Просмотр исходного кода

Merge branch 'master' of git.sagacloud.cn:sagacloud/sagacloud-cwc-pages

guoxiaohuan 5 лет назад
Родитель
Сommit
d3443e6df2
2 измененных файлов с 17 добавлено и 3 удалено
  1. 7 1
      src/components/todayStrategy.vue
  2. 10 2
      src/views/evaluate/evCard.vue

+ 7 - 1
src/components/todayStrategy.vue

@@ -8,7 +8,13 @@
                 >{{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}'>
+                    <span v-if="row.onTime">{{row.onTime?row.onTime.slice(0,2)+":"+row.onTime.slice(2,4):"--"}} </span>
+                    <span v-else-if="row.offTime">{{row.offTime?row.offTime.slice(0,2)+":"+row.offTime.slice(2,4):"--"}}</span>
+                    <span v-else>
+                        {{row.executeTime?row.executeTime.slice(8,10)+":"+row.executeTime.slice(10,12):"--"}}
+                    </span>
+                </template>
             </el-table-column>
             <el-table-column prop label='冷水机组开启台数' min-width='85'>
                 <template

+ 10 - 2
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>
@@ -48,7 +50,7 @@
                     <img src='../../assets/completed.png' alt />
                     已按策略执行
                 </span>
-                <template v-else v-for='(item1,index) in titles'>
+                <template v-else-if="item.recommend.appealId" v-for='(item1,index) in titles'>
                     <template v-if='item1.id==item.recommend.appealId'>
                         <span class='card-div8' v-if='item1.status==302' :key='"l"+index'>
                             <img src='../../assets/processing.png' alt />
@@ -60,6 +62,12 @@
                         </span>
                     </template>
                 </template>
+                <template v-else>
+                    <span class='card-div6' :key='"l"+index'>
+                        <img src='../../assets/error.png' alt />
+                        未按策略执行
+                    </span>
+                </template>
                 <span></span>
                 <span class='MicrYaHei' @click='lookQuickData(item)' style>查看快照</span>
             </div>