Bläddra i källkod

feat: 资产管理对应接口及传参修改

yanglzh 9 månader sedan
förälder
incheckning
026edf9855

+ 1 - 1
src/api/device/index.ts

@@ -118,7 +118,7 @@ export default {
     add: (params: object) => post('/asset/asset/add', params),
     edit: (params: object) => put('/asset/asset/edit', params),
     detail: (params: object) => get('/asset/asset/get', params),
-    delete: (params: object) => del('/asset/asset/delete', params),
+    delete: (params: object) => del('/asset/asset/deleteByDeviceKeys', params),
   },
   assetRelationship: {
     getList: (params: object) => get('/asset/assetRelationship/list', params),

+ 2 - 2
src/views/iot/property/dossier/edit.vue

@@ -148,7 +148,7 @@ const handleSelectionChange = (value: any) => {
 
 const onSubmit = async () => {
   await formRef.value.validate();
-  const theApi = formData.id ? api.dev_asset.edit : api.dev_asset.add;
+  const theApi = !formData.id || formData.id === '0' ? api.dev_asset.add : api.dev_asset.edit;
   await theApi(formData);
   ElMessage.success('操作成功');
   resetForm();
@@ -220,7 +220,7 @@ const open = async (row: any, productInfo: any) => {
       });
     } else {
       //获取档案属性
-      api.dev_asset_metadata.detail({ productKey: productInfo.key}).then((res: any) => {
+      api.dev_asset_metadata.detail({ productKey: productInfo.key }).then((res: any) => {
         const sortedArray = res.sort((a, b) => a.id - b.id);
         Datalist.value = sortedArray || [];
       });

+ 4 - 4
src/views/iot/property/dossier/index.vue

@@ -91,12 +91,12 @@ const mergedData = ref()
 const cateData = ref()
 const editFormRef = ref()
 const productIno = ref()
-const ids = ref<number[]>([])
+const deviceKeys = ref<number[]>([])
 
 const { params, tableData, getList, loading } = useSearch<any[]>(device.dev_asset.getList, 'Data', { keyWord: '' })
 getList()
 const handleSelectionChange = (selection: any[]) => {
-	ids.value = selection.map((item) => item.id);
+	deviceKeys.value = selection.map((item) => item.deviceKey);
 };
 onMounted(() => {
 	getCateList()
@@ -176,7 +176,7 @@ const batchdel = () => {
 		cancelButtonText: '取消',
 		type: 'warning',
 	}).then(async () => {
-		await device.dev_asset.delete({ ids: ids.value })
+		await device.dev_asset.delete({ deviceKeys: deviceKeys.value })
 		ElMessage.success('删除成功')
 		getList()
 	})
@@ -188,7 +188,7 @@ const del = (row: any) => {
 		cancelButtonText: '取消',
 		type: 'warning',
 	}).then(async () => {
-		await device.dev_asset.delete({ ids: row.id })
+		await device.dev_asset.delete({ deviceKeys: [row.deviceKey] })
 		ElMessage.success('删除成功')
 		getList()
 	})

+ 4 - 4
src/views/iot/property/relationship/edit.vue

@@ -12,7 +12,7 @@
             </template>
           </el-cascader>
         </el-form-item>
-        <el-form-item label="已选设备" prop="assetIds">
+        <el-form-item label="已选设备" prop="deviceKeys">
           <el-tag v-for="name in assetName" class="mr-2">{{ name }} </el-tag>
         </el-form-item>
       </el-form>
@@ -53,21 +53,21 @@ const assetName = ref<string[]>([]);
 const baseForm = {
   id: undefined,
   roleId: '',
-  assetIds: [],
+  deviceKeys: [],
 };
 
 const formData = reactive<any>(deepClone(baseForm));
 
 const ruleForm = {
   roleId: [ruleRequired('角色不能为空')],
-  assetIds: [ruleRequired('设备不能为空')],
+  deviceKeys: [ruleRequired('设备不能为空')],
 };
 
 const { params, tableData, getList, loading } = useSearch<any[]>(api.dev_asset.getList, 'Data', { pageSize: 10 })
 getList()
 
 const handleSelectionChange = (selection: any[]) => {
-  formData.assetIds = selection.map((item) => item.id);
+  formData.deviceKeys = selection.map((item) => item.deviceKey);
   assetName.value = selection.map((item) => item.deviceName);
 };