From ca129f54345a16ecd3cecf5a483f8642a96271ef Mon Sep 17 00:00:00 2001 From: lb Date: Fri, 15 Mar 2024 17:03:52 +0800 Subject: [PATCH] =?UTF-8?q?update=20core-worker=E7=9A=84=E5=85=A8=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E8=8E=B7=E5=8F=96=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/specialEquipment/basic/FireFighthing.vue | 3 ++- src/views/specialEquipment/basic/Manage.vue | 3 ++- src/views/specialEquipment/basic/Safety.vue | 3 +-- src/views/specialEquipment/check/Content-add.vue | 5 ++++- src/views/specialEquipment/check/Content-edit.vue | 5 ++++- src/views/specialEquipment/components/EquipmentInfoForm.vue | 3 ++- src/views/specialEquipment/components/manageDrawerForm.vue | 5 ++++- src/views/specialEquipment/maintain/PlanConfig--add.vue | 3 ++- src/views/specialEquipment/maintain/Repair--add.vue | 3 ++- .../maintain/WaitingList--add--unplanned.vue | 3 ++- .../specialEquipment/maintain/WaitingListPlanned--edit.vue | 3 ++- 11 files changed, 27 insertions(+), 12 deletions(-) diff --git a/src/views/specialEquipment/basic/FireFighthing.vue b/src/views/specialEquipment/basic/FireFighthing.vue index 0da17657..7bb37319 100644 --- a/src/views/specialEquipment/basic/FireFighthing.vue +++ b/src/views/specialEquipment/basic/FireFighthing.vue @@ -251,7 +251,8 @@ export default { select: true, label: '负责人', prop: 'responsiblePeopleId', - url: '/base/core-worker/listAll', + url: '/base/core-worker/workerList', + // url: '/base/core-worker/listAll', }, ], [ diff --git a/src/views/specialEquipment/basic/Manage.vue b/src/views/specialEquipment/basic/Manage.vue index b8329090..e9b34803 100644 --- a/src/views/specialEquipment/basic/Manage.vue +++ b/src/views/specialEquipment/basic/Manage.vue @@ -244,7 +244,8 @@ export default { select: true, label: '负责人', prop: 'responsiblePeopleId', - url: '/base/core-worker/listAll', + url: '/base/core-worker/workerList', + // url: '/base/core-worker/listAll', }, ], [{ input: true, label: '备注', prop: 'remark' }], diff --git a/src/views/specialEquipment/basic/Safety.vue b/src/views/specialEquipment/basic/Safety.vue index 01a23622..63c5abf8 100644 --- a/src/views/specialEquipment/basic/Safety.vue +++ b/src/views/specialEquipment/basic/Safety.vue @@ -120,7 +120,6 @@ import { createEquipment, updateEquipment, deleteEquipment, - getEquipment, getEquipmentPage, exportEquipmentExcel, } from '@/api/base/equipment'; @@ -244,7 +243,7 @@ export default { select: true, label: '负责人', prop: 'responsiblePeopleId', - url: '/base/core-worker/listAll', + url: '/base/core-worker/workerList', }, ], [{ input: true, label: '备注', prop: 'remark' }], diff --git a/src/views/specialEquipment/check/Content-add.vue b/src/views/specialEquipment/check/Content-add.vue index d5c9142d..67aeab10 100644 --- a/src/views/specialEquipment/check/Content-add.vue +++ b/src/views/specialEquipment/check/Content-add.vue @@ -164,7 +164,10 @@ export default { })) ); } - const workerlist = await this.$axios('/base/core-worker/listAll'); + const workerlist = await this.$axios( + // '/base/core-worker/listAll' + '/base/core-worker/workerList' + ); if (workerlist.code == 0) { inspectorList = inspectorList.concat( workerlist.data.map((item) => ({ diff --git a/src/views/specialEquipment/check/Content-edit.vue b/src/views/specialEquipment/check/Content-edit.vue index 073ae25d..1a7c8326 100644 --- a/src/views/specialEquipment/check/Content-edit.vue +++ b/src/views/specialEquipment/check/Content-edit.vue @@ -555,7 +555,10 @@ export default { })) ); } - const workerlist = await this.$axios('/base/core-worker/listAll'); + const workerlist = await this.$axios( + '/base/core-worker/workerList' + // '/base/core-worker/listAll' + ); if (workerlist.code == 0) { inspectorList = inspectorList.concat( workerlist.data.map((item) => ({ diff --git a/src/views/specialEquipment/components/EquipmentInfoForm.vue b/src/views/specialEquipment/components/EquipmentInfoForm.vue index c670b036..4eeb2ff9 100644 --- a/src/views/specialEquipment/components/EquipmentInfoForm.vue +++ b/src/views/specialEquipment/components/EquipmentInfoForm.vue @@ -356,7 +356,8 @@ export default { async getRpList() { this.formLoading = true; const { code, data } = await this.$axios( - '/base/core-worker/listAll' + '/base/core-worker/workerList' + // '/base/core-worker/listAll' ); // debugger; if (code == 0) { diff --git a/src/views/specialEquipment/components/manageDrawerForm.vue b/src/views/specialEquipment/components/manageDrawerForm.vue index 13eac654..038b1a36 100644 --- a/src/views/specialEquipment/components/manageDrawerForm.vue +++ b/src/views/specialEquipment/components/manageDrawerForm.vue @@ -182,7 +182,10 @@ export default { async getRpList() { this.formLoading = true; - const { code, data } = await this.$axios('/base/core-worker/listAll'); + const { code, data } = await this.$axios( + '/base/core-worker/workerList' + // '/base/core-worker/listAll' + ); // debugger; if (code == 0) { this.rpList = data; diff --git a/src/views/specialEquipment/maintain/PlanConfig--add.vue b/src/views/specialEquipment/maintain/PlanConfig--add.vue index 54f0479c..caf26fc3 100644 --- a/src/views/specialEquipment/maintain/PlanConfig--add.vue +++ b/src/views/specialEquipment/maintain/PlanConfig--add.vue @@ -390,7 +390,8 @@ export default { const urls = [ '/base/core-production-line/listAll', '/base/core-department/listAll', - '/base/core-worker/listAll', + '/base/core-worker/workerList', + // '/base/core-worker/listAll', ]; let res; switch (source) { diff --git a/src/views/specialEquipment/maintain/Repair--add.vue b/src/views/specialEquipment/maintain/Repair--add.vue index 8e75ae17..bb68e5dc 100644 --- a/src/views/specialEquipment/maintain/Repair--add.vue +++ b/src/views/specialEquipment/maintain/Repair--add.vue @@ -639,7 +639,8 @@ export default { ); /** worker */ const workerList = await this.$axios({ - url: '/base/core-worker/listAll', + url: '/base/core-worker/workerList', + // url: '/base/core-worker/listAll', }); list = list.concat( (workerList.data || []).map((item) => ({ diff --git a/src/views/specialEquipment/maintain/WaitingList--add--unplanned.vue b/src/views/specialEquipment/maintain/WaitingList--add--unplanned.vue index b4d9d4ca..068c0137 100644 --- a/src/views/specialEquipment/maintain/WaitingList--add--unplanned.vue +++ b/src/views/specialEquipment/maintain/WaitingList--add--unplanned.vue @@ -326,7 +326,8 @@ export default { const urls = [ '/base/core-production-line/listAll', '/base/core-department/listAll', - '/base/core-worker/listAll', + '/base/core-worker/workerList', + // '/base/core-worker/listAll', ]; let res; switch (source) { diff --git a/src/views/specialEquipment/maintain/WaitingListPlanned--edit.vue b/src/views/specialEquipment/maintain/WaitingListPlanned--edit.vue index 8ec59282..af30a0fd 100644 --- a/src/views/specialEquipment/maintain/WaitingListPlanned--edit.vue +++ b/src/views/specialEquipment/maintain/WaitingListPlanned--edit.vue @@ -598,7 +598,8 @@ export default { const urls = [ '/base/core-production-line/listAll', '/base/core-department/listAll', - '/base/core-worker/listAll', + '/base/core-worker/workerList', + // '/base/core-worker/listAll', ]; let res; switch (source) {