diff --git a/src/apis/index.js b/src/apis/index.js
index 10ece51..1ffdf76 100644
--- a/src/apis/index.js
+++ b/src/apis/index.js
@@ -73,7 +73,7 @@ export const getHistory = params => http.post(`${corrosion}/history/datas`, para
// 导出历史数据
export const exportHistory = params => http.post(`${corrosion}/export`, params);
-// 发送查询历史记录的指令
+// 发送补传指令
export const sendCommand = params => http.post(`${corrosion}/history`, params);
// 补传记录
diff --git a/src/components/config/config-log-function.vue b/src/components/config/config-log-function.vue
index c9d555d..8fa38f1 100644
--- a/src/components/config/config-log-function.vue
+++ b/src/components/config/config-log-function.vue
@@ -11,7 +11,7 @@
- {{ dayjs(+scope.row.settingTime).format('YYYY-MM-DD HH:mm:ss') }}
+ {{ dayjs(new Date(+scope.row.settingTime)).format('YYYY-MM-DD HH:mm:ss') }}
diff --git a/src/components/config/config-log-network.vue b/src/components/config/config-log-network.vue
index 7c099e7..78de883 100644
--- a/src/components/config/config-log-network.vue
+++ b/src/components/config/config-log-network.vue
@@ -12,7 +12,7 @@
- {{ dayjs(+scope.row.settingTime).format('YYYY-MM-DD HH:mm:ss') }}
+ {{ dayjs(new Date(+scope.row.settingTime)).format('YYYY-MM-DD HH:mm:ss') }}
diff --git a/src/components/history/device.vue b/src/components/history/device.vue
index 3a4b58b..93ddfa8 100644
--- a/src/components/history/device.vue
+++ b/src/components/history/device.vue
@@ -1,5 +1,5 @@
-
+
@@ -21,7 +21,6 @@
-
@@ -55,6 +54,16 @@
@next-click="onNext"
>
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/history/history-log-table.vue b/src/components/history/history-log-table.vue
index 78eb87b..501d834 100644
--- a/src/components/history/history-log-table.vue
+++ b/src/components/history/history-log-table.vue
@@ -4,12 +4,12 @@
- {{ dayjs(+scope.row.startTime).format('YYYY-MM-DD HH:mm:ss') }}
+ {{ dayjs(new Date(+scope.row.startTime)).format('YYYY-MM-DD HH:mm:ss') }}
- {{ dayjs(+scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') }}
+ {{ dayjs(new Date(+scope.row.endTime)).format('YYYY-MM-DD HH:mm:ss') }}
diff --git a/src/components/history/missing-data.vue b/src/components/history/missing-data.vue
new file mode 100644
index 0000000..06c0e30
--- /dev/null
+++ b/src/components/history/missing-data.vue
@@ -0,0 +1,48 @@
+
+
+
+
+
+ {{ dayjs(new Date(+scope.row.startTime)).format('YYYY-MM-DD HH:mm:ss') }}
+
+
+
+
+ {{ dayjs(new Date(+scope.row.endTime)).format('YYYY-MM-DD HH:mm:ss') }}
+
+
+
+
+
+ 补传
+
+
+
+
+
+
diff --git a/src/components/history/search-bar-data.vue b/src/components/history/search-bar-data.vue
index 6c68a02..1c80e12 100644
--- a/src/components/history/search-bar-data.vue
+++ b/src/components/history/search-bar-data.vue
@@ -13,13 +13,29 @@
-
+
-
+
-
+
+
+
+
+
查询历史数据
@@ -50,6 +66,7 @@ const emit = defineEmits(['search']);
const searchDevice = reactive({
deviceId: '',
date: [dayjs().subtract(7, 'day').startOf('day'), new Date()],
+ missingIntervalInMs: 1,
});
const searchDeviceForm = ref(null); // form
const store = useStore();
@@ -61,6 +78,7 @@ defineProps({
showExport: Boolean,
loadingSearch: Boolean,
showCommand: Boolean,
+ showPassSetting: Boolean,
});
// 监听currentDeviceId
@@ -81,19 +99,16 @@ const change = e => {
// 生成查询参数
function generateParams() {
- const { deviceId, date } = searchDevice;
- let params = {
+ const { deviceId, date, missingIntervalInMs } = searchDevice;
+ const params = {
deviceId,
- date,
+ missingIntervalInMs: missingIntervalInMs * 60 * 60 * 1000,
};
if (date) {
const start = +dayjs(date[0]).format('x');
const end = +dayjs(date[1]).format('x');
- params = {
- deviceId,
- date: [start, end],
- };
+ params.date = [start, end];
}
return params;
diff --git a/src/components/overview/device-table.vue b/src/components/overview/device-table.vue
index 7d0be79..51fbd76 100644
--- a/src/components/overview/device-table.vue
+++ b/src/components/overview/device-table.vue
@@ -2,15 +2,15 @@
-
+
- {{ dayjs(+scope.row.signupTime).format('YYYY-MM-DD HH:mm:ss') }}
+ {{ dayjs(new Date(+scope.row.signupTime)).format('YYYY-MM-DD HH:mm:ss') }}
- {{ dayjs(+scope.row.lastUploadTime).format('YYYY-MM-DD HH:mm:ss') }}
+ {{ dayjs(new Date(+scope.row.lastUploadTime)).format('YYYY-MM-DD HH:mm:ss') }}
@@ -42,16 +42,12 @@
@current-change="onCurrentPageChange"
>
-
-
-