diff --git a/manifest.json b/manifest.json index 49baf01..d081ef4 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name" : "檀树岗水库", "appid" : "__UNI__33ED56F", "description" : "", - "versionName" : "1.0.0", + "versionName" : "1.0.1", "versionCode" : 1, "transformPx" : false, "app-plus" : { diff --git a/pages/aqjc/jrxOptions.js b/pages/aqjc/jrxOptions.js index 94377cd..661ab47 100644 --- a/pages/aqjc/jrxOptions.js +++ b/pages/aqjc/jrxOptions.js @@ -66,21 +66,21 @@ export default function jrxOptions(data = {}, type = "1", typeName = '1') { type == "3" ? [[typeName =='6' ?57:52, typeName =='5' ?76.56:92.18], [typeName =='6' ?57:52, data[alltype[0]]]] : type == "2" ? [[typeName =='3' ?50:55, typeName =='3' ?76.76:77.18], [typeName =='3' ?50:55, data[alltype[0]]]] : type == "1" ? [[49, typeName =='1' ?79.16:77.18], [49, data[alltype[0]]]] : - [[62, 109.87], [62, data[alltype[0]]]] + [[62, typeName =='7'?109.08:108.77], [62, data[alltype[0]]]] : []; const gz2 = data[alltype[1]] ? type == "3" ? [[typeName =='6' ?71:57, typeName =='5' ?77.18:83.50], [typeName =='6' ?71:57, data[alltype[1]]]] : type == "2" ? [[typeName =='3' ?55:68, typeName =='3' ?77.18:77.50], [typeName =='3' ?55:68, data[alltype[1]]]] : type == "1" ? [[57, typeName =='1' ?77.18:74.5], [57, data[alltype[1]]]] : - [[72, 109.75], [72, data[alltype[1]]]] : + [[72, typeName =='7'?109.32:109.36], [72, data[alltype[1]]]] : []; const gz3 = data[alltype[2]] ? type == "3" ? [[71, 81.50], [71, data[alltype[2]]]] : type == "2" ? [[68, 80.50], [68, data[alltype[2]]]] : type == "1" ? [[67, 66.50], [67, data[alltype[2]]]] : - [[87, 109.43], [87, data[alltype[2]]]] : []; + [[87, typeName =='7'?109.01:108.87], [87, data[alltype[2]]]] : []; const gz4 = data[alltype[3]] ? diff --git a/pages/homeIndex/index.vue b/pages/homeIndex/index.vue index bec6fa1..a0b9198 100644 --- a/pages/homeIndex/index.vue +++ b/pages/homeIndex/index.vue @@ -243,7 +243,7 @@ export default { }) .then((res) => { if (res.data.code == 200) { - this.messagelist = res.data.data; + this.messagelist = res?.data?.data; } }); },