Merge commit '0c4f4fc951953339c1a4f5e4d7949941e82d4741' into gzb

src/utils/index.js

@@ -709,6 +709,7 @@ export const doEventInfo = {
   104: "USB拔出电脑",
   105: "插入SD卡",
   106: "拔出SD卡",
+  111: "设备ROOT",
   201: "账号登录",
   202: "首次使用",
   203: "账号退出",
@@ -726,6 +727,7 @@ export const breakRuleDoEvent = {
   104: "USB拔出电脑",
   105: "插入SD卡",
   106: "拔出SD卡",
+  111: "设备ROOT",
   211: "安装非应用商店应用",
   212: "卸载强制安装应用"
 };

src/views/schoolSection/deviceManage/deviceManage.vue

@@ -478,11 +478,10 @@
         <div class="geo_location_main" v-if="deviceDetailInfo.show">
           <baidu-map
             class="baidu_map"
-            ak="2xUGaxSQ2TXTsPoiAtT9jZ88tsAl8qw2"
+            ak="lLhDEKNUgqLGxogN0Nf9WPWSbzkMl6ph"
             :center="baiduMapInfo.center"
             :zoom="baiduMapInfo.zoom"
             :scroll-wheel-zoom="false"
-            @ready="baiduMapReady"
           >
             <!--缩放-->
             <bm-navigation anchor="BMAP_ANCHOR_TOP_LEFT"></bm-navigation>
@@ -514,8 +513,8 @@
               >
                 <div v-if="item.address">地址：{{ item.address }}</div>
                 <div>时间：{{ item.createtime }}</div>
-                <div>经度：{{ item.lng }}</div>
-                <div>维度：{{ item.lat }}</div>
+                <!-- <div>经度：{{ item.lng }}</div>
+                <div>维度：{{ item.lat }}</div> -->
               </bm-info-window>
             </bm-marker>
           </baidu-map>
@@ -1147,22 +1146,22 @@ export default {
           this.deviceDetailInfo.username = row.username;
           this.deviceDetailInfo.detail = data.obj;
           let _positions = this.deviceDetailInfo.detail.positions;
+          this.baiduMapInfo.positions = _positions.map((item, index) => {
+            return {
+              show: index === 0 ? true : false,
+              address: item.address,
+              lng: item.lon,
+              lat: item.lat,
+              createtime: item.createtime
+            };
+          });
           if (_positions.length > 0) {
-            this.baiduMapInfo.positions = _positions.map((item) => {
-              return {
-                show: false,
-                address: "",
-                lng: item.lon,
-                lat: item.lat,
-                createtime: item.createtime
-              };
-            });
+            let _firstItem = this.baiduMapInfo.positions[0];
             this.baiduMapInfo.center = {
-              lng: this.baiduMapInfo.positions[0].lng,
-              lat: this.baiduMapInfo.positions[0].lat
+              lng: _firstItem.lng,
+              lat: _firstItem.lat
             };
           } else {
-            this.baiduMapInfo.positions = [];
             this.baiduMapInfo.center = "郑州市";
           }
           this.initMemoryDetailEcharts();
@@ -1171,22 +1170,6 @@ export default {
         }
       });
     },
-    baiduMapReady({ BMap }) {
-      const geocoder = new BMap.Geocoder();
-      this.baiduMapInfo.positions.forEach((pItem, pIndex) => {
-        let point = new BMap.Point(pItem.lng, pItem.lat);
-        geocoder.getLocation(point, (data) => {
-          if (pIndex === 0) {
-            pItem.show = true;
-          } else {
-            pItem.show = false;
-          }
-          if (data) {
-            pItem.address = data.address;
-          }
-        });
-      });
-    },
     bmMarkerClick(item) {
       this.baiduMapInfo.positions.forEach((pItem) => {
         pItem.show = false;