From fb18f19a84fea51d8420c33e40fb6711597e7fc3 Mon Sep 17 00:00:00 2001
From: wally <18603454788@163.com>
Date: Fri, 19 Nov 2021 09:37:25 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20export=20api=20fix=EF=BC=9B?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=95=8C=E9=9D=A2=E6=BB=9A=E5=8A=A8=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/index.js                          |  2 +-
 src/components/history/local.vue           | 11 +++++------
 src/components/history/search-bar-data.vue | 19 ++++++++++---------
 src/views/commands.vue                     | 14 ++++++++------
 4 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/apis/index.js b/src/apis/index.js
index eb03322..10ece51 100644
--- a/src/apis/index.js
+++ b/src/apis/index.js
@@ -71,7 +71,7 @@ export const exportDatas = params => http.post(`${corrosion}/export`, params);
 export const getHistory = params => http.post(`${corrosion}/history/datas`, params);
 
 // 导出历史数据
-export const exportHistory = params => http.post(`${corrosion}/history/export`, params);
+export const exportHistory = params => http.post(`${corrosion}/export`, params);
 
 // 发送查询历史记录的指令
 export const sendCommand = params => http.post(`${corrosion}/history`, params);
diff --git a/src/components/history/local.vue b/src/components/history/local.vue
index d8364f1..5e803f9 100644
--- a/src/components/history/local.vue
+++ b/src/components/history/local.vue
@@ -48,12 +48,12 @@
 </template>
 
 <script setup>
-import { computed, onMounted, ref } from 'vue';
-import { useStore } from 'vuex';
-import SearchBar from 'components/history/search-bar-data.vue';
 import { getDatas } from 'apis';
-import { ElMessage } from 'element-plus';
+import SearchBar from 'components/history/search-bar-data.vue';
 import dayjs from 'dayjs';
+import { ElMessage } from 'element-plus';
+import { computed, onMounted, ref } from 'vue';
+import { useStore } from 'vuex';
 
 const search = ref({});
 const page = ref({
@@ -77,6 +77,7 @@ const getData = async () => {
 
       const options = { ...search.value };
       const date = options && options.date ? options.date : [];
+      console.log(date);
       if (!date || date.length !== 2) {
         return ElMessage.error('请选择时间 ');
       }
@@ -109,8 +110,6 @@ const getData = async () => {
   }
 };
 
-// getData();
-
 // 设置表格高度
 onMounted(() => {
   const winHeight = document.documentElement.clientHeight;
diff --git a/src/components/history/search-bar-data.vue b/src/components/history/search-bar-data.vue
index a06f590..6c68a02 100644
--- a/src/components/history/search-bar-data.vue
+++ b/src/components/history/search-bar-data.vue
@@ -41,10 +41,10 @@
 </template>
 
 <script setup>
+import { exportHistory } from 'apis';
+import dayjs from 'dayjs';
 import { computed, defineEmits, defineProps, reactive, ref, watch } from 'vue';
 import { useStore } from 'vuex';
-import dayjs from 'dayjs';
-import { exportHistory } from 'apis';
 
 const emit = defineEmits(['search']);
 const searchDevice = reactive({
@@ -65,10 +65,11 @@ defineProps({
 
 // 监听currentDeviceId
 watch(
-  () => currentDeviceId.value,
-  newValue => {
-    if (newValue) {
-      searchDevice.deviceId !== newValue && (searchDevice.deviceId = newValue);
+  [searchDeviceForm, currentDeviceId],
+  ([newForm, newDeviceId]) => {
+    if (newDeviceId && newForm) {
+      searchDevice.deviceId !== newDeviceId && (searchDevice.deviceId = newDeviceId);
+      onSubmit();
     }
   },
   { immediate: true },
@@ -99,14 +100,14 @@ function generateParams() {
 }
 
 // 提交
-const onSubmit = () => {
+function onSubmit() {
   searchDeviceForm.value.validate(valid => {
     if (valid) {
       const params = generateParams();
       emit('search', params);
     }
   });
-};
+}
 
 // 导出
 async function onExport() {
@@ -115,7 +116,7 @@ async function onExport() {
     const params = generateParams();
     params.sort = [
       {
-        col: 'gathered_at',
+        col: 'time',
         order: 'DESC',
       },
     ];
diff --git a/src/views/commands.vue b/src/views/commands.vue
index 6bd11d6..f3879df 100644
--- a/src/views/commands.vue
+++ b/src/views/commands.vue
@@ -39,7 +39,9 @@
 
       <el-table-column align="center" label="类型标识" min-width="80">
         <template #default="scope">
-          <span v-if="scope.row.asduType && log.ASDU_TYPE[scope.row.asduType]">{{ log.ASDU_TYPE[scope.row.asduType].text }}</span>
+          <span v-if="scope.row.asduType && log.ASDU_TYPE[scope.row.asduType]">
+            {{ log.ASDU_TYPE[scope.row.asduType].text }}
+          </span>
         </template>
       </el-table-column>
       <el-table-column align="center" label="信息体顺序" min-width="100">
@@ -82,12 +84,12 @@
 </template>
 
 <script setup>
-import { computed, onMounted, ref } from 'vue';
+import { getLog } from 'apis';
+import SearchCommands from 'components/commands/search-commands.vue';
 import dayjs from 'dayjs';
-import { useStore } from 'vuex';
 import { ElMessage } from 'element-plus';
-import SearchCommands from 'components/commands/search-commands.vue';
-import { getLog } from 'apis';
+import { computed, onMounted, ref } from 'vue';
+import { useStore } from 'vuex';
 import * as log from '@/config/log';
 
 const data = ref([]);
@@ -106,7 +108,7 @@ const currentDeviceId = computed(() => store.state.device.currentDeviceId);
 // 设置表格高度
 onMounted(() => {
   const winHeight = document.documentElement.clientHeight;
-  contentHeight.value = winHeight - 150;
+  contentHeight.value = winHeight - 250;
   onSearch();
 });