Merge branch 'develop' into dev_kdl

src/views/riskProject/add/addCurrent.vue

@@ -270,7 +270,7 @@ import { getFun, postFun } from "@/service/table.js";
 //     postRiskShowMeasures,
 // } from "@/service/risk";
 export default {
-    name: "risk-add",
+    name: "addCurrent",
     components: {
         LHeader,
     },
@@ -345,9 +345,9 @@ export default {
         };
     },
     created() {
-        if (this.$route.params.inherentId) {
-            this.inherentId = this.$route.params.inherentId
-            this.buildingIds = this.$route.params.buildingId
+        if (this.$route.params.inherentId || sessionStorage.getItem("inherentId")) {
+            this.inherentId = this.$route.params.inherentId || sessionStorage.getItem("inherentId")
+            this.buildingIds = this.$route.params.buildingId || sessionStorage.getItem("buildingId")
             this.postReturnEcho();
         }
         // this.getList();

src/views/riskProject/add/inherentRisks.vue

@@ -154,7 +154,6 @@ export default {
       postFun(
         `/risk/plan/submit/${this.planId}/${this.buildingId}`
       ).then(res => {
-        console.log(res.msg,'lllll')
         Dialog.alert({
           title: '任务执行结束',
           message: res.msg,
@@ -240,12 +239,12 @@ export default {
     },
     async changeFloor() {
       let room = await this.roomList(this.value1);
-      let risk = await this.riskList(this.planId, this.active, this.value1);
+      let risk = await this.riskList(this.planId,this.buildingId, this.value1,this.value2);
     },
     async changeRoom() {
       let risk = await this.riskList(
         this.planId,
-        this.active,
+        this.buildingId,
         this.value1,
         this.value2
       );
@@ -265,6 +264,7 @@ export default {
       sessionStorage.setItem('buildingId',this.buildingId)
       sessionStorage.setItem('planId',this.planId)
       sessionStorage.setItem('buildingName',this.buildingName)
+      sessionStorage.setItem('inherentId',data.businessId || data.id)
       this.$router.push({
         name: "addCurrent",
         params: {

src/views/riskProject/add/resultPage.vue

@@ -55,12 +55,14 @@ import LHeader from "@/components/header.vue";
                 })
             },
             sureClose(){
-                this.$router.push({
-                    name:'addInherent',
-                    params:{
-                        level:this.level
-                    }
-                })
+                // this.$emit('',)
+                history.go(-1)
+                // this.$router.push({
+                //     name:'addInherent',
+                //     params:{
+                //         level:this.level
+                //     }
+                // })
             }
         }
     }

src/views/riskProject/add/taskList.vue

@@ -169,28 +169,25 @@
                 justify="space-between"
                 style="margin-top:10px;"
               >
-                <van-col span="22" @click="toRiskDetail(item)">
+                <van-col span="20" @click="toRiskDetail(item)">
                   <van-col span="5">
                     <van-image
                       width="46"
                       height="46"
                       src="https://img01.yzcdn.cn/vant/cat.jpeg"
                     />
-                    <van-image width="46" height="46" :src="item.avatar" />
+                    <!-- <van-image width="46" height="46" :src="item.avatar" /> -->
                   </van-col>
-                  <van-col span="17">
+                  <van-col span="15">
                     <van-row gutter="">
                       <van-col span="9">风险名称：</van-col>
                       <van-col span="15">{{ item.name }}</van-col>
                     </van-row>
                   </van-col>
                 </van-col>
-                <van-col span="2">
-                  <van-row
-                    :style="{
-                      color: '#03b615'
-                    }"
-                  >
+                <van-col span="4">
+                  <van-row type="flex">
+                    详情
                     <van-icon name="arrow" size="26px" @click="goColorDetail" />
                   </van-row>
                 </van-col>
@@ -561,6 +558,7 @@ export default {
     },
     //执行任务
     performTasks() {
+      console.log( this.messageList,'LLLL')
       sessionStorage.setItem(
         "buildingId",
         this.messageList.riskBuildingListDtos[0].buildingId