DESKTOP-6LTVLN7\Liumouren 2 år sedan
förälder
incheckning
54dd6ce235

+ 2 - 2
public/static/config/config.js

@@ -16,9 +16,9 @@ var systemConfig = {
   // token: "65463DEE-620A-0ED5-2385-17ECD07CD351", //公共地图资源token
   // mapService: "http://121.43.55.7:10011/proxy/", //地图服务,
   blueBlackMap:
-    "http://map.geoq.cn/arcgis/rest/services/ChinaOnlineStreetPurplishBlue/MapServer",
+    "http://aimap.pudong.sh:5236/zjmap/reproduction-service/maps/rest/services/sat-2018s2/proxy?AccessKey=lUaEMxqqhZKLSImGuP/Ergx47orYVyIqHVgxfyGpIurKAy9kdq5uU1cWuTuIXeOM",
   imageryLayer:
-    "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
+    "http://aimap.pudong.sh:5236/zjmap/reproduction-service/maps/rest/services/sat-2019s2/proxy?AccessKey=lUaEMxqqhZKLSImGuP/Ergx47orYVyIqHVgxfyGpIurKAy9kdq5uU1cWuTuIXeOM",
 };
 //地图全局变量声明
 var map2DViewer = {

+ 1 - 1
src/components/common/BottomForm/SameScreenComparison.vue

@@ -160,7 +160,7 @@ export default {
           data.forEach(v => {
             this.mapList.unshift({
               mapName: v.title,
-              mapUrl: v.c_url,
+              mapUrl: v.c_url + "?AccessKey=lUaEMxqqhZKLSImGuP/Ergx47orYVyIqHVgxfyGpIurKAy9kdq5uU1cWuTuIXeOM",
               active: v.c_defined_show ? v.c_defined_show : false
             });
           });

+ 5 - 1
src/components/common/StepsMyBox.vue

@@ -12,7 +12,7 @@
           <div class="StepsMyBox_main_left_main_title">{{ clickData.c_project_name ? clickData.c_project_name : "--" }}</div>
           <div class="StepsMyBox_main_left_main_info">基本信息</div>
           <div class="StepsMyBox_main_left_main_info">
-            <div>创建日期:</div>
+            <div>立项日期:</div>
             <div>{{ clickData.c_create_date ? $dayjs(clickData.c_create_date).format("YYYY-MM-DD") : "--" }}</div>
           </div>
           <div class="StepsMyBox_main_left_main_info">
@@ -123,6 +123,10 @@ export default {
           title: "通知",
           info: { text: "2018年张江基本农田审计项目审计通知书.pdf", filePath: "./static/word/test.pdf" }
         },
+        {
+          title: "方案",
+          info: { text: "2018年张江基本农田审计项目审计通知书.pdf", filePath: "./static/word/test.pdf" }
+        },
         {
           title: "实施",
           info: {

+ 8 - 12
src/components/map/Map.vue

@@ -71,27 +71,23 @@ export default {
       });
     },
     mapInit() {
-      
       var crs = new L.Proj.CRS(
-        "EPSG:3857",
+        "EPSG:0986",
         "+proj=tmerc +lat_0=0 +lon_0=121.2751921 +k=1 +x_0=0 +y_0=-3457147.81 +ellps=krass +units=m +no_defs",
         {
           resolutions: [
-            132.2919312505292, 52.91677250021167, 26.458386250105836,
-            13.229193125052918, 5.291677250021167, 2.6458386250105836,
-            1.3229193125052918, 0.5291677250021167, 0.26458386250105836,
-            0.13229193125052918,
-          ],  
+            132.2919312505292, 52.91677250021167, 26.458386250105836, 13.229193125052918, 5.291677250021167, 2.6458386250105836,
+            1.3229193125052918, 0.5291677250021167, 0.26458386250105836, 0.13229193125052918
+          ],
           origin: [-66000, 75000],
-          bounds: L.bounds([-65000, -76000], [75000, 72000]),
+          bounds: L.bounds([-65000, -76000], [75000, 72000])
         }
       );
       this.map = L.map(this.$refs.map, {
         crs: crs,
-        center: [31.074472887639914, 121.72521988031804],
-        zoom: 1,
-        minZoom: 0,
-        maxZoom: 9,
+        zoom: 2,
+        minZoom: 1,
+        maxZoom: 6,
         attributionControl: false,
         zoomControl: false,
         // minZoom: this.minZoom,

+ 1 - 1
src/components/map/MapHolder.vue

@@ -617,7 +617,7 @@ export default {
           // systemConfig.mapService +
           // "?servertype=Street_Purplish_Blue&token=" +
           // systemConfig.token,
-          url: "http://aimap.pudong.sh:5236/zjmap/reproduction-service/maps/rest/services/sat-2019s4/proxy?AccessKey=lUaEMxqqhZKLSImGuP/Ergx47orYVyIqHVgxfyGpIurKAy9kdq5uU1cWuTuIXeOM",
+          url: "http://aimap.pudong.sh:5236/zjmap/reproduction-service/maps/rest/services/sat-2018s2/proxy?AccessKey=lUaEMxqqhZKLSImGuP/Ergx47orYVyIqHVgxfyGpIurKAy9kdq5uU1cWuTuIXeOM",
           // http://aimap.pudong.sh:5236/zjmap/reproduction-service/maps/rest/services/sat-2019s4/proxy?AccessKey=lUaEMxqqhZKLSImGuP/Ergx47orYVyIqHVgxfyGpIurKAy9kdq5uU1cWuTuIXeOM
           // url: "http://aimap.pudong.sh:5236/maps/rest/services/basemap-shanghai-gem-blue-sh2000/mapserver",
           tileSize: 512,

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 157 - 293
src/views/ComprehensiveAnalysis.vue


Vissa filer visades inte eftersom för många filer har ändrats