Merge branch 'dev-yf'' into 'develop'

Dev yf'

See merge request !23

src/views/riskProject/add/addCurrent.vue

@@ -440,7 +440,6 @@
             label="参考依据"
             placeholder="请选择"
             @click="selectData('referenceBasis', false)"
-            :rules="[{ required: true, message: '事故类型不能为空' }]"
           />
           <van-dialog
             v-model="showGradeDialog"
@@ -1189,6 +1188,12 @@ export default {
     },
     performTasks() {
       console.log("1233213 :>> ", 1233213);
+      this.$router.push({
+        name: "addPresent",
+        params: {
+          id: this.inherentId
+        }
+      });
     },
     // 点击预览图
     clickPre(e) {

src/views/riskProject/add/addInherent.vue

@@ -15,7 +15,7 @@
           alt=""
           style="position: relative;top: 32%;transform: translateY(-50%);"
         />
-        风险信息
+        固有风险信息
       </div>
       <van-field
         readonly
@@ -437,7 +437,6 @@
         label="参考依据"
         placeholder="请选择"
         @click="selectData('referenceBasis', false)"
-        :rules="[{ required: true, message: '事故类型不能为空' }]"
       />
       <van-dialog
         v-model="showGradeDialog"

src/views/riskProject/add/inherentRisks.vue

@@ -162,13 +162,26 @@ export default {
     //   this.postList();
   },
   methods: {
-    delInherent() {
+    delInherent(item) {
       Dialog.confirm({
         title: "删除固有风险",
         message: "是否确认删除？"
       })
         .then(() => {
           // on confirm
+          getFun(`/risk/plan/inherent/delete/${item.id}`).then(res => {
+            this.$toast.success(res.msg);
+            this.riskList(
+              this.planId,
+              this.buildingId,
+              this.value1,
+              this.value2
+            );
+            // });
+          });
+          {
+            inherentId;
+          }
         })
         .catch(() => {
           // on cancel