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

renkang

2025-02-07 a80fcaaf130286f215a35aa62450421b480b4d5a

 h5/pages/polling/point.vue

@@ -8,7 +8,7 @@
         <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 +141,10 @@
                     id: 1,

                     name: '异常'

                  },

                  {

                     id: '',

                     name: '跳过'

                  },

                  // {

                  //    id: 2,

                  //    name: '跳过'

                  // },

               ]

            ],