diff --git a/PVDEMCSUI/src/api/equipment/equipmentApi.ts b/PVDEMCSUI/src/api/equipment/equipmentApi.ts index 00c4138..854963a 100644 --- a/PVDEMCSUI/src/api/equipment/equipmentApi.ts +++ b/PVDEMCSUI/src/api/equipment/equipmentApi.ts @@ -31,7 +31,7 @@ class EquipmentApi { }; // 删除 delete = (val: any) => { - return request.post(`${pathName}DeleteEquipment`, val); + return request.post(`${pathName}DeleteEquipment`, { id: val }); }; } const equipmentApi = new EquipmentApi(); diff --git a/PVDEMCSUI/src/api/equipment/model/equipment.ts b/PVDEMCSUI/src/api/equipment/model/equipment.ts index e379147..1a648a8 100644 --- a/PVDEMCSUI/src/api/equipment/model/equipment.ts +++ b/PVDEMCSUI/src/api/equipment/model/equipment.ts @@ -11,6 +11,6 @@ export class EquipmentEntity { equipmentName!: string; equipmentType!: string; state!: string; - activated!: string; + activated!: boolean; remark!: string; } diff --git a/PVDEMCSUI/src/api/sysConfig/sysConifgApi.ts b/PVDEMCSUI/src/api/sysConfig/sysConifgApi.ts index 918347e..04d1507 100644 --- a/PVDEMCSUI/src/api/sysConfig/sysConifgApi.ts +++ b/PVDEMCSUI/src/api/sysConfig/sysConifgApi.ts @@ -25,7 +25,7 @@ class SysConfigApi { }; // 删除 delete = (val: any) => { - return request.post(`${pathName}DeleteSysConfig`, val); + return request.post(`${pathName}DeleteSysConfig`, { id: val }); }; // // 获取系统配置项 diff --git a/PVDEMCSUI/src/boot/axios.ts b/PVDEMCSUI/src/boot/axios.ts index d5c71ef..a9bfccf 100644 --- a/PVDEMCSUI/src/boot/axios.ts +++ b/PVDEMCSUI/src/boot/axios.ts @@ -39,7 +39,6 @@ class Request { // 响应拦截器 this.instance.interceptors.response.use( (res: AxiosResponse) => { - debugger; if (res.config.responseType == 'blob') { return Promise.resolve(res); } diff --git a/PVDEMCSUI/src/pages/equipment/components/addOrEditDialog.vue b/PVDEMCSUI/src/pages/equipment/components/addOrEditDialog.vue index 836fe31..662b1ff 100644 --- a/PVDEMCSUI/src/pages/equipment/components/addOrEditDialog.vue +++ b/PVDEMCSUI/src/pages/equipment/components/addOrEditDialog.vue @@ -28,8 +28,7 @@
+ :options="activatedList" emit-value map-options label="设备启停用" />
{ //获取class 添加弹窗文本(新增/编辑) addOrEditFormData.value = JSON.parse(JSON.stringify(e)); // 改为深拷贝; addOrEditFormTitle.value = '修改设备'; - selectVis.value = true; } else { addOrEditFormTitle.value = '新增设备'; - addOrEditFormData.value.activated = '1'; - selectVis.value = false; + addOrEditFormData.value.activated = true; } } visible.value = !visible.value; diff --git a/PVDEMCSUI/src/pages/equipment/index.vue b/PVDEMCSUI/src/pages/equipment/index.vue index 5de4570..d6b0996 100644 --- a/PVDEMCSUI/src/pages/equipment/index.vue +++ b/PVDEMCSUI/src/pages/equipment/index.vue @@ -63,7 +63,7 @@ props.row.state) }} {{ props.row.activated == - true ? '是' : '否' + true ? '启用' : '停用' }} {{ props.row.remark }} @@ -109,8 +109,8 @@ const equipmentTypeList = ref([ { label: 'Cemecon', value: 'Cemecon' }, ]) const activatedList = ref([ - { label: '停用', value: '0' }, - { label: '启用', value: '1' }, + { label: '停用', value: false }, + { label: '启用', value: true }, ]) const pagination = ref(new Pagination(new EquipmentSearchEntity())); const loading = ref(false); diff --git a/PVDEMCSUI/src/pages/sysConfig/components/addOrEditDialog.vue b/PVDEMCSUI/src/pages/sysConfig/components/addOrEditDialog.vue index f1a3b5e..acb2250 100644 --- a/PVDEMCSUI/src/pages/sysConfig/components/addOrEditDialog.vue +++ b/PVDEMCSUI/src/pages/sysConfig/components/addOrEditDialog.vue @@ -62,7 +62,6 @@ const configTypeList = ref([ ]) //新增或修改 -const selectVis = ref(false); const visible = ref(false); const addOrEditFormTitle = ref(''); @@ -75,10 +74,8 @@ const clickForm = (e?: any) => { //获取class 添加弹窗文本(新增/编辑) addOrEditFormData.value = JSON.parse(JSON.stringify(e)); // 改为深拷贝; addOrEditFormTitle.value = '修改系统参数'; - selectVis.value = true; } else { addOrEditFormTitle.value = '新增系统参数'; - selectVis.value = false; } } visible.value = !visible.value;