Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
CivWeb
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ReactWeb5
CivWeb
Commits
79d91fc0
Commit
79d91fc0
authored
3 years ago
by
邓晓峰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 过滤AMAP进行沙盒管理
parent
7157e6c6
Pipeline
#37162
passed with stages
in 17 minutes 6 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
14 deletions
+21
-14
micor.js
config/micor.js
+12
-6
proxy.js
config/proxy.js
+1
-1
RightContent.js
src/components/GlobalHeader/RightContent.js
+1
-1
micro.js
src/micro.js
+6
-5
config.js
src/routes/config.js
+1
-1
No files found.
config/micor.js
View file @
79d91fc0
...
@@ -9,18 +9,24 @@ export default {
...
@@ -9,18 +9,24 @@ export default {
// container: '#micro-container',
// container: '#micro-container',
// activeRule: '/civbase/civ_monitor',
// activeRule: '/civbase/civ_monitor',
// },
// },
{
//
{
name
:
'civ_water'
,
//
name: 'civ_water',
entry
:
`//
${
window
.
location
.
hostname
}
:8081/civ_water`
,
//
entry: `//${window.location.hostname}:8081/civ_water`,
container
:
'#micro-container'
,
//
container: '#micro-container',
activeRule
:
'/civbase/civ_water'
,
//
activeRule: '/civbase/civ_water',
},
//
},
{
{
name
:
'civ_webgis'
,
name
:
'civ_webgis'
,
entry
:
`//
${
window
.
location
.
hostname
}
:8082/civ_webgis`
,
entry
:
`//
${
window
.
location
.
hostname
}
:8082/civ_webgis`
,
container
:
'#micro-container'
,
container
:
'#micro-container'
,
activeRule
:
'/civbase/civ_webgis'
,
activeRule
:
'/civbase/civ_webgis'
,
},
},
{
name
:
'civ_energy'
,
entry
:
`//
${
window
.
location
.
hostname
}
:8081/civ_energy`
,
container
:
'#micro-container'
,
activeRule
:
'/civbase/civ_energy'
,
},
{
{
name
:
'civweb4'
,
name
:
'civweb4'
,
entry
:
`//
${
window
.
location
.
hostname
}
:3020/civweb4`
,
entry
:
`//
${
window
.
location
.
hostname
}
:3020/civweb4`
,
...
...
This diff is collapsed.
Click to expand it.
config/proxy.js
View file @
79d91fc0
/* 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
=
'http://192.168.10.15
0:8669
'
const
proxyURL
=
'http://192.168.10.15
2:8062
'
//'http://192.168.12.47:8081';
//'http://192.168.12.47:8081';
module
.
exports
=
{
module
.
exports
=
{
assetsRoot
:
process
.
env
.
NODE_ENV
!==
'production'
?
proxyURL
:
'./'
,
assetsRoot
:
process
.
env
.
NODE_ENV
!==
'production'
?
proxyURL
:
'./'
,
...
...
This diff is collapsed.
Click to expand it.
src/components/GlobalHeader/RightContent.js
View file @
79d91fc0
...
@@ -236,4 +236,4 @@ const mapDispatchToProps = dispatch => ({
...
@@ -236,4 +236,4 @@ const mapDispatchToProps = dispatch => ({
export
default
connect
(
export
default
connect
(
mapStateToProps
,
mapStateToProps
,
mapDispatchToProps
,
mapDispatchToProps
,
)(
withRouter
(
GlobalHeaderRight
)
);
)(
GlobalHeaderRight
);
This diff is collapsed.
Click to expand it.
src/micro.js
View file @
79d91fc0
...
@@ -127,11 +127,12 @@ export const initMicroApps = (loader, store) => {
...
@@ -127,11 +127,12 @@ export const initMicroApps = (loader, store) => {
url
.
indexOf
(
'framework/jquery/gridify.qrcode.js'
)
!==
-
1
||
url
.
indexOf
(
'framework/jquery/gridify.qrcode.js'
)
!==
-
1
||
url
.
indexOf
(
'framework/application/Platform.js'
)
!==
-
1
||
url
.
indexOf
(
'framework/application/Platform.js'
)
!==
-
1
||
url
.
indexOf
(
'echarts'
)
!==
-
1
||
url
.
indexOf
(
'echarts'
)
!==
-
1
||
// url.indexOf('lbs.amap.com') !== -1 ||
url
.
indexOf
(
'lbs.amap.com'
)
!==
-
1
||
// url.indexOf('restapi.amap.com') !== -1 ||
url
.
indexOf
(
'restapi.amap.com'
)
!==
-
1
||
// url.indexOf('webapi.amap.com') !== -1 ||
url
.
indexOf
(
'webapi.amap.com'
)
!==
-
1
||
// url.indexOf('webapi.amap.com/count') !== -1 ||
url
.
indexOf
(
'webapi.amap.com/count'
)
!==
-
1
||
// url.indexOf('restapi.amap.com/v3') !== -1 ||
url
.
indexOf
(
'https://webapi.amap.com/maps'
)
!==
-
1
||
url
.
indexOf
(
'restapi.amap.com/v3'
)
!==
-
1
||
url
.
indexOf
(
'api.map.baidu.com'
)
!==
-
1
||
url
.
indexOf
(
'api.map.baidu.com'
)
!==
-
1
||
url
.
indexOf
(
'map.baidu.com'
)
!==
-
1
||
url
.
indexOf
(
'map.baidu.com'
)
!==
-
1
||
url
.
indexOf
(
'pv.sohu.com'
)
!==
-
1
||
url
.
indexOf
(
'pv.sohu.com'
)
!==
-
1
||
...
...
This diff is collapsed.
Click to expand it.
src/routes/config.js
View file @
79d91fc0
import
LoadingComponent
from
'@ant-design/pro-layout/es/PageLoading'
;
import
LoadingComponent
from
'@ant-design/pro-layout/es/PageLoading'
;
import
{
dynamic
}
from
'@wisdom-utils/runtime'
;
import
{
dynamic
}
from
'@wisdom-utils/runtime'
;
import
BasicLayout
from
'../layouts/BasicLayout'
;
import
BasicLayout
from
'../layouts/BasicLayout
1
'
;
import
UserLayout
from
'../layouts/UserLayout'
;
import
UserLayout
from
'../layouts/UserLayout'
;
import
BootPage
from
'../pages/bootpage'
;
import
BootPage
from
'../pages/bootpage'
;
import
Login
from
'../pages/user/login'
;
import
Login
from
'../pages/user/login'
;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment