报表更新

src/views/Report/AreaInfoPage.vue

 <template>
-  <div class="contentBlock">
+  <div
+    class="contentBlock"
+    v-loading="loading"
+    element-loading-background="rgba(122, 122, 122, 0.6)"
+  >
     <div class="contentBlockInn" id="printBlock">
       <el-card class="card-contianer">
         <table
@@ -111,7 +115,11 @@
             </td>
           </tr>
         </table>
-        <el-table :data="tableData" style="width: 100%; margin-top: 10px">
+        <el-table
+          :data="tableData"
+          empty-text="暂无数据"
+          style="width: 100%; margin-top: 10px"
+        >
           <el-table-column type="index" width="60" label="序号" align="center">
           </el-table-column>
           <el-table-column prop="jurisdictionName" label="区域名称" />
@@ -213,6 +221,7 @@ import { saveAs } from "file-saver";
 import XLSX from "xlsx-js-style";
 import { postTransferArea } from "../../api/report";
 import print from "vue3-print-nb";
+const loading = ref(false);
 const radioTitle = ref("供热站");
 const options = reactive([]);
 const enterpriseId = ref(null);
@@ -411,7 +420,6 @@ function postTransferAreaFun() {
   enertyInfo.jurisdictionIds.forEach((item) => {
     options.forEach((item1) => {
       if (item1.value == item) {
-        console.log(item1.lable);
         areaName.value.push(item1.lable);
       }
     });
@@ -423,7 +431,7 @@ function postTransferAreaFun() {
   } else {
     supplyYearSend = enertyInfo.supplyYear.split("-")[1];
   }
-
+  loading.value = true;
   let params = {
     jurisdictionIds: enertyInfo.jurisdictionIds,
     supplyYear: supplyYearSend,
@@ -448,13 +456,13 @@ function postTransferAreaFun() {
     } else {
       ElMessage.error(res.message);
     }
+    loading.value = false;
   });
 }
 
 onMounted(() => {
   initRadioList();
   postTransferAreaFun();
-  //postHeatForecastFun();
 });
 onUnmounted(() => {});
 </script>

src/views/Report/ForecastPage.vue

@@ -673,12 +673,21 @@ function postHeatForecastFun() {
   };
   postHeatForecast(params).then((res) => {
     if (res.success === true) {
-      temp.value = res.data.temp;
-      predTemp.value = res.data.predTemp;
-      weather.value = res.data.weather;
-      dataList.value = res.data.list;
-      dataTime.value = res.data.time;
+      res.data.temp ? (temp.value = res.data.temp) : (temp.value = {});
+      res.data.predTemp
+        ? (predTemp.value = res.data.predTemp)
+        : (predTemp.value = {});
+      res.data.weather
+        ? (weather.value = res.data.weather)
+        : (weather.value = {});
+      res.data.list ? (dataList.value = res.data.list) : (dataList.value = {});
+      res.data.time ? (dataTime.value = res.data.time) : (dataTime.value = {});
     } else {
+      temp.value = {};
+      predTemp.value = {};
+      weather.value = {};
+      dataList.value = {};
+      dataTime.value = {};
       ElMessage.error(res.message);
     }
     loading.value = false;
@@ -696,12 +705,21 @@ function postPrintHeatForecastFun() {
   };
   postPrintHeatForecast(params).then((res) => {
     if (res.success === true) {
-      temp.value = res.data.temp;
-      predTemp.value = res.data.predTemp;
-      weather.value = res.data.weather;
-      dataList.value = res.data.list;
-      dataTime.value = res.data.time;
+      res.data.temp ? (temp.value = res.data.temp) : (temp.value = {});
+      res.data.predTemp
+        ? (predTemp.value = res.data.predTemp)
+        : (predTemp.value = {});
+      res.data.weather
+        ? (weather.value = res.data.weather)
+        : (weather.value = {});
+      res.data.list ? (dataList.value = res.data.list) : (dataList.value = {});
+      res.data.time ? (dataTime.value = res.data.time) : (dataTime.value = {});
     } else {
+      temp.value = {};
+      predTemp.value = {};
+      weather.value = {};
+      dataList.value = {};
+      dataTime.value = {};
       ElMessage.error(res.message);
     }
     loading.value = false;

src/views/Report/HeatAnalysisPage.vue

@@ -800,7 +800,7 @@ function timeFun() {
   const prehour = new Date(today.getTime() - 60 * 60 * 1000);
   today.setDate(today.getDate());
   enertyInfo.queryTime =
-    today.toISOString().split("T")[0] + " " + prehour.getHours() + ":00:0";
+    today.toISOString().split("T")[0] + " " + prehour.getHours() + ":00:00";
 }
 
 function postHeatAnalysisFun() {
@@ -809,11 +809,6 @@ function postHeatAnalysisFun() {
     return false;
   }
   loading.value = true;
-  predictionTemp.value = {};
-  realTemp.value = {};
-  comprehensiveTemp.value = {};
-  analysisSupplys.value = {};
-  analysisZones.value = {};
   let params = {
     QueryTime: enertyInfo.queryTime,
   };
@@ -835,6 +830,11 @@ function postHeatAnalysisFun() {
         ? (analysisZones.value = res.data.analysisZones)
         : (analysisZones.value = {});
     } else {
+      predictionTemp.value = {};
+      realTemp.value = {};
+      comprehensiveTemp.value = {};
+      analysisSupplys.value = {};
+      analysisZones.value = {};
       ElMessage.error(res.message);
     }
     loading.value = false;

src/views/Report/TransferEnergyPage.vue

 <template>
-  <div class="contentBlock">
+  <div
+    class="contentBlock"
+    v-loading="loading"
+    element-loading-background="rgba(122, 122, 122, 0.6)"
+  >
     <div class="contentBlockInn" id="printBlock">
       <el-card class="card-contianer">
         <table
           cellpadding="0"
           cellspacing="1"
           style="background-color: #99bbe8"
+          empty-text="暂无数据"
         >
           <tr>
             <th style="width: 25%">起始时间</th>
@@ -144,17 +149,17 @@
         <td>电量(KWH/㎡)</td>
       </tr>
       <tr v-for="item in tableData" :key="item.sn">
-        <td>{{item.sn}}</td>
-        <td>{{item.jurisdictionName}}</td>
-        <td>{{item.transferName}}</td>
-        <td>{{item.area}}</td>
-        <td>{{item.heat}}</td>
-        <td>{{item.heatG}}</td>
-        <td>{{item.heatW}}</td>
-        <td>{{item.water}}</td>
-        <td>{{item.waterUsed}}</td>
-        <td>{{item.electric}}</td>
-        <td>{{item.electricUsed}}</td>
+        <td>{{ item.sn }}</td>
+        <td>{{ item.jurisdictionName }}</td>
+        <td>{{ item.transferName }}</td>
+        <td>{{ item.area }}</td>
+        <td>{{ item.heat }}</td>
+        <td>{{ item.heatG }}</td>
+        <td>{{ item.heatW }}</td>
+        <td>{{ item.water }}</td>
+        <td>{{ item.waterUsed }}</td>
+        <td>{{ item.electric }}</td>
+        <td>{{ item.electricUsed }}</td>
       </tr>
     </table>
   </div>
@@ -169,6 +174,7 @@ import { saveAs } from "file-saver";
 import XLSX from "xlsx-js-style";
 import { postTransferEnergy } from "../../api/report";
 import print from "vue3-print-nb";
+const loading = ref(false);
 const radioTitle = ref("供热站");
 const options = reactive([]);
 const enterpriseId = ref(null);
@@ -276,9 +282,7 @@ function exportTableToExcel() {
     }
   }
 
-  ws["!cols"] = [
-    { wch: 5 }
-  ];
+  ws["!cols"] = [{ wch: 5 }];
 
   XLSX.utils.sheet_add_aoa(ws, [], {
     origin: "A1",
@@ -294,28 +298,13 @@ function exportTableToExcel() {
   ElMessage.success("导出成功！请稍后。。。");
 }
 function timeFun() {
-  var date = new Date();
-  var year = date.getFullYear();
-  var dateArr = [
-    date.getMonth() + 1,
-    date.getDate(),
-    date.getHours(),
-    date.getMinutes(),
-    date.getSeconds(),
-  ];
-  var endTimeDay = parseInt(dateArr[1] - 1);
-  if (endTimeDay < 10) {
-    endTimeDay = "0" + endTimeDay;
-  }
-  if (dateArr[0] < 10) {
-    dateArr[0] = "0" + dateArr[0];
-  }
-  if (dateArr[1] < 10) {
-    dateArr[1] = "0" + dateArr[1];
-  }
-  enertyInfo.startTime = year + "-" + dateArr[0] + "-" + endTimeDay;
-  enertyInfo.endTime = year + "-" + dateArr[0] + "-" + dateArr[1];
-  console.log(enertyInfo);
+  const today = new Date();
+  const preday = new Date(today);
+  preday.setDate(preday.getDate() - 1);
+  today.setDate(today.getDate());
+  enertyInfo.startTime =
+    preday.toISOString().split("T")[0];
+  enertyInfo.endTime = today.toISOString().split("T")[0];
 }
 
 //根据权限初始化单选列表
@@ -360,7 +349,6 @@ function postTransferEnergyFun() {
   enertyInfo.jurisdictionIds.forEach((item) => {
     options.forEach((item1) => {
       if (item1.value == item) {
-        console.log(item1.lable);
         areaName.value.push(item1.lable);
       }
     });
@@ -370,12 +358,18 @@ function postTransferEnergyFun() {
     ElMessage.error("请选择开始时间");
     return false;
   }
+  if (enertyInfo.endTime == null) {
+    ElMessage.error("请选择结束时间");
+    return false;
+  }
+  loading.value = true;
   postTransferEnergy(enertyInfo).then((res) => {
     if (res.success === true) {
       tableData.value = res.data;
     } else {
       ElMessage.error(res.message);
     }
+    loading.value = false;
   });
 }