-
{{name}}历史水质
+
{{AllData.szHistoryData.lakerName}}历史水质
@@ -34,10 +34,7 @@
type: [String],
default: '',
},
- name: {
- type: String,
- default: '',
- },
+
});
const AllData = reactive({
allSZ:[],
@@ -168,6 +165,7 @@
if(res.code==200){
let arr=[]
let data=res.data
+
data.forEach((e)=>{
let obj={
stName:e.stName,
@@ -181,14 +179,51 @@
turb:[],
cond:[],
ph:[],
- marklinearr:[],
+ marklineObj:{
+ nh4n:'',
+ dO:'',
+ turb:'',
+ cond:'',
+ ph:'',
+ },
refresh:1
}
}
- obj.chartInfo.XAxis = e.siteEchartDto.times;
-
+ let at=obj.chartInfo
+ at.XAxis = e.siteEchartDto.times;
+ if(e.targetQuality==1){
+ at.marklineObj.nh4n=0.15
+ at.marklineObj.dO=''
+ at.marklineObj.turb=''
+ at.marklineObj.cond=7.5
+ at.marklineObj.ph=''
+ }else if(e.targetQuality==2){
+ at.marklineObj.nh4n=0.5
+ at.marklineObj.dO=''
+ at.marklineObj.turb=''
+ at.marklineObj.cond=6
+ at.marklineObj.ph=''
+ }else if(e.targetQuality==3){
+ at.marklineObj.nh4n=1
+ at.marklineObj.dO=''
+ at.marklineObj.turb=''
+ at.marklineObj.cond=5
+ at.marklineObj.ph=''
+ }else if(e.targetQuality==4){
+ at.marklineObj.nh4n=1.5
+ at.marklineObj.dO=''
+ at.marklineObj.turb=''
+ at.marklineObj.cond=3
+ at.marklineObj.ph=''
+ }else if(e.targetQuality==5){
+ at.marklineObj.nh4n=2
+ at.marklineObj.dO=''
+ at.marklineObj.turb=''
+ at.marklineObj.cond=2
+ at.marklineObj.ph=''
+ }
e.siteEchartDto.datas.forEach((j) => {
- let at=obj.chartInfo
+
switch (j.dataKey) {
case "nh4n":
at.nh4n = j.datas;
@@ -219,7 +254,6 @@
})
}
onMounted(() => {
- console.log('ppp',props.name);
});
@@ -227,10 +261,14 @@
#YSIndex_right2 {
width: 100%;
height: 100%;
+
.historySZ,.eachLake{
height: calc((100% - 30px) / 3);
+
}
#Charts,#history {
+ width: calc(100% - 10px);
+
height: calc(100% - 32px);
}
// .eachLake {
diff --git a/src/views/pictureOnMap/inputSearch.vue b/src/views/pictureOnMap/inputSearch.vue
index ad908cf..57998f0 100644
--- a/src/views/pictureOnMap/inputSearch.vue
+++ b/src/views/pictureOnMap/inputSearch.vue
@@ -107,11 +107,12 @@
);
function GetSearchList(data) {
+ // let data=data1.slice(0, 10);
SelectList.value = [];
data.map(item => {
SelectList.value = SelectList.value.concat(item.data);
});
- console.log('MapData', appStore.MapData, SelectList.value);
+ // console.log('MapData', appStore.MapData, SelectList.value);
filterList.value = JSON.parse(JSON.stringify(SelectList.value));
// debugger;
}
diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
index bc28660..53cb6c6 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
@@ -264,7 +264,6 @@
diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue
index 0114a15..468c888 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue
@@ -1,7 +1,7 @@