diff --git a/src/router/index.js b/src/router/index.js index 161f7a3..8d59637 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -316,24 +316,34 @@ export const publicRoutes = [ }, }, { - path: "/practitioner", - name: "practitioner", - component: () => - import("@/views/securityManagement/practitioner/index"), + path: "/personnelManagement", + name: "personnelManagement", meta: { - title: "从业人员管理", + title: "人员管理", icon: "personnel" }, - }, - { - path: "/trainingManagement/applicantPersonnel", - name: "applicantPersonnel", - component: () => - import("@/views/securityManagement/applicantPersonnel/index"), - meta: { - title: "申请人员", - icon: "personnel" - } + children: [ + { + path: "/personnelManagement/practitioner", + name: "practitioner", + component: () => + import("@/views/securityManagement/personnelManagement/practitioner/index"), + meta: { + title: "从业人员管理", + icon: "personnel" + }, + }, + { + path: "/personnelManagement/applicantPersonnel", + name: "applicantPersonnel", + component: () => + import("@/views/securityManagement/personnelManagement/applicantPersonnel/index"), + meta: { + title: "申请人员", + icon: "personnel" + } + }, + ] }, { path: "/trainingManagement", diff --git a/src/styles/index.scss b/src/styles/index.scss index 97d3b34..8ee4c59 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -99,7 +99,7 @@ div:focus { ::v-deep { .el-input__inner, .el-input__inner:hover, .el-input__inner:focus { - // border: none; + border: none !important; box-shadow: none; background-color: transparent; } diff --git a/src/views/Training/AnnualInspection/index.vue b/src/views/Training/AnnualInspection/index.vue index 9cd6f96..70c0aff 100644 --- a/src/views/Training/AnnualInspection/index.vue +++ b/src/views/Training/AnnualInspection/index.vue @@ -40,7 +40,6 @@ import DetailForm from "./components/detailForm.vue"; import Pxgs from "./components/pxgs.vue"; import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js"; import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue"; -import { el } from "element-plus/es/locale.mjs"; const { proxy } = getCurrentInstance(); const activeTab = ref(2) const detailDiloag = ref(); @@ -153,4 +152,4 @@ const tabHeightFn = () => { .el-loading-mask { background: rgba(0, 0, 0, 0.5) !important; } - \ No newline at end of file + diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 26ad227..0ab21a8 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -5,20 +5,32 @@

用户登录

- - - - + + + - + + + + + + @@ -191,22 +203,15 @@ $cursor: #fff; color: #454545; } - &::v-deep .el-input { - display: inline-block; - height: 47px; - width: 85%; - - input { - background: transparent; - border: 0px; - -webkit-appearance: none; - border-radius: 0px; - padding: 12px 5px 12px 15px; - color: $light_gray; - height: 47px; - caret-color: $cursor; + ::v-deep { + .el-input__wrapper, .el-input-group__append, .el-input-group__prepend { + background-color: transparent !important; + box-shadow: none !important; } } + &::v-deep .el-input { + height: 44px; + } } .tips { diff --git a/src/views/securityManagement/applicantPersonnel/components/addTrainerDialog.vue b/src/views/securityManagement/personnelManagement/applicantPersonnel/components/addTrainerDialog.vue similarity index 100% rename from src/views/securityManagement/applicantPersonnel/components/addTrainerDialog.vue rename to src/views/securityManagement/personnelManagement/applicantPersonnel/components/addTrainerDialog.vue diff --git a/src/views/securityManagement/applicantPersonnel/components/selectTtaningDialog.vue b/src/views/securityManagement/personnelManagement/applicantPersonnel/components/selectTtaningDialog.vue similarity index 100% rename from src/views/securityManagement/applicantPersonnel/components/selectTtaningDialog.vue rename to src/views/securityManagement/personnelManagement/applicantPersonnel/components/selectTtaningDialog.vue diff --git a/src/views/securityManagement/applicantPersonnel/index.vue b/src/views/securityManagement/personnelManagement/applicantPersonnel/index.vue similarity index 100% rename from src/views/securityManagement/applicantPersonnel/index.vue rename to src/views/securityManagement/personnelManagement/applicantPersonnel/index.vue diff --git a/src/views/securityManagement/practitioner/components/addPractitionerDialog.vue b/src/views/securityManagement/personnelManagement/practitioner/components/addPractitionerDialog.vue similarity index 98% rename from src/views/securityManagement/practitioner/components/addPractitionerDialog.vue rename to src/views/securityManagement/personnelManagement/practitioner/components/addPractitionerDialog.vue index 6483e0d..e6d220c 100644 --- a/src/views/securityManagement/practitioner/components/addPractitionerDialog.vue +++ b/src/views/securityManagement/personnelManagement/practitioner/components/addPractitionerDialog.vue @@ -101,12 +101,14 @@ const close = () => { const open = (row = {}, type = 'add') => { dialogVisible.value = true + disabled.value = false formData.value = { ...row } if (type === 'add') { title.value = '新增从业人员' } else if (type === 'edit') { title.value = '编辑从业人员' } else { + disabled.value = true title.value = '查看详情' } } diff --git a/src/views/securityManagement/practitioner/index.vue b/src/views/securityManagement/personnelManagement/practitioner/index.vue similarity index 99% rename from src/views/securityManagement/practitioner/index.vue rename to src/views/securityManagement/personnelManagement/practitioner/index.vue index e541616..4e35b2f 100644 --- a/src/views/securityManagement/practitioner/index.vue +++ b/src/views/securityManagement/personnelManagement/practitioner/index.vue @@ -78,7 +78,7 @@ const searchConfiger = ref([ ]); const pageData = reactive({ - tableData: [], + tableData: [{}], keyCount: 0, tableConfiger: { rowHieght: 61, diff --git a/src/views/securityManagement/unitInformation/components/viewDetailsDialog.vue b/src/views/securityManagement/unitInformation/components/viewDetailsDialog.vue index 02c3412..110f72b 100644 --- a/src/views/securityManagement/unitInformation/components/viewDetailsDialog.vue +++ b/src/views/securityManagement/unitInformation/components/viewDetailsDialog.vue @@ -3,7 +3,7 @@
{{ title }}
- 保存 + 关闭
@@ -28,6 +28,18 @@ {{ formData.ssbmdm }} {{ formData.ssbmdm }} {{ formData.ssbmdm }} + {{ formData.ssbmdm }} + {{ formData.ssbmdm }} + {{ formData.ssbmdm }} + {{ formData.ssbmdm }} + {{ formData.ssbmdm }} + {{ formData.ssbmdm }} + {{ formData.ssbmdm }} + {{ formData.ssbmdm }} + {{ formData.ssbmdm }} + {{ formData.ssbmdm }} + {{ formData.ssbmdm }} + {{ formData.ssbmdm }} @@ -37,7 +49,6 @@ import { ref, computed, reactive, getCurrentInstance } from 'vue' import { qcckPost } from "@/api/qcckApi.js"; import MyTable from '@/components/aboutTable/MyTable.vue'; -// import viewAndUploadDialog from './viewAndUploadDialog.vue'; const { proxy } = getCurrentInstance() const title = ref('保安培训项目新增') @@ -104,7 +115,7 @@ const open = (row = {}, type = 'add') => { dialogVisible.value = true formData.value = { ...row } if (type === 'view') { - title.value = '保安线下考试详情' + title.value = '查看详情' visible.value = true } else if (type === 'edit') { title.value = '保安证申请' @@ -144,8 +155,7 @@ defineExpose({ open }) .cntinfo { padding: 2rem 12rem 0rem 12rem; - height: calc(100% - 70px); - overflow: hidden; + height: calc(100% - 270px); overflow-y: auto; } diff --git a/src/views/securityManagement/unitInformation/index.vue b/src/views/securityManagement/unitInformation/index.vue index 4044798..9777671 100644 --- a/src/views/securityManagement/unitInformation/index.vue +++ b/src/views/securityManagement/unitInformation/index.vue @@ -2,7 +2,6 @@
- 新增
@@ -20,9 +19,7 @@ @@ -31,7 +28,7 @@ total: pageData.total }"> - +
@@ -47,6 +44,7 @@ import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js"; const visible = ref(false); const searchBox = ref(null); +const detailsRef = ref(null); const D_BZ_BXDLX = ref([]); const searchConfiger = ref([ { @@ -110,6 +108,9 @@ const getList = async () => { } }; +const addEdit = (type, row) => { + detailsRef.value.open(row, type); +} onMounted(() => { tabHeightFn();