feat(all): update

src/api/modules/TaskData.js

@@ -1,5 +1,5 @@
 import service from '@/utils/axios';
-import { baseURL4, baseURL2 } from '@/constant';
+import { baseURL4 } from '@/constant';
 
 // 任务数据 设备列表
 export const getTaskDataClassList = (data) => {
@@ -15,7 +15,7 @@ export const getTaskDataClassList = (data) => {
 export const checkTaskData = (data) => {
   return service.request({
     method: 'POST',
-    url: '/TaskData/Check',
+    url: '/api/TaskData/Check',
     data,
     baseURL: baseURL4,
   });

src/views/data/checkout/index.vue

@@ -16,12 +16,12 @@
 </template>
 
 <script setup>
-import { h } from "vue";
-import { checkTaskData } from "@/api";
-import { NTag } from "naive-ui";
+import { h } from 'vue';
+import { checkTaskData } from '@/api';
+import { NTag } from 'naive-ui';
 
-const task = window.sessionStorage.getItem("task")
-  ? JSON.parse(window.sessionStorage.getItem("task"))
+const task = window.sessionStorage.getItem('task')
+  ? JSON.parse(window.sessionStorage.getItem('task'))
   : {};
 
 // 查询数据
@@ -32,42 +32,42 @@ const queryData = reactive({
 // 需要展示的列
 const columns = [
   {
-    title: "编号",
-    key: "T_id",
+    title: '编号',
+    key: 'T_id',
   },
   {
-    title: "SN",
-    key: "T_sn",
+    title: 'SN',
+    key: 'T_sn',
   },
   {
-    title: "数据量",
-    key: "T_unm",
+    title: '数据量',
+    key: 'T_unm',
   },
   {
-    title: "时间间隔",
-    key: "T_time_interval",
+    title: '时间间隔',
+    key: 'T_time_interval',
   },
   {
-    title: "开始时间",
-    key: "Time_start",
+    title: '开始时间',
+    key: 'Time_start',
   },
   {
-    title: "结束时间",
-    key: "Time_end",
+    title: '结束时间',
+    key: 'Time_end',
   },
   {
-    title: "结果",
-    key: "Result",
+    title: '结果',
+    key: 'Result',
     width: 700,
     render(row) {
       return h(
         NTag,
         {
-          type: row.Result === 200 ? "success" : "error",
+          type: row.Result === 200 ? 'success' : 'error',
           bordered: false,
-          size: "large",
+          size: 'large',
         },
-        { default: () => row.Result_str }
+        { default: () => (row.Result === 200 ? 'OK' : row.Result_str) }
       );
     },
   },
@@ -84,10 +84,11 @@ const getDataList = async () => {
   try {
     loading.value = true;
     const { data: res } = await checkTaskData(queryData);
-    loading.value = false;
     dataList.value = res.Data ? res.Data : [];
   } catch (e) {
     console.log(e);
+  } finally {
+    loading.value = false;
   }
 };
 

src/views/report/audit/TabFour.vue

@@ -25,6 +25,7 @@
   </n-space>
   <n-data-table
     remote
+    :loading="loading"
     :columns="columns"
     :data="dataList"
     :pagination="pagination"
@@ -54,6 +55,8 @@ const queryData = reactive({
 // 列表
 const dataList = ref([]);
 
+const loading = ref(false);
+
 // 需要展示的列
 const columns = [
   {
@@ -87,12 +90,19 @@ const pagination = reactive({
 
 // 获取列表
 const extractTask = async () => {
-  const { data: res } = await extractTaskData({
-    ...queryData,
-    Time_start: queryData.Time_start !== null ? queryData.Time_start : '',
-    Time_end: queryData.Time_end !== null ? queryData.Time_end : '',
-  });
-  console.log(res);
+  try {
+    loading.value = true;
+    const { data: res } = await extractTaskData({
+      T_task_id: queryData.T_task_id,
+      Time_start: queryData.Time_start + '',
+      Time_end: queryData.Time_end + '',
+    });
+    dataList.value = res.Data.List || [];
+  } catch (error) {
+    console.log(error);
+  } finally {
+    loading.value = false;
+  }
 };
 
 extractTask();