Merge branch 'master' of http://gogs.renlianiot.com:4000/zmcoding/smart-tool-ui

src/views/map/routeMap.vue

@@ -289,7 +289,7 @@ export default {
             $('#marker_address').text(address);
         });
       
-        var content ='<div class="info_label">设备名称：' + (data.name) + '</div>'
+        var content ='<div class="info_label">设备名称：测试设备</div>'
         content +='<div class="info_label">设备编号：' + (data.number) + '</div>'
         content += '<div class="info_label">定位地址：<a id="marker_address">' + address + '</a></div>'