Merge branch 'master' of http://120.26.64.82:10880/BFFE/SZYGM1.0

src/views/dashboard/index.vue

@@ -95,7 +95,7 @@
                     <div class="dashboard-content-top-center-bottom-content-bottom-list-txt">{{ item.airport }}</div>
                     <div class="dashboard-content-top-center-bottom-content-bottom-list-txt">{{ item.planTime }}</div>
                     <!-- <div class="dashboard-content-top-center-bottom-content-bottom-list-txt">{{ item.acTime }}</div> -->
-                    <div class="dashboard-content-top-center-bottom-content-bottom-list-txt">{{ item.preTime }}</div>
+                    <div class="dashboard-content-top-center-bottom-content-bottom-list-txt">{{ item.preTime ? item.preTime : '--' }}</div>
                     <div class="dashboard-content-top-center-bottom-content-bottom-list-txt">{{ item.planeType }}</div>
                     <div class="dashboard-content-top-center-bottom-content-bottom-list-txt">{{ item.KHT }}</div>
                   </div>

src/views/dashboard/indexHomeOut.vue

@@ -94,7 +94,7 @@
                     <div class="dashboard-content-top-center-bottom-content-bottom-list-txt">{{ item.flightState }}</div>
                     <div class="dashboard-content-top-center-bottom-content-bottom-list-txt">{{ item.airport }}</div>
                     <div class="dashboard-content-top-center-bottom-content-bottom-list-txt">{{ item.planTime }}</div>
-                    <div class="dashboard-content-top-center-bottom-content-bottom-list-txt">{{ item.preTime }}</div>
+                    <div class="dashboard-content-top-center-bottom-content-bottom-list-txt">{{ item.preTime ? item.preTime : '--'}}</div>
                     <div class="dashboard-content-top-center-bottom-content-bottom-list-txt">{{ item.planeType }}</div>
                     <div class="dashboard-content-top-center-bottom-content-bottom-list-txt">{{ item.KHT }}</div>
                   </div>

src/views/dashboard/indexIn.vue

@@ -134,7 +134,7 @@
                       {{ item.acTime }}
                     </div> -->
                     <div class="dashboard-content-top-center-bottom-content-bottom-list-txt">
-                      {{ item.preTime }}
+                      {{ item.preTime ? item.preTime : '--'}}
                     </div>
                     <div class="dashboard-content-top-center-bottom-content-bottom-list-txt">
                       {{ item.planeType }}

src/views/dashboard/indexOut.vue

@@ -131,7 +131,7 @@
                       {{ item.planTime }}
                     </div>
                     <div class="dashboard-content-top-center-bottom-content-bottom-list-txt">
-                      {{ item.preTime }}
+                      {{ item.preTime ? item.preTime : '--' }}
                     </div>
                     <div class="dashboard-content-top-center-bottom-content-bottom-list-txt">
                       {{ item.planeType }}