From a890b62fa1bbacd1a6156cbccf59def8b7cfe262 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 08 四月 2024 18:13:33 +0800
Subject: [PATCH] Merge branch '2.7.0'
---
web_src/src/components/map.vue | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/web_src/src/components/map.vue b/web_src/src/components/map.vue
old mode 100644
new mode 100755
index bfd4c1f..64ae0e2
--- a/web_src/src/components/map.vue
+++ b/web_src/src/components/map.vue
@@ -22,10 +22,10 @@
<el-descriptions-item label="琛屾斂鍖哄煙" >{{channel.civilCode}}</el-descriptions-item>
<el-descriptions-item label="璁惧褰掑睘" >{{channel.owner}}</el-descriptions-item>
<el-descriptions-item label="瀹夎鍦板潃" >{{channel.address == null?'鏈煡': channel.address}}</el-descriptions-item>
- <el-descriptions-item label="浜戝彴绫诲瀷" >{{channel.ptztypeText}}</el-descriptions-item>
- <el-descriptions-item label="鐘舵��">
- <el-tag size="small" v-if="channel.status === 1">鍦ㄧ嚎</el-tag>
- <el-tag size="small" type="info" v-if="channel.status === 0">绂荤嚎</el-tag>
+ <el-descriptions-item label="浜戝彴绫诲瀷" >{{channel.PTZTypeText}}</el-descriptions-item>
+ <el-descriptions-item label="閫氶亾鐘舵��">
+ <el-tag size="small" v-if="channel.status === true">鍦ㄧ嚎</el-tag>
+ <el-tag size="small" type="info" v-if="channel.status === false">绂荤嚎</el-tag>
</el-descriptions-item>
</el-descriptions>
<div style="padding-top: 10px">
@@ -243,7 +243,7 @@
},
getImageByChannel: function (channel) {
let src = "static/images/gis/camera.png"
- switch (channel.ptztype) {
+ switch (channel.ptzType) {
case 1:
if (channel.status === 1) {
src = "static/images/gis/camera1.png"
@@ -302,7 +302,6 @@
}).then(function (res) {
that.isLoging = false;
if (res.data.code === 0) {
-
that.$refs.devicePlayer.openDialog("media", deviceId, channelId, {
streamInfo: res.data.data,
hasAudio: channel.hasAudio
--
Gitblit v1.8.0