Commit ea6b3cef authored by lihonglin's avatar lihonglin

feat: 地图库版本升级

parent b9133644
Pipeline #57199 failed with stages
...@@ -3,14 +3,11 @@ ...@@ -3,14 +3,11 @@
* @Date: 2022-04-12 18:26:15 * @Date: 2022-04-12 18:26:15
* @LastEditTime: 2022-04-14 09:47:56 * @LastEditTime: 2022-04-14 09:47:56
* @LastEditors: ZengJing * @LastEditors: ZengJing
* @Description: * @Description:
* @FilePath: \CivWeb\config\micor.js * @FilePath: \CivWeb\config\micor.js
*/ */
export function genActiveRule(routerPrefix) { export function genActiveRule(routerPrefix) {
return location => location.pathname.startsWith(routerPrefix);
return location => {
return location.pathname.startsWith(routerPrefix)
};
} }
export default { export default {
dev: [ dev: [
...@@ -43,7 +40,7 @@ export default { ...@@ -43,7 +40,7 @@ export default {
}, },
{ {
name: 'civ_webgis', name: 'civ_webgis',
entry: `//${window.location.hostname}:8081/civ_webgis`, entry: `//${window.location.hostname}:3001/civ_webgis`,
container: '#micro-container', container: '#micro-container',
activeRule: '/civbase/civ_webgis', activeRule: '/civbase/civ_webgis',
}, },
......
/* eslint-disable */ /* eslint-disable */
// const proxyURL = process.env.NODE_ENV !== 'production' ? 'http://192.168.10.150:8777' : window.location.origin; // const proxyURL = process.env.NODE_ENV !== 'production' ? 'http://192.168.10.150:8777' : window.location.origin;
// const proxyURL = 'https://work.panda-water.cn'; // const proxyURL = 'https://work.panda-water.cn';
// const proxyURL = 'http://192.168.12.3:8082'; const proxyURL = 'http://192.168.12.3:8082';
//const proxyURL = 'https://panda-water.cn/' // const proxyURL = 'https://panda-water.cn'
const proxyURL = 'http://192.168.10.152:60001'
module.exports = { module.exports = {
assetsRoot: process.env.NODE_ENV !== 'production' ? proxyURL : './', assetsRoot: process.env.NODE_ENV !== 'production' ? proxyURL : './',
development: { development: {
...@@ -182,7 +182,6 @@ module.exports = { ...@@ -182,7 +182,6 @@ module.exports = {
}, },
}, },
pre: { pre: {
'/PandaGIS': { '/PandaGIS': {
target: proxyURL, target: proxyURL,
changeOrigin: true, changeOrigin: true,
...@@ -194,7 +193,7 @@ module.exports = { ...@@ -194,7 +193,7 @@ module.exports = {
}, },
}, },
'/CityInterface': { '/CityInterface': {
target: 'https://panda-water.cn', target: proxyURL,
changeOrigin: true, changeOrigin: true,
headers: { headers: {
'Access-Control-Allow-Origin': '*', 'Access-Control-Allow-Origin': '*',
...@@ -204,7 +203,7 @@ module.exports = { ...@@ -204,7 +203,7 @@ module.exports = {
}, },
}, },
'/cityinterface': { '/cityinterface': {
target: 'https://panda-water.cn', target: proxyURL,
changeOrigin: true, changeOrigin: true,
headers: { headers: {
'Access-Control-Allow-Origin': '*', 'Access-Control-Allow-Origin': '*',
......
...@@ -107,10 +107,10 @@ ...@@ -107,10 +107,10 @@
"@wisdom-components/basictable": "^1.5.16", "@wisdom-components/basictable": "^1.5.16",
"@wisdom-components/empty": "^1.4.1", "@wisdom-components/empty": "^1.4.1",
"@wisdom-map/amap": "1.1.0-beta.35", "@wisdom-map/amap": "1.1.0-beta.35",
"@wisdom-map/arcgismap": "1.4.0-14",
"@wisdom-map/basemap": "1.1.0-3",
"@wisdom-map/util": "^1.0.27-0",
"@wisdom-utils/components": "0.1.259", "@wisdom-utils/components": "0.1.259",
"@wisdom-map/arcgismap": "1.4.0-20",
"@wisdom-map/basemap": "1.1.0-6",
"@wisdom-map/util": "^1.0.28-0",
"@wisdom-utils/runtime": "0.0.32", "@wisdom-utils/runtime": "0.0.32",
"@wisdom-utils/utils": "0.1.299", "@wisdom-utils/utils": "0.1.299",
"animate.css": "^4.1.1", "animate.css": "^4.1.1",
......
...@@ -522,7 +522,7 @@ window.app.define('js-base64', require.context('../node_modules/js-base64', true ...@@ -522,7 +522,7 @@ window.app.define('js-base64', require.context('../node_modules/js-base64', true
window.app.define('@ant-design/pro-list', require.context('../node_modules/@ant-design/pro-list/lib', true, /^.\/(lib\/)?[^\/]+\.js$/), 'index.js'); window.app.define('@ant-design/pro-list', require.context('../node_modules/@ant-design/pro-list/lib', true, /^.\/(lib\/)?[^\/]+\.js$/), 'index.js');
window.app.define('antd', require.context('../node_modules/antd/es', true, /^.\/(es\/)?[^\/]+\.js$/), 'index.js'); // window.app.define('antd', require.context('../node_modules/antd/es', true, /^.\/(es\/)?[^\/]+\.js$/), 'index.js');
// window.app.define('antd-es-button-style', require.context('../node_modules/antd/es/button/style', true, /\.js/)); // window.app.define('antd-es-button-style', require.context('../node_modules/antd/es/button/style', true, /\.js/));
// window.app.define('antd-es-input-style', require.context('../node_modules/antd/es/input/style', true, /\.js/)); // window.app.define('antd-es-input-style', require.context('../node_modules/antd/es/input/style', true, /\.js/));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment