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

src/views/riskProject/add/addInherent.vue

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

src/views/riskProject/add/addPresent.vue

@@ -28,8 +28,8 @@
       <van-field
         readonly
         required
-        name="projectId"
-        :value="form.projectId"
+        name="projectName"
+        :value="form.projectName"
         label="所属项目"
         placeholder="请输入"
       />
@@ -44,12 +44,11 @@
 
       <van-field
         required
-        clickable
+        readonly
         name="floorName"
         :value="form.floorName"
         label="所属楼层"
         placeholder="请选择"
-        @click="seletFloor('floor')"
         :rules="[{ required: true, message: '所属楼层不能为空' }]"
       />
 
@@ -60,7 +59,6 @@
         :value="form.roomName"
         label="所属房间"
         placeholder="请输入"
-        @click="seletRoom('room')"
         :rules="[{ required: true, message: '所属房间不能为空' }]"
       />
 
@@ -616,6 +614,9 @@ export default {
     this.form.deptName = userInfo.dept.deptName;
     this.form.planId = this.$route.params.planId;
     this.form.floorId = this.$route.params.floorId;
+    this.form.floorName = this.$route.params.floorName;
+    this.form.projectName = this.$route.params.projectName;
+    this.form.projectId = this.$route.params.projectId;
     this.form.roomId = this.$route.params.roomId;
     this.form.inherentId = this.$route.params.id;
     this.form.roomName = this.$route.params.roomName;
@@ -753,7 +754,7 @@ export default {
     },
     //开始测评
     goResultPage() {
-      this.$router.push({
+      this.$router.replace({
         name: "resultPage",
         params: {
           score: this.severityScore * this.possibleScore