Browse Source

单位大小写

guoxiaohuan 4 years ago
parent
commit
d4c87cfd8a

+ 3 - 11
src/views/appeal/appealDetail.vue

@@ -127,7 +127,6 @@ export default {
         },
         tableMethods(obj) {
             this.tableList = []
-            console.log(this.detailObj)
             obj.current.title = '当前运行状态'
             obj.recommend.title = '推送策略'
             obj.real.title = '执行策略'
@@ -171,17 +170,8 @@ export default {
                 }
             }
             queryChillerExecuteInfo(params).then(res => {
-                console.log(res)
                 this.tableList = []
                 const list = res.data || [{}, {}, {}]
-
-                // console.log(res)
-                // const list = res.data || [{}, {}, {}]
-                // this.tableList = Object.values(list[0]).map(i => i || {})
-                // this.tableList[0].title = '当前运行状态'
-                // this.tableList[1].title = '推送策略'
-                // this.tableList[2].title = '执行策略'
-                console.log(this.tableList)
             })
         },
         submission() {
@@ -221,7 +211,9 @@ export default {
             .format('YYYY.MM.DD')
         if (Object.keys(this.detailObj).length > 0) {
             this.tableMethods(this.detailObj)
-            this.quertName(this.detailObj.applyUser)
+            if (this.detailObj.applyUser) {
+                this.quertName(this.detailObj.applyUser)
+            }
             let projects = this.$store.state.projects.projects
             projects.forEach(el => {
                 if (this.detailObj.projectId == el.id) {

+ 6 - 10
src/views/appeal/appealDetails.vue

@@ -96,7 +96,7 @@ export default {
             })
         },
         back() {
-            this.$router.push('/appeal')
+            this.$router.push('/strategy')
         },
         queryDetail(commandId) {
             let params = {
@@ -148,7 +148,7 @@ export default {
                 // this.tableList[0].title = "当前运行状态";
                 // this.tableList[1].title = "推送策略";
                 // this.tableList[2].title = "执行策略";
-                console.log(this.tableList)
+                // console.log(this.tableList)
             })
         },
         submission() {
@@ -184,8 +184,10 @@ export default {
             .locale('zh-cn')
             .format('YYYY.MM.DD')
         if (Object.keys(this.detailObj).length > 0) {
-            console.log(this.detailObj)
-            this.quertName(this.detailObj.applyUser)
+            this.queryDetail(this.detailObj.id)
+            if (this.detailObj.applyUser) {
+                this.quertName(this.detailObj.applyUser)
+            }
             let projects = this.$store.state.projects.projects
             projects.forEach(el => {
                 if (this.detailObj.projectId == el.id) {
@@ -295,12 +297,6 @@ export default {
     .text-color::-webkit-input-placeholder {
         color: #c3c7cb;
     }
-    .foot {
-        // width: 112px;
-        // height: 112px;
-        // background: rgba(248, 249, 250, 1);
-        // border: 1px solid red;
-    }
 }
 </style>
 <style lang="scss">

+ 0 - 1
src/views/appeal/index.vue

@@ -308,7 +308,6 @@ export default {
                 }
             }
             queryChillerExecuteInfo(params).then(res => {
-                // console.log(res)
                 let obj = Object.assign(item, res.data[0])
                 this.menu(obj, type)
             })

+ 4 - 4
src/views/audit/auditTable.vue

@@ -146,21 +146,21 @@
                         <font :class='item.coolPumpNumSetSOrg=="-9999"?"reds":""'>{{formatterRes(item.coolPumpNumSetSOrg,true,0)}}</font>小
                     </span>
                     <span style='width:60px;text-align:center'>
-                        <font :class='item.coolPumpFreqSetOrg=="-9999"?"reds":""'>{{formatterRes(item.coolPumpFreqSetOrg,false,0)}}</font>HZ
+                        <font :class='item.coolPumpFreqSetOrg=="-9999"?"reds":""'>{{formatterRes(item.coolPumpFreqSetOrg,false,0)}}</font>Hz
                     </span>
                     <span style='width:70px;text-align:center'>
                         <font :class='item.chillPumpNumSetLOrg=="-9999"?"reds":""'>{{formatterRes(item.chillPumpNumSetLOrg,true,0)}}</font>大
                         <font :class='item.chillPumpNumSetSOrg=="-9999"?"reds":""'>{{formatterRes(item.chillPumpNumSetSOrg,true,0)}}</font>小
                     </span>
                     <span style='width:60px;text-align:center'>
-                        <font :class='item.chillPumpFreqSetOrg=="-9999"?"reds":""'>{{formatterRes(item.chillPumpFreqSetOrg,false,0)}}</font>HZ
+                        <font :class='item.chillPumpFreqSetOrg=="-9999"?"reds":""'>{{formatterRes(item.chillPumpFreqSetOrg,false,0)}}</font>Hz
                     </span>
                     <span style='width:70px;text-align:center'>
                         <font :class='item.coolTowerNumSetSOrg=="-9999"?"reds":""'>{{formatterRes(item.coolTowerNumSetSOrg,true,0)}}</font>大
                         <font :class='item.coolTowerNumSetLOrg=="-9999"?"reds":""'>{{formatterRes(item.coolTowerNumSetLOrg,true,0)}}</font>小
                     </span>
                     <span style='width:60px;text-align:center'>
-                        <font :class='item.coolTowerFreqSetOrg=="-9999"?"reds":""'>{{formatterRes(item.coolTowerFreqSetOrg,false,0)}}</font>HZ
+                        <font :class='item.coolTowerFreqSetOrg=="-9999"?"reds":""'>{{formatterRes(item.coolTowerFreqSetOrg,false,0)}}</font>Hz
                     </span>
                     <span style='width:75px;text-align:center'>
                         <font :class='item.meanTindoor=="-9999"?"reds":""'>{{formatterRes(item.meanTindoor,false,1)}}</font>℃
@@ -171,7 +171,7 @@
                     <span style='width:60px;text-align:center'>
                         <font
                             :class='parseInt(item.plrAllOrg)=="-9999"?"reds":""'
-                        >{{(item.plrAllOrg==undefined)?'--':(parseInt(item.plrAllOrg)=='-9999'?'x':(parseInt(item.plrAllOrg)=='-9998'?'--':parseInt(item.plrAllOrg)))}}</font>HZ
+                        >{{(item.plrAllOrg==undefined)?'--':(parseInt(item.plrAllOrg)=='-9999'?'x':(parseInt(item.plrAllOrg)=='-9998'?'--':parseInt(item.plrAllOrg)))}}</font>Hz
                     </span>
                 </div>
             </div>

+ 51 - 48
src/views/audit/index.vue

@@ -224,58 +224,61 @@ export default {
         appealClick(item) {
             this.ids = item.id
             this.auditObj = item
-            this.quertName(item.updateUser)
-            let params = {
-                postParams: {
-                    criteria: {
-                        id: item.commandId
+            if (item.updateUser) {
+                this.quertName(item.updateUser)
+
+                let params = {
+                    postParams: {
+                        criteria: {
+                            id: item.commandId
+                        }
                     }
                 }
-            }
-            queryChillerExecuteInfo(params).then(res => {
-                this.tableList = []
-                const list = res.data || [{}, {}, {}]
-                if (list.length > 0) {
-                    let current = list[0].current
-                    current.title = '当前运行状态'
-                    this.tableList.push(current)
-                    list.forEach(item => {
-                        if (Object.keys(item.recommend).length > 0) {
-                            let obj = {
-                                title: '推送策略',
-                                id: item.recommend.id,
-                                date: item.recommend.date,
-                                time: item.recommend.time,
-                                projectId: item.recommend.projectId,
-                                chillerNumSetLOrg: item.recommend.chillerNumSetL,
-                                chillerNumSetSOrg: item.recommend.chillerNumSetS,
-                                chillWaterOutTempSetOrg: item.recommend.chillWaterOutTempSet,
-                                coolPumpNumSetLOrg: item.recommend.coolPumpNumSetL,
-                                coolPumpNumSetSOrg: item.recommend.coolPumpNumSetS,
-                                coolPumpFreqSetOrg: item.recommend.coolPumpFreqSet,
-                                chillPumpNumSetLOrg: item.recommend.chillPumpNumSetL,
-                                chillPumpNumSetSOrg: item.recommend.chillPumpNumSetS,
-                                chillPumpFreqSetOrg: item.recommend.chillPumpFreqSet,
-                                coolTowerNumSetLOrg: item.recommend.coolTowerNumSetL,
-                                coolTowerNumSetSOrg: item.recommend.coolTowerNumSetS,
-                                coolTowerFreqSetOrg: item.recommend.coolTowerFreqSet,
-                                plrAllOrg: item.recommend.plrAllOrg
+                queryChillerExecuteInfo(params).then(res => {
+                    this.tableList = []
+                    const list = res.data || [{}, {}, {}]
+                    if (list.length > 0) {
+                        let current = list[0].current
+                        current.title = '当前运行状态'
+                        this.tableList.push(current)
+                        list.forEach(item => {
+                            if (Object.keys(item.recommend).length > 0) {
+                                let obj = {
+                                    title: '推送策略',
+                                    id: item.recommend.id,
+                                    date: item.recommend.date,
+                                    time: item.recommend.time,
+                                    projectId: item.recommend.projectId,
+                                    chillerNumSetLOrg: item.recommend.chillerNumSetL,
+                                    chillerNumSetSOrg: item.recommend.chillerNumSetS,
+                                    chillWaterOutTempSetOrg: item.recommend.chillWaterOutTempSet,
+                                    coolPumpNumSetLOrg: item.recommend.coolPumpNumSetL,
+                                    coolPumpNumSetSOrg: item.recommend.coolPumpNumSetS,
+                                    coolPumpFreqSetOrg: item.recommend.coolPumpFreqSet,
+                                    chillPumpNumSetLOrg: item.recommend.chillPumpNumSetL,
+                                    chillPumpNumSetSOrg: item.recommend.chillPumpNumSetS,
+                                    chillPumpFreqSetOrg: item.recommend.chillPumpFreqSet,
+                                    coolTowerNumSetLOrg: item.recommend.coolTowerNumSetL,
+                                    coolTowerNumSetSOrg: item.recommend.coolTowerNumSetS,
+                                    coolTowerFreqSetOrg: item.recommend.coolTowerFreqSet,
+                                    plrAllOrg: item.recommend.plrAllOrg
+                                }
+                                this.tableList.push(obj)
                             }
-                            this.tableList.push(obj)
-                        }
-                    })
+                        })
 
-                    let real = list[0].real
-                    real.title = '执行策略'
-                    this.tableList.push(real)
-                }
-                // console.log(list)
-                // this.tableList = Object.values(list[0]).map(i => i || {})
-                // this.tableList[0].title = '当前运行状态'
-                // this.tableList[1].title = '推送策略'
-                // this.tableList[2].title = '执行策略'
-                console.log(this.tableList)
-            })
+                        let real = list[0].real
+                        real.title = '执行策略'
+                        this.tableList.push(real)
+                    }
+                    // console.log(list)
+                    // this.tableList = Object.values(list[0]).map(i => i || {})
+                    // this.tableList[0].title = '当前运行状态'
+                    // this.tableList[1].title = '推送策略'
+                    // this.tableList[2].title = '执行策略'
+                    console.log(this.tableList)
+                })
+            }
         },
         unique(array) {
             var res = []

+ 18 - 12
src/views/evaluate/evSnapshotsDialog.vue

@@ -31,7 +31,8 @@
                             <span>
                                 <font
                                     :class='chillerOrg.chillWaterOutTempSetOrg=="-9999"?"reds":""'
-                                >{{formatterRes(chillerOrg.chillWaterOutTempSetOrg,false,1)}}</font> °C
+                                >{{formatterRes(chillerOrg.chillWaterOutTempSetOrg,false,1)}}</font>
+                                <font style='font-size:12px;'>°C</font>
                             </span>
                         </div>
                         <div class='snapshotss-cont-bot-2 MicrYaHei'>
@@ -56,13 +57,14 @@
                             <span>
                                 <font
                                     :class='chillerOrg.coolPumpFreqSetOrg=="-9999"?"reds":""'
-                                >{{formatterRes(chillerOrg.coolPumpFreqSetOrg,false,0)}}</font> Hz
+                                >{{formatterRes(chillerOrg.coolPumpFreqSetOrg,false,0)}}</font>
+                                <font style='font-size:12px;'>Hz</font>
                             </span>
                         </div>
                         <div class='snapshotss-cont-bot-2'>
                             <span>大</span>
                             <span>小</span>
-                            <span>设定频率</span>
+                            <span>运行频率</span>
                         </div>
                     </div>
                 </div>
@@ -83,13 +85,14 @@
                             <span>
                                 <font
                                     :class='chillerOrg.chillPumpFreqSetOrg=="-9999"?"reds":""'
-                                >{{formatterRes(chillerOrg.chillPumpFreqSetOrg,false,0)}}</font> Hz
+                                >{{formatterRes(chillerOrg.chillPumpFreqSetOrg,false,0)}}</font>
+                                <font style='font-size:12px;'>Hz</font>
                             </span>
                         </div>
                         <div class='snapshotss-cont-bot-2'>
                             <span>大</span>
                             <span>小</span>
-                            <span>设定频率</span>
+                            <span>运行频率</span>
                         </div>
                     </div>
                 </div>
@@ -110,13 +113,14 @@
                             <span>
                                 <font
                                     :class='chillerOrg.coolTowerFreqSetOrg=="-9999"?"reds":""'
-                                >{{formatterRes(chillerOrg.coolTowerFreqSetOrg,false,0)}}</font> Hz
+                                >{{formatterRes(chillerOrg.coolTowerFreqSetOrg,false,0)}}</font>
+                                <font style='font-size:12px;'>Hz</font>
                             </span>
                         </div>
                         <div class='snapshotss-cont-bot-2'>
                             <span>大</span>
                             <span>小</span>
-                            <span>设定频率</span>
+                            <span>运行频率</span>
                         </div>
                     </div>
                 </div>
@@ -125,17 +129,17 @@
         <div class='snapshotss-center2'>
             <div class='snapshotss-cont2-box1 MicrYaHei'>
                 <span>数据传输情况</span>
-                <span :class='chillerCommand.isExecuted==1?"span1":"span2"'>
+                <span :class='chillerCommand.energyErrorFlag!=1?"span1":"span2"'>
                     能耗
                     <img v-if='chillerCommand.energyErrorFlag!=1' src='../../assets/finish.png' alt />
                     <img v-else src='../../assets/wrong.png' alt />
                 </span>
-                <span :class='chillerCommand.isExecuted==1?"span1":"span2"'>
+                <span :class='chillerCommand.environmentErrorFlag!=1?"span1":"span2"'>
                     环境
                     <img v-if='chillerCommand.environmentErrorFlag!=1' src='../../assets/finish.png' alt />
                     <img v-else src='../../assets/wrong.png' alt />
                 </span>
-                <span :class='chillerCommand.isExecuted==1?"span1":"span2"'>
+                <span :class='chillerCommand.baErrorFalg!=1?"span1":"span2"'>
                     BA
                     <img v-if='chillerCommand.baErrorFalg!=1' src='../../assets/finish.png' alt />
                     <img v-else src='../../assets/wrong.png' alt />
@@ -146,13 +150,15 @@
                 <span>
                     <font
                         :class='parseInt(chillerCommand.nowPlantLoad)=="-9999"?"reds":""'
-                    >{{(chillerCommand.nowPlantLoad==undefined)?'--':(parseInt(chillerCommand.nowPlantLoad)=='-9999'?'x':(parseInt(chillerCommand.nowPlantLoad)=='-9998'?'--':parseInt(chillerCommand.nowPlantLoad)))}}</font> kW
+                    >{{(chillerCommand.nowPlantLoad==undefined)?'--':(parseInt(chillerCommand.nowPlantLoad)=='-9999'?'x':(parseInt(chillerCommand.nowPlantLoad)=='-9998'?'--':parseInt(chillerCommand.nowPlantLoad)))}}</font>
+                    <font style='font-size:12px;'>kw</font>
                 </span>
                 <span>未来1小时预测冷量</span>
                 <span>
                     <font
                         :class='parseInt(chillerCommand.predictedLoad1h)=="-9999"?"reds":""'
-                    >{{(chillerCommand.predictedLoad1h==undefined)?'--':(parseInt(chillerCommand.predictedLoad1h)=='-9999'?'x':(parseInt(chillerCommand.predictedLoad1h)=='-9998'?'--':parseInt(chillerCommand.predictedLoad1h)))}}</font> kW
+                    >{{(chillerCommand.predictedLoad1h==undefined)?'--':(parseInt(chillerCommand.predictedLoad1h)=='-9999'?'x':(parseInt(chillerCommand.predictedLoad1h)=='-9998'?'--':parseInt(chillerCommand.predictedLoad1h)))}}</font>
+                    <font style='font-size:12px;'>kw</font>
                 </span>
             </div>
         </div>

+ 3 - 3
src/views/evaluate/index.vue

@@ -31,7 +31,7 @@
                     <p class='ev-top Micbold'>室内温度满足率</p>
                     <div class='ev-bottom'>
                         <div class='ev-bottom-left'>
-                            <ev-satisfaction-rate v-if='tindoorFillRate' :tindoorFillRate='tindoorFillRate'></ev-satisfaction-rate>
+                            <ev-satisfaction-rate :tindoorFillRate='tindoorFillRate'></ev-satisfaction-rate>
                         </div>
                         <div class='ev-bottom-right MicrYaHei'>
                             <p>
@@ -51,7 +51,7 @@
                     <p class='ev-top'>节能率</p>
                     <div class='ev-bottom'>
                         <div class='ev-bottom-left'>
-                            <ev-energy-saving-rate v-if='energySavingRate' :energySavingRate='energySavingRate'></ev-energy-saving-rate>
+                            <ev-energy-saving-rate :energySavingRate='energySavingRate'></ev-energy-saving-rate>
                         </div>
                         <div class='ev-bottom-right'>
                             <p>
@@ -66,7 +66,7 @@
                     <p class='ev-top'>策略执行率</p>
                     <div class='ev-bottom'>
                         <div class='ev-bottom-left'>
-                            <ev-implementation-rate v-if='chillerExecuteRate' :chillerExecuteRate='chillerExecuteRate'></ev-implementation-rate>
+                            <ev-implementation-rate :chillerExecuteRate='chillerExecuteRate'></ev-implementation-rate>
                         </div>
                         <div class='ev-bottom-right'>
                             <p>

+ 9 - 7
src/views/strategy/animationBox.vue

@@ -3,17 +3,17 @@
         <div class='snapshotss-center2'>
             <div class='snapshotss-cont2-box1 MicrYaHei'>
                 <span>数据传输情况</span>
-                <span :class='data.isExecuted==true?"span1":"span2"'>
+                <span :class='data.energyErrorFlag!=1?"span1":"span2"'>
                     能耗
                     <img v-if='data.energyErrorFlag!=1' src='../../assets/finish.png' alt />
                     <img v-else src='../../assets/wrong.png' alt />
                 </span>
-                <span :class='data.isExecuted==true?"span1":"span2"'>
+                <span :class='data.environmentErrorFlag!=1?"span1":"span2"'>
                     环境
                     <img v-if='data.environmentErrorFlag!=1' src='../../assets/finish.png' alt />
                     <img v-else src='../../assets/wrong.png' alt />
                 </span>
-                <span :class='data.isExecuted==true?"span1":"span2"'>
+                <span :class='data.baErrorFalg!=1?"span1":"span2"'>
                     BA
                     <img v-if='data.baErrorFalg!=1' src='../../assets/finish.png' alt />
                     <img v-else src='../../assets/wrong.png' alt />
@@ -24,13 +24,15 @@
                 <span>
                     <font
                         :class='parseInt(data.nowPlantLoad)=="-9999"?"reds":""'
-                    >{{(data.nowPlantLoad==undefined)?'--':(parseInt(data.nowPlantLoad)=='-9999'?'x':(parseInt(data.nowPlantLoad)=='-9998'?'--':parseInt(data.nowPlantLoad)))}}</font> kW
+                    >{{(data.nowPlantLoad==undefined)?'--':(parseInt(data.nowPlantLoad)=='-9999'?'x':(parseInt(data.nowPlantLoad)=='-9998'?'--':parseInt(data.nowPlantLoad)))}}</font>
+                    <font style='font-size:12px;'>kw</font>
                 </span>
                 <span>未来1小时预测冷量</span>
                 <span>
                     <font
                         :class='parseInt(data.predictedLoad1h)=="-9999"?"reds":""'
-                    >{{(data.predictedLoad1h==undefined)?'--':(parseInt(data.predictedLoad1h)=='-9999'?'x':(parseInt(data.predictedLoad1h)=='-9998'?'--':parseInt(data.predictedLoad1h)))}}</font> kW
+                    >{{(data.predictedLoad1h==undefined)?'--':(parseInt(data.predictedLoad1h)=='-9999'?'x':(parseInt(data.predictedLoad1h)=='-9998'?'--':parseInt(data.predictedLoad1h)))}}</font>
+                    <font style='font-size:12px;'>kw</font>
                 </span>
             </div>
         </div>
@@ -52,9 +54,9 @@
             </div>
         </div>
 
-        <div class='side-r' :class='data.isExecuted==true?"green":"red"'>
+        <div class='side-r' :class='data.isExecuted?"green":"red"'>
             <div v-if='!showDraw' class='float-r' @click='showDraw = true'>
-                <div class='float-line' :class='data.isExecuted==true?"green":"red"'></div>
+                <div class='float-line' :class='data.isExecuted?"green":"red"'></div>
                 <img src='../../assets/open.png' alt />
                 <p>当前策略</p>
             </div>

+ 8 - 6
src/views/strategy/bomBox.vue

@@ -1,6 +1,6 @@
 <template>
     <div class='bomb'>
-        <div class='bomb-line' :class='data.isExecuted==true?"green":"red"'></div>
+        <div class='bomb-line' :class='data.isExecuted?"green":"red"'></div>
         <div class='close' @click='$emit("close")'>
             <img src='../../assets/close.png' alt />
         </div>
@@ -17,17 +17,17 @@
             <div class='snapshotss-center2'>
                 <div class='snapshotss-cont2-box1 MicrYaHei'>
                     <span>数据传输情况</span>
-                    <span :class='data.isExecuted==1?"span1":"span2"'>
+                    <span :class='data.energyErrorFlag!=1?"span1":"span2"'>
                         能耗
                         <img v-if='data.energyErrorFlag!=1' src='../../assets/finish.png' alt />
                         <img v-else src='../../assets/wrong.png' alt />
                     </span>
-                    <span :class='data.isExecuted==1?"span1":"span2"'>
+                    <span :class='data.environmentErrorFlag!=1?"span1":"span2"'>
                         环境
                         <img v-if='data.environmentErrorFlag!=1' src='../../assets/finish.png' alt />
                         <img v-else src='../../assets/wrong.png' alt />
                     </span>
-                    <span :class='data.isExecuted==1?"span1":"span2"'>
+                    <span :class='data.baErrorFalg!=1?"span1":"span2"'>
                         BA
                         <img v-if='data.baErrorFalg!=1' src='../../assets/finish.png' alt />
                         <img v-else src='../../assets/wrong.png' alt />
@@ -38,13 +38,15 @@
                     <span>
                         <font
                             :class='parseInt(data.nowPlantLoad)=="-9999"?"reds":""'
-                        >{{(data.nowPlantLoad==undefined)?'--':(parseInt(data.nowPlantLoad)=='-9999'?'x':(parseInt(data.nowPlantLoad)=='-9998'?'--':parseInt(data.nowPlantLoad)))}}</font> kW
+                        >{{(data.nowPlantLoad==undefined)?'--':(parseInt(data.nowPlantLoad)=='-9999'?'x':(parseInt(data.nowPlantLoad)=='-9998'?'--':parseInt(data.nowPlantLoad)))}}</font>
+                        <font style='font-size:12px;'>kw</font>
                     </span>
                     <span>未来1小时预测冷量</span>
                     <span>
                         <font
                             :class='parseInt(data.predictedLoad1h)=="-9999"?"reds":""'
-                        >{{(data.predictedLoad1h==undefined)?'--':(parseInt(data.predictedLoad1h)=='-9999'?'x':(parseInt(data.predictedLoad1h)=='-9998'?'--':parseInt(data.predictedLoad1h)))}}</font> kW
+                        >{{(data.predictedLoad1h==undefined)?'--':(parseInt(data.predictedLoad1h)=='-9999'?'x':(parseInt(data.predictedLoad1h)=='-9998'?'--':parseInt(data.predictedLoad1h)))}}</font>
+                        <font style='font-size:12px;'>kw</font>
                     </span>
                 </div>
             </div>

+ 1 - 1
src/views/strategy/index.vue

@@ -3,7 +3,7 @@
     <div>
         <Head :headText='headText'></Head>
         <div class='nav-right'>
-            <img class='nav-icon' v-if='chillerIsNotExecutedCount ' src='@/assets/shape.png' alt />
+            <img class='nav-icon' v-if='chillerIsNotExecutedCount!=undefined' src='@/assets/shape.png' alt />
             <span class='nav-text1' v-if='chillerIsNotExecutedCount!=undefined'>今日已收到 {{chillerCount}} 条策略,其中有 {{chillerIsNotExecutedCount}} 条未执行</span>
             <span class='nav-text' v-else>今天已收到 {{chillerCommand.chillerCount || 0}} 条策略</span>
             <span class='nav-look MicrYaHei' @click='lookSnapshot' v-if='parseInt(chillerCommand.chillerCount)||parseInt(chillerCount )> 0'>查看</span>

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

@@ -17,7 +17,7 @@
                         :class='data.chillWaterOutTempSetOrg=="-9999"?"reds":""'
                     >{{formatterRes(data.chillWaterOutTempSetOrg,true,1)}}</font>
                     <font v-if='type==2' :class='data.chillWaterOutTempSet=="-9999"?"reds":""'>{{formatterRes(data.chillWaterOutTempSet,true,1)}}</font>
-                    ℃
+                    <font style='font-size:12px;'></font>
                 </p>
             </div>
             <div class='starte-right-box-1-content'>
@@ -40,13 +40,13 @@
                 <p>
                     <font v-if='type==1' :class='data.coolPumpFreqSetOrg=="-9999"?"reds":""'>{{formatterRes(data.coolPumpFreqSetOrg,false,0)}}</font>
                     <font v-if='type==2' :class='data.coolPumpFreqSet=="-9999"?"reds":""'>{{formatterRes(data.coolPumpFreqSet,false,0)}}</font>
-                    HZ
+                    <font style='font-size:12px;'>Hz</font>
                 </p>
             </div>
             <div class='starte-right-box-1-content'>
                 <p>大</p>
                 <p>小</p>
-                <p>设定频率</p>
+                <p>运行频率</p>
             </div>
         </div>
         <div class='strate-right-box-1' :class='type==2?"content1":""'>
@@ -63,13 +63,13 @@
                 <p>
                     <font v-if='type==1' :class='data.chillPumpFreqSetOrg=="-9999"?"reds":""'>{{formatterRes(data.chillPumpFreqSetOrg,false,0)}}</font>
                     <font v-if='type==2' :class='data.chillPumpFreqSet=="-9999"?"reds":""'>{{formatterRes(data.chillPumpFreqSet,false,0)}}</font>
-                    HZ
+                    <font style='font-size:12px;'>Hz</font>
                 </p>
             </div>
             <div class='starte-right-box-1-content'>
                 <p>大</p>
                 <p>小</p>
-                <p>设定频率</p>
+                <p>运行频率</p>
             </div>
         </div>
         <div class='strate-right-box-1' :class='type==2?"content1":""'>
@@ -86,13 +86,13 @@
                 <p>
                     <font v-if='type==1' :class='data.coolTowerFreqSetOrg=="-9999"?"reds":""'>{{formatterRes(data.coolTowerFreqSetOrg,false,0)}}</font>
                     <font v-if='type==2' :class='data.coolTowerFreqSet=="-9999"?"reds":""'>{{formatterRes(data.coolTowerFreqSet,false,0)}}</font>
-                    HZ
+                    <font style='font-size:12px;'>Hz</font>
                 </p>
             </div>
             <div class='starte-right-box-1-content'>
                 <p>大</p>
                 <p>小</p>
-                <p>设定频率</p>
+                <p>运行频率</p>
             </div>
         </div>
     </div>