guoxiaohuan 5 years ago
parent
commit
aa58522df7
1 changed files with 11 additions and 7 deletions
  1. 11 7
      src/views/strategy/bomBox.vue

+ 11 - 7
src/views/strategy/bomBox.vue

@@ -6,17 +6,21 @@
         </div>
         <div class='bomb-left'>
             <div class='bomb-left1'>当前策略</div>
-            <div
+            <!-- <div
                 class='bomb-left2'
                 v-if='data.openTime'
-            >开机时间 {{data.onTime?(data.onTime.slice(0,2)+":"+ data.onTime.slice(2,4)):'--'}} - {{data.onTime?(data.onTime.slice(0,2)+":"+ data.onTime.slice(2,4)):'--'}}</div>
-            <div
+            >开机时间 {{data.onTime?(data.onTime.slice(0,2)+":"+ data.onTime.slice(2,4)):'--'}} - {{data.onTime?(data.onTime.slice(0,2)+":"+ data.onTime.slice(2,4)):'--'}}</div>-->
+            <!-- <div
                 class='bomb-left2'
                 v-else-if='data.offTime'
-            >关机时间 {{data.offTime?(data.offTime.slice(0,2)+":"+ data.offTime.slice(2,4)):'--'}} - {{data.offTime?(data.offTime.slice(0,2)+":"+ data.offTime.slice(2,4)):'--'}}</div>
-            <div
-                class='bomb-left2'
-            >应执行时间 {{data.executeTime?(data.executeTime.slice(8,10)+":"+ data.executeTime.slice(10,12)):'--'}} - {{data.executeTime?(data.executeTime.slice(8,10)+":"+ data.executeTime.slice(10,12)):'--'}}</div>
+            >关机时间 {{data.offTime?(data.offTime.slice(0,2)+":"+ data.offTime.slice(2,4)):'--'}} - {{data.offTime?(data.offTime.slice(0,2)+":"+ data.offTime.slice(2,4)):'--'}}</div>-->
+            <div class='bomb-left2'>
+                应执行时间
+                <span v-if='data.onTime'>{{data.onTime?data.onTime.slice(0,2)+":"+data.onTime.slice(2,4):"--"}}</span>
+                <span v-else-if='data.offTime'>{{data.offTime?data.offTime.slice(0,2)+":"+data.offTime.slice(2,4):"--"}}</span>
+                <span v-else>{{data.executeTime?data.executeTime.slice(8,10)+":"+data.executeTime.slice(10,12):"--"}}</span>
+                <!-- {{data.executeTime?(data.executeTime.slice(8,10)+":"+ data.executeTime.slice(10,12)):'--'}} - {{data.executeTime?(data.executeTime.slice(8,10)+":"+ data.executeTime.slice(10,12)):'--'}} -->
+            </div>
             <div class='bomb-left3'>策略可靠度</div>
             <div id='circleEcharts' style='width:170px;height:204px'></div>
         </div>