diff --git a/src/util/bfHelper.js b/src/util/bfHelper.js index 2bb076a..8a6dec0 100644 --- a/src/util/bfHelper.js +++ b/src/util/bfHelper.js @@ -2862,12 +2862,12 @@ const loadModel = (i) => { // BimfaceLoaderConfig.APIHost = "http://10.90.100.203:8080"; BimfaceLoaderConfig.dataEnvType = BimfaceEnvOption.Local; BimfaceLoaderConfig.sdkPath = "static/jssdk@3.6.191/jssdk"; - // BimfaceLoaderConfig.path = i == 1 ? 'http://47.103.199.45:8000/face/ywq/viewToken.json' : - // 'http://47.103.199.45:8000/face/tt/viewToken.json'; - BimfaceLoaderConfig.path = - i == 1 - ? "http://10.90.100.203:8080/ywq/viewToken.json" - : "http://10.90.100.203:8080/tt/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'; + // BimfaceLoaderConfig.path = + // i == 1 + // ? "http://10.90.100.203:8080/ywq/viewToken.json" + // : "http://10.90.100.203:8080/tt/viewToken.json"; BimfaceSDKLoader.load(BimfaceLoaderConfig, onSDKLoadSucceeded); }; diff --git a/src/views/sourceAnaly/components/buildWarm.vue b/src/views/sourceAnaly/components/buildWarm.vue index 71ee7ac..ddfa425 100644 --- a/src/views/sourceAnaly/components/buildWarm.vue +++ b/src/views/sourceAnaly/components/buildWarm.vue @@ -199,13 +199,13 @@ export default { ).then((res) => { let leidaData = []; let lineData = []; - const data = res.data.data; + const data = res.data.data.dataList; for (let i = 0; i < data.length; i++) { leidaData.push(data[i].consume); lineData.push(data[i].consumeMonList); } this.getWarmLeida(leidaData); - this.getWarmLine(lineData); + this.getWarmLine(lineData,res.data.data.dateList); }); }, getGaugeData() { @@ -344,7 +344,7 @@ export default { title ); }, - getWarmLine(value) { + getWarmLine(value,category) { const data = []; for (let i = 0; i < this.build.length; i++) { data.push({ @@ -361,7 +361,7 @@ export default { }, }); } - this.$refs.line.getLineCharts("耗热量(MJ)", data); + this.$refs.line.getLineCharts("耗热量(MJ)", data, category); }, getFloorTemper(id, value) { let myChart = this.$echarts.init(document.getElementById(id)); diff --git a/src/views/sourceAnaly/components/conditionAnaly.vue b/src/views/sourceAnaly/components/conditionAnaly.vue index b2fc700..2ac4237 100644 --- a/src/views/sourceAnaly/components/conditionAnaly.vue +++ b/src/views/sourceAnaly/components/conditionAnaly.vue @@ -63,7 +63,7 @@ @change="searchBuild" > -
+