能耗分析-镂空时长日期计算修正,耗热折线图日期改为从接口取数

dev
xuechunyuan 3 years ago
parent 20faea3fcb
commit 81dfe82440
  1. 12
      src/util/bfHelper.js
  2. 8
      src/views/sourceAnaly/components/buildWarm.vue
  3. 5
      src/views/sourceAnaly/components/conditionAnaly.vue
  4. 4
      vue.config.js

@ -2862,12 +2862,12 @@ const loadModel = (i) => {
// BimfaceLoaderConfig.APIHost = "http://10.90.100.203:8080"; // BimfaceLoaderConfig.APIHost = "http://10.90.100.203:8080";
BimfaceLoaderConfig.dataEnvType = BimfaceEnvOption.Local; BimfaceLoaderConfig.dataEnvType = BimfaceEnvOption.Local;
BimfaceLoaderConfig.sdkPath = "static/jssdk@3.6.191/jssdk"; BimfaceLoaderConfig.sdkPath = "static/jssdk@3.6.191/jssdk";
// BimfaceLoaderConfig.path = i == 1 ? 'http://47.103.199.45:8000/face/ywq/viewToken.json' : BimfaceLoaderConfig.path = i == 1 ? 'http://47.103.199.45:8000/face/ywq/viewToken.json' :
// 'http://47.103.199.45:8000/face/tt/viewToken.json'; 'http://47.103.199.45:8000/face/tt/viewToken.json';
BimfaceLoaderConfig.path = // BimfaceLoaderConfig.path =
i == 1 // i == 1
? "http://10.90.100.203:8080/ywq/viewToken.json" // ? "http://10.90.100.203:8080/ywq/viewToken.json"
: "http://10.90.100.203:8080/tt/viewToken.json"; // : "http://10.90.100.203:8080/tt/viewToken.json";
BimfaceSDKLoader.load(BimfaceLoaderConfig, onSDKLoadSucceeded); BimfaceSDKLoader.load(BimfaceLoaderConfig, onSDKLoadSucceeded);
}; };

@ -199,13 +199,13 @@ export default {
).then((res) => { ).then((res) => {
let leidaData = []; let leidaData = [];
let lineData = []; let lineData = [];
const data = res.data.data; const data = res.data.data.dataList;
for (let i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
leidaData.push(data[i].consume); leidaData.push(data[i].consume);
lineData.push(data[i].consumeMonList); lineData.push(data[i].consumeMonList);
} }
this.getWarmLeida(leidaData); this.getWarmLeida(leidaData);
this.getWarmLine(lineData); this.getWarmLine(lineData,res.data.data.dateList);
}); });
}, },
getGaugeData() { getGaugeData() {
@ -344,7 +344,7 @@ export default {
title title
); );
}, },
getWarmLine(value) { getWarmLine(value,category) {
const data = []; const data = [];
for (let i = 0; i < this.build.length; i++) { for (let i = 0; i < this.build.length; i++) {
data.push({ data.push({
@ -361,7 +361,7 @@ export default {
}, },
}); });
} }
this.$refs.line.getLineCharts("耗热量(MJ)", data); this.$refs.line.getLineCharts("耗热量(MJ)", data, category);
}, },
getFloorTemper(id, value) { getFloorTemper(id, value) {
let myChart = this.$echarts.init(document.getElementById(id)); let myChart = this.$echarts.init(document.getElementById(id));

@ -63,7 +63,7 @@
@change="searchBuild" @change="searchBuild"
> >
</el-date-picker> </el-date-picker>
<div class="change-tab"> <div class="change-tab" style="display:none;">
<!-- <div <!-- <div
@click="selectDate(1)" @click="selectDate(1)"
:style="{ backgroundColor: choseDate == 1 ? 'rgb(8,166,255)' : '' }" :style="{ backgroundColor: choseDate == 1 ? 'rgb(8,166,255)' : '' }"
@ -552,7 +552,8 @@ export default {
let baseDate = this.chooseDateValue let baseDate = this.chooseDateValue
? this.chooseDateValue ? this.chooseDateValue
: dateFormat(now, "yyyy-MM-dd"); : dateFormat(now, "yyyy-MM-dd");
let minDate = now.setDate(new Date(baseDate).getDate() - 10); let baseDate2 = new Date(baseDate);
let minDate = baseDate2.setDate(new Date(baseDate).getDate() - 10);
let _min = dateFormat(new Date(minDate), "yyyy-MM-dd"); let _min = dateFormat(new Date(minDate), "yyyy-MM-dd");
console.log("mindate", baseDate, _min); console.log("mindate", baseDate, _min);
// hoursArr = this.getDayList(); //this.getLastDayList(now, 23); // hoursArr = this.getDayList(); //this.getLastDayList(now, 23);

@ -31,9 +31,9 @@ module.exports = {
// target: 'http://180.76.231.175:8000', // target: 'http://180.76.231.175:8000',
// target: 'http://192.168.0.105:80', // target: 'http://192.168.0.105:80',
// target: "http://192.168.43.35", // target: "http://192.168.43.35",
// target: 'http://192.168.1.106', target: 'http://192.168.1.106',
// target: "http://192.168.1.3", // target: "http://192.168.1.3",
target: "http://10.90.100.204", // target: "http://10.90.100.204",
// target: "http://rsvz4t.natappfree.cc", // target: "http://rsvz4t.natappfree.cc",
//远程演示服务地址,可用于直接启动项目 //远程演示服务地址,可用于直接启动项目
//target: 'https://saber.bladex.vip/api', //target: 'https://saber.bladex.vip/api',

Loading…
Cancel
Save