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

648540858

2022-04-21 d7bfd9bfa7af26d6c76fe771bb8cfe0d3f84da5e

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

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

@@ -62,7 +62,7 @@
        }

        Element e = em.element(tag);

        //

        return null == e ? null : e.getText();

        return null == e ? null : e.getText().trim();

    }



    /**


 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>

 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">