Skip to content

李君 / carrefour

Go to a project
Commit ed0da9d6 by 李君
Options

优化

1 parent 1b086577
Inline Side-by-side
Showing 2 changed files with 14 additions and 13 deletions
src/views/queueManagement/dataPlayback/index.vue
...@@ -117,15 +117,15 @@ ...@@ -117,15 +117,15 @@
</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='Lane' align="center" width="80"> <el-table-column prop="laneName" show-overflow-tooltip label='Lane' align="center" width="100">
</el-table-column> </el-table-column>
<el-table-column prop="customersInQueue" align="center" label="Customers in Queue" width="90"> <el-table-column prop="customersInQueue" align="center" label="Customers in Queue" width="80">
<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>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="averageWaitingTime" align="center" label="AVG.Waiting Time" width="100"> <el-table-column prop="averageWaitingTime" align="center" label="AVG.Waiting Time" width="90">
<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>
...@@ -192,6 +192,7 @@ ...@@ -192,6 +192,7 @@
data() { data() {
return { return {
laneName:'', laneName:'',
laneId: null,
isloading: false, isloading: false,
tableData: [], tableData: [],
chart_left: null, chart_left: null,
...@@ -341,7 +342,7 @@ ...@@ -341,7 +342,7 @@
this.chart_right = echarts.init(document.getElementById("chart_right")); this.chart_right = echarts.init(document.getElementById("chart_right"));
this.canvas = document.getElementById("container"); this.canvas = document.getElementById("container");
this.ctx = this.canvas.getContext("2d"); this.ctx = this.canvas.getContext("2d");
this.canvas.width = document.body.clientWidth - 248; this.canvas.width = document.body.clientWidth - 245;
this.canvas.height = 280; this.canvas.height = 280;
this.widthX = (1920 / this.canvas.width).toFixed(2); this.widthX = (1920 / this.canvas.width).toFixed(2);
this.heightX = (1080 / this.canvas.height).toFixed(2); this.heightX = (1080 / this.canvas.height).toFixed(2);
...@@ -420,6 +421,7 @@ ...@@ -420,6 +421,7 @@
mallId: this.searchForm.mallId, mallId: this.searchForm.mallId,
chartType: "line", chartType: "line",
countDate: moment(this.searchForm.countDate).format('YYYY-MM-DD'), countDate: moment(this.searchForm.countDate).format('YYYY-MM-DD'),
cashierChannelId: this.laneId,
}); });
let { code, data } = res.data; let { code, data } = res.data;
...@@ -711,10 +713,8 @@ ...@@ -711,10 +713,8 @@
<style scoped="scoped" lang="less"> <style scoped="scoped" lang="less">
.queueManagementContainer{ .queueManagementContainer{
position: relative; position: relative;
position: relative;
height: 100%; height: 100%;
padding: 0 8px 0px 10px; // padding: 0 8px 0px 10px;
overflow: hidden; overflow: hidden;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
...@@ -732,7 +732,7 @@ ...@@ -732,7 +732,7 @@
margin-bottom: 10px; margin-bottom: 10px;
flex: 1; flex: 1;
&:last-child{ &:last-child{
margin-right: 5px; margin-right: 0px;
} }
.aiot_title_item_text { .aiot_title_item_text {
font-size: 14px; font-size: 14px;
...@@ -814,7 +814,7 @@ ...@@ -814,7 +814,7 @@
} }
.chart { .chart {
// overflow: hidden; // overflow: hidden;
width: 45%; width: calc(45% - 18px);
height: 100%; height: 100%;
.chartLine{ .chartLine{
width: 100%; width: 100%;
......
src/views/queueManagement/queueLive/index.vue
...@@ -84,15 +84,15 @@ ...@@ -84,15 +84,15 @@
</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='Lane' align="center" width="80"> <el-table-column prop="laneName" show-overflow-tooltip label='Lane' align="center" width="100">
</el-table-column> </el-table-column>
<el-table-column prop="customersInQueue" align="center" label="Customers in Queue" width="90"> <el-table-column prop="customersInQueue" align="center" label="Customers in Queue" width="80">
<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>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="averageWaitingTime" align="center" label="AVG.Waiting Time" width="100"> <el-table-column prop="averageWaitingTime" align="center" label="AVG.Waiting Time" width="90">
<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>
...@@ -667,6 +667,7 @@ export default { ...@@ -667,6 +667,7 @@ export default {
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
display: flex; display: flex;
padding: 0 8px 0px 10px;
flex-direction: column; flex-direction: column;
// justify-content: space-between; // justify-content: space-between;
color: #555; color: #555;
...@@ -764,7 +765,7 @@ export default { ...@@ -764,7 +765,7 @@ export default {
} }
.chart { .chart {
// overflow: hidden; // overflow: hidden;
width: 45%; width: calc(45% - 18px);
height: 100%; height: 100%;
.chartLine{ .chartLine{
width: 100%; width: 100%;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!