From ac0ac2776a39ef216a70803b5069de559ad29109 Mon Sep 17 00:00:00 2001 From: wangchengming <15110151257@163.com> Date: Tue, 1 Jul 2025 22:53:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E8=BD=A6=E5=9E=8B=E5=9F=B9?= =?UTF-8?q?=E8=AE=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/qualification/myQualifications.js | 44 ++++ src/api/qualification/vehicleTrain.js | 62 ++++++ src/api/system/user.js | 8 + src/router/index.js | 44 ++-- .../qualification/myQualifications/index.vue | 40 ++-- .../qualification/vehicleTrain/addForm.vue | 210 ++++++++++++++---- .../qualification/vehicleTrain/index.vue | 191 ++++++---------- 7 files changed, 391 insertions(+), 208 deletions(-) create mode 100644 src/api/qualification/myQualifications.js create mode 100644 src/api/qualification/vehicleTrain.js diff --git a/src/api/qualification/myQualifications.js b/src/api/qualification/myQualifications.js new file mode 100644 index 0000000..574090c --- /dev/null +++ b/src/api/qualification/myQualifications.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 获取我的资质申请记录列表 +export function getBusUserQualification(query) { + return request({ + url: '/admin/busUserQualification/pageList', + method: 'post', + data: query + }) +} + +// 查询属地详细 +export function getBusDependency(busDependencyId) { + return request({ + url: '/admin/busDependency/getBusDependency/' + busDependencyId, + method: 'post' + }) +} + +// 新增属地 +export function addBusDependency(data) { + return request({ + url: '/admin/busDependency/addBusDependency', + method: 'post', + data: data + }) +} + +// 修改属地 +export function updateBusDependency(data) { + return request({ + url: '/admin/busDependency/updateBusDependency', + method: 'post', + data: data + }) +} + +// 删除属地 +export function deleteBusDependency(busDependencyId) { + return request({ + url: '/admin/busDependency/deleteBusDependency/' + busDependencyId, + method: 'post' + }) +} diff --git a/src/api/qualification/vehicleTrain.js b/src/api/qualification/vehicleTrain.js new file mode 100644 index 0000000..f01bc31 --- /dev/null +++ b/src/api/qualification/vehicleTrain.js @@ -0,0 +1,62 @@ +import request from '@/utils/request' + +// 获取车型培训列表 +export function getVehicleTrainingPageList(query) { + return request({ + url: '/admin/vehicleModelTraining/pageList', + method: 'post', + data: query + }) +} + +// 查询车型培训详细 +export function getVehicleModelTraining(trainingId) { + return request({ + url: '/admin/vehicleModelTraining/getVehicleModelTraining/' + trainingId, + method: 'post' + }) +} + +// 新增车型培训记录 +export function addVehicleModelTraining(data) { + return request({ + url: '/admin/vehicleModelTraining/addVehicleModelTraining', + method: 'post', + data: data + }) +} + +// 修改车型培训记录 +export function updateVehicleModelTraining(data) { + return request({ + url: '/admin/vehicleModelTraining/update', + method: 'post', + data: data + }) +} + +// 删除属地 +export function deleteVehicleModelTraining(trainingId) { + return request({ + url: '/admin/vehicleModelTraining/delete/' + trainingId, + method: 'post' + }) +} + +// 导入车型培训记录 +export function importVehicleModelTraining(data) { + return request({ + url: '/admin/vehicleModelTraining/import', + method: 'post', + data + }) +} + +// // 导出车型培训记录 +// export function exportVehicleModelTraining(data) { +// return request({ +// url: '/admin/vehicleModelTraining/export', +// method: 'post', +// data +// }) +// } \ No newline at end of file diff --git a/src/api/system/user.js b/src/api/system/user.js index b5e3edd..fd5c12b 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -134,3 +134,11 @@ export function deptTreeSelect() { method: 'get' }) } + +// 获取当前登录用户信息 +export function getUserInfo() { + return request({ + url: '/system/user/info', + method: 'get' + }) +} diff --git a/src/router/index.js b/src/router/index.js index c3a505b..bc8d601 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -150,33 +150,33 @@ export const dynamicRoutes = [ ] }, { - path: '/qualification/vehicleTrain/addForm', - component: Layout, - hidden: true, - permissions: ['qualification:vehicleTrain:addForm'], - children: [ - { - path: '', - component: () => import('@/views/qualification/vehicleTrain/addForm'), - name: 'addForm', - meta: { title: '新建车型培训记录', activeMenu: '/qualification/vehicleTrain' } - } - ] - }, - { - path: '/qualification/vehicleTrain/editForm', + path: '/qualification/vehicleTrain/Form', component: Layout, hidden: true, permissions: ['qualification:vehicleTrain:editForm'], children: [ { - path: '', - component: () => import('@/views/qualification/vehicleTrain/editForm'), - name: 'editForm', - meta: { title: '编辑车型培训记录', activeMenu: '/qualification/vehicleTrain' } + path: 'operation/:Id(\\d+)?', + component: () => import('@/views/qualification/vehicleTrain/addForm'), + name: 'vehicleTrainForm', + meta: { title: '车型培训记录维护', activeMenu: '/qualification/vehicleTrain' } } ] - }, + }, + // { + // path: '/qualification/vehicleTrain/editForm', + // component: Layout, + // hidden: true, + // permissions: ['qualification:vehicleTrain:editForm'], + // children: [ + // { + // path: '', + // component: () => import('@/views/qualification/vehicleTrain/editForm'), + // name: 'editForm', + // meta: { title: '编辑车型培训记录', activeMenu: '/qualification/vehicleTrain' } + // } + // ] + // }, { path: '/qualification/vehicleTrain/importForm', component: Layout, @@ -204,7 +204,7 @@ export const dynamicRoutes = [ meta: { title: '导出车型培训记录', activeMenu: '/qualification/vehicleTrain' } } ] - }, + }, { path: '/labelManage/labelEscApproval/approvalDetail', component: Layout, @@ -247,7 +247,7 @@ export const dynamicRoutes = [ } ] }, - + { path: '/system/userApproval/userApprovalDetail', component: Layout, diff --git a/src/views/qualification/myQualifications/index.vue b/src/views/qualification/myQualifications/index.vue index 3028135..94f83b9 100644 --- a/src/views/qualification/myQualifications/index.vue +++ b/src/views/qualification/myQualifications/index.vue @@ -6,9 +6,10 @@
- -
官思成
-
GuanSiCheng
+ +
{{ curUserInfo.nickName }}
+
{{ curUserInfo.englishName }}
@@ -16,35 +17,35 @@ 工号 - NO.30424 + {{ curUserInfo.workNo }}
所属部门 - XXXX部门 + {{ curUserInfo.dept?.deptName }}
所属科室 - xxxx科室 + {{ curUserInfo.workNo }}
属地 - XXXXXX属地XXXXXX属地 + {{ curUserInfo.workNo }}
所属ESC - 刘文静 + {{ curUserInfo.workNo }}
@@ -64,7 +65,7 @@
-
+
@@ -92,20 +93,23 @@ import VehicleTrain from './components/VehicleTrain.vue' import QualificationApply from './components/QualificationApply.vue' import LableApply from './components/LableApply.vue' // import { addMenu, delMenu, getMenu, listMenu, updateMenu } from "@/api/system/menu" +import { getUserInfo } from "@/api/system/user" import jobNumberIcon from '@/assets/images/job-number-icon.png' import myAvatar from '@/assets/images/my-avatar.png' import { onMounted, ref } from 'vue' -import useUserStore from '@/store/modules/user' -const userStore = useUserStore() +const baseUrl = import.meta.env.VITE_APP_BASE_API // 初始化 onMounted(() => { - getUserInfo() + getUserInfos() }); // 获取当前登录用户详情 -const getUserInfo = () => { - +const getUserInfos = () => { + getUserInfo().then(response => { + console.log('用户详情', response) + if (response.code == 200) curUserInfo.value = response.data + }) } // 按钮组配置 @@ -113,7 +117,7 @@ const ToolOptions = ref(['高压资质培训信息', '高压车型培训信息', const activeIndex = ref(0) // panel禁止拖拽 const resizable = ref(false) - +const curUserInfo = ref({})