Merge branch 'local_dev_ft' into 'main'

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

See merge request huang/yun-teng-iot-front!466

@@ -117,7 +117,7 @@ export const searchFormSchema: FormSchema[] = [
       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,21 @@
         api: devicePage,
         api: devicePage,
         immediate: immediateStatus.value,
         immediate: immediateStatus.value,
         columns,
         columns,
+        beforeFetch: (params) => {
+          const { deviceProfileId } = params;
+          console.log(deviceProfileId);
+          const obj = {
+            ...params,
+            ...{
+              deviceProfileIds:
+                deviceProfileId === undefined || deviceProfileId === null || deviceProfileId == ''
+                  ? null
+                  : [deviceProfileId],
+            },
+          };
+          delete obj.deviceProfileId;
+          return obj;
+        },
         formConfig: {
         formConfig: {
           labelWidth: 100,
           labelWidth: 100,
           schemas: searchFormSchema,
           schemas: searchFormSchema,
@@ -282,7 +297,12 @@
           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 === undefined ||
+              deviceProfileId.value === null ||
+              deviceProfileId.value == ''
+                ? null
+                : [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
                 );
                 );
               },
               },
             },
             },

@@ -235,6 +235,21 @@ export const step2Schemas: FormSchema[] = [
   },
   },
 ];
 ];
 
 
+const deviceTypeStatic = [
+  {
+    key: 'DIRECT_CONNECTION',
+    value: '直连设备',
+  },
+  {
+    key: 'GATEWAY',
+    value: '网关设备',
+  },
+  {
+    key: 'SENSOR',
+    value: '网关子设备',
+  },
+];
+
 export const columns: BasicColumn[] = [
 export const columns: BasicColumn[] = [
   {
   {
     title: '配置图片', //图标
     title: '配置图片', //图标
@@ -248,6 +263,14 @@ export const columns: BasicColumn[] = [
     width: 120,
     width: 120,
   },
   },
   {
   {
+    title: '设备类型',
+    dataIndex: 'deviceType',
+    width: 90,
+    format: (text) => {
+      return deviceTypeStatic.find((f) => f.key === text)!.value;
+    },
+  },
+  {
     title: '配置类型',
     title: '配置类型',
     dataIndex: 'type',
     dataIndex: 'type',
     width: 90,
     width: 90,