diff --git a/src/assets/js/asyncRouter.js b/src/assets/js/asyncRouter.js index 0e1509c..43360d6 100644 --- a/src/assets/js/asyncRouter.js +++ b/src/assets/js/asyncRouter.js @@ -243,6 +243,68 @@ export default [ component: "hazard_investigation/inventory_management/insurance_coverage", }, + { + path: "/hazard_investigation/inventory_management/add", + meta: { + title: "新增", + activeMenu: "/hazard_investigation/inventory_management", + }, + component: "hazard_investigation/inventory_management/add", + }, + { + path: "/hazard_investigation/inventory_management/edit", + meta: { + title: "修改", + activeMenu: "/hazard_investigation/inventory_management", + }, + component: "hazard_investigation/inventory_management/add", + }, + { + path: "/hazard_investigation/inventory_management/inheritance_list", + meta: { + title: "继承清单", + activeMenu: "/hazard_investigation/inventory_management", + }, + component: "hazard_investigation/inventory_management/add", + }, + ], + }, + { + path: "/hazard_investigation/delete_inventory_management", + meta: { title: "删除清单管理", isSubMenu: false }, + component: "children", + children: [ + { + path: "", + component: "hazard_investigation/delete_inventory_management/index", + }, + { + path: "/hazard_investigation/delete_inventory_management/view", + meta: { + title: "查看", + activeMenu: "/hazard_investigation/delete_inventory_management", + }, + component: "hazard_investigation/delete_inventory_management/view", + }, + ], + }, + { + path: "/hazard_investigation/inventory_troubleshooting", + meta: { title: "清单排查", isSubMenu: false }, + component: "children", + children: [ + { + path: "", + component: "hazard_investigation/inventory_troubleshooting/index", + }, + { + path: "/hazard_investigation/inventory_troubleshooting/inspect", + meta: { + title: "开始检查", + activeMenu: "/hazard_investigation/inventory_troubleshooting", + }, + component: "hazard_investigation/inventory_troubleshooting/inspect", + }, ], }, ], @@ -311,7 +373,7 @@ export default [ { path: "/platform_resource_library/curriculum/view", meta: { - title: "课程详情查看", + title: "查看详情", activeMenu: "/platform_resource_library/curriculum/list", }, component: "platform_resource_library/curriculum/view", @@ -330,7 +392,7 @@ export default [ { path: "/platform_resource_library/paper/view", meta: { - title: "试卷详情查看", + title: "查看试卷", activeMenu: "/platform_resource_library/paper/list", }, component: "platform_resource_library/paper/view", @@ -339,6 +401,62 @@ export default [ }, ], }, + { + path: "/online_learn_exam", + redirect: "/online_learn_exam/courseware", + meta: { title: "在线学习与考试", model: MODEL["2"] }, + component: "children", + children: [ + { + path: "/online_learn_exam/courseware", + redirect: "/online_learn_exam/courseware/video", + meta: { title: "课件管理" }, + component: "children", + children: [ + { + path: "/online_learn_exam/courseware/video", + meta: { title: "视频课件维护", isSubMenu: false }, + component: "children", + children: [ + { + path: "", + component: "online_learn_exam/courseware/video/index", + }, + { + path: "/online_learn_exam/courseware/video/question_list", + meta: { + title: "课件习题", + activeMenu: "/online_learn_exam/courseware/video", + }, + component: + "online_learn_exam/courseware/question/question_list", + }, + ], + }, + { + path: "/online_learn_exam/courseware/data", + meta: { title: "资料课件维护", isSubMenu: false }, + component: "children", + children: [ + { + path: "", + component: "online_learn_exam/courseware/data/index", + }, + { + path: "/online_learn_exam/courseware/data/question_list", + meta: { + title: "课件习题", + activeMenu: "/online_learn_exam/courseware/data", + }, + component: + "online_learn_exam/courseware/question/question_list", + }, + ], + }, + ], + }, + ], + }, { path: "/archives", redirect: "/archives/user", diff --git a/src/assets/js/data_dictionary.js b/src/assets/js/data_dictionary.js index 56504f6..b72b135 100644 --- a/src/assets/js/data_dictionary.js +++ b/src/assets/js/data_dictionary.js @@ -139,6 +139,34 @@ export const layoutFnGetTroubleshootingType = async () => { }); return ref(resData.list); }; +// 隐患级别 +export const layoutFnGetHazardLevel = async () => { + const resData = await getLevels({ + DICTIONARIES_ID: "5e7cf8620ba54ad89719d0be62133c7a", + }); + return ref(resData.list); +}; +// 隐患类别 +export const layoutFnGetHazardCategories = async () => { + const resData = await getLevels({ + DICTIONARIES_ID: "ec1d6dcfd0f2438a88968feea542eab0", + }); + return ref(resData.list); +}; +// 各省隐患类型 +export const layoutFnGetEveryProvinceHiddenDangerType = async () => { + const resData = await getLevels({ + DICTIONARIES_ID: "3babc15144444bdc8d763d0af2bdfff8", + }); + return ref(resData.list); +}; +// 排查周期 +export const layoutFnGetTroubleshootingCycle = async () => { + const resData = await getLevels({ + DICTIONARIES_ID: "f60cf0e8315b4993b6d6049dd29f2ba5", + }); + return ref(resData.list); +}; // 清单级别 export const layoutFnGetInventoryLevel = async () => { const resData = await getLevels({ @@ -146,6 +174,13 @@ export const layoutFnGetInventoryLevel = async () => { }); return ref(resData.list); }; +// 任务类型 +export const layoutFnGetTaskType = async () => { + const resData = await getLevels({ + DICTIONARIES_ID: "7a1afe8a5e594b6a9e0cef42bd00f352", + }); + return ref(resData.list); +}; // 职务 export const layoutFnGetDuties = async () => { const resData = await getLevelsCorp({ diff --git a/src/assets/js/usePrint.js b/src/assets/js/usePrint.js index 9767d45..e402fe0 100644 --- a/src/assets/js/usePrint.js +++ b/src/assets/js/usePrint.js @@ -1,11 +1,10 @@ import { ref } from "vue"; -export default function usePrint(THEAD_HEIGHT) { +export default function usePrint() { const buttonRef = ref(null); const A4_HEIGHT_MM = 297; const A4_HEIGHT_MM_TO_PX_PROPORTION = 3.78; - let A4_HEIGHT_PX = - A4_HEIGHT_MM * A4_HEIGHT_MM_TO_PX_PROPORTION - THEAD_HEIGHT; + let A4_HEIGHT_PX = A4_HEIGHT_MM * A4_HEIGHT_MM_TO_PX_PROPORTION; let elements = []; const printObj = { id: "printContent", @@ -16,9 +15,9 @@ export default function usePrint(THEAD_HEIGHT) { const fnPrint = () => { document.querySelector("#printContent").style.overflow = "visible"; elements = document.querySelectorAll("#printContent > table > tr"); - if (!document.querySelector("#printContent > table thead")) { - A4_HEIGHT_PX = A4_HEIGHT_PX + THEAD_HEIGHT; - } + 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/assets/js/utils.js b/src/assets/js/utils.js index 912ac1e..f0a2804 100644 --- a/src/assets/js/utils.js +++ b/src/assets/js/utils.js @@ -99,7 +99,7 @@ export function ArrayDeduplication(arr) { * @param {string} name 去重的key * @return {Array} 去重后的数组 **/ -export function ArrayObjectDeduplication(arr, name) { +export function arrayObjectDeduplication(arr, name) { const obj = {}; arr = arr.reduce(function (previousValue, currentValue) { if (!obj[currentValue[name]]) { @@ -349,10 +349,7 @@ export function idCardGetDateAndGender(idCard) { else MonthDate = Month; if (DayDate < 10) Day = "0" + DayDate; else Day = DayDate; - sex = - org_gender % 2 === 1 - ? "998f8531a6254c2eab5c825fa2d9896f" - : "fdd532d9def447cdb68af3a938f6f05c"; + sex = org_gender % 2 === 1 ? "1" : "0"; date = birthdays.getFullYear() + "-" + MonthDate + "-" + Day; } return { sex, date }; diff --git a/src/components/hazard_type/index.vue b/src/components/hazard_type/index.vue new file mode 100644 index 0000000..2e2dca5 --- /dev/null +++ b/src/components/hazard_type/index.vue @@ -0,0 +1,48 @@ + + + + + diff --git a/src/components/pdf/index.vue b/src/components/pdf/index.vue index 7dc3b15..4fed0fe 100644 --- a/src/components/pdf/index.vue +++ b/src/components/pdf/index.vue @@ -1,8 +1,11 @@