Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev

src/router/index.js

@@ -33,16 +33,17 @@ const ExistingSimulation = () => import('@/views/system/existingSimulation/index
 const CacheControl = () => import('@/views/system/cacheControl/index');
 const SystemGenerate = () => import('@/views/system/systemGenerate/index');
 const IbpDraw = () => import('@/views/system/ibpDraw/index');
-const IscsDraw = () => import('@/views/system/iscsDraw/index');
-const IscsDesign = () => import('@/views/system/iscsDesign/index');
 const News = () => import('@/views/system/news/index');
 const CommandDictionary = () => import('@/views/system/commandDictionary/index');
 const CommandDictionaryDetail = () => import('@/views/system/commandDictionary/edit');
 const configLine = () => import('@/views/system/configLine/index');
-const IscsSystem = () => import('@/views/system/iscsSystem/index');
-
 const Mapedit = () => import('@/views/mapdraft/index');
 
+const IscsSystem = () => import('@/views/iscs/iscsSystem/index');
+const IscsDraw = () => import('@/views/iscs/iscsDraw/index');
+const IscsDesign = () => import('@/views/iscs/iscsDesign/index');
+const IscsConfig = () => import('@/views/iscs/iscsSystem/config/index');
+
 const NewMapDraft = () => import('@/views/newMap/newMapdraft/index');
 const NewDesignPlatformUser = () => import('@/views/newMap/newDesignUser/index');
 
@@ -518,21 +519,6 @@ export const asyncRouter = [
         component: JointTraining,
         hidden: true
     },
-    // { // iscs系统
-    //     path: '/iscs/system',
-    //     component: IscsSystem,
-    //     meta: {
-    //         roles: [admin],
-    //         i18n: 'router.iscsSystem'
-    //     },
-    //     children: [{
-    //         path: '',
-    //         component: IscsSystem,
-    //         meta: {
-    //             i18n: 'router.iscsSystem'
-    //         }
-    //     }]
-    // },
     {
         path: '/jlmap3d',
         component: Jlmap3d,
@@ -785,27 +771,6 @@ export const asyncRouter = [
                     i18n: 'router.ibpDraw'
                 }
             },
-            // {
-            //     path:'iscs/design',
-            //     component: IscsDesign,
-            //     meta: {
-            //         i18n: 'router.iscsDraw'
-            //     },
-            //     children: [
-            //         {
-            //             path: 'edit/:id/:mode',
-            //             component: IscsDraw,
-            //             hidden: true
-            //         }
-            //     ]
-            // },
-            // {
-            //     path: 'iscs/system',
-            //     component: IscsSystem,
-            //     meta: {
-            //         i18n: 'router.iscsSystem'
-            //     }
-            // },
             {
                 path: 'dictionary',
                 component: Dictionary,
@@ -998,7 +963,14 @@ export const asyncRouter = [
                 component: IscsSystem,
                 meta: {
                     i18n: 'router.iscsSystem'
+                },
+                children: [
+                    {
+                        path: 'config/:mode',
+                        component: IscsConfig,
+                        hidden: true
                     }
+                ]
             }
         ]
     }

src/views/iscs/iscsSystem/config/broadcast/homeScreen.vue

@@ -0,0 +1,88 @@
+<template>
+  <div>
+    <div class="area-selection">
+      <el-row><div style="margin-top: 10px;margin-bottom: 5px; color: #9EEBEF;">特定区域</div></el-row>
+      <el-row><div class="area-selection-button">全线</div></el-row>
+      <el-row><div class="area-selection-button">全站厅</div></el-row>
+      <el-row><div class="area-selection-button">全上行站台</div></el-row>
+      <el-row><div class="area-selection-button">全下行站台</div></el-row>
+      <el-row><div class="area-selection-button">全办公区</div></el-row>
+      <el-row><div class="area-selection-button">全出入口</div></el-row>
+      <el-row><div class="area-selection-button">全换乘通道</div></el-row>
+    </div>
+    <div class="broadcast-form">
+      <div v-for="item in verticalHeader">
+        <el-row>
+          <el-col><div>{{ item.name }}</div></el-col>
+          <div v-for="it in stationList">
+            <div v-if="item.type===header">
+              <div>{{ it }}</div>
+            </div>
+            <div v-else>
+              <div />
+            </div>
+          </div>
+        </el-row>
+      </div>
+    </div>
+
+  </div>
+</template>
+
+<script>
+export default {
+    name: 'HomeScreen',
+    data() {
+        return {
+            mes: '1111',
+            verticalHeader: [
+                {name:'车站', type: 'header'},
+                {name: '站厅', type: 'checkBox'},
+                {name: '上行站台', type: 'checkBox'},
+                {name: '下行站台', type: 'checkBox'},
+                {name: '办公区', type: 'checkBox'},
+                {name: '换乘通道', type: 'checkBox'}
+            ],
+            stationList: ['会展中心站', '世纪大道站', '交通大学站', '市图书馆站', '中心医院站', '未来路站', '火车站', '人民广场站', '体育中心站']
+        };
+    }
+};
+</script>
+
+<style scoped>
+    .area-selection{
+        text-align: center;
+        border-top: 3px solid #898888;
+        border-left: 3px solid #898888;
+        border-right: 3px solid #fff;
+        border-bottom: 3px solid #fff;
+        width: 5%;
+        position: absolute;
+        top: 200px;
+        left: 1%;
+    }
+    .area-selection-button{
+        width: 90%;
+        padding: 6px 0;
+        margin-bottom: 10px;
+        font-size: 10px;
+        background: #CCCCCC;
+        display: inline-block;
+        border-top: 2px solid #fff;
+        border-left: 2px solid #fff;
+        border-right: 2px solid #565656;
+        border-bottom: 2px solid #565656;
+    }
+    .broadcast-form{
+        text-align: center;
+        border-top: 3px solid #898888;
+        border-left: 3px solid #898888;
+        border-right: 3px solid #fff;
+        border-bottom: 3px solid #fff;
+        width: 80%;
+        top: 200px;
+        position: absolute;
+        left: 7%;
+    }
+
+</style>

src/views/iscs/iscsSystem/config/index.vue

@@ -35,16 +35,15 @@ export default {
         StationNetwork,
         EmergencyRelease
     },
-    props: {
-        mode: {
-            type: String,
-            required: true
-        }
-    },
     data() {
         return {
-            mes: '1111'
+            mode: 'standFAS'
         };
+    },
+    watch: {
+        '$route': function(val) {
+            this.mode = this.$route.params.mode;
+        }
     }
 };
 </script>

src/views/iscs/iscsSystem/index.vue

@@ -2,8 +2,7 @@
   <div class="iscs-system-box">
     <top-nav @selectMode="selectMode" />
     <div class="content-box">
-      <!-- <config-content :mode="mode" /> -->
-      <route-view />
+      <router-view />
     </div>
     <!-- <bottom /> -->
   </div>
@@ -26,9 +25,6 @@ export default {
         };
     },
     methods: {
-        selectMode(type) {
-            this.mode = type;
-        }
     }
 };
 </script>

src/views/iscs/iscsSystem/nav.vue

@@ -205,13 +205,13 @@ export default {
                 this.selectIndex = index;
                 this.selectChildIndex = 0;
                 if (item.children.length) {
-                    this.$emit('selectMode', item.children[0].type);
+                    this.$router.push({ path: `/iscs/system/config/${item.children[0].type}` });
                 }
             }
         },
         selectChildren(item, index) { // 选择子菜单
             this.selectChildIndex = index;
-            this.$emit('selectMode', item.type);
+            this.$router.push({ path: `/iscs/system/config/${item.type}` });
         },
         selectStation(item, index) { // 选择子菜单
             console.log(item);

src/views/system/iscsSystem/config/broadcast/homeScreen.vue

@@ -1,44 +0,0 @@
-<template>
-  <div>
-    <el-row>
-      <el-col :span="1">
-        <div class="area-selection">
-          <el-row><span>特定区域</span></el-row>
-          <el-row><el-button>全线</el-button></el-row>
-          <el-row><el-button>全站厅</el-button></el-row>
-          <el-row><el-button>全上行站台</el-button></el-row>
-          <el-row><el-button>全下行站台</el-button></el-row>
-          <el-row><el-button>全办公区</el-button></el-row>
-          <el-row><el-button>全出入口</el-button></el-row>
-          <el-row><el-button>全换乘通道</el-button></el-row>
-        </div>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-export default {
-    name: 'HomeScreen',
-    data() {
-        return {
-            mes: '1111'
-        };
-    }
-};
-</script>
-
-<style scoped>
-    .area-selection{
-        text-align: center;
-        border: 2px solid #409EFF;
-        width: 100%;
-        .el-button{
-            width: 90%;
-            padding: 6px 0;
-            margin-top: 10px;
-            font-size: 10px;
-        }
-    }
-
-</style>