Merge branch 'develop' of http://git.censoft.com.cn/rongtong/rongtong-app into dev-yf'

src/views/riskProject/add/addCurrent.vue

@@ -196,16 +196,16 @@
                         <van-row gutter="">
                             <van-col span="17">
                                 <van-row gutter="">
-                                    <van-col span="9">风险系数：</van-col>
-                                    <van-col span="15">{{ item.time }}</van-col>
+                                    <van-col span="9">风险名称：</van-col>
+                                    <van-col span="15">{{ item.name }}</van-col>
                                 </van-row>
                                 <van-row gutter="">
                                     <van-col span="9">创建时间：</van-col>
-                                    <van-col span="15">{{ item.name }}</van-col>
+                                    <van-col span="15">{{ timestampToTimes(item.createTime) }}</van-col>
                                 </van-row>
                                 <van-row gutter="">
                                     <van-col span="9">风险描述：</van-col>
-                                    <van-col span="15">{{ item.name }}</van-col>
+                                    <van-col span="15">{{ item.describe }}</van-col>
                                 </van-row>
                             </van-col>
                             <van-col span="7" :style="{ color: item.state == 1 ? '#0069e5' : '#03b615' }">
@@ -277,6 +277,7 @@
 import LHeader from "@/components/header.vue";
 import SelectList from "@/components/selectList.vue";
 import selectFloor from "@/components/selectFloor.vue";
+import { timestampToTime, generateId } from "@/utils/format";
 // import selectPeople from "@/views/riskTask/selectPeople/index.vue";
 import { getFun, postFun } from "@/service/table.js";
 // import {
@@ -380,6 +381,9 @@ export default {
         this.getZSGLX();
     },
     methods: {
+        timestampToTimes(time) {
+      return timestampToTime(new Date(time), "DT2", true);
+    },
         tabList(value) {
             console.log(
                 "%c [ value ]-527",
@@ -391,7 +395,7 @@ export default {
             }
         },
         getFloor() {
-            getFun(`/risk/plan/floor/list/${this.inherentId}`)
+            getFun(`/risk/plan/floor/list/${this.buildingIds}`)
                 .then(res => {
                     // this.$toast.clear();
                     // this.showSource = true;
@@ -399,7 +403,7 @@ export default {
                     this.floorSource = newArr;
                 })
                 .catch(() => {
-                    this.$toast.fail("加载失败,请稍后再试");
+                    // this.$toast.fail("加载失败,请稍后再试");
                 });
         },
         getFXYS() {
@@ -408,7 +412,7 @@ export default {
                     this.columnsTrouble = res.data;
                 })
                 .catch(() => {
-                    this.$toast.fail("加载失败,请稍后再试");
+                    // this.$toast.fail("加载失败,请稍后再试");
                 });
         },
         getZSGLX() {
@@ -417,7 +421,7 @@ export default {
                     this.columnsAccident = res.data;
                 })
                 .catch(() => {
-                    this.$toast.fail("加载失败,请稍后再试");
+                    // this.$toast.fail("加载失败,请稍后再试");
                 });
         },
         seletFloor(name) {
@@ -439,7 +443,7 @@ export default {
                     this.columnsSource = res.data;
                 })
                 .catch(() => {
-                    this.$toast.fail("加载失败,请稍后再试");
+                    // this.$toast.fail("加载失败,请稍后再试");
                 });
         },
         //风险因素

src/views/riskProject/add/addInherent.vue

@@ -29,7 +29,7 @@
         readonly
         required
         name="projectId"
-        :value="form.projectName"
+        :value="form.projectId"
         label="所属项目"
         placeholder="请输入"
       />

src/views/riskProject/add/addPresent.vue

@@ -102,7 +102,7 @@
                 @click="seletGrade('level')"
                 :rules="[{ required: true, message: '风险等级不能为空' }]"
             /> -->
-      <van-field
+      <!-- <van-field
         readonly
         v-model="form.level"
         required
@@ -111,7 +111,7 @@
         placeholder="请选择"
         @click="seletGrade"
         :rules="[{ required: true, message: '风险等级不能为空' }]"
-      />
+      /> -->
 
       <van-field
         required
@@ -627,24 +627,24 @@ export default {
     this.form.projectId = "测试项目";
   },
   mounted() {
-    this.getFloor();
+    // this.getFloor();
     this.getFXYS();
     this.getZSGLX();
   },
   methods: {
-    getFloor() {
-      getFun(`/risk/plan/floor/list/${this.form.buildingIds}`)
-        .then(res => {
-          // this.$toast.clear();
-          // this.showSource = true;
+    // getFloor() {
+    //   getFun(`/risk/plan/floor/list/${this.form.buildingIds}`)
+    //     .then(res => {
+    //       // this.$toast.clear();
+    //       // this.showSource = true;
 
-          let newArr = this.renameKeyInTree(res.data, "name", "text");
-          this.floorSource = newArr;
-        })
-        .catch(() => {
-          this.$toast.fail("加载失败,请稍后再试");
-        });
-    },
+    //       let newArr = this.renameKeyInTree(res.data, "name", "text");
+    //       this.floorSource = newArr;
+    //     })
+    //     .catch(() => {
+    //       this.$toast.fail("加载失败,请稍后再试");
+    //     });
+    // },
     getFXYS() {
       getFun(`/risk/plan/dict/data/list?dictType=risk_plan_factor`)
         .then(res => {