Compare commits

..

No commits in common. "1ea2fe27382e7ecced304c17b0785bc064918d30" and "b5049b22fadf6a119f1a57788e775ae19b9db337" have entirely different histories.

11 changed files with 12 additions and 27 deletions

View File

@ -251,8 +251,7 @@ export default {
select: true, select: true,
label: '负责人', label: '负责人',
prop: 'responsiblePeopleId', prop: 'responsiblePeopleId',
url: '/base/core-worker/workerList', url: '/base/core-worker/listAll',
// url: '/base/core-worker/listAll',
}, },
], ],
[ [

View File

@ -244,8 +244,7 @@ export default {
select: true, select: true,
label: '负责人', label: '负责人',
prop: 'responsiblePeopleId', prop: 'responsiblePeopleId',
url: '/base/core-worker/workerList', url: '/base/core-worker/listAll',
// url: '/base/core-worker/listAll',
}, },
], ],
[{ input: true, label: '备注', prop: 'remark' }], [{ input: true, label: '备注', prop: 'remark' }],

View File

@ -120,6 +120,7 @@ import {
createEquipment, createEquipment,
updateEquipment, updateEquipment,
deleteEquipment, deleteEquipment,
getEquipment,
getEquipmentPage, getEquipmentPage,
exportEquipmentExcel, exportEquipmentExcel,
} from '@/api/base/equipment'; } from '@/api/base/equipment';
@ -243,7 +244,7 @@ export default {
select: true, select: true,
label: '负责人', label: '负责人',
prop: 'responsiblePeopleId', prop: 'responsiblePeopleId',
url: '/base/core-worker/workerList', url: '/base/core-worker/listAll',
}, },
], ],
[{ input: true, label: '备注', prop: 'remark' }], [{ input: true, label: '备注', prop: 'remark' }],

View File

@ -164,10 +164,7 @@ export default {
})) }))
); );
} }
const workerlist = await this.$axios( const workerlist = await this.$axios('/base/core-worker/listAll');
// '/base/core-worker/listAll'
'/base/core-worker/workerList'
);
if (workerlist.code == 0) { if (workerlist.code == 0) {
inspectorList = inspectorList.concat( inspectorList = inspectorList.concat(
workerlist.data.map((item) => ({ workerlist.data.map((item) => ({

View File

@ -555,10 +555,7 @@ export default {
})) }))
); );
} }
const workerlist = await this.$axios( const workerlist = await this.$axios('/base/core-worker/listAll');
'/base/core-worker/workerList'
// '/base/core-worker/listAll'
);
if (workerlist.code == 0) { if (workerlist.code == 0) {
inspectorList = inspectorList.concat( inspectorList = inspectorList.concat(
workerlist.data.map((item) => ({ workerlist.data.map((item) => ({

View File

@ -356,8 +356,7 @@ export default {
async getRpList() { async getRpList() {
this.formLoading = true; this.formLoading = true;
const { code, data } = await this.$axios( const { code, data } = await this.$axios(
'/base/core-worker/workerList' '/base/core-worker/listAll'
// '/base/core-worker/listAll'
); );
// debugger; // debugger;
if (code == 0) { if (code == 0) {

View File

@ -182,10 +182,7 @@ export default {
async getRpList() { async getRpList() {
this.formLoading = true; this.formLoading = true;
const { code, data } = await this.$axios( const { code, data } = await this.$axios('/base/core-worker/listAll');
'/base/core-worker/workerList'
// '/base/core-worker/listAll'
);
// debugger; // debugger;
if (code == 0) { if (code == 0) {
this.rpList = data; this.rpList = data;

View File

@ -390,8 +390,7 @@ export default {
const urls = [ const urls = [
'/base/core-production-line/listAll', '/base/core-production-line/listAll',
'/base/core-department/listAll', '/base/core-department/listAll',
'/base/core-worker/workerList', '/base/core-worker/listAll',
// '/base/core-worker/listAll',
]; ];
let res; let res;
switch (source) { switch (source) {

View File

@ -639,8 +639,7 @@ export default {
); );
/** worker */ /** worker */
const workerList = await this.$axios({ const workerList = await this.$axios({
url: '/base/core-worker/workerList', url: '/base/core-worker/listAll',
// url: '/base/core-worker/listAll',
}); });
list = list.concat( list = list.concat(
(workerList.data || []).map((item) => ({ (workerList.data || []).map((item) => ({

View File

@ -326,8 +326,7 @@ export default {
const urls = [ const urls = [
'/base/core-production-line/listAll', '/base/core-production-line/listAll',
'/base/core-department/listAll', '/base/core-department/listAll',
'/base/core-worker/workerList', '/base/core-worker/listAll',
// '/base/core-worker/listAll',
]; ];
let res; let res;
switch (source) { switch (source) {

View File

@ -598,8 +598,7 @@ export default {
const urls = [ const urls = [
'/base/core-production-line/listAll', '/base/core-production-line/listAll',
'/base/core-department/listAll', '/base/core-department/listAll',
'/base/core-worker/workerList', '/base/core-worker/listAll',
// '/base/core-worker/listAll',
]; ];
let res; let res;
switch (source) { switch (source) {