From 9fcc8bcb99d365d74a24c1329ec5e7623f57b342 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期二, 19 三月 2024 14:56:28 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/zgyw-ui
---
src/views/system/video/index.vue | 51 ++++++++++++++++++++++++++++++---------------------
1 files changed, 30 insertions(+), 21 deletions(-)
diff --git a/src/views/system/video/index.vue b/src/views/system/video/index.vue
index a68de4e..be733c2 100644
--- a/src/views/system/video/index.vue
+++ b/src/views/system/video/index.vue
@@ -24,8 +24,16 @@
<p>寮傚父鏁�</p >
</div>
<div class="dashboard-item">
- <h3 style="color: #7868d9">{{ totalViews }}</h3>
+ <h3>{{ totalViews }}</h3>
<p>鐢熸垚寮傚父宸ュ崟鏁�</p >
+ </div>
+ <div class="dashboard-item">
+ <h3>{{ noStore }}</h3>
+ <p>鏃犲瓨鍌�</p >
+ </div>
+ <div class="dashboard-item">
+ <h3>{{ partStore }}</h3>
+ <p>閮ㄥ垎瀛樺偍</p >
</div>
<div class="dashboard-item">
<h3>{{ viewsPercentage }}%</h3>
@@ -95,25 +103,26 @@
</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="tag" 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 label="绠＄悊鍗曚綅" align="center" prop="managementUnit" />
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="鏁版嵁鏃堕棿" align="center" prop="installedTime" width="180"/>
+ <el-table-column label="绠＄悊鍗曚綅" align="center" prop="managementUnit" width="180"/>
+ <el-table-column label="淇′护鏃跺欢(ms)" align="center" prop="sipDelay" width="180"/>
+ <el-table-column label="瑙嗛鏃跺欢(ms)" align="center" prop="videoDelay" width="180"/>
+ <el-table-column label="鍏抽敭甯ф椂寤�(ms)" align="center" prop="iframeDelay" width="180"/>
+ <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
@@ -140,14 +149,13 @@
<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.deptName }} </el-form-item>
+ <el-form-item label="鏍囩锛�">{{ form.tag }} </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>
@@ -172,18 +180,20 @@
</template>
<script>
-import { listMonitor, getMonitor, delMonitor, addMonitor, updateMonitor } from "@/api/platform/monitor";
+import { listMonitor, getMonitor, delMonitor, addMonitor, updateMonitor } from "@/api/platform/video-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,
+ totalPosts: 6250,
+ totalMembers: 6008,
+ postsPercentage: 51,
+ totalViews: 17,
+ noStore: 47,
+ partStore: 56,
+ viewsPercentage: 96.12,
totalErrors: 0,
// 閬僵灞�
loading: true,
@@ -214,7 +224,6 @@
installedTime: null,
managementUnit: null,
defaultOrder: null,
- cameraFunType: 1,
},
// 琛ㄥ崟鍙傛暟
form: {},
@@ -263,7 +272,7 @@
address: null,
installedTime: null,
managementUnit: null,
- defaultOrder: "1",
+ defaultOrder: null,
};
this.resetForm("form");
},
--
Gitblit v1.8.0