diff --git a/pages/aqjc/jrxOptions.js b/pages/aqjc/jrxOptions.js index 006dd26..94377cd 100644 --- a/pages/aqjc/jrxOptions.js +++ b/pages/aqjc/jrxOptions.js @@ -64,7 +64,7 @@ export default function jrxOptions(data = {}, type = "1", typeName = '1') { // gz1、gz2、gz3、gz4分别为渗压管 const gz1 = data[alltype[0]] ? 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.16:77.18], [typeName =='3' ?50:55, 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]]]] : []; diff --git a/pages/skInfo/index.vue b/pages/skInfo/index.vue index a7647d6..8682d72 100644 --- a/pages/skInfo/index.vue +++ b/pages/skInfo/index.vue @@ -94,13 +94,13 @@ this.dataform={...this.dataform,...filterObj[0]} this.tm = filterObj[0].tm }) - uni.$http.post('/gunshiApp/tsg/stWaterRReal/list').then(res=>{ + uni.$http.post('/gunshiApp/tsg/stFlowR/list').then(res=>{ res.data.data.forEach(item=>{ - if(item.sttp == 'QQ'){ + if(item.stcd == '2222222'){ this.stgs=item.q this.stStcd=item.stcd } - if(item.sttp == 'PQ'){ + if(item.stcd == '10498'){ this.shgs=item.q this.shStcd=item.stcd } diff --git a/pages/spjk/index.vue b/pages/spjk/index.vue index 9df3a0b..2d8425b 100644 --- a/pages/spjk/index.vue +++ b/pages/spjk/index.vue @@ -21,7 +21,7 @@ - +