diff --git a/main.js b/main.js index faca0f1..f7188fc 100644 --- a/main.js +++ b/main.js @@ -34,7 +34,7 @@ uni.$showMsg = function (title = '', duration = 1500) { icon: 'none' }) } -uni.$stcd = '10196' +uni.$stcd = '61610700' Vue.config.productionTip = false App.mpType = 'app' diff --git a/manifest.json b/manifest.json index d081ef4..49baf01 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name" : "檀树岗水库", "appid" : "__UNI__33ED56F", "description" : "", - "versionName" : "1.0.1", + "versionName" : "1.0.0", "versionCode" : 1, "transformPx" : false, "app-plus" : { diff --git a/pages/aqjc/jrxOptions.js b/pages/aqjc/jrxOptions.js index ae9a3cf..db70091 100644 --- a/pages/aqjc/jrxOptions.js +++ b/pages/aqjc/jrxOptions.js @@ -79,12 +79,12 @@ export default function jrxOptions(data = {}, type = "1",typeName='1') { type == '1' ? 58 : 70; const yMax = type == "3" ? 129 : type == "2" ? 117 : type == "1" ? 118 : 150; - const type1 = ["SY01", "SY04", "SY07", "SY16"]; - const type2 = ["SY10", "SY13"]; - const type3 = ["SY02", "SY05", "SY08", "SY17"]; - const type4 = ["SY11", "SY14"]; - const type5 = ["SY03", "SY06", "SY09"]; - const type6 = ["SY12", "SY15"]; + const type1 = ["UPD1", "UPD4", "UPD10", "UPD16"]; + const type2 = ["UPD7", "UPD13"]; + const type3 = ["UPD2", "UPD5", "UPD8", "UPD17"]; + const type4 = ["UPD11", "UPD14"]; + const type5 = ["UPD3", "UPD6", "UPD9"]; + const type6 = ["UPD12", "UPD15"]; const alltype = typeName == "1" ? type1 : typeName == "2" ? type2 : typeName == "3" ? type3 : @@ -126,30 +126,30 @@ export default function jrxOptions(data = {}, type = "1",typeName='1') { [] // gz1、gz2、gz3、gz4分别为渗压管 const gz1 = data[alltype[0]] ? - type == "3" ? [[47, 101], [47, data[alltype[0]]]] : - type == "2" ? [[45.5, 98], [45.5, data[alltype[0]]]] : - type == "1" ? [[44, 83], [44, data[alltype[0]]]] : + type == "3" ? [[52, typeName =='5' ?76.56:92.18], [52, data[alltype[0]]]] : + type == "2" ? [[52, typeName =='3' ?76.16:77.18], [52, data[alltype[0]]]] : + type == "1" ? [[49, typeName =='1' ?79.16:77.18], [49, data[alltype[0]]]] : [[47.5, 158], [85, data[alltype[0]]]] : []; const gz2 = data[alltype[1]] ? - type == "3" ? [[51, 101], [51, data[alltype[1]]]] : - type == "2" ? [[50, 98], [50, data[alltype[1]]]] : - type == "1" ? [[51.5, 82], [51.5, data[alltype[1]]]] : + type == "3" ? [[57, typeName =='5' ?77.18:83.50], [57, data[alltype[1]]]] : + type == "2" ? [[55, typeName =='3' ?77.18:77.50], [55, data[alltype[1]]]] : + type == "1" ? [[57, typeName =='1' ?77.18:74.5], [57, data[alltype[1]]]] : [[53.6, 158], [53.6, data[alltype[1]]]] : []; const gz3 = data[alltype[2]] ? - type == "3" ? [[58.5, 95], [58.5, data[alltype[2]]]] : - type == "2" ? [[58, 92], [58, data[alltype[2]]]] : - type == "1" ? [[58, 81], [58, data[alltype[2]]]] : + type == "3" ? [[65, 81.50], [65, data[alltype[2]]]] : + type == "2" ? [[63, 80.50], [63, data[alltype[2]]]] : + type == "1" ? [[67, 66.50], [79, data[alltype[2]]]] : [[73, 161], [73, data[alltype[2]]]] : []; const gz4 = data[alltype[3]] ? type == "3" ? [] : - type == "2" ? [[77, 82], [77, data[alltype[3]]]] : - type == "1" ? [[79, 78], [79, data[alltype[3]]]] : + type == "2" ? [[87, 73.50], [87, data[alltype[3]]]] : + type == "1" ? [[89, 72.50], [89, data[alltype[3]]]] : [[85, 166], [85, data[alltype[3]]]] : []; // 将渗压管连起来的线 @@ -157,26 +157,26 @@ export default function jrxOptions(data = {}, type = "1",typeName='1') { type == "3" ? [ [xValue, data?.rz], - [47, data[alltype[0]]], - [51, data[alltype[1]]], - [58.5, data[alltype[2]]], + [52, data[alltype[0]]], + [57, data[alltype[1]]], + [65, data[alltype[2]]], ] : type == "2" ? [ [xValue, data?.rz], - [45.5, data[alltype[0]]], - [50, data[alltype[1]]], - [58, data[alltype[2]]], - [77, data[alltype[3]]] + [52, data[alltype[0]]], + [55, data[alltype[1]]], + [63, data[alltype[2]]], + [87, data[alltype[3]]] ] : type == "1"? [ [xValue, data?.rz], - [44, data[alltype[0]]], - [51.5, data[alltype[1]]], - [58, data[alltype[2]]], - [79, data[alltype[3]]] + [49, data[alltype[0]]], + [57, data[alltype[1]]], + [67, data[alltype[2]]], + [89, data[alltype[3]]] ]: [ [xValue, data?.rz], diff --git a/pages/briefList/detail/index.vue b/pages/briefList/detail/index.vue index 3dd6ff8..2c27ac8 100644 --- a/pages/briefList/detail/index.vue +++ b/pages/briefList/detail/index.vue @@ -46,15 +46,14 @@ class="xqjb-redColor" >{{ item.sumStnm }}),最大点雨量 - {{ item.drp24Max }}mm/h({{ item.drp24Max }}mm({{ item.maxStnm }},{{ raimTime(item.maxTm) }})。当前水库水位 {{ item.rz8 }}m,汛限水位({{ item.flLowLimLev }}m),较昨日 {{ increaseWater(item.rz8, item.rzYesterday8) }}m,库容达 + >{{ increaseWater(item.rz8, item.rzYesterday8) }}m,库容达 {{ item.w }}万m³。-- {{ endDataString(item.date) }} diff --git a/pages/briefList/index.vue b/pages/briefList/index.vue index 42d07a6..d386979 100644 --- a/pages/briefList/index.vue +++ b/pages/briefList/index.vue @@ -23,7 +23,7 @@ border-top: 1px solid #f0f0f0; " > - + {{ item.sumStnm }}),最大点雨量 - {{ item.drp24Max }}mm/h(... + {{ item.drp24Max }}mm(... diff --git a/pages/homeIndex/index.vue b/pages/homeIndex/index.vue index d123ed5..5deae81 100644 --- a/pages/homeIndex/index.vue +++ b/pages/homeIndex/index.vue @@ -80,7 +80,7 @@ {{briefTime}}8时,过去24小时最大累计降雨量 {{resBriefObj.drp24Sum}}mm({{resBriefObj.sumStnm}}),最大点雨量 - {{resBriefObj.drp24Max}}mm/h({{resBriefObj.maxStnm}},{{raimTime}})。当前水库水位 + {{resBriefObj.drp24Max}}mm({{resBriefObj.maxStnm}},{{raimTime}})。当前水库水位 {{resBriefObj.rz8}}m,汛限水位({{resBriefObj.flLowLimLev}}m),较昨日 {{increaseWater}}m,库容达 {{resBriefObj.w}}万m³。-- diff --git a/pages/sjc/zwyTable.vue b/pages/sjc/zwyTable.vue index ce4a0f7..90a2230 100644 --- a/pages/sjc/zwyTable.vue +++ b/pages/sjc/zwyTable.vue @@ -9,9 +9,9 @@ 监测时间 - e方向(mm) - n方向(mm) - u方向(mm) + x方向(mm) + y方向(mm) + h方向(mm)
diff --git a/pages/skInfo/detail/jcxx.vue b/pages/skInfo/detail/jcxx.vue index 4e7af33..ce1f447 100644 --- a/pages/skInfo/detail/jcxx.vue +++ b/pages/skInfo/detail/jcxx.vue @@ -1,6 +1,6 @@