Browse Source

Merge branch 'master' of http://39.106.8.246:3003/sagacloud/sagacloud-cwc-pages

zhulizhen 5 years ago
parent
commit
1ec476c04e

+ 11 - 15
src/views/evaluate/evIndoorTemperature.vue

@@ -42,8 +42,12 @@ export default {
                 this.energyDataList.forEach(el => {
                     el.time = el.date.slice(4, 6) + '.' + el.date.slice(6, 8)
                     this.dataX.push(el.time)
-                    this.indoorY.push(el.tindoorFillRate == '-9999' ? undefined : el.tindoorFillRate.toFixed(2))
-                    this.energyY.push(el.energySavingRate == '-9999' ? undefined : el.energySavingRate.toFixed(2))
+                    this.indoorY.push(
+                        el.tindoorFillRate == '-9999' ? undefined : el.tindoorFillRate != undefined ? el.tindoorFillRate.toFixed(2) : undefined
+                    )
+                    this.energyY.push(
+                        el.energySavingRate == '-9999' ? undefined : el.energySavingRate != undefined ? el.energySavingRate.toFixed(2) : undefined
+                    )
                     if (el.chillerExecuteRateReal >= 75) {
                         //绿色
                         this.strategy1.push(2)
@@ -74,19 +78,11 @@ export default {
                         type: 'shadow'
                     },
                     formatter: function(params) {
-                        console.log(params)
-                        return (
-                            params[0].name +
-                            '<br/>' +
-                            (params[0].value == 2 ? params[0].seriesName : params[1].seriesName) +
-                            '<br/>' +
-                            '<i class="icon1"></i> 室内温度:' +
-                            (params[2].value || 0) +
-                            '% <br/>' +
-                            '<i class="icon2"></i>节能率:' +
-                            (params[3].value || 0) +
-                            '%'
-                        )
+                        return `${params[0].name}<br/>${
+                            params[0].value == 2 ? params[0].seriesName : params[1].seriesName
+                        }<br/><i class="icon1"></i> 节能率: ${
+                            params[2].value ? Number(params[2].value).toFixed(1) : ''
+                        }%<br/><i class="icon2"></i>室内温度:${params[3].value ? Number(params[3].value).toFixed(1) : ''}%`
                     }
                 },
                 grid: {

+ 0 - 1
src/views/strategy/animationBox.vue

@@ -162,7 +162,6 @@ export default {
                 tooltip: {
                     trigger: 'axis',
                     formatter: function(data) {
-                        console.log(data)
                         return `${data[0].name}<br/>${data[0].seriesName}  :${data[0].value ? data[0].value.toFixed(1) : ''}<br/>${
                             data[1].seriesName
                         }  :${data[1].value ? data[1].value.toFixed(1) : ''} <br/> ${data[2].seriesName}  :${

+ 3 - 3
src/views/strategy/waterUnit.vue

@@ -46,7 +46,7 @@
             <div class='starte-right-box-1-content'>
                 <p>大</p>
                 <p>小</p>
-                <p>运行频率</p>
+                <p>{{type==2?'运行频率设定':'运行频率'}}</p>
             </div>
         </div>
         <div class='strate-right-box-1' :class='type==2?"content1":""'>
@@ -69,7 +69,7 @@
             <div class='starte-right-box-1-content'>
                 <p>大</p>
                 <p>小</p>
-                <p>运行频率</p>
+                <p>{{type==2?'运行频率设定':'运行频率'}}</p>
             </div>
         </div>
         <div class='strate-right-box-1' :class='type==2?"content1":""'>
@@ -92,7 +92,7 @@
             <div class='starte-right-box-1-content'>
                 <p>大</p>
                 <p>小</p>
-                <p>运行频率</p>
+                <p>{{type==2?'运行频率设定':'运行频率'}}</p>
             </div>
         </div>
     </div>