From a6842851a844e63a8766d63c5410a8e2f27a7d45 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期二, 20 八月 2024 11:56:30 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/views/screen/components/screen-table/index.vue | 41 ++++++++--------------------------------- 1 files changed, 8 insertions(+), 33 deletions(-) diff --git a/src/views/screen/components/screen-table/index.vue b/src/views/screen/components/screen-table/index.vue index 4400918..be0de28 100644 --- a/src/views/screen/components/screen-table/index.vue +++ b/src/views/screen/components/screen-table/index.vue @@ -6,13 +6,7 @@ ></wrapper-title> --> <div class="table-content" ref="tabContent"> <div class="table-wrapper"> - <el-table - :data="tableData" - border - :height="tableHeight" - :max-height="tableHeight" - class="rank-table" - > + <el-table :data="tableData" border :height="tableHeight" :max-height="tableHeight" class="rank-table"> <el-table-column prop="area" label="鍦板尯" align="center" width="100"> </el-table-column> @@ -34,12 +28,7 @@ </div> </div> <div class="tip-num"> - {{ - scope.row.faceRate?( - (scope.row.faceNormalNum / scope.row.faceRate) * - 100 - ).toFixed(0)+'%':'--' - }} + {{ scope.row.faceRate ? scope.row.faceRate + '%' : '--' }} </div> </el-tooltip> </template> @@ -58,17 +47,12 @@ <div class="tip-item"> <div class="tip-label">璁惧寮傚父鏁�:</div> <div class="tip-info tip-danger"> - {{ scope.row.carNormalNum }} + {{ scope.row.carErrorNum }} </div> </div> </div> <div class="tip-num"> - {{ - scope.row.carRate?( - (scope.row.carNormalNum / scope.row.carRate) * - 100 - ).toFixed(0)+'%':'--' - }} + {{ scope.row.carRate ? scope.row.carRate + '%' : '--' }} </div> </el-tooltip> </template> @@ -87,17 +71,12 @@ <div class="tip-item"> <div class="tip-label">璁惧寮傚父鏁�:</div> <div class="tip-info tip-danger"> - {{ scope.row.videoNormalNum }} + {{ scope.row.videoErrorNum }} </div> </div> </div> <div class="tip-num"> - {{ - scope.row.videoRate?( - (scope.row.videoNormalNum / scope.row.videoRate) * - 100 - ).toFixed(0)+'%':'--' - }} + {{ scope.row.videoRate ? scope.row.videoRate + '%' : '--' }} </div> </el-tooltip> </template> @@ -239,7 +218,7 @@ border-color: #56739e99 !important; } -::v-deep .el-table th.el-table__cell > .cell { +::v-deep .el-table th.el-table__cell>.cell { color: #447ed6; } @@ -253,11 +232,7 @@ background-color: transparent !important; } -::v-deep - .el-table--enable-row-hover - .el-table__body - tr:hover - > td.el-table__cell { +::v-deep .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell { background-color: #447ed648; } -- Gitblit v1.8.0