Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

jiangping

2025-06-06 77946261ec663aa1fe7f6f97e550532ed879f982

 h5/pages/polling/point.vue

@@ -8,7 +8,8 @@
         <template v-if="info.status == 1">

            <view class="line">

               <div class="la">巡检结果：</div>

               <div class="val primaryColor" :class="{red: info.dealStatus == 1}">{{ info.dealStatus == 0 ? '正常' : '异常' }}

               <div class="val primaryColor" :class="{red: info.dealStatus == 1}">

                  {{ info.dealStatus == 0 ? '正常' : info.dealStatus == 1 ? '异常' : '-' }}

               </div>

            </view>

            <view class="line">

@@ -141,10 +142,10 @@
                     id: 1,

                     name: '异常'

                  },

                  {

                     id: '',

                     name: '跳过'

                  },

                  // {

                  //    id: 2,

                  //    name: '跳过'

                  // },

               ]

            ],
            

@@ -170,6 +171,7 @@
               multifileList: fileList,

               id,

            }).then(res => {

               if (res.code == 200) {

               if (handleParam.dealStatus == 1) {

                  return uni.showModal({

                     title: '温馨提示',

@@ -196,6 +198,8 @@
                     uni.navigateBack()
                  }, 300)

               }

               }



            })

         },

         getDetail() {

@@ -506,10 +510,12 @@
         width: 100%;

         height: 100%;

      }


      video {
         width: 100%;
         height: 100%;
      }



      .video_wrap {
         position: relative;
         border: 1px solid;