Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
CivManage
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
CivManage
Commits
30fb7b0f
Commit
30fb7b0f
authored
Aug 12, 2022
by
皮倩雯
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: '集成登录内外网限制'
parent
f9fcf025
Pipeline
#57620
waiting for manual action with stages
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
55 additions
and
9 deletions
+55
-9
AddModal.jsx
...s/platformCenter/gis/schemeConfig/TileConfig/AddModal.jsx
+3
-3
NewEditModal.jsx
...atformCenter/gis/schemeConfig/TileConfig/NewEditModal.jsx
+2
-2
AddModal.jsx
src/pages/platformCenter/integratedLogin/AddModal.jsx
+50
-4
No files found.
src/pages/platformCenter/gis/schemeConfig/TileConfig/AddModal.jsx
View file @
30fb7b0f
...
...
@@ -106,7 +106,7 @@ const AddModal = props => {
url
=
'//map.geoq.cn/ArcGIS/rest/services/ChinaOnlineStreetWarm/MapServer'
;
}
else
if
(
obj
.
type
==
'mapbox-i-ia'
)
{
url
=
'//api.mapbox.com/v4/mapbox.satellite'
;
}
else
if
(
obj
.
type
==
'arcgis-i'
)
{
}
else
if
(
obj
.
type
==
'
tianditu-
arcgis-i'
)
{
url
=
'//services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer'
;
}
arr
=
{
...
...
@@ -343,7 +343,7 @@ const AddModal = props => {
return
'GeoQ暖色'
;
case
'mapbox-i-ia'
:
return
'mapbox影像'
;
case
'arcgis-i'
:
case
'
tianditu-
arcgis-i'
:
return
'arcgis影像'
;
case
'arcgis-i-ia'
:
return
'arcgis影像注记'
;
...
...
@@ -539,7 +539,7 @@ const AddModal = props => {
<
Option
value=
"streetGray"
>
GeoQ水墨灰(streetGray)
</
Option
>
<
Option
value=
"streetWarm"
>
GeoQ暖色(streetWarm)
</
Option
>
<
Option
value=
"mapbox-i-ia"
>
mapbox影像(mapbox-i-ia)
</
Option
>
<
Option
value=
"
arcgis-i"
>
arcgis影像(
arcgis-i)
</
Option
>
<
Option
value=
"
tianditu-arcgis-i"
>
arcgis影像(tianditu-
arcgis-i)
</
Option
>
<
Option
value=
"arcgis-i-ia"
>
arcgis影像注记(arcgis-i-ia)
</
Option
>
</
Select
>
</
Item
>
...
...
src/pages/platformCenter/gis/schemeConfig/TileConfig/NewEditModal.jsx
View file @
30fb7b0f
...
...
@@ -102,7 +102,7 @@ const NewEditModal = props => {
url
=
'//map.geoq.cn/ArcGIS/rest/services/ChinaOnlineStreetWarm/MapServer'
;
}
else
if
(
obj
.
type
==
'mapbox-i-ia'
)
{
url
=
'//api.mapbox.com/v4/mapbox.satellite'
;
}
else
if
(
obj
.
type
==
'arcgis-i'
)
{
}
else
if
(
obj
.
type
==
'
tianditu-
arcgis-i'
)
{
url
=
'//services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer'
;
}
arr
=
{
...
...
@@ -500,7 +500,7 @@ const NewEditModal = props => {
<
Option
value=
"streetGray"
>
GeoQ水墨灰(streetGray)
</
Option
>
<
Option
value=
"streetWarm"
>
GeoQ暖色(streetWarm)
</
Option
>
<
Option
value=
"mapbox-i-ia"
>
mapbox影像(mapbox-i-ia)
</
Option
>
<
Option
value=
"
arcgis-i"
>
arcgis影像(
arcgis-i)
</
Option
>
<
Option
value=
"
tianditu-arcgis-i"
>
arcgis影像(tianditu-
arcgis-i)
</
Option
>
<
Option
value=
"arcgis-i-ia"
>
arcgis影像注记(arcgis-i-ia)
</
Option
>
</
Select
>
</
Item
>
...
...
src/pages/platformCenter/integratedLogin/AddModal.jsx
View file @
30fb7b0f
...
...
@@ -210,9 +210,7 @@ const AddModal = props => {
let
data
=
[];
if
(
obj
.
coordinate
)
{
data
=
obj
.
coordinate
.
split
(
','
);
console
.
log
(
data
);
}
if
(
type
===
'add'
)
{
AddIntegratedLogin
({
systemName
:
obj
.
systemName
,
...
...
@@ -455,10 +453,58 @@ const AddModal = props => {
<
Input
allowClear
style=
{
{
width
:
'100%'
}
}
placeholder=
"请输入名称"
/>
</
Item
>
)
}
<
Item
label=
"外网地址"
name=
"internetAddress"
>
<
Item
label=
"外网地址"
name=
"internetAddress"
rules=
{
[
{
validator
:
(
rule
,
value
)
=>
{
let
aa
=
form
.
getFieldValue
().
internetAddress
;
let
bb
=
aa
.
split
(
'//'
);
let
cc
=
bb
[
1
].
split
(
':'
);
let
regEn
=
/^10
\.(
1
\d
{2}|2
[
0-4
]\d
|25
[
0-5
]
|
[
1-9
]\d
|
[
0-9
])\.(
1
\d
{2}|2
[
0-4
]\d
|25
[
0-5
]
|
[
1-9
]\d
|
[
0-9
])\.(
1
\d
{2}|2
[
0-4
]\d
|25
[
0-5
]
|
[
1-9
]\d
|
[
0-9
])
$/
;
let
regFn
=
/^172
\.(
1
[
6789
]
|2
[
0-9
]
|3
[
01
])\.(
1
\d
{2}|2
[
0-4
]\d
|25
[
0-5
]
|
[
1-9
]\d
|
[
0-9
])\.(
1
\d
{2}|2
[
0-4
]\d
|25
[
0-5
]
|
[
1-9
]\d
|
[
0-9
])
$/
;
let
regCn
=
/^192
\.
168
\.(
1
\d
{2}|2
[
0-4
]\d
|25
[
0-5
]
|
[
1-9
]\d
|
[
0-9
])\.(
1
\d
{2}|2
[
0-4
]\d
|25
[
0-5
]
|
[
1-9
]\d
|
[
0-9
])
$/
;
let
reg
=
/^
(
127
\.
0
\.
0
\.
1
)
|
(
localhost
)
/
;
let
ss
=
[];
ss
.
push
(
regEn
.
test
(
cc
[
0
]));
ss
.
push
(
regFn
.
test
(
cc
[
0
]));
ss
.
push
(
regCn
.
test
(
cc
[
0
]));
ss
.
push
(
reg
.
test
(
cc
[
0
]));
if
(
ss
.
indexOf
(
true
)
!==
-
1
)
{
return
Promise
.
reject
(
'外网IP不正确'
);
}
return
Promise
.
resolve
();
},
},
]
}
>
<
AutoComplete
placeholder=
"建议使用公网IP或域名"
options=
{
options
}
allowClear
/>
</
Item
>
<
Item
label=
"内网地址"
name=
"intranetAddress"
>
<
Item
label=
"内网地址"
name=
"intranetAddress"
rules=
{
[
{
validator
:
(
rule
,
value
)
=>
{
let
aa
=
form
.
getFieldValue
().
intranetAddress
;
let
bb
=
aa
.
split
(
'//'
);
let
cc
=
bb
[
1
].
split
(
':'
);
let
regEn
=
/^10
\.(
1
\d
{2}|2
[
0-4
]\d
|25
[
0-5
]
|
[
1-9
]\d
|
[
0-9
])\.(
1
\d
{2}|2
[
0-4
]\d
|25
[
0-5
]
|
[
1-9
]\d
|
[
0-9
])\.(
1
\d
{2}|2
[
0-4
]\d
|25
[
0-5
]
|
[
1-9
]\d
|
[
0-9
])
$/
;
let
regFn
=
/^172
\.(
1
[
6789
]
|2
[
0-9
]
|3
[
01
])\.(
1
\d
{2}|2
[
0-4
]\d
|25
[
0-5
]
|
[
1-9
]\d
|
[
0-9
])\.(
1
\d
{2}|2
[
0-4
]\d
|25
[
0-5
]
|
[
1-9
]\d
|
[
0-9
])
$/
;
let
regCn
=
/^192
\.
168
\.(
1
\d
{2}|2
[
0-4
]\d
|25
[
0-5
]
|
[
1-9
]\d
|
[
0-9
])\.(
1
\d
{2}|2
[
0-4
]\d
|25
[
0-5
]
|
[
1-9
]\d
|
[
0-9
])
$/
;
let
ss
=
[];
ss
.
push
(
regEn
.
test
(
cc
[
0
]));
ss
.
push
(
regFn
.
test
(
cc
[
0
]));
ss
.
push
(
regCn
.
test
(
cc
[
0
]));
if
(
ss
.
indexOf
(
true
)
==
-
1
)
{
return
Promise
.
reject
(
'局域网IP不正确'
);
}
return
Promise
.
resolve
();
},
},
]
}
>
<
AutoComplete
placeholder=
"建议使用局域网IP"
options=
{
options
}
allowClear
/>
</
Item
>
<
Row
>
...
...
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