Merge branch 'b-master' of http://gitlab.91isoft.com:90/hikvision/web-project into b-master

src/api/report.js

 import http from './http'
-
+import {reportHeatAnalysis,reportHeatForecast,reportTransferEnergy,reportTransferArea,reportPrintHeatForecast} from "../../src/dataJson/productData/mock"
 //热量分析报表
-export const postHeatAnalysis = params => {
+/*export const postHeatAnalysis = params => {
     return http.post(`/api/analysis/report/HeatAnalysis`, params).then(res => res).catch(function (error) {
         console.log(error);
     })
+}*/
+//静态资源 热量分析报表
+export const postHeatAnalysis = params => {
+    return Promise.resolve(reportHeatAnalysis);
 }
-
 //明日预测报表（实时或历史查询）
-export const postHeatForecast = params => {
+/*export const postHeatForecast = params => {
     return http.post(`/api/analysis/report/HeatForecast`, params).then(res => res).catch(function (error) {
         console.log(error);
     })
+}*/
+//静态资源 明日预测报表（实时或历史查询）
+export const postHeatForecast = params => {
+    return Promise.resolve(reportHeatForecast);
 }
-
 //明日预测报表（打印查询）
-export const postPrintHeatForecast = params => {
+/*export const postPrintHeatForecast = params => {
     return http.post(`/api/analysis/report/PrintHeatForecast`, params).then(res => res).catch(function (error) {
         console.log(error);
     })
+}*/
+//静态资源 明日预测报表（打印查询）
+export const postPrintHeatForecast = params => {
+    return Promise.resolve(reportPrintHeatForecast);
 }
 
 //明日预测报表（保存打印记录）
+/*export const postSaveHeatForecast = params => {
+    return http.post(`/api/analysis/report/SaveHeatForecast`, params).then(res => res).catch(function (error) {
+        console.log(error);
+    })
+}*/
+//静态资源 明日预测报表（保存打印记录）
 export const postSaveHeatForecast = params => {
     return http.post(`/api/analysis/report/SaveHeatForecast`, params).then(res => res).catch(function (error) {
         console.log(error);
     })
 }
 
+
+
 //换热站能耗报表
-export const postTransferEnergy = params => {
+/*export const postTransferEnergy = params => {
     return http.post(`/api/analysis/report/TransferEnergy`, params).then(res => res).catch(function (error) {
         console.log(error);
     })
+}*/
+//静态资源 换热站能耗报表
+export const postTransferEnergy = params => {
+    return Promise.resolve(reportTransferEnergy);
 }
 
+
 //换热站面积报表
-export const postTransferArea = params => {
+/*export const postTransferArea = params => {
     return http.post(`/api/analysis/report/TransferArea`, params).then(res => res).catch(function (error) {
         console.log(error);
     })
+}*/
+//静态资源 换热站面积报表
+export const postTransferArea = params => {
+    return Promise.resolve(reportTransferArea);
 }
-
 //热量实时分析报表
 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/components/art/MeasurementArt.vue

@@ -33,7 +33,8 @@ import { ref, reactive, onMounted, onUnmounted } from 'vue';
 import { useRoute } from 'vue-router'
 import store from "../../store/index";
 import http from '../../api/http';
-
+import { weatherArt } from '../../dataJson/RealPage/boilerArt';
+import { pipeRealArt } from '../../dataJson/RealPage/measureArt';
 const props = defineProps(['id', 'refreshTime']);
 const route = useRoute()
 const Pipe = ref();
@@ -83,7 +84,6 @@ const BackFlowSum = ref();
 getSupplysList();
 function getSupplysList() {
   var result = store.getters.getEnterprise();
-  console.log(result);
   if (result) {
     result.forEach(element => {
       if (element.enterpriseId === enterpriseId.value) {
@@ -112,23 +112,50 @@ function getSupplysList() {
 }
 
 //获取气象实时数据
+// function getweather() {
+//   http.post("/api/weather/Real", SupplyId.value).then((result) => {
+//     temperature.value = result.data["temperature"];
+//     wind.value = result.data["wind"];
+//     illumination.value = result.data["illumination"];
+//     humidity.value = result.data["humidity"];
+//   })
+// }
 function getweather() {
-  http.post("/api/weather/Real", SupplyId.value).then((result) => {
-    temperature.value = result.data["temperature"];
-    wind.value = result.data["wind"];
-    illumination.value = result.data["illumination"];
-    humidity.value = result.data["humidity"];
-  })
+    temperature.value = weatherArt.data["temperature"];
+    wind.value = weatherArt.data["wind"];
+    illumination.value = weatherArt.data["illumination"];
+    humidity.value =weatherArt.data["humidity"];
 }
-
 getPipeData();
-//获取计量站实时数据
+// //获取计量站实时数据
+// function getPipeData() {
+//   let deviceType = 8;
+//   http.post("/api/pipe/Real", { "enterpriseId": enterpriseId.value, "deviceType": deviceType }).then((result) => {
+//     // console.log(JSON.stringify(result));
+//     result.data.title.forEach(element => {
+//       result.data.realData.forEach(item => {
+//         if (item.id === id.value) {
+//           PipeData[element.enName] = item[element.enName[0].toLowerCase() + element.enName.substring(1)];
+//         }
+//       })
+//     })
+//     SupplyClearPressure.value = PipeData["SupplyClearPressure"];
+//     SupplyValuePressure.value = PipeData["SupplyValuePressure"];
+//     FirstInTemp.value = PipeData["FirstInTemp"];
+//     SupplyFlow.value = PipeData["SupplyFlow"];
+//     SupplyFlowSum.value = PipeData["SupplyFlowSum"];
+//     SupplyHeat.value = PipeData["SupplyHeat"];
+//     SupplyHeatSum.value = PipeData["SupplyHeatSum"];
+//     FirstOutTemp.value = PipeData["FirstOutTemp"];
+//     BackClearPressure.value = PipeData["BackClearPressure"];
+//     BackFlow.value = PipeData["BackFlow"];
+//     BackFlowSum.value = PipeData["BackFlowSum"];
+//   })
+// }
+//静态
 function getPipeData() {
-  let deviceType = 8;
-  http.post("/api/pipe/Real", { "enterpriseId": enterpriseId.value, "deviceType": deviceType }).then((result) => {
-    console.log(result);
-    result.data.title.forEach(element => {
-      result.data.realData.forEach(item => {
+    pipeRealArt.title.forEach(element => {
+      pipeRealArt.realData.forEach(item => {
         if (item.id === id.value) {
           PipeData[element.enName] = item[element.enName[0].toLowerCase() + element.enName.substring(1)];
         }
@@ -145,7 +172,6 @@ function getPipeData() {
     BackClearPressure.value = PipeData["BackClearPressure"];
     BackFlow.value = PipeData["BackFlow"];
     BackFlowSum.value = PipeData["BackFlowSum"];
-  })
 }
 setInterval(() => {
   getPipeData();

src/store/index.js

 
 import { createStore } from 'vuex'
 import { orgFn } from '@/api/org'
+import { homeGetOrg } from '../dataJson/common/common.js'
 import {AIAPIExternalSERVEICE, AIAPIWithinSERVEICE, ExternalSERVEICE, WithinSERVEICE} from '../../public/config'
 
 const keys = { USER: 'user', ENTERPRISE:'enterprise', SERVEICE:'SERVEICE', AIAPISERVEICE:'AIAPISERVEICE' }
@@ -194,12 +195,15 @@ const store = createStore({
         //actions里面的方法是异步操作
         //异步操作就使用promise
         return new Promise((resolve,reject)=>{
-          orgFn().then(res=>{
+/*          orgFn().then(res=>{
             //console.log(res)
             context.commit('setEnterprise',res.data)
             context.commit('setEnterpriseId',res.data[0].enterpriseId)
             resolve(res)
-          }).catch(err=>reject(err))
+          }).catch(err=>reject(err))*/
+          context.commit('setEnterprise',homeGetOrg.data)
+          context.commit('setEnterpriseId',homeGetOrg.data[0].enterpriseId)
+          resolve(homeGetOrg)
         })
     }
   }

src/views/Report/TransferEnergyPage.vue

@@ -367,9 +367,15 @@ function postTransferEnergyFun() {
   postTransferEnergy(enertyInfo).then((res) => {
     if (res.success === true) {
       res.data.forEach((item, index) => {
-        item.area = item.area.toFixed(4);
-        if (item.transferName != "总计") {
-          tableData.value.push(item);
+        // 尝试将 item.area 转换为数字
+        let area = Number(item.area);
+        if (!isNaN(area)) {
+          item.area = area.toFixed(4);
+          if (item.transferName != "总计") {
+            tableData.value.push(item);
+          }
+        } else {
+          console.error('item.area is not a valid number:', item.area);
         }
       });
     } else {
@@ -478,4 +484,4 @@ table.botList td {
     height: 76vh;
   }
 }
-</style>
+</style>
\ No newline at end of file