Merge branch 'zl-dev'

pages/homeIndex/index.vue

@@ -56,7 +56,7 @@
         mode="aspectFit"
       ></image
       ><span style="color: #000">当前防汛应急响应：</span>
-      <span style="color: #59a7ff">{{ !level?"无":level }}</span>
+      <span style="color: #59a7ff">{{ !level ? '无' : level }}</span>
     </view>
 
     <!-- 24小时综述 -->
@@ -529,7 +529,8 @@ export default {
       }
       if (m > 30) {
         h1 = Number(h) - 1
-        tms = `${this.imgtm}${h}30`
+        let m1 = h > 10 ? h : `0${h}`
+        tms = `${this.imgtm}${m1}30`
         mm = '30'
       } else if (m < 10) {
         tms = `${this.imgtm}${h1}`
@@ -555,7 +556,8 @@ export default {
         h1 = Number(h) - 1
         let t3 = Number(h) - this.numPic
         if (this.numPic <= 0) {
-          tms = `${this.imgtm}${h1}30`
+          let m3 = h1 > 10 ? h1 : `0${h1}`
+          tms = `${this.imgtm}${m3}30`
         } else {
           t3 = t3 < 10 ? `0${t3}` : t3
           tms = `${this.imgtm}${t3}30`
@@ -830,7 +832,7 @@ export default {
         )
         if (data.code == 200) {
           if (data.data.records.length > 0) {
-            console.log("1111111data",data);
+            console.log('1111111data', data)
             this.level = level(data.data.records[0].status)
           } else {
             this.level = '无'

pages/xxsb/dsfrom.vue

@@ -16,7 +16,7 @@
             labelPosition="left"
             :model="formList"
             ref="form3"
-            labelWidth="100"
+            labelWidth="150"
             v-if="key == 3"
           >
             <u-form-item
@@ -607,9 +607,11 @@ export default {
       //   params.adcd = ''
 
       if (this.fileList1.length > 0) {
-        params.fileId = this.fileList1.map(item => {
+        params.fileIds = this.fileList1.map(item => {
           return JSON.parse(item.url).data.fileId
         })
+      } else {
+        params.fileIds = []
       }
 
       uni.$http

pages/xxsb/from.vue

@@ -14,7 +14,7 @@
           labelPosition="left"
           :model="model1"
           ref="form1"
-          labelWidth="100"
+          labelWidth="120"
           v-if="key == 1"
         >
           <u-form-item

pages/xxsb/fromSeverity.vue

@@ -524,9 +524,11 @@ export default {
           params.projectType = this.projectType
           params.isControlled = params.isControlled == '是' ? 1 : 0
           if (this.fileList1.length > 0) {
-            params.fileId = this.fileList1.map(item => {
+            params.fileIds = this.fileList1.map(item => {
               return JSON.parse(item.url).data.fileId
             })
+          } else {
+            params.fileIds = []
           }
 
           uni.$http

pages/xxsb/map.vue

@@ -23,6 +23,7 @@
       >
     </view>
     <u-button
+      :disabled="!address"
       type="primary"
       text="确定"
       customStyle="margin-top: 50px"
@@ -52,6 +53,7 @@ export default {
     }
   },
   mounted () {
+    uni.showLoading({ title: '加载中...', mask: true })
     this.initAMap()
   },
   onShow () {},
@@ -65,24 +67,24 @@ export default {
     },
     initAMap () {
       const self = this
-      console.log('erreee')
+      console.log('erreee', 'wgs84', 'gcj02')
+
       uni.getLocation({
-        type: 'gcj02',
+        type: 'wgs84',
         isHighAccuracy: 'true',
         geocode: 'true',
         success: function (res) {
-          console.log('res', res)
+          console.log('res----------', res)
-
           const latitude = res.latitude
           const longitude = res.longitude
-          // this.lnglat = [109.139726, 29.665203]
-          self.lnglat = [longitude, latitude]
-          // this.lnglat = [res.longitude, res.latitude]
 
+          self.lnglat = [longitude, latitude]
+
+          uni.hideLoading()
           console.log('lnglatlnglat', self.lnglat, res)
           console.log('地址', res.address)
+
           if (res.address) {
-            console.log('地址', res.address)
             let city = res.address.city ? res.address.city : ''
             let district = res.address.district ? res.address.district : ''
             let street = res.address.street ? res.address.street : ''