From 7e255d6a66ddf025dec59d68a0b0e08d050a8ddb Mon Sep 17 00:00:00 2001 From: monanxiao Date: Mon, 21 Oct 2024 17:57:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E7=A8=8B=E5=B8=88?= =?UTF-8?q?=E5=B2=97=E4=BD=8D=E6=96=87=E5=AD=97=EF=BC=8C=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E3=80=81=E9=A1=B5=E9=9D=A2=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/schedulingUser.js | 6 +- src/api/modules/user.js | 4 +- src/mock/permission.js | 2 +- src/views/engineer/maintain.vue | 2 +- src/views/engineer/reconnaissance.vue | 2 +- src/views/scheduling/maintain.vue | 4 +- src/views/scheduling/options.js | 97 ------------------------- src/views/scheduling/reconnaissance.vue | 4 +- src/views/users/reconnaissance.vue | 2 +- 9 files changed, 13 insertions(+), 110 deletions(-) delete mode 100644 src/views/scheduling/options.js diff --git a/src/api/modules/schedulingUser.js b/src/api/modules/schedulingUser.js index 26d2809..59ac5e8 100644 --- a/src/api/modules/schedulingUser.js +++ b/src/api/modules/schedulingUser.js @@ -1,7 +1,7 @@ import service from "../request.js"; const API_BASE_URL = '/user'; -// 查询勘察人员列表 +// 查询勘测人员列表 export function listSurveyorsUser(query) { return service({ method: "get", @@ -10,11 +10,11 @@ export function listSurveyorsUser(query) { }); } -// 查询勘察人员列表 +// 查询勘测人员列表 export function listMaintenanceUser(query) { return service({ method: "get", url: `${API_BASE_URL}/maintenance`, params: query }); -} +} \ No newline at end of file diff --git a/src/api/modules/user.js b/src/api/modules/user.js index 8c156b7..9d17aea 100644 --- a/src/api/modules/user.js +++ b/src/api/modules/user.js @@ -11,7 +11,7 @@ export function getUserList(query) { }); } -// 获取勘察人员列表 +// 获取勘测人员列表 export function getSurveyorsList(query) { return service({ method: "get", @@ -33,7 +33,7 @@ export function getMaintenanceList(query) { export function deleteUser(ItemId) { return service({ method: "delete", - url: `${API_BASE_URL}/${ItemId}`, + url: `/application/role/${ItemId}`, data: query, }); } \ No newline at end of file diff --git a/src/mock/permission.js b/src/mock/permission.js index 13511bd..bdf2980 100644 --- a/src/mock/permission.js +++ b/src/mock/permission.js @@ -49,7 +49,7 @@ export const menuListItem = [ icon: "Menu", }, { - title: "勘察人员", + title: "勘测人员", url: "/reconnaissanceList", icon: "Menu", }, diff --git a/src/views/engineer/maintain.vue b/src/views/engineer/maintain.vue index 936e9b2..649662f 100644 --- a/src/views/engineer/maintain.vue +++ b/src/views/engineer/maintain.vue @@ -202,7 +202,7 @@ const statusFormater = (row, column, cellValue) => { const postFormater = (row, column, cellValue) => { if (cellValue === 2) { - return '勘察工程师'; + return '勘测工程师'; } else if (cellValue === 3) { return '维修工程师'; } else { diff --git a/src/views/engineer/reconnaissance.vue b/src/views/engineer/reconnaissance.vue index e0ac83b..bce9f50 100644 --- a/src/views/engineer/reconnaissance.vue +++ b/src/views/engineer/reconnaissance.vue @@ -200,7 +200,7 @@ const statusFormater = (row, column, cellValue) => { const postFormater = (row, column, cellValue) => { if (cellValue === 2) { - return '勘察工程师'; + return '勘测工程师'; } else if (cellValue === 3) { return '维修工程师'; } else { diff --git a/src/views/scheduling/maintain.vue b/src/views/scheduling/maintain.vue index fb2e1f5..1766363 100644 --- a/src/views/scheduling/maintain.vue +++ b/src/views/scheduling/maintain.vue @@ -165,7 +165,7 @@ const scheduleForm = ref({ const direction = ref('rtl') const drawer = ref(false) const editStatus = ref(false) -const userList = ref([]); // 勘察人员列表 +const userList = ref([]); // 勘测人员列表 // 日期列表 const dateList = ref([]); @@ -259,7 +259,7 @@ const handleDateChange = (value) => { return; } - // 查询勘察人员列表 + // 查询勘测人员列表 let params = { date: formatDate(scheduleForm.value.date), timeQuantumId: scheduleForm.value.timeQuantumId diff --git a/src/views/scheduling/options.js b/src/views/scheduling/options.js deleted file mode 100644 index f7fbfca..0000000 --- a/src/views/scheduling/options.js +++ /dev/null @@ -1,97 +0,0 @@ -export const options = [ - { - userId: 1, - avatar: 'https://pic.qqans.com/up/2024-6/2024620113729773.jpg', - name: '高永建', - nickname: '软件开发老高', - mobile: '19136448763', - date: '2024-10-11', - timeToTime: '14:00:00-15:00:00,15:00:00-16:00:00' - }, - { - userId: 2, - avatar: 'https://pic.qqans.com/up/2024-6/2024620113729773.jpg', - name: '张三', - nickname: '软件开发老高', - mobile: '19136448763', - date: '2024-10-11', - timeToTime: '14:00:00-15:00:00,15:00:00-16:00:00' - }, - { - userId: 3, - avatar: 'https://pic.qqans.com/up/2024-6/2024620113729773.jpg', - name: '李四', - nickname: '软件开发老高', - mobile: '19136448763', - date: '2024-10-11', - timeToTime: '14:00:00-15:00:00,15:00:00-16:00:00' - }, - { - userId: 4, - avatar: 'https://pic.qqans.com/up/2024-6/2024620113729773.jpg', - name: '名称', - nickname: '软件开发老高', - mobile: '19136448763', - date: '2024-10-11', - timeToTime: '14:00:00-15:00:00,15:00:00-16:00:00' - },{ - userId: 5, - avatar: 'https://pic.qqans.com/up/2024-6/2024620113729773.jpg', - name: '名称', - nickname: '软件开发老高', - mobile: '19136448763', - date: '2024-10-11', - timeToTime: '14:00:00-15:00:00,15:00:00-16:00:00' - }, - { - userId: 6, - avatar: 'https://pic.qqans.com/up/2024-6/2024620113729773.jpg', - name: '李四', - nickname: '软件开发老高', - mobile: '19136448763', - date: '2024-10-11', - timeToTime: '14:00:00-15:00:00,15:00:00-16:00:00' - },{ - userId: 7, - avatar: 'https://pic.qqans.com/up/2024-6/2024620113729773.jpg', - name: '张三', - nickname: '软件开发老高', - mobile: '19136448763', - date: '2024-10-11', - timeToTime: '14:00:00-15:00:00,15:00:00-16:00:00' - },{ - userId: 8, - avatar: 'https://pic.qqans.com/up/2024-6/2024620113729773.jpg', - name: '名称', - nickname: '软件开发老高', - mobile: '19136448763', - date: '2024-10-07', - timeToTime: '14:00:00-15:00:00,15:00:00-16:00:00' - },{ - userId: 9, - avatar: 'https://pic.qqans.com/up/2024-6/2024620113729773.jpg', - name: '名称', - nickname: '软件开发老高', - mobile: '19136448763', - date: '2024-10-08', - timeToTime: '14:00:00-15:00:00,15:00:00-16:00:00' - },{ - userId: 10, - avatar: 'https://pic.qqans.com/up/2024-6/2024620113729773.jpg', - name: '名称', - nickname: '软件开发老高', - mobile: '19136448763', - date: '2024-10-09', - timeToTime: '14:00:00-15:00:00,15:00:00-16:00:00' - }, - { - userId: 11, - avatar: 'https://pic.qqans.com/up/2024-6/2024620113729773.jpg', - name: '名称', - nickname: '软件开发老高', - mobile: '19136448763', - date: '2024-10-10', - timeToTime: '14:00:00-15:00:00,15:00:00-16:00:00' - }, - -]; \ No newline at end of file diff --git a/src/views/scheduling/reconnaissance.vue b/src/views/scheduling/reconnaissance.vue index fcccf94..a16ed38 100644 --- a/src/views/scheduling/reconnaissance.vue +++ b/src/views/scheduling/reconnaissance.vue @@ -165,7 +165,7 @@ const scheduleForm = ref({ const direction = ref('rtl') const drawer = ref(false) const editStatus = ref(false) -const userList = ref([]); // 勘察人员列表 +const userList = ref([]); // 勘测人员列表 // 日期列表 const dateList = ref([]); @@ -259,7 +259,7 @@ const handleDateChange = (value) => { return; } - // 查询勘察人员列表 + // 查询勘测人员列表 let params = { date: formatDate(scheduleForm.value.date), timeQuantumId: scheduleForm.value.timeQuantumId diff --git a/src/views/users/reconnaissance.vue b/src/views/users/reconnaissance.vue index 20ab6c9..1824844 100644 --- a/src/views/users/reconnaissance.vue +++ b/src/views/users/reconnaissance.vue @@ -156,7 +156,7 @@ const initData = () => { queryData.value.roleld = 2; - // 获取勘察工程师列表 + // 获取勘测工程师列表 getUserList(queryData.value).then((res) => { tableData.value = res.data.records;