diff --git a/src/views/checkMonitoring/index.vue b/src/views/checkMonitoring/index.vue
index 39ba351..15c0d11 100644
--- a/src/views/checkMonitoring/index.vue
+++ b/src/views/checkMonitoring/index.vue
@@ -8,7 +8,7 @@
-
+
-
@@ -30,6 +30,17 @@
盘点结果条码:
+ -
+
+ 系统品规:
+
+
+
+ -
+
+ 盘点结果品规:
+
+
-
系统数量:
@@ -181,7 +192,7 @@ ul {
color: #494e52;
.img-box-title {
- width: 130px;
+ width: 230px;
display: inline-block;
}
diff --git a/src/views/roadwayManage/index.vue b/src/views/roadwayManage/index.vue
index c37d0d6..c62af33 100644
--- a/src/views/roadwayManage/index.vue
+++ b/src/views/roadwayManage/index.vue
@@ -27,15 +27,13 @@
{{ text === null ? '-' : text === 0 ? '单伸' : '双伸' }}
+
+ {{ text === 1 ? '已连接' : "未连接" }}
+
{{ text.plcIp }}:{{text.plcPort}}
-
- {{ text.lightSourceIp }}:{{text.lightSourcePort}}
-
-
- {{ text.RFIDIp }}:{{text.RFIDPort}}
-
+
{{text.leftSensorGunIp}}:{{text.leftSensorGunPort}} 、{{text.rightSensorGunIp}}:{{text.rightSensorGunPort}}
@@ -47,10 +45,10 @@
- {{text.camera1Name}} 、{{text.camera2Name}}
+ {{text.camera1Name}}
- {{text.camera1Name}}
- {{text.camera2Name}}
+ {{text.camera1Name}}
+
@@ -99,14 +97,13 @@ const columns = [
dataIndex: 'plcId',
},
{
- title: '光源IP',
- scopedSlots: { customRender: 'lightSourceIp' }
+ title: '客户端IP',
+ scopedSlots: { customRender: 'plcIp' }
},
{
- title: '客户端',
- scopedSlots: { customRender: 'plc' }
+ title: '客户端连接状态',
+ scopedSlots: { customRender: 'connectStatus' }
},
-
{
title: '左货架类型',
dataIndex: 'leftType',
diff --git a/src/views/roadwayManage/model.vue b/src/views/roadwayManage/model.vue
index a78e07e..a4c6e3a 100644
--- a/src/views/roadwayManage/model.vue
+++ b/src/views/roadwayManage/model.vue
@@ -38,18 +38,6 @@
/>
-
@@ -128,8 +116,8 @@
-
-
+
+
-
-
- {{item.name}}
-
-
-
-
-
-
-
-
- {{item.name}}
-
-
-
-
-
-
- {{item.name}}
-
-
-
+
+