Merge branch 'develop' into dev_kdl

src/views/login.vue

@@ -2,7 +2,7 @@
   <div class="login" :style="{ backgroundImage: `url(${bg})` }">
     <div class="title">
       <div class="login-logo">
-        融通危险源辨识系统建设项目
+        融通危险源辨识系统
       </div>
       <!-- <div class="login-name">Enterprise Business Data Monitoring</div> -->
     </div>

src/views/riskProject/add/taskList.vue

@@ -22,14 +22,18 @@
           <div>开始时间:</div>
           <div>
             {{
-              timestampToTimes(messageList.startTime,'DT2') || messageList.startTime
+              timestampToTimes(messageList.startTime, "DT2") ||
+                messageList.startTime
             }}
           </div>
         </van-grid-item>
         <van-grid-item>
           <div>结束时间:</div>
           <div>
-            {{ timestampToTimes(messageList.endTime,'DT2') || messageList.endTime }}
+            {{
+              timestampToTimes(messageList.endTime, "DT2") ||
+                messageList.endTime
+            }}
           </div>
         </van-grid-item>
       </van-grid>
@@ -130,7 +134,7 @@
               input-align="right"
               :formatter="
                 () => {
-                  return timestampToTimes(form.startTime,'DT2');
+                  return timestampToTimes(form.startTime, 'DT2');
                 }
               "
               :rules="[{ required: true, message: '任务开始时间不能为空' }]"
@@ -143,7 +147,7 @@
               label="任务结束时间"
               :formatter="
                 () => {
-                  return timestampToTimes(form.endTime,'DT2')
+                  return timestampToTimes(form.endTime, 'DT2');
                 }
               "
               input-align="right"
@@ -171,7 +175,7 @@
                 style="margin-top:10px;"
                 @click="toRiskDetail(item)"
               >
-                <van-col span="20" >
+                <van-col span="20">
                   <van-col span="5">
                     <van-image
                       width="46"
@@ -190,7 +194,7 @@
                 <van-col span="4">
                   <van-row type="flex">
                     详情
-                    <van-icon name="arrow" size="26px"  />
+                    <van-icon name="arrow" size="26px" />
                   </van-row>
                 </van-col>
               </van-row>
@@ -210,7 +214,7 @@
                     <van-row>
                       <van-col span="24">
                         <div class="info-title">
-                          {{ timestampToTimes(item.startTime,"DT1") }}
+                          {{ timestampToTimes(item.startTime, "DT1") }}
                         </div>
                       </van-col>
                     </van-row>
@@ -222,15 +226,17 @@
                     </van-row>
                     <van-row>
                       <van-col span="7"
-                        ><span class="field-title">审批结果：</span></van-col
+                        ><span class="field-title">任务节点：</span></van-col
                       >
                       <van-col span="17">{{ item.taskName }}</van-col>
                     </van-row>
-                    <van-row>
+                    <van-row v-show="item.taskResult">
                       <van-col span="7"
-                        ><span class="field-title">岗位：</span></van-col
+                        ><span class="field-title">审批结果：</span></van-col
                       >
-                      <van-col span="17">{{ item.taskResult }}</van-col>
+                      <van-col span="17">{{
+                        item.taskResult == 1 ? "审批通过" : "审批否决"
+                      }}</van-col>
                     </van-row>
                     <!-- <van-row>
                     <van-col span="7"
@@ -341,7 +347,7 @@
       </div>
     </div>
     <div
-      v-show="pathAuth == 'riskApprove' && status == 2"
+      v-show="pathAuth == 'riskApprove0' && status == 2"
       style="display: flex;
         justify-content: space-around;
         background-color: #fff;
@@ -426,7 +432,7 @@
                   <van-row gutter="">
                     <van-col span="8">发起时间：</van-col>
                     <van-col span="16"
-                      >{{ timestampToTimes(item.startTime,"DT2") }}
+                      >{{ timestampToTimes(item.startTime, "DT2") }}
                     </van-col>
                   </van-row>
                 </van-col>
@@ -555,12 +561,12 @@ export default {
     this.getRiskTaskList(this.planId, buildingId);
   },
   methods: {
-    timestampToTimes(time,type) {
+    timestampToTimes(time, type) {
       return timestampToTime(new Date(time), type, true);
     },
     //执行任务
     performTasks() {
-      console.log( this.messageList,'LLLL')
+      console.log(this.messageList, "LLLL");
       sessionStorage.setItem(
         "buildingId",
         this.messageList.riskBuildingListDtos[0].buildingId
@@ -642,7 +648,7 @@ export default {
           console.log(res.data, "lll");
           this.riskList = res.data;
         });
-      }else{
+      } else {
         getFun(`/risk/plan/inherent/list/${planId}`).then(res => {
           console.log(res.data, "lll");
           this.riskList = res.data;

src/views/riskProject/approve/index.vue

@@ -53,7 +53,7 @@
                     type="info"
                     size="mini"
                     @click="todetail(index, item)"
-                    >{{ active == 2 ? "去处理" : "去审批" }}</van-button
+                    >{{ active == 0 ? "去审批" : "查看详情" }}</van-button
                   >
                 </van-row>
               </van-col>
@@ -121,7 +121,7 @@ export default {
       buildingList: []
     };
   },
-  created() {
+  mounted() {
     this.postList(0);
   },
   methods: {
@@ -144,9 +144,9 @@ export default {
         duration: 0
       });
       let url = `/risk/plan/approve/list?status=running`;
-      if (name == 0) {
+      if (this.active == 0) {
         url = `/risk/plan/approve/list?status=running`;
-      } else if (name == 1) {
+      } else if (this.active == 1) {
         url = `/risk/plan/approve/list?status=completed`;
       } else {
         url = `/risk/plan/approve/list?status=return`;
@@ -175,7 +175,8 @@ export default {
           // buildingId: item.buildingId
         }
       });
-      sessionStorage.setItem("pathAuth", "riskApprove");
+      if (this.active == 0) sessionStorage.setItem("pathAuth", "riskApprove0");
+      else sessionStorage.setItem("pathAuth", "riskApprove1");
       sessionStorage.setItem("planId", item.id);
       sessionStorage.setItem("buildingId", "");
     }

src/views/riskProject/execution/index.vue

@@ -26,7 +26,7 @@
               <van-col span="17">
                 <van-row gutter="">
                   <van-col span="9">创建人：</van-col>
-                  <van-col span="15">{{ item.leaderUserName }}</van-col>
+                  <van-col span="15">{{ item.createUserName }}</van-col>
                 </van-row>
                 <van-row gutter="">
                   <van-col span="9">发起时间：</van-col>

src/views/riskProject/taskLedger/taskDetail.vue

@@ -17,8 +17,8 @@
               <van-row gutter="4">
                 <van-col span="17">
                   <van-row gutter="">
-                    <van-col span="9">风险系数：</van-col>
-                    <van-col span="15">{{ item.coefficient }}</van-col>
+                    <van-col span="9">风险等级：</van-col>
+                    <van-col span="15">{{ item.level }}</van-col>
                   </van-row>
                   <van-row gutter="">
                     <van-col span="9">创建时间：</van-col>
@@ -27,9 +27,9 @@
                     }}</van-col>
                   </van-row>
                   <van-row gutter="">
-                    <van-col span="9">风险描述：</van-col>
+                    <van-col span="9">风险因素：</van-col>
                     <van-col span="15">{{
-                      item.describe
+                      item.factor
                     }}</van-col>
                   </van-row>
                 </van-col>

src/views/saveWorkbench/index.vue

@@ -3,20 +3,20 @@
     <!-- 头部标签 -->
     <van-sticky>
       <header class="header-wrap">
-        办公控制台
+        工作台
       </header>
     </van-sticky>
-    <van-notice-bar left-icon="volume-o" :scrollable="true" color="#a09c9c" background="#D5EAFF">
+    <!-- <van-notice-bar left-icon="volume-o" :scrollable="true" color="#a09c9c" background="#D5EAFF">
       <van-swipe class="notice-swipe" :show-indicators="false" width="100vw">
         <van-swipe-item>危险源系统正式上线</van-swipe-item>
         <van-swipe-item>汛期安全防护会议计划本周日召开</van-swipe-item>
       </van-swipe>
-    </van-notice-bar>
-    <van-swipe :autoplay="6000">
+    </van-notice-bar> -->
+    <!-- <van-swipe :autoplay="6000">
       <van-swipe-item v-for="(item, index) in images" :key="index">
         <img style="width:100%;height:200px" :src="item.url" />
       </van-swipe-item>
-    </van-swipe>
+    </van-swipe> -->
     <div class="con">
       <van-cell-group inset v-if="finalRiskList.length > 0">
         <van-cell value="风险评估管理" />

vue.config.js

@@ -8,10 +8,10 @@ module.exports = {
     //以上的ip和端口是我们本机的;下面为需要跨域的
     proxy: { //配置跨域
       '/app-api': {
-        // target: 'http://192.168.4.232:8080/', //这里是后台的地址
+        target: 'http://192.168.4.232:8080/', //这里是后台的地址
         // target: 'http://192.168.15.124:8080/', //这里是杨帆的地址
         // target: 'http://192.168.10.137:8080/', //这里是昊哥的地址
-        target: 'http://192.168.10.36:8080/', //这里是昊哥的地址
+        // target: 'http://192.168.10.36:8080/', //这里是昊哥的地址
         // target: 'http://localhost:8080/', //这里是后台的地址
         ws: true,
         changOrigin: true, //允许跨域