diff --git a/src/assets/js/asyncRouter.js b/src/assets/js/asyncRouter.js index 35f8687..4355554 100644 --- a/src/assets/js/asyncRouter.js +++ b/src/assets/js/asyncRouter.js @@ -320,4 +320,84 @@ export default [ }, ], }, + { + path: "/temporary_electricity_usage", + redirect: "/temporary_electricity_usage/job_data", + meta: { title: "临时用电作业管理", model: MODEL["3"] }, + component: "children", + children: [ + { + path: "/temporary_electricity_usage/job_data", + meta: { title: "临时用电作业数据", isSubMenu: false }, + component: "children", + children: [ + { path: "", component: "temporary_electricity_usage/job_data/index" }, + { + path: "/temporary_electricity_usage/job_data/view", + meta: { + title: "审批表详情", + activeMenu: "/temporary_electricity_usage/job_data", + }, + component: "temporary_electricity_usage/job_data/view", + }, + ], + }, + { + path: "/temporary_electricity_usage/archive", + meta: { title: "归档管理", isSubMenu: false }, + component: "children", + children: [ + { path: "", component: "temporary_electricity_usage/archive/index" }, + { + path: "/temporary_electricity_usage/archive/view", + meta: { + title: "审批表详情", + activeMenu: "/temporary_electricity_usage/archive", + }, + component: "temporary_electricity_usage/archive/view", + }, + ], + }, + ], + }, + { + path: "/hot_work", + redirect: "/hot_work/job_data", + meta: { title: "动火作业管理", model: MODEL["3"] }, + component: "children", + children: [ + { + path: "/hot_work/job_data", + meta: { title: "动火作业数据", isSubMenu: false }, + component: "children", + children: [ + { path: "", component: "hot_work/job_data/index" }, + { + path: "/hot_work/job_data/view", + meta: { + title: "审批表详情", + activeMenu: "/hot_work/job_data", + }, + component: "hot_work/job_data/view", + }, + ], + }, + { + path: "/hot_work/archive", + meta: { title: "归档管理", isSubMenu: false }, + component: "children", + children: [ + { path: "", component: "hot_work/archive/index" }, + { + path: "/hot_work/archive/view", + meta: { + title: "审批表详情", + activeMenu: "/hot_work/archive", + }, + component: "hot_work/archive/view", + }, + ], + }, + ], + }, ]; diff --git a/src/assets/js/usePrint.js b/src/assets/js/usePrint.js index ecfaf04..9767d45 100644 --- a/src/assets/js/usePrint.js +++ b/src/assets/js/usePrint.js @@ -1,6 +1,6 @@ import { ref } from "vue"; -export default function usePrint(THEAD_HEIGHT = 81.59) { +export default function usePrint(THEAD_HEIGHT) { const buttonRef = ref(null); const A4_HEIGHT_MM = 297; const A4_HEIGHT_MM_TO_PX_PROPORTION = 3.78; diff --git a/src/components/print_table_package/index.vue b/src/components/print_table_package/index.vue index 00dcad2..4dfd4a5 100644 --- a/src/components/print_table_package/index.vue +++ b/src/components/print_table_package/index.vue @@ -23,15 +23,22 @@ diff --git a/src/views/hot_work/archive/view.vue b/src/views/hot_work/archive/view.vue new file mode 100644 index 0000000..2a5eb71 --- /dev/null +++ b/src/views/hot_work/archive/view.vue @@ -0,0 +1,9 @@ + + + + + diff --git a/src/views/hot_work/job_data/components/flow_chart.vue b/src/views/hot_work/job_data/components/flow_chart.vue new file mode 100644 index 0000000..8548481 --- /dev/null +++ b/src/views/hot_work/job_data/components/flow_chart.vue @@ -0,0 +1,192 @@ + + + + + diff --git a/src/views/hot_work/job_data/index.vue b/src/views/hot_work/job_data/index.vue new file mode 100644 index 0000000..b1111ae --- /dev/null +++ b/src/views/hot_work/job_data/index.vue @@ -0,0 +1,170 @@ + + + + + diff --git a/src/views/hot_work/job_data/view.vue b/src/views/hot_work/job_data/view.vue new file mode 100644 index 0000000..b3d662b --- /dev/null +++ b/src/views/hot_work/job_data/view.vue @@ -0,0 +1,379 @@ + + + + + diff --git a/src/views/open_circuit/job_data/index.vue b/src/views/open_circuit/job_data/index.vue index 54cb472..9294d76 100644 --- a/src/views/open_circuit/job_data/index.vue +++ b/src/views/open_circuit/job_data/index.vue @@ -157,9 +157,7 @@ const stateList = [ ]; const router = useRouter(); const listData = useListData(getOpenCircuitList, { - otherParams: { - APPLY_STATUS: props.entrance === "archive" ? "6" : "", - }, + otherParams: props.entrance === "archive" ? { APPLY_STATUS: "6" } : {}, }); const { list, pagination, searchForm, fnGetData, fnResetPagination } = listData; const data = reactive({ diff --git a/src/views/open_circuit/job_data/view.vue b/src/views/open_circuit/job_data/view.vue index 498180f..06dd504 100644 --- a/src/views/open_circuit/job_data/view.vue +++ b/src/views/open_circuit/job_data/view.vue @@ -1,5 +1,5 @@