Ver Fonte

[Feat 0000]数据中心历史数据模块修改

bobo04052021@163.com há 1 mês atrás
pai
commit
3fadd33e56

+ 47 - 1
src/views/vent/dataCenter/deviceCenter/history/HistoryTable.vue

@@ -279,6 +279,7 @@ function resetFormParam() {
     pageNo: pagination['current'],
     pageSize: pagination['pageSize'],
     column: pagination['createTime'],
+    skip: formData['skip'],
     ttime_begin: formData['ttime_begin'],
     ttime_end: formData['ttime_end'],
     deviceId: formData['gdeviceids'],
@@ -362,6 +363,51 @@ const { tableContext, onExportXls, onExportXlsPost } = useListPage({
                   span: 5,
                 },
               },
+              {
+                label: '间隔时间',
+                field: 'skip',
+                component: 'Select',
+                defaultValue: '8',
+                componentProps: {
+                  options: [
+                    {
+                      label: '1秒',
+                      value: '1',
+                    },
+                    {
+                      label: '5秒',
+                      value: '2',
+                    },
+                    {
+                      label: '10秒',
+                      value: '3',
+                    },
+                    {
+                      label: '30秒',
+                      value: '4',
+                    },
+                    {
+                      label: '1分钟',
+                      value: '5',
+                    },
+                    {
+                      label: '10分钟',
+                      value: '6',
+                    },
+                    {
+                      label: '30分钟',
+                      value: '7',
+                    },
+                    {
+                      label: '1小时',
+                      value: '8',
+                    },
+                  ],
+                },
+                colProps: {
+                  span: 3,
+                },
+              },
               {
                 label: '查询设备',
                 field: 'gdeviceids',
@@ -387,7 +433,7 @@ const { tableContext, onExportXls, onExportXlsPost } = useListPage({
                   },
                 },
                 colProps: {
-                  span: 6,
+                  span: 5,
                 },
               },
             ],

+ 1 - 1
src/views/vent/dataCenter/deviceCenter/history/history.api.ts

@@ -3,7 +3,7 @@ import { defHttp } from '/@/utils/http/axios';
 
 enum Api {
   getHistory = '/safety/ventanalyMonitorData/getRealHistory',
-  getDeviceList = '/monitor/device',
+  getDeviceList = '/ventanaly-collect/collect/monitor/device',
 }
 /**
  * 获取列表的接口

+ 48 - 3
src/views/vent/dataCenter/deviceCenter/history/history.data.ts

@@ -32,7 +32,7 @@ export const getDefaultSchemas: (dictOptions: any[], deviceOptions: any[], onDev
         getPopupContainer: getAutoScrollContainer,
       },
       colProps: {
-        span: 5,
+        span: 4,
       },
     },
     {
@@ -47,7 +47,52 @@ export const getDefaultSchemas: (dictOptions: any[], deviceOptions: any[], onDev
         getPopupContainer: getAutoScrollContainer,
       },
       colProps: {
-        span: 5,
+        span: 4,
+      },
+    },
+    {
+      label: '间隔时间',
+      field: 'skip',
+      component: 'Select',
+      defaultValue: '8',
+      componentProps: {
+        options: [
+          {
+            label: '1秒',
+            value: '1',
+          },
+          {
+            label: '5秒',
+            value: '2',
+          },
+          {
+            label: '10秒',
+            value: '3',
+          },
+          {
+            label: '30秒',
+            value: '4',
+          },
+          {
+            label: '1分钟',
+            value: '5',
+          },
+          {
+            label: '10分钟',
+            value: '6',
+          },
+          {
+            label: '30分钟',
+            value: '7',
+          },
+          {
+            label: '1小时',
+            value: '8',
+          },
+        ],
+      },
+      colProps: {
+        span: 3,
       },
     },
     {
@@ -63,7 +108,7 @@ export const getDefaultSchemas: (dictOptions: any[], deviceOptions: any[], onDev
         onChange: onDeviceChange,
       },
       colProps: {
-        span: 5,
+        span: 4,
       },
     },
     {