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/video/index.vue | 62 +++++++++++++++++--------------
1 files changed, 34 insertions(+), 28 deletions(-)
diff --git a/src/views/system/video/index.vue b/src/views/system/video/index.vue
index f7c179f..22bfe76 100644
--- a/src/views/system/video/index.vue
+++ b/src/views/system/video/index.vue
@@ -12,31 +12,31 @@
<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>{{ totalViews }}</h3>
+ <h3>{{ count.totalViews }}</h3>
<p>鐢熸垚寮傚父宸ュ崟鏁�</p >
</div>
<div class="dashboard-item">
- <h3>{{ noStore }}</h3>
+ <h3>{{ count.noStore }}</h3>
<p>鏃犲瓨鍌�</p >
</div>
<div class="dashboard-item">
- <h3>{{ partStore }}</h3>
+ <h3>{{ count.partStore }}</h3>
<p>閮ㄥ垎瀛樺偍</p >
</div>
<div class="dashboard-item">
- <h3>{{ viewsPercentage }}%</h3>
+ <h3>{{ count.viewsPercentage }}%</h3>
<p>璁惧杩愯鐜�</p >
</div>
</div>
@@ -44,7 +44,7 @@
</el-row>
</el-card>
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+ <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"
@@ -123,8 +123,8 @@
<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="tag" width="180" v-if="columns[0].visible"/>
- <el-table-column label="鍖哄煙" align="center" prop="region" width="180" v-if="columns[1].visible"/>
+ <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"/>
@@ -167,21 +167,19 @@
<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.tag }} </el-form-item>
- <el-form-item label="鍖哄煙锛�">{{ form.region }} </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>
<div v-else-if="form.onState === 2">涓嶅彲鐢�</div>
</el-form-item>
</el-col>
<el-col :span="24">
+ <el-form-item label="鍦板潃锛�">{{ form.address }}</el-form-item>
<el-form-item label="鏄惁鐢熸垚寮傚父宸ュ崟锛�">
<div v-if="form.defaultOrder === 1">鏄�</div>
<div v-else-if="form.defaultOrder === 2">鍚�</div>
</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>
@@ -190,13 +188,13 @@
<el-form-item label="绠＄悊鍗曚綅锛�">{{ form.managementUnit }}</el-form-item>
</el-col>
<el-col :span="24">
- <el-form-item label="淇′护鏃跺欢(ms)锛�">{{ form.sipDelay }}</el-form-item>
+ <el-form-item label="淇′护鏃跺欢(ms)锛�"></el-form-item>
</el-col>
<el-col :span="24">
- <el-form-item label="瑙嗛鏃跺欢(ms)锛�">{{ form.videoDelay }}</el-form-item>
+ <el-form-item label="瑙嗛鏃跺欢(ms)锛�"></el-form-item>
</el-col>
<el-col :span="24">
- <el-form-item label="鍏抽敭甯ф椂寤�(ms)锛�">{{ form.iframeDelay }}</el-form-item>
+ <el-form-item label="鍏抽敭甯ф椂寤�(ms)锛�"></el-form-item>
</el-col>
</el-row>
</el-form>
@@ -208,7 +206,7 @@
</template>
<script>
-import { listMonitor, getMonitor, delMonitor, addMonitor, updateMonitor } from "@/api/platform/video-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'],
@@ -226,14 +224,15 @@
{ key: 7, label: `瑙嗛鏃跺欢`, visible: true },
{ key: 8, label: `鍏抽敭甯ф椂寤禶, visible: true }
],
- totalPosts: 6250,
- totalMembers: 6008,
- postsPercentage: 51,
- totalViews: 17,
- noStore: 47,
- partStore: 56,
- viewsPercentage: 96.12,
- totalErrors: 0,
+ count: {
+ totalPosts: 0,
+ totalMembers: 0,
+ postsPercentage: 0,
+ totalViews: 0,
+ noStore: 0,
+ partStore: 0,
+ viewsPercentage: 0
+ },
// 閬僵灞�
loading: true,
// 閫変腑鏁扮粍
@@ -285,9 +284,9 @@
};
},
created() {
+ this.getVideoCount();
this.getList();
this.getCountyList();
-
},
methods: {
/** 鏌ヨ璁惧璧勪骇鍒楄〃 */
@@ -297,6 +296,12 @@
this.monitorList = response.rows;
this.total = response.total;
this.loading = false;
+ });
+ },
+ /** 鏌ヨ璁惧璧勪骇缁熻鏁� */
+ getVideoCount() {
+ videoCount('1').then(response => {
+ this.count = response.data;
});
},
// 鍙栨秷鎸夐挳
@@ -323,6 +328,7 @@
this.queryParams.pageNum = 1;
this.queryParams.cameraFunType = 1;
this.getList();
+ this.getVideoCount();
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
--
Gitblit v1.8.0