Hu Cheng 2 lat temu
rodzic
commit
436a52ae96

+ 1 - 0
package.json

@@ -22,6 +22,7 @@
     "md5": "^2.3.0",
     "pinia": "^2.0.32",
     "qiniu-js": "^3.4.1",
+    "ramda": "^0.29.0",
     "vue": "^3.2.45",
     "vue-pdf-embed": "^1.1.5",
     "vue-router": "^4.1.6",

+ 7 - 0
pnpm-lock.yaml

@@ -22,6 +22,9 @@ dependencies:
   qiniu-js:
     specifier: ^3.4.1
     version: 3.4.1
+  ramda:
+    specifier: ^0.29.0
+    version: 0.29.0
   vue:
     specifier: ^3.2.45
     version: 3.2.47
@@ -2257,6 +2260,10 @@ packages:
     resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
     dev: true
 
+  /ramda@0.29.0:
+    resolution: {integrity: sha512-BBea6L67bYLtdbOqfp8f58fPMqEwx0doL+pAi8TZyp2YWz8R9G8z9x75CZI8W+ftqhFHCpEX2cRnUUXK130iKA==}
+    dev: false
+
   /rc9@2.0.1:
     resolution: {integrity: sha512-9EfjLgNmzP9255YX8bGnILQcmdtOXKtUlFTu8bOZPJVtaUDZ2imswcUdpK51tMjTRQyB7r5RebNijrzuyGXcVA==}
     dependencies:

+ 1 - 1
src/utils/axios.js

@@ -9,7 +9,7 @@ const showError = (res) => {
     message.error('登录过期,请重新登录');
     window.sessionStorage.clear();
     window.location.reload();
-  } else if (res.Code !== 200) {
+  } else if (res.Code !== 200 && res.Code !== 600 && res.Code !== 601) {
     message.error(res.Msg);
   }
 };

+ 4 - 4
src/views/data/edit/TemplateForm.vue

@@ -9,7 +9,7 @@
           label-width="auto"
           label-placement="left"
           :show-feedback="false"
-          :label="item.T_text"
+          :label="item.T_name"
           v-if="item.T_label === 7"
         >
           <n-date-picker
@@ -23,7 +23,7 @@
           label-width="auto"
           label-placement="left"
           :show-feedback="false"
-          :label="item.T_text"
+          :label="item.T_name"
           v-else-if="item.T_label === 9"
         >
           <n-date-picker
@@ -37,7 +37,7 @@
           label-width="auto"
           label-placement="left"
           :show-feedback="false"
-          :label="item.T_text"
+          :label="item.T_name"
           v-else-if="item.T_label === 3"
         >
           <n-select
@@ -52,7 +52,7 @@
           label-width="auto"
           label-placement="left"
           :show-feedback="false"
-          :label="item.T_text"
+          :label="item.T_name"
           v-else-if="item.T_label === 4"
         >
           <n-select

+ 63 - 66
src/views/data/edit/index.vue

@@ -8,10 +8,11 @@
         <n-list>
           <template #header>
             <n-checkbox
-              v-model:checked="checkValueAll"
-              label="全选"
-              @update:checked="handleCheckAll"
-            />
+              v-model:checked="checked"
+              @update:checked="handleSelectAll"
+            >
+              全选
+            </n-checkbox>
           </template>
           <n-scrollbar
             :style="{ maxHeight: `${height - 260}px` }"
@@ -19,7 +20,7 @@
           >
             <n-checkbox-group
               v-model:value="checkValues"
-              @update:value="onUpdateValues"
+              @update:value="handleCheckValues"
             >
               <template v-for="item of classList" :key="item.T_id">
                 <n-list-item class="mr-5">
@@ -152,6 +153,7 @@ import { useWindowSize } from '@vueuse/core';
 import { useNow, useDateFormat } from '@vueuse/core';
 import EditClass from './EditTaskClass.vue';
 import DeleteClass from './DeleteTaskClass.vue';
+import { dateFormat } from 'highcharts';
 
 const formatted = useDateFormat(useNow(), 'YYYY-MM-DD HH:mm:ss');
 
@@ -206,12 +208,9 @@ const checkValues = ref(null);
 // tab
 const tabChart = ref('温度');
 
-const checkValueAll = ref(false);
-
 const handleTabChange = (value) => {
   console.log(value);
   checkValues.value = [];
-  checkValueAll.value = false;
 };
 
 //
@@ -250,21 +249,23 @@ const handleSet = (data) => {
   });
 };
 
+const checked = ref(false);
+
 // 全选
-const handleCheckAll = (checked) => {
-  checkValues.value = [];
-  if (checked) {
+const handleSelectAll = async (value) => {
+  if (value) {
     checkValues.value = classList.value.map((item) => item.T_id);
-    checkValues.value.forEach(async (item) => {
-      queryData.T_id = item;
+    for (let i of classList.value) {
+      queryData.T_id = i.T_id;
+      queryData.T_sn = i.T_sn;
       await getDataList();
       if (tabChart.value === '温度') {
         const data1 = dataList.value
           .map((item) => [new Date(item.T_time).getTime(), item.T_t])
           .sort((a, b) => a[0] - b[0]);
         chart1.value.chart.addSeries({
-          id: item,
-          name: item,
+          id: i.T_id,
+          name: i.T_id,
           data: data1,
           lineWidth: 1,
           cursor: 'pointer',
@@ -280,12 +281,13 @@ const handleCheckAll = (checked) => {
           },
         });
       } else {
+        chart2.value.chart.series = [];
         const data2 = dataList.value
           .map((item) => [new Date(item.T_time).getTime(), item.T_rh])
           .sort((a, b) => a[0] - b[0]);
         chart2.value.chart.addSeries({
-          id: item,
-          name: item,
+          id: i.T_id,
+          name: i.T_id,
           data: data2,
           lineWidth: 1,
           cursor: 'pointer',
@@ -301,7 +303,7 @@ const handleCheckAll = (checked) => {
           },
         });
       }
-    });
+    }
   } else {
     if (tabChart.value === '温度') {
       classList.value.forEach((item) => {
@@ -312,11 +314,12 @@ const handleCheckAll = (checked) => {
         chart2.value.chart.get(item.T_id).remove();
       });
     }
+    checkValues.value = [];
   }
 };
 
 // 选项组的值改变时的回调
-const onUpdateValues = async (values, meta) => {
+const handleCheckValues = async (values, meta) => {
   const classInfo = classList.value.find((item) => item.T_id === meta.value);
   queryData.T_id = classInfo.T_id;
   queryData.T_sn = classInfo.T_sn;
@@ -333,7 +336,6 @@ const onUpdateValues = async (values, meta) => {
         id: meta.value,
         name: meta.value,
         data: data1,
-        lineWidth: 1,
         cursor: 'pointer',
         events: {
           click(e) {
@@ -351,18 +353,16 @@ const onUpdateValues = async (values, meta) => {
         id: meta.value,
         name: meta.value,
         data: data2,
-        lineWidth: 1,
-        cursor: 'pointer',
-        events: {
-          click(e) {
-            modal.title = '湿度';
-            modal.showModal = true;
-            formValue.T_rh = e.point.y;
-            queryData.T_id = e.point.series.name;
-            getDataList();
-            dataInfo.value = dataList.value[e.point.index];
-          },
-        },
+        // events: {
+        //   click(e) {
+        //     modal.title = '湿度';
+        //     modal.showModal = true;
+        //     formValue.T_rh = e.point.y;
+        //     queryData.T_id = e.point.series.name;
+        //     getDataList();
+        //     dataInfo.value = dataList.value[e.point.index];
+        //   },
+        // },
       });
     }
   } else {
@@ -397,33 +397,43 @@ const chartOptions1 = {
     enabled: false,
   },
 
-  chart: {
-    zoomType: 'xy',
-  },
-
   boost: {
     useGPUTranslations: true,
     seriesThreshold: 5,
   },
 
-  title: {
-    text: '车载冷藏箱',
-  },
-
-  subtitle: {
-    align: 'left',
-    text: '车载冷藏箱',
+  scrollbar: {
+    enabled: false,
   },
 
-  tooltip: {
-    valueDecimals: 2,
+  chart: {
+    zoomType: 'xy',
+    events: {
+      click(event) {
+        console.log(
+          dateFormat('%Y-%m-%d %H:%M:%S', event.xAxis[0].value),
+          event.yAxis[0].value
+        );
+        // modal.title = '温度';
+        // modal.showModal = true;
+        // formValue.T_rh = e.point.y;
+        // queryData.T_id = e.point.series.name;
+        // getDataList();
+        // dataInfo.value = dataList.value[e.point.index];
+      },
+      selection(event) {
+        // log the min and max of the primary, datetime x-axis
+        console.log(
+          dateFormat('%Y-%m-%d %H:%M:%S', event.xAxis[0].min),
+          dateFormat('%Y-%m-%d %H:%M:%S', event.xAxis[0].max)
+        );
+        // log the min and max of the y axis
+        console.log(event.yAxis[0].min, event.yAxis[0].max);
+      },
+    },
   },
 
   series: [],
-
-  scrollbar: {
-    enabled: false,
-  },
 };
 const chartOptions2 = {
   xAxis: {
@@ -446,33 +456,20 @@ const chartOptions2 = {
     enabled: false,
   },
 
-  chart: {
-    zoomType: 'xy',
-  },
-
   boost: {
     useGPUTranslations: true,
     seriesThreshold: 5,
   },
 
-  title: {
-    text: '车载冷藏箱',
-  },
-
-  subtitle: {
-    align: 'left',
-    text: '车载冷藏箱',
+  scrollbar: {
+    enabled: false,
   },
 
-  tooltip: {
-    valueDecimals: 2,
+  chart: {
+    zoomType: 'xy',
   },
 
   series: [],
-
-  scrollbar: {
-    enabled: false,
-  },
 };
 
 // 删除

+ 79 - 60
src/views/report/create/index.vue

@@ -14,13 +14,13 @@
         </n-space>
       </template>
     </n-page-header>
-    <n-scrollbar :style="{ maxHeight: `${height - 200}px` }" trigger="none">
+    <n-scrollbar :style="{ maxHeight: `${height - 150}px` }" trigger="none">
       <n-form
         label-placement="left"
         label-width="auto"
         size="large"
         show-require-mark
-        class="w-2/5 mx-auto"
+        class="w-[800px] mx-auto"
       >
         <template
           v-for="(item, index) of templateList"
@@ -137,11 +137,12 @@
           <n-form-item :label="item.T_name" v-else-if="item.T_label === 10">
             <n-image class="mr-5" width="100" :src="item.T_value" />
             <n-upload
+              list-type="image-card"
               @change="(options) => handleChangeByIndex(options, index)"
               :default-upload="false"
               :max="1"
             >
-              <n-button>点击上传</n-button>
+              点击上传
             </n-upload>
             <n-popover trigger="hover">
               <template #trigger>
@@ -175,31 +176,42 @@
     v-model:show="modal.showModal"
     :show-icon="false"
     preset="dialog"
+    :mask-closable="false"
     :title="modal.title"
+    @close="handleClose"
   >
-    <n-upload
-      :default-upload="false"
-      :max="1"
-      @change="handleChange"
-      v-if="modal.title === '上传验证'"
-    >
-      <n-button> 上传文件 </n-button>
-    </n-upload>
-    <n-alert
-      :title="keyInfo.Msg"
-      :type="code === 200 ? 'info' : code === 201 ? 'success' : 'error'"
-      v-else
-    >
-      <div>进度:{{ keyInfo.Schedule }}%</div>
-      <n-list>
-        <n-list-item :key="index" v-for="(item, index) of items">
-          <template #prefix>
-            {{ index }}
-          </template>
-          {{ item }}
-        </n-list-item>
-      </n-list>
-    </n-alert>
+    <n-scrollbar style="max-height: 200px" trigger="none" ref="scroll">
+      <n-upload
+        list-type="image-card"
+        :default-upload="false"
+        :max="1"
+        @change="handleChange"
+        v-if="modal.title === '上传验证'"
+      >
+        上传文件
+      </n-upload>
+      <n-alert
+        :title="keyInfo.Msg"
+        :type="
+          keyInfo.Code === 600
+            ? 'info'
+            : keyInfo.Code === 601
+            ? 'success'
+            : 'error'
+        "
+        v-else
+      >
+        <div>进度:{{ keyInfo.Schedule }}%</div>
+        <n-list class="bg-transparent">
+          <n-list-item :key="index" v-for="(item, index) of items">
+            <template #prefix>
+              {{ index }}
+            </template>
+            {{ item }}
+          </n-list-item>
+        </n-list>
+      </n-alert>
+    </n-scrollbar>
     <template #action>
       <n-space v-if="modal.title === '上传验证'">
         <n-button @click="modal.showModal = false">取消</n-button>
@@ -208,8 +220,8 @@
       <n-button
         v-else
         type="primary"
-        :disabled="code !== 201"
-        @click="window.open(keyInfo.Data)"
+        :disabled="keyInfo.Code !== 601"
+        @click="handleDownload"
         >下载文件</n-button
       >
     </template>
@@ -237,12 +249,17 @@ const { height } = useWindowSize();
 
 const message = useMessage();
 
+const scroll = ref(null);
+
 const task = window.sessionStorage.getItem('task')
   ? JSON.parse(window.sessionStorage.getItem('task'))
   : {};
 
-// 获取表项中收集到的值的对象
-const pdf2 = ref('');
+// 表单对象
+const formValue = reactive({
+  pdf: '',
+  templateList: [],
+});
 
 // 查询数据
 const queryData = reactive({
@@ -263,7 +280,7 @@ const modal = reactive({
   title: '',
 });
 
-// 刷新CAD
+// CAD刷新
 const handleRefresh = (index) => {
   templateList.value[
     index
@@ -304,7 +321,7 @@ const handleChangeByIndex = async ({ file }, i) => {
 
 //
 const handleChange = async ({ file }) => {
-  const token = await getFileToken(file.name.split('/')[1]);
+  const token = await getFileToken(file.name.split('.')[1]);
   const observable = qiniu.upload(
     file.file,
     file.name,
@@ -323,7 +340,7 @@ const handleChange = async ({ file }) => {
       message.error('上传失败');
     },
     complete: (res) => {
-      pdf2.value = res.key;
+      formValue.pdf = res.key;
     },
   });
 };
@@ -344,31 +361,29 @@ const handleSelectReverse = (i) => {
   );
 };
 
-//
+// 显示上传验证对话框
 const showUploadModal = () => {
   modal.title = '上传验证';
   modal.showModal = true;
 };
 
-//
+// 上传验证
 const editTaskInfo = async () => {
   try {
     const { data: res } = await editTask({
       T_task_id: queryData.T_task_id,
-      T_pdf2: pdf2.value,
+      T_pdf2: formValue.pdf,
     });
     if (res.Code === 200) {
       message.success(res.Msg);
+      modal.showModal = false;
     }
   } catch (e) {
     console.log(e);
   }
 };
 
-/**
- * 生成报告
- * @returns {Promise<void>}
- */
+// 验证报告生成 报告
 const generateReportInfo = async (obj) => {
   const { data: res } = await generateReport({
     T_task_id: task.T_task_id,
@@ -382,22 +397,19 @@ const generateReportInfo = async (obj) => {
 
 let timer = 0;
 const keyInfo = ref({});
-const code = ref(0);
 const items = computed(() => {
-  if (keyInfo.value.Item) {
-    return keyInfo.value.Item.split('\n').filter((item) => item);
-  } else {
-    return [];
-  }
+  return keyInfo.value.Item
+    ? keyInfo.value.Item.split('\n').filter((item) => item)
+    : [];
 });
 
+// 验证报告生成 获取生成结果
 const generateKeyInfo = async (key) => {
   const { data: res } = await generateKey({
     key,
   });
   keyInfo.value = res;
-  code.value = res.Code;
-  if (res.Code === 200) {
+  if (res.Code === 600) {
     timer = setTimeout(() => {
       generateKeyInfo(key);
     }, 3000);
@@ -406,12 +418,20 @@ const generateKeyInfo = async (key) => {
   }
 };
 
-/**
- *
- */
+// 关闭对话框时触发
+const handleClose = () => {
+  clearTimeout(timer);
+};
+
+// 下载文件
+const handleDownload = () => {
+  window.open(keyInfo.value.Data);
+};
+
+// 生成报告
 const putTemplateData = async () => {
   try {
-    const arr = templateList.value.filter((item) => item.T_label !== 5);
+    const arr = toRaw(templateList.value);
     const VerifyTemplateMapData = arr.map((item) => {
       if (item.T_label === 3 || item.T_label === 9) {
         return {
@@ -442,13 +462,13 @@ const putTemplateData = async () => {
       VerifyTemplateMapData,
     });
     if (res.Code === 200) {
-      const arr = toRaw(templateList.value);
       const obj = {};
       for (let i of arr) {
         if (i.T_label === 3 || i.T_label === 9) {
-          i.T_value = i.T_value.join('|');
+          obj[i.T_name] = i.T_value.join('|');
+        } else {
+          obj[i.T_name] = i.T_value;
         }
-        obj[i.T_name] = i.T_value;
       }
       modal.title = '生成报告';
       modal.showModal = true;
@@ -477,12 +497,10 @@ const getTemplateList = async () => {
     const { data: res } = await getVerifyTemplateMapDataList(queryData);
     templateList.value = res.Data;
     templateList.value.forEach((item) => {
-      if (item.T_label === 7) {
-        item.T_value = item.T_value ? item.T_value : null;
-      } else if (item.T_label === 9) {
+      if (item.T_label === 3 || item.T_label === 9) {
         item.T_value = item.T_value ? item.T_value.split('|') : null;
-      } else if (item.T_label === 3) {
-        item.T_value = item.T_value ? item.T_value.split('|') : [];
+      } else {
+        item.T_value = item.T_value ? item.T_value : null;
       }
     });
   } catch (e) {
@@ -491,6 +509,7 @@ const getTemplateList = async () => {
 };
 
 onBeforeUnmount(() => {
+  // 取消订阅
   clearTimeout(timer);
 });
 

+ 77 - 55
src/views/scheme/index.vue

@@ -14,13 +14,13 @@
         </n-space>
       </template>
     </n-page-header>
-    <n-scrollbar :style="{ maxHeight: `${height - 200}px` }" trigger="none">
+    <n-scrollbar :style="{ maxHeight: `${height - 150}px` }" trigger="none">
       <n-form
         label-placement="left"
         label-width="auto"
         size="large"
         show-require-mark
-        class="w-2/5 mx-auto"
+        class="w-[800px] mx-auto"
       >
         <template
           v-for="(item, index) of templateList"
@@ -137,11 +137,12 @@
           <n-form-item :label="item.T_name" v-else-if="item.T_label === 10">
             <n-image class="mr-5" width="100" :src="item.T_value" />
             <n-upload
+              list-type="image-card"
               @change="(options) => handleChangeByIndex(options, index)"
               :default-upload="false"
               :max="1"
             >
-              <n-button>点击上传</n-button>
+              点击上传
             </n-upload>
             <n-popover trigger="hover">
               <template #trigger>
@@ -175,31 +176,41 @@
     v-model:show="modal.showModal"
     :show-icon="false"
     preset="dialog"
+    @close="handleClose"
     :title="modal.title"
   >
-    <n-upload
-      :default-upload="false"
-      :max="1"
-      @change="handleChange"
-      v-if="modal.title === '上传验证'"
-    >
-      <n-button> 上传文件 </n-button>
-    </n-upload>
-    <n-alert
-      :title="keyInfo.Msg"
-      :type="code === 200 ? 'info' : code === 201 ? 'success' : 'error'"
-      v-else
-    >
-      <div>进度:{{ keyInfo.Schedule }}%</div>
-      <n-list>
-        <n-list-item :key="index" v-for="(item, index) of items">
-          <template #prefix>
-            {{ index }}
-          </template>
-          {{ item }}
-        </n-list-item>
-      </n-list>
-    </n-alert>
+    <n-scrollbar style="max-height: 400px" trigger="none" ref="scroll">
+      <n-upload
+        list-type="image-card"
+        :default-upload="false"
+        :max="1"
+        @change="handleChange"
+        v-if="modal.title === '上传验证'"
+      >
+        上传文件
+      </n-upload>
+      <n-alert
+        :title="keyInfo.Msg"
+        :type="
+          keyInfo.Code === 600
+            ? 'info'
+            : keyInfo.Code === 601
+            ? 'success'
+            : 'error'
+        "
+        v-else
+      >
+        <div>进度:{{ keyInfo.Schedule }}%</div>
+        <n-list class="bg-transparent">
+          <n-list-item :key="index" v-for="(item, index) of items">
+            <template #prefix>
+              {{ index }}
+            </template>
+            {{ item }}
+          </n-list-item>
+        </n-list>
+      </n-alert>
+    </n-scrollbar>
     <template #action>
       <n-space v-if="modal.title === '上传验证'">
         <n-button @click="modal.showModal = false">取消</n-button>
@@ -208,8 +219,8 @@
       <n-button
         v-else
         type="primary"
-        :disabled="code !== 201"
-        @click="window.open(keyInfo.Data)"
+        :disabled="!keyInfo.Code === 601"
+        @click="handleDownload"
         >下载文件</n-button
       >
     </template>
@@ -241,8 +252,11 @@ const task = window.sessionStorage.getItem('task')
   ? JSON.parse(window.sessionStorage.getItem('task'))
   : {};
 
-// 获取表项中收集到的值的对象
-const pdf1 = ref('');
+// 表单对象
+const formValue = reactive({
+  pdf: '',
+  templateList: [],
+});
 
 // 查询数据
 const queryData = reactive({
@@ -327,7 +341,7 @@ const handleChange = async ({ file }) => {
       message.error('上传失败');
     },
     complete: (res) => {
-      pdf1.value = res.key;
+      formValue.pdf = res.key;
     },
   });
 };
@@ -362,25 +376,25 @@ const showUploadModal = () => {
   modal.showModal = true;
 };
 
-//
+/**
+ * 上传验证
+ */
 const editTaskInfo = async () => {
   try {
     const { data: res } = await editTask({
       T_task_id: queryData.T_task_id,
-      T_pdf1: pdf1.value,
+      T_pdf1: formValue.pdf,
     });
     if (res.Code === 200) {
       message.success(res.Msg);
+      modal.showModal = false;
     }
   } catch (e) {
     console.log(e);
   }
 };
 
-/**
- * 生成报告
- * @returns {Promise<void>}
- */
+// 验证报告生成 方案
 const generateSchemeInfo = async (obj) => {
   const { data: res } = await generateScheme({
     T_task_id: task.T_task_id,
@@ -394,21 +408,18 @@ const generateSchemeInfo = async (obj) => {
 
 let timer = 0;
 const keyInfo = ref({});
-const code = ref(0);
 const items = computed(() => {
-  if (keyInfo.value.Item) {
-    return keyInfo.value.Item.split('\n').filter((item) => item);
-  } else {
-    return [];
-  }
+  return keyInfo.value.Item
+    ? keyInfo.value.Item.split('\n').filter((item) => item)
+    : [];
 });
+// 验证报告生成 获取生成结果
 const generateKeyInfo = async (key) => {
   const { data: res } = await generateKey({
     key,
   });
   keyInfo.value = res;
-  code.value = res.Code;
-  if (res.Code === 200) {
+  if (res.Code === 600) {
     timer = setTimeout(() => {
       generateKeyInfo(key);
     }, 3000);
@@ -417,14 +428,26 @@ const generateKeyInfo = async (key) => {
   }
 };
 
+// 关闭对话框时触发
+const handleClose = () => {
+  clearTimeout(timer);
+};
+
+/**
+ * 下载文件
+ */
+const handleDownload = () => {
+  window.open(keyInfo.value.Data);
+};
+
 /**
- *
+ * 生成报告
  * @returns {Promise<void>}
  */
 const putTemplateData = async () => {
   try {
-    const arr = templateList.value.filter((item) => item.T_label !== 5);
-    const VerifyTemplateMapData = arr.map((item) => {
+    const arr = toRaw(templateList.value);
+    const VerifyTemplateMapData = templateList.value.map((item) => {
       if (item.T_label === 3 || item.T_label === 9) {
         return {
           T_VerifyTemplateMap_id: item.T_VerifyTemplateMap_id,
@@ -454,13 +477,13 @@ const putTemplateData = async () => {
       VerifyTemplateMapData,
     });
     if (res.Code === 200) {
-      const arr = toRaw(templateList.value);
       const obj = {};
       for (let i of arr) {
         if (i.T_label === 3 || i.T_label === 9) {
           i.T_value = i.T_value.join('|');
+        } else {
+          obj[i.T_name] = i.T_value;
         }
-        obj[i.T_name] = i.T_value;
       }
       modal.title = '生成报告';
       modal.showModal = true;
@@ -495,12 +518,10 @@ const getTemplateList = async () => {
     const { data: res } = await getVerifyTemplateMapDataList(queryData);
     templateList.value = res.Data;
     templateList.value.forEach((item) => {
-      if (item.T_label === 7) {
-        item.T_value = item.T_value ? item.T_value : null;
-      } else if (item.T_label === 9) {
+      if (item.T_label === 3 || item.T_label === 9) {
         item.T_value = item.T_value ? item.T_value.split('|') : null;
-      } else if (item.T_label === 3) {
-        item.T_value = item.T_value ? item.T_value.split('|') : [];
+      } else {
+        item.T_value = item.T_value ? item.T_value : null;
       }
     });
   } catch (e) {
@@ -509,6 +530,7 @@ const getTemplateList = async () => {
 };
 
 onBeforeUnmount(() => {
+  // 取消订阅
   clearTimeout(timer);
 });