风险模块详情页

src/service/risk.js

@@ -94,6 +94,14 @@ export function postriskBook(url,data) {
   })
 }
 
+// 风险详情
+export function riskDetail(url,data) {
+  return request({
+    url: url,
+    method: 'post',
+    data
+  })
+}
 /*接口对接1 START*/
 
 

src/views/risk/riskAccount/riskBigDetail.vue

@@ -5,133 +5,133 @@
     <div class="con-list">
       <div class="cell-wrap">
         <p>风险上报</p>
-        <van-cell-group inset v-for="(item, index) in reportList" :key="index">
+        <van-cell-group inset >
           <van-row gutter="">
             <van-col span="7"
               ><span class="field-title">所属工程名称:</span></van-col
             >
-            <van-col span="17">{{ item.project }}</van-col>
+            <van-col span="17">{{ riskMain.pId }}</van-col>
           </van-row>
           <van-row gutter="">
             <van-col span="7"
               ><span class="field-title">风险因素:</span></van-col
             >
-            <van-col span="17">{{ item.subject }}</van-col>
+            <van-col span="17">{{ riskMain.riskFactor }}</van-col>
           </van-row>
           <van-row gutter="">
             <van-col span="7"><span class="field-title">风险源:</span></van-col>
-            <van-col span="17">{{ item.findTime }}</van-col>
+            <van-col span="17">{{ riskMain.riskSource }}</van-col>
           </van-row>
           <van-row gutter="">
             <van-col span="7"
               ><span class="field-title">事故类型:</span></van-col
             >
-            <van-col span="17">{{ item.level }}</van-col>
+            <van-col span="17">{{ riskMain.accidentType }}</van-col>
           </van-row>
 
           <!-- 隐藏的字段 -->
-          <div v-show="reportOpen">
+          <div v-show="riskOpen">
             <van-row gutter="">
               <van-col span="7"
                 ><span class="field-title">风险等级:</span></van-col
               >
-              <van-col span="17">{{ item.range }}</van-col>
+              <van-col span="17">{{ riskMain.riskLevel }}</van-col>
             </van-row>
             <van-row gutter="">
               <van-col span="7"
                 ><span class="field-title">风险部位:</span></van-col
               >
-              <van-col span="17">{{ item.type }}</van-col>
+              <van-col span="17">{{ riskMain.emergencyMeasure }}</van-col>
             </van-row>
             <van-row gutter="">
               <van-col span="7"
                 ><span class="field-title">管控层级:</span></van-col
               >
-              <van-col span="17">{{ item.dangerNum }}</van-col>
+              <van-col span="17">{{ riskMain.controlLevel }}</van-col>
             </van-row>
             <van-row gutter="">
               <van-col span="7"
                 ><span class="field-title">主责部门:</span></van-col
               >
-              <van-col span="17">{{ item.source }}</van-col>
+              <van-col span="17">{{ riskMain.responsibilityDept }}</van-col>
             </van-row>
             <van-row gutter="">
               <van-col span="7"
                 ><span class="field-title">主责人员:</span></van-col
               >
-              <van-col span="17">{{ item.source1 }}</van-col>
+              <van-col span="17">{{ riskMain.responsibilityMember }}</van-col>
             </van-row>
             <van-row gutter="">
               <van-col span="7"
                 ><span class="field-title">定级方式:</span></van-col
               >
-              <van-col span="17">{{ item.location }}</van-col>
+              <van-col span="17">{{ riskMain.gradingMethod }}</van-col>
             </van-row>
             <van-row gutter="">
               <van-col span="7"
                 ><span class="field-title">技术措施:</span></van-col
               >
-              <van-col span="17">{{ item.dangerNum }}</van-col>
+              <van-col span="17">{{ riskMain.technicalMeasures }}</van-col>
             </van-row>
             <van-row gutter="">
               <van-col span="7"
                 ><span class="field-title">技术措施(附件):</span></van-col
               >
-              <van-col span="17">{{ item.describe }}</van-col>
+              <van-col span="17">{{ riskMain.technicalMeasures }}</van-col>
             </van-row>
             <van-row gutter="">
               <van-col span="7"
                 ><span class="field-title">管理措施:</span></van-col
               >
-              <van-col span="17">{{ item.uploaderImg }}</van-col>
+              <van-col span="17">{{ riskMain.managementMeasures }}</van-col>
             </van-row>
             <van-row gutter="">
               <van-col span="7"
                 ><span class="field-title">管理措施(附件):</span></van-col
               >
-              <van-col span="17">{{ item.uploaderVideo }}</van-col>
+              <van-col span="17">{{ riskMain.managementMeasures }}</van-col>
             </van-row>
             <van-row gutter="">
               <van-col span="7"
                 ><span class="field-title">应急措施:</span></van-col
               >
-              <van-col span="17">{{ item.expireTime }}</van-col>
+              <van-col span="17">{{ riskMain.emergencyMeasure }}</van-col>
             </van-row>
             <van-row gutter="">
               <van-col span="7"
                 ><span class="field-title">应急措施(附件):</span></van-col
               >
-              <van-col span="17">{{ item.recPeople }}</van-col>
+              <van-col span="17">{{ riskMain.emergencyMeasure }}</van-col>
             </van-row>
           </div>
         </van-cell-group>
         <!-- 展开 -->
-        <div class="more" @click="reportReverse">
-          {{ reportOpenText }}
+        <div class="more" @click="riskReverse">
+          {{ riskOpenText }}
         </div>
       </div>
 
-      <div class="confirme-wrap">
+      <div class="confirme-wrap" v-if="confirmList.length>0">
         <p>风险确认</p>
-        <van-cell-group inset v-for="(item, index) in reportList" :key="index">
+        <van-cell-group inset v-for="(item, index) in confirmList" :key="index" >
           <van-row gutter="">
             <van-col span="7"><span class="field-title">意见:</span></van-col>
-            <van-col span="17">{{ item.subject }}</van-col>
+            <van-col span="17">{{ item.confirmOpinion }}</van-col>
           </van-row>
           <van-row gutter="">
             <van-col span="7"
               ><span class="field-title">隐患确认信息:</span></van-col
             >
-            <van-col span="17">{{ item.project }}</van-col>
+            <van-col span="17">{{ item.confirmResult == 1? "同意":"退回" }}</van-col>
           </van-row>
         </van-cell-group>
       </div>
 
       <div class="journal-wrap">
         <p>日志信息</p>
-        <van-cell-group inset v-for="(item, index) in reportList" :key="index">
-          <van-steps direction="vertical" :active="999">
-            <van-step>
+        <van-cell-group inset >
+          <van-steps direction="vertical" :active="99999" v-if="riskLogList.length>0">
+            <van-step v-for="(item, index) in riskLogList" :key="index">
               <div class="step-wrap">
                 <van-row>
                   <van-col span="24"
@@ -142,58 +142,49 @@
                   <van-col span="5"
                     ><span class="field-title">审批人：</span></van-col
                   >
-                  <van-col span="19">首华建设项目</van-col>
+                  <van-col span="19">{{item.userName}}</van-col>
                 </van-row>
                 <van-row>
                   <van-col span="5"
-                    ><span class="field-title">节点</span></van-col
+                    ><span class="field-title">节点：</span></van-col
                   >
-                  <van-col span="19">隐患上报</van-col>
+                  <van-col span="19">{{item.logNode}}</van-col>
                 </van-row>
                 <van-row>
                   <van-col span="5"
                     ><span class="field-title">结果：</span></van-col
                   >
-                  <van-col span="19">通过</van-col>
+                  <van-col span="19">{{item.logResult}}</van-col>
                 </van-row>
                 <van-row>
                   <van-col span="5"
                     ><span class="field-title">部门：</span></van-col
                   >
-                  <van-col span="19">首华建设项目部</van-col>
+                  <van-col span="19">{{item.deptName}}</van-col>
                 </van-row>
                 <van-row>
                   <van-col span="5"
                     ><span class="field-title">时间：</span></van-col
                   >
-                  <van-col span="19">2021-10-26 16:30:00</van-col>
+                  <van-col span="19">{{item.createTime}}</van-col>
                 </van-row>
               </div>
             </van-step>
           </van-steps>
+          <div style="text-align: center;" v-if="riskLogList.length == 0">暂无数据</div>
         </van-cell-group>
         <!-- 展开 -->
-        <div class="more" @click="journalReverse">
+        <div class="more" @click="journalReverse" v-show="riskLogList.length>0">
           {{ journalOpenText }}
         </div>
       </div>
-
-      <div class="supervise-wrap">
-        <p>督办信息</p>
-        <van-cell-group inset v-for="(item, index) in reportList" :key="index">
-          <div style="text-align: center;">暂无数据</div>
-        </van-cell-group>
-        <!-- 展开 -->
-        <div class="more" @click="superviseReverse" v-show="false">
-          {{ superviseOpenText }}
-        </div>
-      </div>
     </div>
   </div>
 </template>
 
 <script>
 import LHeader from "@/components/header.vue";
+import { riskDetail } from "@/service/risk";
 
 export default {
   components: {
@@ -201,15 +192,16 @@ export default {
   },
   data() {
     return {
-      text: "隐患历史台账",
-      reportOpen: false,
-      reportOpenText: "展开 ▼",
+      id: "",
+      text: "风险历史台账",
+      riskOpen: false,
+      riskOpenText: "展开 ▼",
       journalOpen: false,
       journalOpenText: "展开 ▼",
       superviseOpen: false,
       superviseOpenText: "展开 ▼",
 
-      reportList: [
+      riskList: [
         {
           project: "朝阳区和平街14区简易住宅楼改造项目",
           subject: "临时用电施工组织设计未对盾构施工用电进行专项说明。",
@@ -228,22 +220,48 @@ export default {
           recPeople: "张三"
         }
       ],
-
+      riskMain:"",
+      confirmList:[],
+      riskLogList:[],
       journalList: []
     };
   },
   created() {
+    this.id = this.$route.params.id;
+    if (this.id) {
+      this.postDetail();
+    }
   },
   methods: {
     
+    // 请求台账信息
+    postDetail() {
+      this.$toast.loading({
+        message: "加载中...",
+        forbidClick: true,
+        loadingType: "spinner",
+        duration: 0
+      });
+      riskDetail(`/riskMain/riskDetailsApp/${this.id}`)
+        .then(res => {
+          this.$toast.clear();
+          this.riskMain = res.data.riskMain
+          this.confirmList = res.data.confirmList
+          this.riskLogList = res.data.riskLogList
+        })
+        .catch(() => {
+          this.$toast.clear();
+          this.$toast.fail("加载失败,请稍后再试");
+        });
+    },
 
     // 上报信息显示或隐藏
-    reportReverse() {
-      this.reportOpen = !this.reportOpen;
-      if (this.reportOpen) {
-        this.reportOpenText = "收起 ▲";
+    riskReverse() {
+      this.riskOpen = !this.riskOpen;
+      if (this.riskOpen) {
+        this.riskOpenText = "收起 ▲";
       } else {
-        this.reportOpenText = "展开 ▼";
+        this.riskOpenText = "展开 ▼";
       }
     },
     // 日志信息显示或隐藏

src/views/risk/riskConfirme/index.vue

@@ -122,7 +122,12 @@ export default {
     // 详情
     goDetail(data) {
       console.log(data);
-      this.$router.push("/affirm-detail");
+      this.$router.push({
+        name: "risk-big-detail",
+        params: {
+          id: data.taskId
+        }
+      });
       this.showIndex = null;
     },
     // 确认

src/views/risk/riskReturn/index.vue

@@ -118,7 +118,7 @@ export default {
       clearInterval(this.Loop);
     },
 
-    // 详情
+    // 重新上报
     goDetail(data) {
       console.log(data);
       this.$router.push({