Browse Source

feat: update

Hu Cheng 1 year ago
parent
commit
d5a99a95f9
4 changed files with 50 additions and 20 deletions
  1. 1 0
      src/api/index.js
  2. 23 18
      src/views/data/edit/index.vue
  3. 23 2
      src/views/scheme/index.vue
  4. 3 0
      vite.config.js

+ 1 - 0
src/api/index.js

@@ -6,3 +6,4 @@ export * from "./modules/Task";
 export * from "./modules/TaskData";
 export * from "./modules/VerifyTemplateMapData";
 export * from "./modules/Data";
+export * from "./modules/GenerateReport";

+ 23 - 18
src/views/data/edit/index.vue

@@ -25,8 +25,16 @@
                   </template>
                   <template #suffix>
                     <n-space>
-                      <EditClass :task="task" :taskClass="item" :getClassList="getClassList" />
-                      <DeleteClass :task="task" :taskClass="item" :getClassList="getClassList" />
+                      <EditClass
+                        :task="task"
+                        :taskClass="item"
+                        :getClassList="getClassList"
+                      />
+                      <DeleteClass
+                        :task="task"
+                        :taskClass="item"
+                        :getClassList="getClassList"
+                      />
                     </n-space>
                   </template>
                   <n-thing>
@@ -238,14 +246,12 @@ const handleCheckAll = (checked) => {
     checkValues.value.forEach(async (item) => {
       queryData.T_id = item;
       await getDataList();
-      const data1 = dataList.value.map((item) => [
-        new Date(item.T_time).getTime(),
-        item.T_t,
-      ]);
-      const data2 = dataList.value.map((item) => [
-        new Date(item.T_time).getTime(),
-        item.T_rh,
-      ]);
+      const data1 = dataList.value
+        .map((item) => [new Date(item.T_time).getTime(), item.T_t])
+        .sort((a, b) => a[0] - b[0]);
+      const data2 = dataList.value
+        .map((item) => [new Date(item.T_time).getTime(), item.T_rh])
+        .sort((a, b) => a[0] - b[0]);
       chart1.value.chart.addSeries({
         id: item,
         name: item,
@@ -300,14 +306,12 @@ const onUpdateValues = async (values, meta) => {
   queryData.T_id = classInfo.T_id;
   queryData.T_sn = classInfo.T_sn;
   await getDataList();
-  const data1 = dataList.value.map((item) => [
-    new Date(item.T_time).getTime(),
-    item.T_t,
-  ]);
-  const data2 = dataList.value.map((item) => [
-    new Date(item.T_time).getTime(),
-    item.T_rh,
-  ]);
+  const data1 = dataList.value
+    .map((item) => [new Date(item.T_time).getTime(), item.T_t])
+    .sort((a, b) => a[0] - b[0]);
+  const data2 = dataList.value
+    .map((item) => [new Date(item.T_time).getTime(), item.T_rh])
+    .sort((a, b) => a[0] - b[0]);
   if (meta.actionType === "check") {
     chart1.value.chart.addSeries({
       id: meta.value,
@@ -486,6 +490,7 @@ const getDataList = async () => {
     }
   }
   const { data: res } = await getTaskDataList(data);
+  console.log(res);
   dataList.value = res.Data.List || [];
   if (queryData.page_z <= res.Data.Page_size) {
     const arr = classList.value.filter((item) =>

+ 23 - 2
src/views/scheme/index.vue

@@ -185,6 +185,7 @@ import {
   editTask,
   getTaskDataClassList,
   getVerifyTemplateMapDataList,
+  generateScheme,
 } from "@/api";
 import * as qiniu from "qiniu-js";
 import { getToken } from "@/utils/storage/sessionToken";
@@ -330,7 +331,24 @@ const showCreateDialog = async () => {
   });
 };
 
-//
+/**
+ *
+ * @param T_VerifyTemplateMap_id
+ * @returns {Promise<void>}
+ */
+const generateSchemeReport = async (T_VerifyTemplateMap_id) => {
+  const { data: res } = await generateScheme({
+    T_task_id: task.T_task_id,
+    T_VerifyTemplate_id: task.T_VerifyTemplate_id,
+    T_VerifyTemplateMap_id,
+  });
+  console.log(res);
+};
+
+/**
+ *
+ * @returns {Promise<void>}
+ */
 const putTemplateData = async () => {
   try {
     const VerifyTemplateMapData = templateData.map((item) => {
@@ -354,7 +372,10 @@ const putTemplateData = async () => {
       T_VerifyTemplate_id: queryData.T_VerifyTemplate_id,
       VerifyTemplateMapData,
     });
-    message.success(res.Msg);
+    if (res.Code === 200) {
+      message.success(res.Msg);
+      generateSchemeReport();
+    }
   } catch (e) {
     console.log(e);
   }

+ 3 - 0
vite.config.js

@@ -18,6 +18,9 @@ export default defineConfig({
   //     },
   //   },
   // },
+  server: {
+    cors: true,
+  },
   base: "./",
   resolve: {
     alias: {