Merge branch 'web-v2' into web-v2-pro

src/views/oneKeyOutfire/planExecuteRecord/planExecuteRecordDetail.vue

@@ -26,7 +26,8 @@
           <div class="small_title">现场记录<i>(预案发生一个月后将自动清理）</i></div>
           <div class="addPage_b_t_c_b"  v-if="form">
 <!--            <img src="@/assets/images/login-background.jpg">-->
-            <video class="video" :src="form.recordVideo?form.recordVideo:''"  autoplay controls ></video>
+            <img v-if="versionField() === 'kuangYeDaXue_nanHu'" :src="form.recordPhoto">
+            <video v-if="versionField() !== 'kuangYeDaXue_nanHu'" class="video" :src="form.recordVideo?form.recordVideo:''"  autoplay controls ></video>
           </div>
         </div>
         <div class="addPage_b_t_r">

src/views/safetyCheck/startInspection/index.vue

@@ -1102,6 +1102,7 @@
         this.$set(this.addForm,'rectifyNotice','');
         this.$set(this.addForm,'rectifyDeadline','');
         this.$set(this.addForm,'checkHazardDtoList',[]);
+        this.$set(this.addForm,'checkHazardInfoVoList',[]);
       },
       initializationAddData(){
         this.$set(this,'addForm',{
@@ -1118,6 +1119,7 @@
           dateRange:[],
           rectifyDeadline:"",
           checkHazardDtoList:[],
+          checkHazardInfoVoList:[],
         });
         this.$set(this,'planType',1);
         this.$set(this,'planList',[]);
@@ -1224,6 +1226,7 @@
         }
     }
     .start_btn{
+      cursor: pointer;
       font-size: 16px;
       font-family: Microsoft YaHei-Regular, Microsoft YaHei;
       font-weight: 400;