Merge branch 'master' of http://local.gunshiiot.com:10000/lishenfeng/xffxkh-app

pages/hdDetail/hdDetail.vue

@@ -5,6 +5,7 @@
           <u-icon name="arrow-left" color="#000" size="20" @click="backTo" style="margin-left:10px"></u-icon>
           <view class="title">
              {{stnm}}
+             <text style="font-size:12px;margin-left:5px">{{sta}}({{rain}})</text>
           </view>
     </view>
     <view class="tab-bar" >
@@ -35,6 +36,10 @@
   import Tjsj from "./tjsj/tjsj.vue"
   import Zbyq from "./zbyq/zbyq.vue"
   import Spjk from "./spjk/spjk.vue"
+   const staType = {
+    MM: '气象站',PP: '雨量站',RR: '水库水文站',ZZ: '河道水位站',ZQ:"河道水文站"
+  }
+  const rainType = {'SH':'山洪','SW':'水文','QX':'气象','SK':'水库'}
   export default {
     data(){
       return {
@@ -63,6 +68,8 @@
       this.source = option.source;
       this.grz = option.grz;
       this.wrz = option.wrz;
+      this.sta = staType[option.sttp];
+      this.rain = rainType[option.source];
     }
   }
 </script>

pages/hdDetail/jcsj/chartOption.js

@@ -7,6 +7,7 @@ export default function DrpOption(data=[],wrz,grz) {
     const minSw = Math.min(...data.map(obj => obj.z))
     const maxLl = Math.max(...data.map(obj => obj.tq))
     const minLl = Math.min(...data.map(obj => obj.tq))
+    console.log("maxLl",wrz,grz);
   let eopts = {
      tooltip: {
          trigger: 'axis',
@@ -168,7 +169,19 @@ export default function DrpOption(data=[],wrz,grz) {
   }
   let chartData = {
     series: [
-   
+      
+      {
+        xAxisIndex: 1,
+        yAxisIndex: 1,
+        name: '危险水位',
+        type: 'line',
+        color: "#D9001B",
+        lineStyle: {
+          type: "dashed"
+        },
+        data: data.map(o => grz),
+        symbol: 'none' // 设置标记点为'none'，即去掉圆点
+      },
          {
            xAxisIndex: 1,
            yAxisIndex: 1,
@@ -176,24 +189,12 @@ export default function DrpOption(data=[],wrz,grz) {
            type: 'line',
            color: "#F59A23",
            barWidth: '60%',
-           data:  data.map(o => wrz),
+           data: data.map(o => wrz),
            lineStyle: {
              type: "dashed"
            },
            symbol: 'none' // 设置标记点为'none'，即去掉圆点
          },
-         {
-           xAxisIndex: 1,
-           yAxisIndex: 1,
-           name: '危险水位',
-           type: 'line',
-           color: "#D9001B",
-           lineStyle: {
-             type: "dashed"
-           },
-           data:  data.map(o => grz),
-           symbol: 'none' // 设置标记点为'none'，即去掉圆点
-         },
          {
            name: '降雨量',
            type: 'bar',

pages/hdDetail/jcsj/jcsj.vue

@@ -83,7 +83,7 @@
     },
     watch:{
       rainChartData(newV, oldV){
-        this.chartData = {...drpOption(newV,this.grz,this.wrz)}
+        this.chartData = {...drpOption(newV,this.wrz,this.grz)}
         this.tableData = [...newV]
       }
     },

pages/hdDetail/tjsj/tjsj.vue

@@ -77,7 +77,7 @@
               </view>
             </uni-col>
             <uni-col :span="12">
-            	<view class="first-row">24h水位变幅(mm)</view>
+            	<view class="first-row">24h水位变幅(m)</view>
             </uni-col>
             <uni-col :span="12">
             	<view class="second-row">{{tableData.rzDiff > 0 ? "+" :"" }}{{tableData.rzDiff?tableData.rzDiff.toFixed(2) : 0}}</view>

pages/homeIndex/index.vue

@@ -56,7 +56,7 @@
         mode="aspectFit"
       ></image
       ><span style="color: #000">当前防汛应急响应：</span>
-      <span style="color: #59a7ff">{{ level }}</span>
+      <span style="color: #59a7ff">{{ !level?"无":level }}</span>
     </view>
 
     <!-- 24小时综述 -->
@@ -678,7 +678,7 @@ export default {
           '/gunshiApp/xfflood/real/rain/home/list',
           {
             start: this.formData.stm.format('YYYY-MM-DD HH:mm:ss'),
-            end: this.formData.etm.format('YYYY-MM-DD HH:mm:ss')
+            end: this.formData.etm.format('YYYY-MM-DD HH:00:00')
           }
         )
         if (data.code == 200) {
@@ -830,7 +830,8 @@ export default {
         )
         if (data.code == 200) {
           if (data.data.records.length > 0) {
-            this.level = level(data.data.records[0].level)
+            console.log("1111111data",data);
+            this.level = level(data.data.records[0].status)
           } else {
             this.level = '无'
           }

pages/rain/Table.vue

@@ -25,11 +25,11 @@
                       <td style="width: 11%;">{{ index + 1 }}</td>
                       <td style="width: 27%; color: #3399ef; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;" @click="jumpDetail(item)">
                         {{ item.stnm }}</td>
-                      <td style="width: 20%">{{ item.drp || 0  }}</td>
-                      <td style="width: 20%">{{ item.yesDrp || 0 }}</td>
+                      <td style="width: 20%">{{ item.drp || "-"  }}</td>
+                      <td style="width: 20%">{{ item.yesDrp || "-" }}</td>
                       <td style="width:23%;">{{ item.adnm }}</td>
                     </tr>
-                    <div style="height:125px"></div>
+                    <div style="height:160px"></div>
                   </div>
                   
                 </table>
@@ -55,7 +55,7 @@
        jumpDetail(params){
          console.log(123)
          uni.navigateTo({
-           url:`/pages/rainDetail/rainDetail?stcd=${params.stcd}&stnm=${params.stnm}`
+           url:`/pages/rainDetail/rainDetail?stcd=${params.stcd}&stnm=${params.stnm}&sttp=${params.sttp}&source=${params.source}`
          })
        }
      },
@@ -96,7 +96,7 @@
     text-align: center !important;
   }
   .scroll-table{
-    height: calc(100vh - 125px);
+    height: calc(100vh - 160px);
     overflow-y: auto;
     width:'100%'
   }

pages/rainDetail/rainDetail.vue

@@ -5,6 +5,7 @@
           <u-icon name="arrow-left" color="#000" size="20" @click="backTo" style="margin-left:10px"></u-icon>
           <view class="title">
              {{stnm}}
+             <text style="font-size:12px;margin-left:5px">{{sta}}({{rain}})</text>
           </view>
     </view>
     <view class="tab-bar" >
@@ -30,12 +31,19 @@
   import Jcsj from "./jcsj/jcsj.vue"
   import Tjsj from "./tjsj/tjsj.vue"
   import Zbyq from "./zbyq/zbyq.vue"
+  const staType = {
+    MM: '气象站',PP: '雨量站',RR: '水库水文站',ZZ: '河道水位站',ZQ:"河道水文站"
+  }
+  const rainType = {'SH':'山洪','SW':'水文','QX':'气象','SK':'水库'}
   export default {
     data(){
       return {
         activeOne:0,
         stcd:'',
-        stnm:''
+        stnm:'',
+        rainType:rainType,
+        staType:staType,
+        // sta:staType[sttp]
       }
     },
     components:{
@@ -51,6 +59,8 @@
     onLoad(option) {
       this.stcd = option.stcd;
       this.stnm = option.stnm;
+      this.sta = staType[option.sttp];
+      this.rain = rainType[option.source];
     }
   }
 </script>

pages/skDetail/jcsj/chartOption.js

@@ -11,7 +11,8 @@ export default function DrpOption(
      const maxSw = Math.ceil(Math.max(...data.map(obj => obj.rz)))
      const minSw = Math.floor(Math.min(...data.map(obj => obj.rz)))
      const maxKr = Math.max(...data.map(obj => obj.w))
-     const minKr = Math.min(...data.map(obj => obj.w))
+  const minKr = Math.min(...data.map(obj => obj.w))
+  console.log('desFloodLev',desFloodLev);
   let eopts = {
      tooltip: {
          trigger: 'axis',

pages/skDetail/jcsj/jcsj.vue

@@ -62,6 +62,11 @@
       source:String,
       wrz:String,
       grz:String,
+      afsltdz:String,
+      flLowLimLev:String,
+      desFloodLev:String,
+      calFloodLev:String,
+
       default:''
     },
     data() {
@@ -83,7 +88,7 @@
     },
     watch:{
       rainChartData(newV, oldV){
-        this.chartData = {...drpOption(newV,this.grz,this.wrz)}
+        this.chartData = {...drpOption(newV,this.afsltdz,this.flLowLimLev,this.desFloodLev,this.calFloodLev)}
         this.tableData = [...newV]
       }
     },

pages/skDetail/skDetail.vue

@@ -5,6 +5,7 @@
           <u-icon name="arrow-left" color="#000" size="20" @click="backTo" style="margin-left:10px"></u-icon>
           <view class="title">
              {{stnm}}
+             <text style="font-size:12px;margin-left:5px">{{sta}}({{rain}})</text>
           </view>
     </view>
     <view class="tab-bar">
@@ -60,6 +61,10 @@
   import Spjk from "./spjk/spjk.vue"
   import Zrtx from "./zrtx/zrtx.vue"
   import Txjc from "./txjc/txjc.vue"
+    const staType = {
+    MM: '气象站',PP: '雨量站',RR: '水库水文站',ZZ: '河道水位站',ZQ:"河道水文站"
+  }
+  const rainType = {'SH':'山洪','SW':'水文','QX':'气象','SK':'水库'}
   export default {
     data(){
       return {
@@ -109,6 +114,8 @@
       this.flLowLimLev = option.flLowLimLev;
       this.desFloodLev = option.desFloodLev;
       this.resCode = option.resCode;
+      this.sta = staType[option.sttp];
+      this.rain = rainType[option.source];
     }
   }
 </script>

pages/skDetail/tjsj/tjsj.vue

@@ -77,7 +77,7 @@
               </view>
             </uni-col>
             <uni-col :span="12">
-            	<view class="first-row">24h水位变幅(mm)</view>
+            	<view class="first-row">24h水位变幅(m)</view>
             </uni-col>
             <uni-col :span="12">
             	<view class="second-row">{{tableData.rzDiff > 0 ? "+" :"" }}{{tableData.rzDiff?tableData.rzDiff.toFixed(2) : 0}}</view>

pages/water/hdWater/hdWater.vue

@@ -108,7 +108,7 @@
            const {data} = await uni.$http.post(
             "/gunshiApp/xfflood/river/water/list",{...this.formData}
             )
-            console.log("data",data);
+            console.log("22weee",data);
             if(data.code == 200){
               this.list = [...data.data]
               this.saveList = [...data.data]

pages/water/hdWater/table.vue

@@ -60,7 +60,7 @@
      methods:{
        jumpDetail(params){
          uni.navigateTo({
-           url:`/pages/hdDetail/hdDetail?stcd=${params.stcd}&stnm=${params.stnm}&source=${params.source}&wrz=${params.wrz}&grz=${params.grz}`
+           url:`/pages/hdDetail/hdDetail?stcd=${params.stcd}&stnm=${params.stnm}&source=${params.source}&wrz=${params.wrz}&grz=${params.grz}&sttp=${params.sttp}`
          })
        }
      }

pages/water/skWater/table.vue

@@ -6,31 +6,32 @@
                     <th style="width: 11%;">
                       序号
                       </th>
-                    <th style="width: 22%">
+                    <th style="width: 32%">
                      站名
-                    <th style="width: 22%;">
+                    <th style="width: 20%;">
                       监测时间
                       </th>
-                    <th style="width: 25%;" >
+                    <th style="width: 37%;" >
                       实时水位(m)
                       </th>
-                      <th style="width: 22%;" >
+                      <!-- <th style="width: 22%;" >
                         超汛限(m)
-                        </th>
+                        </th> -->
                       </tr>
                   <div class="scroll-table">
                 <tr v-for="(item, index) in newList" :key="index">
-                      <td style="width: 10%">{{ index + 1 }}</td>
-                      <td style="width: 23%;color: #3399ef;overflow: hidden; white-space: nowrap; text-overflow: ellipsis;" @click="jumpDetail(item)">{{ item.stnm }}</td>
-                      <td style="width: 22%">{{item.tm}}</td>
-                      <td style="width: 25%; position: relative;" >
-                        <text :class="{'active1':item.flState	 == 1,'active2':item.desState == 1,'active3':item.calState}">{{ item.rz.toFixed(2) }}</text>
+                      <td style="width: 11%">{{ index + 1 }}</td>
+                      <td style="width: 27%;color: #3399ef;overflow: hidden; white-space: nowrap; text-overflow: ellipsis;" @click="jumpDetail(item)">{{ item.stnm }}</td>
+                      <td style="width: 21%"><text>{{item.tm}}</text></td>
+                      <td style="width: 38%; position: relative;" >
+                        <text :class="{'active1':item.flState	 == 1,'active2':item.desState == 1,'active3':item.calState}" style="margin-right:20%">{{ item.rz.toFixed(2) }}</text>
                        <text v-if="item.state == 1" 
-                       style="position: absolute; top: 0px; right: 0; color: #FF7D7D;font-size:18px;">↑</text>
+                       style="position: absolute; top: 0px; right: 34%; color: #FF7D7D;font-size:18px;">↑</text>
                        <text v-else-if="item.state == 2" style="position: absolute;
-                       top:0px;right: 0; color: #32E48E; font-size: 18px;">↓</text>
+                       top:0px;right: 34%; color: #32E48E; font-size: 18px;">↓</text>
+                       <text style="position: absolute; top: 0px; left: 62%;">（{{item.afsltdz ? item.afsltdz.toFixed(2):'-'}}）</text>
                       </td>
-                      <td style="width: 22%">{{item.afsltdz ? item.afsltdz.toFixed(2):'-'}}</td>
+                      <!-- <td style="width: 4%"></td> -->
                     </tr>
                     <div style="height:125px"></div>
                   </div>
@@ -65,7 +66,7 @@
        jumpDetail(params){
          console.log(params);
          uni.navigateTo({
-           url:`/pages/skDetail/skDetail?stcd=${params.stcd}&stnm=${params.stnm}&source=${params.source}&afsltdz=${params.afsltdz}&flLowLimLev=${params.flLowLimLev}&desFloodLev=${params.desFloodLev}&calFloodLev=${params.calFloodLev}&resCode=${params.resCode}`
+           url:`/pages/skDetail/skDetail?stcd=${params.stcd}&stnm=${params.stnm}&source=${params.source}&afsltdz=${params.afsltdz}&flLowLimLev=${params.flLowLimLev}&desFloodLev=${params.desFloodLev}&calFloodLev=${params.calFloodLev}&resCode=${params.resCode}&sttp=${params.sttp}`
          })
        }
      }