From f6bb715188852880202994964caf3f4598d99a70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?= Date: Wed, 19 Apr 2023 16:33:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1.=E4=B8=8B=E4=B8=80=E4=B8=AA=E7=9B=98?= =?UTF-8?q?=E7=82=B9=202.=E5=85=A8=E9=83=A8=E7=9B=98=E7=82=B9=203.?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E5=B7=B7=E9=81=93=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=204.=E5=A2=9E=E5=8A=A0=E9=9C=80=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/http/http-api.js | 10 + src/plugins/antd.js | 2 + src/views/alarmVideos/alarmLog.vue | 8 +- src/views/checkManage/Subsection.vue | 31 +- src/views/checkManage/checkOperation.vue | 40 ++- src/views/checkManage/index.vue | 389 +++++++++++++++-------- src/views/historyMonitoring/index.vue | 50 ++- 7 files changed, 372 insertions(+), 158 deletions(-) diff --git a/src/api/http/http-api.js b/src/api/http/http-api.js index 4043d9e..23d7aa4 100644 --- a/src/api/http/http-api.js +++ b/src/api/http/http-api.js @@ -198,6 +198,16 @@ export default { name: '导出单个巷道', method: 'GET' }, + nextOne: { + url: '/stock/nextOne', + name: '下一个盘点', + method: 'POST' + }, + allStockCheck: { + url: '/stock/allStockCheck', + name: '全部盘点', + method: 'POST' + }, exportAllStock: { url: '/stock/exportAll', name: '导出所有巷道', diff --git a/src/plugins/antd.js b/src/plugins/antd.js index 892ed8d..94b8f30 100644 --- a/src/plugins/antd.js +++ b/src/plugins/antd.js @@ -15,6 +15,7 @@ import { Breadcrumb, Icon, Tree, + Timeline, message, result, Modal, @@ -50,6 +51,7 @@ Vue.use(Button); Vue.use(Breadcrumb); Vue.use(Icon); Vue.use(Tree); +Vue.use(Timeline); try { Vue.use(result); }catch (e){ diff --git a/src/views/alarmVideos/alarmLog.vue b/src/views/alarmVideos/alarmLog.vue index b88205a..3efc473 100644 --- a/src/views/alarmVideos/alarmLog.vue +++ b/src/views/alarmVideos/alarmLog.vue @@ -3,8 +3,11 @@
- - + + + + + 巷道： 全部 @@ -12,6 +15,7 @@ {{item.name}} + diff --git a/src/views/checkManage/Subsection.vue b/src/views/checkManage/Subsection.vue index 3816502..3d29400 100644 --- a/src/views/checkManage/Subsection.vue +++ b/src/views/checkManage/Subsection.vue @@ -10,8 +10,9 @@ > {{ getRandom(latticeRow + 1 -index, latticeRow, nums.row, total.row) }} - - + + + @@ -30,7 +31,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)"> - {{ random.row[0] + random.row[1] - rowIndex - 1}}-{{column}} + {{column}}-{{ random.row[0] + random.row[1] - rowIndex - 1}}
@@ -48,8 +49,10 @@ {{ getRandom(index, latticeColumn, nums.column, total.column) }} - - + + + + @@ -86,7 +89,7 @@ export default { default: () => { return { row: 10, - column: 15 + column: 30 } } }, @@ -217,10 +220,18 @@ export default { getStatusBg(row,column,status) { var dom = document.getElementById(this.direction+"-"+this.side+"-"+row+'-'+column); - var color = status == 1 ?'#d81e06': (status == 2|| status == 3) ? '#1afa29': '#bfbfbf'; + var color; + if(status == -1){ + color = '#f2ed48' + }else if(status == 2|| status == 3){ + color = '#1afa29' + }else if(status == 1){ + color = '#d81e06' + }else{ + color = '#bfbfbf' + } dom.style.background = color }, - getStatus(){ var columnTab = [] @@ -246,10 +257,12 @@ export default { columnTabs: columnTab } }).then(res => { + console.log(this.status.column) + console.log(this.status.row) if(res.code == 200){ if(res.data.stocks){ for(let a of res.data.stocks){ - this.getStatusBg(a.row,a.column,a.status) + this.getStatusBg(a.row,a.column,a.viewStatus) } } diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue index c31dd21..308323f 100644 --- a/src/views/checkManage/checkOperation.vue +++ b/src/views/checkManage/checkOperation.vue @@ -7,8 +7,11 @@
@@ -107,6 +116,7 @@ diff --git a/src/views/historyMonitoring/index.vue b/src/views/historyMonitoring/index.vue index 4ac3354..4bdef1e 100644 --- a/src/views/historyMonitoring/index.vue +++ b/src/views/historyMonitoring/index.vue @@ -3,7 +3,20 @@
- + + + + + 全部 + + + {{i.name}} + + + + + + @@ -23,7 +36,7 @@ - + 搜索 重置 @@ -95,12 +108,15 @@ export default { data() { return { queryParam: { - orderNum: '' + orderNum: '', + streetId: '' }, + listData:[], time:[], pageNum: 1, pageSize: 10, data: [], + select: '', pagination:{ total: 0, defaultPageSize: 10, // 默认每页显示数量 @@ -163,6 +179,8 @@ export default { } }, mounted() { + + this.getStreetList(); this.handleGetHistoryList() console.log(this.imgUrl) if (this.$route.params.orderNum) { @@ -172,6 +190,30 @@ export default { }, methods: { moment, + + handleChange(value) { + console.log(value); + if(value === 0){ + this.select = "全部"; + this.queryParam.streetId = value + } else { + for (let item of this.listData) { + if (item.id == value){ + this.select = item.name + this.queryParam.streetId = value + } + } + } + }, + //获取巷道列表 + getStreetList() { + this.$api.httpApi.getAllStreet({ + }).then(res => { + this.listData = res.data; + }).catch(err => { + console.error(err); + }); + }, range(start, end) { const result = []; for (let i = start; i < end; i++) { @@ -244,6 +286,8 @@ export default { this.queryParam.startTimestamp = "" this.queryParam.endTimestamp = "" this.queryParam.orderNum = "" + this.queryParam.streetId = "" + this.select = "" this.time = [] this.pageNum = 1 this.pageSize = 10 From 92e34d1d8c114ac20b17c3479effa996b72e766b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?= Date: Fri, 26 May 2023 16:46:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1.=E6=94=B9=E5=8F=98=E5=B7=A6=E5=8F=B3?= =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E9=99=A4=E6=B7=B1=E6=B5=85=202.=E6=B8=85?= =?UTF-8?q?=E7=A9=BA=E7=9B=98=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/checkManage/checkOperation.vue | 2 +- src/views/checkManage/index.vue | 20 ++++++++++++++++++++ src/views/historyCheck/index.vue | 9 +++++---- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue index 308323f..661b913 100644 --- a/src/views/checkManage/checkOperation.vue +++ b/src/views/checkManage/checkOperation.vue @@ -11,7 +11,7 @@ 位置: - {{checkObj.streetName}}-{{checkObj.direction == 1?"左":"右"}}-{{checkObj.side == 1?"浅":"深"}}-{{checkObj.row}}层-{{checkObj.column}}列 + {{checkObj.streetName}}-{{checkObj.direction }}-{{checkObj.column}}列-{{checkObj.row}}层
  • diff --git a/src/views/checkManage/index.vue b/src/views/checkManage/index.vue index e0070b5..6bff017 100644 --- a/src/views/checkManage/index.vue +++ b/src/views/checkManage/index.vue @@ -1,6 +1,17 @@