From 1c3e5a5bfda8cb8c797e456d3307f439f38b51ed Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Thu, 25 May 2023 09:14:22 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=BB=98=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../photographicDevice/components/pictureTags.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/pictureTags.vue b/src/views/management/monitoringEquipment/photographicDevice/components/pictureTags.vue index 5b4ec4b..6bfb537 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/components/pictureTags.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/components/pictureTags.vue @@ -16,6 +16,7 @@ @mousedown="mousedown" @mouseup="mouseup" @mousemove="mousemove" + v-if="picsrc.indexOf('nopic') == -1" > From 2d1c8aea046865841ec7c81c054cd1123d6a0af6 Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Thu, 25 May 2023 09:32:17 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=BB=98=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../photographicDevice/components/pictureTags.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/pictureTags.vue b/src/views/management/monitoringEquipment/photographicDevice/components/pictureTags.vue index 6bfb537..5b4ec4b 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/components/pictureTags.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/components/pictureTags.vue @@ -16,7 +16,6 @@ @mousedown="mousedown" @mouseup="mouseup" @mousemove="mousemove" - v-if="picsrc.indexOf('nopic') == -1" > From ee0bb842526a21270f9c1f34e0ddeeab2baaa0e7 Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Thu, 25 May 2023 16:55:12 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8B=8D=E7=85=A7=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/api/index.js | 12 +++- .../components/setdevice.vue | 62 +++++++++++++++++-- 2 files changed, 67 insertions(+), 7 deletions(-) diff --git a/src/utils/api/index.js b/src/utils/api/index.js index 7f7f67a..08cfdc9 100644 --- a/src/utils/api/index.js +++ b/src/utils/api/index.js @@ -521,8 +521,14 @@ export function updateCoordinate(data) { url: "/api/updateCoordinate", method: "post", data, - // headers: { - // "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8", - // }, + }); +} + +//根据requestid查询时间表下发状态 +export function getCmaSchelduleUpload(data) { + return request({ + url: "/api/getCmaSchelduleUpload", + method: "post", + data, }); } diff --git a/src/views/devicePhotoSchedule/components/setdevice.vue b/src/views/devicePhotoSchedule/components/setdevice.vue index b8480f2..064e0b3 100644 --- a/src/views/devicePhotoSchedule/components/setdevice.vue +++ b/src/views/devicePhotoSchedule/components/setdevice.vue @@ -40,10 +40,19 @@ :default-expand-all="true" @check="getCheckedNodes" > - + {{ data.name }} - 装置下发中 - 装置下发失败 + 装置下发中 + 装置下发中 + 装置下发失败 {{ data.name }} @@ -66,6 +75,7 @@ import { setScheduleRulel, getScheduleRulelAccessList, getTermListByChannelJoggle, + getCmaSchelduleUpload, } from "@/utils/api/index"; export default { props: { @@ -98,6 +108,13 @@ export default { isIndeterminate: true, //全选设置默认选中 timer: null, termidArrNum: -1, + requestList: [], + + timer: null, + i: 0, + zzsuccess: false, + zzpending: false, + zzerror: false, }; }, mounted() {}, @@ -218,6 +235,13 @@ export default { }) .then((res) => { console.log(res); + this.requestList = res.data.list; + console.log("0000000000000000"); + this.requestTime(); + this.timer = window.setInterval(() => { + this.requestTime(); + this.i++; + }, 10000); // this.$message({ // showClose: true, // message: '添加成功',type: 'success' @@ -231,6 +255,36 @@ export default { }); }); }, + //根据requestid查询时间表下发状态 + requestTime() { + getCmaSchelduleUpload({ + list: this.requestList, + }) + .then((res) => { + console.log("1111111111111111111111111111111"); + console.log("1111111111111111111111111111111"); + console.log("1111111111111111111111111111111"); + console.log("1111111111111111111111111111111"); + console.log(res); + + if (res.data.list.length > 0) { + for (var j = 0; j < res.data.list.length; j++) { + if (res.data.list[j].status == 1) { + this.zzsuccess = true; + } else { + this.zzerror = true; + } + } + clearInterval(this.timer); + this.timer = null; + } else if (this.i > 9) { + this.$message.warning("暂无响应，请稍后再试！"); + clearInterval(this.timer); + this.timer = null; + } + }) + .catch((err) => {}); + }, display() { this.isShow = true; }, @@ -256,7 +310,7 @@ export default { border: 1px solid #eee; padding: 16px; border-radius: 4px; - .mr10{ + .mr10 { margin-right: 10px; } .dybox { From a772467045d60e51d7fad4d8aced8eff2e0fa009 Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Thu, 25 May 2023 17:10:49 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8B=8D=E7=85=A7=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/imageCapture.vue | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/imageCapture.vue b/src/views/management/monitoringEquipment/photographicDevice/components/imageCapture.vue index 1164e6e..92cc089 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/components/imageCapture.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/components/imageCapture.vue @@ -97,20 +97,6 @@ > - - - - - - + + + + + + + 9) { + } else if (this.i > 9) { this.$message.warning("暂无响应，请稍后再试！"); clearInterval(this.timer); this.timer = null;