From 0b380b3b0fc1f9092e8f48956d2ed6e259e56df9 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 21 Sep 2020 16:00:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=A6=8F=E5=B7=9E=E7=BA=BF=E8=B7=AFiscs?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=20=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/iscs/iscsSystem/index.vue      |   5 +-
 src/views/iscs/iscsSystem/menuBottom.vue | 187 +++++++++++++++++++++++
 src/views/iscs/iscsSystem/stationNav.vue |   8 +-
 3 files changed, 194 insertions(+), 6 deletions(-)
 create mode 100644 src/views/iscs/iscsSystem/menuBottom.vue

diff --git a/src/views/iscs/iscsSystem/index.vue b/src/views/iscs/iscsSystem/index.vue
index 91fd6cd19..7185247de 100644
--- a/src/views/iscs/iscsSystem/index.vue
+++ b/src/views/iscs/iscsSystem/index.vue
@@ -13,6 +13,7 @@
       <div class="content-box-station iscs_content_box" :class="{'displayStationIscs': $route.query.group}">
         <router-view />
       </div>
+      <menu-bottom />
     </div>
     <!-- <bottom /> -->
   </div>
@@ -23,6 +24,7 @@ import TopNav from './nav.vue';
 import GroupNav from './groupNav.vue';
 import StationNav from './stationNav.vue';
 import MenuBar from './menuBar.vue';
+import MenuBottom from './menuBottom.vue';
 // import bottom from './bottom.vue';
 
 export default {
@@ -30,7 +32,8 @@ export default {
         TopNav,
         GroupNav,
         MenuBar,
-        StationNav
+        StationNav,
+        MenuBottom
         // bottom
     },
     data() {
diff --git a/src/views/iscs/iscsSystem/menuBottom.vue b/src/views/iscs/iscsSystem/menuBottom.vue
new file mode 100644
index 000000000..4630ffef2
--- /dev/null
+++ b/src/views/iscs/iscsSystem/menuBottom.vue
@@ -0,0 +1,187 @@
+<template>
+  <div class="bottom-box">
+    <div v-for="button in buttonList" :key="button.id" class="eachButtonTop">
+      <div class="eachButton" :class="buttonId==button.id?'active':''" @click="showSubMenu(button)">{{ button.name }}</div>
+      <div v-if="button.children&&button.children.length>0" class="childGroup" :class="buttonId==button.id?'active':''">
+        <div v-for="child in button.children" :key="child.id" class="childButton">
+          <div class="childButtonIn">{{ child.name }}</div>
+        </div>
+        <div class="childLine" />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            buttonId:'',
+            buttonList:[
+                {name:'车站概要', type:'totalSystem', id: 'stationDescription' },
+                {name:'电力监控系统', type:'totalSystem', id: 'electric' },
+                {name:'环境与设备监控系统', type:'totalSystem', id: 'environment' },
+                {name:'火灾报警系统', type:'totalSystem', id: 'ffas', mode: 'ffas',
+                    children:[
+                        {
+                            name: '火灾报警系统-FAS联动',
+                            mode: 'linkage',
+                            id: 'linkage',
+                            type: 'interface'
+                        },
+                        {
+                            name: '火灾报警系统-站厅层',
+                            mode: 'stationHall',
+                            id: 'stationHall',
+                            type: 'interface'
+                        },
+                        {
+                            name: '火灾报警系统-站台层',
+                            mode: 'platform',
+                            id: 'platform',
+                            type: 'interface'
+                        },
+                        {
+                            name: '火灾报警系统-区间',
+                            mode: 'section',
+                            id: 'section',
+                            type: 'interface'
+                        },
+                        {
+                            name: '感温光纤探测系统',
+                            mode: 'sensing',
+                            id: 'sensing',
+                            type: 'interface'
+                        },
+                        {
+                            name: '气体灭火系统',
+                            mode: 'gas',
+                            id: 'gas',
+                            type: 'interface'
+                        }
+                    ]},
+                {name:'屏蔽门系统', type:'totalSystem', id: 'psd' },
+                {name:'自动售检票/门禁', type:'totalSystem', id: 'fafc', mode: 'fafc',
+                    children:[
+                        {
+                            name: '自动售检票系统',
+                            mode: 'autoTicket',
+                            id: 'autoTicket',
+                            type: 'interface'
+                        },
+                        {
+                            name: '门禁系统',
+                            mode: 'entranceGuard',
+                            id: 'entranceGuard',
+                            type: 'interface'
+                        }
+                    ]},
+                {name:'信号系统', type:'totalSystem', id: 'signalSystem', mode: 'signalSystem',
+                    children:[
+                        {
+                            name: 'TIS管理器',
+                            mode: 'tis',
+                            id: 'tis',
+                            type: 'interface'
+                        },
+                        {
+                            name: '列车时刻表',
+                            mode: 'schedule',
+                            id: 'schedule',
+                            type: 'interface'
+                        },
+                        {
+                            name: '信号系统',
+                            mode: 'signal',
+                            id: 'signal',
+                            type: 'interface'
+                        },
+                        {
+                            name: '全线信号系统界面',
+                            mode: 'allLineSignal',
+                            id: 'allLineSignal',
+                            type: 'interface'
+                        }
+                    ]},
+                {name:'通信', type:'totalSystem', id: 'message' },
+                {name:'公共设施', type:'totalSystem', id: 'public' },
+                {name:'管理', type:'totalSystem', id: 'manage' }
+            ]
+        };
+    },
+    methods:{
+        showSubMenu(button) {
+            if (button.children && button.children.length > 0) {
+
+            }
+            this.buttonId = button.id;
+        }
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+.bottom-box{
+    width: 100%;
+    height: 30px;
+    background-color: #ACACAC;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    padding-left: 5px;
+}
+.eachButton{
+    padding: 2px 30px;
+    background: #c0c0c0;
+    margin-top: 3px;
+    border-top: 2px #f7f7f7 solid;
+    border-left: 2px #f7f7f7 solid;
+    border-right: 2px #7e7e7e solid;
+    border-bottom: 2px #7e7e7e solid;
+    cursor: pointer;
+    font-size: 15px;
+}
+.eachButton.active{
+    background: #f7f7f7;
+}
+.eachButtonTop{
+    display:inline-block;
+}
+.childGroup{
+    position: absolute;
+    bottom:30px;
+    background:#f0f0f0;
+    padding: 5px;
+    border-radius: 3px;
+    box-shadow: 3px 3px 4px #525252;
+    display: none;
+}
+.childGroup.active{
+    display: inline-block;
+}
+.childButton{
+    border:1px #f0f0f0 solid;
+    padding-left: 15px;
+    border-radius: 4px;
+    font-size: 14px;
+    padding-right: 10px;
+    cursor: pointer;
+}
+.childButton:hover{
+border:1px #ceddec solid;
+background:rgba(231,237,253,0.9);
+}
+.childButtonIn{
+    padding-left: 5px;
+    padding: 2px 5px;
+}
+.childLine{
+    border-right: 1px #fbfbfb solid;
+    position: absolute;
+    width: 0px;
+    height: 90%;
+    left: 20px;
+    border-left: 1px #e2e3e3 solid;
+    top: 5%;
+}
+</style>
diff --git a/src/views/iscs/iscsSystem/stationNav.vue b/src/views/iscs/iscsSystem/stationNav.vue
index 38f6b461f..6f4f37654 100644
--- a/src/views/iscs/iscsSystem/stationNav.vue
+++ b/src/views/iscs/iscsSystem/stationNav.vue
@@ -92,19 +92,17 @@ export default {
     top: 50%;
     position: absolute;
     border-left: 1px #fdfdfd solid;
-    border-top: 1px #fdfdfd solid;
     border-right: 1px #262626 solid;
-    border-bottom: 1px #262626 solid;
     transform: translateY(-50%);
 }
 .station-list-box.active::before{
     content: '';
-    width: 128%;
-    height: 128%;
+    width: 124%;
+    height: 124%;
     border: 1px #10ff00 solid;
     position: absolute;
     left: -16%;
-    top: -15%;
+    top: -10%;
     border-radius: 130%;
 }
 .station-name{

From e094134960381d993ef450a74dce774f4efc7100 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 21 Sep 2020 16:24:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=89=A7=E6=9C=AC=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/displayNew/dispatherContest/sceneList.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/newMap/displayNew/dispatherContest/sceneList.vue b/src/views/newMap/displayNew/dispatherContest/sceneList.vue
index 842be5de5..86c1bd376 100644
--- a/src/views/newMap/displayNew/dispatherContest/sceneList.vue
+++ b/src/views/newMap/displayNew/dispatherContest/sceneList.vue
@@ -74,8 +74,7 @@ export default {
             this.mainSceneData = [
                 {type: '车辆故障', scene: '列车救援'},
                 {type: '信号系统故障', scene: '道岔故障', id: '11'},
-                //
-                {type: '信号系统故障', scene: '区域控制器故障', id:'19'},
+                {type: '信号系统故障', scene: '区域控制器故障'},
                 {type: '信号系统故障', scene: '联锁故障'},
                 {type: '供电系统故障', scene: '接触轨(网)断电'},
                 {type: '供电系统故障', scene: '车站照明熄灭影响乘降'},