From 59ba1069ae7982598a33d432a3e247a404da6fa8 Mon Sep 17 00:00:00 2001
From: zhanglin <zhanglin@gunshiiot.com>
Date: Mon, 1 Jul 2024 16:22:28 +0800
Subject: [PATCH] fix:bug

---
 pages/homeIndex/index.vue   | 15 +++++++++++----
 pages/xxsb/dsfrom.vue       |  9 ++++++---
 pages/xxsb/from.vue         |  2 +-
 pages/xxsb/fromSeverity.vue |  4 ++--
 pages/xxsb/map.vue          | 12 +++++++++++-
 5 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/pages/homeIndex/index.vue b/pages/homeIndex/index.vue
index cbfe442..8607e10 100644
--- a/pages/homeIndex/index.vue
+++ b/pages/homeIndex/index.vue
@@ -219,15 +219,22 @@
           <p class="title">
             <span class="line"></span><span class="h4">短时天气预报</span>
           </p>
-          <div class="time">{{ imgHourstm[0] }}至{{ imgHourstm[1] }}</div>
+          <div class="time" v-if="imgHourstm.length > 0">
+            {{ imgHourstm[0] }}至{{ imgHourstm[1] }}
+          </div>
         </div>
         <div class="imgs" style="height: 100%; text-align: center">
           <image
+            v-if="imgHoursList.url != ''"
             :src="imgHoursList.url"
             mode="aspectFit"
-            v-if="imgHoursList.url"
           ></image>
-          <image class="noData" src="" mode="aspectFit" v-else></image>
+          <image
+            v-if="imgHoursList.url == ''"
+            class="noData"
+            src="../../static/tabs//noData1.png"
+            mode="aspectFit"
+          ></image>
         </div>
       </view>
     </view>
@@ -386,7 +393,7 @@ export default {
       imgData: [],
       imgHours: '',
       imgHourstm: [],
-      imgHoursList: {},
+      imgHoursList: { url: '' },
       interval: null,
       numPic: 0
     }
diff --git a/pages/xxsb/dsfrom.vue b/pages/xxsb/dsfrom.vue
index 1d2bfd3..47cabe5 100644
--- a/pages/xxsb/dsfrom.vue
+++ b/pages/xxsb/dsfrom.vue
@@ -318,7 +318,7 @@
         </view> </view
     ></view>
     <view v-if="isMap">
-      <newmap v-if="isMap" @back="back"></newmap>
+      <newmap v-if="isMap" @back="back" @navBack="navBack"></newmap>
     </view>
   </view>
 </template>
@@ -407,7 +407,7 @@ export default {
             type: 'string',
             required: true,
             message: '请选择时间',
-            trigger: ['blur', 'change']
+            trigger: ['change']
           }
         ]
         // severity: [
@@ -436,6 +436,9 @@ export default {
     this.$refs.form3.setRules(this.rules2)
   },
   methods: {
+    navBack () {
+      this.isMap = false
+    },
     back (lnglat, address) {
       console.log('搜索框22key', lnglat, address)
       this.isMap = false
@@ -613,7 +616,7 @@ export default {
       } else {
         params.fileIds = []
       }
-
+      console.log('this.---can', params)
       uni.$http
         .post('/gunshiApp/xfflood/iaCHsfwater/insert', params)
         .then(res => {
diff --git a/pages/xxsb/from.vue b/pages/xxsb/from.vue
index 949e8d2..59a0013 100644
--- a/pages/xxsb/from.vue
+++ b/pages/xxsb/from.vue
@@ -347,7 +347,7 @@ export default {
             type: 'string',
             required: true,
             message: '请选择工程名称',
-            trigger: ['blur', 'change']
+            trigger: ['change']
           }
         ]
       },
diff --git a/pages/xxsb/fromSeverity.vue b/pages/xxsb/fromSeverity.vue
index 7f9c741..bfbaee4 100644
--- a/pages/xxsb/fromSeverity.vue
+++ b/pages/xxsb/fromSeverity.vue
@@ -321,7 +321,7 @@ export default {
             type: 'string',
             required: true,
             message: '请选择工程名称',
-            trigger: ['blur', 'change']
+            trigger: ['change']
           }
         ],
         severity: [
@@ -329,7 +329,7 @@ export default {
             type: 'string',
             required: true,
             message: '请选择严重程度',
-            trigger: ['blur', 'change']
+            trigger: ['change']
           }
         ]
       },
diff --git a/pages/xxsb/map.vue b/pages/xxsb/map.vue
index 9bd0f24..3969dbf 100644
--- a/pages/xxsb/map.vue
+++ b/pages/xxsb/map.vue
@@ -1,5 +1,12 @@
 <template>
   <view>
+    <u-navbar
+      title="灾害发生地点"
+      @leftClick="navigateBack"
+      safeAreaInsetTop
+      fixed
+      placeholder
+    ></u-navbar>
     <view class="page-section page-section-gap">
       <map
         style="width: 100%; height: 300px; flex: 1"
@@ -59,6 +66,9 @@ export default {
   onShow () {},
   onLoad () {},
   methods: {
+    navigateBack () {
+      this.$emit('navBack', false)
+    },
     backclick () {
       this.$emit('back', this.lnglat, this.address)
     },
@@ -70,7 +80,7 @@ export default {
       console.log('erreee', 'wgs84', 'gcj02')
 
       uni.getLocation({
-        type: 'wgs84',
+        type: 'gcj02',
         isHighAccuracy: 'true',
         geocode: 'true',
         success: function (res) {