Commit 929f54a6 authored by Mr.Tang's avatar Mr.Tang

bug修复-2

parent c3482c40
import http from './http'
import {reportHeatAnalysis,reportHeatForecast,reportTransferEnergy,reportTransferArea} from "../../src/dataJson/productData/mock"
import {reportHeatAnalysis,reportHeatForecast,reportTransferEnergy,reportTransferArea,reportPrintHeatForecast} from "../../src/dataJson/productData/mock"
//热量分析报表
/*export const postHeatAnalysis = params => {
return http.post(`/api/analysis/report/HeatAnalysis`, params).then(res => res).catch(function (error) {
......@@ -21,19 +21,31 @@ 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 => {
return http.post(`/api/analysis/report/TransferEnergy`, params).then(res => res).catch(function (error) {
......
......@@ -4402,3 +4402,15 @@ export const reportTransferArea={
}
]
}
export const reportPrintHeatForecast={
"success": false,
"status": 4000,
"message": "数据正在生成中,稍后在访问!",
"data": null
}
export const alarmGetAlarmMsg={
"success": true,
"status": 0,
"message": "操作成功",
"data": []
}
......@@ -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,alarmParaGetAlarmPara} from "../../dataJson/alarmData/mock"
import {alarmGetTransAlarmStatusData,alarmGetBoilerAlarmStatusData,alarmParaTranssave,alarmParaGetAlarmPara} from "../../dataJson/alarmData/mock"
//分页设置
const currentPage = ref(1)
var pageSize = ref(30)
......@@ -682,13 +682,13 @@ 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 = alarmParaGetAlarmPara(newType.value, dept.value, param.value.baseId)
// const data = http.post("api/alarm/para/GetAlarmParaInfo", { type: newType.value, id: dept.value, baseid: param.value.baseId }, false)
const data = alarmParaTranssave
// console.log("查看baseId --- dataaaaa:", data);
data.then(function () {
param.value.cnName = row.cnName
form_control.value = false
});
// data.then(function () {
// param.value.cnName = row.cnName
// form_control.value = false
// });
} else {
ElMessage.info("该参数暂不需要修改...")
}
......@@ -715,7 +715,7 @@ const selectAfterParams = (row) => {
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 = alarmParaGetAlarmPara(newType.value, dept.value, param.value.baseId)
const data = alarmParaTranssave
data.then(function (val) {
// console.log("valllll:", val);
// 数据回显
......
......@@ -443,7 +443,7 @@ function postTransferAreaFun() {
nature: enertyInfo.nature,
energyType: enertyInfo.energyType,
};
postTransferArea(params).then((res) => {
/*postTransferArea(params).then((res) => {
if (res.success === true) {
tableData.value = res.data;
tableData.value.forEach((element) => {
......@@ -462,6 +462,30 @@ function postTransferAreaFun() {
ElMessage.error(res.message);
}
loading.value = false;
});*/
postTransferArea(params).then((res) => {
if (res.success === true) {
tableData.value = res.data;
tableData.value.forEach((element) => {
// 对每个属性进行类型检查和转换
const fields = ['realCostCiviled', 'realCostSPB', 'realBuildBPB', 'stopBuildBPB', 'realBuildSPB', 'stopBuildSPB', 'supplyArea', 'realBuild', 'realCost', 'calculateArea'];
fields.forEach(field => {
if (typeof element[field] === 'number') {
element[field] = element[field].toFixed(field === 'supplyArea' || field === 'realBuild' || field === 'realCost' || field === 'calculateArea' ? 4 : 2);
} else if (typeof element[field] === 'string' && !isNaN(element[field])) {
element[field] = Number(element[field]).toFixed(field === 'supplyArea' || field === 'realBuild' || field === 'realCost' || field === 'calculateArea' ? 4 : 2);
} else {
// 处理非数字或无法转换为数字的情况,例如设置为0或显示警告
console.warn(`Field ${field} is not a valid number in element:`, element);
element[field] = '0.00'; // 或其他默认值
}
});
});
} else {
ElMessage.error(res.message);
}
loading.value = false;
});
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment