Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei

MrShi

2025-01-02 77d8f6ccb72cb64c29e77c39fcc8298781d008bb

 h5/pages/polling/point.vue

@@ -31,7 +31,7 @@
               <video v-if="item.type == 1" :src="item.fileurlFull" :controls="false"></video>

            </view>

         </view>

         <view class="desc">{{ info.dealInfo }}</view>

         <view v-if="info.dealInfo" class="desc">{{ info.dealInfo }}</view>

         <view class="line line_s">

            <view class="la">巡检人：</view>

            <view class="val">{{ info.realname }}</view>

@@ -78,11 +78,12 @@
               </view>

            </view>



            <view class="label">处理说明</view>

            <textarea v-model="handleParam.dealInfo" placeholder="请填写处理说明" placeholder-class="placeholder9" />

            <view class="label" style="margin-bottom: 10rpx;">处理说明</view>

            <textarea v-model="handleParam.dealInfo" :maxlength="-1" placeholder="请填写处理说明"

               placeholder-class="placeholder9" />

         </view>

      </view>

      <view class="sub_btn" @click="onSubmit">确认巡检</view>

      <view v-if="info.status == 0" class="sub_btn" @click="onSubmit">确认巡检</view>

      <!--  -->

      <u-popup :show="showUpload" @close="showUpload = false" closeOnClickOverlay>

         <view class="sel_upload_wrap">

@@ -149,34 +150,38 @@
               fileList,

               id

            } = this

            if (handleParam.dealStatus == 1) {

               return uni.showModal({

                  title: '温馨提示',

                  content: '巡检结果异常，是否前往提交工单？',

                  success: function(res) {

                     if (res.confirm) {

                        patrolData({

                           ...handleParam,

                           multifileList: fileList,

                           id,

                        }).then(res => {

                           this.showToast('操作成功')

                           uni.navigateBack()

                        })

            patrolData({

               ...handleParam,

               multifileList: fileList,

               id,

            }).then(res => {

               if (handleParam.dealStatus == 1) {

                  return uni.showModal({

                     title: '温馨提示',

                     content: '巡检结果异常，是否前往提交工单？',

                     success: (res) => {

                        if (res.confirm) {

                           this.showToast('操作成功')
                           setTimeout(() => {
                              uni.redirectTo({
                                 url: '/pages/workOrder/edit'
                              })
                           }, 300)

                        }else{
                           this.showToast('操作成功')
                           setTimeout(() => {
                              uni.navigateBack()
                           }, 300)
                        }

                     }

                  }

               });

            } else {

               patrolData({

                  ...handleParam,

                  multifileList: fileList,

                  id,

               }).then(res => {

                  });

               } else {

                  this.showToast('操作成功')

                  uni.navigateBack()

               })

            }



                  setTimeout(() => {
                     uni.navigateBack()
                  }, 300)

               }

            })

         },

         getDetail() {

            const {

@@ -360,10 +365,11 @@
   }



   .sub_btn {

      position: fixed;

      bottom: 68rpx;

      left: 40rpx;

      // position: fixed;

      // bottom: 68rpx;

      // left: 40rpx;

      width: 670rpx;

      margin-top: 60rpx;

      height: 88rpx;

      background: $primaryColor;

      box-shadow: 0rpx 8rpx 20rpx 0rpx rgba(0, 104, 255, 0.3);

@@ -417,7 +423,7 @@
      textarea {

         box-sizing: border-box;

         width: 690rpx;

         min-height: 200rpx;

         min-height: 140rpx;

         background-color: #f7f7f7;

         font-size: 28rpx;

         color: #333333;