diff --git a/public/index.html b/public/index.html index cc6311a..3dc8a43 100644 --- a/public/index.html +++ b/public/index.html @@ -10,12 +10,12 @@ - 罗博泰克智能视觉 + 易高智能视觉 diff --git a/src/plugins/antd.js b/src/plugins/antd.js index 892ed8d..87c2f2a 100644 --- a/src/plugins/antd.js +++ b/src/plugins/antd.js @@ -16,7 +16,7 @@ import { Icon, Tree, message, - result, + Modal, Popover, Row, diff --git a/src/router/index.js b/src/router/index.js index a312d66..ba5d56f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -58,15 +58,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: 'checkSummary', name: 'checkSummary', @@ -102,23 +102,23 @@ const routes = [{ }, component: () => import('@/views/historyCheck/index'), }, - { - path: 'stockHistory', - name: 'stockHistory', - meta: { - icon: 'file-excel', - name: '库位历史', - }, - component: () => import('@/views/stockLog/index'), - }, - { - path: 'stockLogDetail', - name: 'stockLogDetail', - meta: { - name: '库位历史详情', - }, - component: () => import('@/views/stockLog/logPage'), - }, + // { + // path: 'stockHistory', + // name: 'stockHistory', + // meta: { + // icon: 'file-excel', + // name: '库位历史', + // }, + // component: () => import('@/views/stockLog/index'), + // }, + // { + // path: 'stockLogDetail', + // name: 'stockLogDetail', + // meta: { + // name: '库位历史详情', + // }, + // component: () => import('@/views/stockLog/logPage'), + // }, { path: 'roadwayManage', name: 'roadwayManage', @@ -146,23 +146,32 @@ const routes = [{ component: () => import('@/views/cameraManage/model') }, { - path: 'productSpecManage', - name: 'productSpecManage', - meta: { - icon: 'pushpin', - name: '品规管理' - }, - component: () => import('@/views/productSpecManage/index') - }, - { - path: 'repertoryManage', - name: 'repertoryManage', + path: 'checkMonitoring', + name: 'checkMonitoring', meta: { - icon: 'wallet', - name: '库存管理' + icon: "eye", + name: '实时盘点监控' }, - component: () => import('@/views/repertoryManage/index') + component: () => import('@/views/checkMonitoring/index') }, + // { + // 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', diff --git a/src/store/modules/styles.js b/src/store/modules/styles.js index 9ae2a4c..b8e43f2 100644 --- a/src/store/modules/styles.js +++ b/src/store/modules/styles.js @@ -11,7 +11,7 @@ const store = { "primary-color":"rgba(184, 68, 13, 1)" }, "title":{ - "text":"昆船垛机智能视觉系统", + "text":"易高智能视觉系统", "style":{ "color":"rgba(255, 255, 255, 1)", "background-color":"rgba(163, 60, 12, 1)", diff --git a/src/views/checkMonitoring/index.vue b/src/views/checkMonitoring/index.vue new file mode 100644 index 0000000..39ba351 --- /dev/null +++ b/src/views/checkMonitoring/index.vue @@ -0,0 +1,190 @@ + + + + diff --git a/src/views/checkMonitoring/model.vue b/src/views/checkMonitoring/model.vue new file mode 100644 index 0000000..1e7cf93 --- /dev/null +++ b/src/views/checkMonitoring/model.vue @@ -0,0 +1,122 @@ + + + + diff --git a/src/views/historyMonitoring/index.vue b/src/views/historyMonitoring/index.vue index 4ac3354..fa8eae9 100644 --- a/src/views/historyMonitoring/index.vue +++ b/src/views/historyMonitoring/index.vue @@ -58,25 +58,7 @@ - - - {{ text.status == null ? ' ' : text.status == 0 ? '正常' : '告警' }} - - - - - 查看视频 - - - - +