pref:优化设备列表产品筛选传数组 地理位置产品筛选传数组 产品跳转筛选传数组

@@ -110,14 +110,14 @@ export const searchFormSchema: FormSchema[] = [
   },
   },
   {
   {
     field: 'deviceProfileId',
     field: 'deviceProfileId',
-    label: '产品',
+    label: '产品1',
     component: 'ApiSelect',
     component: 'ApiSelect',
     colProps: { span: 6 },
     colProps: { span: 6 },
     componentProps: () => {
     componentProps: () => {
       return {
       return {
         showSearch: true,
         showSearch: true,
         labelField: 'name',
         labelField: 'name',
-        valueField: 'id',
+        valueField: 'tbProfileId',
         resultField: 'data',
         resultField: 'data',
         placeholder: '请选择产品',
         placeholder: '请选择产品',
         api: deviceProfile,
         api: deviceProfile,

@@ -232,6 +232,17 @@
         api: devicePage,
         api: devicePage,
         immediate: immediateStatus.value,
         immediate: immediateStatus.value,
         columns,
         columns,
+        beforeFetch: (params) => {
+          const { deviceProfileId } = params;
+          const obj = {
+            ...params,
+            ...{
+              deviceProfileIds: deviceProfileId === undefined ? null : [deviceProfileId],
+            },
+          };
+          delete obj.deviceProfileId;
+          return obj;
+        },
         formConfig: {
         formConfig: {
           labelWidth: 100,
           labelWidth: 100,
           schemas: searchFormSchema,
           schemas: searchFormSchema,
@@ -282,7 +293,7 @@
           const { items, total } = await devicePage({
           const { items, total } = await devicePage({
             page: 1,
             page: 1,
             pageSize: count.value === 0 ? 10 : count.value,
             pageSize: count.value === 0 ? 10 : count.value,
-            deviceProfileId: deviceProfileId.value,
+            deviceProfileIds: [deviceProfileId.value],
           });
           });
           setPagination({ total });
           setPagination({ total });
           nextTick(() => {
           nextTick(() => {

@@ -35,7 +35,7 @@ export const formSchema: FormSchema[] = [
       api: getDeviceProfile,
       api: getDeviceProfile,
       placeholder: '请选择产品',
       placeholder: '请选择产品',
       labelField: 'name',
       labelField: 'name',
-      valueField: 'id',
+      valueField: 'tbProfileId',
     },
     },
   },
   },
   {
   {

@@ -257,6 +257,18 @@
           schemas: formSchema,
           schemas: formSchema,
           labelAlign: 'left',
           labelAlign: 'left',
         },
         },
+        beforeFetch: (params) => {
+          const { deviceProfileId } = params;
+          const deviceProfileIds = [deviceProfileId];
+          const obj = {
+            ...params,
+            ...{
+              deviceProfileIds: params?.deviceProfileId === undefined ? null : deviceProfileIds,
+            },
+          };
+          delete obj.deviceProfileId;
+          return obj;
+        },
         showIndexColumn: false,
         showIndexColumn: false,
         useSearchForm: true,
         useSearchForm: true,
         pagination: {
         pagination: {

@@ -50,7 +50,7 @@
                     '?count=' +
                     '?count=' +
                     data.deviceCount +
                     data.deviceCount +
                     '&deviceProfileId=' +
                     '&deviceProfileId=' +
-                    data.id
+                    data.tbProfileId
                 );
                 );
               },
               },
             },
             },