diff --git a/package.json b/package.json index 41b7a92..60ab576 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "core-js": "^3.6.5", "echarts": "^5.3.3", "echarts-gl": "^2.0.9", - "element-plus": "2.0.2", + "element-plus": "2.11.3", "gifler": "^0.1.0", "lodash": "^4.17.21", "mitt": "^3.0.0", diff --git a/src/api/sys.js b/src/api/sys.js index 47ab1ef..d661a70 100644 --- a/src/api/sys.js +++ b/src/api/sys.js @@ -1,5 +1,5 @@ import request from "@/utils/request"; -const api = "/mosty-base"; +const api = "/mosty-api/mosty-base"; /* * 登录 * return promise 实例对象 diff --git a/src/components/MyComponents/Upload/index.vue b/src/components/MyComponents/Upload/index.vue index 0f0b397..f5aa56c 100644 --- a/src/components/MyComponents/Upload/index.vue +++ b/src/components/MyComponents/Upload/index.vue @@ -54,7 +54,7 @@ import { COMPONENT_WIDTH } from "@/constant"; import { ref, defineProps, defineEmits, defineExpose, computed, watch, onMounted } from "vue"; import { ElMessage, ElMessageBox } from "element-plus"; -import type from "element-plus/es/components/upload/src/upload.type"; + import { useStore } from "vuex"; const props = defineProps({ //获取组件传值 diff --git a/src/layout/components/Header.vue b/src/layout/components/Header.vue index ab994d3..a4489e3 100644 --- a/src/layout/components/Header.vue +++ b/src/layout/components/Header.vue @@ -19,9 +19,9 @@ -
+
diff --git a/src/router/index.js b/src/router/index.js index bfb9542..823ba1b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -326,14 +326,127 @@ export const publicRoutes = [ }, }, { - path: "/trainer", - name: "trainer", - component: () => - import("@/views/securityManagement/trainer/index"), + path: "/trainingManagement", + name: "/trainingManagement", meta: { - title: "培训人员管理", + title: "培训管理", icon: "personnel" }, + children: [ + { + path: "/trainingManagement/trainer", + name: "trainer", + component: () => + import("@/views/securityManagement/trainingManagement/trainer/index"), + meta: { + title: "培训人员", + icon: "personnel" + }, + }, + { + path: "/trainingManagement/personnelTraining", + name: "personnelTraining", + component: () => + import("@/views/securityManagement/trainingManagement/personnelTraining/index"), + meta: { + title: "保安待培训人员管理", + icon: "personnel" + }, + }, + { + path: "/trainingManagement/trainingProject", + name: "trainingProject", + component: () => + import("@/views/securityManagement/trainingManagement/trainingProject/index"), + meta: { + title: "保安培训项目管理", + icon: "personnel" + } + } + ] + }, + { + path: "/examManagement", + name: "examManagement", + component: () => + import("@/views/securityManagement/examManagement/index"), + meta: { + title: "保安考试管理", + icon: "personnel" + }, + }, + { + path: "/training", + name: "training", + meta: { + title: "培训中心", + icon: "personnel" + }, + children: [ + { + path: "/training/securityTrainingVideo", + name: "securityTrainingVideo", + component: () => import("@/views/Training/SecurityTrainingVideo/index"), + meta: { + title: "保安培训视频", + icon: "personnel" + } + }, + { + path: "/training/securityQuestionBank", + name: "securityQuestionBank", + component: () => import("@/views/Training/SecurityQuestionBank/index"), + meta: { + title: "保安题库", + icon: "personnel" + } + }, + { + path: "/training/securityTrainingSyllabus", + name: "securityTrainingSyllabus", + component: () => import("@/views/Training/SecurityTrainingSyllabus/index"), + meta: { + title: "保安培训教学大纲", + icon: "personnel" + } + }, + { + path: "/training/annualInspectionTraining", + name: "annualInspectionTraining", + component: () => import("@/views/Training/AnnualInspectionTraining/index"), + meta: { + title: "年检培训", + icon: "personnel" + } + }, + { + path: "/training/annualInspectionApplicants", + name: "annualInspectionApplicants", + component: () => import("@/views/Training/AnnualInspectionApplicants/index"), + meta: { + title: "年检申请人员", + icon: "personnel" + } + }, + { + path: "/training/annualInspection", + name: "annualInspection", + component: () => import("@/views/Training/AnnualInspection/index"), + meta: { + title: "年检", + icon: "personnel" + } + }, + { + path: "/training/securityExamManagement", + name: "securityExamManagement", + component: () => import("@/views/Training/SecurityExamManagement/index"), + meta: { + title: "保安考试管理", + icon: "personnel" + } + } + ] } // { // path: "/basicsmanage", diff --git a/src/styles/index.scss b/src/styles/index.scss index 6587ff6..d2d6193 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -97,6 +97,13 @@ div:focus { border-color: rgb(8, 85, 170); } +::v-deep { + .el-input__inner, .el-input__inner:hover, .el-input__inner:focus { + border: none; + box-shadow: none; + } +} + .new-btn-class-bj { color: #409eff; margin-right: 10px; diff --git a/src/views/securityManagement/examManagement/components/viewAndUploadDialog.vue b/src/views/securityManagement/examManagement/components/viewAndUploadDialog.vue new file mode 100644 index 0000000..1baecef --- /dev/null +++ b/src/views/securityManagement/examManagement/components/viewAndUploadDialog.vue @@ -0,0 +1,83 @@ + + + + + diff --git a/src/views/securityManagement/examManagement/components/viewExamDetalis.vue b/src/views/securityManagement/examManagement/components/viewExamDetalis.vue new file mode 100644 index 0000000..89f27bb --- /dev/null +++ b/src/views/securityManagement/examManagement/components/viewExamDetalis.vue @@ -0,0 +1,155 @@ + + + + + diff --git a/src/views/securityManagement/examManagement/index.vue b/src/views/securityManagement/examManagement/index.vue new file mode 100644 index 0000000..5419b96 --- /dev/null +++ b/src/views/securityManagement/examManagement/index.vue @@ -0,0 +1,131 @@ + + + + + diff --git a/src/views/securityManagement/practitioner/index.vue b/src/views/securityManagement/practitioner/index.vue index 1219846..e541616 100644 --- a/src/views/securityManagement/practitioner/index.vue +++ b/src/views/securityManagement/practitioner/index.vue @@ -1,7 +1,7 @@