bug修复

src/views/AlarmPage/AlarmStatusPage.vue

@@ -265,7 +265,7 @@ import { ElMessage, ElMessageBox } from 'element-plus';
 import { watchEffect } from 'vue';
 import { add } from 'lodash';
 import { vFloatNumber } from "@/utils/directives.js";
-import {alarmGetTransAlarmStatusData,alarmGetBoilerAlarmStatusData,alarmGetPipeAlarmStatusData} from "../../dataJson/alarmData/mock"
+import {alarmGetTransAlarmStatusData,alarmGetBoilerAlarmStatusData,alarmGetPipeAlarmStatusData,alarmParaGetAlarmPara} from "../../dataJson/alarmData/mock"
 //分页设置
 const currentPage = ref(1)
 var pageSize = ref(30)
@@ -621,14 +621,28 @@ watchEffect(() => {
 const getCnNames = () => {
   // console.log('dept-------------------', dept.value);
   // console.log("++++++++++++++++++++++++", newType.value);
-  let data = http.post("api/alarm/para/GetAlarmPara", { type: newType.value, id: dept.value }, false);
-  data.then(function (val) {
+  //let data = http.post("api/alarm/para/GetAlarmPara", { type: newType.value, id: dept.value }, false);
+  /*data.then(function (val) {
     cnNames_before.value = val.data.before
     cnNames_after.value = val.data.after
     // console.log("cnNames_before===>", cnNames_before);
     // console.log("cnNames_after===>", cnNames_after);
     // console.log("cnNames_before.transParaBaseId:", cnNames_before.transParaBaseId)
+  });*/
+  function getStaticData(newType, dept) {
+    // 假设 staticData 是您文件中已有的静态数据
+    const staticData = alarmParaGetAlarmPara;
+
+    // 返回一个立即解析的 Promise
+    return Promise.resolve(staticData);
+  }
+
+  getStaticData(newType.value, dept.value).then(function (val) {
+    cnNames_before.value = val.data.before;
+    cnNames_after.value = val.data.after;
   });
+
+
 }
 
 // 表单编辑控制
@@ -668,7 +682,8 @@ const selectBeforeParams = (row) => {
   param.value.baseId = row[param.value.baseId]
   newRow.value = param.value.baseId
   if (param.value.baseId) {
-    const data = http.post("api/alarm/para/GetAlarmParaInfo", { type: newType.value, id: dept.value, baseid: param.value.baseId }, false)
+    //const data = http.post("api/alarm/para/GetAlarmParaInfo", { type: newType.value, id: dept.value, baseid: param.value.baseId }, false)
+    const data = alarmParaGetAlarmPara(newType.value, dept.value, param.value.baseId)
     // console.log("查看baseId --- dataaaaa:", data);
     data.then(function () {
       param.value.cnName = row.cnName
@@ -699,8 +714,8 @@ const selectAfterParams = (row) => {
   param.value.baseId = row[param.value.baseId]
   newRow.value = param.value.baseId
   if (param.value.baseId) {
-    const data = http.post("/api/alarm/para/GetAlarmParaInfo", { type: newType.value, id: dept.value, baseid: param.value.baseId }, false)
-    console.log("查看baseId --- dataaaaa:", data);
+    //const data = http.post("/api/alarm/para/GetAlarmParaInfo", { type: newType.value, id: dept.value, baseid: param.value.baseId }, false)
+    const data = alarmParaGetAlarmPara(newType.value, dept.value, param.value.baseId)
     data.then(function (val) {
       // console.log("valllll:", val);
       // 数据回显

src/views/Report/TransferEnergyPage.vue

@@ -367,10 +367,16 @@ function postTransferEnergyFun() {
   postTransferEnergy(enertyInfo).then((res) => {
     if (res.success === true) {
       res.data.forEach((item, index) => {
-        item.area = item.area.toFixed(4);
+        // 尝试将 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 {
       ElMessage.error(res.message);