列表页

src/service/danger.js

@@ -2,7 +2,7 @@ import request from '@/utils/axios'
 
 // 隐患上报模块
 // 请求新增表单数据信息的
-export function getFormList(url,params) {
+export function getFormList(url, params) {
     return request({
         url: url,
         method: 'get',
@@ -10,7 +10,7 @@ export function getFormList(url,params) {
     })
 }
 // 隐患类型
-export function postHdTyp(url,data) {
+export function postHdTyp(url, data) {
     return request({
         url: url,
         method: 'post',
@@ -18,7 +18,7 @@ export function postHdTyp(url,data) {
     })
 }
 // 隐患项目名称
-export function postHdName(url,data) {
+export function postHdName(url, data) {
     return request({
         url: url,
         method: 'post',
@@ -26,7 +26,7 @@ export function postHdName(url,data) {
     })
 }
 // 隐患项目编号和隐患级别
-export function postHdInventories(url,data) {
+export function postHdInventories(url, data) {
     return request({
         url: url,
         method: 'post',
@@ -34,7 +34,7 @@ export function postHdInventories(url,data) {
     })
 }
 // 风险源带出来的字段
-export function postHdRiskSource(url,data) {
+export function postHdRiskSource(url, data) {
     return request({
         url: url,
         method: 'post',
@@ -42,7 +42,7 @@ export function postHdRiskSource(url,data) {
     })
 }
 // 隐患整改人接口
-export function postHdShowPeople(url,data) {
+export function postHdShowPeople(url, data) {
     return request({
         url: url,
         method: 'post',
@@ -52,7 +52,7 @@ export function postHdShowPeople(url,data) {
 
 
 // 隐患上报保存接口
-export function postHdReportAdd(url,data) {
+export function postHdReportAdd(url, data) {
     return request({
         url: url,
         method: 'post',
@@ -61,7 +61,7 @@ export function postHdReportAdd(url,data) {
 }
 
 // 隐患上报已退回列表
-export function dangerReturn(url,data) {
+export function dangerReturn(url, data) {
     return request({
         url: url,
         method: 'post',
@@ -69,7 +69,7 @@ export function dangerReturn(url,data) {
     })
 }
 // 隐患上报已退回删除
-export function dangerReturnDel(url,data) {
+export function dangerReturnDel(url, data) {
     return request({
         url: url,
         method: 'post',
@@ -78,7 +78,7 @@ export function dangerReturnDel(url,data) {
 }
 
 // 隐患上报已退回  回显所有数据接口
-export function dangerReturnEcho(url,data) {
+export function dangerReturnEcho(url, data) {
     return request({
         url: url,
         method: 'get',
@@ -87,7 +87,7 @@ export function dangerReturnEcho(url,data) {
 }
 
 // 隐患上报已退回  保存接口
-export function dangerReturnAdd(url,data) {
+export function dangerReturnAdd(url, data) {
     return request({
         url: url,
         method: 'get',
@@ -98,7 +98,7 @@ export function dangerReturnAdd(url,data) {
 
 // 隐患确认模块
 // 隐患确认列表
-export function dangerConfirm(url,data) {
+export function dangerConfirm(url, data) {
     return request({
         url: url,
         method: 'post',
@@ -106,7 +106,7 @@ export function dangerConfirm(url,data) {
     })
 }
 // 隐患确认form表单列表数据
-export function getConfirmFormList(url,params) {
+export function getConfirmFormList(url, params) {
     return request({
         url: url,
         method: 'get',
@@ -114,7 +114,7 @@ export function getConfirmFormList(url,params) {
     })
 }
 // 隐患确认提交
-export function dangerConSub(url,data) {
+export function dangerConSub(url, data) {
     return request({
         url: url,
         method: 'post',
@@ -124,7 +124,7 @@ export function dangerConSub(url,data) {
 
 // 隐患整改模块
 // 隐患整改列表
-export function dangerRect(url,data) {
+export function dangerRect(url, data) {
     return request({
         url: url,
         method: 'post',
@@ -132,7 +132,7 @@ export function dangerRect(url,data) {
     })
 }
 // 隐患整改 有退回原因的
-export function dangerRectReturn(url,params) {
+export function dangerRectReturn(url, params) {
     return request({
         url: url,
         method: 'get',
@@ -140,7 +140,7 @@ export function dangerRectReturn(url,params) {
     })
 }
 // 隐患整改保存 没有退回原因
-export function dangerRectAdd(url,data) {
+export function dangerRectAdd(url, data) {
     return request({
         url: url,
         method: 'post',
@@ -150,7 +150,7 @@ export function dangerRectAdd(url,data) {
 
 // 整改复查模块
 // 整改复查列表
-export function dangerReview(url,data) {
+export function dangerReview(url, data) {
     return request({
         url: url,
         method: 'post',
@@ -158,7 +158,7 @@ export function dangerReview(url,data) {
     })
 }
 // 整改复查保存
-export function dangerReviewAdd(url,data) {
+export function dangerReviewAdd(url, data) {
     return request({
         url: url,
         method: 'post',
@@ -167,7 +167,7 @@ export function dangerReviewAdd(url,data) {
 }
 
 // 隐患历史台账模块
-export function dangerStandBook(url,data) {
+export function dangerStandBook(url, data) {
     return request({
         url: url,
         method: 'post',
@@ -176,7 +176,34 @@ export function dangerStandBook(url,data) {
 }
 
 // 隐患各种台账详情模块
-export function standBookDetail(url,data) {
+export function standBookDetail(url, data) {
+    return request({
+        url: url,
+        method: 'post',
+        data
+    })
+}
+
+//重大隐患台账
+export function majorList(url, data) {
+    return request({
+        url: url,
+        method: 'post',
+        data
+    })
+}
+
+//隐患督办
+export function superviseList(url, data) {
+    return request({
+        url: url,
+        method: 'post',
+        data
+    })
+}
+
+//经理督办
+export function superviseSABList(url, data) {
     return request({
         url: url,
         method: 'post',

src/views/danger/majorDanger/index.vue

@@ -15,21 +15,21 @@
       >
 
         <van-row gutter="">
-          <van-col span="7">所属工程名称:</van-col>
-          <van-col span="17">{{ item.proId }}</van-col>
+          <van-col span="7">隐患编号:</van-col>
+          <van-col span="17">{{ item.businessId }}</van-col>
         </van-row>
       
         <van-row gutter="">
           <van-col span="7">隐患项目名称:</van-col>
-          <van-col span="17">{{ item.subject }}</van-col>
+          <van-col span="17">{{ item.proId }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="7">隐患发现时间:</van-col>
-          <van-col span="17">{{ item.findTime }}</van-col>
+          <van-col span="7">隐患级别:</van-col>
+          <van-col span="17">{{ item.hdLev }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="7">隐患级别:</van-col>
-          <van-col span="17">{{ item.level }}</van-col>
+          <van-col span="7">发现时间:</van-col>
+          <van-col span="17">{{ item.startDate }}</van-col>
         </van-row>
    <!-- *接口对接4 END -->
 
@@ -50,7 +50,7 @@
 
 <script>
 import LHeader from "@/components/header.vue";
-import { postriskBook } from "@/service/risk";
+import { majorList } from "@/service/danger";
 
 /*接口对接2 START*/
 // 例子：
@@ -93,7 +93,7 @@ export default {
         loadingType: "spinner",
         duration: 0
       });
-      postriskBook("/riskMain/doneList")
+      majorList("/majorapprove/list")
         .then(res => {
           this.$toast.clear();
           this.messageList = res.rows

src/views/danger/managerDanger/index.vue

@@ -15,21 +15,20 @@
       >
 
         <van-row gutter="">
-          <van-col span="7">所属工程名称:</van-col>
-          <van-col span="17">{{ item.proId }}</van-col>
+          <van-col span="7">隐患编号:</van-col>
+          <van-col span="17">{{ item.processInstanceId }}</van-col>
         </van-row>
-      
         <van-row gutter="">
           <van-col span="7">隐患项目名称:</van-col>
-          <van-col span="17">{{ item.subject }}</van-col>
+          <van-col span="17">{{ item.projectName }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="7">隐患发现时间:</van-col>
-          <van-col span="17">{{ item.findTime }}</van-col>
+          <van-col span="7">隐患级别:</van-col>
+          <van-col span="17">{{ item.hdLev }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="7">隐患级别:</van-col>
-          <van-col span="17">{{ item.level }}</van-col>
+          <van-col span="7">隐患发现时间:</van-col>
+          <van-col span="17">{{ item.createTime }}</van-col>
         </van-row>
    <!-- *接口对接4 END -->
 
@@ -50,7 +49,7 @@
 
 <script>
 import LHeader from "@/components/header.vue";
-import { postriskBook } from "@/service/risk";
+import { superviseSABList } from "@/service/danger";
 
 /*接口对接2 START*/
 // 例子：
@@ -73,7 +72,7 @@ export default {
   },
   data() {
     return {
-      text: "项目经理督",
+      text: "项目经理督办",
       searchValue: "",
        messageList: [],
       Loop: "", // 定时器
@@ -93,7 +92,7 @@ export default {
         loadingType: "spinner",
         duration: 0
       });
-      postriskBook("/riskMain/doneList")
+      superviseSABList("/supervise/SABlist")
         .then(res => {
           this.$toast.clear();
           this.messageList = res.rows

src/views/danger/superviseDanger/index.vue

@@ -9,27 +9,25 @@
         inset
         v-for="(item, index) in messageList"
         :key="index"
-        @click="read(item)"
         @touchstart="touchstart(index, item)"
         @touchend.prevent="touchend(index)"
       >
 
         <van-row gutter="">
-          <van-col span="7">所属工程名称:</van-col>
-          <van-col span="17">{{ item.proId }}</van-col>
+          <van-col span="7">隐患编号:</van-col>
+          <van-col span="17">{{ item.processInstanceId }}</van-col>
         </van-row>
-      
         <van-row gutter="">
           <van-col span="7">隐患项目名称:</van-col>
-          <van-col span="17">{{ item.subject }}</van-col>
+          <van-col span="17">{{ item.projectName }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="7">隐患发现时间:</van-col>
-          <van-col span="17">{{ item.findTime }}</van-col>
+          <van-col span="7">隐患级别:</van-col>
+          <van-col span="17">{{ item.hdLev }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="7">隐患级别:</van-col>
-          <van-col span="17">{{ item.level }}</van-col>
+          <van-col span="7">隐患发现时间:</van-col>
+          <van-col span="17">{{ item.createTime }}</van-col>
         </van-row>
    <!-- *接口对接4 END -->
 
@@ -50,7 +48,7 @@
 
 <script>
 import LHeader from "@/components/header.vue";
-import { postriskBook } from "@/service/risk";
+import { superviseList } from "@/service/danger";
 
 /*接口对接2 START*/
 // 例子：
@@ -73,7 +71,7 @@ export default {
   },
   data() {
     return {
-      text: "隐患督办",
+      text: "隐患督办123",
       searchValue: "",
        messageList: [],
       Loop: "", // 定时器
@@ -93,10 +91,10 @@ export default {
         loadingType: "spinner",
         duration: 0
       });
-      postriskBook("/riskMain/doneList")
+      superviseList("/supervise/list")
         .then(res => {
           this.$toast.clear();
-          this.messageList = res.rows
+          this.messageList = res.data
           
         })
         .catch(() => {

src/views/risk/riskAccount/index.vue

@@ -14,22 +14,25 @@
         @touchend.prevent="touchend(index)"
       >
 
+        <van-row gutter="">
+          <van-col span="7">风险编号:</van-col>
+          <van-col span="17">{{ item.processInstanceId }}</van-col>
+        </van-row>
         <van-row gutter="">
           <van-col span="7">所属工程名称:</van-col>
           <van-col span="17">{{ item.proId }}</van-col>
         </van-row>
-      
         <van-row gutter="">
-          <van-col span="7">隐患项目名称:</van-col>
-          <van-col span="17">{{ item.subject }}</van-col>
+          <van-col span="7">风险等级:</van-col>
+          <van-col span="17">{{ item.riskLevel }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="7">隐患发现时间:</van-col>
-          <van-col span="17">{{ item.findTime }}</van-col>
+          <van-col span="7">风险源:</van-col>
+          <van-col span="17">{{ item.riskSource }}</van-col>
         </van-row>
          <van-row gutter="">
-          <van-col span="7">隐患级别:</van-col>
-          <van-col span="17">{{ item.level }}</van-col>
+          <van-col span="7">创建时间:</van-col>
+          <van-col span="17">{{ item.startDate }}</van-col>
         </van-row>
    <!-- *接口对接4 END -->