From 10cd00ab87fb080d830ef617b51162a0f52cccb9 Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Wed, 8 May 2024 17:21:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9=E5=87=BB=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/css/element.less | 3 ++ .../components/parameterArea.vue | 6 +++- .../components/setChannelDialog.vue | 33 ++++++++++++++----- .../realTimeMonitor/components/siderBar.vue | 1 + .../components/takePicButton.vue | 6 ++++ src/views/realTimeMonitor/index.vue | 2 +- 6 files changed, 41 insertions(+), 10 deletions(-) diff --git a/src/assets/css/element.less b/src/assets/css/element.less index 76b195f..05a7006 100644 --- a/src/assets/css/element.less +++ b/src/assets/css/element.less @@ -78,3 +78,6 @@ .el-image-viewer__actions { background: rgba(0, 0, 0, 0.15); } +.el-form-item__label{ + padding: 0 6px 0 0; +} \ No newline at end of file diff --git a/src/views/realTimeMonitor/components/parameterArea.vue b/src/views/realTimeMonitor/components/parameterArea.vue index c56ad4c..88e3a64 100644 --- a/src/views/realTimeMonitor/components/parameterArea.vue +++ b/src/views/realTimeMonitor/components/parameterArea.vue @@ -68,7 +68,7 @@

操作项

- + @@ -292,6 +292,10 @@ export default { this.getDateTime(); }, methods: { + takepicFun(){ + console.log("点击了我自己，准备取消轮巡") + this.$refs.takepicRef.clearFn(); + }, //控制显示与隐藏 showButton(key) { if (this.roleUser !== "0") { diff --git a/src/views/realTimeMonitor/components/setChannelDialog.vue b/src/views/realTimeMonitor/components/setChannelDialog.vue index 98717b7..26006ce 100644 --- a/src/views/realTimeMonitor/components/setChannelDialog.vue +++ b/src/views/realTimeMonitor/components/setChannelDialog.vue @@ -203,10 +203,17 @@ 确 定 保存并关闭 +
@@ -532,7 +539,8 @@ export default { } this.searchBtn(); }, - handleConfim() { + + handleConfim(flag) { console.log("点击了确定"); console.log(this.channelForm); @@ -727,7 +735,7 @@ export default { { name: "type21", value: 0 }, ]; console.log(params); - this.setTermFn(params); + this.setTermFn(params,flag); } else { this.$message({ duration: 1500, @@ -738,7 +746,7 @@ export default { } }); }, - setTermFn(val) { + setTermFn(val,flag) { setTermCamera({ termId: this.areaData.id, list: val, @@ -747,16 +755,17 @@ export default { console.log(res); this.requestid = res.data.requestId; - this.getTakechannelStatus(); + this.getTakechannelStatus(flag); clearInterval(this.setTimer); this.setTimer = window.setInterval(() => { - this.getTakechannelStatus(); + this.getTakechannelStatus(flag); this.setNum++; }, 1000); }) .catch((err) => {}); }, - getTakechannelStatus() { + getTakechannelStatus(flag) { + console.log("aaaaaaaaaaaaaaaaaaaaaa",flag) getTermCameraRequest({ requestid: this.requestid }) .then((res) => { console.log(res); @@ -764,6 +773,10 @@ export default { window.clearInterval(this.setTimer); this.setTimer = null; this.setNum = 0; + + if(flag){ + this.isShow = false; + } //this.isShow = false; this.channelLoading = false; this.$message({ @@ -774,6 +787,9 @@ export default { }); } else if (this.setNum > 3) { // this.isShow = false; + if(flag){ + this.isShow = false; + } window.clearInterval(this.setTimer); this.setTimer = null; this.setNum = 0; @@ -1050,6 +1066,7 @@ export default { .el-slider { width: 200px; margin-right: 12px; + margin-left: 10px; .el-slider__runway { height: 8px; margin: 12px 0; diff --git a/src/views/realTimeMonitor/components/siderBar.vue b/src/views/realTimeMonitor/components/siderBar.vue index 55785be..01e7f51 100644 --- a/src/views/realTimeMonitor/components/siderBar.vue +++ b/src/views/realTimeMonitor/components/siderBar.vue @@ -329,6 +329,7 @@ export default { this.$store.commit("protocol", this.currentData.protocol); //将currentData保存在vuex中 this.$store.commit("cmdId", this.currentData.cmdid); //将currentData保存在vuex中 this.$parent.getCurrentData(); + //this.$refs.tree.scrollTo(data); // localStorage.setItem("currentData", JSON.stringify(this.currentData)); }, diff --git a/src/views/realTimeMonitor/components/takePicButton.vue b/src/views/realTimeMonitor/components/takePicButton.vue index f801664..7626949 100644 --- a/src/views/realTimeMonitor/components/takePicButton.vue +++ b/src/views/realTimeMonitor/components/takePicButton.vue @@ -246,6 +246,7 @@ export default { new Date(val.date).getTime(), this.termId ); //获取图片列表是传当前设备的 id 和termid + this.$message({ duration: 1500, showClose: true, @@ -264,10 +265,15 @@ export default { }); }, clearFn() { + console.log("我要取消了轮巡") clearInterval(this.statusTimer); this.statusTimer = null; this.statusNum = 0; this.picLoading = false; + console.log("我要取消了轮巡1111111111111111111111111111111") + clearInterval(this.picPimer); + this.picPimer = null; + this.picNum = 0; }, }, destroyed() { diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue index 5f9293a..40cd429 100644 --- a/src/views/realTimeMonitor/index.vue +++ b/src/views/realTimeMonitor/index.vue @@ -120,13 +120,13 @@ export default { console.log("杆塔"); this.LineFlag = false; this.towerFlag = true; - this.terminalPhoto = []; this.protocolInfo = this.treeSelectData.protocol; console.log("asddddddddddddddddddddd", this.treeSelectData); this.towertitle = this.treeSelectData.name; this.$nextTick(() => { this.$refs.areaRef.getChannelList(); + this.$refs.areaRef.takepicFun(); }); } },