From 47a9d0b2711203995fd5eeb00df1bebda7d63ad8 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 21 三月 2024 10:27:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/face/index.vue | 87 ++++++++++++++++++++++++++++---------------
1 files changed, 56 insertions(+), 31 deletions(-)
diff --git a/src/views/system/face/index.vue b/src/views/system/face/index.vue
index 2d4ac6c..2755297 100644
--- a/src/views/system/face/index.vue
+++ b/src/views/system/face/index.vue
@@ -22,8 +22,12 @@
<p>寮傚父鏁�</p >
</div>
<div class="dashboard-item">
- <h3 style="color: #7868d9">{{ totalViews }}</h3>
+ <h3>{{ totalOrders }}</h3>
<p>鐢熸垚寮傚父宸ュ崟鏁�</p >
+ </div>
+ <div class="dashboard-item">
+ <h3>{{ totalViews }}</h3>
+ <p>鎶撴媿鏁版嵁鎬婚噺</p >
</div>
<div class="dashboard-item">
<h3>{{ viewsPercentage }}%</h3>
@@ -34,14 +38,30 @@
</el-row>
</el-card>
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
- <el-form-item label="璁惧鍚嶇О" prop="name">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+ <el-form-item label="鍏抽敭瀛�" prop="name">
<el-input
v-model="queryParams.name"
- placeholder="璇疯緭鍏ヨ澶囧悕绉�"
+ placeholder="璇疯緭鍏ュ叧閿瓧"
clearable
@keyup.enter.native="handleQuery"
/>
+ </el-form-item>
+ <el-form-item label="鍖哄煙" prop="onState">
+ <el-select
+ v-model="queryParams.address"
+ placeholder="璇烽�夋嫨鍖哄煙"
+ clearable
+ >
+ <el-option label="鑷础甯�" value="鑷础甯�"/>
+ <el-option label="娌挎哗鍖�" value="娌挎哗鍖�"/>
+ <el-option label="澶у畨鍖�" value="澶у畨鍖�"/>
+ <el-option label="璐′簳鍖�" value="璐′簳鍖�"/>
+ <el-option label="鑷祦浜曞尯" value="鑷祦浜曞尯"/>
+ <el-option label="楂樻柊鍖�" value="楂樻柊鍖�"/>
+ <el-option label="鑽ｅ幙" value="鑽ｅ幙"/>
+ <el-option label="瀵岄『鍘�" value="瀵岄『鍘�"/>
+ </el-select>
</el-form-item>
<el-form-item label="璁惧鐘舵��" prop="onState">
<el-select
@@ -93,34 +113,34 @@
</el-row>
<el-table v-loading="loading" :data="monitorList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column label="璁惧缂栫爜" align="center" prop="serialNumber" />
- <el-table-column label="璁惧鍚嶇О" align="center" prop="name" />
- <el-table-column label="涓婃姤閮ㄩ棬" align="center" prop="deptName" />
+ <el-table-column type="selection" align="center" />
+ <el-table-column label="璁惧鍚嶇О" align="center" prop="name" width="280" fixed/>
+ <el-table-column label="璁惧缂栫爜" align="center" prop="serialNumber" width="180"/>
+ <el-table-column label="鏍囩" align="center" prop="publicSecurity" width="180"/>
+ <el-table-column label="鍖哄煙" align="center" prop="address" width="180"/>
<el-table-column label="璁惧鐘舵��" align="center" prop="onState">
<template slot-scope="scope">
<dict-tag :options="dict.type.camera_state" :value="scope.row.onState"/>
</template>
</el-table-column>
- <el-table-column label="鍦板潃" align="center" prop="address" />
- <el-table-column label="鏄惁鐢熸垚寮傚父宸ュ崟" align="center" prop="defaultOrder">
+ <el-table-column label="鏄惁鐢熸垚寮傚父宸ュ崟" align="center" prop="defaultOrder" width="180">
<template slot-scope="scope">
<dict-tag :options="dict.type.platform_yes_no" :value="scope.row.defaultOrder"/>
</template>
</el-table-column>
- <el-table-column label="寮傚父鍘熷洜" align="center" prop="reason" />
- <el-table-column label="瀹夎鏃堕棿" align="center" prop="installedTime" width="180">
- </el-table-column>
- <el-table-column label="绠＄悊鍗曚綅" align="center" prop="managementUnit" />
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-view"
- @click="handleView(scope.row,scope.index)"
- >璇︾粏</el-button>
- </template>
+ <el-table-column label="鏁版嵁鏃堕棿" align="center" prop="installedTime" width="180"/>
+ <el-table-column label="绠＄悊鍗曚綅" align="center" prop="managementUnit" width="180"/>
+ <el-table-column label="鎶撴媿閲�" align="center" prop="model" width="180"/>
+ <el-table-column label="鎸佺画鏃犳暟鎹ぉ鏁�" align="center" prop="recovery" width="180"/>
+ <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" fixed="right">
+ <template slot-scope="scope">
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-view"
+ @click="handleView(scope.row,scope.index)"
+ >璇︾粏</el-button>
+ </template>
</el-table-column>
</el-table>
@@ -181,6 +201,7 @@
<el-col :span="12">
<el-form-item label="璁惧缂栫爜锛�">{{ form.serialNumber }}</el-form-item>
<el-form-item label="璁惧鍚嶇О锛�">{{ form.name }} </el-form-item>
+ <el-form-item label="鍦板尯锛�">{{ form.address }} </el-form-item>
<el-form-item label="涓婃姤閮ㄩ棬锛�">{{ form.deptName }} </el-form-item>
<el-form-item label="璁惧鐘舵�侊細">
<div v-if="form.onState === 1">鍙敤</div>
@@ -195,13 +216,16 @@
</el-form-item>
</el-col>
<el-col :span="24">
- <el-form-item label="寮傚父鍘熷洜锛�">{{ form.reason }}</el-form-item>
- </el-col>
- <el-col :span="24">
<el-form-item label="瀹夎鏃堕棿锛�">{{ form.installedTime }}</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="绠＄悊鍗曚綅锛�">{{ form.managementUnit }}</el-form-item>
+ </el-col>
+ <el-col :span="24">
+ <el-form-item label="鎶撴媿閲忥細">{{ form.model }}</el-form-item>
+ </el-col>
+ <el-col :span="24">
+ <el-form-item label="鎸佺画鏃犳暟鎹ぉ鏁帮細">{{ form.recovery }}</el-form-item>
</el-col>
</el-row>
</el-form>
@@ -220,11 +244,12 @@
dicts: ['sys_normal_disable','platform_yes_no','camera_state'],
data() {
return {
- totalPosts: 1156,
- totalMembers: 1000,
- postsPercentage: 156,
- totalViews: 75,
- viewsPercentage: 91.36,
+ totalPosts: 1490,
+ totalMembers: 1090,
+ postsPercentage: 319,
+ totalViews: 1200164,
+ totalOrders: 81,
+ viewsPercentage: 73.15,
totalErrors: 0,
// 閬僵灞�
loading: true,
--
Gitblit v1.8.0