diff --git a/dist.zip b/dist.zip
index bc18862..9a2b095 100644
Binary files a/dist.zip and b/dist.zip differ
diff --git a/public/antd_color.less b/public/antd_color.less
index ca715dd..e04b7f1 100644
--- a/public/antd_color.less
+++ b/public/antd_color.less
@@ -42,7 +42,7 @@ html {--antd-wave-shadow-color: @primary-color;}
.ant-alert-info .ant-alert-icon {color: #1890ff;}
.ant-alert-warning {background-color: #fffbe6;border: 1px solid #ffe58f;}
.ant-alert-warning .ant-alert-icon {color: #faad14;}
-.ant-alert-error {background-color: color(~`colorPalette("@{text-color}", 1)`);border: 1px solid #ffa39e;}
+.ant-alert-error {background-color: color(~`colorPalette("@{heading-color}", 1)`);border: 1px solid #ffa39e;}
.ant-alert-error .ant-alert-icon {color: #f5222d;}
.ant-alert-close-icon {background-color: transparent;border: none;}
.ant-alert-close-icon .anticon-close {color: @text-color-secondary;}
@@ -1377,7 +1377,7 @@ tr.ant-table-expanded-row:hover {background: #fbfbfb;}
.ant-tag-pink-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;}
.ant-tag-magenta {color: #eb2f96;background: #fff0f6;border-color: #ffadd2;}
.ant-tag-magenta-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;}
-.ant-tag-red {color: #f5222d;background: color(~`colorPalette("@{text-color}", 1)`);border-color: #ffa39e;}
+.ant-tag-red {color: #f5222d;background: color(~`colorPalette("@{heading-color}", 1)`);border-color: #ffa39e;}
.ant-tag-red-inverse {color: #fff;background: #f5222d;border-color: #f5222d;}
.ant-tag-volcano {color: #fa541c;background: #fff2e8;border-color: #ffbb96;}
.ant-tag-volcano-inverse {color: #fff;background: #fa541c;border-color: #fa541c;}
diff --git a/src/router/index.js b/src/router/index.js
index d319efd..fb15f7a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -34,19 +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: 'realTimeMonitoring',
name: 'realTimeMonitoring',
@@ -67,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 21521d9..284baf7 100644
--- a/src/views/checkManage/Subsection.vue
+++ b/src/views/checkManage/Subsection.vue
@@ -29,7 +29,7 @@
class="default"
:id="`${direction}-${side}-${random.row[0] + random.row[1] - rowIndex - 1}-${column}`"
@click="tocheckPage(random.row[0] + random.row[1] - rowIndex - 1,column)">
- {{column}}-{{ random.row[0] + random.row[1] - rowIndex - 1}}
+ {{ random.row[0] + random.row[1] - rowIndex - 1}}-{{column}}
diff --git a/src/views/historyCheck/index.vue b/src/views/historyCheck/index.vue
index fead928..84262ba 100644
--- a/src/views/historyCheck/index.vue
+++ b/src/views/historyCheck/index.vue
@@ -96,10 +96,10 @@
{{ text }}
- {{ text.direction }}-{{ text.row}}-{{ text.column}}
+ {{ text.direction==1?'左侧':'右侧' }}-{{ text.row +"层"}}-{{ text.column+"列"}}-{{ text.side==1?'浅':'深' }}
- {{ text.trayCode}}
+ {{statusMap[text.status] }}
@@ -150,19 +150,22 @@ export default {
imgUrl: imgUrl,
columns: [
{
- title: "盘点批次号",
- dataIndex: "lotnum",
+ title: "任务号",
+ dataIndex: "checkNum",
},
{
title: "巷道名称",
dataIndex: "streetName",
},
{
- title: "货位({1:左,2:右}-{行}-{列})",
+ title: "货位",
scopedSlots: {customRender: 'goodsLocation'},
width:200,
},
+ {
+ title: "rfid",dataIndex: 'wmsTrayCode',
+ },
{
title: "盘点状态",
scopedSlots: {customRender: 'status'},
diff --git a/src/views/historyMonitoring/index.vue b/src/views/historyMonitoring/index.vue
index 4bdef1e..588b37d 100644
--- a/src/views/historyMonitoring/index.vue
+++ b/src/views/historyMonitoring/index.vue
@@ -77,7 +77,7 @@
-
+
查看视频
@@ -156,12 +156,7 @@ export default {
scopedSlots: {customRender: 'pics'},
width:320,
},
- {
- title: "视频状态",
- // dataIndex: "status",
- scopedSlots: {customRender: 'status'},
- width: 90
- },
+
{
title: "工单时长",
dataIndex: "timeLength",