[FEAT]:

1.完善设备、系统参数配置 删除功能

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();

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;
 }

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 });
   };
 
   //   // 获取系统配置项

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);
         }

PVDEMCSUI/src/pages/equipment/components/addOrEditDialog.vue

@@ -28,8 +28,7 @@
                         </div>
                         <div class="col-xl-6 col-lg-12 col-sm-12">
                             <q-select class="text-h6" outlined v-model="addOrEditFormData.activated"
-                                :options="activatedList" emit-value map-options label="设备启停用"
-                                :rules="[(val) => (val && val.length > 0) || '请选择设备启停用']" />
+                                :options="activatedList" emit-value map-options label="设备启停用" />
                         </div>
                         <div class="col-xl-6 col-lg-12 col-sm-12">
                             <q-input class="text-h6" outlined v-model="addOrEditFormData.remark" label="备注"
@@ -64,12 +63,11 @@ const equipmentTypeList = ref([
 ])
 
 const activatedList = ref([
-    { label: '停用', value: '0' },
-    { label: '启用', value: '1' },
+    { label: '停用', value: false },
+    { label: '启用', value: true },
 ])
 
 //新增或修改
-const selectVis = ref(false);
 const visible = ref(false);
 const addOrEditFormTitle = ref('');
 
@@ -82,11 +80,9 @@ const clickForm = (e?: any) => {
             //获取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;

PVDEMCSUI/src/pages/equipment/index.vue

@@ -63,7 +63,7 @@
                                         props.row.state)
                                     }}</q-td>
                                     <q-td style="font-size: 16px;" key="activated" :props="props">{{ props.row.activated ==
-                                        true ? '是' : '否'
+                                        true ? '启用' : '停用'
                                     }}</q-td>
                                     <q-td style="font-size: 16px;" key="remark" :props="props">{{ props.row.remark }}</q-td>
                                     <q-td key="action" :props="props" style="width: 100px">
@@ -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);

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;