Merge branch 'master' of https://gitee.com/tj-wang-yahui/AMS_HeatSys_Vue_V10

src/api/report.js

@@ -33,4 +33,11 @@ export const postTransferArea = params => {
     return http.post(`/api/analysis/report/TransferArea`, params).then(res => res).catch(function (error) {
         console.log(error);
     })
+}
+
+//热量实时分析报表
+export const postRealAnalysis = params => {
+    return http.post(`/api/analysis/report/RealAnalysis`, params).then(res => res).catch(function (error) {
+        console.log(error);
+    })
 }
\ No newline at end of file

src/router/index.js

@@ -334,7 +334,16 @@ const routes = [
                 meta: {
                     title: '锅炉远程控制'
                 }
-            },{
+            },
+            {
+                path: '/Remote/ZdlmSelfTest',
+                name: 'ZdlmSelfTestPage',
+                component: () => import('@/views/RemotePage/ZdlmSelfTest.vue'),
+                meta: {
+                    title: '电动阀自检'
+                }
+            },
+            {
                 path: '/Remote/Transfer',
                 name: 'TransferRemotePage',
                 component: () => import('@/views/RemotePage/TransControlPage.vue'),

src/views/RemotePage/ZdlmSelfTest.vue

+<template>
+    电动阀自检
+     </template>
\ No newline at end of file

src/views/Report/ForecastPage.vue

@@ -255,12 +255,11 @@
               style="margin: 15px 0 0 10px"
               >导出PDF</el-button
             >
-            <el-button
+            <router-link to="/RealAnalysis"><el-button
               type="primary"
-              @click="exportTableToExcel"
               style="margin: 15px 0 0 10px"
               >实时分析</el-button
-            >
+            ></router-link>
           </div>
         </div>
       </el-card>

src/views/Report/RealAnalysisPage.vue

 <template>
-    实时热量分析
-</template>
+  <div class="contentBlock">
+    <div class="contentBlockInn">
\ No newline at end of file
+      <el-card class="card-contianer">
+        <table
+          cellpadding="0"
+          cellspacing="1"
+          style="background-color: #99bbe8"
+        >
+          <tr>
+            <th style="text-align:center;">
+              <span style="font-size:24px;">港益热量汇总实时分析<span style="font-size:14px; margin-left:10px;">当前时间：{{ enertyInfo.nowTime }}</span></span>
+            </th>
+          </tr>
+        </table>
+        <el-table :data="tableData" style="overflow: auto">
+          <el-table-column fixed prop="pipeName" label="地点" width="180" />
+          <el-table-column
+            prop="firstInstantaneousFlow"
+            label="区域换热站计量反馈瞬时流量(m³/h)"
+            width="150"
+            align="center"
+          />
+          <el-table-column
+            prop="firstInstantaneousHeat"
+            label="区域换热站计量反馈瞬时热量(GJ/H)"
+            width="150"
+            align="center"
+          />
+          <el-table-column prop="firstInTemp" width="150" align="center">
+            <template v-slot:header>
+              <div>
+                <div>港益</div>
+                <span>供水温度(℃)</span>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="firstOutTemp" width="150" align="center">
+            <template v-slot:header>
+              <div>
+                <div>港益</div>
+                <span>回水温度(℃)</span>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="supplyFlow" width="180" align="center">
+            <template v-slot:header>
+              <div>
+                <div>港益</div>
+                <span>供水瞬时流量(m³/h)</span>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="supplyHeat" width="180" align="center">
+            <template v-slot:header>
+              <div>
+                <div>港益</div>
+                <span>供水瞬时流量(m³/h)</span>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="predictionHeat" label="预测瞬时热量" width="130" />
+          <el-table-column prop="currentPredictionHeat" label="当前预测热量累计" width="150" />
+          <el-table-column prop="currentDifference" label="当前热量偏差量" width="150" />
+          <el-table-column prop="groupFirstSupplyTemp" width="150" align="center">
+            <template v-slot:header>
+              <div>
+                <div>滨海供热集团</div>
+                <span>供水温度(℃)</span>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="groupFirstBackTemp" width="150" align="center">
+            <template v-slot:header>
+              <div>
+                <div>滨海供热集团</div>
+                <span>回水温度(℃)</span>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="groupFirstSupplyPress"
+            width="150"
+             align="center"
+          >
+          <template v-slot:header>
+              <div>
+                <div>滨海供热集团</div>
+                <span>供水压力(MP)</span>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="groupFirstBackPress"
+            width="150"
+            align="center"
+          >
+          <template v-slot:header>
+              <div>
+                <div>滨海供热集团</div>
+                <span>回水压力(MP)</span>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="groupSupplyFlow"
+            width="180"
+            align="center"
+          >
+          <template v-slot:header>
+              <div>
+                <div>滨海供热集团</div>
+                <span>供水瞬时流量(m³/h)</span>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="groupSupplyHeat"
+            width="180"
+            align="center"
+          >
+          <template v-slot:header>
+              <div>
+                <div>滨海供热集团</div>
+                <span>供水瞬时热量(GJ/H)</span>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column fixed="right" prop="currentRealHeat" label="当前实际热量累计" />
+        </el-table>
+        <table
+          cellpadding="0"
+          cellspacing="1"
+          class="bottomTable"
+          style="width: 100%;"
+        >
+          <tr>
+            <td style="text-align:center; width:50%;">预测方案生成 瞬时热量(GJ/H)</td>
+            <td style="text-align:center;">{{ tableDataList.prePlan }}</td>
+          </tr>
+          <tr>
+            <td style="text-align:center;">滨海供热集团汇总 瞬时热量(GJ/H)</td>
+            <td style="text-align:center;">{{ tableDataList.groupTotal }}</td>
+          </tr>
+          <tr>
+            <td style="text-align:center;">预测瞬时热量与汇总 瞬时热量 差两(GJ/H)</td>
+            <td style="text-align:center;">{{ tableDataList.prePlanDiff }}</td>
+          </tr>
+          <tr>
+            <td style="text-align:center;">预测瞬时热量与汇总 瞬时热量 差量比(%)</td>
+            <td style="text-align:center;">{{ tableDataList.diffPercent }}</td>
+          </tr>
+        </table>
+        <div>
+          <div class="btngrounp">
+            <el-button
+              type="primary"
+              @click="sendClick"
+              style="margin: 15px 0 0 0"
+              >打印</el-button
+            ><el-button
+              type="primary"
+              @click="exportTableToExcel"
+              style="margin: 15px 0 0 10px"
+              >打印预览</el-button
+            >
+            <el-button
+              type="primary"
+              @click="exportTableToExcel"
+              style="margin: 15px 0 0 10px"
+              >导出</el-button
+            >
+            <router-link to="/Forecast"><el-button
+              type="primary"
+              style="margin: 15px 0 0 10px"
+              >返回</el-button
+            ></router-link>
+          </div>
+        </div>
+      </el-card>
+    </div>
+  </div>
+</template>
+<script setup>
+import { ref, reactive, onMounted, onUnmounted } from "vue";
+import http from "../../api/http";
+import zhCn from "element-plus/dist/locale/zh-cn.mjs";
+import { ElMessage } from "element-plus";
+import { saveAs } from "file-saver";
+import XLSX from "xlsx-js-style";
+import { postRealAnalysis } from "../../api/report";
+
+const enertyInfo = reactive({
+  nowTime: null,
+  queryTime: null
+})
+const tableDataList = ref([]);
+const tableData = ref([]);
+
+function postRealAnalysisFun() {
+  var date = new Date();
+  var year = date.getFullYear();
+  var dateArr = [
+    date.getMonth() + 1,
+    date.getDate(),
+    date.getHours(),
+    date.getMinutes(),
+    date.getSeconds(),
+  ];
+  enertyInfo.nowTime = year + "-" + dateArr[0] + "-" + dateArr[1] + " " + dateArr[2] + ":" + dateArr[3] + ":" + dateArr[4];
+  enertyInfo.queryTime = year + "-" + dateArr[0] + "-" + dateArr[1] + " " + dateArr[2] + ":" + "00:00";
+  console.log(enertyInfo.queryTime);
+  let params = {
+    QueryTime: "2024-01-01 09:00:00",
+    //QueryTime: year + "-" + dateArr[0] + "-" + dateArr[1] + " " + dateArr[2] + ":" + "00:00"
+  };
+  postRealAnalysis(params).then((res) => {
+    if (res.success === true) {
+      tableDataList.value = res.data[0];
+      tableData.value = res.data[0].repData;
+      tableData.value.forEach(element => {
+        element.firstInstantaneousFlow = parseFloat(element.firstInstantaneousFlow).toFixed(1);
+        element.predictionHeat = parseFloat(element.predictionHeat).toFixed(1);
+        element.currentPredictionHeat = element.currentPredictionHeat ? element.currentPredictionHeat : "-";
+        element.currentDifference = element.currentDifference ? element.currentDifference : "-";
+        element.groupFirstSupplyPress = element.groupFirstSupplyPress ? element.groupFirstSupplyPress : "-";
+        element.groupFirstBackPress = element.groupFirstBackPress ? element.groupFirstBackPress : "-";
+        element.currentRealHeat = element.currentRealHeat ? element.currentRealHeat : "-";
+      })
+    } else {
+      ElMessage.error(res.message);
+    }
+  });
+}
+
+onMounted(() => {
+  postRealAnalysisFun();
+});
+onUnmounted(() => {});
+</script>
+<style lang="less" scoped>
+.contentBlock {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: #ffffff;
+  overflow: auto;
+}
+table {
+  width: 100%;
+}
+table,
+tr,
+th,
+td {
+  font-size: 14px;
+  margin: 0;
+  padding: 0;
+}
+table {
+  width: 100%;
+}
+table th {
+  background-color: #dfe8f6;
+  text-align: center;
+  padding: 5px 10px;
+}
+table td {
+  text-align: center;
+  background-color: #ffffff;
+  padding: 5px 10px;
+}
+table.bottomTable td {
+  border-bottom: #ebeef5 solid 1px;
+  padding: 10px 0;
+}
+.btngrounp {
+  width: 300px;
+  margin: 0 auto;
+  text-align: center;
+}
+</style>
\ No newline at end of file