Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/admin into dev

src/pages/system/caseManager/caseInfo/index.vue

@@ -3,7 +3,7 @@
     <div class="system-table-search">
       <div class="flex-h">
         <div class="flex-item flex-h">
-          <el-button size="mini" type="success" @click="redirection('addCase')">新增案场</el-button>
+          <el-button size="mini" type="success" @click="redirection('addIndexCase')">新增案场</el-button>
         </div>
         <tableSearch value="请输入案场名称" @exportSearchKey="searchList"></tableSearch>
       </div>
@@ -140,7 +140,7 @@ export default {
     },
     editItem (index, row) { // 修改
       // console.log(index, row)
-      this.$router.push({ name: 'editCase', query: { id: row.id } })
+      this.$router.push({ name: 'editIndexCase', query: { id: row.id } })
     },
     keyManager (index, row) { // 钥匙管理
       console.log(index, row)

src/pages/system/index.vue

@@ -195,6 +195,41 @@ export default {
         FatherID: '3',
         Url: 'editUser',
         IsShow: 0
+      }, {
+        MenuId: '7',
+        MenuName: '案场管理',
+        Icon: '',
+        FatherID: '1',
+        Url: 'caseManager',
+        IsShow: 1
+      }, {
+        MenuId: '8',
+        MenuName: '案场信息',
+        Icon: '',
+        FatherID: '7',
+        Url: 'indexCase',
+        IsShow: 1
+      }, {
+        MenuId: '9',
+        MenuName: '新增案场',
+        Icon: '',
+        FatherID: '8',
+        Url: 'addIndexCase',
+        IsShow: 1
+      }, {
+        MenuId: '10',
+        MenuName: '编辑案场',
+        Icon: '',
+        FatherID: '8',
+        Url: 'editIndexCase',
+        IsShow: 1
+      }, {
+        MenuId: '11',
+        MenuName: '钥匙管理',
+        Icon: '',
+        FatherID: '7',
+        Url: 'keyManager',
+        IsShow: 1
       }]
       this.$store.state.app.menusRaw = menuData // 写入权限菜单数据
       this.creatSlideMenu([...menuData])

src/pages/system/page.js

@@ -10,9 +10,9 @@ import addRole from './systemSet/roleManager/add' // 添加角色
 import editRole from './systemSet/roleManager/edit' // 编辑角色
 
 import caseManager from './caseManager/index' // 案场管理
-import caseInfo from './caseManager/caseInfo/index' // 案场信息
-import addCase from './caseManager/caseInfo/addCase/index' // 新增案场
-import editCase from './caseManager/caseInfo/editCase/index' // 新增案场
+import indexCase from './caseManager/caseInfo/index' // 案场信息
+import addIndexCase from './caseManager/caseInfo/addCase/index' // 新增案场
+import editIndexCase from './caseManager/caseInfo/editCase/index' // 新增案场
 import keyManager from './caseManager/keyManager/index' // 钥匙管理
 import caseAreaManager from './caseManager/caseAreaManager/index' // 案场区域管理
 import addCaseArea from './caseManager/caseAreaManager/add' // 新增案场区域
@@ -105,18 +105,18 @@ export default {
         name: 'caseManager',
         component: caseManager,
         children: [{ // 案场信息
-          path: 'caseInfo',
-          name: 'caseInfo',
-          component: caseInfo,
+          path: 'indexCase',
+          name: 'indexCase',
+          component: indexCase,
           children: [{ // 新增案场
-            path: 'addCase',
-            name: 'addCase',
-            component: addCase,
+            path: 'addIndexCase',
+            name: 'addIndexCase',
+            component: addIndexCase,
             children: []
           }, { // 编辑案场
-            path: 'editCase',
-            name: 'editCase',
-            component: editCase,
+            path: 'editIndexCase',
+            name: 'editIndexCase',
+            component: editIndexCase,
             children: []
           }]
         }, { // 钥匙管理