diff --git a/src/views/publicService/special.vue b/src/views/publicService/special.vue index 5bffc24..e7a4f05 100644 --- a/src/views/publicService/special.vue +++ b/src/views/publicService/special.vue @@ -35,7 +35,7 @@ - + diff --git a/src/views/publicService/special.vue b/src/views/publicService/special.vue index 5bffc24..e7a4f05 100644 --- a/src/views/publicService/special.vue +++ b/src/views/publicService/special.vue @@ -35,7 +35,7 @@ - + diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue index 3a959f5..5526303 100644 --- a/src/views/sponeScreen/gisMF/cesiumPopup.vue +++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue @@ -317,6 +317,7 @@ datas.propertyMonitorList.map(item => { dataOption.value.push({ value: item.stCode + item.monitorPropertyName, + monitorPropertyName: item.monitorPropertyName, label: item.monitorPropertyName, propertyUnit: item.propertyUnit, ylist: item.ylist, @@ -328,11 +329,11 @@ propertyMonitorXList.value.push(i.substr(0, 16)); }); } - selectCode.value = dataOption.value[0].value; - seleceName.value = dataOption.value[0].label; + selectCode.value = nameToData(dataOption.value, '5分钟时段降水量').value; + seleceName.value = nameToData(dataOption.value, '5分钟时段降水量').label; // propertyMonitorXList.value = datas.propertyMonitorXList; - unitName.value = datas.propertyMonitorList[0].propertyUnit; - selectData.value = datas.propertyMonitorList[0].ylist; + unitName.value = nameToData(dataOption.value, '5分钟时段降水量').propertyUnit; + selectData.value = nameToData(dataOption.value, '5分钟时段降水量').ylist; initEchartsPopup(); } }; @@ -349,6 +350,13 @@ bus.emit('checkWSCGYT', allData.dataList); } +// 公共方法，根据监测名称来匹配对应的数值 +function nameToData(data, name) { + let arr = data.filter(item => item.monitorPropertyName == name); + let lists = arr[0] ? arr[0] : []; + return lists; +} + onMounted(() => { bus.on('closeCesiumPopup', () => { allData.popupShow = false; diff --git a/src/views/publicService/special.vue b/src/views/publicService/special.vue index 5bffc24..e7a4f05 100644 --- a/src/views/publicService/special.vue +++ b/src/views/publicService/special.vue @@ -35,7 +35,7 @@ - + diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue index 3a959f5..5526303 100644 --- a/src/views/sponeScreen/gisMF/cesiumPopup.vue +++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue @@ -317,6 +317,7 @@ datas.propertyMonitorList.map(item => { dataOption.value.push({ value: item.stCode + item.monitorPropertyName, + monitorPropertyName: item.monitorPropertyName, label: item.monitorPropertyName, propertyUnit: item.propertyUnit, ylist: item.ylist, @@ -328,11 +329,11 @@ propertyMonitorXList.value.push(i.substr(0, 16)); }); } - selectCode.value = dataOption.value[0].value; - seleceName.value = dataOption.value[0].label; + selectCode.value = nameToData(dataOption.value, '5分钟时段降水量').value; + seleceName.value = nameToData(dataOption.value, '5分钟时段降水量').label; // propertyMonitorXList.value = datas.propertyMonitorXList; - unitName.value = datas.propertyMonitorList[0].propertyUnit; - selectData.value = datas.propertyMonitorList[0].ylist; + unitName.value = nameToData(dataOption.value, '5分钟时段降水量').propertyUnit; + selectData.value = nameToData(dataOption.value, '5分钟时段降水量').ylist; initEchartsPopup(); } }; @@ -349,6 +350,13 @@ bus.emit('checkWSCGYT', allData.dataList); } +// 公共方法，根据监测名称来匹配对应的数值 +function nameToData(data, name) { + let arr = data.filter(item => item.monitorPropertyName == name); + let lists = arr[0] ? arr[0] : []; + return lists; +} + onMounted(() => { bus.on('closeCesiumPopup', () => { allData.popupShow = false; diff --git a/src/views/spongePerformance/ManagingPerformance/completionstatus/index.vue b/src/views/spongePerformance/ManagingPerformance/completionstatus/index.vue index 1ecf418..1cca9e9 100644 --- a/src/views/spongePerformance/ManagingPerformance/completionstatus/index.vue +++ b/src/views/spongePerformance/ManagingPerformance/completionstatus/index.vue @@ -46,14 +46,12 @@ - + - - - + - -