From 7f356bf22e4fe731e2b79ca3877e7c702eaf0704 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 03 四月 2024 14:25:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/face/index.vue | 123 ++++++++++++++++++++++++++++-------------
1 files changed, 84 insertions(+), 39 deletions(-)
diff --git a/src/views/system/face/index.vue b/src/views/system/face/index.vue
index 2d4ac6c..d571bbc 100644
--- a/src/views/system/face/index.vue
+++ b/src/views/system/face/index.vue
@@ -10,23 +10,27 @@
<el-col :xl="14" :lg="14" :md="12" :sm="14" :xs="16">
<div class="dashboard">
<div class="dashboard-item">
- <h3 style="color: #5C9BF8">{{ totalPosts }}</h3>
+ <h3 style="color: #5C9BF8">{{ count.totalPosts }}</h3>
<p>璁惧鎬绘暟</p >
</div>
<div class="dashboard-item">
- <h3 style="color: #3eba45">{{ totalMembers }}</h3>
+ <h3 style="color: #3eba45">{{ count.totalMembers }}</h3>
<p>姝ｅ父鏁�</p >
</div>
<div class="dashboard-item">
- <h3 style="color: #fe640d">{{ postsPercentage }}</h3>
+ <h3 style="color: #fe640d">{{ count.postsPercentage }}</h3>
<p>寮傚父鏁�</p >
</div>
<div class="dashboard-item">
- <h3 style="color: #7868d9">{{ totalViews }}</h3>
+ <h3>{{ count.totalViews }}</h3>
<p>鐢熸垚寮傚父宸ュ崟鏁�</p >
</div>
<div class="dashboard-item">
- <h3>{{ viewsPercentage }}%</h3>
+ <h3>{{ count.totalFace }}</h3>
+ <p>鎶撴媿鏁版嵁鎬婚噺</p >
+ </div>
+ <div class="dashboard-item">
+ <h3>{{ count.viewsPercentage }}%</h3>
<p>璁惧杩愯鐜�</p >
</div>
</div>
@@ -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
@@ -89,38 +109,38 @@
@click="handleExport"
>瀵煎嚭</el-button>
</el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</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 label="璁惧鐘舵��" align="center" prop="onState">
+ <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" v-if="columns[0].visible"/>
+ <el-table-column label="鍖哄煙" align="center" prop="address" width="180" v-if="columns[1].visible"/>
+ <el-table-column label="璁惧鐘舵��" align="center" prop="onState" v-if="columns[2].visible">
<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" v-if="columns[3].visible">
<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" 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" 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="鎶撴媿閲忥細"></el-form-item>
+ </el-col>
+ <el-col :span="24">
+ <el-form-item label="鎸佺画鏃犳暟鎹ぉ鏁帮細"></el-form-item>
</el-col>
</el-row>
</el-form>
@@ -213,19 +237,32 @@
</template>
<script>
-import { listMonitor, getMonitor, delMonitor, addMonitor, updateMonitor } from "@/api/platform/monitor";
+import { videoCount, listMonitor, getMonitor, delMonitor, addMonitor, updateMonitor } from "@/api/platform/monitor";
export default {
name: "Monitor",
dicts: ['sys_normal_disable','platform_yes_no','camera_state'],
data() {
return {
- totalPosts: 1156,
- totalMembers: 1000,
- postsPercentage: 156,
- totalViews: 75,
- viewsPercentage: 91.36,
- totalErrors: 0,
+ // 鍒椾俊鎭�
+ columns: [
+ { key: 0, label: `鏍囩`, visible: true },
+ { key: 1, label: `鍖哄煙`, visible: true },
+ { key: 2, label: `璁惧鐘舵�乣, visible: true },
+ { key: 3, label: `鏄惁鐢熸垚寮傚父宸ュ崟`, visible: true },
+ { key: 4, label: `鏁版嵁鏃堕棿`, visible: true },
+ { key: 5, label: `绠＄悊鍗曚綅`, visible: true },
+ { key: 6, label: `鎶撴媿閲廯, visible: true },
+ { key: 7, label: `鎸佺画鏃犳暟鎹ぉ鏁癭, visible: true }
+ ],
+ count: {
+ totalPosts: 0,
+ totalMembers: 0,
+ postsPercentage: 0,
+ totalViews: 0,
+ totalFace: 0,
+ viewsPercentage: 0
+ },
// 閬僵灞�
loading: true,
// 閫変腑鏁扮粍
@@ -277,6 +314,7 @@
};
},
created() {
+ this.getVideoCount();
this.getList();
},
methods: {
@@ -287,6 +325,12 @@
this.monitorList = response.rows;
this.total = response.total;
this.loading = false;
+ });
+ },
+ /** 鏌ヨ璁惧璧勪骇缁熻鏁� */
+ getVideoCount() {
+ videoCount('3').then(response => {
+ this.count = response.data;
});
},
// 鍙栨秷鎸夐挳
@@ -312,6 +356,7 @@
this.queryParams.pageNum = 1;
this.queryParams.cameraFunType = 3
this.getList();
+ this.getVideoCount();
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
--
Gitblit v1.8.0