From e1a0d9a35c8d91db02d1123ea1f6d4538b7c27fe Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 20 三月 2024 17:18:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/video/index.vue | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/views/system/video/index.vue b/src/views/system/video/index.vue
index be733c2..6b0abb8 100644
--- a/src/views/system/video/index.vue
+++ b/src/views/system/video/index.vue
@@ -45,10 +45,10 @@
</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-item label="鍏抽敭瀛�" prop="name">
<el-input
v-model="queryParams.name"
- placeholder="璇疯緭鍏ヨ澶囧悕绉�"
+ placeholder="璇疯緭鍏ュ叧閿瓧"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -107,6 +107,7 @@
<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="region" 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"/>
@@ -150,6 +151,7 @@
<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="璁惧鐘舵�侊細">
<div v-if="form.onState === 1">鍙敤</div>
<div v-else-if="form.onState === 2">涓嶅彲鐢�</div>
@@ -170,6 +172,15 @@
<el-col :span="24">
<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-col>
+ <el-col :span="24">
+ <el-form-item label="瑙嗛鏃跺欢(ms)锛�">{{ form.videoDelay }}</el-form-item>
+ </el-col>
+ <el-col :span="24">
+ <el-form-item label="鍏抽敭甯ф椂寤�(ms)锛�">{{ form.iframeDelay }}</el-form-item>
+ </el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -181,7 +192,7 @@
<script>
import { listMonitor, getMonitor, delMonitor, addMonitor, updateMonitor } from "@/api/platform/video-monitor";
-
+import {getCountyList} from "@/api/platform/region";
export default {
name: "Monitor",
dicts: ['sys_normal_disable', 'platform_yes_no','camera_state'],
@@ -246,6 +257,8 @@
},
created() {
this.getList();
+ this.getCountyList();
+
},
methods: {
/** 鏌ヨ璁惧璧勪骇鍒楄〃 */
--
Gitblit v1.8.0