diff --git a/src/assets/js/asyncRouter.js b/src/assets/js/asyncRouter.js index 33cf4e9..4d4d508 100644 --- a/src/assets/js/asyncRouter.js +++ b/src/assets/js/asyncRouter.js @@ -330,6 +330,15 @@ export default [ }, component: "hazard_investigation/inventory_management/add", }, + { + path: "/hazard_investigation/inventory_management/check_standard_add", + meta: { + title: "新增", + activeMenu: "/hazard_investigation/inventory_management", + }, + component: + "hazard_investigation/inventory_management/check_standard_add", + }, { path: "/hazard_investigation/inventory_management/edit", meta: { @@ -384,6 +393,15 @@ export default [ }, component: "hazard_investigation/inventory_troubleshooting/inspect", }, + { + path: "/hazard_investigation/inventory_troubleshooting/standard_inspect", + meta: { + title: "开始检查", + activeMenu: "/hazard_investigation/inventory_troubleshooting", + }, + component: + "hazard_investigation/inventory_troubleshooting/standard_inspect", + }, ], }, { @@ -927,6 +945,56 @@ export default [ }, ], }, + { + path: "/safety_environmental_management", + redirect: "/safety_environmental_management/safety_environmental", + meta: { title: "安全、环保检查管理", model: MODEL["1"] }, + component: "children", + children: [ + { + path: "/safety_environmental_management/safety_environmental", + meta: { title: "安全、环保检查", isSubMenu: false }, + component: "children", + children: [ + { + path: "", + component: + "safety_environmental_management/safety_environmental/index", + }, + { + path: "/safety_environmental_management/safety_environmental/add", + meta: { + title: "新增", + activeMenu: + "/safety_environmental_management/safety_environmental", + }, + component: + "safety_environmental_management/safety_environmental/add", + }, + { + path: "/safety_environmental_management/safety_environmental/edit", + meta: { + title: "编辑", + activeMenu: + "/safety_environmental_management/safety_environmental", + }, + component: + "safety_environmental_management/safety_environmental/add", + }, + { + path: "/safety_environmental_management/safety_environmental/view", + meta: { + title: "查看", + activeMenu: + "/safety_environmental_management/safety_environmental", + }, + component: + "safety_environmental_management/safety_environmental/view", + }, + ], + }, + ], + }, { path: "/off_duty_management", redirect: "/off_duty_management/leave", diff --git a/src/assets/js/data_dictionary.js b/src/assets/js/data_dictionary.js index 3ade1a7..aa1b810 100644 --- a/src/assets/js/data_dictionary.js +++ b/src/assets/js/data_dictionary.js @@ -6,6 +6,7 @@ import { getDepartmentTree, getLevelsCorp, getElectronicFenceTree, + getListSelectTree, } from "@/request/data_dictionary.js"; import { ref } from "vue"; @@ -388,6 +389,13 @@ export const layoutFnGetElectronicFenceTree = async (params) => { const resData = await getElectronicFenceTree(params); return ref(JSON.parse(resData.zTreeNodes)); }; +// 检查类型树 +export const layoutFnGetInspectionTypeTree = async () => { + const resData = await getListSelectTree({ + DICTIONARIES_ID: "60e6481d96e44a5390ff5c347c4d1ffe", + }); + return ref(JSON.parse(resData.zTreeNodes)); +}; // 无法确定DICTIONARIES_ID的数据字典 export const layoutFnGetLevels = async (DICTIONARIES_ID) => { const resData = await getLevels({ DICTIONARIES_ID }); diff --git a/src/components/inspection_type/index.vue b/src/components/inspection_type/index.vue new file mode 100644 index 0000000..0710553 --- /dev/null +++ b/src/components/inspection_type/index.vue @@ -0,0 +1,46 @@ + + + + + diff --git a/src/components/select_create/index.vue b/src/components/select_create/index.vue index 561ff5c..261d058 100644 --- a/src/components/select_create/index.vue +++ b/src/components/select_create/index.vue @@ -19,7 +19,7 @@ " >
{{ item.NAME }}
-
+
@@ -47,6 +47,10 @@ const props = defineProps({ required: true, default: () => [], }, + isDelete: { + type: Boolean, + default: false, + }, }); const emits = defineEmits(["update:modelValue", "delete-option"]); const modelValue = useVModel(props, "modelValue", emits); diff --git a/src/components/sign/index.vue b/src/components/sign/index.vue index d9d66f1..2f3586c 100644 --- a/src/components/sign/index.vue +++ b/src/components/sign/index.vue @@ -14,7 +14,7 @@ :height="300" :is-crop="false" :line-width="6" - line-color="red" + line-color="#fff" /> + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 搜索 + + 重置 + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + diff --git a/src/views/hazard_investigation/delete_inventory_management/index.vue b/src/views/hazard_investigation/delete_inventory_management/index.vue index 4fce8ca..583f4bc 100644 --- a/src/views/hazard_investigation/delete_inventory_management/index.vue +++ b/src/views/hazard_investigation/delete_inventory_management/index.vue @@ -1,247 +1,37 @@ - + diff --git a/src/views/hazard_investigation/inventory_management/add.vue b/src/views/hazard_investigation/inventory_management/add.vue index ee85a3c..91388c2 100644 --- a/src/views/hazard_investigation/inventory_management/add.vue +++ b/src/views/hazard_investigation/inventory_management/add.vue @@ -1,6 +1,6 @@ + + + + diff --git a/src/views/hazard_investigation/inventory_management/components/checkstandard_add.vue b/src/views/hazard_investigation/inventory_management/components/checkstandard_add.vue new file mode 100644 index 0000000..10096f2 --- /dev/null +++ b/src/views/hazard_investigation/inventory_management/components/checkstandard_add.vue @@ -0,0 +1,221 @@ + + + + + diff --git a/src/views/hazard_investigation/inventory_management/components/list.vue b/src/views/hazard_investigation/inventory_management/components/list.vue new file mode 100644 index 0000000..7aad582 --- /dev/null +++ b/src/views/hazard_investigation/inventory_management/components/list.vue @@ -0,0 +1,483 @@ + + + + + diff --git a/src/views/hazard_investigation/inventory_management/components/select_checkstandard.vue b/src/views/hazard_investigation/inventory_management/components/select_checkstandard.vue new file mode 100644 index 0000000..08ce8d0 --- /dev/null +++ b/src/views/hazard_investigation/inventory_management/components/select_checkstandard.vue @@ -0,0 +1,172 @@ + + + + + diff --git a/src/views/hazard_investigation/inventory_management/components/standard_list.vue b/src/views/hazard_investigation/inventory_management/components/standard_list.vue new file mode 100644 index 0000000..82deb9d --- /dev/null +++ b/src/views/hazard_investigation/inventory_management/components/standard_list.vue @@ -0,0 +1,385 @@ + + + + + diff --git a/src/views/hazard_investigation/inventory_management/index.vue b/src/views/hazard_investigation/inventory_management/index.vue index 2821e72..15e7408 100644 --- a/src/views/hazard_investigation/inventory_management/index.vue +++ b/src/views/hazard_investigation/inventory_management/index.vue @@ -1,423 +1,37 @@ - + diff --git a/src/views/hazard_investigation/inventory_troubleshooting/index.vue b/src/views/hazard_investigation/inventory_troubleshooting/index.vue index d2e4dc7..91e8fc8 100644 --- a/src/views/hazard_investigation/inventory_troubleshooting/index.vue +++ b/src/views/hazard_investigation/inventory_troubleshooting/index.vue @@ -15,6 +15,14 @@ /> + + + + + + + +
+ + + 开始检查 @@ -143,14 +157,14 @@ import { layoutFnGetInventoryLevel, layoutFnGetTroubleshootingCycle, } from "@/assets/js/data_dictionary.js"; -import { getInventoryTroubleshootingList } from "@/request/hazard_investigation.js"; +import { getRiskStandardList } from "@/request/hazard_investigation.js"; import { useRouter } from "vue-router"; import { ElMessageBox } from "element-plus"; const router = useRouter(); let ISREST = ""; const { list, pagination, searchForm, fnGetData, fnResetPagination } = - useListData(getInventoryTroubleshootingList, { + useListData(getRiskStandardList, { callbackFn: (list, resData) => { ISREST = resData.ISREST; }, @@ -167,14 +181,17 @@ const fnResetPaginationTransfer = () => { DEPTIDS: searchForm.value.DEPTIDS?.join(","), }); }; -const fnInspect = (LISTMANAGER_ID) => { +const fnInspect = (ID, LIST_TYPE) => { if (ISREST === "1") { ElMessageBox.alert("您处于离岗状态,无需检查清单"); return; } router.push({ - path: "/hazard_investigation/inventory_troubleshooting/inspect", - query: { LISTMANAGER_ID }, + path: + LIST_TYPE === "1" + ? "/hazard_investigation/inventory_troubleshooting/inspect" + : "/hazard_investigation/inventory_troubleshooting/standard_inspect", + query: { ID }, }); }; diff --git a/src/views/hazard_investigation/inventory_troubleshooting/standard_inspect.vue b/src/views/hazard_investigation/inventory_troubleshooting/standard_inspect.vue new file mode 100644 index 0000000..d116bcf --- /dev/null +++ b/src/views/hazard_investigation/inventory_troubleshooting/standard_inspect.vue @@ -0,0 +1,531 @@ + + + + + diff --git a/src/views/safety_environmental_management/safety_environmental/add.vue b/src/views/safety_environmental_management/safety_environmental/add.vue new file mode 100644 index 0000000..649182b --- /dev/null +++ b/src/views/safety_environmental_management/safety_environmental/add.vue @@ -0,0 +1,258 @@ + + + + + diff --git a/src/views/safety_environmental_management/safety_environmental/components/defense.vue b/src/views/safety_environmental_management/safety_environmental/components/defense.vue new file mode 100644 index 0000000..404b6bb --- /dev/null +++ b/src/views/safety_environmental_management/safety_environmental/components/defense.vue @@ -0,0 +1,126 @@ + + + + + diff --git a/src/views/safety_environmental_management/safety_environmental/components/flow_chart.vue b/src/views/safety_environmental_management/safety_environmental/components/flow_chart.vue new file mode 100644 index 0000000..13cc7ac --- /dev/null +++ b/src/views/safety_environmental_management/safety_environmental/components/flow_chart.vue @@ -0,0 +1,79 @@ + + + + + diff --git a/src/views/safety_environmental_management/safety_environmental/index.vue b/src/views/safety_environmental_management/safety_environmental/index.vue new file mode 100644 index 0000000..bfb101c --- /dev/null +++ b/src/views/safety_environmental_management/safety_environmental/index.vue @@ -0,0 +1,344 @@ + + + + + diff --git a/src/views/safety_environmental_management/safety_environmental/view.vue b/src/views/safety_environmental_management/safety_environmental/view.vue new file mode 100644 index 0000000..738d4a8 --- /dev/null +++ b/src/views/safety_environmental_management/safety_environmental/view.vue @@ -0,0 +1,7 @@ + + + + +