diff --git a/src/assets/css/common.scss b/src/assets/css/common.scss index 9c727ad..cf485f8 100644 --- a/src/assets/css/common.scss +++ b/src/assets/css/common.scss @@ -184,7 +184,7 @@ a { display: none; } -@mixin table { +@mixin table($tdTextAlign,$titleTextAlign) { border-collapse: collapse; width: 100%; display: table; @@ -198,17 +198,22 @@ a { border: 1px solid var(--el-border-color); padding: 8px; line-height: 1.6; - text-align: center; + text-align: $tdTextAlign; } .title { background: var(--el-fill-color-light); width: 200px; + text-align: $titleTextAlign; } } .print_table { - @include table; + @include table(center,left); +} + +.archive_print_table { + @include table(left,center); } img.ml-10:first-child { @@ -326,7 +331,7 @@ div::-webkit-scrollbar-track { } .print_use { - @include table; + @include table(center,left); } .print_no_use { diff --git a/src/assets/js/asyncRouter.js b/src/assets/js/asyncRouter.js index 1abe98a..1e499b6 100644 --- a/src/assets/js/asyncRouter.js +++ b/src/assets/js/asyncRouter.js @@ -1794,6 +1794,14 @@ export default [ }, component: "blind_plate_plugging/job_data/view", }, + { + path: "/blind_plate_plugging/job_data/add_video", + meta: { + title: "添加监控", + activeMenu: "/blind_plate_plugging/job_data", + }, + component: "eightwork_videomanager/index", + }, ], }, { @@ -1834,6 +1842,14 @@ export default [ }, component: "groundbreaking/job_data/view", }, + { + path: "/blind_plate_plugging/job_data/add_video", + meta: { + title: "添加监控", + activeMenu: "/blind_plate_plugging/job_data", + }, + component: "eightwork_videomanager/index", + }, ], }, { @@ -1922,6 +1938,14 @@ export default [ }, component: "hoisting/job_data/view", }, + { + path: "/hoisting/job_data/add_video", + meta: { + title: "添加监控", + activeMenu: "/hoisting/job_data", + }, + component: "eightwork_videomanager/index", + }, ], }, { @@ -1942,6 +1966,7 @@ export default [ }, ], }, + { path: "/open_circuit", redirect: "/open_circuit/job_data", @@ -1962,6 +1987,14 @@ export default [ }, component: "open_circuit/job_data/view", }, + { + path: "/open_circuit/job_data/add_video", + meta: { + title: "添加监控", + activeMenu: "/open_circuit/job_data", + }, + component: "eightwork_videomanager/index", + }, ], }, { @@ -2002,6 +2035,14 @@ export default [ }, component: "temporary_electricity_usage/job_data/view", }, + { + path: "/temporary_electricity_usage/job_data/add_video", + meta: { + title: "添加监控", + activeMenu: "/temporary_electricity_usage/job_data", + }, + component: "eightwork_videomanager/index", + }, ], }, { diff --git a/src/assets/js/usePrint.js b/src/assets/js/usePrint.js index 0515007..64caf73 100644 --- a/src/assets/js/usePrint.js +++ b/src/assets/js/usePrint.js @@ -10,6 +10,9 @@ export default function usePrint() { id: "printContent", closeCallback() { document.querySelector("#printContent").style.overflow = "hidden"; + for (let i = 0; i < elements.length; i++) { + elements[i].removeAttribute("style"); + } }, }; const fnPrint = () => { diff --git a/src/request/blind_plate_plugging.js b/src/request/blind_plate_plugging.js deleted file mode 100644 index de605ca..0000000 --- a/src/request/blind_plate_plugging.js +++ /dev/null @@ -1,6 +0,0 @@ -import { post } from "@/request/axios.js"; - -export const getBlindPlatePluggingList = (params) => - post("/blindboard/list", params); // 盲板抽堵作业管理列表 -export const getBlindPlatePluggingView = (params) => - post("/blindboard/goEdit", params); // 盲板抽堵作业管理查看 diff --git a/src/request/eight_work.js b/src/request/eight_work.js index 92b739f..8b67d33 100644 --- a/src/request/eight_work.js +++ b/src/request/eight_work.js @@ -19,3 +19,33 @@ export const getHighWorkView = (params) => post("/highwork/findById", params); / export const getHighWorkFlow = (params) => post("/highwork/getFlowList", params); // 高处作业流程图 + +export const getHoistingList = (params) => post("/hoisting/list", params); +export const getHoistingView = (params) => post("/hoisting/findById", params); +export const getHoistingFlow = (params) => + post("/hoisting/getFlowList", params); + +export const getBlindBoardList = (params) => post("/blindboard/list", params); +export const getBlindBoardView = (params) => + post("/blindboard/findById", params); +export const getBlindBoardFlow = (params) => + post("/blindboard/getFlowList", params); + +export const getGroundbreakingList = (params) => + post("/breakground/list", params); +export const getGroundbreakingView = (params) => + post("/breakground/findById", params); +export const getGroundbreakingFlow = (params) => + post("/breakground/getFlowList", params); + +export const getOpenCircuitList = (params) => post("/cutroad/list", params); +export const getOpenCircuitView = (params) => post("/cutroad/findById", params); +export const getOpenCircuitFlow = (params) => + post("/cutroad/getFlowList", params); + +export const getTemporaryElectricityUsageList = (params) => + post("/electricity/list", params); +export const getTemporaryElectricityUsageView = (params) => + post("/electricity/findById", params); +export const getTemporaryElectricityUsageFlow = (params) => + post("/electricity/getFlowList", params); diff --git a/src/request/hoisting.js b/src/request/hoisting.js deleted file mode 100644 index 53a026a..0000000 --- a/src/request/hoisting.js +++ /dev/null @@ -1,4 +0,0 @@ -import { post } from "@/request/axios.js"; - -export const getHoistingList = (params) => post("/hoisting/list", params); // 吊装作业管理列表 -export const getHoistingView = (params) => post("/hoisting/goEdit", params); // 吊装作业管理查看 diff --git a/src/views/BI/components/dialog/confinedspace_dialog.vue b/src/views/BI/components/dialog/confinedspace_dialog.vue index 2722906..f4a246f 100644 --- a/src/views/BI/components/dialog/confinedspace_dialog.vue +++ b/src/views/BI/components/dialog/confinedspace_dialog.vue @@ -191,7 +191,7 @@
安全交底人： -
+