diff --git a/src/components/data-search-bar.vue b/src/components/data-search-bar.vue
index 2220af5..f9d8a15 100644
--- a/src/components/data-search-bar.vue
+++ b/src/components/data-search-bar.vue
@@ -17,7 +17,7 @@
- 查询
+ 查询
diff --git a/src/components/function-config-pending.vue b/src/components/function-config-pending.vue
index 3c8956d..03a890d 100644
--- a/src/components/function-config-pending.vue
+++ b/src/components/function-config-pending.vue
@@ -59,7 +59,7 @@
-
+
@@ -155,7 +155,7 @@ import { useStore } from 'vuex';
import { ElMessage } from 'element-plus';
import cloneDeep from 'lodash/cloneDeep';
import isDate from 'lodash/isDate';
-import { createConfigFunction, getConfigFunction } from 'apis/index';
+import { createConfigFunction, getConfigFunction } from 'apis';
import Refresh from 'components/refresh.vue';
import { corrosiveTypes, functionConfig } from '@/config/config';
diff --git a/src/components/search-bar-data.vue b/src/components/search-bar-data.vue
index 128cbbe..1bbdd34 100644
--- a/src/components/search-bar-data.vue
+++ b/src/components/search-bar-data.vue
@@ -26,11 +26,14 @@
- 查询
+
+
+ 查询
+
- 导出
+ 导出
diff --git a/src/components/search-bar.vue b/src/components/search-bar.vue
index d2d0b21..79ff6b2 100644
--- a/src/components/search-bar.vue
+++ b/src/components/search-bar.vue
@@ -1,23 +1,27 @@
-
+
-
-
+
+
- 查询
+ 查询
+
+
+ 刷新
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ formatTime(+scope.row.time) }}
-
-
-
-
- {{ formatTime(+scope.row.createdAt) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+// 手动刷新 清除定时器 重新获取数据
+function onRefresh() {
+ apiTimer && clearInterval(apiTimer);
+ apiTimer = null;
+ getData();
+}
+
diff --git a/src/views/data-report.vue b/src/views/data-report.vue
index c60864d..5fa9e27 100644
--- a/src/views/data-report.vue
+++ b/src/views/data-report.vue
@@ -135,21 +135,22 @@ function formatTime(time) {
{{ formatTime(+scope.row.createdAt) }}
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
- 添加设备
+
+
+ 添加设备
+
@@ -141,7 +144,11 @@ onMounted(() => {
*/
function onSearch(page, size = 50) {
const deviceId = currentDeviceId.value;
- const params = { deviceId, page, size };
+ const params = {
+ deviceId,
+ page,
+ size,
+ };
store.dispatch('device/getDevicesAll', params);
}
diff --git a/src/views/statistical-realtime.vue b/src/views/statistical-realtime.vue
index 1b1a99d..4016358 100644
--- a/src/views/statistical-realtime.vue
+++ b/src/views/statistical-realtime.vue
@@ -1,5 +1,5 @@
-
+
@@ -59,4 +59,11 @@ onUnmounted(() => {
apiTimer && clearInterval(apiTimer);
apiTimer = null;
});
+
+// 手动刷新 清除定时器 重新获取数据
+function onRefresh() {
+ apiTimer && clearInterval(apiTimer);
+ apiTimer = null;
+ getData();
+}