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

src/layout/components/Navbar.vue

@@ -106,6 +106,8 @@ export default {
         $route(val) {
             if (val.path === '/orderauthor/rules/manage') {
                 this.$refs.keMenu.activeIndex = val.path;
+            } else if (val.path === '/design/home') {
+                this.$refs.keMenu.activeIndex = val.path;
             }
         }
     },

src/router/index.js

@@ -940,15 +940,15 @@ export const asyncRouter = [
         path: '/iscs',
         component: Layout,
         meta: {
-            i18n: 'router.iscsSystem',
-            roles: [admin]
+            i18n: 'router.iscsSystem'
         },
         children: [
             {
                 path:'design',
                 component: IscsDesign,
                 meta: {
-                    i18n: 'router.iscsDraw'
+                    i18n: 'router.iscsDraw',
+                    roles: [admin]
                 },
                 children: [
                     {
@@ -962,7 +962,8 @@ export const asyncRouter = [
                 path: 'system',
                 component: IscsSystem,
                 meta: {
-                    i18n: 'router.iscsSystem'
+                    i18n: 'router.iscsSystem',
+                    roles: [admin, user]
                 },
                 children: [
                     {

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

@@ -1,5 +1,5 @@
 <template>
-  <div style="height: 100%; width: 100%;">
+  <div style="height: 100%; width: 100%;overflow-y: auto;">
     <standFAS v-if="mode == 'standFAS'" />
     <stationHallFAS v-else-if="mode == 'stationHallFAS'" />
     <systemFAS v-else-if="mode == 'systemFAS'" />

src/views/iscs/iscsSystem/index.vue

@@ -11,13 +11,11 @@
 <script>
 import TopNav from './nav.vue';
 // import bottom from './bottom.vue';
-// import ConfigContent from './config/index';
 
 export default {
     components: {
         TopNav
-        // bottom,
-        // ConfigContent
+        // bottom
     },
     data() {
         return {
@@ -31,13 +29,14 @@ export default {
 
 <style lang="scss" scoped>
 .iscs-system-box{
-    position: relative;
+    // position: relative;
     height: 100%;
+    overflow-y: auto;
 }
 .content-box{
     width: 100%;
     height: 100%;
-    padding: 95px 0 0;
+    padding: 34px 0 0;
     background: #45607B;
 }
 </style>

src/views/iscs/iscsSystem/nav.vue

@@ -13,6 +13,7 @@
         <div class="station-name">{{ item.name }}</div>
       </div>
     </div>
+    <div class="back-box" @click="back">返回主页面</div>
   </div>
 </template>
 
@@ -21,8 +22,8 @@ export default {
     data() {
         return {
             selectIndex: 0,
-            selectChildIndex: 0,
-            selectStationIndex: 0,
+            selectChildIndex: -1,
+            selectStationIndex: -1,
             navList: [
                 {
                     name: '火灾报警',
@@ -226,8 +227,10 @@ export default {
             this.$router.push({ path: `/iscs/system/config/${item.type}` });
         },
         selectStation(item, index) { // 选择子菜单
-            console.log(item);
             this.selectStationIndex = index;
+        },
+        back() {
+            this.$router.push({ path: `/design/home` });
         }
     }
 };
@@ -304,6 +307,15 @@ export default {
             background: #A1D9DC;
         }
     }
-
+    .back-box{
+        display: table;
+        position: absolute;
+        right: 20px;
+        top: 15px;
+        cursor: pointer;
+        &:hover{
+            color: #3161cc;
+        }
+    }
 }
 </style>