Merge xyh

Next xyh

config/proxy.ts

@@ -9,11 +9,11 @@
 export default {
   dev: {
     '/jetlinks': {
-      target: 'http://192.168.32.8:8844/',
-      ws: 'ws://192.168.32.8:8844/',
+      // target: 'http://192.168.32.8:8844/',
+      // ws: 'ws://192.168.32.8:8844/',
       // 开发环境
-      // target: 'http://120.79.18.123:8844/',
-      // ws: 'ws://120.79.18.123:8844/',
+      target: 'http://120.79.18.123:8844/',
+      ws: 'ws://120.79.18.123:8844/',
       // 测试环境
       // target: 'http://120.77.179.54:8844/',
       // ws: 'ws://120.77.179.54:8844/',

src/pages/device/Instance/index.tsx

@@ -519,38 +519,12 @@ const Instance = () => {
         onSearch={(data) => {
           actionRef.current?.reset?.();
           setSearchParams(data);
-          const terms1 = data.terms[0]?.terms?.map((e) => {
-            if (e.column === 'classifiedId') {
-              return {
-                column: 'productId$product-info',
-                value: [e],
-              };
-            } else {
-              return e;
-            }
-          });
-          if (data.terms && data.terms.length === 2) {
-            const terms2 = data.terms[1]?.terms?.map((e) => {
-              if (e.column === 'classifiedId') {
-                return {
-                  column: 'productId$product-info',
-                  value: [e],
-                };
-              } else {
-                return e;
-              }
-            });
-            setSearchParams({
-              ...searchParams,
-              terms: [{ terms: terms1 }, { terms: terms2, type: data.terms[1].type }],
-            });
-          } else {
-            setSearchParams({
-              ...searchParams,
-              terms: [{ terms: terms1 }],
-            });
-          }
         }}
+        // onReset={() => {
+        //   // 重置分页及搜索参数
+        //   actionRef.current?.reset?.();
+        //   setSearchParams({});
+        // }}
       />
       <ProTableCard<DeviceInstance>
         columns={columns}

src/pages/rule-engine/DashBoard/index.tsx

@@ -53,7 +53,7 @@ const Dashboard = observer(() => {
     group: 'today',
     params: {
       time: '1h',
-      targetType: 'device',
+      // targetType: 'device',
       format: 'HH:mm:ss',
       from: moment(new Date(new Date().setHours(0, 0, 0, 0))).format('YYYY-MM-DD HH:mm:ss'),
       to: 'now',
@@ -69,7 +69,7 @@ const Dashboard = observer(() => {
     group: 'thisMonth',
     params: {
       time: '1d',
-      targetType: 'device',
+      // targetType: 'device',
       format: 'yyyy-MM',
       limit: 1,
       from: 'now-1M',
@@ -204,7 +204,7 @@ const Dashboard = observer(() => {
       dimension: 'agg',
       group: 'alarmTrend',
       params: {
-        targetType: 'device', // product、device、org、other
+        targetType: params.targetType, // product、device、org、other
         format: format,
         time: time,
         // from: 'now-1y', // now-1d、now-1w、now-1M、now-1y