diff --git a/dist.zip b/dist.zip index 7858593..9343a31 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/src/router/index.js b/src/router/index.js index 285b666..fb15f7a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -34,28 +34,11 @@ const routes = [{ name: 'videoWall1`', meta: { icon: 'desktop', - name: '视频墙1' + name: '视频墙' }, component: () => import('@/views/videoWall/index'), }, - { - path: 'videoWall2', - name: 'videoWall2', - meta: { - icon: 'desktop', - name: '视频墙2' - }, - component: () => import('@/views/videoWall2/index'), - }, - { - path: 'videoWall3', - name: 'videoWall3', - meta: { - icon: 'desktop', - name: '视频墙3' - }, - component: () => import('@/views/videoWall3/index'), - }, + { path: 'realTimeMonitoring', name: 'realTimeMonitoring', @@ -76,15 +59,15 @@ const routes = [{ }, component: () => import('@/views/historyMonitoring/index') }, - { - path: 'alarmLog', - name: 'alarmLog', - meta: { - icon: 'eye', - name: '告警日志' - }, - component: () => import('@/views/alarmVideos/alarmLog') - }, + // { + // path: 'alarmLog', + // name: 'alarmLog', + // meta: { + // icon: 'eye', + // name: '告警日志' + // }, + // component: () => import('@/views/alarmVideos/alarmLog') + // }, { path: 'checkManage', name: 'checkManage', diff --git a/src/views/checkManage/Subsection.vue b/src/views/checkManage/Subsection.vue index 3d29400..a75c2c9 100644 --- a/src/views/checkManage/Subsection.vue +++ b/src/views/checkManage/Subsection.vue @@ -89,7 +89,7 @@ export default { default: () => { return { row: 10, - column: 30 + column: 24 } } }, diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue index 4d6961b..f434788 100644 --- a/src/views/checkManage/checkOperation.vue +++ b/src/views/checkManage/checkOperation.vue @@ -44,7 +44,7 @@

盘点图1

-
+ - + diff --git a/src/views/historyMonitoring/index.vue b/src/views/historyMonitoring/index.vue index 4bdef1e..d06eb49 100644 --- a/src/views/historyMonitoring/index.vue +++ b/src/views/historyMonitoring/index.vue @@ -156,12 +156,6 @@ export default { scopedSlots: {customRender: 'pics'}, width:320, }, - { - title: "视频状态", - // dataIndex: "status", - scopedSlots: {customRender: 'status'}, - width: 90 - }, { title: "工单时长", dataIndex: "timeLength", diff --git a/src/views/videoWall/index.vue b/src/views/videoWall/index.vue index dfd81b8..cb71e07 100644 --- a/src/views/videoWall/index.vue +++ b/src/views/videoWall/index.vue @@ -1,58 +1,108 @@ \ No newline at end of file + \ No newline at end of file