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

src/views/riskProject/add/addCurrent.vue

@@ -354,7 +354,7 @@ export default {
     created() {
         if (this.$route.params.inherentId) {
             this.inherentId = this.$route.params.inherentId
-            this.buildingIds = this.$route.params.buildingIds
+            this.buildingIds = this.$route.params.buildingId
             this.postReturnEcho();
         }
         // this.getList();
@@ -458,6 +458,11 @@ export default {
                 params: {
                     id: this.inherentId,
                     // planId:this.planId
+                    buildingId:this.buildingId,
+                    planId:this.inherentId,
+                    floorId:this.form.floorId,
+                    roomName:this.form.roomName,
+                    roomId:this.form.roomId,
                 },
             })
         },

src/views/riskProject/add/addPresent.vue

 <template>
     <div>
         <LHeader :text="text"></LHeader>
-     
         <van-form
             @submit="onSubmit"
             :scroll-to-error="true"
@@ -466,11 +465,16 @@ export default {
         var userInfo=getUserInfo()
         this.form.buildingIds=this.$route.params.id
         this.form.planId=this.$route.params.planId
+        this.form.floorId = this.$route.params.floorId
+        this.form.roomId = this.$route.params.roomId
+        this.form.inherentId = this.$route.params.id
+        this.form.roomName = this.$route.params.roomName
         this.form.buildingName = '1号楼'
         this.form.userId=userInfo.userId
         this.form.userName=userInfo.userName
         this.form.deptName=userInfo.dept.deptName
         this.form.projectId='测试项目'
+        
     },
     methods: {
         seletFloor(name){
@@ -600,7 +604,8 @@ export default {
         onSubmit(values) {
             // console.log('%c [ values ]-592', 'font-size:13px; background:pink; color:#bf2c9f;', values)
             var formDataJson=this.jsonToFormData(this.form)
-            let url = "/risk/plan/inherent";
+            // let url = "/risk/plan/inherent";
+            let url = "/risk/plan/existing";
             values.hdPicture1.forEach((item) => {
                 if (item.file) {
                     formDataJson.append("pictureFile[]", item.file);

src/views/riskProject/add/inherentRisks.vue

@@ -16,7 +16,6 @@
               <div style="font-size: 0.45rem;padding: 5px 0;">
                 {{ item.title }}
               </div>
-
               <van-row gutter="">
                 <van-col span="17">
                   <van-row gutter="">
@@ -263,11 +262,16 @@ export default {
     },
     // 详情
     goDetail(data) {
+      sessionStorage.setItem('buildingId',this.buildingId)
+      sessionStorage.setItem('planId',this.planId)
+      sessionStorage.setItem('buildingName',this.buildingName)
       this.$router.push({
         name: "addCurrent",
         params: {
           inherentId: data.businessId || data.id,
-          buildingIds: this.active
+          planId: this.planId,
+          buildingId:this.buildingId,
+          buildingName:this.buildingName
         }
       });
       this.showIndex = null;

src/views/riskProject/taskLedger/taskDetail.vue

@@ -3,33 +3,101 @@
     <van-sticky offset-top="0">
       <LHeader :text="text"></LHeader>
     </van-sticky>
+    <div class="section">
+      <van-tabs v-model="activeName" color="#2980f7" animated >
+        <van-tab title="固有风险信息" name="a">
+
+        </van-tab>
+        <van-tab title="现状风险" name="b">
+          <van-cell-group
+            inset
+            v-for="(item, index) in quoRiskList"
+            :key="index"
+          >
+            <div style="font-size: 0.45rem;padding: 5px 0;">
+              {{ item.name }}
+            </div>
+            <van-row gutter="">
+              <van-col span="17">
+                <van-row gutter="">
+                  <van-col span="9">创建人：</van-col>
+                  <van-col span="15">{{ item.leaderUserName }}</van-col>
+                </van-row>
+                <van-row gutter="">
+                  <van-col span="9">发起时间：</van-col>
+                  <van-col span="15">{{
+                    timestampToTimes(item.startTime)
+                  }}</van-col>
+                </van-row>
+              </van-col>
+              <van-col span="7">
+                <van-row>
+                  {{ item.state }}
+                </van-row>
+                <van-row>
+                  <van-button
+                    type="info"
+                    size="mini"
+                    @click="todetail(index, item)"
+                    >{{ active == 2 ? "去处理" : "去审批" }}</van-button
+                  >
+                </van-row>
+              </van-col>
+            </van-row>
+          </van-cell-group>
+        </van-tab>
+        <van-tab title="四色图" name="c">
+          <drawCanvas/>
+        </van-tab>
+      </van-tabs>
+    </div>
   </div>
 </template>
 
 <script type="text/ecmascript-6">
 import LHeader from "@/components/header.vue";
+import drawCanvas from '@/views/drawCanvas/riskView.vue'
+import { getFun, postFun } from "@/service/table.js";
 export default {
-  name:'taskDetail',
+  name: 'taskDetail',
   data() {
     return {
       text: "固有风险列表",
+      activeName: 'a',
+      quoRiskList:[],//现状风险列表
+      InherentRisk:[],//固有风险
+      inherentId:''
     }
   },
   components: {
     LHeader,
+    drawCanvas
+  },
+  created(){
+    this.inherentId = this.$route.params.id
   },
   mounted() {
-    
+    this.getQuoRiskList(this.$route.params.id)
   },
   methods: {
-    
+    getQuoRiskList(inherentId){
+      getFun(`/risk/plan/existing/list/${inherentId}`).then(res=>{
+        this.quoRiskList = res.data
+      })
+    }
   },
 }
 </script>
 
 <style scoped>
-.wrap{
-    height: 100vh;
-    width: 100vw;
+.wrap {
+  height: 100vh;
+  width: 100vw;
+}
+
+.section {
+  width: 100%;
+  height: 100%;
+  overflow-y: auto;
 }
 </style>

vue.config.js

@@ -3,13 +3,13 @@ module.exports = {
   devServer: {
     open: true,
     host: 'localhost',
-    port: 8081,
+    port: 8080,
     https: false,
     //以上的ip和端口是我们本机的;下面为需要跨域的
     proxy: { //配置跨域
       '/app-api': {
-        // target: 'http://192.168.4.232:8080/', //这里是后台的地址
-        target: 'http://192.168.15.124:8080/', //这里是杨帆的地址
+        target: 'http://192.168.4.232:8080/', //这里是后台的地址
+        // target: 'http://192.168.15.124:8080/', //这里是杨帆的地址
         // target: 'http://192.168.10.137:8080/', //这里是昊哥的地址
         // target: 'http://localhost:8080/', //这里是后台的地址
         ws: true,