zhulizhen 5 лет назад
Родитель
Сommit
6316ba4ffa

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

@@ -26,7 +26,7 @@
             <div class="snapshotss-cont-bot-1">
               <span>{{chillerOrg.chillerNumSetLOrg || 0}}</span>
               <span>{{chillerOrg.chillerNumSetSOrg || 0}}</span>
-              <span>{{chillerOrg.chillWaterOutTempSetOrg || 0}} °C</span>
+              <span>{{chillerOrg.chillWaterOutTempSetOrg?chillerOrg.chillWaterOutTempSetOrg.toFixed(1):'--'}} °C</span>
             </div>
             <div class="snapshotss-cont-bot-2 MicrYaHei">
               <span>大</span>
@@ -41,7 +41,7 @@
             <div class="snapshotss-cont-bot-1">
               <span>{{chillerOrg.coolPumpNumSetLOrg || 0}}</span>
               <span>{{chillerOrg.coolPumpNumSetSOrg || 0}}</span>
-              <span>{{chillerOrg.coolPumpFreqSetOrg || 0}} Hz</span>
+              <span>{{chillerOrg.coolPumpFreqSetOrg?chillerOrg.coolPumpFreqSetOrg.toFixed(0):'--'}} Hz</span>
             </div>
             <div class="snapshotss-cont-bot-2">
               <span>大</span>
@@ -56,7 +56,7 @@
             <div class="snapshotss-cont-bot-1">
               <span>{{chillerOrg.chillPumpNumSetLOrg || 0}}</span>
               <span>{{chillerOrg.chillPumpNumSetSOrg || 0}}</span>
-              <span>{{chillerOrg.chillPumpFreqSetOrg || 0}} Hz</span>
+              <span>{{chillerOrg.chillPumpFreqSetOrg?chillerOrg.chillPumpFreqSetOrg.toFixed(0):'--'}} Hz</span>
             </div>
             <div class="snapshotss-cont-bot-2">
               <span>大</span>
@@ -71,7 +71,7 @@
             <div class="snapshotss-cont-bot-1">
               <span>{{chillerOrg.coolTowerNumSetLOrg || 0}}</span>
               <span>{{chillerOrg.coolTowerNumSetSOrg || 0}}</span>
-              <span>{{chillerOrg.coolTowerFreqSet || 0}} Hz</span>
+              <span>{{chillerOrg.coolTowerFreqSet?chillerOrg.coolTowerFreqSet.toFixed(0):'--'}} Hz</span>
             </div>
             <div class="snapshotss-cont-bot-2">
               <span>大</span>
@@ -103,9 +103,9 @@
       </div>
       <div class="snapshotss-cont2-box2 MicrYaHei">
         <span>实际冷量</span>
-        <span>{{chillerCommand.nowPlantLoad || 0}} KW</span>
+        <span>{{chillerCommand.nowPlantLoad?parseInt(chillerCommand.nowPlantLoad):'--'}} KW</span>
         <span>未来1小时预测冷量</span>
-        <span>{{chillerCommand.predictedLoad1h || 0}} KW</span>
+        <span>{{chillerCommand.predictedLoad1h?parseInt(chillerCommand.predictedLoad1h):'--'}} KW</span>
       </div>
     </div>
     <div class="snapshotss-foot">
@@ -545,7 +545,7 @@ export default {
 <style lang="scss" scoped>
 .snapshotss-box {
   .snapshotss-top {
-    padding: 0 40px;
+    padding: 0 20px;
     display: flex;
     align-items: center;
     margin-bottom: 40px;
@@ -572,7 +572,7 @@ export default {
     }
   }
   .snapshotss-center1 {
-    padding: 0 40px;
+    padding: 0 20px;
     margin-bottom: 20px;
     .snapshotss-center1-title {
       height: 24px;
@@ -598,7 +598,7 @@ export default {
           padding-left: 20px;
         }
         .snapshotss-cont-bottom {
-          padding: 14px 36px;
+          padding: 14px 20px;
           .snapshotss-cont-bot-1 {
             display: flex;
             justify-content: space-between;
@@ -606,13 +606,13 @@ export default {
             margin-bottom: 4px;
             span {
               height: 32px;
-              font-size: 24px;
+              font-size: 20px;
               font-family: Persagy;
               color: rgba(31, 36, 41, 1);
               line-height: 29px;
             }
             span:nth-of-type(2) {
-              margin: 0 50px;
+              margin: 0 20px;
             }
           }
           .snapshotss-cont-bot-2 {
@@ -631,7 +631,7 @@ export default {
     }
   }
   .snapshotss-center2 {
-    padding: 0 40px;
+    padding: 0 20px;
     margin-bottom: 44px;
     display: flex;
     align-items: center;

+ 2 - 2
src/views/strategy/animationBox.vue

@@ -21,9 +21,9 @@
             </div>
             <div class='snapshotss-cont2-box2 MicrYaHei'>
                 <span>实际冷量</span>
-                <span>{{data.nowPlantLoad || 0}} KW</span>
+                <span>{{data.nowPlantLoad?parseInt(data.nowPlantLoad):'--'}} KW</span>
                 <span>未来1小时预测冷量</span>
-                <span>{{data.predictedLoad1h || 0}} KW</span>
+                <span>{{data.predictedLoad1h?parseInt(data.predictedLoad1h):'--'}} KW</span>
             </div>
         </div>
         <div class='an-bottom'>

+ 2 - 2
src/views/strategy/bomBox.vue

@@ -35,9 +35,9 @@
                 </div>
                 <div class='snapshotss-cont2-box2 MicrYaHei'>
                     <span>实际冷量</span>
-                    <span>{{data.nowPlantLoad || 0}} KW</span>
+                    <span>{{data.nowPlantLoad?parseInt(data.nowPlantLoad):'--'}} KW</span>
                     <span>未来1小时预测冷量</span>
-                    <span>{{data.predictedLoad1h || 0}} KW</span>
+                    <span>{{data.predictedLoad1h?parseInt(data.predictedLoad1h):'--'}} KW</span>
                 </div>
             </div>
             <div class='bomb-right-bottom'>

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

@@ -5,7 +5,7 @@
             <div class="starte-right-box-1-content1">
               <p>{{data.chillerNumSetL || 0}}</p>
               <p>{{data.chillerNumSetS || 0}}</p>
-              <p>{{data.chillWaterOutTempSet || 0}} ℃</p>
+              <p>{{data.chillWaterOutTempSet?data.chillWaterOutTempSet.toFixed(1):'--'}} ℃</p>
             </div>
              <div class="starte-right-box-1-content">
               <p>大</p>
@@ -18,7 +18,7 @@
             <div class="starte-right-box-1-content1" >
               <p>{{data.coolPumpNumSetL || 0}}</p>
               <p>{{data.coolPumpNumSetS || 0}}</p>
-              <p>{{data.coolPumpFreqSet || 0}} HZ</p>
+              <p>{{data.coolPumpFreqSet?data.coolPumpFreqSet.toFixed(0):'--'}} HZ</p>
             </div>
              <div class="starte-right-box-1-content">
               <p>大</p>
@@ -31,7 +31,7 @@
             <div class="starte-right-box-1-content1">
               <p>{{data.chillPumpNumSetL || 0}}</p>
               <p>{{data.chillPumpNumSetS || 0}}</p>
-              <p>{{data.chillPumpFreqSet || 0}} HZ</p>
+              <p>{{data.chillPumpFreqSet?data.chillPumpFreqSet.toFixed(0):'--'}} HZ</p>
             </div>
              <div class="starte-right-box-1-content">
               <p>大</p>
@@ -44,7 +44,7 @@
             <div class="starte-right-box-1-content1">
               <p>{{data.coolTowerNumSetL || 0}}</p>
               <p>{{data.coolTowerNumSetS || 0}}</p>
-              <p>{{data.coolTowerFreqSet || 0}} HZ</p>
+              <p>{{data.coolTowerFreqSet?data.coolTowerFreqSet.toFixed(0):'--'}} HZ</p>
             </div>
              <div class="starte-right-box-1-content">
               <p>大</p>