diff --git a/auth.json b/auth.json
index ddc8ab0..a2f7d82 100644
--- a/auth.json
+++ b/auth.json
@@ -3,8 +3,8 @@
"type": -1,
"rights": "duojiSystem",
"children": [{
- "description": "实时视频流",
+ "description": "盘点管理",
"type": 1,
- "rights": "realTimeMonitoring"
+ "rights": "checkManage"
}]
}
diff --git a/src/layouts/AsideMenu.vue b/src/layouts/AsideMenu.vue
index be956a0..523118e 100644
--- a/src/layouts/AsideMenu.vue
+++ b/src/layouts/AsideMenu.vue
@@ -71,7 +71,12 @@ export default {
parents = this.$router.options.routes[0].children.filter(ele => {
if (
this.userInfo.permissionList.some(item => {
- return item.rights === ele.name && ele.name.indexOf("center") < 0 && item.rights === ele.name && ele.name.indexOf("ioTable") < 0 && item.rights === ele.name && ele.name.indexOf("realTimeMonitoringModel") < 0 && item.rights === ele.name && ele.name.indexOf("plcStatus") < 0 && item.rights === ele.name && ele.name.indexOf("cameraManageModel") < 0 && item.rights === ele.name && ele.name.indexOf("checkOperation") < 0;
+ return item.rights === ele.name && ele.name.indexOf("center") < 0
+ && item.rights === ele.name && ele.name.indexOf("ioTable") < 0
+ && item.rights === ele.name && ele.name.indexOf("realTimeMonitoringModel") < 0
+ && item.rights === ele.name && ele.name.indexOf("plcStatus") < 0
+ && item.rights === ele.name && ele.name.indexOf("cameraManageModel") < 0
+ && item.rights === ele.name && ele.name.indexOf("checkOperation") < 0;
})
) {
return ele;
diff --git a/src/layouts/PageContent.vue b/src/layouts/PageContent.vue
index fbc6b32..222c960 100644
--- a/src/layouts/PageContent.vue
+++ b/src/layouts/PageContent.vue
@@ -2,7 +2,7 @@
-
+
diff --git a/src/router/index.js b/src/router/index.js
index d319efd..931d28d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -25,57 +25,57 @@ VueRouter.prototype.push = function push(location) {
const routes = [{
path: '/',
redirect: {
- name: 'realTimeMonitoring'
+ name: 'checkManage'
},
component: () => import('@/views/index'),
children: [
- {
- path: 'videoWall1`',
- name: 'videoWall1`',
- meta: {
- icon: 'desktop',
- name: '视频墙1'
- },
- component: () => import('@/views/videoWall/index'),
- },
- {
- path: 'videoWall2',
- name: 'videoWall2',
- meta: {
- icon: 'desktop',
- name: '视频墙2'
- },
- component: () => import('@/views/videoWall2/index'),
- },
- {
- path: 'realTimeMonitoring',
- name: 'realTimeMonitoring',
- meta: {
- icon: 'video-camera',
- name: '实时视频流'
- },
- component: () => import('@/views/realTimeMonitoring/index'),
+ // {
+ // path: 'videoWall1`',
+ // name: 'videoWall1`',
+ // meta: {
+ // icon: 'desktop',
+ // name: '视频墙1'
+ // },
+ // component: () => import('@/views/videoWall/index'),
+ // },
+ // {
+ // path: 'videoWall2',
+ // name: 'videoWall2',
+ // meta: {
+ // icon: 'desktop',
+ // name: '视频墙2'
+ // },
+ // component: () => import('@/views/videoWall2/index'),
+ // },
+ // {
+ // path: 'realTimeMonitoring',
+ // name: 'realTimeMonitoring',
+ // meta: {
+ // icon: 'video-camera',
+ // name: '实时视频流'
+ // },
+ // component: () => import('@/views/realTimeMonitoring/index'),
- },
+ // },
- {
- path: 'historyMonitoring',
- name: 'historyMonitoring',
- meta: {
- icon: 'book',
- name: '历史数据'
- },
- component: () => import('@/views/historyMonitoring/index')
- },
- {
- path: 'alarmLog',
- name: 'alarmLog',
- meta: {
- icon: 'eye',
- name: '告警日志'
- },
- component: () => import('@/views/alarmVideos/alarmLog')
- },
+ // {
+ // path: 'historyMonitoring',
+ // name: 'historyMonitoring',
+ // meta: {
+ // icon: 'book',
+ // name: '历史数据'
+ // },
+ // component: () => import('@/views/historyMonitoring/index')
+ // },
+ // {
+ // path: 'alarmLog',
+ // name: 'alarmLog',
+ // meta: {
+ // icon: 'eye',
+ // name: '告警日志'
+ // },
+ // component: () => import('@/views/alarmVideos/alarmLog')
+ // },
{
path: 'checkManage',
name: 'checkManage',
@@ -128,66 +128,66 @@ const routes = [{
},
component: () => import('@/views/roadwayManage/index')
},
- {
- path: 'cameraManage',
- name: 'cameraManage',
- meta: {
- icon: 'camera',
- name: '球机管理'
- },
- component: () => import('@/views/cameraManage/index')
- },
- {
- path: 'cameraManage/model',
- name: 'cameraManageModel',
- meta: {
- name: '球机管理测试or配置'
- },
- component: () => import('@/views/cameraManage/model')
- },
// {
- // path: 'productSpecManage',
- // name: 'productSpecManage',
+ // path: 'cameraManage',
+ // name: 'cameraManage',
// meta: {
- // icon: 'pushpin',
- // name: '品规管理'
+ // icon: 'camera',
+ // name: '球机管理'
// },
- // component: () => import('@/views/productSpecManage/index')
+ // component: () => import('@/views/cameraManage/index')
// },
// {
- // path: 'repertoryManage',
- // name: 'repertoryManage',
+ // path: 'cameraManage/model',
+ // name: 'cameraManageModel',
// meta: {
- // icon: 'wallet',
- // name: '库存管理'
+ // name: '球机管理测试or配置'
// },
- // component: () => import('@/views/repertoryManage/index')
+ // component: () => import('@/views/cameraManage/model')
// },
+ // // {
+ // // path: 'productSpecManage',
+ // // name: 'productSpecManage',
+ // // meta: {
+ // // icon: 'pushpin',
+ // // name: '品规管理'
+ // // },
+ // // component: () => import('@/views/productSpecManage/index')
+ // // },
+ // // {
+ // // path: 'repertoryManage',
+ // // name: 'repertoryManage',
+ // // meta: {
+ // // icon: 'wallet',
+ // // name: '库存管理'
+ // // },
+ // // component: () => import('@/views/repertoryManage/index')
+ // // },
- {
- path: 'cameraManage/ioTable',
- name: 'ioTable',
- meta: {
- name: 'IO表配置'
- },
- component: () => import('@/views/cameraManage/ioTable')
- },
- {
- path: 'center',
- name: 'center',
- meta: {
- name: '个人中心'
- },
- component: () => import('@/views/center')
- },
- {
- path: 'plcStatus',
- name: 'plcStatus',
- meta: {
- name: 'PLC状态'
- },
- component: () => import('@/views/plcStatus')
- }
+ // {
+ // path: 'cameraManage/ioTable',
+ // name: 'ioTable',
+ // meta: {
+ // name: 'IO表配置'
+ // },
+ // component: () => import('@/views/cameraManage/ioTable')
+ // },
+ // {
+ // path: 'center',
+ // name: 'center',
+ // meta: {
+ // name: '个人中心'
+ // },
+ // component: () => import('@/views/center')
+ // },
+ // {
+ // path: 'plcStatus',
+ // name: 'plcStatus',
+ // meta: {
+ // name: 'PLC状态'
+ // },
+ // component: () => import('@/views/plcStatus')
+ // }
]
},
{
diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue
index 5468b6c..276c7ea 100644
--- a/src/views/checkManage/checkOperation.vue
+++ b/src/views/checkManage/checkOperation.vue
@@ -3,7 +3,7 @@
-
+
-
@@ -11,7 +11,7 @@
位置:
- {{checkObj.streetName}}-{{checkObj.direction }}-{{checkObj.column}}列-{{checkObj.row}}层
+ {{checkObj.streetName}}-{{direction==1?"左":"右"}}-{{side==1?"浅":"深"}}-{{checkObj.column}}列-{{checkObj.row}}层
-
@@ -34,7 +34,7 @@
-
+
-
-
-
-
-
- 暂无图片
-
-
盘点图2
-