diff --git a/src/router/index.js b/src/router/index.js index 249512b..154a7cd 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -182,7 +182,17 @@ export const publicRoutes = [ icon: "personnel" } }, - { + ] + }, + { + path: "/njxx", + name: "njxx", + meta: { + title: "年检信息", + icon: "personnel" + }, + children: [ + { path: "/training/annualInspectionTraining", name: "annualInspectionTraining", component: () => import("@/views/Training/AnnualInspectionTraining/index"), @@ -211,255 +221,255 @@ export const publicRoutes = [ }, ] }, - { - path: "/systemConfig", - name: "systemConfigModel", - meta: { - title: "系统管理", - icon: "personnel" - }, - children: [ - { - path: "/user/department-ist", - name: "departmentList", - component: () => - import( - "@/views/backOfficeSystem/systemConfig/department-list/index" - ), - meta: { - title: "部门管理", - icon: "personnel-manage" - } - }, - { - path: "/user/userList", - name: "userList", - component: () => - import("@/views/backOfficeSystem/systemConfig/user-list/index"), - meta: { - title: "用户管理", - icon: "role" - } - }, - { - path: "/user/role", - name: "userRoleIndex", - component: () => - import("@/views/backOfficeSystem/systemConfig/role-list/index"), - meta: { - title: "角色列表", - icon: "role" - } - }, - { - path: "/user/menuList", - name: "menuList", - component: () => - import("@/views/backOfficeSystem/systemConfig/menu-list/index"), - meta: { - title: "菜单管理", - icon: "personnel-manage" - } - }, - { - path: "/user/publicSecurity", - name: "publicSecurity", - component: () => - import( - "@/views/backOfficeSystem/systemConfig/publicSecurity/index" - ), - meta: { - title: "公安机关要素", - icon: "personnel-manage" - } - }, - { - path: "/dict/detail", - name: "dictDetail", - component: () => - import("@/views/backOfficeSystem/systemConfig/dict/detail"), - meta: { - title: "字典数据" - } - }, - { - path: "/dict/index", - name: "dictIndex", - component: () => - import("@/views/backOfficeSystem/systemConfig/dict/index"), - meta: { - title: "字典列表", - icon: "article-ranking" - } - }, - { - path: "/user/job", - name: "userJob", - component: () => - import("@/views/backOfficeSystem/systemConfig/job-list/index"), - meta: { - title: "岗位列表", - icon: "personnel-manage" - } - }, - { - path: "/user/deptAllocationUser/:id", - name: "deptAllocationUser", - component: () => - import( - "@/views/backOfficeSystem/systemConfig/department-list/deptAllocationUser" - ), - meta: { - title: "管理用户" - } - }, - { - path: "/user/allocationUser/:id", - name: "allocationUser", - component: () => - import( - "@/views/backOfficeSystem/systemConfig/role-list/allocationUser" - ), - meta: { - title: "分配用户" - } - }, - { - path: "/sys/systemFxMx", - name: "systemFxMx", - component: () => - import("@/views/backOfficeSystem/systemConfig/systemFxMx/index"), - meta: { - title: "系统分析模型", - icon: "personnel-manage" - } - }, - // { - // path: "/sys/ysjq", - // name: "ysjq", - // component: () => import("@/views/backOfficeSystem/systemConfig/ysjq/index"), - // meta: { - // title: "演示警情", - // icon: "personnel-manage" - // } - // }, - { - path: "/user/systemConfig", - name: "systemConfig", - component: () => - import( - "@/views/backOfficeSystem/systemConfig/system-config-list/index" - ), - meta: { - title: "系统配置", - icon: "personnel-manage" - } - }, + // { + // path: "/systemConfig", + // name: "systemConfigModel", + // meta: { + // title: "系统管理", + // icon: "personnel" + // }, + // children: [ + // { + // path: "/user/department-ist", + // name: "departmentList", + // component: () => + // import( + // "@/views/backOfficeSystem/systemConfig/department-list/index" + // ), + // meta: { + // title: "部门管理", + // icon: "personnel-manage" + // } + // }, + // { + // path: "/user/userList", + // name: "userList", + // component: () => + // import("@/views/backOfficeSystem/systemConfig/user-list/index"), + // meta: { + // title: "用户管理", + // icon: "role" + // } + // }, + // { + // path: "/user/role", + // name: "userRoleIndex", + // component: () => + // import("@/views/backOfficeSystem/systemConfig/role-list/index"), + // meta: { + // title: "角色列表", + // icon: "role" + // } + // }, + // { + // path: "/user/menuList", + // name: "menuList", + // component: () => + // import("@/views/backOfficeSystem/systemConfig/menu-list/index"), + // meta: { + // title: "菜单管理", + // icon: "personnel-manage" + // } + // }, + // { + // path: "/user/publicSecurity", + // name: "publicSecurity", + // component: () => + // import( + // "@/views/backOfficeSystem/systemConfig/publicSecurity/index" + // ), + // meta: { + // title: "公安机关要素", + // icon: "personnel-manage" + // } + // }, + // { + // path: "/dict/detail", + // name: "dictDetail", + // component: () => + // import("@/views/backOfficeSystem/systemConfig/dict/detail"), + // meta: { + // title: "字典数据" + // } + // }, + // { + // path: "/dict/index", + // name: "dictIndex", + // component: () => + // import("@/views/backOfficeSystem/systemConfig/dict/index"), + // meta: { + // title: "字典列表", + // icon: "article-ranking" + // } + // }, + // { + // path: "/user/job", + // name: "userJob", + // component: () => + // import("@/views/backOfficeSystem/systemConfig/job-list/index"), + // meta: { + // title: "岗位列表", + // icon: "personnel-manage" + // } + // }, + // { + // path: "/user/deptAllocationUser/:id", + // name: "deptAllocationUser", + // component: () => + // import( + // "@/views/backOfficeSystem/systemConfig/department-list/deptAllocationUser" + // ), + // meta: { + // title: "管理用户" + // } + // }, + // { + // path: "/user/allocationUser/:id", + // name: "allocationUser", + // component: () => + // import( + // "@/views/backOfficeSystem/systemConfig/role-list/allocationUser" + // ), + // meta: { + // title: "分配用户" + // } + // }, + // { + // path: "/sys/systemFxMx", + // name: "systemFxMx", + // component: () => + // import("@/views/backOfficeSystem/systemConfig/systemFxMx/index"), + // meta: { + // title: "系统分析模型", + // icon: "personnel-manage" + // } + // }, + // // { + // // path: "/sys/ysjq", + // // name: "ysjq", + // // component: () => import("@/views/backOfficeSystem/systemConfig/ysjq/index"), + // // meta: { + // // title: "演示警情", + // // icon: "personnel-manage" + // // } + // // }, + // { + // path: "/user/systemConfig", + // name: "systemConfig", + // component: () => + // import( + // "@/views/backOfficeSystem/systemConfig/system-config-list/index" + // ), + // meta: { + // title: "系统配置", + // icon: "personnel-manage" + // } + // }, - { - path: "/user/systemVersion", - name: "systemVersion", - component: () => - import( - "@/views/backOfficeSystem/systemConfig/system-version-list/index" - ), - meta: { - title: "系统版本管理", - icon: "personnel-manage" - } - }, - { - path: "/user/useQk", - name: "useQk", - component: () => - import("@/views/backOfficeSystem/systemConfig/useQk/index"), - meta: { - title: "系统使用情况", - icon: "personnel-manage" - } - }, - { - path: "/user/zdqyFz", - name: "zdqyFz", - component: () => - import("@/views/backOfficeSystem/systemConfig/zdqyFz/index"), - meta: { - title: "重点区域分值", - icon: "personnel-manage" - } - }, + // { + // path: "/user/systemVersion", + // name: "systemVersion", + // component: () => + // import( + // "@/views/backOfficeSystem/systemConfig/system-version-list/index" + // ), + // meta: { + // title: "系统版本管理", + // icon: "personnel-manage" + // } + // }, + // { + // path: "/user/useQk", + // name: "useQk", + // component: () => + // import("@/views/backOfficeSystem/systemConfig/useQk/index"), + // meta: { + // title: "系统使用情况", + // icon: "personnel-manage" + // } + // }, + // { + // path: "/user/zdqyFz", + // name: "zdqyFz", + // component: () => + // import("@/views/backOfficeSystem/systemConfig/zdqyFz/index"), + // meta: { + // title: "重点区域分值", + // icon: "personnel-manage" + // } + // }, - { - path: "/user/log", - name: "/user/log", - meta: { - title: "日志", - icon: "article" - }, - children: [ - { - path: "/user/operateLog", - name: "/user/operateLog", - component: () => - import( - "@/views/backOfficeSystem/systemConfig/log-manage/operateLog/index" - ), - meta: { - title: "操作日志", - icon: "article-ranking" - } - }, - { - path: "/user/loginLog", - name: "/user/loginLog", - component: () => - import( - "@/views/backOfficeSystem/systemConfig/log-manage/loginLog/index" - ), - meta: { - title: "登录日志", - icon: "article-ranking" - } - } - ] - }, - { - path: "/developer", - name: "developer", - component: () => import("@/views/developer/index"), - meta: { - title: "开发者中心", - icon: "article-ranking" - } - }, - { - //如果三级 需要把路由注册出来 - path: "/user/operateLog", - name: "/user/operateLog", - component: () => - import( - "@/views/backOfficeSystem/systemConfig/log-manage/operateLog/index" - ) - }, - { - path: "/user/loginLog", - name: "/user/loginLog", - component: () => - import( - "@/views/backOfficeSystem/systemConfig/log-manage/loginLog/index" - ) - }, - { - path: "/tool/gen-edit/index/:tableId", - name: "gen-edit", - component: () => - import("@/views/backOfficeSystem/systemConfig/gen/editTable"), - meta: { - title: "代码生成编辑" - } - } - ] - }, + // { + // path: "/user/log", + // name: "/user/log", + // meta: { + // title: "日志", + // icon: "article" + // }, + // children: [ + // { + // path: "/user/operateLog", + // name: "/user/operateLog", + // component: () => + // import( + // "@/views/backOfficeSystem/systemConfig/log-manage/operateLog/index" + // ), + // meta: { + // title: "操作日志", + // icon: "article-ranking" + // } + // }, + // { + // path: "/user/loginLog", + // name: "/user/loginLog", + // component: () => + // import( + // "@/views/backOfficeSystem/systemConfig/log-manage/loginLog/index" + // ), + // meta: { + // title: "登录日志", + // icon: "article-ranking" + // } + // } + // ] + // }, + // { + // path: "/developer", + // name: "developer", + // component: () => import("@/views/developer/index"), + // meta: { + // title: "开发者中心", + // icon: "article-ranking" + // } + // }, + // { + // //如果三级 需要把路由注册出来 + // path: "/user/operateLog", + // name: "/user/operateLog", + // component: () => + // import( + // "@/views/backOfficeSystem/systemConfig/log-manage/operateLog/index" + // ) + // }, + // { + // path: "/user/loginLog", + // name: "/user/loginLog", + // component: () => + // import( + // "@/views/backOfficeSystem/systemConfig/log-manage/loginLog/index" + // ) + // }, + // { + // path: "/tool/gen-edit/index/:tableId", + // name: "gen-edit", + // component: () => + // import("@/views/backOfficeSystem/systemConfig/gen/editTable"), + // meta: { + // title: "代码生成编辑" + // } + // } + // ] + // }, // { // path: "/basicsmanage", // name: "/basicsmanage", diff --git a/src/views/login/oatuh_login.vue b/src/views/login/oatuh_login.vue index a2459af..61c6421 100644 --- a/src/views/login/oatuh_login.vue +++ b/src/views/login/oatuh_login.vue @@ -3,25 +3,23 @@ diff --git a/src/views/securityManagement/personnelManagement/applicantPersonnel/index.vue b/src/views/securityManagement/personnelManagement/applicantPersonnel/index.vue index 1a8d063..e7affe3 100644 --- a/src/views/securityManagement/personnelManagement/applicantPersonnel/index.vue +++ b/src/views/securityManagement/personnelManagement/applicantPersonnel/index.vue @@ -81,7 +81,7 @@ const searchConfiger = ref([ ]); const pageData = reactive({ - tableData: [{}], + tableData: [], keyCount: 0, tableConfiger: { rowHieght: 61, @@ -99,7 +99,7 @@ const pageData = reactive({ { label: "证件号码", prop: "zjhm" }, { label: "联系方式", prop: "lxdh" }, { label: "岗位", prop: "gw", showSolt: true }, - { label: "申请时间", prop: "xtCjsj" }, + { label: "申请时间", prop: "sqrq" }, { label: "是否上传资料", prop: "pxgs", showSolt: true }, { label: "是否线上培训", prop: "sfpx", showSolt: true }, ] diff --git a/src/views/securityManagement/personnelManagement/practitioner/components/addPractitionerDialog.vue b/src/views/securityManagement/personnelManagement/practitioner/components/addPractitionerDialog.vue index df4d247..39333e8 100644 --- a/src/views/securityManagement/personnelManagement/practitioner/components/addPractitionerDialog.vue +++ b/src/views/securityManagement/personnelManagement/practitioner/components/addPractitionerDialog.vue @@ -89,8 +89,14 @@ const close = () => { const open = (row = {}, type = 'add') => { dialogVisible.value = true disabled.value = false - row.tp = row.tp ? row.tp.split(','):[] - row.bazzp = row.bazzp ? row.bazzp.split(','):[] + + const fieldsToSplit = ['tp', 'bazzp']; + fieldsToSplit.forEach(field => { + row[field] = typeof row[field] === 'string' + ? row[field].split(',') + : row[field]; + }); + formData.value = { ...row } if (type === 'add') { title.value = '新增从业人员' diff --git a/src/views/securityManagement/trainingManagement/personnelTraining/index.vue b/src/views/securityManagement/trainingManagement/personnelTraining/index.vue index b0544c1..09fa76b 100644 --- a/src/views/securityManagement/trainingManagement/personnelTraining/index.vue +++ b/src/views/securityManagement/trainingManagement/personnelTraining/index.vue @@ -65,9 +65,8 @@ const searchConfiger = ref([ { label: "所属保安公司", prop: "ssbags", - placeholder: "请选择所属保安公司", - showType: "select", - options: D_BAXX_DWLX + placeholder: "请输入所属保安公司", + showType: "input", }, { label: "提交日期", @@ -87,7 +86,7 @@ const pageData = reactive({ }, total: 0, pageConfiger: { - sfcjpx: 1, // 是否参加培训 + sfxxpx: '02', // 是否参加培训 pageSize: 20, pageCurrent: 1 }, diff --git a/src/views/securityManagement/trainingManagement/trainer/components/addTrainerDialog.vue b/src/views/securityManagement/trainingManagement/trainer/components/addTrainerDialog.vue index 9fd89c3..a6b3f71 100644 --- a/src/views/securityManagement/trainingManagement/trainer/components/addTrainerDialog.vue +++ b/src/views/securityManagement/trainingManagement/trainer/components/addTrainerDialog.vue @@ -99,6 +99,14 @@ const close = () => { const open = (row = {}, type = 'add') => { disabled.value = false dialogVisible.value = true + + const fieldsToSplit = ['sfzzm', 'sfzfm', 'tjbg', 'fzjlzm']; + fieldsToSplit.forEach(field => { + row[field] = typeof row[field] === 'string' + ? row[field].split(',') + : []; + }); + formData.value = { ...row } if (type === 'add') { title.value = '新增从业人员' @@ -111,10 +119,18 @@ const open = (row = {}, type = 'add') => { } const save = () => { + const params = { ...formData.value } + const fieldsToSplit = ['sfzzm', 'sfzfm', 'tjbg', 'fzjlzm']; + fieldsToSplit.forEach(field => { + params[field] = params[field] + ? params[field].join(',') + : ''; + }); + FormRef.value.submit(() => { loading.value = true; - const url = !formData.value?.id ? `/bagl/mosty-base/baxx/cyry/add` : `/bagl/mosty-base/baxx/cyry/edit`; - qcckPost(formData.value, url).then(() => { + const url = !formData.value?.id ? `/mosty-base/baxx/cyry/add` : `/mosty-base/baxx/cyry/edit`; + qcckPost(params, url).then(() => { loading.value = false; proxy.$message.success("保存成功"); emits("refresh"); diff --git a/src/views/securityManagement/trainingManagement/trainer/index.vue b/src/views/securityManagement/trainingManagement/trainer/index.vue index 2b25caa..007467a 100644 --- a/src/views/securityManagement/trainingManagement/trainer/index.vue +++ b/src/views/securityManagement/trainingManagement/trainer/index.vue @@ -73,7 +73,7 @@ const searchConfiger = ref([ ]); const pageData = reactive({ - tableData: [{}], + tableData: [], keyCount: 0, tableConfiger: { rowHieght: 61, @@ -120,8 +120,8 @@ const getList = async () => { const res = await qcckPost({ ...pageData.pageConfiger, ...queryFrom.value, - sfcjpx: 0 - }, `/bagl/mosty-base/baxx/pxry/page`) + sfxxpx: '01' + }, `/mosty-base/baxx/pxry/page`) if(res) { pageData.tableData = res.records || []; @@ -139,8 +139,8 @@ const handleSubmitTraining = async (row) => { try { await qcckPost({ ...row, - sfcjpx: 1 - }, "/bagl/mosty-base/baxx/pxry/edit") + sfxxpx: '02' + }, "/mosty-base/baxx/pxry/edit") proxy.$modal.msgSuccess("提交培训成功"); await getList(); } catch (error) { diff --git a/src/views/securityManagement/trainingManagement/trainingProject/components/selectPersonnelDialog.vue b/src/views/securityManagement/trainingManagement/trainingProject/components/selectPersonnelDialog.vue index 6a1990c..4db1cfa 100644 --- a/src/views/securityManagement/trainingManagement/trainingProject/components/selectPersonnelDialog.vue +++ b/src/views/securityManagement/trainingManagement/trainingProject/components/selectPersonnelDialog.vue @@ -73,7 +73,7 @@ const pageData = reactive({ total: 0, tableHeight: 300, pageConfiger: { - sfcjpx: 1, + sfxxpx: '02', pageSize: 10, pageCurrent: 1 }, diff --git a/src/views/securityManagement/unitInformation/components/viewDetailsDialog.vue b/src/views/securityManagement/unitInformation/components/viewDetailsDialog.vue index 2750f47..6ec4e33 100644 --- a/src/views/securityManagement/unitInformation/components/viewDetailsDialog.vue +++ b/src/views/securityManagement/unitInformation/components/viewDetailsDialog.vue @@ -114,6 +114,15 @@ const close = () => { const open = (row = {}, type = 'add') => { disabled.value = false dialogVisible.value = true + + // 统一处理所有需拆分的字段 + const fieldsToSplit = ['cszp', 'frSfzZm', 'frSfzFm', 'fzrSfzZm', 'fzrSfzFm', 'yyzzzp', 'jyxkz']; + fieldsToSplit.forEach(field => { + row[field] = typeof row[field] === 'string' + ? row[field].split(',') + : row[field]; + }); + formData.value = { ...row } if (type === 'view') { title.value = '查看详情' diff --git a/src/views/securityManagement/unitInformation/index.vue b/src/views/securityManagement/unitInformation/index.vue index 5888823..d42a105 100644 --- a/src/views/securityManagement/unitInformation/index.vue +++ b/src/views/securityManagement/unitInformation/index.vue @@ -44,7 +44,7 @@ const detailsRef = ref(null); const D_BZ_BXDLX = ref([]); const pageData = reactive({ - tableData: [{}], + tableData: [], keyCount: 0, tableConfiger: { rowHieght: 61,