执行率默认状态

src/views/evaluate/evCard.vue

@@ -1,82 +1,85 @@
 <template>
-    <div class='count-card-box'>
-        <div class='count-card' v-for='(item,index) in cardList' :key='index'>
-            <div class='card-div1' v-if='item.recommend.onTime'>执行时间：{{item.recommend?formatterStr2(item.recommend.onTime):'--'}}</div>
-            <div class='card-div1' v-else-if='item.recommend.offTime'>执行时间：{{item.recommend?formatterStr2(item.recommend.offTime):'--'}}</div>
-            <div class='card-div1' v-else>执行时间：{{item.recommend?formatterStr2(item.recommend.time):'--'}}</div>
-            <div class='card-div2 MicrYaHei'>
-                <span>策略建议</span>
-                <span>冷机台数</span>
-                <span>
-                    <b style='width:50px;display: inline-block;text-align: center;'>{{formatterRes(item.recommend.chillerNumSetL,true,0)}}</b>
-                    大
-                    <b
-                        style='width:50px;display: inline-block;text-align: center;'
-                    >{{formatterRes(item.recommend.chillerNumSetS,true,0)}}</b>小
-                </span>
-                <span>冷机出水温度</span>
-                <span>
-                    <b style='width:50px;display: inline-block;text-align: center;'>{{formatterRes(item.recommend.chillWaterOutTempSet,false,1)}}</b> °C
-                </span>
-            </div>
-            <div class='card-div3 MicrYaHei'>
-                <span>实际执行</span>
-                <span>冷机台数</span>
-                <span>
-                    <b
-                        v-if='item.real'
-                        style='width:50px;display: inline-block;text-align: center;'
-                        :class='item.recommend.chillerNumSetL==item.real.chillerNumSetLOrg?"":"red"'
-                    >{{formatterRes(item.real.chillerNumSetLOrg,true,0)}}</b>大
-                    <b
-                        v-if='item.real'
-                        style='width:50px;display: inline-block;text-align: center;'
-                        :class='item.recommend.chillerNumSetS==item.real.chillerNumSetSOrg?"":"red"'
-                    >{{formatterRes(item.real.chillerNumSetSOrg,true,0)}}</b> 小
-                </span>
-                <span>冷机出水温度</span>
-                <span>
-                    <b
-                        v-if='item.real'
-                        style='width:50px;display: inline-block;text-align: center;'
-                        :class='item.recommend.chillWaterOutTempSet==item.real.chillWaterOutTempSetOrg?"":"red"'
-                    >{{formatterRes(item.real.chillWaterOutTempSetOrg,false,1)}}</b>°C
-                </span>
-            </div>
+    <div>
+        <div class='count-card-box' v-if='cardList.length>0'>
+            <div class='count-card' v-for='(item,index) in cardList' :key='index'>
+                <div class='card-div1' v-if='item.recommend.onTime'>执行时间：{{item.recommend?formatterStr2(item.recommend.onTime):'--'}}</div>
+                <div class='card-div1' v-else-if='item.recommend.offTime'>执行时间：{{item.recommend?formatterStr2(item.recommend.offTime):'--'}}</div>
+                <div class='card-div1' v-else>执行时间：{{item.recommend?formatterStr2(item.recommend.time):'--'}}</div>
+                <div class='card-div2 MicrYaHei'>
+                    <span>策略建议</span>
+                    <span>冷机台数</span>
+                    <span>
+                        <b style='width:50px;display: inline-block;text-align: center;'>{{formatterRes(item.recommend.chillerNumSetL,true,0)}}</b>
+                        大
+                        <b
+                            style='width:50px;display: inline-block;text-align: center;'
+                        >{{formatterRes(item.recommend.chillerNumSetS,true,0)}}</b>小
+                    </span>
+                    <span>冷机出水温度</span>
+                    <span>
+                        <b style='width:50px;display: inline-block;text-align: center;'>{{formatterRes(item.recommend.chillWaterOutTempSet,false,1)}}</b> °C
+                    </span>
+                </div>
+                <div class='card-div3 MicrYaHei'>
+                    <span>实际执行</span>
+                    <span>冷机台数</span>
+                    <span>
+                        <b
+                            v-if='item.real'
+                            style='width:50px;display: inline-block;text-align: center;'
+                            :class='item.recommend.chillerNumSetL==item.real.chillerNumSetLOrg?"":"red"'
+                        >{{formatterRes(item.real.chillerNumSetLOrg,true,0)}}</b>大
+                        <b
+                            v-if='item.real'
+                            style='width:50px;display: inline-block;text-align: center;'
+                            :class='item.recommend.chillerNumSetS==item.real.chillerNumSetSOrg?"":"red"'
+                        >{{formatterRes(item.real.chillerNumSetSOrg,true,0)}}</b> 小
+                    </span>
+                    <span>冷机出水温度</span>
+                    <span>
+                        <b
+                            v-if='item.real'
+                            style='width:50px;display: inline-block;text-align: center;'
+                            :class='item.recommend.chillWaterOutTempSet==item.real.chillWaterOutTempSetOrg?"":"red"'
+                        >{{formatterRes(item.real.chillWaterOutTempSetOrg,false,1)}}</b>°C
+                    </span>
+                </div>
 
-            <div class='card-div4'>备注：{{item.h||'--'}}</div>
-            <div class='card-div5'>
-                <span class='card-div7' v-if='item.recommend.isExecuted'>
-                    <img src='../../assets/completed.png' alt />
-                    已按策略执行
-                </span>
-                <template v-else-if='item.recommend.appealId' v-for='(item1,index) in titles'>
-                    <template v-if='item1.id==item.recommend.appealId'>
-                        <span class='card-div8' v-if='item1.status==302' :key='"l"+index'>
-                            <img src='../../assets/processing.png' alt />
-                            申诉中
-                        </span>
-                        <span class='card-div6' v-else :key='"l"+index'>
+                <div class='card-div4'>备注：{{item.h||'--'}}</div>
+                <div class='card-div5'>
+                    <span class='card-div7' v-if='item.recommend.isExecuted'>
+                        <img src='../../assets/completed.png' alt />
+                        已按策略执行
+                    </span>
+                    <template v-else-if='item.recommend.appealId' v-for='(item1,index) in titles'>
+                        <template v-if='item1.id==item.recommend.appealId'>
+                            <span class='card-div8' v-if='item1.status==302' :key='"l"+index'>
+                                <img src='../../assets/processing.png' alt />
+                                申诉中
+                            </span>
+                            <span class='card-div6' v-else :key='"l"+index'>
+                                <img src='../../assets/error.png' alt />
+                                未按策略执行
+                            </span>
+                        </template>
+                    </template>
+                    <template v-else>
+                        <span class='card-div6' :key='"l"+index'>
                             <img src='../../assets/error.png' alt />
                             未按策略执行
                         </span>
                     </template>
-                </template>
-                <template v-else>
-                    <span class='card-div6' :key='"l"+index'>
-                        <img src='../../assets/error.png' alt />
-                        未按策略执行
-                    </span>
-                </template>
-                <span></span>
-                <span class='MicrYaHei' @click='lookQuickData(item)' style>查看快照</span>
+                    <span></span>
+                    <span class='MicrYaHei' @click='lookQuickData(item)' style>查看快照</span>
+                </div>
+            </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' :appDate='date' :time='time'></ev-snapshots-dialog>
+                </el-dialog>
             </div>
         </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' :appDate='date' :time='time'></ev-snapshots-dialog>
-            </el-dialog>
-        </div>
+        <div class='no-data' v-else>暂无数据</div>
     </div>
 </template>
 <script>
@@ -145,6 +148,7 @@ export default {
     },
     mounted() {
         this.getAppealId()
+        console.log(this.cardList.length)
     },
     watch: {
         cardList(n, o) {
@@ -290,6 +294,15 @@ export default {
         }
     }
 }
+.no-data {
+    font-size: 14px;
+    font-family: MicrosoftYaHei;
+    color: rgba(100, 108, 115, 1);
+    height: 100%;
+    justify-content: center;
+    align-items: center;
+    display: flex;
+}
 </style>
 <style lang="scss">
 .view-dialog {

src/views/evaluate/evHistory.vue

@@ -101,9 +101,6 @@ export default {
                     this.current.energy = '--'
                 }
             }
-            console.log('11111', this.current.tempOutdoor, this.current.tempIndoor, this.current.energy)
-            console.log('22222', this.similarDay.tempOutdoor, this.similarDay.tempIndoor, this.similarDay.energy)
-            console.log('33333', this.maxArr)
         }
     },
     watch: {

src/views/evaluate/evTwoLevelMenu.vue

@@ -27,10 +27,10 @@
                             <el-switch v-model='value2' @change='changeNum("1")'></el-switch>
                         </div>
                         <div class='count-bottom-content'>
-                            <ev-two-table v-if='dataList.length>0' :switch='value2' :dataList='dataList' :value2='value2'></ev-two-table>
+                            <ev-two-table v-if='dataList.length>=0' :switch='value2' :dataList='dataList' :value2='value2'></ev-two-table>
                         </div>
                         <div class='count-bottom-foot'>
-                            <ev-stacked-line v-if='stackArr.length>0' :stackArr='stackArr'></ev-stacked-line>
+                            <ev-stacked-line v-if='stackArr.length>=0' :stackArr='stackArr'></ev-stacked-line>
                         </div>
                     </div>
                     <div v-show='num == 2'>
@@ -55,7 +55,7 @@
                     </div>
                     <div v-show='num == 3'>
                         <ev-rate-title :chillerExecuteRateReal='chillerExecuteRateReal' :tab='3'></ev-rate-title>
-                        <ev-card v-if='cardList.length>0' :cardList='cardList' :date='date'></ev-card>
+                        <ev-card v-if='cardList.length>=0' :cardList='cardList' :date='date'></ev-card>
                     </div>
                 </div>
             </div>
@@ -138,20 +138,33 @@ export default {
             }
             this.tindoorFillRate = ''
             queryTdbDay(date, { getParams }).then(res => {
-                this.tindoorFillRate = res.tindoorFillRate != undefined ? res.tindoorFillRate.toFixed(1) : '--'
+                if (res.tindoorFillRate != undefined) {
+                    if (res.tindoorFillRate == -9999) {
+                        this.tindoorFillRate = 'x'
+                    } else if (res.tindoorFillRate == -9998) {
+                        this.tindoorFillRate = '--'
+                    } else {
+                        this.tindoorFillRate = Number(this.tindoorFillRate).toFixed(1)
+                    }
+                } else {
+                    this.tindoorFillRate = '--'
+                }
                 let content = res.content
                 this.stackArr = content
-                content.forEach(({ spaceDayRpt }) => {
-                    if (obj.hasOwnProperty(spaceDayRpt.floorId)) {
-                        obj[spaceDayRpt.floorId].children.push(spaceDayRpt)
-                    } else {
-                        obj[spaceDayRpt.floorId] = {
-                            id: spaceDayRpt.floorId,
-                            name: spaceDayRpt.floorLocalName,
-                            children: [spaceDayRpt]
+                if (content && content.length > 0) {
+                    content.forEach(({ spaceDayRpt }) => {
+                        if (obj.hasOwnProperty(spaceDayRpt.floorId)) {
+                            obj[spaceDayRpt.floorId].children.push(spaceDayRpt)
+                        } else {
+                            obj[spaceDayRpt.floorId] = {
+                                id: spaceDayRpt.floorId,
+                                name: spaceDayRpt.floorLocalName,
+                                children: [spaceDayRpt]
+                            }
                         }
-                    }
-                })
+                    })
+                }
+
                 this.dataList = Object.values(obj).map(i => {
                     // 增加 isExpand 属性
                     i.isExpand = i.children.some(c => c.isSatisfy == false)
@@ -205,7 +218,6 @@ export default {
             this.energySavingRate = ''
             this.chillerExecuteRateReal = ''
             querychiller(params).then(res => {
-                console.log('res', res)
                 // // 节能率
                 // if (res.content[0].energySavingRate != undefined) {
                 //     if (res.content[0].energySavingRate == -9999) {
@@ -272,7 +284,6 @@ export default {
             this.similarDay = {}
             this.samples = []
             energyDayQuery(date, {}).then(res => {
-                console.log('sssssssssss', res)
                 if (res.result == 'success') {
                     // 本日概况
                     this.current = res.current ? res.current : {}