From df90c0c5cfa4de114798015b92120ad8ba8b4826 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 22 十一月 2024 10:45:40 +0800
Subject: [PATCH] MEASURE_VALUE_TYPE

---
 src/views/data/plan/item/ItemChart.vue |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/views/data/plan/item/ItemChart.vue b/src/views/data/plan/item/ItemChart.vue
index bb6d993..4f43986 100644
--- a/src/views/data/plan/item/ItemChart.vue
+++ b/src/views/data/plan/item/ItemChart.vue
@@ -39,11 +39,12 @@
           :loading="exportLoading"
           v-hasPermi="['data:point:export']"
         >
-          <Icon icon="ep:download" />导出
+          <Icon icon="ep:download"/>
+          导出
         </el-button>
       </el-form-item>
     </el-form>
-    <div ref="chartDomPlan" class="result-chart"></div>
+    <div ref="chartDomPlan" class="result-chart"  v-loading="loading"></div>
   </el-dialog>
 </template>
 
@@ -52,6 +53,7 @@
 import * as echarts from 'echarts';
 import * as ItemApi from '@/api/data/plan/item'
 import download from "@/utils/download";
+
 const message = useMessage() // 消息弹窗
 const visible = ref(false);
 const chartDomPlan = ref(null);
@@ -68,6 +70,8 @@
   start: undefined,
   end: undefined,
 })
+const loading = ref(true) // 列表的加载中
+
 function getYMDHMS() {
   let timestamp = new Date().getTime();
   let time = new Date(timestamp - 1000 * 60 * 60 * 3);
@@ -104,6 +108,7 @@
     "00"
   );
 }
+
 /** 打开弹窗 */
 const open = async (row: object) => {
   visible.value = true
@@ -119,12 +124,14 @@
 
 async function getDataList() {
   visible.value = true;
+  loading.value = true
   if (dataForm.value.id) {
     try {
-      queryParams.itemNos=[dataForm.value.itemNo];
+      queryParams.itemNos = [dataForm.value.itemNo];
       queryParams.start = dataForm.value.startTime;
       queryParams.end = dataForm.value.endTime;
       const data = await ItemApi.getPlanChart(queryParams)
+      loading.value = false
       let seriesData = []
       data.series.forEach(item => {
         seriesData.push({
@@ -195,10 +202,11 @@
     }
   }
 }
+
 /** 导出按钮操作 */
 const exportLoading = ref(false)
 const handleExport = async () => {
-  queryParams.itemNos=[dataForm.value.itemNo];
+  queryParams.itemNo = dataForm.value.itemNo;
   queryParams.start = dataForm.value.startTime;
   queryParams.end = dataForm.value.endTime;
   try {
@@ -207,7 +215,7 @@
     // 发起导出
     exportLoading.value = true
     const data = await ItemApi.exportPlanValue(queryParams)
-    download.excel(data, dataForm.value.itemName +'.xls')
+    download.excel(data, '计划数据.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

--
Gitblit v1.9.3