瀏覽代碼

Merge remote-tracking branch 'origin' into dev_wanke

zhulizhen1111 5 年之前
父節點
當前提交
ba4a05c645
共有 2 個文件被更改,包括 17 次插入14 次删除
  1. 1 1
      src/views/evaluate/evCard.vue
  2. 16 13
      src/views/evaluate/evIndoorTemperature.vue

+ 1 - 1
src/views/evaluate/evCard.vue

@@ -74,7 +74,7 @@
         </div>
         <div class='view-dialog'>
             <el-dialog title='策略推出时状况' :visible.sync='viewSnapshots' :close-on-click-modal='false' width='1260px'>
-                <ev-snapshots-dialog v-if='date && time' :appealsDate='date' :time='time'></ev-snapshots-dialog>
+                <ev-snapshots-dialog v-if='date && time' :appDate='date' :time='time'></ev-snapshots-dialog>
             </el-dialog>
         </div>
     </div>

+ 16 - 13
src/views/evaluate/evIndoorTemperature.vue

@@ -77,19 +77,22 @@ export default {
                         type: 'shadow'
                     },
                     formatter: function(params) {
-                        if (params.length == 2) {
-                            return `${params[0].name}<br/>${params[0].seriesName}<br/>${params[1].seriesName}:${
-                                params[1].value ? Number(params[1].value).toFixed(1) : 'x'
-                            }%`
-                        } else {
-                            return `${params[0].name}<br/>${
-                                params[0].value == 2 ? params[0].seriesName : params[1].value == 2 ? params[1].seriesName : params[2].seriesName
-                            }<br/>${params[params.length - 2].seriesName}:${
-                                params[params.length - 2].value ? Number(params[params.length - 2].value).toFixed(1) : 'x'
-                            }%<br/>${params[params.length - 1].seriesName}:${
-                                params[params.length - 1].value ? Number(params[params.length - 1].value).toFixed(1) : 'x'
-                            }%`
-                        }
+                        let time = params[0].name,
+                            strategyText = '',
+                            tindoorText = '',
+                            energySavingText = ''
+                        params.forEach(i => {
+                            if (i.value == 2 && i.seriesName != '室内温度满足率' && i.seriesName != '节能率') {
+                                strategyText = i.seriesName
+                            }
+                            if (i.seriesName == '室内温度满足率') {
+                                tindoorText = `室内温度满足率:${i.value ? Number(i.value).toFixed(1) : 'x'}%`
+                            }
+                            if (i.seriesName == '节能率') {
+                                energySavingText = `节能率:${i.value ? Number(i.value).toFixed(1) : 'x'}%`
+                            }
+                        })
+                        return `${time}<br/>${strategyText}<br/>${tindoorText}<br/>${energySavingText}`
                     }
                 },
                 grid: {