guoxiaohuan 5 éve
szülő
commit
21895a108d

+ 4 - 4
src/components/todayStrategy.vue

@@ -11,19 +11,19 @@
                 <template slot-scope='{row}'>{{row.executeTime?row.executeTime.slice(8,10)+":"+row.executeTime.slice(10,12):"--"}}</template>
             </el-table-column>
             <el-table-column prop label='冷水机组开启台数' min-width='85'>
-                <template slot-scope='{row}'>{{formatterRes(row.chillerNumSetL,true,0)+formatterRes(row.chillerNumSetS,true,0)}}</template>
+                <template slot-scope='{row}'>{{Number(formatterRes(row.chillerNumSetL,true,0))+Number(formatterRes(row.chillerNumSetS,true,0))}}</template>
             </el-table-column>
             <el-table-column prop='chillWaterOutTempSet' label='出水温度设定值' min-width='75'>
                 <template slot-scope='{row}'>{{formatterRes(row.chillWaterOutTempSet,false,1)}}</template>
             </el-table-column>
             <el-table-column prop label='冷冻泵开启台数' min-width='75'>
-                <template slot-scope='{row}'>{{formatterRes(row.coolPumpNumSetL,true,0)+formatterRes(row.coolPumpNumSetS,true,0)}}</template>
+                <template slot-scope='{row}'>{{Number(formatterRes(row.coolPumpNumSetL,true,0))+Number(formatterRes(row.coolPumpNumSetS,true,0))}}</template>
             </el-table-column>
             <el-table-column prop label='冷却泵开启台数' min-width='75'>
-                <template slot-scope='{row}'>{{formatterRes(row.chillPumpNumSetL,true,0)+formatterRes(row.chillPumpNumSetS,true,0)}}</template>
+                <template slot-scope='{row}'>{{Number(formatterRes(row.chillPumpNumSetL,true,0))+Number(formatterRes(row.chillPumpNumSetS,true,0))}}</template>
             </el-table-column>
             <el-table-column prop label='冷却塔开启组数' min-width='75'>
-                <template slot-scope='{row}'>{{formatterRes(row.coolTowerNumSetL,true,0)+formatterRes(row.coolTowerNumSetS,true,0)}}</template>
+                <template slot-scope='{row}'>{{Number(formatterRes(row.coolTowerNumSetL,true,0))+Number(formatterRes(row.coolTowerNumSetS,true,0))}}</template>
             </el-table-column>
             <el-table-column prop='zip' label='通风策略' width='80'>
                 <template slot-scope='{row}'>无</template>

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

@@ -52,7 +52,7 @@
             </div>
         </div>
 
-        <div class='side-r' :class='data.isExecuted==true?"green":"red"' v-if='data.isExecuted'>
+        <div class='side-r' :class='data.isExecuted==true?"green":"red"'>
             <div v-if='!showDraw' class='float-r' @click='showDraw = true'>
                 <div class='float-line' :class='data.isExecuted==true?"green":"red"'></div>
                 <img src='../../assets/open.png' alt />