Pre Merge pull request !43 from 阿斌/N/A

Signed-off-by: 阿斌 <38912748@qq.com>

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java

@@ -1148,6 +1148,15 @@ public class SIPCommander implements ISIPCommander {
                 if (code == ErrorCode.SUCCESS.getCode() && data instanceof Element) {
                     Element responseElement = (Element) data;
                     Element configElement = responseElement.element(configType);
+                    if (configElement == null) {
+                        // 兼容部分宇视设备ElementName和configType不一致的情况
+                        for (Element child : responseElement.elements()) {
+                            if (child.element("Item") != null) {
+                                configElement = child;
+                                break;
+                            }
+                        }
+                    }
                     if (configElement != null) {
                         try {
                             T result = configClass.getDeclaredConstructor().newInstance();

web/src/views/map/index.vue

@@ -89,7 +89,7 @@
           <div class="infobox-content" v-if="channel">
             <el-descriptions class="margin-top" :title="channel.gbName" :column="1" :colon="true" size="mini" :labelStyle="labelStyle" >
               <el-descriptions-item label="编号" >{{channel.gbDeviceId}}</el-descriptions-item>
-              <el-descriptions-item label="生产厂商">{{channel.gbManufacture}}</el-descriptions-item>
+              <el-descriptions-item label="生产厂商">{{channel.gbManufacturer}}</el-descriptions-item>
               <el-descriptions-item label="安装地址" >{{channel.gbAddress == null?'未知': channel.gbAddress}}</el-descriptions-item>
             </el-descriptions>
             <div style="padding-top: 10px; margin: 0 auto; width: fit-content;">