diff --git a/src/assets/js/asyncRouter.js b/src/assets/js/asyncRouter.js index 4d4d508..bf3b140 100644 --- a/src/assets/js/asyncRouter.js +++ b/src/assets/js/asyncRouter.js @@ -1561,6 +1561,14 @@ export default [ }, component: "confined_space/job_data/view", }, + { + path: "/confined_space/job_data/add_video", + meta: { + title: "添加监控", + activeMenu: "/confined_space/job_data", + }, + component: "eightwork_videomanager/index", + }, ], }, { @@ -1686,6 +1694,14 @@ export default [ }, component: "high/job_data/view", }, + { + path: "/high/job_data/add_video", + meta: { + title: "添加监控", + activeMenu: "/high/job_data", + }, + component: "eightwork_videomanager/index", + }, ], }, { @@ -1846,6 +1862,14 @@ export default [ }, component: "hot_work/job_data/view", }, + { + path: "/hot_work/job_data/add_video", + meta: { + title: "添加监控", + activeMenu: "/hot_work/job_data", + }, + component: "eightwork_videomanager/index", + }, ], }, { diff --git a/src/request/confined_space.js b/src/request/confined_space.js index e24ffe8..ba879c0 100644 --- a/src/request/confined_space.js +++ b/src/request/confined_space.js @@ -1,9 +1,5 @@ import { post, upload } from "@/request/axios.js"; -export const getConfinedSpaceList = (params) => - post("/confinedspace/list", params); // 受限空间作业管理列表 -export const getConfinedSpaceView = (params) => - post("/confinedspace/goEdit", params); // 受限空间作业管理查看 export const getLedgerList = (params) => post("/limitspace/list", params); // 台账列表 export const setLedgerImport = (params) => upload("/limitspace/readExcel2", params); // 台账导入 diff --git a/src/request/high.js b/src/request/high.js deleted file mode 100644 index 9ffffd6..0000000 --- a/src/request/high.js +++ /dev/null @@ -1,4 +0,0 @@ -import { post } from "@/request/axios.js"; - -export const getHighList = (params) => post("/highwork/list", params); // 高处作业管理列表 -export const getHighView = (params) => post("/highwork/goEdit", params); // 高处作业管理查看 diff --git a/src/views/confined_space/job_data/components/flow_chart.vue b/src/views/confined_space/job_data/components/flow_chart.vue index fc8083a..883fdf7 100644 --- a/src/views/confined_space/job_data/components/flow_chart.vue +++ b/src/views/confined_space/job_data/components/flow_chart.vue @@ -1,81 +1,15 @@ diff --git a/src/views/confined_space/job_data/view.vue b/src/views/confined_space/job_data/view.vue index 585eb89..0eadddf 100644 --- a/src/views/confined_space/job_data/view.vue +++ b/src/views/confined_space/job_data/view.vue @@ -33,24 +33,7 @@ 作业负责人 {{ data.info.CONFIRM_USER_NAME }} - - 作业人 - {{ data.info.WORK_USER }} - 监护人 - -
- 签字： - - {{ data.info.GUARDIAN_USER_SIGNER_TIME }} -
- - + 关联的其他特殊作业及安全作业票编号 {{ data.info.SPECIAL_WORK }} @@ -120,7 +103,7 @@ - +
@@ -131,135 +114,216 @@ - - - - - - + + +
序号 安全措施{{ index + 1 }} {{ item.PROTECTIVE_MEASURES }} - - - 涉   及 - - - 不涉及 - - - {{ item.CONFIRM_NAME }} -
{{ data.measuresList.length + 1 }} -
- - 其他安全措施：{{ data.info.CONFIRM_USER_MEASURES }} - - 编制人：{{ data.info.CONFIRM_USER_NAME }} -
-
- - 其他安全措施：{{ data.info.APPROVE_USER_MEASURES }} - - 编制人：{{ data.info.APPROVE_USER_NAME }} +
+
+ 涉   及 + 不涉及 + + +
- - 安全交底人 - -
- 签字： - - {{ data.info.CONFESS_USER_SIGNER_TIME }} -
- - - - 接受交底人 + +
监护人：
签字： - {{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }} + {{ data.signs.GUARDIAN[0].SIGN_TIME[index] }}
- + -
作业负责人意见：{{ data.info.CONFIRM_CONTENT }}
-
- 签字： - - {{ data.info.CONFIRM_USER_SIGNER_TIME }} +
+ 安全交底人： +
+ +
- - - - -
所在单位意见：{{ data.info.APPROVE_CONTENT }}
-
- 签字： - - {{ data.info.APPROVE_USER_SIGNER_TIME }} -
- - - - -
完工验收：{{ data.info.ACCEPT_CONTENT }}
签字： - {{ item.ACCEPT_USER_SIGNER_TIME }} + {{ data.signs.CONFESS[0].SIGN_TIME[index] }} +
+ + + + +
接受交底人：
+
+ 签字： + + {{ data.signs.ACCEPT_CONFESS[0].SIGN_TIME[index] }} +
+ + + + +
作业负责人意见：{{ data.signs.CONFIRM[0].DESCR }}
+
+ 签字： + + {{ data.signs.CONFIRM[0].SIGN_TIME[index] }} +
+ + + + +
作业人：
+
+ 签字： + + {{ data.signs.WORK_USER[0].SIGN_TIME[index] }} +
+ + + + + +
所在单位意见：{{ data.signs.LEADER[0].DESCR }}
+
+ 签字： + + {{ data.signs.LEADER[0].SIGN_TIME[index] }} +
+ + + + + +
完工验收：{{ data.signs.ACCEPT[0].DESCR }}
+
+ 签字： + + {{ data.signs.ACCEPT[0].SIGN_TIME[index] }}
@@ -272,7 +336,7 @@ import LayoutPrintTablePackage from "@/components/print_table_package/index.vue" import { reactive } from "vue"; import { useRoute } from "vue-router"; import { findCharIndex } from "@/assets/js/utils.js"; -import { getConfinedSpaceView } from "@/request/confined_space.js"; +import { getConfinedSpaceView } from "@/request/eight_work.js"; const VITE_FILE_URL = import.meta.env.VITE_FILE_URL; const route = useRoute(); @@ -282,14 +346,11 @@ const data = reactive({ gasList: [], gas: {}, measuresList: [], - imgList: [], - imgList1: [], + signs: [], }); const fnGetData = async () => { const resData = await getConfinedSpaceView({ CONFINEDSPACE_ID }); data.info = resData.pd; - data.imgList = resData.imgList; - data.imgList1 = resData.imgList1; for (let i = 0; i < resData.measuresList.length; i++) { const PROTECTIVE_MEASURES = resData.measuresList[i].PROTECTIVE_MEASURES.split(""); @@ -307,10 +368,7 @@ const fnGetData = async () => { data.measuresList = resData.measuresList; data.gasList = resData.gasList; data.gas = resData.gas || {}; - data.info.CONFIRM_USER_MEASURES = - data.info.OTHER_PROTECTIVE_MEASURES.split(";_;")[0]; - data.info.APPROVE_USER_MEASURES = - data.info.OTHER_PROTECTIVE_MEASURES.split(";_;")[1]; + data.signs = resData.signs; }; fnGetData(); diff --git a/src/views/high/job_data/components/flow_chart.vue b/src/views/high/job_data/components/flow_chart.vue index 30decea..a701438 100644 --- a/src/views/high/job_data/components/flow_chart.vue +++ b/src/views/high/job_data/components/flow_chart.vue @@ -1,96 +1,15 @@