Skip to content

W
web-project
Commit 3f7eb5d2 authored by liwei's avatar liwei
Browse files
Options

修改了bug

parent 5f6468c7
Show whitespace changes
Inline Side-by-side
Showing with 5963 additions and 322 deletions
src/dataJson/exchangeStation/hotUser/hotUser.js
View file @ 3f7eb5d2
......@@ -515,3 +515,105 @@ export const tigerTigerHeatUserHis={
}
]
}
export const cityName = {
"success": true,
"status": 0,
"message": "操作成功",
"data": [
{
"supplyName": "东部供热站",
"name": "福津园小区"
},
{
"supplyName": "东部供热站",
"name": "港益热力海雅园小区"
},
{
"supplyName": "东部供热站",
"name": "海花园小区"
},
{
"supplyName": "东部供热站",
"name": "海榕园小区低区"
},
{
"supplyName": "东部供热站",
"name": "海榕园小区高区"
},
{
"supplyName": "东部供热站",
"name": "海怡园小区低区"
},
{
"supplyName": "东部供热站",
"name": "海怡园小区高区"
},
{
"supplyName": "东部供热站",
"name": "汇德园"
},
{
"supplyName": "东部供热站",
"name": "天宸庭苑"
},
{
"supplyName": "东部供热站",
"name": "天启庭苑"
},
{
"supplyName": "福苑里供热站",
"name": "福苑里南"
},
{
"supplyName": "福苑里供热站",
"name": "天泽园"
},
{
"supplyName": "行政区供热站",
"name": "百丽学府"
},
{
"supplyName": "行政区供热站",
"name": "百丽学府高区"
},
{
"supplyName": "行政区供热站",
"name": "振业里小区"
}
]
}
export const real = {
"success": true,
"status": 0,
"message": "操作成功",
"data": [
{
"gatherTime": "2024-03-27 08:15:26",
"supplyName": "东部供热站",
"name": "汇德园",
"append": "1-1-704",
"tempTar": 21.0,
"tempHome": 16.0,
"houseType": "偏单",
"toward": "南",
"position": "客厅",
"building": "1",
"unit": "1",
"household": "704"
},
{
"gatherTime": "2024-03-27 08:15:26",
"supplyName": "东部供热站",
"name": "汇德园",
"append": "6-1-304",
"tempTar": 21.0,
"tempHome": 17.0,
"houseType": "偏单",
"toward": "南",
"position": "客厅",
"building": "6",
"unit": "1",
"household": "304"
}
]
}
src/dataJson/mock-data/mock.js
View file @ 3f7eb5d2
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/AIStation/ExtinguisherPage/ExtinguisherNewDataPage.vue
View file @ 3f7eb5d2
......@@ -143,7 +143,7 @@ watch(
}
)
getDataNew()
function getDataNew(item) {
/* getListNewData(item).then(res => {
if(res.total === 0){
......
src/views/AIStation/MoveMonitorPage/MoveMonitorNewDataPage.vue
View file @ 3f7eb5d2
......@@ -108,7 +108,7 @@ watch(
}
)
getDataNew()
function getData(){
const item = reactive({
page: Page.page,
......
src/views/AIStation/PipelineTempPage/PipelineTempNewDataPage.vue
View file @ 3f7eb5d2
......@@ -216,7 +216,7 @@ const handleSortChange = (data) => {
Page.total = buspipelinetemperatureList.total
Page.rows = buspipelinetemperatureList.pageSize
};
getDataByParams()
/**序号自增*/
function Nindex(index) {
// 当前页数 - 1 * 每页数据条数 + 1
......
src/views/AIStation/TransTempPage/TransTempNewDataPage.vue
View file @ 3f7eb5d2
......@@ -67,7 +67,7 @@ watch(
console.log('值ooo', props.queryParams)
}
)
getDataNew()
function getData() {
/* const item = reactive({
page: Page.page,
......
src/views/HandlerPage/OverviewPage.vue
View file @ 3f7eb5d2
......@@ -398,62 +398,62 @@ const timeV = ref("");
const selTimeF = ref(true);
//能耗总览页---概况接口
function postArealistFun() {
loading13.value = true;
postArealist().then((res) => {
if (res.success === true) {
areaList.supplyYear = res.data[0].supplyYear;
areaList.runDay = res.data[0].runDay;
areaList.heArea = res.data[0].heArea;
areaList.gasArea = res.data[0].gasArea;
areaList.transferCount = res.data[0].transferCount;
areaList.userCount = res.data[0].userCount;
} else {
ElMessage.error(res.message);
}
loading13.value = false;
postGYPipeRealFun();
postGYCompanyEnergyFun();
});
// loading13.value = true;
// postArealist().then((res) => {
// if (res.success === true) {
// areaList.supplyYear = res.data[0].supplyYear;
// areaList.runDay = res.data[0].runDay;
// areaList.heArea = res.data[0].heArea;
// areaList.gasArea = res.data[0].gasArea;
// areaList.transferCount = res.data[0].transferCount;
// areaList.userCount = res.data[0].userCount;
// } else {
// ElMessage.error(res.message);
// }
// loading13.value = false;
// postGYPipeRealFun();
// postGYCompanyEnergyFun();
// });
}
function postGYPipeRealFun() {
loading1.value = true;
postGYPipeReal().then((res) => {
if (res.success === true) {
gYPipeReal.value = res.data;
} else {
loading.value = false;
ElMessage.error(res.message);
}
loading1.value = false;
postAllHeatFun();
});
// loading1.value = true;
// postGYPipeReal().then((res) => {
// if (res.success === true) {
// gYPipeReal.value = res.data;
// } else {
// loading.value = false;
// ElMessage.error(res.message);
// }
// loading1.value = false;
// postAllHeatFun();
// });
}
function postAllHeatFun() {
loading14.value = true;
postAllHeat().then((res) => {
if (res.success === true) {
allHeat.value = res.data[0];
} else {
ElMessage.error(res.message);
}
loading14.value = false;
postGYWeatherFun();
});
// loading14.value = true;
// postAllHeat().then((res) => {
// if (res.success === true) {
// allHeat.value = res.data[0];
// } else {
// ElMessage.error(res.message);
// }
// loading14.value = false;
// postGYWeatherFun();
// });
}
function postGYCompanyEnergyFun() {
loading2.value = true;
postGYCompanyEnergy(params).then((res) => {
if (res.success === true) {
gYCompanyEnergy.value = res.data[0];
} else {
ElMessage.error(res.message);
}
loading2.value = false;
gYCompanyEnergyInit.value = true;
});
// postGYCompanyEnergy(params).then((res) => {
// if (res.success === true) {
// gYCompanyEnergy.value = res.data[0];
// } else {
// ElMessage.error(res.message);
// }
// loading2.value = false;
// gYCompanyEnergyInit.value = true;
// });
}
//近七日气象趋势
......
src/views/HandlerPage/QOQ.vue
View file @ 3f7eb5d2
......@@ -387,12 +387,12 @@ function postExternalQOQFun() {
};
clearData();
if (networkType.value == 2) {
console.log('externalQOQ:',externalQOQ)
console.log('externalQOQ.data.hourWater:',externalQOQ.data.hourWater)
// 静态数据
echarts.dispose(document.getElementById("echartsLayer"));
pageInitFun(externalQOQ)
tableData = externalQOQ.data.hourWater
pageInitFun(externalQOQ);
tableData = externalQOQ.data.hourWater;
// postExternalQOQ(params).then((res) => {
// echarts.dispose(document.getElementById("echartsLayer"));
// if (res.success === true) {
......@@ -434,6 +434,7 @@ function clearData() {
}
function pageInitFun(res) {
console.log('res:',res)
tableData.length = 0;
res.data.hourWater.forEach((element) => {
let tableArr = {
......@@ -450,6 +451,7 @@ function pageInitFun(res) {
echartSeries.length = 0;
echartDataLegend.length = 0;
echartDataTime.length = 0;
console.log('res:',res)
echartData.value = dataDeal(res.data.hourWater);
echartData.value[0].listInfo.forEach((element) => {
if (element.gatherTime) {
......
src/views/HandlerPage/TransferEnergyView.vue
View file @ 3f7eb5d2
......@@ -138,6 +138,20 @@ 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 {
TransferEnergyView1,
TransferEnergyView2,
TransferEnergyView3,
TransferEnergyView4,
TransferEnergyView5,
TransferEnergyView6,
TransferEnergyView7,
TransferEnergyView8,
TransferEnergyView9,
TransferEnergyView10,
TransferEnergyView11,
TransferEnergyView12,
} from '../../dataJson/mock-data/mock'
import {
postQOQlist,
postHeatUct,
......@@ -444,168 +458,168 @@ function postQOQlistFun() {
//换热站机组能耗数据接口（热单耗）
function postHeatUctFun() {
loading.value = true;
postHeatUct(enertyInfo).then((res) => {
// postHeatUct(enertyInfo).then((res) => {
echarts.dispose(document.getElementById("echartsLayer"));
// postHeatUct(params).then((res) => {
if (res.success === true) {
pageInitFun(res);
} else {
ElMessage.error(res.message);
}
// if (res.success === true) {
pageInitFun(TransferEnergyView1);
// } else {
// ElMessage.error(res.message);
// }
loading.value = false;
});
// });
}
//换热站机组能耗数据接口（电单耗）
function postElecUcFun() {
loading.value = true;
postElecUc(enertyInfo).then((res) => {
// postElecUc(enertyInfo).then((res) => {
echarts.dispose(document.getElementById("echartsLayer"));
if (res.success === true) {
pageInitFun(res);
} else {
ElMessage.error(res.message);
}
// if (res.success === true) {
pageInitFun(TransferEnergyView2);
// } else {
// ElMessage.error(res.message);
// }
loading.value = false;
});
// });
}
//换热站机组能耗数据接口（水单耗）
function postWaterUcFun() {
loading.value = true;
postWaterUc(enertyInfo).then((res) => {
// loading.value = true;
// postWaterUc(enertyInfo).then((res) => {
echarts.dispose(document.getElementById("echartsLayer"));
if (res.success === true) {
pageInitFun(res);
} else {
ElMessage.error(res.message);
}
// if (res.success === true) {
pageInitFun(TransferEnergyView3);
// } else {
// ElMessage.error(res.message);
// }
loading.value = false;
});
// });
}
//换热站机组能耗数据接口（度日数热耗）
function postDayHeatFun() {
loading.value = true;
postDayHeat(enertyInfo).then((res) => {
// postDayHeat(enertyInfo).then((res) => {
echarts.dispose(document.getElementById("echartsLayer"));
if (res.success === true) {
pageInitFun(res);
} else {
ElMessage.error(res.message);
}
// if (res.success === true) {
pageInitFun(TransferEnergyView4);
// } else {
// ElMessage.error(res.message);
// }
loading.value = false;
});
// });
}
//换热站机组能耗数据接口（一网回温）
function postFirBackTFun() {
loading.value = true;
postFirBackT(enertyInfo).then((res) => {
// postFirBackT(enertyInfo).then((res) => {
echarts.dispose(document.getElementById("echartsLayer"));
if (res.success === true) {
pageInitFun(res);
} else {
ElMessage.error(res.message);
}
// if (res.success === true) {
pageInitFun(TransferEnergyView5);
// } else {
// ElMessage.error(res.message);
// }
loading.value = false;
});
// });
}
//换热站机组能耗数据接口（一网万平米流量）
function postWPMLLFun() {
loading.value = true;
postWPMLL(enertyInfo).then((res) => {
// postWPMLL(enertyInfo).then((res) => {
echarts.dispose(document.getElementById("echartsLayer"));
if (res.success === true) {
pageInitFun(res);
} else {
ElMessage.error(res.message);
}
// if (res.success === true) {
pageInitFun(TransferEnergyView6);
// } else {
// ElMessage.error(res.message);
// }
loading.value = false;
});
// });
}
//换热站机组能耗数据接口（一网万平米流量）
function postHeatEffiUcFun() {
loading.value = true;
postHeatEffiUc(enertyInfo).then((res) => {
// postHeatEffiUc(enertyInfo).then((res) => {
echarts.dispose(document.getElementById("echartsLayer"));
if (res.success === true) {
pageInitFun(res);
} else {
ElMessage.error(res.message);
}
// if (res.success === true) {
pageInitFun(TransferEnergyView7);
// } else {
// ElMessage.error(res.message);
// }
loading.value = false;
});
// });
}
//换热站机组能耗数据接口（二网温差）
function postSecAbsTUcFun() {
loading.value = true;
postSecAbsTUc(enertyInfo).then((res) => {
// postSecAbsTUc(enertyInfo).then((res) => {
echarts.dispose(document.getElementById("echartsLayer"));
if (res.success === true) {
pageInitFun(res);
} else {
ElMessage.error(res.message);
}
// if (res.success === true) {
pageInitFun(TransferEnergyView8);
// } else {
// ElMessage.error(res.message);
// }
loading.value = false;
});
// });
}
//换热站机组能耗数据接口（换热站二网均温）
function postSecAvgTUcFun() {
loading.value = true;
postSecAvgTUc(enertyInfo).then((res) => {
// postSecAvgTUc(enertyInfo).then((res) => {
echarts.dispose(document.getElementById("echartsLayer"));
if (res.success === true) {
pageInitFun(res);
} else {
ElMessage.error(res.message);
}
// if (res.success === true) {
pageInitFun(TransferEnergyView9);
// } else {
// ElMessage.error(res.message);
// }
loading.value = false;
});
// });
}
//换热站机组能耗数据接口（二网万平米流量）
function postSecTrafficUcFun() {
loading.value = true;
postSecTrafficUc(enertyInfo).then((res) => {
// postSecTrafficUc(enertyInfo).then((res) => {
echarts.dispose(document.getElementById("echartsLayer"));
if (res.success === true) {
pageInitFun(res);
} else {
ElMessage.error(res.message);
}
// if (res.success === true) {
pageInitFun(TransferEnergyView10);
// } else {
// ElMessage.error(res.message);
// }
loading.value = false;
});
// });
}
function postFirEffiTrendUcFun() {
loading.value = true;
postFirEffiTrendUc(enertyInfo).then((res) => {
// postFirEffiTrendUc(enertyInfo).then((res) => {
echarts.dispose(document.getElementById("echartsLayer"));
if (res.success === true) {
pageInitFun(res);
} else {
ElMessage.error(res.message);
}
// if (res.success === true) {
pageInitFun(TransferEnergyView11);
// } else {
// ElMessage.error(res.message);
// }
loading.value = false;
});
// });
}
function postSecEffiTrendUcFun() {
loading.value = true;
postSecEffiTrendUc(enertyInfo).then((res) => {
// postSecEffiTrendUc(enertyInfo).then((res) => {
echarts.dispose(document.getElementById("echartsLayer"));
if (res.success === true) {
pageInitFun(res);
} else {
ElMessage.error(res.message);
}
// if (res.success === true) {
pageInitFun(TransferEnergyView12);
// } else {
// ElMessage.error(res.message);
// }
loading.value = false;
});
// });
}
function pageInitFun(res) {
......
src/views/HeatUserPage/HeatUserPage.vue
View file @ 3f7eb5d2
......@@ -226,7 +226,7 @@ import { ref, reactive, onMounted, onUnmounted, provide, computed, handleError }
import DataForm from '../../components/DataForm.vue';
import { useRoute } from 'vue-router'
import http from '../../api/http'
import {tigerTigerHeatUserGetName,tigerTigerHeatUserReal,tigerTigerHeatUserHis} from '@/dataJson/exchangeStation/hotUser/hotUser.js'
import {tigerTigerHeatUserGetName,tigerTigerHeatUserReal,tigerTigerHeatUserHis,real} from '../../dataJson/exchangeStation/hotUser/hotUser.js'
import store from "../../store/index";
import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
import {
......@@ -435,15 +435,15 @@ async function initHis() {
//获得数据
async function getRealData() {
loading.value = true
await http.post(dataUrl).then((result) => {
if (result.status === 0) {
// await http.post(dataUrl).then((result) => {
if (real.status === 0) {
//处理返回数据
tableInfo.realData = result.data;
tableInfo.realData = real.data;
setshowData();
} else {
tableInfo.tableData.length = 0;
}
})
// })
loading.value = false
}
......@@ -628,11 +628,11 @@ function SearchHisData() {
//导出数据
function ExportDataFile(){
if (isHisData.value) {
ExportHisDataFile();
} else {
ExportRealDataFile();
}
// if (isHisData.value) {
// ExportHisDataFile();
// } else {
// ExportRealDataFile();
// }
}
//实时数据导出
......
src/views/HeatUserPage/TapPage.vue
View file @ 3f7eb5d2
......@@ -225,7 +225,8 @@
import { ref, reactive, onMounted, onUnmounted, provide, computed, handleError } from 'vue'
import { useRoute } from 'vue-router'
import http from '../../api/http'
import {tigerTigerTapDataHis,tigerTapDataReal} from '@/dataJson/exchangeStation/valve/valve.js'
import {tigerTigerTapDataHis,tigerTapDataReal} from '../../dataJson/exchangeStation/valve/valve.js'
import {cityName} from '../../dataJson/exchangeStation/hotUser/hotUser'
import store from "../../store/index";
import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
// import { da } from 'element-plus/es/locale';
......@@ -473,18 +474,18 @@ async function getHisData() {
//获得小区数据
async function getName() {
loading.value = true
await http.post('/api/tiger/TigerHeatUser/GetName').then((result) => {
if (result.status === 0) {
// loading.value = true
// await http.post('/api/tiger/TigerHeatUser/GetName').then((result) => {
if (cityName.status === 0) {
//处理返回数据
var list = [];
//供热站--小区
result.data.forEach(data => {
cityName.data.forEach(data => {
list.push({supplyName:data.supplyName,name:data.name});
})
setSelect(list)
}
})
// })
loading.value = false
}
......@@ -632,11 +633,11 @@ function SearchHisData() {
//导出数据
function ExportDataFile(){
if (isHisData.value) {
ExportHisDataFile();
} else {
ExportRealDataFile();
}
// if (isHisData.value) {
// ExportHisDataFile();
// } else {
// ExportRealDataFile();
// }
}
//实时数据导出
......
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