diff --git a/src/assets/images/map/50.png b/src/assets/images/map/50.png new file mode 100644 index 0000000..e67c5d0 Binary files /dev/null and b/src/assets/images/map/50.png differ diff --git a/src/assets/images/map/h.png b/src/assets/images/map/h.png new file mode 100644 index 0000000..31cec4a Binary files /dev/null and b/src/assets/images/map/h.png differ diff --git a/src/assets/js/asyncRouter.js b/src/assets/js/asyncRouter.js index c3f6a11..aeb6f03 100644 --- a/src/assets/js/asyncRouter.js +++ b/src/assets/js/asyncRouter.js @@ -307,6 +307,79 @@ export default [ }, ], }, + { + path: "/hazard_investigation/checklist_inspection_status", + meta: { title: "清单检查情况", isSubMenu: false }, + component: "children", + children: [ + { + path: "", + component: "hazard_investigation/checklist_inspection_status/index", + }, + { + path: "/hazard_investigation/checklist_inspection_status/inspection_record", + meta: { + title: "检查记录", + activeMenu: "/hazard_investigation/checklist_inspection_status", + }, + component: "children", + children: [ + { + path: "", + component: + "hazard_investigation/checklist_inspection_status/inspection_record", + }, + { + path: "/hazard_investigation/checklist_inspection_status/inspection_record/supplementary_recording", + meta: { + title: "补录", + activeMenu: + "/hazard_investigation/checklist_inspection_status", + }, + component: + "hazard_investigation/checklist_inspection_status/supplementary_recording", + }, + { + path: "/hazard_investigation/checklist_inspection_status/inspection_record/view", + meta: { + title: "详情", + activeMenu: + "/hazard_investigation/checklist_inspection_status", + }, + component: "children", + children: [ + { + path: "", + component: + "hazard_investigation/checklist_inspection_status/inspection_record_view", + }, + { + path: "/hazard_investigation/checklist_inspection_status/inspection_record/view/hidden_danger", + meta: { + title: "隐患信息", + activeMenu: + "/hazard_investigation/checklist_inspection_status", + }, + component: + "hazard_investigation/checklist_inspection_status/hidden_danger_view", + }, + ], + }, + ], + }, + ], + }, + { + path: "/hazard_investigation/inspection_record", + meta: { title: "检查记录管理", isSubMenu: false }, + component: "children", + children: [ + { + path: "", + component: "hazard_investigation/inspection_record/index", + }, + ], + }, ], }, { diff --git a/src/assets/js/usePrint.js b/src/assets/js/usePrint.js index e402fe0..0515007 100644 --- a/src/assets/js/usePrint.js +++ b/src/assets/js/usePrint.js @@ -17,7 +17,6 @@ export default function usePrint() { elements = document.querySelectorAll("#printContent > table > tr"); const thead = document.querySelector("#printContent > table thead"); if (thead) A4_HEIGHT_PX = A4_HEIGHT_PX - thead.offsetHeight; - else A4_HEIGHT_PX = A4_HEIGHT_PX + thead.offsetHeight; fnIsPaging(); buttonRef.value.$el.click(); }; diff --git a/src/components/ali-player/index.vue b/src/components/ali-player/index.vue index 99d93ae..4e06b4a 100644 --- a/src/components/ali-player/index.vue +++ b/src/components/ali-player/index.vue @@ -35,6 +35,10 @@ const props = defineProps({ type: String, default: "600px", }, + visible: { + type: Boolean, + default: false, + }, }); const visibility = useDocumentVisibility(); onMounted(() => { @@ -51,9 +55,9 @@ onMounted(() => { () => visibility.value, () => { if (visibility.value === "hidden") { - pause(); + props.visible && pause(); } else { - play(); + props.visible && play(); } }, { diff --git a/src/components/print_table_package/index.vue b/src/components/print_table_package/index.vue index 4b0fb71..400edde 100644 --- a/src/components/print_table_package/index.vue +++ b/src/components/print_table_package/index.vue @@ -22,7 +22,6 @@ + + diff --git a/src/views/enterprise_management/information/edit.vue b/src/views/enterprise_management/information/edit.vue index f317506..bc4ca6a 100644 --- a/src/views/enterprise_management/information/edit.vue +++ b/src/views/enterprise_management/information/edit.vue @@ -106,7 +106,7 @@ 地图定位 @@ -427,38 +427,16 @@ 确 定 - - - - - - - - - - - - - - - -
-
-
- - +
diff --git a/src/views/hazard_investigation/checklist_inspection_status/components/map.vue b/src/views/hazard_investigation/checklist_inspection_status/components/map.vue new file mode 100644 index 0000000..efc194a --- /dev/null +++ b/src/views/hazard_investigation/checklist_inspection_status/components/map.vue @@ -0,0 +1,129 @@ + + + + + diff --git a/src/views/hazard_investigation/checklist_inspection_status/components/qualified.vue b/src/views/hazard_investigation/checklist_inspection_status/components/qualified.vue new file mode 100644 index 0000000..80ce8e2 --- /dev/null +++ b/src/views/hazard_investigation/checklist_inspection_status/components/qualified.vue @@ -0,0 +1,42 @@ + + + + + diff --git a/src/views/hazard_investigation/checklist_inspection_status/hidden_danger_view.vue b/src/views/hazard_investigation/checklist_inspection_status/hidden_danger_view.vue new file mode 100644 index 0000000..c0a6fa5 --- /dev/null +++ b/src/views/hazard_investigation/checklist_inspection_status/hidden_danger_view.vue @@ -0,0 +1,11 @@ + + + + + diff --git a/src/views/hazard_investigation/checklist_inspection_status/hidden_view.vue b/src/views/hazard_investigation/checklist_inspection_status/hidden_view.vue new file mode 100644 index 0000000..b0a9b0a --- /dev/null +++ b/src/views/hazard_investigation/checklist_inspection_status/hidden_view.vue @@ -0,0 +1,270 @@ + + + + + diff --git a/src/views/hazard_investigation/checklist_inspection_status/index.vue b/src/views/hazard_investigation/checklist_inspection_status/index.vue new file mode 100644 index 0000000..d8ff747 --- /dev/null +++ b/src/views/hazard_investigation/checklist_inspection_status/index.vue @@ -0,0 +1,262 @@ + + + + + diff --git a/src/views/hazard_investigation/checklist_inspection_status/inspection_record.vue b/src/views/hazard_investigation/checklist_inspection_status/inspection_record.vue new file mode 100644 index 0000000..644c8dd --- /dev/null +++ b/src/views/hazard_investigation/checklist_inspection_status/inspection_record.vue @@ -0,0 +1,182 @@ + + + + + diff --git a/src/views/hazard_investigation/checklist_inspection_status/inspection_record_view.vue b/src/views/hazard_investigation/checklist_inspection_status/inspection_record_view.vue new file mode 100644 index 0000000..82061e0 --- /dev/null +++ b/src/views/hazard_investigation/checklist_inspection_status/inspection_record_view.vue @@ -0,0 +1,260 @@ + + + + + diff --git a/src/views/hazard_investigation/checklist_inspection_status/supplementary_recording.vue b/src/views/hazard_investigation/checklist_inspection_status/supplementary_recording.vue new file mode 100644 index 0000000..8fec285 --- /dev/null +++ b/src/views/hazard_investigation/checklist_inspection_status/supplementary_recording.vue @@ -0,0 +1,9 @@ + + + + + diff --git a/src/views/hazard_investigation/inspection_record/index.vue b/src/views/hazard_investigation/inspection_record/index.vue new file mode 100644 index 0000000..d633546 --- /dev/null +++ b/src/views/hazard_investigation/inspection_record/index.vue @@ -0,0 +1,185 @@ + + + + + diff --git a/src/views/hazard_investigation/inventory_troubleshooting/index.vue b/src/views/hazard_investigation/inventory_troubleshooting/index.vue index d34b8bd..d2e4dc7 100644 --- a/src/views/hazard_investigation/inventory_troubleshooting/index.vue +++ b/src/views/hazard_investigation/inventory_troubleshooting/index.vue @@ -36,15 +36,8 @@ - + + diff --git a/src/views/hazard_investigation/inventory_troubleshooting/inspect.vue b/src/views/hazard_investigation/inventory_troubleshooting/inspect.vue index de945f5..021bb53 100644 --- a/src/views/hazard_investigation/inventory_troubleshooting/inspect.vue +++ b/src/views/hazard_investigation/inventory_troubleshooting/inspect.vue @@ -47,11 +47,26 @@ 合格 + + + - + 不合格 - + 不涉及 @@ -60,7 +75,11 @@ 其他隐患
- + 添加
@@ -103,6 +122,7 @@ value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="这里输入检查时间" + :disabled-date="fnDisabledDate" /> @@ -175,6 +195,11 @@ + + + + + { - const geolocation = new window.BMapGL.Geolocation(); - geolocation.getCurrentPosition(async (r) => { - if (!r) { - await ElMessageBox.alert("获取位置信息失败，请刷新重试", { - type: "warning", - }); - window.location.reload(); - } - data.longitude = r.longitude; - data.latitude = r.latitude; - }); -}); const { list: inspectionList } = useListData(getInventoryManagementView, { otherParams: { LISTMANAGER_ID }, usePagination: false, @@ -312,6 +330,27 @@ const { list: otherHiddenList, fnGetData: fnGetOtherHidden } = useListData( key: "hiddenList", } ); +onMounted(() => { + const geolocation = new window.BMapGL.Geolocation(); + geolocation.getCurrentPosition(async (r) => { + if (!r) { + await ElMessageBox.alert("获取位置信息失败，请刷新重试", { + type: "warning", + }); + window.location.reload(); + } + data.longitude = r.longitude; + data.latitude = r.latitude; + }); +}); +const fnDisabledDate = (time) => { + if (DATEEND && DATESTART) + return ( + time.getTime() > new Date(DATEEND).getTime() || + time.getTime() < new Date(DATESTART).getTime() + ); + else return false; +}; const fnQualified = async (index, row) => { if (row.HASHIDDEN > 0) return; data.qualifiedDialog.visible = true; @@ -328,7 +367,7 @@ const fnQualified = async (index, row) => { inspectionList.value[index].ISNORMAL = 0; }; const fnNotInvolved = (index, row) => { - if (row.HASHIDDEN > 0) return; + if (row.HASHIDDEN > 0 || type === "supplementaryRecording") return; fnRemoveUnqualified(index); inspectionList.value[index].ISNORMAL = 2; }; @@ -336,7 +375,7 @@ const fnRemoveUnqualified = (index) => { inspectionList.value[index].HIDDEN_ID = ""; }; const fnUnqualified = async (index, row) => { - if (row.HASHIDDEN > 0) return; + if (row.HASHIDDEN > 0 || type === "supplementaryRecording") return; data.unQualifiedDialog.visible = true; await nextTick(); if ( @@ -432,7 +471,7 @@ const fnSubmit = debounce( } const inspectedList = cloneDeep(data.form.inspectedList); if (inspectedList.length > 0) inspectedList.splice(0, 1); - await setInventoryTroubleshootingSubmit({ + const params = { LISTMANAGER_ID, LIST_NAME: info.value.NAME, CHECK_TIME: data.form.CHECK_TIME, @@ -444,7 +483,14 @@ const fnSubmit = debounce( OTHER: JSON.stringify(inspectedList), LONGITUDE: data.longitude, LATITUDE: data.latitude, - }); + }; + if (type === "supplementaryRecording") { + params.REASON = data.form.REASON; + params.CHECKRECORD_ID = CHECKRECORD_ID; + await setChecklistInspectionStatusRecordSupplementaryRecordingSubmit( + params + ); + } else await setInventoryTroubleshootingSubmit(params); ElMessage.success("操作成功"); router.back(); }, diff --git a/src/views/online_learn_exam/courseware/data/index.vue b/src/views/online_learn_exam/courseware/data/index.vue index 709a987..43f0ab8 100644 --- a/src/views/online_learn_exam/courseware/data/index.vue +++ b/src/views/online_learn_exam/courseware/data/index.vue @@ -218,7 +218,6 @@