Merge branch 'master' of http://47.103.92.60:3003/skyversation/qp_onemap_ui

public/static/config/config.js

@@ -24,24 +24,27 @@ let systemConfig = {
     modelIds: [1667, 1690, 1677, 1673],
     columnIds: [1657, 1659, 1666, 1676, 1665, 1651, 1662],
 
-    baseServicerPath: "/oneMap",
+    // baseServicerPath: "/oneMap",
+    baseServicerPath: "http://121.43.55.7:13901/qpyzt",
     // oauth和DMS环境
     backServerPath: "http://121.43.55.7",
     // oauth地址
     oauthServiceUrlOrigin: "http://121.43.55.7:10086/",
     // oauth地址
-    oauthServiceUrl: "/proxy_oauth",
+    // oauthServiceUrl: "/proxy_oauth",
+    oauthServiceUrl: "http://121.43.55.7:10086/oauth/",
     // oauth前端地址
     oauthWebUrlPort: "2100",
     // dms前端地址
     dmsWebUrlPort: "2101",
     // dms地址
-    dmsDataProxy: "/proxy_dms",
+    // dmsDataProxy: "/proxy_dms",
+    dmsDataProxy: "http://121.43.55.7:10081/dms/",
     // 引擎基础js
     scriptMain: "/static/plugins/skyscenery/SkyScenery.js",
-    GEOSERVER_URL_WMS: "http://121.43.55.7:8889/geoserver/kdyjs/wms",
-    GEOSERVER_URL_WFS: "http://121.43.55.7:8889/geoserver/kdyjs/wfs",
-    TDT_URL: "https://{s}.tianditu.gov.cn/",
+    // GEOSERVER_URL_WMS: "http://121.43.55.7:8889/geoserver/kdyjs/wms",
+    // GEOSERVER_URL_WFS: "http://121.43.55.7:8889/geoserver/kdyjs/wfs",
+    // TDT_URL: "https://{s}.tianditu.gov.cn/",
     /* 以下为各模块定义各自全局变量的位置，包括 example 示例 */
     example: {
         scriptArr: [
@@ -172,7 +175,10 @@ let systemConfig = {
         },
     },
     skmh: {},
-    wgn: {},
+    wgn: {
+        // 微功能演示页面底图地址
+        layerUrl: "https://szlszxdt.qpservice.org.cn/internal_map/?servertype=shmap_blue_web&proxyToken=",
+    },
     yygl: {},
     yxgl: {},
 };

src/api/common.js

@@ -13,12 +13,13 @@ const login = (params) => {
 }
 
 const getDmsTypes = (params) => {
-  return postform(systemConfig.backServerPath + ":" + systemConfig.dmsWebUrlPort + systemConfig.dmsDataProxy + '/category/selectByCNameAType', params)
+  // return postform(systemConfig.backServerPath + ":" + systemConfig.dmsWebUrlPort + systemConfig.dmsDataProxy + '/category/selectByCNameAType', params)
+  return postform(systemConfig.dmsDataProxy + '/category/selectByCNameAType', params)
 }
 
 // 修改用户密码
 const updatePassword = (params) => {
-    return postform(systemConfig.oauthServiceUrl + '/user/updatePassword', params);
+  return postform(systemConfig.oauthServiceUrl + '/user/updatePassword', params);
 }
 
 export default {

src/views/Wgn.vue

@@ -233,13 +233,12 @@
                 <el-input
                   v-if="['lonKey', 'latKey'].includes(rulesItem)"
                   v-model="taskColumn.from.c_source_data[rulesItem]"
+                  placeholder="当文件为xlsx时必填"
                 />
                 <el-select
                   v-if="['outFileType', 'inPrj', 'outPrj'].includes(rulesItem)"
                   v-model="taskColumn.from.c_source_data[rulesItem]"
-                  placeholder="请选择"
-                  +
-                  rulesItem
+                  :placeholder="'请选择' + rulesItem"
                 >
                   <el-option
                     v-for="item in taskColumn.selectOptions[rulesItem]"

src/views/wgn/Example.vue

@@ -64,9 +64,7 @@ export default {
       // 添加地图服务
       viewer.imageryLayers.addImageryProvider(
         new SkyScenery.ArcGisMapServerImageryProvider({
-          url:
-            "https://szlszxdt.qpservice.org.cn/internal_map/?servertype=shmap_blue_web&proxyToken=" +
-            SkySceneryConfig.token,
+          url: systemConfig.wgn.layerUrl + SkySceneryConfig.token,
           enablePickFeatures: false, // 禁用要素拾取功能以提高性能
         })
       );