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 43360d6..4ff5e10 100644 --- a/src/assets/js/asyncRouter.js +++ b/src/assets/js/asyncRouter.js @@ -307,6 +307,267 @@ 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", + }, + { + path: "/hazard_investigation/inspection_record/supplementary_recording", + meta: { + title: "补录", + activeMenu: "/hazard_investigation/inspection_record", + }, + component: + "hazard_investigation/inspection_record/supplementary_recording", + }, + { + path: "/hazard_investigation/inspection_record/view", + meta: { + title: "检查记录", + activeMenu: "/hazard_investigation/inspection_record", + }, + component: "children", + children: [ + { + path: "", + component: "hazard_investigation/inspection_record/view", + }, + { + path: "/hazard_investigation/inspection_record/view/hidden_danger", + meta: { + title: "隐患信息", + activeMenu: "/hazard_investigation/inspection_record", + }, + component: + "hazard_investigation/inspection_record/hidden_danger", + }, + ], + }, + { + path: "/hazard_investigation/inspection_record/batch_printing", + meta: { + title: "批量打印", + activeMenu: "/hazard_investigation/inspection_record", + }, + component: "hazard_investigation/inspection_record/batch_printing", + }, + ], + }, + { + path: "/hazard_investigation/troubleshooting_plan", + meta: { title: "排查计划", isSubMenu: false }, + component: "hazard_investigation/troubleshooting_plan/index", + }, + ], + }, + { + path: "/hidden_danger_government", + redirect: "/hidden_danger_government/rectification", + meta: { title: "隐患治理", model: MODEL["1"] }, + component: "children", + children: [ + { + path: "/hidden_danger_government/rectification", + meta: { title: "隐患整改", isSubMenu: false }, + component: "children", + children: [ + { + path: "", + component: "hidden_danger_government/rectification/index", + }, + { + path: "/hidden_danger_government/rectification/view", + meta: { + title: "查看", + activeMenu: "/hidden_danger_government/rectification", + }, + component: "hidden_danger_government/rectification/view", + }, + { + path: "/hidden_danger_government/rectification/rectification", + meta: { + title: "整改", + activeMenu: "/hidden_danger_government/rectification", + }, + component: "hidden_danger_government/rectification/rectification", + }, + ], + }, + { + path: "/hidden_danger_government/acceptance", + meta: { title: "隐患验收", isSubMenu: false }, + component: "children", + children: [ + { + path: "", + component: "hidden_danger_government/acceptance/index", + }, + { + path: "/hidden_danger_government/acceptance/view", + meta: { + title: "查看", + activeMenu: "/hidden_danger_government/acceptance", + }, + component: "hidden_danger_government/acceptance/view", + }, + { + path: "/hidden_danger_government/acceptance/acceptance", + meta: { + title: "验收", + activeMenu: "/hidden_danger_government/acceptance", + }, + component: "hidden_danger_government/acceptance/acceptance", + }, + ], + }, + { + path: "/hidden_danger_government/major", + meta: { title: "重大隐患", isSubMenu: false }, + component: "children", + children: [ + { + path: "", + component: "hidden_danger_government/major/index", + }, + { + path: "/hidden_danger_government/major/view", + meta: { + title: "查看", + activeMenu: "/hidden_danger_government/major", + }, + component: "hidden_danger_government/major/view", + }, + ], + }, + { + path: "/hidden_danger_government/ledger", + meta: { title: "隐患台账", isSubMenu: false }, + component: "children", + children: [ + { + path: "", + component: "hidden_danger_government/ledger/index", + }, + { + path: "/hidden_danger_government/ledger/add", + meta: { + title: "新增", + activeMenu: "/hidden_danger_government/ledger", + }, + component: "hidden_danger_government/ledger/add", + }, + { + path: "/hidden_danger_government/ledger/view", + meta: { + title: "查看", + activeMenu: "/hidden_danger_government/ledger", + }, + component: "hidden_danger_government/ledger/view", + }, + { + path: "/hidden_danger_government/ledger/print", + meta: { + title: "打印", + activeMenu: "/hidden_danger_government/ledger", + }, + component: "hidden_danger_government/ledger/print", + }, + ], + }, + ], + }, + { + path: "/continuous_improvement", + redirect: "/continuous_improvement/hazard_analysis", + meta: { title: "持续改进", model: MODEL["1"] }, + component: "children", + children: [ + { + path: "/continuous_improvement/hazard_analysis", + meta: { title: "隐患分析", isSubMenu: false }, + component: "children", + children: [ + { + path: "", + component: "continuous_improvement/hazard_analysis/index", + }, + { + path: "/continuous_improvement/hazard_analysis/view", + meta: { + title: "查看", + activeMenu: "/continuous_improvement/hazard_analysis", + }, + component: "continuous_improvement/hazard_analysis/view", + }, + ], + }, ], }, { diff --git a/src/assets/js/useDownloadBlob.js b/src/assets/js/useDownloadBlob.js new file mode 100644 index 0000000..e2a0578 --- /dev/null +++ b/src/assets/js/useDownloadBlob.js @@ -0,0 +1,45 @@ +import { ElLoading, ElMessage } from "element-plus"; +import dayjs from "dayjs"; +import axios from "axios"; + +export default function useDownloadBlob( + url, + option = { + name: dayjs().format("YYYY-MM-DD HH:mm:ss"), + type: "application/vnd.ms-excel", + } +) { + return new Promise((resolve, reject) => { + const loading = ElLoading.service({ + lock: true, + text: "加载中...", + background: "rgba(0, 0, 0, 0.5)", + }); + axios + .get(url, { responseType: "blob" }) + .then((resData) => { + if (resData.data.type === "application/json") { + throw new Error("导出失败"); + } + const blob = new Blob([resData.data], { + type: option.type, + }); + const downloadElement = document.createElement("a"); + const href = window.URL.createObjectURL(blob); + downloadElement.style.display = "none"; + downloadElement.href = href; + downloadElement.download = option.name; + document.body.appendChild(downloadElement); + downloadElement.click(); + document.body.removeChild(downloadElement); + window.URL.revokeObjectURL(href); + loading.close(); + resolve(resData); + }) + .catch((err) => { + ElMessage.error("导出失败"); + loading.close(); + reject(err); + }); + }); +} diff --git a/src/assets/js/useListData.js b/src/assets/js/useListData.js index 504d865..4e71d13 100644 --- a/src/assets/js/useListData.js +++ b/src/assets/js/useListData.js @@ -3,9 +3,10 @@ import { getDataType } from "@/assets/js/utils.js"; /** * @param api {Function} 接口函数 - * @param options {Object?: {callbackFn, otherParams, immediate, usePagination, key}} 配置项 + * @param options {Object?: {callbackFn, otherParams, defaultSearchForm, immediate, usePagination, key}} 配置项 * @param options.callbackFn {Function?} 回调函数(返回值【第一个参数表格数据,第二个参数后台返回的所有数据】) * @param options.otherParams {Object?} 其它接口参数 + * @param options.defaultSearchForm {Object?} searchForm默认值 * @param options.immediate {Boolean?} 是否立即执行接口函数(默认是) * @param options.usePagination {Boolean?} 是否使用分页(默认是) * @param options.key {String?} 返回的存放数组的key(默认varList) @@ -22,26 +23,30 @@ export default function useListData(api, options = {}) { throw new Error("options.usePagination必须是一个布尔值"); if (options.key && getDataType(options.key) !== "String") throw new Error("options.key必须是一个字符串"); + if (options.callbackFn && getDataType(options.callbackFn) !== "Function") + throw new Error("options.callbackFn必须是一个函数"); + if ( + options.defaultSearchForm && + getDataType(options.defaultSearchForm) !== "Object" + ) + throw new Error("options.defaultSearchForm必须是一个对象"); const immediate = options.immediate ?? true; const usePagination = options.usePagination ?? true; const key = options.key ?? "varList"; - if (!immediate && options.otherParams) - throw new Error("options.otherParams只有在immediate为true时才有效"); + const defaultSearchForm = options.defaultSearchForm ?? {}; if ( immediate && options.otherParams && getDataType(options.otherParams) !== "Object" ) throw new Error("options.otherParams必须是一个对象"); - if (options.callbackFn && getDataType(options.callbackFn) !== "Function") - throw new Error("options.callbackFn必须是一个函数"); const list = ref([]); const pagination = ref({ currentPage: 1, pageSize: 10, total: 0, }); - const searchForm = ref({}); + const searchForm = ref(defaultSearchForm); const tableRef = ref(null); const fnGetData = async (otherParams = {}) => { const resData = await api({ 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/hidden_add/index.vue b/src/components/hidden_add/index.vue new file mode 100644 index 0000000..724ea93 --- /dev/null +++ b/src/components/hidden_add/index.vue @@ -0,0 +1,351 @@ + + + + + diff --git a/src/components/hidden_view/index.vue b/src/components/hidden_view/index.vue new file mode 100644 index 0000000..3a8c793 --- /dev/null +++ b/src/components/hidden_view/index.vue @@ -0,0 +1,289 @@ + + + + + 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/components/video/index.vue b/src/components/video/index.vue index 7dc2008..dd709ee 100644 --- a/src/components/video/index.vue +++ b/src/components/video/index.vue @@ -5,6 +5,7 @@ :vid="vid" :play-auth="playAuth" ref="playerRef" + :visible="visible" /> diff --git a/src/components/layout/breadcrumb/index.vue b/src/layout/breadcrumb/index.vue similarity index 100% rename from src/components/layout/breadcrumb/index.vue rename to src/layout/breadcrumb/index.vue diff --git a/src/components/layout/header/components/update_avatar.vue b/src/layout/header/components/update_avatar.vue similarity index 100% rename from src/components/layout/header/components/update_avatar.vue rename to src/layout/header/components/update_avatar.vue diff --git a/src/components/layout/header/components/update_info.vue b/src/layout/header/components/update_info.vue similarity index 100% rename from src/components/layout/header/components/update_info.vue rename to src/layout/header/components/update_info.vue diff --git a/src/components/layout/header/index.vue b/src/layout/header/index.vue similarity index 99% rename from src/components/layout/header/index.vue rename to src/layout/header/index.vue index 7d8e257..21a73a7 100644 --- a/src/components/layout/header/index.vue +++ b/src/layout/header/index.vue @@ -114,7 +114,7 @@ const fnGetInfo = async () => { data.avatar = FILE_URL + resData.userPhoto; } catch { data.avatar = new URL( - "../../../assets/images/public/tx.png", + "../../assets/images/public/tx.png", import.meta.url ).href; } diff --git a/src/components/layout/index.vue b/src/layout/index.vue similarity index 87% rename from src/components/layout/index.vue rename to src/layout/index.vue index 8af1d0e..2053476 100644 --- a/src/components/layout/index.vue +++ b/src/layout/index.vue @@ -32,9 +32,9 @@ + + diff --git a/src/views/continuous_improvement/hazard_analysis/view.vue b/src/views/continuous_improvement/hazard_analysis/view.vue new file mode 100644 index 0000000..f7c6703 --- /dev/null +++ b/src/views/continuous_improvement/hazard_analysis/view.vue @@ -0,0 +1,9 @@ + + + + + diff --git a/src/views/enterprise_management/industry_qualifications/add.vue b/src/views/enterprise_management/industry_qualifications/add.vue index d9770ed..2471b9c 100644 --- a/src/views/enterprise_management/industry_qualifications/add.vue +++ b/src/views/enterprise_management/industry_qualifications/add.vue @@ -45,7 +45,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/inspection_record_view.vue b/src/views/hazard_investigation/checklist_inspection_status/components/inspection_record_view.vue new file mode 100644 index 0000000..949b787 --- /dev/null +++ b/src/views/hazard_investigation/checklist_inspection_status/components/inspection_record_view.vue @@ -0,0 +1,276 @@ + + + + + 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..01f5afc --- /dev/null +++ b/src/views/hazard_investigation/checklist_inspection_status/hidden_danger_view.vue @@ -0,0 +1,26 @@ + + + + + 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..b337385 --- /dev/null +++ b/src/views/hazard_investigation/checklist_inspection_status/inspection_record.vue @@ -0,0 +1,181 @@ + + + + + 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..25f2943 --- /dev/null +++ b/src/views/hazard_investigation/checklist_inspection_status/inspection_record_view.vue @@ -0,0 +1,29 @@ + + + + + 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..90c3e97 --- /dev/null +++ b/src/views/hazard_investigation/checklist_inspection_status/supplementary_recording.vue @@ -0,0 +1,9 @@ + + + + + diff --git a/src/views/hazard_investigation/delete_inventory_management/view.vue b/src/views/hazard_investigation/delete_inventory_management/view.vue index 14a89f8..aea83b3 100644 --- a/src/views/hazard_investigation/delete_inventory_management/view.vue +++ b/src/views/hazard_investigation/delete_inventory_management/view.vue @@ -66,8 +66,6 @@ const { list } = useListData(getInventoryManagementView, { info.value = resData.pd; }, }); -console.log(list); -console.log(info); diff --git a/src/views/hazard_investigation/inspection_record/batch_printing.vue b/src/views/hazard_investigation/inspection_record/batch_printing.vue new file mode 100644 index 0000000..3c8e1ed --- /dev/null +++ b/src/views/hazard_investigation/inspection_record/batch_printing.vue @@ -0,0 +1,24 @@ + + + + + diff --git a/src/views/hazard_investigation/inspection_record/hidden_danger.vue b/src/views/hazard_investigation/inspection_record/hidden_danger.vue new file mode 100644 index 0000000..62a0b96 --- /dev/null +++ b/src/views/hazard_investigation/inspection_record/hidden_danger.vue @@ -0,0 +1,15 @@ + + + + + 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..e72b659 --- /dev/null +++ b/src/views/hazard_investigation/inspection_record/index.vue @@ -0,0 +1,217 @@ + + + + + diff --git a/src/views/hazard_investigation/inspection_record/supplementary_recording.vue b/src/views/hazard_investigation/inspection_record/supplementary_recording.vue new file mode 100644 index 0000000..90c3e97 --- /dev/null +++ b/src/views/hazard_investigation/inspection_record/supplementary_recording.vue @@ -0,0 +1,9 @@ + + + + + diff --git a/src/views/hazard_investigation/inspection_record/view.vue b/src/views/hazard_investigation/inspection_record/view.vue new file mode 100644 index 0000000..4766025 --- /dev/null +++ b/src/views/hazard_investigation/inspection_record/view.vue @@ -0,0 +1,9 @@ + + + + + diff --git a/src/views/hazard_investigation/inventory_management/add.vue b/src/views/hazard_investigation/inventory_management/add.vue index 9596ba5..0ab7db4 100644 --- a/src/views/hazard_investigation/inventory_management/add.vue +++ b/src/views/hazard_investigation/inventory_management/add.vue @@ -217,7 +217,6 @@ type="add" v-model:visible="data.addOrEditDialog.visible" v-model:form="data.addOrEditDialog.form" - :control="false" @get-data="fnAddRiskSubmit" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 立即整改 - - 限期整改 - - - - - - - - - -
- - - {{ item.RISK_UNIT_NAME }} - - - {{ item.HIDDEN_PART }} - - - {{ item.INSPECTION_BASIS }} - - -
-
-
+
- - + 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..c22bca7 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 +335,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 +372,7 @@ const fnQualified = async (index, row) => { inspectionList.value[index].ISNORMAL = 0; }; const fnNotInvolved = (index, row) => { - if (row.HASHIDDEN > 0) return; + if (row.HASHIDDEN > 0 || props.entrance === "supplementaryRecording") return; fnRemoveUnqualified(index); inspectionList.value[index].ISNORMAL = 2; }; @@ -336,7 +380,7 @@ const fnRemoveUnqualified = (index) => { inspectionList.value[index].HIDDEN_ID = ""; }; const fnUnqualified = async (index, row) => { - if (row.HASHIDDEN > 0) return; + if (row.HASHIDDEN > 0 || props.entrance === "supplementaryRecording") return; data.unQualifiedDialog.visible = true; await nextTick(); if ( @@ -353,7 +397,7 @@ const fnUnqualified = async (index, row) => { data.unQualifiedDialog.hiddenType = "unqualified"; }; const fnGetHiddenDangerView = async (HIDDEN_ID) => { - const resData = await getInventoryTroubleshootingOtherHiddenDangerView({ + const resData = await getHiddenDangerView({ HIDDEN_ID, }); data.unQualifiedDialog.form = resData.pd; @@ -404,7 +448,7 @@ const fnDeleteOtherHidden = async (HIDDEN_ID) => { await ElMessageBox.confirm("确定要删除吗?", { type: "warning", }); - await setInventoryTroubleshootingOtherHiddenDangerDelete({ HIDDEN_ID }); + await setHiddenDangerDelete({ HIDDEN_ID }); fnGetOtherHidden(); }; const fnAddOrEditOtherHidden = async (row, type) => { @@ -432,7 +476,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 +488,14 @@ const fnSubmit = debounce( OTHER: JSON.stringify(inspectedList), LONGITUDE: data.longitude, LATITUDE: data.latitude, - }); + }; + if (props.entrance === "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/hazard_investigation/troubleshooting_plan/index.vue b/src/views/hazard_investigation/troubleshooting_plan/index.vue new file mode 100644 index 0000000..12b5978 --- /dev/null +++ b/src/views/hazard_investigation/troubleshooting_plan/index.vue @@ -0,0 +1,119 @@ + + + + + diff --git a/src/views/hidden_danger_government/acceptance/acceptance.vue b/src/views/hidden_danger_government/acceptance/acceptance.vue new file mode 100644 index 0000000..f1fcd66 --- /dev/null +++ b/src/views/hidden_danger_government/acceptance/acceptance.vue @@ -0,0 +1,125 @@ + + + + + diff --git a/src/views/hidden_danger_government/acceptance/index.vue b/src/views/hidden_danger_government/acceptance/index.vue new file mode 100644 index 0000000..9911271 --- /dev/null +++ b/src/views/hidden_danger_government/acceptance/index.vue @@ -0,0 +1,156 @@ + + + + + diff --git a/src/views/hidden_danger_government/acceptance/view.vue b/src/views/hidden_danger_government/acceptance/view.vue new file mode 100644 index 0000000..f7c6703 --- /dev/null +++ b/src/views/hidden_danger_government/acceptance/view.vue @@ -0,0 +1,9 @@ + + + + + diff --git a/src/views/hidden_danger_government/ledger/add.vue b/src/views/hidden_danger_government/ledger/add.vue new file mode 100644 index 0000000..678b129 --- /dev/null +++ b/src/views/hidden_danger_government/ledger/add.vue @@ -0,0 +1,79 @@ + + + + + diff --git a/src/views/hidden_danger_government/ledger/components/export_excel.vue b/src/views/hidden_danger_government/ledger/components/export_excel.vue new file mode 100644 index 0000000..b7e7d30 --- /dev/null +++ b/src/views/hidden_danger_government/ledger/components/export_excel.vue @@ -0,0 +1,169 @@ + + + + + diff --git a/src/views/hidden_danger_government/ledger/index.vue b/src/views/hidden_danger_government/ledger/index.vue new file mode 100644 index 0000000..87ddab7 --- /dev/null +++ b/src/views/hidden_danger_government/ledger/index.vue @@ -0,0 +1,246 @@ + + + + + diff --git a/src/views/hidden_danger_government/ledger/print.vue b/src/views/hidden_danger_government/ledger/print.vue new file mode 100644 index 0000000..fd15524 --- /dev/null +++ b/src/views/hidden_danger_government/ledger/print.vue @@ -0,0 +1,124 @@ + + + + + diff --git a/src/views/hidden_danger_government/ledger/view.vue b/src/views/hidden_danger_government/ledger/view.vue new file mode 100644 index 0000000..f7c6703 --- /dev/null +++ b/src/views/hidden_danger_government/ledger/view.vue @@ -0,0 +1,9 @@ + + + + + diff --git a/src/views/hidden_danger_government/major/index.vue b/src/views/hidden_danger_government/major/index.vue new file mode 100644 index 0000000..8dd95ce --- /dev/null +++ b/src/views/hidden_danger_government/major/index.vue @@ -0,0 +1,179 @@ + + + + + diff --git a/src/views/hidden_danger_government/major/view.vue b/src/views/hidden_danger_government/major/view.vue new file mode 100644 index 0000000..4aa3c65 --- /dev/null +++ b/src/views/hidden_danger_government/major/view.vue @@ -0,0 +1,41 @@ + + + + + diff --git a/src/views/hidden_danger_government/rectification/index.vue b/src/views/hidden_danger_government/rectification/index.vue new file mode 100644 index 0000000..8840aac --- /dev/null +++ b/src/views/hidden_danger_government/rectification/index.vue @@ -0,0 +1,162 @@ + + + + + diff --git a/src/views/hidden_danger_government/rectification/rectification.vue b/src/views/hidden_danger_government/rectification/rectification.vue new file mode 100644 index 0000000..a5b539d --- /dev/null +++ b/src/views/hidden_danger_government/rectification/rectification.vue @@ -0,0 +1,541 @@ + + + + + diff --git a/src/views/hidden_danger_government/rectification/view.vue b/src/views/hidden_danger_government/rectification/view.vue new file mode 100644 index 0000000..f7c6703 --- /dev/null +++ b/src/views/hidden_danger_government/rectification/view.vue @@ -0,0 +1,9 @@ + + + + + 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 @@ - - diff --git a/src/views/risk_control/identifying_parts/components/risk_add.vue b/src/views/risk_control/identifying_parts/components/risk_add.vue new file mode 100644 index 0000000..122079b --- /dev/null +++ b/src/views/risk_control/identifying_parts/components/risk_add.vue @@ -0,0 +1,91 @@ + + + + + diff --git a/src/views/risk_control/identifying_parts/resources_risk.vue b/src/views/risk_control/identifying_parts/resources_risk.vue index f5251f8..1407221 100644 --- a/src/views/risk_control/identifying_parts/resources_risk.vue +++ b/src/views/risk_control/identifying_parts/resources_risk.vue @@ -89,7 +89,7 @@
保存
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{ form.LIKELIHOOD }} - - - - - - - - - - - - - - - - - {{ form.EXPOSURE }} - - - - - - - - - - - - - - - - - {{ form.CONSEQUENCE }} - - - - - {{ form.LEVEL_NAME }} - - - - - {{ form.DANGER }} - - - - - - - - - - - - - - - - - - - - - - +