Browse Source

修改首页节能减排数据展示bug,修改功率拟合曲线页面loading效果

baiyanting 1 year ago
parent
commit
856cff7d14

+ 2 - 0
.env.development

@@ -1,6 +1,8 @@
 
 VUE_APP_TEST=http://10.81.3.155:9002
 
+
+# VUE_APP_API=http://192.168.1.110:6060
 VUE_APP_API=http://10.81.3.153:6060
 # VUE_APP_API=http://192.168.1.106:6060
 

+ 2 - 0
src/views/HealthControl/energyEfficAnalyse/healthPowerCurve/components/table.vue

@@ -16,6 +16,8 @@
       :data="props.data"
       size="small"
       v-loading="props.loading"
+      element-loading-text="加载中..."
+      element-loading-background="rgba(4, 12, 11, 0.8)"
       :max-height="tableHeight"
       :style="{ width: '100%' }"
     >

+ 8 - 8
src/views/Home/components/map.vue

@@ -285,7 +285,7 @@
               <svg-icon class="" svgid="svg-煤" />
             </div>
             <p class="eco_val text-ellipsis">
-              {{ (StationinformationData?.qt.jym / 10000).toFixed(2) }}
+              {{ (StationinformationData?.qt.jym ).toFixed(2) }}
             </p>
             <p class="eco_name">煤</p>
           </li>
@@ -294,7 +294,7 @@
               <svg-icon class="" svgid="svg-水" />
             </div>
             <p class="eco_val text-ellipsis">
-              {{ (StationinformationData?.qt.jys / 10000).toFixed(2) }}
+              {{ (StationinformationData?.qt.jys ).toFixed(2) }}
             </p>
             <p class="eco_name">水</p>
           </li>
@@ -305,7 +305,7 @@
               </div>
             </div>
             <p class="eco_val text-ellipsis">
-              {{ (StationinformationData?.qt.co2 / 10000).toFixed(2) }}
+              {{ (StationinformationData?.qt.co2 ).toFixed(2) }}
             </p>
             <p class="eco_name">二氧化碳</p>
           </li>
@@ -316,7 +316,7 @@
               </div>
             </div>
             <p class="eco_val text-ellipsis">
-              {{ (StationinformationData?.qt.so2 / 10000).toFixed(2) }}
+              {{ (StationinformationData?.qt.so2 ).toFixed(2) }}
             </p>
             <p class="eco_name">二氧化硫</p>
           </li>
@@ -660,7 +660,7 @@
                 <div class="save-value">
                   {{
                     Number(
-                      Number(StationinformationData?.qt?.jym) / 10000
+                      Number(StationinformationData?.qt?.jym)
                     ).toFixed(2)
                   }}
                 </div>
@@ -673,7 +673,7 @@
                 <div class="save-value">
                   {{
                     Number(
-                      Number(StationinformationData?.qt?.jys) / 10000
+                      Number(StationinformationData?.qt?.jys)
                     ).toFixed(2)
                   }}
                 </div>
@@ -688,7 +688,7 @@
                 <div class="save-value">
                   {{
                     Number(
-                      Number(StationinformationData?.qt?.co2) / 10000
+                      Number(StationinformationData?.qt?.co2)
                     ).toFixed(2)
                   }}
                 </div>
@@ -703,7 +703,7 @@
                 <div class="save-value">
                   {{
                     Number(
-                      Number(StationinformationData?.qt?.so2) / 10000
+                      Number(StationinformationData?.qt?.so2) 
                     ).toFixed(2)
                   }}
                 </div>

+ 2 - 2
src/views/stateMonitor/powerPredictMatrix/components/multiple-line-chart.vue

@@ -267,10 +267,10 @@ export default {
   },
   mounted() {
     this.$nextTick(() => {
+      this.$el.style.width = this.width;
+      this.$el.style.height = this.height;
       this.initChart();
       window.addEventListener("resize", this.resize);
-      //   this.$el.style.width = this.width;
-      //   this.$el.style.height = this.height;
     });
   },
   updated() {