From 81dfe824409f1b418b039e9d93c4da948e860065 Mon Sep 17 00:00:00 2001
From: xuechunyuan <17853500702@163.com>
Date: Thu, 16 Feb 2023 17:41:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=83=BD=E8=80=97=E5=88=86=E6=9E=90-=E9=95=82?=
 =?UTF-8?q?=E7=A9=BA=E6=97=B6=E9=95=BF=E6=97=A5=E6=9C=9F=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=8C=E8=80=97=E7=83=AD=E6=8A=98=E7=BA=BF?=
 =?UTF-8?q?=E5=9B=BE=E6=97=A5=E6=9C=9F=E6=94=B9=E4=B8=BA=E4=BB=8E=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=8F=96=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/util/bfHelper.js                                | 12 ++++++------
 src/views/sourceAnaly/components/buildWarm.vue      |  8 ++++----
 src/views/sourceAnaly/components/conditionAnaly.vue |  5 +++--
 vue.config.js                                       |  4 ++--
 4 files changed, 15 insertions(+), 14 deletions(-)

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"
         >
         </el-date-picker>
-        <div class="change-tab">
+        <div class="change-tab" style="display:none;">
           <!-- <div
             @click="selectDate(1)"
             :style="{ backgroundColor: choseDate == 1 ? 'rgb(8,166,255)' : '' }"
@@ -552,7 +552,8 @@ export default {
       let baseDate = this.chooseDateValue
         ? this.chooseDateValue
         : 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");
       console.log("mindate", baseDate, _min);
       // hoursArr = this.getDayList(); //this.getLastDayList(now, 23);
diff --git a/vue.config.js b/vue.config.js
index 6ab8ff6..2c00fe4 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -31,9 +31,9 @@ module.exports = {
         // target: 'http://180.76.231.175:8000',
         // target: 'http://192.168.0.105:80',
         // 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://10.90.100.204",
+        // target: "http://10.90.100.204",
         // target: "http://rsvz4t.natappfree.cc",
         //远程演示服务地址,可用于直接启动项目
         //target: 'https://saber.bladex.vip/api',