Merge branch 'lsf-dev'

2024-07-02 13:09:56 +08:00 · 2024-07-02 13:09:56 +08:00 · 44fcf985fe
parent fcd2767b40 6f5a19fda7
commit 44fcf985fe
7 changed files with 46 additions and 14 deletions
--- 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>
--- 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小时综述 -->
@ -298,6 +298,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
@ -319,7 +320,9 @@
            </div>
            <div style="color: #91939b">监测时间：{{ item.tm }}</div>
          </div>
+                  <div v-if="!skList.length" style="text-align:center">暂无内容</div>
        </div>
+
      </view>
    </view>
  </view>
@ -359,6 +362,7 @@ export default {
      tableData: {},
      tm: '',
      level: '',
+      yjStatus:0,
      limit: disType(uni.getStorageSync('value').adcd),
      timeList: [
        { text: '昨天08:00~当前时间', value: 1 },
@ -385,8 +389,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'),
@ -395,7 +400,8 @@ export default {
      imgHourstm: [],
      imgHoursList: { url: '' },
      interval: null,
-      numPic: 0
+      numPic: 0,
+      allStatus: false
    }
  },
  computed: {
@ -494,6 +500,13 @@ export default {
        }
      },
      immediate: true
+    },
+    allStatus:{
+      handler (newValue) {
+        const newArr = this.getNavList()
+
+      },
+      immediate: true
    }
  },
  methods: {
@ -636,6 +649,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}`
@ -840,7 +863,8 @@ 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)
+            this.yjStatus = data.data.records[0].status
          } else {
            this.level = '无'
          }
@ -865,6 +889,8 @@ export default {

  onShow () {
    this.getReadStatus()
+    this.getResponseLevel()
+    this.getDispatchStatus()
    if (this.limit == 1) {
      this.getYjRead()
      // this.getInterval()
--- 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>
--- 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;
--- 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(
--- 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}
--- 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>