Browse Source

fix: 修复报错问题

sy-water-data-board-ui
panyuyi 4 months ago
parent
commit
3778b7f4d0
  1. 9
      src/views/reservoir/safeOperation/components/BaseInfo.vue
  2. 16
      src/views/reservoir/safeOperation/components/EngineSafe.vue
  3. 19
      src/views/reservoir/safeOperation/components/EnvirQuality.vue
  4. 9
      src/views/reservoir/safeOperation/components/MonitorWarning.vue
  5. 13
      src/views/reservoir/safeOperation/components/ProjectDetail.vue
  6. 21
      src/views/reservoir/safeOperation/components/WaterRain.vue
  7. 21
      src/views/reservoir/safeOperation/index.vue
  8. 3
      src/views/reservoir/safeOperation/js/initEcharts.js

9
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() { created() {
console.log("baseInfo-page created"); console.log("baseInfo-page created");
this.initData(); this.initData();

16
src/views/reservoir/safeOperation/components/EngineSafe.vue

@ -91,7 +91,7 @@ export default {
}, },
data() { data() {
return { return {
dateRange: null, dateRange: "0",
filterText: "", filterText: "",
currentNode: null, currentNode: null,
myChart: null, myChart: null,
@ -103,14 +103,21 @@ export default {
value: "key", value: "key",
}, },
paramsData: { paramsData: {
startTime: "", startTime: dayjs().subtract(1, "month").format("YYYY-MM-DD HH:mm:ss"),
endTime: "", endTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
}, },
}; };
}, },
created() {}, created() {},
mounted() {}, mounted() {},
watch: { watch: {
resCode: {
handler(val) {
console.log("resCode-watch >>>>> ", val);
// this.getTableData();
},
immediate: true,
},
filterText(val) { filterText(val) {
this.$refs.tree.filter(val); this.$refs.tree.filter(val);
}, },
@ -226,7 +233,7 @@ export default {
return; return;
} }
getReservoirCZEchartsData({ getReservoirCZEchartsData({
elementType: "WATER_LEVEL", elementType: this.currentNode.mpType,
stcd: this.currentNode.stcd, stcd: this.currentNode.stcd,
resCode: this.resCode, resCode: this.resCode,
startTime: this.paramsData.startTime, startTime: this.paramsData.startTime,
@ -245,6 +252,7 @@ export default {
this.getTableData(); this.getTableData();
}, },
handleClickTreeNode(data, node) { handleClickTreeNode(data, node) {
console.log("data >>>>> ", data);
if (node.isLeaf && data.value) { if (node.isLeaf && data.value) {
this.currentNode = data; this.currentNode = data;
this.getTableData(); this.getTableData();

19
src/views/reservoir/safeOperation/components/EnvirQuality.vue

@ -133,13 +133,24 @@ export default {
mounted() { mounted() {
this.initData(); this.initData();
}, },
watch: {
resCode: {
handler(val) {
console.log("resCode-watch >>>>> ", val);
this.initData();
},
immediate: true,
},
},
methods: { methods: {
initData() { initData() {
getReservoirFlagCZData(this.resCode).then((res) => { getReservoirFlagCZData(this.resCode).then((res) => {
getReservoirCZDetailData(res.data.stcd).then((res2) => { if (res.data?.stcd) {
this.czInfo = res2.data; getReservoirCZDetailData(res.data.stcd).then((res2) => {
this.getTableData(); this.czInfo = res2.data;
}); this.getTableData();
});
}
}); });
}, },
getTableData() { getTableData() {

9
src/views/reservoir/safeOperation/components/MonitorWarning.vue

@ -119,6 +119,15 @@ export default {
tableData: [], tableData: [],
}; };
}, },
watch: {
resCode: {
handler(val) {
console.log("resCode-watch >>>>> ", val);
this.getTableData();
},
immediate: true,
},
},
created() { created() {
this.getTableData(); this.getTableData();
}, },

13
src/views/reservoir/safeOperation/components/ProjectDetail.vue

@ -51,7 +51,18 @@ export default {
activeTab: "1", activeTab: "1",
}; };
}, },
created() {}, // watch: {
// resCode: {
// handler(val) {
// console.log("resCode-watch >>>>> ", val);
// this.initData();
// },
// immediate: true,
// },
// },
created() {
console.warn("created ???????? ");
},
methods: { methods: {
handleGetResInfo(data) { handleGetResInfo(data) {
this.$emit("getResInfo", data); this.$emit("getResInfo", data);

21
src/views/reservoir/safeOperation/components/WaterRain.vue

@ -127,6 +127,15 @@ export default {
detailData: null, detailData: null,
}; };
}, },
watch: {
resCode: {
handler(val) {
console.log("resCode-watch >>>>> ", val);
this.initData();
},
immediate: true,
},
},
created() {}, created() {},
mounted() { mounted() {
this.initData(); this.initData();
@ -134,11 +143,13 @@ export default {
methods: { methods: {
initData() { initData() {
getReservoirFlagCZData(this.resCode).then((res) => { getReservoirFlagCZData(this.resCode).then((res) => {
getReservoirCZDetailData(res.data.stcd).then((res2) => { if (res.data?.stcd) {
console.log("res2 >>>>> ", res2); getReservoirCZDetailData(res.data.stcd).then((res2) => {
this.czInfo = res2.data; console.log("res2 >>>>> ", res2);
this.getTableData(); this.czInfo = res2.data;
}); this.getTableData();
});
}
}); });
}, },
getTableData() { getTableData() {

21
src/views/reservoir/safeOperation/index.vue

@ -71,11 +71,9 @@
<!-- 弹窗 --> <!-- 弹窗 -->
<el-dialog <el-dialog
:title=" :title="`${(resInfoData && resInfoData.resName) || '未知'}(${
`${resInfoData && resInfoData.resName}(${ (resInfoData && resInfoData.resCode) || '??'
resInfoData && resInfoData.resCode })`"
})` || '弹窗'
"
:visible.sync="showDialog" :visible.sync="showDialog"
:destroy-on-close="true" :destroy-on-close="true"
width="1080px" width="1080px"
@ -268,16 +266,13 @@ export default {
}, },
openDialog(e) { openDialog(e) {
console.log("openDialog >>>>> ", e); console.log("打开弹窗获取resCode >>>>> ", e);
let code = e; let code = e;
devRun(() => { // devRun(() => {
code = "440111000034"; // code = "440111000008";
}); // });
this.commonResCode = code; this.commonResCode = code.toString();
this.showDialog = true; this.showDialog = true;
this.$nextTick(() => {
// this.$refs.detailRef.initData(code);
});
}, },
// //
handleClickTree(data, node) { handleClickTree(data, node) {

3
src/views/reservoir/safeOperation/js/initEcharts.js

@ -1,6 +1,7 @@
// 折线图 // 折线图
export const initLineOptions = (data) => { export const initLineOptions = (data) => {
const { markLine, xaxis, yaxis } = data const { markLine, xaxis, yaxis } = data
if(!xaxis || !yaxis || !yaxis.length) return {}
let yAxis = yaxis.map(v => { let yAxis = yaxis.map(v => {
return { return {
type: 'value', type: 'value',
@ -25,9 +26,7 @@ export const initLineOptions = (data) => {
}) })
if(markLine && markLine.length && series.length){ 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] let seriesItem = series.find(v => v.yAxisIndex === 1) || series[0]
console.log('seriesItem >>>>> ', seriesItem)
let colors = ['#f8afaf', '#bae4dd'] let colors = ['#f8afaf', '#bae4dd']
let markLineData = markLine.map((v,i) => { let markLineData = markLine.map((v,i) => {
return { return {

Loading…
Cancel
Save