ソースを参照

微功能增加时空预览和政务网和互联网时的地图切换显示修改

mork 2 週間 前
コミット
662055bf2a

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

@@ -1,5 +1,5 @@
 // 部署环境【互联网、政务网】
 // 部署环境【互联网、政务网】
-const serverType = "互联网";
+const serverType = "政务网";
 var serverPath = serverType == "互联网" ? "http://121.43.55.7" : "http://10.235.245.174"; // 政
 var serverPath = serverType == "互联网" ? "http://121.43.55.7" : "http://10.235.245.174"; // 政
 let systemConfig = {
 let systemConfig = {
   /* 通用全局变量 */
   /* 通用全局变量 */
@@ -45,7 +45,7 @@ let systemConfig = {
   iframeUrl: serverPath + ":2024/",
   iframeUrl: serverPath + ":2024/",
 
 
   // baseServicerPath: "/oneMap",
   // baseServicerPath: "/oneMap",
-  baseServicerPath: serverType == "互联网" ? "/oneMap" : serverPath + ":13901/qpyzt", // 政 1201   互 13901
+  baseServicerPath: serverType == "互联网" ? "/oneMap" : serverPath + ":1201/qpyzt", // 政 1201   互 13901
 
 
   // oauth地址
   // oauth地址
   oauthServiceUrlOrigin: serverPath + ":" + (serverType == "互联网" ? "10086" : "8888") + "/", // App里使用  互 10086  政 8888
   oauthServiceUrlOrigin: serverPath + ":" + (serverType == "互联网" ? "10086" : "8888") + "/", // App里使用  互 10086  政 8888

+ 5 - 0
src/data/wgnSceneList.js

@@ -74,6 +74,11 @@ export const WGN_SCENE_LIST = [
     label: "自定义工具",
     label: "自定义工具",
     children: [{ value: "1.5.8.1", label: "obj三维模型轻量化" }],
     children: [{ value: "1.5.8.1", label: "obj三维模型轻量化" }],
   },
   },
+  {
+    value: "1.5.9",
+    label: "时空数据预览",
+    children: [{ value: "1.5.9.1", label: "时空数据预览" }],
+  },
   {
   {
     value: "1.2.5",
     value: "1.2.5",
     label: "时空算子库",
     label: "时空算子库",

+ 13 - 1
src/views/HomePage.vue

@@ -1324,6 +1324,12 @@ export default {
               axisLabel: {
               axisLabel: {
                 formatter: this.numberFormatter,
                 formatter: this.numberFormatter,
               },
               },
+              splitLine: {
+                lineStyle: {
+                  type: "dashed",
+                  color: "#113761",
+                },
+              },
             },
             },
           ],
           ],
         });
         });
@@ -1335,6 +1341,12 @@ export default {
               min: 0,
               min: 0,
 
 
               axisLine: { lineStyle: { color: "#fff" } },
               axisLine: { lineStyle: { color: "#fff" } },
+              splitLine: {
+                lineStyle: {
+                  type: "dashed",
+                  color: "#113761",
+                },
+              },
             },
             },
           ],
           ],
         });
         });
@@ -1402,7 +1414,7 @@ export default {
   margin-left: 0;
   margin-left: 0;
   padding-left: 120px;
   padding-left: 120px;
   padding-right: 120px;
   padding-right: 120px;
-  min-height: 600px;
+  min-height: 500px;
 }
 }
 
 
 .darkblue-background {
 .darkblue-background {

+ 24 - 7
src/views/HomePage_Demo.vue

@@ -542,14 +542,18 @@ export default {
         xAxis: [
         xAxis: [
           {
           {
             type: "value",
             type: "value",
-            // axisLine: { lineStyle: { color: "red" } },
-            // splitLine: { show: false }, // 隐藏分割线
-            splitLine: {
-              lineStyle: {
-                color: "rgba(255,255,255,0.12)",
-              },
+           axisLine: {
+            lineStyle: {
+              color: "#fff",
+            },
+          },
+          splitLine: {
+            lineStyle: {
+              type: "dashed",
+              color: "#113761",
             },
             },
           },
           },
+          },
         ],
         ],
         yAxis: [
         yAxis: [
           {
           {
@@ -559,7 +563,8 @@ export default {
             data: [""],
             data: [""],
             splitLine: {
             splitLine: {
               lineStyle: {
               lineStyle: {
-                color: "red",
+                type: "dashed",
+                color: "#113761",
               },
               },
             },
             },
           },
           },
@@ -849,6 +854,12 @@ export default {
               axisLabel: {
               axisLabel: {
                 formatter: this.numberFormatter,
                 formatter: this.numberFormatter,
               },
               },
+              splitLine: {
+                lineStyle: {
+                  type: "dashed",
+                  color: "#113761",
+                },
+              },
             },
             },
           ],
           ],
         });
         });
@@ -860,6 +871,12 @@ export default {
               min: 0,
               min: 0,
 
 
               axisLine: { lineStyle: { color: "#fff" } },
               axisLine: { lineStyle: { color: "#fff" } },
+              splitLine: {
+                lineStyle: {
+                  type: "dashed",
+                  color: "#113761",
+                },
+              },
             },
             },
           ],
           ],
         });
         });

+ 1 - 1
src/views/Wgn.vue

@@ -893,7 +893,7 @@ export default {
       // console.log("000000000"+item);
       // console.log("000000000"+item);
 
 
       // 1. 解析目标路由(支持传参、命名路由等)
       // 1. 解析目标路由(支持传参、命名路由等)
-      if (item.c_scene_name == "view") {
+      if (item.c_scene_name == "1.5.9.1") {
         routerPath = {
         routerPath = {
           // path: item.c_url,
           // path: item.c_url,
           path: "sksj",
           path: "sksj",

+ 14 - 8
src/views/example/Map.vue

@@ -45,14 +45,7 @@ export default {
       });
       });
 
 
       // 添加地图服务
       // 添加地图服务
-      viewer.imageryLayers.addImageryProvider(
-        // 此处使用的地图服务地址也可存放在配置文件中
-        new SkyScenery.ArcGisMapServerImageryProvider({
-          url:
-            "https://szlszxdt.qpservice.org.cn/internal_map/?servertype=shmap_blue_web&proxyToken=" +
-            SkySceneryConfig.token,
-        })
-      );
+      viewer.imageryLayers.addImageryProvider(this.getImageryProvider());
       // 定位
       // 定位
       viewer.camera.setView({
       viewer.camera.setView({
         destination: SkyScenery.Cartesian3.fromDegrees(121.1158994, 31.15205574, 30000.0), // 设置位置
         destination: SkyScenery.Cartesian3.fromDegrees(121.1158994, 31.15205574, 30000.0), // 设置位置
@@ -83,6 +76,19 @@ export default {
       //     }
       //     }
       // });
       // });
     },
     },
+    getImageryProvider(){
+      // console.log("互联网========="+serverType);
+      if(serverType == "互联网"){
+        return new SkyScenery.ArcGisMapServerImageryProvider({
+          url: systemConfig.wgn.layerUrl + SkySceneryConfig.token,
+          enablePickFeatures: false, // 禁用要素拾取功能以提高性能
+        })
+      }else{
+        return new SkyScenery.CGCS2000ArcGisMapServerImageryProvider({
+          url: systemConfig.wgn.layerUrl + SkySceneryConfig.token,
+        })
+      }
+    }
   },
   },
 };
 };
 </script>
 </script>

+ 13 - 6
src/views/wgn/Example.vue

@@ -66,12 +66,7 @@ export default {
       });
       });
 
 
       // 添加地图服务
       // 添加地图服务
-      viewer.imageryLayers.addImageryProvider(
-        new SkyScenery.CGCS2000ArcGisMapServerImageryProvider({
-          url: systemConfig.wgn.layerUrl + SkySceneryConfig.token,
-          // enablePickFeatures: false, // 禁用要素拾取功能以提高性能
-        })
-      );
+      viewer.imageryLayers.addImageryProvider(this.getImageryProvider());
 
 
       // 定位
       // 定位
       viewer.camera.setView({
       viewer.camera.setView({
@@ -88,6 +83,18 @@ export default {
       });
       });
       this.$refs["controlPanel"].initDrawHandler();
       this.$refs["controlPanel"].initDrawHandler();
     },
     },
+    getImageryProvider(){
+      if(serverType == "互联网"){
+        return new SkyScenery.ArcGisMapServerImageryProvider({
+          url: systemConfig.wgn.layerUrl + SkySceneryConfig.token,
+          enablePickFeatures: false, // 禁用要素拾取功能以提高性能
+        })
+      }else{
+        return new SkyScenery.CGCS2000ArcGisMapServerImageryProvider({
+          url: systemConfig.wgn.layerUrl + SkySceneryConfig.token,
+        })
+      }
+    }
   },
   },
 };
 };
 </script>
 </script>

+ 34 - 3
src/views/wgn/sksj/index.vue

@@ -18,6 +18,7 @@
         <el-input
         <el-input
           v-if="typeValue != 6"
           v-if="typeValue != 6"
           v-model="inputAddress"
           v-model="inputAddress"
+          :disabled="typeValue == 0 ? true : false"
           style="max-width: 200px; height: 32px; margin: 0px 10px; background: black"
           style="max-width: 200px; height: 32px; margin: 0px 10px; background: black"
           placeholder="输入URL地址……"
           placeholder="输入URL地址……"
         />
         />
@@ -74,9 +75,13 @@ export default {
       infoDialogShow: false,
       infoDialogShow: false,
       nowPoint: null,
       nowPoint: null,
       nowPointInfo: null,
       nowPointInfo: null,
-      typeValue: "1",
+      typeValue: "0",
       inputAddress: "http://121.43.55.7:8889/geoserver/kdyjs/wms",
       inputAddress: "http://121.43.55.7:8889/geoserver/kdyjs/wms",
       options: [
       options: [
+        {
+          value: "0",
+          label: "默认",
+        },
         {
         {
           value: "1",
           value: "1",
           label: "栅格WMS服务",
           label: "栅格WMS服务",
@@ -377,10 +382,31 @@ export default {
         viewer.zoomTo(tile1);
         viewer.zoomTo(tile1);
       });
       });
     },
     },
+    addDEFLayer(){
+       // 添加地图服务
+      let layer = viewer.imageryLayers.addImageryProvider(this.getImageryProvider());
+      this.wmslayer.mapItemLayer = layer;
+    },
+    getImageryProvider(){
+      // console.log("互联网========="+serverType);
+      if(serverType == "互联网"){
+        return new SkyScenery.ArcGisMapServerImageryProvider({
+          url: systemConfig.wgn.layerUrl + SkySceneryConfig.token,
+          enablePickFeatures: false, // 禁用要素拾取功能以提高性能
+        })
+      }else{
+        return new SkyScenery.CGCS2000ArcGisMapServerImageryProvider({
+          url: systemConfig.wgn.layerUrl + SkySceneryConfig.token,
+        })
+      }
+    },
     changType() {
     changType() {
       let that = this;
       let that = this;
       // this.inputAddress = '';
       // this.inputAddress = '';
-      if (that.typeValue == 1) {
+      if (that.typeValue == 0) {
+        let curUrl = systemConfig.wgn.layerUrl + SkySceneryConfig.token;
+        that.inputAddress = curUrl;
+      } else if (that.typeValue == 1) {
         let curUrl = "http://121.43.55.7:8889/geoserver/kdyjs/wms";
         let curUrl = "http://121.43.55.7:8889/geoserver/kdyjs/wms";
         that.inputAddress = curUrl;
         that.inputAddress = curUrl;
       } else if (that.typeValue == 2) {
       } else if (that.typeValue == 2) {
@@ -414,7 +440,12 @@ export default {
       //  typeValue:'1',
       //  typeValue:'1',
       // inputAddress:'',
       // inputAddress:'',
 
 
-      if (that.typeValue == 1) {
+      if (that.typeValue == 0) {
+        let curUrl = that.inputAddress;
+        // that.inputAddress = curUrl;
+        let param = { url: curUrl, layers: "defLayer" };
+        that.addDEFLayer(param);
+      } else if (that.typeValue == 1) {
         let curUrl = that.inputAddress;
         let curUrl = that.inputAddress;
         // let curUrl = 'http://121.43.55.7:8889/geoserver/kdyjs/wms';
         // let curUrl = 'http://121.43.55.7:8889/geoserver/kdyjs/wms';
         // that.inputAddress = curUrl;
         // that.inputAddress = curUrl;