Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/wvp-28181-2.0' into map

pull/446/head
648540858 2022-04-21 10:30:46 +08:00
parent f7236c4a90 a0462055de
commit d7bfd9bfa7
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
View File

@ -20,8 +20,8 @@ import java.util.*;
/** /**
* 基于dom4j的工具包 * 基于dom4j的工具包
* *
* *
*/ */
public class XmlUtil { public class XmlUtil {
/** /**
@ -31,9 +31,9 @@ public class XmlUtil {
/** /**
* 解析XML为Document对象 * 解析XML为Document对象
* *
* @param xml 被解析的XMl * @param xml 被解析的XMl
* *
* @return Document * @return Document
*/ */
public static Element parseXml(String xml) { public static Element parseXml(String xml) {
@ -51,7 +51,7 @@ public class XmlUtil {
/** /**
* 获取element对象的text的值 * 获取element对象的text的值
* *
* @param em 节点的对象 * @param em 节点的对象
* @param tag 节点的tag * @param tag 节点的tag
* @return 节点 * @return 节点
@ -62,12 +62,12 @@ public class XmlUtil {
} }
Element e = em.element(tag); Element e = em.element(tag);
// //
return null == e ? null : e.getText(); return null == e ? null : e.getText().trim();
} }
/** /**
* 递归解析xml节点，适用于 多节点数据 * 递归解析xml节点，适用于 多节点数据
* *
* @param node node * @param node node
* @param nodeName nodeName * @param nodeName nodeName
* @return List<Map<String, Object>> * @return List<Map<String, Object>>
@ -106,7 +106,7 @@ public class XmlUtil {
/** /**
* xml转json * xml转json
* *
* @param element * @param element
* @param json * @param json
*/ */

2
web_src/src/components/control.vue
View File

@ -41,7 +41,7 @@
<template slot="extra"> <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> <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> </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"> <template slot="label">
{{ getNameFromKey(key) }} {{ getNameFromKey(key) }}
</template> </template>

2
web_src/src/components/live.vue
View File

@ -4,7 +4,7 @@
<el-header> <el-header>
<uiHeader></uiHeader> <uiHeader></uiHeader>
</el-header> </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"> <el-aside width="300px" style="background-color: #ffffff">
<div style="text-align: center;padding-top: 20px;">设备列表</div> <div style="text-align: center;padding-top: 20px;">设备列表</div>
<el-menu v-loading="loading"> <el-menu v-loading="loading">