Merge branch 'master' of http://123.57.226.179:8080/yin_yu820/HS_MZAP

src/views/activityMan/siteInspection/siteInspectionList.vue

@@ -43,7 +43,7 @@
       title-active-color="#36a7f3"
       @click-tab="onClickTab"
     >
-      <van-tab title="未排查" name="1">
+      <van-tab title="正常" name="1">
         <van-list
           v-model:loading="loading"
           :finished="finished"
@@ -56,7 +56,7 @@
                 <p style="color: #c4c4c4">
                   {{ item.supervisionTime }}
                 </p>
-                <p style="color: red">未排查</p>
+                <p style="color: gray">正常</p>
               </div>
               <van-cell>
                 <template #title>
@@ -90,7 +90,7 @@
           </van-swipe-cell>
         </van-list>
       </van-tab>
-      <van-tab title="正常" name="2">
+      <van-tab title="异常" name="2">
         <van-list
           v-model:loading="loading"
           :finished="finished"
@@ -103,7 +103,7 @@
                 <p  style="color: #c4c4c4">
                   {{ item.supervisionTime }}
                 </p>
-                <p style="color: gray">正常</p>
+                <p style="color: red">异常</p>
               </div>
               <van-cell>
                 <template #title>
@@ -123,7 +123,7 @@
       </van-tab>
 
       <!-- 不合格 -->
-      <van-tab title="不合格" name="3">
+      <!-- <van-tab title="不合格" name="3">
         <van-list
           v-model:loading="loading"
           :finished="finished"
@@ -153,7 +153,7 @@
             </div>
           </van-swipe-cell>
         </van-list>
-      </van-tab>
+      </van-tab> -->
       <!-- 不合格 -->
 
     </van-tabs>

src/views/activityMan/siteInspection/siteInspectionView.vue

@@ -99,6 +99,29 @@
           </van-picker-group>
         </van-popup>
       </van-cell-group>
+	  
+	  <van-cell-group>
+	    
+	    <van-field
+	      v-model="siteInspection.assessment"
+	      center
+	      readonly
+	      required
+	      label="排查结果:"
+	      placeholder="请选择"
+	      input-align="right"
+	      right-icon="arrow-down"
+	      @click="showLx = true"
+	    />
+	    <van-popup v-model:show="showLx" round position="bottom">
+	      <van-picker
+	        title="排查结果"
+	        :columns="facilityTypes"
+	        @cancel="showLx = false"
+	        @confirm="getfacilityType"
+	      />
+	    </van-popup>
+	  </van-cell-group>
 
       <van-cell-group>
         <van-field name="uploader" label="附件:">
@@ -264,6 +287,20 @@ export default {
           .join("/");
       }
     };
+	
+	//选择排查结果
+	let showLx = ref(false);
+	const facilityTypes = [{text:"正常",value:"1"},{text:"异常",value:"2"}];
+	const getfacilityType= ({ selectedOptions }) => {     
+	  if(selectedOptions[0]!=undefined&&selectedOptions[0]!=null){  
+	    siteInspection.value.assessment = selectedOptions[0].value;
+	    //siteInspection.value.facilityTypename = selectedOptions[0].text;
+	    // getVideoAudioList();
+	    // getFireStationList();
+	    showLx.value = false;
+	  }
+	};
+	
     // 文件上传
     let fileList = ref([]);
     let fileupList = ref([]);
@@ -385,6 +422,11 @@ export default {
       onFinish,
       cascaderValue,
 	  
+	  //排查结果选择
+	  showLx,
+	  facilityTypes,
+	  getfacilityType,
+	  
 	  getLocation,
       // 文件上传
       chooseImg,