From 61387d7a128d04da10ea318614a7775eb8aa90ad Mon Sep 17 00:00:00 2001
From: lishenfeng <lishenfeng@gunshiiot.com>
Date: Mon, 1 Jul 2024 17:17:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix():=20=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/hdDetail/tjsj/tjsj.vue  | 2 +-
 pages/homeIndex/index.vue     | 3 ++-
 pages/skDetail/tjsj/tjsj.vue  | 2 +-
 pages/water/skWater/table.vue | 6 +++---
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pages/hdDetail/tjsj/tjsj.vue b/pages/hdDetail/tjsj/tjsj.vue
index c3252d9..67fbd81 100644
--- a/pages/hdDetail/tjsj/tjsj.vue
+++ b/pages/hdDetail/tjsj/tjsj.vue
@@ -82,7 +82,7 @@
             <uni-col :span="12">
             	<view class="second-row">{{tableData.rzDiff > 0 ? "+" :"" }}{{tableData.rzDiff?tableData.rzDiff.toFixed(2) : 0}}</view>
             </uni-col>  <uni-col :span="12">
-            	<view class="first-row" style="border-bottom: 1px solid #dfdfdf;">本年最高水位(mm)</view>
+            	<view class="first-row" style="border-bottom: 1px solid #dfdfdf;">本年最高水位(m)</view>
             </uni-col>
             <uni-col :span="12">
             	<view class="second-row" style="border-bottom: 1px solid #dfdfdf;">{{tableData.maxRz ? tableData.maxRz.toFixed(2) :0}}</view>
diff --git a/pages/homeIndex/index.vue b/pages/homeIndex/index.vue
index cbfe442..b791fa2 100644
--- a/pages/homeIndex/index.vue
+++ b/pages/homeIndex/index.vue
@@ -833,7 +833,7 @@ export default {
         if (data.code == 200) {
           if (data.data.records.length > 0) {
             console.log('1111111data', data)
-            this.level = level(data.data.records[0].status)
+            this.level = level(data.data.records[0].level)
           } else {
             this.level = '无'
           }
@@ -858,6 +858,7 @@ export default {
 
   onShow () {
     this.getReadStatus()
+    this.getResponseLevel()
     if (this.limit == 1) {
       this.getYjRead()
       // this.getInterval()
diff --git a/pages/skDetail/tjsj/tjsj.vue b/pages/skDetail/tjsj/tjsj.vue
index 4e59384..3c9c003 100644
--- a/pages/skDetail/tjsj/tjsj.vue
+++ b/pages/skDetail/tjsj/tjsj.vue
@@ -82,7 +82,7 @@
             <uni-col :span="12">
             	<view class="second-row">{{tableData.rzDiff > 0 ? "+" :"" }}{{tableData.rzDiff?tableData.rzDiff.toFixed(2) : 0}}</view>
             </uni-col>  <uni-col :span="12">
-            	<view class="first-row" style="border-bottom: 1px solid #dfdfdf;">本年最高水位(mm)</view>
+            	<view class="first-row" style="border-bottom: 1px solid #dfdfdf;">本年最高水位(m)</view>
             </uni-col>
             <uni-col :span="12">
             	<view class="second-row" style="border-bottom: 1px solid #dfdfdf;">{{tableData.maxRz ? tableData.maxRz.toFixed(2) :0}}</view>
diff --git a/pages/water/skWater/table.vue b/pages/water/skWater/table.vue
index 5d7190c..6305936 100644
--- a/pages/water/skWater/table.vue
+++ b/pages/water/skWater/table.vue
@@ -26,10 +26,10 @@
                       <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: 34%; color: #FF7D7D;font-size:18px;">↑</text>
+                       style="position: absolute; top: 0px; right: 33%; color: #FF7D7D;font-size:18px;">↑</text>
                        <text v-else-if="item.state == 2" style="position: absolute;
-                       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>
+                       top:0px;right: 33%; color: #32E48E; font-size: 18px;">↓</text>
+                       <text style="position: absolute; top: 0px; left: 64%;">（{{item.afsltdz ? item.afsltdz.toFixed(2):'-'}}）</text>
                       </td>
                       <!-- <td style="width: 4%"></td> -->
                     </tr>

From 6f5a19fda7a4d3e1c0625282da6762da63189b16 Mon Sep 17 00:00:00 2001
From: lishenfeng <lishenfeng@gunshiiot.com>
Date: Tue, 2 Jul 2024 13:09:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix():bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/homeIndex/index.vue       | 35 ++++++++++++++++++++++++++++-----
 pages/utils/dicType.js          |  2 +-
 pages/water/hdWater/hdWater.vue |  5 ++++-
 pages/water/skWater/skWater.vue |  5 ++++-
 4 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/pages/homeIndex/index.vue b/pages/homeIndex/index.vue
index b791fa2..b744b01 100644
--- a/pages/homeIndex/index.vue
+++ b/pages/homeIndex/index.vue
@@ -35,7 +35,7 @@
             <div
               class="readStatus"
               v-show="
-                (readStatus && item.key == 3) ||
+                (readStatus && item.key == 3) || (dispatchStatus && item.key ==5 && limit == 0) ||
                 (limit == 1 && readYjStatus && item.key == 5)
               "
             ></div>
@@ -56,7 +56,7 @@
         mode="aspectFit"
       ></image
       ><span style="color: #000">当前防汛应急响应：</span>
-      <span style="color: #59a7ff">{{ !level ? '无' : level }}</span>
+      <span style="color: #59a7ff">{{ !level || !yjStatus ? '无' : level }}</span>
     </view>
 
     <!-- 24小时综述 -->
@@ -291,6 +291,7 @@
             </div>
             <div style="color: #91939b">监测时间：{{ item.tm }}</div>
           </div>
+           <div v-if="!hdList.length" style="text-align:center">暂无内容</div>
         </div>
         <div class="info_icon" v-else>
           <div
@@ -312,7 +313,9 @@
             </div>
             <div style="color: #91939b">监测时间：{{ item.tm }}</div>
           </div>
+                  <div v-if="!skList.length" style="text-align:center">暂无内容</div>
         </div>
+
       </view>
     </view>
   </view>
@@ -352,6 +355,7 @@ export default {
       tableData: {},
       tm: '',
       level: '',
+      yjStatus:0,
       limit: disType(uni.getStorageSync('value').adcd),
       timeList: [
         { text: '昨天08:00~当前时间', value: 1 },
@@ -378,8 +382,9 @@ export default {
       current: 0,
       hdList: [],
       skList: [],
-      readStatus: false,
-      readYjStatus: false,
+      readStatus: false, //工灾情状态
+      readYjStatus: false, //预警状态
+      dispatchStatus:false, //调令状态
       default_src: uni.getStorageSync('avatar'),
       imgList: {},
       imgtm: moment().format('YYYYMMDD'),
@@ -388,7 +393,8 @@ export default {
       imgHourstm: [],
       imgHoursList: {},
       interval: null,
-      numPic: 0
+      numPic: 0,
+      allStatus: false
     }
   },
   computed: {
@@ -487,6 +493,13 @@ export default {
         }
       },
       immediate: true
+    },
+    allStatus:{
+      handler (newValue) {
+        const newArr = this.getNavList()
+
+      },
+      immediate: true
     }
   },
   methods: {
@@ -629,6 +642,16 @@ export default {
         uni.$showMsg()
       }
     },
+    async getDispatchStatus(){
+      try {
+        const res = await uni.$http.post('/gunshiApp/xfflood/xfEmerDispatchR/app/list',{status:1,dispatchTypeList:["0","1"]})
+        if(res.data.code == 200){
+          this.dispatchStatus = res.data.data.length > 0 ? true : false
+        }
+      } catch (error) {
+        console.log(error);
+      }
+    },
     jumpHdDetail (params) {
       uni.navigateTo({
         url: `/pages/hdDetail/hdDetail?stcd=${params.stcd}&stnm=${params.stnm}&source=${params.source}&wrz=${params.wrz}&grz=${params.grz}`
@@ -834,6 +857,7 @@ export default {
           if (data.data.records.length > 0) {
             console.log('1111111data', data)
             this.level = level(data.data.records[0].level)
+            this.yjStatus = data.data.records[0].status
           } else {
             this.level = '无'
           }
@@ -859,6 +883,7 @@ export default {
   onShow () {
     this.getReadStatus()
     this.getResponseLevel()
+    this.getDispatchStatus()
     if (this.limit == 1) {
       this.getYjRead()
       // this.getInterval()
diff --git a/pages/utils/dicType.js b/pages/utils/dicType.js
index 22dbac3..7c98997 100644
--- a/pages/utils/dicType.js
+++ b/pages/utils/dicType.js
@@ -20,7 +20,7 @@ export function disType(e) {
   let type;
   if (e.endsWith('000000000')) {
     type = 1;
-  } else if (e.endsWith('000000')) {
+  } else{
     type = 0;
   }
   return type;
diff --git a/pages/water/hdWater/hdWater.vue b/pages/water/hdWater/hdWater.vue
index d116fe9..8709808 100644
--- a/pages/water/hdWater/hdWater.vue
+++ b/pages/water/hdWater/hdWater.vue
@@ -79,7 +79,7 @@
         formData:{
           args:'',
           sources:["SH","SW"],
-          adcd:type == 1 ? undefined :adcd,
+          // adcd:type == 1 ? undefined : adcd,
         },
         list:[], //搜索结果
         saveList:[], //保存搜索结果
@@ -103,6 +103,9 @@
          this.getList()
        },
        async getList(){
+        const adcd = uni.getStorageSync('value').adcd
+        let newAdcd = adcd.endsWith('000000000') ? "" : adcd
+        this.formData = {...this.formData,adcd:newAdcd}
         console.log(1111,this.formData);
          try{
            const {data} = await uni.$http.post(
diff --git a/pages/water/skWater/skWater.vue b/pages/water/skWater/skWater.vue
index 837c301..74eaa5b 100644
--- a/pages/water/skWater/skWater.vue
+++ b/pages/water/skWater/skWater.vue
@@ -80,7 +80,7 @@
         formData:{
           args:'',
           sources:["SW","SK"],
-          adcd:type == 1 ? undefined :adcd,
+          // adcd:uni.getStorageSync('value').adcd,
         },
         list:[], //搜索结果
         saveList:[] //保存搜索结果
@@ -104,6 +104,9 @@
          this.getList()
        },
        async getList(){
+         const adcd = uni.getStorageSync('value').adcd
+        let newAdcd = adcd.endsWith('000000000') ? "" : adcd
+        this.formData = {...this.formData,adcd:newAdcd}
          try{
            const {data} = await uni.$http.post(
             "/gunshiApp/xfflood/reservoir/water/list",{...this.formData}