执行时间

src/components/todayStrategy.vue

@@ -8,7 +8,9 @@
                 >{{row.pushTime?timestamp2String(row.pushTime).slice(8,10)+":"+timestamp2String(row.pushTime).slice(10,12) : '--'}}</template>
             </el-table-column>
             <el-table-column prop='executeTime' label='策略执行时间' width='105'>
-                <template slot-scope='{row}'>{{row.executeTime?row.executeTime.slice(8,10)+":"+row.executeTime.slice(10,12):"--"}}</template>
+                <template slot-scope='{row}' v-if="row.onTime">{{row.onTime?row.onTime.slice(0,2)+":"+row.onTime.slice(2,4):"--"}}</template>
+                <template slot-scope='{row}' v-else-if="row.offTime">{{row.offTime?row.offTime.slice(0,2)+":"+row.offTime.slice(2,4):"--"}}</template>
+                <template slot-scope='{row}' v-else>{{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

src/views/evaluate/evCard.vue

@@ -1,7 +1,9 @@
 <template>
     <div class='count-card-box'>
         <div class='count-card' v-for='(item,index) in cardList' :key='index'>
-            <div class='card-div1'>执行时间：{{item.recommend?formatterStr2(item.recommend.time):'--'}}</div>
+            <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>