Skip to content

李君 / carrefour

Go to a project
Commit 1b086577 by 李君
Options

优化

1 parent 0e99bfad
Expand all
Inline Side-by-side
Showing 2 changed files with 16 additions and 31 deletions
src/views/queueManagement/queueLive/index.vue
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
<div class="aiot_title_item"> <div class="aiot_title_item">
<div class="aiot_title_item_text">Customers in Queue<span class="aiot_title_item_unit">(Customers)</span></div> <div class="aiot_title_item_text">Customers in Queue<span class="aiot_title_item_unit">(Customers)</span></div>
<div class="aiot_title_item_num">{{topData.customersInQueue}}</div> <div class="aiot_title_item_num">{{topData.customersInQueue}}</div>
<!-- <div class="aiot_title_item_unit"></div> -->
</div> </div>
<div class="aiot_title_item"> <div class="aiot_title_item">
<div class="aiot_title_item_text">Average Waiting Time</div> <div class="aiot_title_item_text">Average Waiting Time</div>
...@@ -85,55 +84,36 @@ ...@@ -85,55 +84,36 @@
</div> </div>
</div> </div>
<el-table :data="tableData" style="width: 100%" :row-class-name="tableRowClassName" height='calc(100% - 30px)' highlight-current-row @row-click="handleCurrentChange" row-key='laneId'> <el-table :data="tableData" 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" :label="$t('table.laneName')" width="100"></el-table-column> <el-table-column prop="laneName" label='Lane' align="center" width="80">
<el-table-column prop="queueLength" :label="$t('table.queueLength')" width="130"></el-table-column>
<el-table-column prop="name" :label="$t('home.averagewaitingtime')">
<template slot-scope="{row}">
<span>{{Math.floor(row.averageWaitingTime/60)}}min{{row.averageWaitingTime%60}}s</span>
</template>
</el-table-column>
<el-table-column prop="address" :label="$t('home.predictedwaiting')">
<template slot-scope="{row}">
<span>{{Math.floor(row.predictedWaiting/60)}}min{{row.predictedWaiting%60}}s</span>
</template>
</el-table-column> -->
<el-table-column prop="laneName" label='Lane' align="center" width="100">
<!-- <template slot-scope="{row}">
<span v-if="row.customersInQueue>warningNum"><img style="width: 16px;" src="../../../assets/img/warning.png" alt=""></span>
<span>{{row.laneName}}</span>
</template> -->
</el-table-column> </el-table-column>
<el-table-column prop="customersInQueue" align="center" label="Customers in Queue" width="120"> <el-table-column prop="customersInQueue" align="center" label="Customers in Queue" width="90">
<template slot="header"> <template slot="header">
<p class="cell_title">Customers</p> <p class="cell_title">Customers</p>
<p class="cell_title">in Queue</p> <p class="cell_title">in Queue</p>
<!-- <p class="cell_unit">Customers</p> -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="averageWaitingTime" align="center" label="AVG.Waiting Time"> <el-table-column prop="averageWaitingTime" align="center" label="AVG.Waiting Time" width="100">
<template slot="header"> <template slot="header">
<p class="cell_title">AVG.Waiting</p> <p class="cell_title">AVG.Waiting</p>
<p class="cell_title">Time</p> <p class="cell_title">Time</p>
<!-- <p class="cell_unit">Time</p> -->
</template> </template>
<template slot-scope="{row}"> <template slot-scope="{row}">
<span>{{Math.floor(row.averageWaitingTime/60)}}min{{row.averageWaitingTime%60}}s</span> <span>{{Math.floor(row.averageWaitingTime/60)}}min{{row.averageWaitingTime%60}}s</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="predictedWaiting" align="center" label="Predicted Waiting Time"> <el-table-column prop="predictedWaiting" align="center" label="Predicted Waiting Time" width="110">
<template slot="header"> <template slot="header">
<p class="cell_title">Estimated</p> <p class="cell_title">Estimated</p>
<p class="cell_title">Waiting Time</p> <p class="cell_title">Waiting Time</p>
<!-- <p class="cell_unit">Time</p> -->
</template> </template>
<template slot-scope="{row}"> <template slot-scope="{row}">
<span>{{Math.floor(row.predictedWaiting/60)}}min{{row.predictedWaiting%60}}s</span> <span>{{Math.floor(row.predictedWaiting/60)}}min{{row.predictedWaiting%60}}s</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="customersServedTillNow" align="center" label="Customers Served" width="160"> <el-table-column prop="customersServedTillNow" align="center" label="Customers Served" width="80">
<template slot="header"> <template slot="header">
<p class="cell_title">Customers Served</p> <p class="cell_title">Customers</p>
<!-- <p class="cell_unit">Customers</p> --> <p class="cell_title">Served</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="throughput" align="center" width="160" label="Throughput"> <el-table-column prop="throughput" align="center" width="160" label="Throughput">
...@@ -143,7 +123,13 @@ ...@@ -143,7 +123,13 @@
<!-- <p class="cell_unit">Customers/hour</p> --> <!-- <p class="cell_unit">Customers/hour</p> -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="counterType" show-overflow-tooltip align="center" label="Lane Type" :formatter="formatCounterType" :filters="counterTypeData" <el-table-column prop="throughput" align="center" width="180">
<template slot="header">
<p class="cell_title">Customers Abandoned</p>
<p class="cell_title">the Queue</p>
</template>
</el-table-column>
<el-table-column prop="counterType" show-overflow-tooltip align="center" width="120" label="Lane Type" :formatter="formatCounterType" :filters="counterTypeData"
:filter-method="filterTag"></el-table-column> :filter-method="filterTag"></el-table-column>
</el-table> </el-table>
</div> </div>
...@@ -679,7 +665,6 @@ export default { ...@@ -679,7 +665,6 @@ export default {
.aiot_content { .aiot_content {
position: relative; position: relative;
height: 100%; height: 100%;
padding: 0 8px 0px 10px;
overflow: hidden; overflow: hidden;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
...@@ -800,10 +785,10 @@ export default { ...@@ -800,10 +785,10 @@ export default {
} }
/deep/.el-table{ /deep/.el-table{
.el-table__cell{ .el-table__cell{
padding: 5px 0; padding: 5px 0 !important;
} }
.cell{ .cell{
text-overflow:ellipsis !important text-overflow:ellipsis !important;
} }
.el-table__column-filter-trigger i{ .el-table__column-filter-trigger i{
color: #333; color: #333;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!