From c4f2b1f60f08b63e9a06977208597b805619f204 Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Thu, 6 Mar 2025 13:26:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/iceWeather/weather/index.vue | 16 +- .../components/parameterSetDialog.vue | 21 +- .../components/parameterArea.vue | 1 + .../photostatis/components/photoList.vue | 4 + .../photostatis/components/photoTimeList.vue | 193 ++++++++++++++++++ src/views/reportData/photostatis/index.vue | 19 +- 6 files changed, 245 insertions(+), 9 deletions(-) create mode 100644 src/views/reportData/photostatis/components/photoTimeList.vue diff --git a/src/views/iceWeather/weather/index.vue b/src/views/iceWeather/weather/index.vue index 5d22fbf..859b11c 100644 --- a/src/views/iceWeather/weather/index.vue +++ b/src/views/iceWeather/weather/index.vue @@ -154,10 +154,17 @@ {{ scope.row.lastWeathers.avgWindDir10min }} + 异常 - @@ -428,9 +435,14 @@ diff --git a/src/views/photographicDevice/components/parameterSetDialog.vue b/src/views/photographicDevice/components/parameterSetDialog.vue index b83098f..2c15a5d 100644 --- a/src/views/photographicDevice/components/parameterSetDialog.vue +++ b/src/views/photographicDevice/components/parameterSetDialog.vue @@ -2115,8 +2115,6 @@ export default { ]; this.setTermFn(params); } - - this.setTermFn(params); } else { this.$message({ duration: 1500, @@ -2162,17 +2160,27 @@ export default { }, { name: "text", - value: this.osdParams.textContent, + value: + this.osdParams.textContent == undefined + ? "" + : this.osdParams.textContent, }, { name: "leftBottom", - value: this.osdParams.leftBottom, + value: + this.osdParams.leftBottom == undefined + ? "" + : this.osdParams.leftBottom, }, { name: "rightBottom", - value: this.osdParams.rightBottom, + value: + this.osdParams.rightBottom == undefined + ? "" + : this.osdParams.rightBottom, }, ]; + console.log(params); this.setTermFn(params); } else { let params = [ @@ -2419,8 +2427,9 @@ export default { this.idParameter = JSON.parse(res.data.data); this.waterForm = JSON.parse(res.data.data); this.osdParams = JSON.parse(res.data.data); + console.log(this.osdParams); this.zjidParameter = JSON.parse(res.data.data); - if (this.osdParams.textContent == "null ") { + if (this.osdParams.textContent == "null") { console.log("我是空"); this.osdParams.textContent = ""; } diff --git a/src/views/realTimeMonitor/components/parameterArea.vue b/src/views/realTimeMonitor/components/parameterArea.vue index 3d7d52e..fde33fa 100644 --- a/src/views/realTimeMonitor/components/parameterArea.vue +++ b/src/views/realTimeMonitor/components/parameterArea.vue @@ -482,6 +482,7 @@ export default { console.log(val); // const a = this.channelListOption.find((channel) => channel.type === 1); // console.log(a); + this.yzwVal = ""; if (val != -1) { console.log(this.channelListOption[val].type); if (this.channelListOption[val].type == 1) { diff --git a/src/views/reportData/photostatis/components/photoList.vue b/src/views/reportData/photostatis/components/photoList.vue index 654fd52..b64bf56 100644 --- a/src/views/reportData/photostatis/components/photoList.vue +++ b/src/views/reportData/photostatis/components/photoList.vue @@ -16,6 +16,10 @@ 通道2 通道3 通道4 + 通道5 + 通道6 + 通道7 + 通道8
diff --git a/src/views/reportData/photostatis/components/photoTimeList.vue b/src/views/reportData/photostatis/components/photoTimeList.vue new file mode 100644 index 0000000..077d204 --- /dev/null +++ b/src/views/reportData/photostatis/components/photoTimeList.vue @@ -0,0 +1,193 @@ + + + + + diff --git a/src/views/reportData/photostatis/index.vue b/src/views/reportData/photostatis/index.vue index 0117c62..83627ad 100644 --- a/src/views/reportData/photostatis/index.vue +++ b/src/views/reportData/photostatis/index.vue @@ -242,7 +242,12 @@ :sort-method="picSort" > @@ -263,6 +268,7 @@ +