diff --git a/src/api/http/http-api.js b/src/api/http/http-api.js index 23d7aa4..c9da053 100644 --- a/src/api/http/http-api.js +++ b/src/api/http/http-api.js @@ -252,6 +252,17 @@ export default { url: '/ScanAndCheck', name: '盘点操作里参数', method: 'GET' + }, + allStockClear: { + url: '/stock/allStockClear', + name: '清空盘点信息', + method: 'POST' + }, + getAllStreetStock:{ + + url: '/street/streetStockStatus', + name: '巷道盘点状态', + method: 'POST' } } diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue index 661b913..5468b6c 100644 --- a/src/views/checkManage/checkOperation.vue +++ b/src/views/checkManage/checkOperation.vue @@ -55,7 +55,7 @@

盘点图2

-
+
@@ -272,6 +272,7 @@ export default { this.index = index; }, submit(visible, index) { + this.visible = visible console.log(index) // this.next(index); @@ -282,7 +283,6 @@ export default { this.modelData = data }, nextOne(id){ - console.log(1111); this.$api.httpApi.nextOne({ data: { id:Number(id) @@ -298,6 +298,7 @@ export default { this.side = res.data.side this.streetId = res.data.streetId this.streetName = res.data.streetName + this.checkObj.checkPic2 = this.checkObj.checkPic + ".jpg" }else{ message.info('全部盘点已完成') diff --git a/src/views/checkManage/index.vue b/src/views/checkManage/index.vue index 6bff017..5726d32 100644 --- a/src/views/checkManage/index.vue +++ b/src/views/checkManage/index.vue @@ -70,6 +70,7 @@ > {{ i.name }} +
@@ -152,12 +153,14 @@ export default { select: "", streetId: 0, streetDetail: {}, + streetStockStatusMap:{}, }; }, computed: {}, mounted() { this.request(); + }, created() {}, activated() { @@ -173,21 +176,44 @@ export default { created() { this.initWebSocket(); + + this.timerRequestData = window.setInterval(this.requestData, 10000); //设置定时器,注意:只有在 created 生命周期中设置的定时器 才能在beforeDestroy 中销毁 this.timer = window.setInterval(() => { setTimeout(this.pollingFunc(), 0); - }, 1000); + }, 2000); + }, + beforeDestroy(){ + clearInterval(this.timerRequestData); }, destroyed() { this.websock.close(); //离开路由之后断开websocket连接 }, methods: { + //获取巷道列表 + requestData() { + this.$api.httpApi + .getAllStreetStock({}) + .then((res) => { + console.log("update data"); + console.log(res) + for (let i = 0; i < res.data.length; i++) { + this.$set(this.data, i, res.data[i]); + } + //this.select = res.data[0].id; + //this.selectName = res.data[0].name; + //this.$set(this.select,res.data.list[0].id,0) + //this.getStreetDetail(this.select); + }) + .catch((err) => {}); + }, //获取巷道列表 request() { this.$api.httpApi .getAllStreet({}) .then((res) => { console.log("update data"); + console.log(res) for (let i = 0; i < res.data.length; i++) { this.$set(this.data, i, res.data[i]); }