Merge branch '3ddc' of http://yun.pashanhoo.com:9090/xian-java/fontweb-dc into 3ddc

@@ -8,10 +8,10 @@ require([
     "esri/geometry/Extent",
 ], function (Map, MapView, Basemap, TileLayer, Extent) {
     let yingxiang_imageMap = new TileLayer({
-        url: 'http://10.6.144.134:6080/arcgis/rest/services/影像底图2000/2018GF影像/MapServer'   // 影像地图
+        url: 'https://192.168.5.164:6443/arcgis/rest/services/xzsj/ygyx/MapServer'   // 影像地图
     });
     let dianzi_imageMap = new TileLayer({
-        url: 'http://10.7.120.44:6080/arcgis/rest/services/规划2000/电子地图/MapServer' //电子底图
+        url: 'https://192.168.5.164:6443/arcgis/rest/services/xzsj/ygyx/MapServer' //电子底图
     });
 
     var basemapIcon = {
@@ -19,12 +19,12 @@ require([
         dzdt: '/image/yxdt_normal.png'
     }
     let ext = new Extent({
-        "xmax": 628754.984749743,
-        "ymax": 3820457.747395801,
-        "xmin": 550649.8285394306,
-        "ymin": 3773943.904368115,
+        "xmax": 1.1332182150213555E7,
+        "ymax": 4379415.470661429,
+        "xmin": 1.1339935515720293E7,
+        "ymin": 4383168.328167147,
         "spatialReference": {
-            "wkid": 4545
+            "wkid": 3857
         }
     });
 
@@ -44,11 +44,11 @@ require([
         zoom: 1
     });
 
-        $(function () {
+/*        $(function () {
             $('#trigger').attr('src',basemapIcon.dzdt);
             $('#trigger').click(function () {
 
-        /*        var basemaps = [];
+        /!*        var basemaps = [];
                 for (var key in basemapIcon) {
                     var items = mapview.allLayerViews.items;
                     for (var i in items) {
@@ -70,7 +70,7 @@ require([
                     basemaps[0].layer.visible = true;
                     basemaps[1].layer.visible = false;
                     this.setAttribute('src', basemapIcon.yxdt);
-                }*/
+                }*!/
             })
-    });
+    });*/
 });
\ No newline at end of file

@@ -105,7 +105,7 @@
                     </el-select>
                 </div>
                 <div class="layui-card" v-loading="loading2">
-                    <div class="layui-card-header">西安市实施情况监测</div>
+                    <div class="layui-card-header">东川工业园区实施情况监测</div>
                     <div class="layui-card-body">
                         <div id="chart2" style="width:100%;height:700px"></div>
                     </div>

@@ -856,6 +856,7 @@ require([
                         let czData = [];
                         let ProvinceChartData = res.data.data;
                         for (let i = 0; i < ProvinceChartData.length; i++) {
+                            debugger
                             qymcData.push(ProvinceChartData[i].qymc);
                             jczData.push(ProvinceChartData[i].jcz);
                             ghmbData.push(ProvinceChartData[i].ghmb);
@@ -1073,7 +1074,7 @@ require([
                 ctx.globalCompositeOperation='destination-over';
                 ctx.rotate(-20 * Math.PI / 180);
                 ctx.fillStyle = 'rgba(100,100,100,0.2)';
-                ctx.fillText(this.qymc, -22, 80);
+                ctx.fillText('东川工业园区', -22, 80);
                 ctx.rotate('20*Math.PI/180'); // 坐标系还原
                 const img_src = cw.toDataURL();
                 document.getElementsByClassName('left-content-cards')[0].style.background = `${background} url(${img_src})`;
@@ -1996,7 +1997,8 @@ require([
     let regionSwitch = document.getElementById("region_select");   // 下拉切换区县区域
     let resetMap = document.getElementById("resetMap");   // 重置地图
     let layer_electronicMap = new TileLayer({
-        url: 'http://10.6.144.88:6080/arcgis/rest/services/实施监督系统/地图灰化2/MapServer'   // 电子地图
+        //url: 'http://10.6.144.88:6080/arcgis/rest/services/实施监督系统/地图灰化2/MapServer'   // 电子地图
+        url: 'https://192.168.5.164:6443/arcgis/rest/services/xzsj/ygyx/MapServer'   // 电子地图
     });
     let layer_imageMap = new TileLayer({
         url: 'http://10.6.144.134:6080/arcgis/rest/services/影像底图2000/2018GF影像/MapServer'   // 影像地图
@@ -2031,11 +2033,11 @@ require([
 
     // 创建地图实例
     let ext = new Extent({
-        xmin: 413417,
-        ymin: 3715140,
-        xmax: 665512,
-        ymax: 3902165,
-        spatialReference: 4545
+        xmin: 1.1332182150213555E7,
+        ymin: 4379415.470661429,
+        xmax: 1.1339935515720293E7,
+        ymax: 4383168.328167147,
+        spatialReference: 3857
     });
     _self.myMap = new Map({
         basemap: electronBaseMap

@@ -186,7 +186,7 @@
         </div>
         <!-- 实时情况检测echart -->
         <div class="layui-card" id="layui-right-bottom" v-loading="loading2" style="opacity: 0.8">
-            <div class="layui-card-header" style="height: 18px">{{ qymc }}实施情况监测</div>
+            <div class="layui-card-header" style="height: 18px">东川工业园区实施情况监测</div>
             <div class="layui-card-body">
                 <div id="chart2" style="width:300px;height:450px"></div>
             </div>