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 ba6eed5f..09e7a04f 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 @@ import java.util.*; /** * 基于dom4j的工具包 - * - * + * + * */ public class XmlUtil { /** @@ -31,9 +31,9 @@ public class XmlUtil { /** * 解析XML为Document对象 - * + * * @param xml 被解析的XMl - * + * * @return Document */ public static Element parseXml(String xml) { @@ -51,7 +51,7 @@ public class XmlUtil { /** * 获取element对象的text的值 - * + * * @param em 节点的对象 * @param tag 节点的tag * @return 节点 @@ -62,12 +62,12 @@ public class XmlUtil { } 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> @@ -106,7 +106,7 @@ public class XmlUtil { /** * xml转json - * + * * @param element * @param json */ diff --git a/web_src/src/components/control.vue b/web_src/src/components/control.vue index 9a0a97e0..742b0917 100644 --- a/web_src/src/components/control.vue +++ b/web_src/src/components/control.vue @@ -41,7 +41,7 @@ - + diff --git a/web_src/src/components/live.vue b/web_src/src/components/live.vue index 654e921e..8d9cb3eb 100644 --- a/web_src/src/components/live.vue +++ b/web_src/src/components/live.vue @@ -4,7 +4,7 @@ - +
设备列表