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

src/views/safetyCheck/components/addPage/addPage.vue

@@ -328,6 +328,7 @@
         }
         this.$set(this.addForm.checkHazardDtoList[index],'hazardCheckCode',obj.code);
         this.$set(this.addForm.checkHazardDtoList[index],'hazardCheckName',obj.name);
+        this.$set(this.addForm.checkHazardDtoList[index],'hazardCheckPoint',obj.mainPoint);
         countHazardNum({subId:this.addForm.subId, hazardCheckPro:val}).then( response => {
           this.$set(this,'hazardCheckCount',response.data);
         })

src/views/safetyCheck/startInspection/index.vue

@@ -665,6 +665,7 @@
         }
         this.$set(this.addForm.checkHazardDtoList[index],'hazardCheckCode',obj.code);
         this.$set(this.addForm.checkHazardDtoList[index],'hazardCheckName',obj.name);
+        this.$set(this.addForm.checkHazardDtoList[index],'hazardCheckPoint',obj.mainPoint);
         countHazardNum({subId:this.addForm.subId, hazardCheckPro:val}).then( response => {
           this.$set(this,'hazardCheckCount',response.data);
         })