Merge branch 'dev' of http://git.echepei.com/tubao/Smart_platform_ui into dev

public/index.html

@@ -22,11 +22,11 @@
 <!--    导入拖拽-->
   <script src="https://cdn.staticfile.org/Sortable/1.10.0-rc2/Sortable.min.js"></script>
 <!--    导入高德地图-->
-<!--  <script src="https://webapi.amap.com/maps?v=1.4.15&key=9fe905e45ed0e2cfbf69479b4cd83edf"></script>-->
+  <script src="https://webapi.amap.com/maps?v=1.4.15&key=9fe905e45ed0e2cfbf69479b4cd83edf"></script>
 <!--    导入腾旭地图-->
-    <script src="https://map.qq.com/api/gljs?v=1.exp&key=CB2BZ-T3IWN-UPWFO-SR2Y6-4YBXQ-SGBKT"></script>
-    <script src="https://mapapi.qq.com/web/mapComponents/geoLocation/v/geolocation.min.js"></script>
-    <script charset="utf-8" src="https://map.qq.com/api/gljs?libraries=tools&v=1.exp&key=CB2BZ-T3IWN-UPWFO-SR2Y6-4YBXQ-SGBKT"></script>
+<!--    <script src="https://map.qq.com/api/gljs?v=1.exp&key=CB2BZ-T3IWN-UPWFO-SR2Y6-4YBXQ-SGBKT"></script>-->
+<!--    <script src="https://mapapi.qq.com/web/mapComponents/geoLocation/v/geolocation.min.js"></script>-->
+<!--    <script charset="utf-8" src="https://map.qq.com/api/gljs?libraries=tools&v=1.exp&key=CB2BZ-T3IWN-UPWFO-SR2Y6-4YBXQ-SGBKT"></script>-->
     <!--  <link rel="icon" href="<%= BASE_URL %>favicon.png">-->
   <link rel="icon" href="<%= BASE_URL %>tubaoFavicon.ico">
   <!-- stimulsoft -->

src/main.js

@@ -356,6 +356,6 @@ Fingerprint2.get(function (components) {
   }
 })
 
-Vue.prototype.$Map = window.TMap
-Vue.prototype.$Location = new window.TMap.Geolocation('CB2BZ-T3IWN-UPWFO-SR2Y6-4YBXQ-SGBKT', '腾讯地图模板')
+//Vue.prototype.$Map = window.TMap
+//Vue.prototype.$Location = new window.TMap.Geolocation('CB2BZ-T3IWN-UPWFO-SR2Y6-4YBXQ-SGBKT', '腾讯地图模板')
 

src/views/wel/home/landTransportation/components/sales-trend.vue

@@ -956,7 +956,7 @@ export default {
             this.infoWindow.open();
         },
         initMap(data, plateNo) {
-            /*this.map = new AMap.Map("container", {resizeEnable: true});
+            this.map = new AMap.Map("container", {resizeEnable: true});
             this.infoWindow = new AMap.InfoWindow({
                 ffset: new AMap.Pixel(0, -30),
                 offset: new AMap.Pixel(0, -30)
@@ -990,7 +990,7 @@ export default {
             this.infoWindow.open(this.map, this.map.getCenter());
             this.marker.on('click', this.markerClick);
             this.marker.emit('click', {target: this.marker});
-            this.map.setFitView();*/
+            this.map.setFitView();
             /*var center = new TMap.LatLng(39.984104, 116.307503);//设置中心点坐标
             //初始化地图
             var map = new TMap.Map("container", {
@@ -1039,7 +1039,7 @@ export default {
                 infoWindow.setPosition(evt.geometry.position);//设置信息窗位置
                 infoWindow.setContent(evt.geometry.position.toString());//设置信息窗内容
             })*/
-            var rightClicked = false;
+           /* var rightClicked = false;
             if (data.location == null) {
                 data.location = [40.040422,116.273521]
             }
@@ -1128,7 +1128,7 @@ export default {
                         + '<p style="padding: 5px 0"><span style="color: #a0a0a0">经纬度:</span>' + data.location.join(',') + '</p>'
                         + '</div>');
                 }
-            });
+            });*/
             /*var map = new TMap.Map(document.getElementById("container"), {
                 center: new TMap.LatLng(39.916527, 116.397128), // 设定地图中心点
                 zoom: 13 // 设定地图缩放级别