Merge branch 'onemap_zmg' of http://47.103.92.60:3003/skyversation/qp_onemap_ui into MicroFunction

public/static/config/config.js

@@ -5,8 +5,9 @@ let systemConfig = {
   /* 通用全局变量 */
   defaultAccount: {
     username: "user_yztmh_dev", // 默认游客用户名
+    adminRoleId: "1", //默认管理员角色id，Oauth中配置“系统管理员”角色
   },
-  adminRoleId: "1", //默认管理员角色id，Oauth中配置“系统管理员”角色
+
   /*
     * 模型id如下
       1667（应用中心模型id）            1780 政务网  1667 互联网
@@ -45,7 +46,7 @@ let systemConfig = {
   iframeUrl: serverPath + ":2024/",
 
   // baseServicerPath: "/oneMap",
-  baseServicerPath: serverType == "互联网" ? "/oneMap" : serverPath + ":13901/qpyzt", // 政 1201   互 13901
+  baseServicerPath: serverType == "互联网" ? "/oneMap" : serverPath + ":1201/qpyzt", // 政 1201   互 13901
 
   // oauth地址
   oauthServiceUrlOrigin: serverPath + ":" + (serverType == "互联网" ? "10086" : "8888") + "/", // App里使用  互 10086  政 8888

src/data/wgnSceneList.js

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

src/main.js

@@ -48,7 +48,7 @@ const getUserType = () => {
     // 得到默认游客用户名
     let defaultAccountUsername = systemConfig.defaultAccount.username;
     // 得到默认管理员角色id(roleId,在Oauth中配置)
-    let adminRoleId = systemConfig.adminRoleId;
+    let adminRoleId = systemConfig.defaultAccount.adminRoleId;
     if (!store.state.userInfo || !userId || !roleIds || username == defaultAccountUsername) {
       // 游客
       return 1;

src/views/HomePage.vue

@@ -137,7 +137,7 @@
         </div>
       </div>
 
-      <!-- 服务调用趋势  验收版保留，演示版隐藏  start-->
+      <!-- 服务调用趋势  验收版保留，演示版隐藏   现已改为全隐藏  start-->
       <div v-if="isDemo">
         <div class="second-title">服务调用趋势(近30天)</div>
         <div id="echart1"></div>
@@ -645,7 +645,7 @@ export default {
       totalCallNumber: "18,659,623",
       // sections: ['top', 'yyal', 'jcnl', 'tjyy', 'yyzc', 'hxgn'],
       sections: ["top", "jcnl", "tjyy", "yyzc", "hxgn"],
-      isDemo: true,   // true  验收版，false  演示版
+      isDemo:  false,    // true  验收版，false  演示版   现已全隐藏
       affixOptions: [
         {
           title: "顶部",
@@ -1324,6 +1324,12 @@ export default {
               axisLabel: {
                 formatter: this.numberFormatter,
               },
+              splitLine: {
+                lineStyle: {
+                  type: "dashed",
+                  color: "#113761",
+                },
+              },
             },
           ],
         });
@@ -1335,6 +1341,12 @@ export default {
               min: 0,
 
               axisLine: { lineStyle: { color: "#fff" } },
+              splitLine: {
+                lineStyle: {
+                  type: "dashed",
+                  color: "#113761",
+                },
+              },
             },
           ],
         });
@@ -1402,7 +1414,7 @@ export default {
   margin-left: 0;
   padding-left: 120px;
   padding-right: 120px;
-  min-height: 600px;
+  min-height: 500px;
 }
 
 .darkblue-background {

src/views/HomePage_Demo.vue

@@ -4,17 +4,18 @@
     <div class="darkblue-background">
 
       <!-- 服务调用趋势  验收版保留，演示版隐藏  start-->
-      <div class="second-title">服务调用趋势(近30天)</div>
-      <div id="echart1"></div>
-
-      <div class="second-title">平台核心运行清单</div>
+      <div style="background-color: #eeeeee0b;padding: 10px;vertical-align: middle;border-radius: 10px;">
+          <div class="second-title">服务调用趋势(近30天)</div>
+          <div id="echart1"></div>
+      </div>
+      <!-- <div class="second-title">平台核心运行清单</div> -->
       <!--四组统计-->
       <div class="row">
         <div class="lighter-container" style="flex: 2">
           <div class="third-title">
-            <el-icon color="#0071e3" size="30px">
+            <!-- <el-icon color="#0071e3" size="30px">
               <Stopwatch></Stopwatch>
-            </el-icon>
+            </el-icon> -->
             <div>基础统计</div>
           </div>
           <div class="grid-2x2">
@@ -47,9 +48,9 @@
         <div class="lighter-container" style="flex: 3">
           <div class="between-row">
             <div class="third-title">
-              <el-icon color="#0071e3" size="30px">
+              <!-- <el-icon color="#0071e3" size="30px">
                 <Histogram />
-              </el-icon>
+              </el-icon> -->
               <div>委办调用情况</div>
             </div>
             <span>
@@ -541,14 +542,18 @@ export default {
         xAxis: [
           {
             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: [
           {
@@ -558,7 +563,8 @@ export default {
             data: [""],
             splitLine: {
               lineStyle: {
-                color: "red",
+                type: "dashed",
+                color: "#113761",
               },
             },
           },
@@ -848,6 +854,12 @@ export default {
               axisLabel: {
                 formatter: this.numberFormatter,
               },
+              splitLine: {
+                lineStyle: {
+                  type: "dashed",
+                  color: "#113761",
+                },
+              },
             },
           ],
         });
@@ -859,6 +871,12 @@ export default {
               min: 0,
 
               axisLine: { lineStyle: { color: "#fff" } },
+              splitLine: {
+                lineStyle: {
+                  type: "dashed",
+                  color: "#113761",
+                },
+              },
             },
           ],
         });
@@ -1009,7 +1027,8 @@ export default {
 .lighter-container {
   background-color: #eeeeee0b;
   padding: 20px;
-  margin: 15px;
+  // margin: 15px;
+  margin-top: 20px;
   vertical-align: middle;
   border-radius: 10px;
 }
@@ -1171,7 +1190,7 @@ export default {
   font-size: 20px;
   margin-top: 10px;
   padding-left: 10px;
-  border-left: 2px solid #3498db;
+  //border-left: 2px solid #3498db;
   font-weight: bold;
 }
 

src/views/Wgn.vue

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

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({
         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>

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({
@@ -88,6 +83,18 @@ export default {
       });
       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>

src/views/wgn/sksj/index.vue

@@ -18,6 +18,7 @@
         <el-input
           v-if="typeValue != 6"
           v-model="inputAddress"
+          :disabled="typeValue == 0 ? true : false"
           style="max-width: 200px; height: 32px; margin: 0px 10px; background: black"
           placeholder="输入URL地址……"
         />
@@ -74,9 +75,13 @@ export default {
       infoDialogShow: false,
       nowPoint: null,
       nowPointInfo: null,
-      typeValue: "1",
+      typeValue: "0",
       inputAddress: "http://121.43.55.7:8889/geoserver/kdyjs/wms",
       options: [
+        {
+          value: "0",
+          label: "默认",
+        },
         {
           value: "1",
           label: "栅格WMS服务",
@@ -377,10 +382,31 @@ export default {
         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() {
       let that = this;
       // 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";
         that.inputAddress = curUrl;
       } else if (that.typeValue == 2) {
@@ -414,7 +440,12 @@ export default {
       //  typeValue:'1',
       // 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 = 'http://121.43.55.7:8889/geoserver/kdyjs/wms';
         // that.inputAddress = curUrl;

src/views/yxgl/StatisticalAnalysis.vue

@@ -215,8 +215,12 @@
         </div>
       </div>
     </div>
+
+    <!-- 验收版-隐藏  演示版-显示   现已全显示 -->
+    <HomePage_Demo />
+
     <!-- 区级特色信息统计 -->
-    <div class="bigCard">
+    <!-- <div class="bigCard">
       <div class="bigCard_title">区级特色信息统计</div>
       <div class="flex" style="margin-top: 20px">
         <div class="flex_column" style="width: 28%; height: 420px">
@@ -249,11 +253,7 @@
           <EchartsDome :chartOption="chartOptions['服务调用趋势']" title="服务调用趋势" />
         </div>
       </div>
-    </div>
-
-    <!-- 验收版-隐藏  演示版-显示 -->
-    <!-- <HomePage_Demo /> -->
-
+    </div> -->
 
   </div>
 </template>