diff --git a/dist.zip b/dist.zip deleted file mode 100644 index 2b36948..0000000 Binary files a/dist.zip and /dev/null differ diff --git a/public/antd_color.less b/public/antd_color.less index b746b9c..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: #fff1f0;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: #fff1f0;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/views/cameraManage/model.vue b/src/views/cameraManage/model.vue index 1085ff5..0da62a5 100644 --- a/src/views/cameraManage/model.vue +++ b/src/views/cameraManage/model.vue @@ -351,9 +351,10 @@ export default { autoPlay(id){ let video = document.getElementById('camera'+id); - this.player = new WebRtcPlayer(video,'camera'+id); + let player = new WebRtcPlayer(video,'camera'+id); - this.player.load('camera'+id); + player.load('camera'+id); + this.player = player }, setVideoServer(){ diff --git a/src/views/checkManage/Subsection.vue b/src/views/checkManage/Subsection.vue index e99b1ea..5029cff 100644 --- a/src/views/checkManage/Subsection.vue +++ b/src/views/checkManage/Subsection.vue @@ -140,14 +140,14 @@ export default { }, watchShelveIdInfo(){ return this.shelveId; - } - - + }, }, watch: { watchShelveIdInfo() { this.getStatus(); - } + }, + + immediate: true }, data() { return { @@ -163,27 +163,29 @@ export default { //this.changeTab('1-1') this.$nextTick(() => { this.getStatus(); + }) }, created() { - //this.getStatus(); - //this.changeTab('1-1') + + + }, destroyed() { }, methods: { changeTab(value){ - console.log(value) + //console.log(value) this.select.row = value - console.log("latticeRow"+this.latticeRow+"select"+this.select.row+","+this.select.column+"random"+this.random.row+","+this.random.column) + //console.log("latticeRow"+this.latticeRow+"select"+this.select.row+","+this.select.column+"random"+this.random.row+","+this.random.column) this.getStatus() }, changeTabLeft(value){ - console.log(value) + //console.log(value) this.select.column = value this.getStatus() - console.log("latticeRow"+this.latticeRow+"select"+this.select.row+","+this.select.column+"random"+this.random.row+","+this.random.column) + //console.log("latticeRow"+this.latticeRow+"select"+this.select.row+","+this.select.column+"random"+this.random.row+","+this.random.column) }, // 获取行或列的范围字符串 @@ -263,6 +265,7 @@ export default { } console.log(this.status) + } }).catch(err => { @@ -334,11 +337,11 @@ export default { } .roadway-box { - transform: rotateX(180deg); + //transform: rotateX(180deg); padding: 10px 10px 0 0; .line { display: flex; - transform: rotateX(180deg); //两次垂直镜像翻转让原本由上到下排列的div 更改为由下到上 + //transform: rotateX(180deg); //两次垂直镜像翻转让原本由上到下排列的div 更改为由下到上 .el { width: 46px; diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue index 873849e..925b6e5 100644 --- a/src/views/checkManage/checkOperation.vue +++ b/src/views/checkManage/checkOperation.vue @@ -39,116 +39,93 @@
-
- -
-
-
    -
  • - - 核对状态: - - - {{ statusMap[checkObj.status] }} - -
    • -
  • - - - {{ item.label }}: - - - {{ checkObj[item.key] }} - -
    • -
  • - - 盘点图: - - -
    • - -
- -
-
- -
- 暂无图片 -
-

操作前照片

-
-
- -
- 暂无图片 -
-

操作后照片

-
- - -
+
+ +
+
+
    +
  • + + 核对状态: + + + {{ statusMap[checkObj.status] }} + +
    • +
  • + + + {{ item.label }}: + + + {{ checkObj[item.key] }} + +
    • +
  • + + 盘点图: + -
-
-
- - 核对正确 - -
-
- 核对错误 - - 核对正确 - -
-
-
- ＜上一个 -

{{checkObj.row}}行{{checkObj.column}}列

- 下一个＞ - -
+ + + + +
+
+ +
+ 暂无图片 +
+

操作前照片

+
+
+ +
+ 暂无图片 +
+

操作后照片

+
+
+
+
+ 核对 + +
+
+ ＜上一个 +

{{checkObj.row}}行{{checkObj.column}}列

+ 下一个＞ + +
@@ -555,8 +532,8 @@ export default { justify-content: flex-start; .btn { - padding: 25px; - font-size: 17px; + padding: 50px; + font-size: 20px; display: flex; align-items: center; justify-content: center; diff --git a/src/views/checkManage/index.vue b/src/views/checkManage/index.vue index 5b844ad..1867231 100644 --- a/src/views/checkManage/index.vue +++ b/src/views/checkManage/index.vue @@ -48,25 +48,7 @@
- - +
@@ -91,25 +73,7 @@
- - +
@@ -132,48 +96,13 @@ export default { right: {} }, timer: null, - shelveId: '', + leftShelveId:{}, rightShelveId:{} } }, computed: { - // 获取左侧货架号 - // leftShelveId() { - // let shelveId; - // let shelveType = 'none'; - // if(this.streetDetail.leftShelveId) { - // shelveId = this.streetDetail.leftShelveId; - // }else if(this.streetDetail.leftInsideShelveId && this.size =='leftInsideShelveId'){ - // shelveId = this.streetDetail.leftInsideShelveId; - // shelveType = 'inside'; - // }else if(this.streetDetail.leftOutsideShelveId && this.size== 'leftOutsideShelveId'){ - // shelveId = this.streetDetail.leftOutsideShelveId; - // shelveType = 'out'; - // }; - // return { - // shelveId, - // shelveType - // }; - // }, - // 获取右侧货架号 - // rightShelveId() { - // let shelveId; - // let shelveType = 'none'; - // if(this.streetDetail.rightShelveId) { - // shelveId = this.streetDetail.rightShelveId; - // }else if(this.streetDetail.rightInsideShelveId && this.size2 =='rightInsideShelveId'){ - // shelveId = this.streetDetail.rightInsideShelveId; - // shelveType = 'inside'; - // }else if(this.streetDetail.rightOutsideShelveId && this.size2 == 'rightOutsideShelveId'){ - // shelveId = this.streetDetail.rightOutsideShelveId; - // shelveType = 'out'; - // }; - // return { - // shelveId, - // shelveType - // }; - // } + }, mounted() { this.request(); @@ -197,6 +126,7 @@ export default { this.data = res.data.list; this.select = res.data.list[0].id this.getStreetDetail(res.data.list[0].id); + }).catch(err => { }); @@ -252,8 +182,7 @@ export default { data: {} }).then(res => { this.streetDetail = res.data - this.leftShelveChange(); - this.rightShelveChange(); + this.getStockRowColumn() }).catch(err => { }) diff --git a/src/views/plcStatus.vue b/src/views/plcStatus.vue index 5282fa0..4298650 100644 --- a/src/views/plcStatus.vue +++ b/src/views/plcStatus.vue @@ -111,7 +111,7 @@ export default { }).then(res => { if (res.code == 200) { this.$message.success('连接成功'); - this.handleGetStreetList() + this.request() } else { this.$message.error('连接失败'); }