From f11195779ab58206b5011a92dbdde7f6c44ed283 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 19 八月 2024 17:36:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/screen/components/screen-table/index.vue | 148 +++++++++++++++++++++++++++++++------------------
1 files changed, 93 insertions(+), 55 deletions(-)
diff --git a/src/views/screen/components/screen-table/index.vue b/src/views/screen/components/screen-table/index.vue
index 2cf0b6d..4400918 100644
--- a/src/views/screen/components/screen-table/index.vue
+++ b/src/views/screen/components/screen-table/index.vue
@@ -13,7 +13,7 @@
:max-height="tableHeight"
class="rank-table"
>
- <el-table-column prop="name" label="鍦板尯" align="center" width="100">
+ <el-table-column prop="area" label="鍦板尯" align="center" width="100">
</el-table-column>
<el-table-column label="浜鸿劯璁惧" align="center">
@@ -22,14 +22,25 @@
<div slot="content">
<div class="tip-item">
<div class="tip-label">璁惧姝ｅ父鏁�:</div>
- <div class="tip-info tip-success">12</div>
+ <div class="tip-info tip-success">
+ {{ scope.row.faceNormalNum }}
+ </div>
</div>
<div class="tip-item">
<div class="tip-label">璁惧寮傚父鏁�:</div>
- <div class="tip-info tip-danger">4</div>
+ <div class="tip-info tip-danger">
+ {{ scope.row.faceErrorNum }}
+ </div>
</div>
</div>
- <div class="tip-num">75%</div>
+ <div class="tip-num">
+ {{
+ scope.row.faceRate?(
+ (scope.row.faceNormalNum / scope.row.faceRate) *
+ 100
+ ).toFixed(0)+'%':'--'
+ }}
+ </div>
</el-tooltip>
</template>
</el-table-column>
@@ -40,14 +51,25 @@
<div slot="content">
<div class="tip-item">
<div class="tip-label">璁惧姝ｅ父鏁�:</div>
- <div class="tip-info tip-success">12</div>
+ <div class="tip-info tip-success">
+ {{ scope.row.carNormalNum }}
+ </div>
</div>
<div class="tip-item">
<div class="tip-label">璁惧寮傚父鏁�:</div>
- <div class="tip-info tip-danger">4</div>
+ <div class="tip-info tip-danger">
+ {{ scope.row.carNormalNum }}
+ </div>
</div>
</div>
- <div class="tip-num">75%</div>
+ <div class="tip-num">
+ {{
+ scope.row.carRate?(
+ (scope.row.carNormalNum / scope.row.carRate) *
+ 100
+ ).toFixed(0)+'%':'--'
+ }}
+ </div>
</el-tooltip>
</template>
</el-table-column>
@@ -58,14 +80,25 @@
<div slot="content">
<div class="tip-item">
<div class="tip-label">璁惧姝ｅ父鏁�:</div>
- <div class="tip-info tip-success">12</div>
+ <div class="tip-info tip-success">
+ {{ scope.row.videoNormalNum }}
+ </div>
</div>
<div class="tip-item">
<div class="tip-label">璁惧寮傚父鏁�:</div>
- <div class="tip-info tip-danger">4</div>
+ <div class="tip-info tip-danger">
+ {{ scope.row.videoNormalNum }}
+ </div>
</div>
</div>
- <div class="tip-num">75%</div>
+ <div class="tip-num">
+ {{
+ scope.row.videoRate?(
+ (scope.row.videoNormalNum / scope.row.videoRate) *
+ 100
+ ).toFixed(0)+'%':'--'
+ }}
+ </div>
</el-tooltip>
</template>
</el-table-column>
@@ -80,57 +113,62 @@
export default {
name: "ScreenTable",
-
+ props: {
+ tableData: {
+ type: Array,
+ default: null,
+ },
+ },
components: {
WrapperTitle,
},
data() {
return {
tableHeight: 40,
- tableData: [
- {
- name: "瀵岄『鍘�",
- data1: 1123,
- data2: 1123,
- data3: 1123,
- },
- {
- name: "鑽ｅ幙",
- data1: 1123,
- data2: 1123,
- data3: 1123,
- },
- {
- name: "楂樻柊鍖�",
- data1: 1123,
- data2: 1123,
- data3: 1123,
- },
- {
- name: "鑷祦浜曞尯",
- data1: 1123,
- data2: 1123,
- data3: 1123,
- },
- {
- name: "璐′簳鍖�",
- data1: 1123,
- data2: 1123,
- data3: 1123,
- },
- {
- name: "澶у畨鍖�",
- data1: 1123,
- data2: 1123,
- data3: 1123,
- },
- {
- name: "娌挎哗鍖�",
- data1: 1123,
- data2: 1123,
- data3: 1123,
- },
- ],
+ // tableData: [
+ // {
+ // name: "瀵岄『鍘�",
+ // data1: 1123,
+ // data2: 1123,
+ // data3: 1123,
+ // },
+ // {
+ // name: "鑽ｅ幙",
+ // data1: 1123,
+ // data2: 1123,
+ // data3: 1123,
+ // },
+ // {
+ // name: "楂樻柊鍖�",
+ // data1: 1123,
+ // data2: 1123,
+ // data3: 1123,
+ // },
+ // {
+ // name: "鑷祦浜曞尯",
+ // data1: 1123,
+ // data2: 1123,
+ // data3: 1123,
+ // },
+ // {
+ // name: "璐′簳鍖�",
+ // data1: 1123,
+ // data2: 1123,
+ // data3: 1123,
+ // },
+ // {
+ // name: "澶у畨鍖�",
+ // data1: 1123,
+ // data2: 1123,
+ // data3: 1123,
+ // },
+ // {
+ // name: "娌挎哗鍖�",
+ // data1: 1123,
+ // data2: 1123,
+ // data3: 1123,
+ // },
+ // ],
};
},
methods: {
--
Gitblit v1.8.0