Skip to content

蔡永松 / fontweb-dc

Go to a project
Toggle navigation
Toggle navigation pinning
ccdeba45 by 焦小希
Options

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

2 parents 0dfaebd7 177ea1b6
Inline Side-by-side
Showing 4 changed files with 22 additions and 20 deletions
...@@ -8,10 +8,10 @@ require([ ...@@ -8,10 +8,10 @@ require([
8 "esri/geometry/Extent", 8 "esri/geometry/Extent",
9 ], function (Map, MapView, Basemap, TileLayer, Extent) { 9 ], function (Map, MapView, Basemap, TileLayer, Extent) {
10 let yingxiang_imageMap = new TileLayer({ 10 let yingxiang_imageMap = new TileLayer({
11 url: 'http://10.6.144.134:6080/arcgis/rest/services/影像底图2000/2018GF影像/MapServer' // 影像地图 11 url: 'https://192.168.5.164:6443/arcgis/rest/services/xzsj/ygyx/MapServer' // 影像地图
12 }); 12 });
13 let dianzi_imageMap = new TileLayer({ 13 let dianzi_imageMap = new TileLayer({
14 url: 'http://10.7.120.44:6080/arcgis/rest/services/规划2000/电子地图/MapServer' //电子底图 14 url: 'https://192.168.5.164:6443/arcgis/rest/services/xzsj/ygyx/MapServer' //电子底图
15 }); 15 });
16 16
17 var basemapIcon = { 17 var basemapIcon = {
...@@ -19,12 +19,12 @@ require([ ...@@ -19,12 +19,12 @@ require([
19 dzdt: '/image/yxdt_normal.png' 19 dzdt: '/image/yxdt_normal.png'
20 } 20 }
21 let ext = new Extent({ 21 let ext = new Extent({
22 "xmax": 628754.984749743, 22 "xmax": 1.1332182150213555E7,
23 "ymax": 3820457.747395801, 23 "ymax": 4379415.470661429,
24 "xmin": 550649.8285394306, 24 "xmin": 1.1339935515720293E7,
25 "ymin": 3773943.904368115, 25 "ymin": 4383168.328167147,
26 "spatialReference": { 26 "spatialReference": {
27 "wkid": 4545 27 "wkid": 3857
28 } 28 }
29 }); 29 });
30 30
...@@ -44,11 +44,11 @@ require([ ...@@ -44,11 +44,11 @@ require([
44 zoom: 1 44 zoom: 1
45 }); 45 });
46 46
47 $(function () { 47 /* $(function () {
48 $('#trigger').attr('src',basemapIcon.dzdt); 48 $('#trigger').attr('src',basemapIcon.dzdt);
49 $('#trigger').click(function () { 49 $('#trigger').click(function () {
50 50
51 /* var basemaps = []; 51 /!* var basemaps = [];
52 for (var key in basemapIcon) { 52 for (var key in basemapIcon) {
53 var items = mapview.allLayerViews.items; 53 var items = mapview.allLayerViews.items;
54 for (var i in items) { 54 for (var i in items) {
...@@ -70,7 +70,7 @@ require([ ...@@ -70,7 +70,7 @@ require([
70 basemaps[0].layer.visible = true; 70 basemaps[0].layer.visible = true;
71 basemaps[1].layer.visible = false; 71 basemaps[1].layer.visible = false;
72 this.setAttribute('src', basemapIcon.yxdt); 72 this.setAttribute('src', basemapIcon.yxdt);
73 }*/ 73 }*!/
74 }) 74 })
75 }); 75 });*/
76 }); 76 });
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
105 </el-select> 105 </el-select>
106 </div> 106 </div>
107 <div class="layui-card" v-loading="loading2"> 107 <div class="layui-card" v-loading="loading2">
108 <div class="layui-card-header">西安市实施情况监测</div> 108 <div class="layui-card-header">东川工业园区实施情况监测</div>
109 <div class="layui-card-body"> 109 <div class="layui-card-body">
110 <div id="chart2" style="width:100%;height:700px"></div> 110 <div id="chart2" style="width:100%;height:700px"></div>
111 </div> 111 </div>
......
...@@ -856,6 +856,7 @@ require([ ...@@ -856,6 +856,7 @@ require([
856 let czData = []; 856 let czData = [];
857 let ProvinceChartData = res.data.data; 857 let ProvinceChartData = res.data.data;
858 for (let i = 0; i < ProvinceChartData.length; i++) { 858 for (let i = 0; i < ProvinceChartData.length; i++) {
859 debugger
859 qymcData.push(ProvinceChartData[i].qymc); 860 qymcData.push(ProvinceChartData[i].qymc);
860 jczData.push(ProvinceChartData[i].jcz); 861 jczData.push(ProvinceChartData[i].jcz);
861 ghmbData.push(ProvinceChartData[i].ghmb); 862 ghmbData.push(ProvinceChartData[i].ghmb);
...@@ -1073,7 +1074,7 @@ require([ ...@@ -1073,7 +1074,7 @@ require([
1073 ctx.globalCompositeOperation='destination-over'; 1074 ctx.globalCompositeOperation='destination-over';
1074 ctx.rotate(-20 * Math.PI / 180); 1075 ctx.rotate(-20 * Math.PI / 180);
1075 ctx.fillStyle = 'rgba(100,100,100,0.2)'; 1076 ctx.fillStyle = 'rgba(100,100,100,0.2)';
1076 ctx.fillText(this.qymc, -22, 80); 1077 ctx.fillText('东川工业园区', -22, 80);
1077 ctx.rotate('20*Math.PI/180'); // 坐标系还原 1078 ctx.rotate('20*Math.PI/180'); // 坐标系还原
1078 const img_src = cw.toDataURL(); 1079 const img_src = cw.toDataURL();
1079 document.getElementsByClassName('left-content-cards')[0].style.background = `${background} url(${img_src})`; 1080 document.getElementsByClassName('left-content-cards')[0].style.background = `${background} url(${img_src})`;
...@@ -1996,7 +1997,8 @@ require([ ...@@ -1996,7 +1997,8 @@ require([
1996 let regionSwitch = document.getElementById("region_select"); // 下拉切换区县区域 1997 let regionSwitch = document.getElementById("region_select"); // 下拉切换区县区域
1997 let resetMap = document.getElementById("resetMap"); // 重置地图 1998 let resetMap = document.getElementById("resetMap"); // 重置地图
1998 let layer_electronicMap = new TileLayer({ 1999 let layer_electronicMap = new TileLayer({
1999 url: 'http://10.6.144.88:6080/arcgis/rest/services/实施监督系统/地图灰化2/MapServer' // 电子地图 2000 //url: 'http://10.6.144.88:6080/arcgis/rest/services/实施监督系统/地图灰化2/MapServer' // 电子地图
2001 url: 'https://192.168.5.164:6443/arcgis/rest/services/xzsj/ygyx/MapServer' // 电子地图
2000 }); 2002 });
2001 let layer_imageMap = new TileLayer({ 2003 let layer_imageMap = new TileLayer({
2002 url: 'http://10.6.144.134:6080/arcgis/rest/services/影像底图2000/2018GF影像/MapServer' // 影像地图 2004 url: 'http://10.6.144.134:6080/arcgis/rest/services/影像底图2000/2018GF影像/MapServer' // 影像地图
...@@ -2031,11 +2033,11 @@ require([ ...@@ -2031,11 +2033,11 @@ require([
2031 2033
2032 // 创建地图实例 2034 // 创建地图实例
2033 let ext = new Extent({ 2035 let ext = new Extent({
2034 xmin: 413417, 2036 xmin: 1.1332182150213555E7,
2035 ymin: 3715140, 2037 ymin: 4379415.470661429,
2036 xmax: 665512, 2038 xmax: 1.1339935515720293E7,
2037 ymax: 3902165, 2039 ymax: 4383168.328167147,
2038 spatialReference: 4545 2040 spatialReference: 3857
2039 }); 2041 });
2040 _self.myMap = new Map({ 2042 _self.myMap = new Map({
2041 basemap: electronBaseMap 2043 basemap: electronBaseMap
......
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
186 </div> 186 </div>
187 <!-- 实时情况检测echart --> 187 <!-- 实时情况检测echart -->
188 <div class="layui-card" id="layui-right-bottom" v-loading="loading2" style="opacity: 0.8"> 188 <div class="layui-card" id="layui-right-bottom" v-loading="loading2" style="opacity: 0.8">
189 <div class="layui-card-header" style="height: 18px">{{ qymc }}实施情况监测</div> 189 <div class="layui-card-header" style="height: 18px">东川工业园区实施情况监测</div>
190 <div class="layui-card-body"> 190 <div class="layui-card-body">
191 <div id="chart2" style="width:300px;height:450px"></div> 191 <div id="chart2" style="width:300px;height:450px"></div>
192 </div> 192 </div>
......