From d7bfd9bfa7af26d6c76fe771bb8cfe0d3f84da5e Mon Sep 17 00:00:00 2001
From: 648540858 <456panlinlin>
Date: 星期四, 21 四月 2022 10:30:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into map
---
src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java | 16 ++++++++--------
web_src/src/components/control.vue | 2 +-
web_src/src/components/live.vue | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java b/src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
index ba6eed5..09e7a04 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
@@ -20,8 +20,8 @@
/**
* 鍩轰簬dom4j鐨勫伐鍏峰寘
- *
- *
+ *
+ *
*/
public class XmlUtil {
/**
@@ -31,9 +31,9 @@
/**
* 瑙ｆ瀽XML涓篋ocument瀵硅薄
- *
+ *
* @param xml 琚В鏋愮殑XMl
- *
+ *
* @return Document
*/
public static Element parseXml(String xml) {
@@ -51,7 +51,7 @@
/**
* 鑾峰彇element瀵硅薄鐨則ext鐨勫��
- *
+ *
* @param em 鑺傜偣鐨勫璞�
* @param tag 鑺傜偣鐨則ag
* @return 鑺傜偣
@@ -62,12 +62,12 @@
}
Element e = em.element(tag);
//
- return null == e ? null : e.getText();
+ return null == e ? null : e.getText().trim();
}
/**
* 閫掑綊瑙ｆ瀽xml鑺傜偣锛岄�傜敤浜� 澶氳妭鐐规暟鎹�
- *
+ *
* @param node node
* @param nodeName nodeName
* @return List<Map<String, Object>>
@@ -106,7 +106,7 @@
/**
* xml杞琷son
- *
+ *
* @param element
* @param json
*/
diff --git a/web_src/src/components/control.vue b/web_src/src/components/control.vue
index 9a0a97e..742b091 100644
--- a/web_src/src/components/control.vue
+++ b/web_src/src/components/control.vue
@@ -41,7 +41,7 @@
<template slot="extra">
<el-button style="float: right;" type="primary" size="mini" icon="el-icon-document-copy" title="鐐瑰嚮鎷疯礉" v-clipboard="JSON.stringify(wvpServerConfig.sip)|| ''" @success="$message({type:'success', message:'鎴愬姛鎷疯礉鍒扮矘璐存澘'})"></el-button>
</template>
- <el-descriptions-item v-for="(value, key, index) in wvpServerConfig.sip">
+ <el-descriptions-item v-for="(value, key, index) in wvpServerConfig.sip" :key="key">
<template slot="label">
{{ getNameFromKey(key) }}
</template>
diff --git a/web_src/src/components/live.vue b/web_src/src/components/live.vue
index 654e921..8d9cb3e 100644
--- a/web_src/src/components/live.vue
+++ b/web_src/src/components/live.vue
@@ -4,7 +4,7 @@
<el-header>
<uiHeader></uiHeader>
</el-header>
- <el-container v-loading="loading" element-loading-text="鎷煎懡鍔犺浇涓�">
+ <el-container v-loading="loading" element-loading-text="鎷煎懡鍔犺浇涓�" style="margin: 0 20px;">
<el-aside width="300px" style="background-color: #ffffff">
<div style="text-align: center;padding-top: 20px;">璁惧鍒楄〃</div>
<el-menu v-loading="loading">
--
Gitblit v1.8.0