From 3778b7f4d0d3e94b21f5917546c5406defb87077 Mon Sep 17 00:00:00 2001 From: panyuyi Date: Tue, 31 Dec 2024 16:20:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../safeOperation/components/BaseInfo.vue | 9 ++++++++ .../safeOperation/components/EngineSafe.vue | 16 ++++++++++---- .../safeOperation/components/EnvirQuality.vue | 19 +++++++++++++---- .../components/MonitorWarning.vue | 9 ++++++++ .../components/ProjectDetail.vue | 13 +++++++++++- .../safeOperation/components/WaterRain.vue | 21 ++++++++++++++----- src/views/reservoir/safeOperation/index.vue | 21 +++++++------------ .../reservoir/safeOperation/js/initEcharts.js | 3 +-- 8 files changed, 82 insertions(+), 29 deletions(-) diff --git a/src/views/reservoir/safeOperation/components/BaseInfo.vue b/src/views/reservoir/safeOperation/components/BaseInfo.vue index 3b50195..58fc0d9 100644 --- a/src/views/reservoir/safeOperation/components/BaseInfo.vue +++ b/src/views/reservoir/safeOperation/components/BaseInfo.vue @@ -585,6 +585,15 @@ export default { ], }; }, + watch: { + resCode: { + handler(val) { + console.log("resCode-watch >>>>> ", val); + this.initData(); + }, + immediate: true, + }, + }, created() { console.log("baseInfo-page created"); this.initData(); diff --git a/src/views/reservoir/safeOperation/components/EngineSafe.vue b/src/views/reservoir/safeOperation/components/EngineSafe.vue index 2ff459b..e92ca91 100644 --- a/src/views/reservoir/safeOperation/components/EngineSafe.vue +++ b/src/views/reservoir/safeOperation/components/EngineSafe.vue @@ -91,7 +91,7 @@ export default { }, data() { return { - dateRange: null, + dateRange: "0", filterText: "", currentNode: null, myChart: null, @@ -103,14 +103,21 @@ export default { value: "key", }, paramsData: { - startTime: "", - endTime: "", + startTime: dayjs().subtract(1, "month").format("YYYY-MM-DD HH:mm:ss"), + endTime: dayjs().format("YYYY-MM-DD HH:mm:ss"), }, }; }, created() {}, mounted() {}, watch: { + resCode: { + handler(val) { + console.log("resCode-watch >>>>> ", val); + // this.getTableData(); + }, + immediate: true, + }, filterText(val) { this.$refs.tree.filter(val); }, @@ -226,7 +233,7 @@ export default { return; } getReservoirCZEchartsData({ - elementType: "WATER_LEVEL", + elementType: this.currentNode.mpType, stcd: this.currentNode.stcd, resCode: this.resCode, startTime: this.paramsData.startTime, @@ -245,6 +252,7 @@ export default { this.getTableData(); }, handleClickTreeNode(data, node) { + console.log("data >>>>> ", data); if (node.isLeaf && data.value) { this.currentNode = data; this.getTableData(); diff --git a/src/views/reservoir/safeOperation/components/EnvirQuality.vue b/src/views/reservoir/safeOperation/components/EnvirQuality.vue index 1d5197e..a2a4d9a 100644 --- a/src/views/reservoir/safeOperation/components/EnvirQuality.vue +++ b/src/views/reservoir/safeOperation/components/EnvirQuality.vue @@ -133,13 +133,24 @@ export default { mounted() { this.initData(); }, + watch: { + resCode: { + handler(val) { + console.log("resCode-watch >>>>> ", val); + this.initData(); + }, + immediate: true, + }, + }, methods: { initData() { getReservoirFlagCZData(this.resCode).then((res) => { - getReservoirCZDetailData(res.data.stcd).then((res2) => { - this.czInfo = res2.data; - this.getTableData(); - }); + if (res.data?.stcd) { + getReservoirCZDetailData(res.data.stcd).then((res2) => { + this.czInfo = res2.data; + this.getTableData(); + }); + } }); }, getTableData() { diff --git a/src/views/reservoir/safeOperation/components/MonitorWarning.vue b/src/views/reservoir/safeOperation/components/MonitorWarning.vue index 14d0e27..27aef25 100644 --- a/src/views/reservoir/safeOperation/components/MonitorWarning.vue +++ b/src/views/reservoir/safeOperation/components/MonitorWarning.vue @@ -119,6 +119,15 @@ export default { tableData: [], }; }, + watch: { + resCode: { + handler(val) { + console.log("resCode-watch >>>>> ", val); + this.getTableData(); + }, + immediate: true, + }, + }, created() { this.getTableData(); }, diff --git a/src/views/reservoir/safeOperation/components/ProjectDetail.vue b/src/views/reservoir/safeOperation/components/ProjectDetail.vue index 0311a7d..7e3c05e 100644 --- a/src/views/reservoir/safeOperation/components/ProjectDetail.vue +++ b/src/views/reservoir/safeOperation/components/ProjectDetail.vue @@ -51,7 +51,18 @@ export default { activeTab: "1", }; }, - created() {}, + // watch: { + // resCode: { + // handler(val) { + // console.log("resCode-watch >>>>> ", val); + // this.initData(); + // }, + // immediate: true, + // }, + // }, + created() { + console.warn("created ???????? "); + }, methods: { handleGetResInfo(data) { this.$emit("getResInfo", data); diff --git a/src/views/reservoir/safeOperation/components/WaterRain.vue b/src/views/reservoir/safeOperation/components/WaterRain.vue index 9f29f47..54e9c2e 100644 --- a/src/views/reservoir/safeOperation/components/WaterRain.vue +++ b/src/views/reservoir/safeOperation/components/WaterRain.vue @@ -127,6 +127,15 @@ export default { detailData: null, }; }, + watch: { + resCode: { + handler(val) { + console.log("resCode-watch >>>>> ", val); + this.initData(); + }, + immediate: true, + }, + }, created() {}, mounted() { this.initData(); @@ -134,11 +143,13 @@ export default { methods: { initData() { getReservoirFlagCZData(this.resCode).then((res) => { - getReservoirCZDetailData(res.data.stcd).then((res2) => { - console.log("res2 >>>>> ", res2); - this.czInfo = res2.data; - this.getTableData(); - }); + if (res.data?.stcd) { + getReservoirCZDetailData(res.data.stcd).then((res2) => { + console.log("res2 >>>>> ", res2); + this.czInfo = res2.data; + this.getTableData(); + }); + } }); }, getTableData() { diff --git a/src/views/reservoir/safeOperation/index.vue b/src/views/reservoir/safeOperation/index.vue index 8b62ccf..0e23691 100644 --- a/src/views/reservoir/safeOperation/index.vue +++ b/src/views/reservoir/safeOperation/index.vue @@ -71,11 +71,9 @@ >>>> ", e); + console.log("打开弹窗获取resCode >>>>> ", e); let code = e; - devRun(() => { - code = "440111000034"; - }); - this.commonResCode = code; + // devRun(() => { + // code = "440111000008"; + // }); + this.commonResCode = code.toString(); this.showDialog = true; - this.$nextTick(() => { - // this.$refs.detailRef.initData(code); - }); }, // 点击 handleClickTree(data, node) { diff --git a/src/views/reservoir/safeOperation/js/initEcharts.js b/src/views/reservoir/safeOperation/js/initEcharts.js index ddc250a..10c91e5 100644 --- a/src/views/reservoir/safeOperation/js/initEcharts.js +++ b/src/views/reservoir/safeOperation/js/initEcharts.js @@ -1,6 +1,7 @@ // 折线图 export const initLineOptions = (data) => { const { markLine, xaxis, yaxis } = data + if(!xaxis || !yaxis || !yaxis.length) return {} let yAxis = yaxis.map(v => { return { type: 'value', @@ -25,9 +26,7 @@ export const initLineOptions = (data) => { }) if(markLine && markLine.length && series.length){ - console.log('series >>>>> ', series.find(v => v.yAxisIndex === 1)) let seriesItem = series.find(v => v.yAxisIndex === 1) || series[0] - console.log('seriesItem >>>>> ', seriesItem) let colors = ['#f8afaf', '#bae4dd'] let markLineData = markLine.map((v,i) => { return {