优化

src/views/queueManagement/dataPlayback/index.vue

@@ -50,6 +50,10 @@
                 <div class="aiot_title_item_num">{{topData.customersInQueue}}</div>
               </div>
               <div class="aiot_title_item">
+                <div class="aiot_title_item_text"> Carts & Baskets</div>
+                <div class="aiot_title_item_num">{{topData.carts}}</div>
+              </div>
+              <div class="aiot_title_item">
                 <div class="aiot_title_item_text">Average Waiting Time</div>
                 <div class="aiot_title_item_num">{{topData.averageWaitingTime[0]}}<small style="marginRight:5px">min</small>{{topData.averageWaitingTime[1]}}<small style="marginLeft:4px">s</small></div>
               </div>
@@ -65,10 +69,7 @@
                 <div class="aiot_title_item_text">Estimated Waiting Time</div>
                 <div class="aiot_title_item_num">{{topData.predictedWaiting[0]}}<small style="marginRight:5px">min</small>{{topData.predictedWaiting[1]}}<small style="marginLeft:4px">s</small></div>
               </div>
-              <div class="aiot_title_item">
-                <div class="aiot_title_item_text">Open Counters</div>
-                <div class="aiot_title_item_num">{{topData.openCounters}}/{{topData.totalCounters}}</div>
-              </div>
+
             </div>
             <div class="aiot_title">
               <div class="aiot_title_item">
@@ -84,8 +85,8 @@
                 <div class="aiot_title_item_num">{{topData.customersAbandonedQueue}}</div>
               </div>
               <div class="aiot_title_item">
-                <div class="aiot_title_item_text"> Carts & Baskets</div>
-                <div class="aiot_title_item_num">{{topData.carts}}</div>
+                <div class="aiot_title_item_text">Open Counters</div>
+                <div class="aiot_title_item_num">{{topData.openCounters}}/{{topData.totalCounters}}</div>
               </div>
               <!-- <div class="aiot_title_item">
                 <div class="aiot_title_item_text">Crowded Counters</div>
@@ -127,6 +128,11 @@
                 </div>
                 <el-table :data="tableData" ref="laneTable" style="width: 100%" :row-class-name="tableRowClassName" height='calc(100% - 30px)' highlight-current-row @row-click="handleCurrentChange" row-key='laneId'>
                   <el-table-column prop="laneName" show-overflow-tooltip label='Lane' align="center" width="100">
+                    <template slot-scope="{row}">
+                      <span v-if="row.isOpen==1"><img src="../../../assets/open.png" style="width: 15px;vertical-align: middle;" /></span>
+                      <span v-else><img src="../../../assets/close.png" style="width: 15px;vertical-align: middle;" /></span>
+                      <span>{{row.laneName}}</span>
+                    </template>
                   </el-table-column>
                   <el-table-column prop="customersInQueue" align="center" label="Customers in Queue" width="80">
                       <template slot="header">
@@ -201,6 +207,11 @@
           <div v-if="openDialogType=='table'">
             <el-table :data="tableData" style="width: 100%" :row-class-name="tableRowClassName" :height='tableHeight' highlight-current-row @row-click="handleCurrentChange" row-key='laneId'>
               <el-table-column prop="laneName" show-overflow-tooltip label='Lane' align="center" >
+                <template slot-scope="{row}">
+                  <span v-if="row.isOpen==1"><img src="../../../assets/open.png" style="width: 15px;vertical-align: middle;" /></span>
+                  <span v-else><img src="../../../assets/close.png" style="width: 15px;vertical-align: middle;" /></span>
+                  <span>{{row.laneName}}</span>
+                </template>
               </el-table-column>
               <el-table-column prop="customersInQueue" align="center" label="Customers in Queue">
                   <template slot="header">

src/views/queueManagement/queueLive/index.vue

@@ -14,6 +14,10 @@
           <div class="aiot_title_item_num">{{topData.customersInQueue}}</div>
         </div>
         <div class="aiot_title_item">
+          <div class="aiot_title_item_text"> Carts & Baskets</div>
+          <div class="aiot_title_item_num">{{topData.carts}}</div>
+        </div>
+        <div class="aiot_title_item">
           <div class="aiot_title_item_text">Average Waiting Time</div>
           <div class="aiot_title_item_num">{{topData.averageWaitingTime[0]}}<small style="marginRight:5px">min</small>{{topData.averageWaitingTime[1]}}<small style="marginLeft:4px">s</small></div>
         </div>
@@ -29,10 +33,7 @@
           <div class="aiot_title_item_text">Estimated Waiting Time</div>
           <div class="aiot_title_item_num">{{topData.predictedWaiting[0]}}<small style="marginRight:5px">min</small>{{topData.predictedWaiting[1]}}<small style="marginLeft:4px">s</small></div>
         </div>
-        <div class="aiot_title_item">
-          <div class="aiot_title_item_text">Open Counters</div>
-          <div class="aiot_title_item_num">{{topData.openCounters}}/{{topData.totalCounters}}</div>
-        </div>
+
       </div>
       <div class="aiot_title">
         <div class="aiot_title_item">
@@ -48,9 +49,10 @@
           <div class="aiot_title_item_num">{{topData.customersAbandonedQueue}}</div>
         </div>
         <div class="aiot_title_item">
-          <div class="aiot_title_item_text"> Carts & Baskets</div>
-          <div class="aiot_title_item_num">{{topData.carts}}</div>
+          <div class="aiot_title_item_text">Open Counters</div>
+          <div class="aiot_title_item_num">{{topData.openCounters}}/{{topData.totalCounters}}</div>
         </div>
+
         <!-- <div class="aiot_title_item">
           <div class="aiot_title_item_text">Crowded Counters</div>
           <div class="aiot_title_item_num">0</div>
@@ -165,7 +167,12 @@
     <el-dialog :title="$t('button.details')" :visible.sync="dialogShow" v-if="dialogShow" width="80%" :close-on-click-modal='false' class="manage-dialog dialog_lj" :before-close="closeDialog">
       <div v-if="openDialogType=='table'">
         <el-table :data="tableData" style="width: 100%" :row-class-name="tableRowClassName" :height='tableHeight' highlight-current-row @row-click="handleCurrentChange" row-key='laneId'>
-          <el-table-column prop="laneName" show-overflow-tooltip label='Lane' align="center" >
+          <el-table-column prop="laneName" show-overflow-tooltip label='Lane' align="center">
+            <template slot-scope="{row}">
+              <span v-if="row.isOpen==1"><img src="../../../assets/open.png" style="width: 15px;vertical-align: middle;" /></span>
+              <span v-else><img src="../../../assets/close.png" style="width: 15px;vertical-align: middle;" /></span>
+              <span>{{row.laneName}}</span>
+            </template>
           </el-table-column>
           <el-table-column prop="customersInQueue" align="center" label="Customers in Queue">
               <template slot="header">
@@ -369,10 +376,11 @@ export default {
     this.time1 = setInterval(() => {
         this.updateTime = moment().format("YYYY-MM-DD HH:mm:ss");
         this.getDistribution();
-    }, 1000);
-    this.time3 = setInterval(() => {
         this.getStatistics();
-    }, 10000);
+    }, 1000);
+    // this.time3 = setInterval(() => {
+    //     this.getStatistics();
+    // }, 10000);
     this.time2 = setInterval(() => {
       this.getchart(false);
       this.getCustomersOverview()