+
diff --git a/src/router/index.js b/src/router/index.js
index dfac89f..09504a8 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -76,23 +76,32 @@ const routes = [{
// },
// component: () => import('@/views/checkSummary/index')
// },
+ // {
+ // path: 'emptyCheckManage',
+ // name: 'emptyCheckManage',
+ // meta: {
+ // icon: 'form',
+ // name: '空货位管理',
+ // },
+ // component: () => import('@/views/emptyCheckManage/index'),
+ // },
{
- path: 'emptyCheckManage',
- name: 'emptyCheckManage',
+ path: 'platformCheckManage',
+ name: 'platformCheckManage',
meta: {
icon: 'form',
- name: '空货位管理',
+ name: '站点盘点',
},
- component: () => import('@/views/emptyCheckManage/index'),
+ component: () => import('@/views/platformCheck/index'),
},
{
- path: 'checkManage',
- name: 'checkManage',
+ path: 'platformCheckManageOld',
+ name: 'platformCheckManageOld',
meta: {
icon: 'form',
- name: '盘点管理',
+ name: '站点盘点历史',
},
- component: () => import('@/views/checkManage/index'),
+ component: () => import('@/views/platformCheck/old/index'),
},
{
path: 'checkOperation',
@@ -102,32 +111,24 @@ const routes = [{
},
component: () => import('@/views/checkManage/checkOperation'),
},
- // {
- // path: 'checkHistory',
- // name: 'checkHistory',
- // meta: {
- // icon: 'tag',
- // name: '盘点历史',
- // },
- // 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: 'checkManage',
+ name: 'checkManage',
+ meta: {
+ icon: 'form',
+ name: '盘点管理',
+ },
+ component: () => import('@/views/checkManage/index'),
+ },
+ {
+ path: 'checkHistory',
+ name: 'checkHistory',
+ meta: {
+ icon: 'tag',
+ name: '盘点历史',
+ },
+ component: () => import('@/views/historyCheck/index'),
+ },
{
path: 'roadwayManage',
name: 'roadwayManage',
diff --git a/src/store/modules/styles.js b/src/store/modules/styles.js
index fef5cf6..efc1a55 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(0,0,0, 1)",
diff --git a/src/views/checkManage/Subsection.vue b/src/views/checkManage/Subsection.vue
index 3816502..7e4389b 100644
--- a/src/views/checkManage/Subsection.vue
+++ b/src/views/checkManage/Subsection.vue
@@ -1,7 +1,7 @@
+
+
+
+
+
+
diff --git a/src/views/platformCheck/model.vue b/src/views/platformCheck/model.vue
new file mode 100644
index 0000000..1e7cf93
--- /dev/null
+++ b/src/views/platformCheck/model.vue
@@ -0,0 +1,122 @@
+
+
+
+
+
+
+
+ -
+
- + + {{street.name}}-{{realCheck.direction == ''?'左右':(realCheck.direction == 1?"左":"右")}}-{{realCheck.side == ''?'深浅':(realCheck.side == 1?"浅":"深")}}-{{realCheck.row}}层-{{realCheck.column}}列 + + +
- + + 核对状态:{{realCheck.status == 1?"盘点正确":"盘点异常"}} + + +
- + + 系统条码:{{realCheck.WMSCode}} + + +
- + + 盘点结果条码:{{realCheck.checkCode}} + + +
- + + 系统品规: + + + +
- + + 盘点结果品规: + + +
- + + 系统数量:{{realCheck.WMSCount}} + + +
- + + 盘点结果数量:{{realCheck.checkCode}} + + +
- + + 盘点时间:{{realCheck.time}} + + +
+
+
+
+ ![]()
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+ ![]()
+
+
+
+
+
+ 顶部图片1
+顶部图片2
+侧面图片1
+侧面图片2
+侧面图片3
+侧面图片4
+
+
+
+
+
+
+
+
diff --git a/src/views/platformCheck/old/index.vue b/src/views/platformCheck/old/index.vue
new file mode 100644
index 0000000..c707256
--- /dev/null
+++ b/src/views/platformCheck/old/index.vue
@@ -0,0 +1,326 @@
+
+
+
+
+ ╳
+
+
+
+
+
+
+
+
+ {{ text }}
+
+
+ {{ text.direction == 1 ?"左":"右"}}-{{ text.side == 1 ?"浅":"深"}}-{{ text.row}}-{{ text.column}}
+
+
+ {{ statusMap[text.status] }}
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/roadwayManage/index.vue b/src/views/roadwayManage/index.vue
index 711d6a0..19b085c 100644
--- a/src/views/roadwayManage/index.vue
+++ b/src/views/roadwayManage/index.vue
@@ -27,13 +27,15 @@
{{ text === null ? '-' : text === 0 ? '单伸' : '双伸' }}
-
- {{ text.connectStatus === 1 ? '已连接' : "未连接" }}
-
{{ text.plcIp }}:{{text.plcPort}}
-
+
+ {{ text.lightSourceIp }}:{{text.lightSourcePort}}
+
+
+ {{ text.RFIDIp }}:{{text.RFIDPort}}
+
{{text.leftSensorGunIp}}:{{text.leftSensorGunPort}} 、{{text.rightSensorGunIp}}:{{text.rightSensorGunPort}}
@@ -45,10 +47,10 @@
- {{text.camera1Name}}
+ {{text.camera1Name}} 、{{text.camera2Name}}
- {{text.camera1Name}}
-
+ {{text.camera1Name}}
+ {{text.camera2Name}}
@@ -97,14 +99,20 @@ const columns = [
dataIndex: 'plcId',
},
{
- title: '客户端IP',
- dataIndex: 'plcIp',
-
+ title: '光源IP',
+ scopedSlots: { customRender: 'lightSourceIp' }
},
{
- title: '客户端连接状态',
-
- scopedSlots: { customRender: 'connectStatus' }
+ title: 'plc',
+ scopedSlots: { customRender: 'plc' }
+ },
+ {
+ title: 'RFID',
+ scopedSlots: { customRender: 'RFID' }
+ },
+ {
+ title: '扫码枪',
+ scopedSlots: { customRender: 'sensorGun' }
},
{
title: '左货架类型',
diff --git a/src/views/roadwayManage/model.vue b/src/views/roadwayManage/model.vue
index f02546d..51048b4 100644
--- a/src/views/roadwayManage/model.vue
+++ b/src/views/roadwayManage/model.vue
@@ -27,14 +27,41 @@
+
+
+
+
+
+
+ {{i.name}}
+
+
+
+
+
+
+
+
+
+ 未选择
+
+
+ 左侧
+
+
+ 右侧
+
+
+
+
+
+
+
+
+
+ 未选择
+
+
+ 浅
+
+
+ 深
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+