From fcdde8aa33dd467b35553b9565e2772d6ef50484 Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Wed, 31 Jan 2024 15:23:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=80=9A=E9=81=93=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/carouselChart.vue | 1 - .../components/parameterArea.vue | 4 + .../components/setChannelButton.vue | 34 + .../components/setChannelDialog.vue | 616 ++++++++++++++++++ .../components/takePicButton.vue | 25 +- 5 files changed, 677 insertions(+), 3 deletions(-) create mode 100644 src/views/realTimeMonitor/components/setChannelButton.vue create mode 100644 src/views/realTimeMonitor/components/setChannelDialog.vue diff --git a/src/views/realTimeMonitor/components/carouselChart.vue b/src/views/realTimeMonitor/components/carouselChart.vue index 99d45df..929fba8 100644 --- a/src/views/realTimeMonitor/components/carouselChart.vue +++ b/src/views/realTimeMonitor/components/carouselChart.vue @@ -390,7 +390,6 @@ export default { //鼠标滚动 handleScroll(e) { let direction = e.deltaY > 0 ? "down" : "up"; //deltaY为正则滚轮向下,为负滚轮向上 - if (direction == "down") { this.$refs.scrollBox.scrollLeft += (this.$refs.scrollBox.offsetWidth / this.photoNum) * 1; diff --git a/src/views/realTimeMonitor/components/parameterArea.vue b/src/views/realTimeMonitor/components/parameterArea.vue index 4d9bb49..e09808d 100644 --- a/src/views/realTimeMonitor/components/parameterArea.vue +++ b/src/views/realTimeMonitor/components/parameterArea.vue @@ -91,6 +91,8 @@ 上传图片 + + @@ -146,6 +148,7 @@ diff --git a/src/views/realTimeMonitor/components/setChannelDialog.vue b/src/views/realTimeMonitor/components/setChannelDialog.vue new file mode 100644 index 0000000..0eda3b4 --- /dev/null +++ b/src/views/realTimeMonitor/components/setChannelDialog.vue @@ -0,0 +1,616 @@ + + + diff --git a/src/views/realTimeMonitor/components/takePicButton.vue b/src/views/realTimeMonitor/components/takePicButton.vue index 8e385b0..f801664 100644 --- a/src/views/realTimeMonitor/components/takePicButton.vue +++ b/src/views/realTimeMonitor/components/takePicButton.vue @@ -180,7 +180,11 @@ export default { // }, 2000); // return; // } - if (res.data.cmaStatus != 1 && this.statusNum >= 5) { + if ( + res.data.cmaStatus != 1 && + res.data.picStatus == false && + this.statusNum >= 5 + ) { this.clearFn(); this.$message({ duration: 1500, @@ -188,7 +192,11 @@ export default { message: "下发指令超时,请重试!", type: "warning", }); - } else if (res.data.cmaStatus == 1 || res.data.picStatus == true) { + } else if ( + res.data.cmaStatus == 1 && + res.data.picStatus == false && + this.statusNum < 5 + ) { this.clearFn(); this.$message({ duration: 1500, @@ -203,6 +211,19 @@ export default { this.newPicApi(val); this.picNum++; }, 8000); + } else if ( + res.data.cmaStatus != 1 && + res.data.picStatus == true && + this.statusNum < 5 + ) { + this.clearFn(); + this.newPicApi(val); + clearInterval(this.picPimer); + this.picPimer = null; + this.picPimer = window.setInterval(() => { + this.newPicApi(val); + this.picNum++; + }, 8000); } }) .catch((err) => {