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/system/monitor/face/index.vue | 41 +++++++++++------------------------------
1 files changed, 11 insertions(+), 30 deletions(-)
diff --git a/src/views/system/monitor/face/index.vue b/src/views/system/monitor/face/index.vue
index 830997a..58546c8 100644
--- a/src/views/system/monitor/face/index.vue
+++ b/src/views/system/monitor/face/index.vue
@@ -22,14 +22,6 @@
<p>寮傚父鏁�</p >
</div>
<div class="dashboard-item">
- <h3>{{ count.totalViews }}</h3>
- <p>鐢熸垚寮傚父宸ュ崟鏁�</p >
- </div>
- <div class="dashboard-item">
- <h3>{{ count.totalFace }}</h3>
- <p>鎶撴媿鏁版嵁鎬婚噺</p >
- </div>
- <div class="dashboard-item">
<h3>{{ count.viewsPercentage }}%</h3>
<p>璁惧杩愯鐜�</p >
</div>
@@ -78,24 +70,9 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="鏄惁鐢熸垚寮傚父宸ュ崟" prop="defaultOrder" label-width="130px">
- <el-select
- v-model="queryParams.defaultOrder"
- placeholder="鏄惁鐢熸垚寮傚父宸ュ崟"
- clearable
- style="width: 170px"
- >
- <el-option
- v-for="dict in dict.type.platform_yes_no"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="el-icon-refresh" size="small" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
@@ -131,8 +108,10 @@
</el-table-column>
<el-table-column label="鏁版嵁鏃堕棿" align="center" prop="installedTime" width="180" v-if="columns[4].visible"/>
<el-table-column label="绠＄悊鍗曚綅" align="center" prop="managementUnit" width="180" v-if="columns[5].visible"/>
- <el-table-column label="鎶撴媿閲�" align="center" prop="a" width="180" v-if="columns[6].visible"/>
- <el-table-column label="鎸佺画鏃犳暟鎹ぉ鏁�" align="center" prop="a" width="180" v-if="columns[7].visible"/>
+ <el-table-column label="鎶撴媿閲�" align="center" prop="clockPercent" width="180" v-if="columns[6].visible"/>
+ <el-table-column label="鏃堕挓鍑嗙‘鐜�" align="center" prop="dataCount" width="180" v-if="columns[7].visible"/>
+ <el-table-column label="澶у浘鍙敤鐜�" align="center" prop="bigUsefulPercent" width="180" v-if="columns[8].visible"/>
+ <el-table-column label="浜鸿劯鍚堟牸鐜�" align="center" prop="faceEligPercent" width="180" v-if="columns[9].visible"/>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope">
<el-button
@@ -190,8 +169,8 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
</div>
</el-dialog>
@@ -254,7 +233,9 @@
{ key: 4, label: `鏁版嵁鏃堕棿`, visible: true },
{ key: 5, label: `绠＄悊鍗曚綅`, visible: true },
{ key: 6, label: `鎶撴媿閲廯, visible: true },
- { key: 7, label: `鎸佺画鏃犳暟鎹ぉ鏁癭, visible: true }
+ { key: 7, label: `鏃堕挓鍑嗙‘鐜嘸, visible: true },
+ { key: 8, label: `澶у浘鍙敤鐜嘸, visible: true },
+ { key: 9, label: `浜鸿劯鍚堟牸鐜嘸, visible: true }
],
count: {
totalPosts: 0,
@@ -443,7 +424,7 @@
display: flex;
justify-content: center;
align-items: center;
- border-radius: 4px;
+ border-radius: 10px;
width: 130px;
height: 80px;
margin-left: 5%;
--
Gitblit v1.8.0