Commit 0088ce13 authored by 皮倩雯's avatar 皮倩雯

fix: '修改默认底图端口号为18088'

parent f7fcb47c
Pipeline #83219 failed with stages
......@@ -110,7 +110,7 @@ const AddModal = props => {
levelEnd: obj.levelEnd,
levelEndEnlarge: obj.levelEndEnlarge,
m_Ip: obj.IP,
m_Port: obj.Port || '8088',
m_Port: obj.Port || '18088',
m_User: obj.User || 'admin',
m_Pwd: obj.Pwd || 'geoserver',
gsAppName: obj.gis,
......@@ -215,7 +215,7 @@ const AddModal = props => {
gis: 'geoserver217',
IP: '192.168.12.7',
proxy: 'javasvc.panda-water.cn/geoserver',
Port: '8088',
Port: '18088',
User: 'admin',
Pwd: 'geoserver',
isTainDiTu: 0,
......@@ -368,7 +368,7 @@ const AddModal = props => {
result = aa.substr(index + 1, aa.length);
}
GetGridSetList({
m_Port: obj.Port || '8088',
m_Port: obj.Port || '18088',
m_User: obj.User || 'admin',
m_Pwd: obj.Pwd || 'geoserver',
m_Ip: obj.IP || '192.168.12.7',
......@@ -389,7 +389,7 @@ const AddModal = props => {
const getGetCustomBaseMapByName = (a, bb, cc) => {
let obj = form.getFieldsValue();
GetCustomBaseMapByName({
m_Port: obj.Port || '8088',
m_Port: obj.Port || '18088',
m_User: obj.User || 'admin',
m_Pwd: obj.Pwd || 'geoserver',
m_Ip: obj.IP || '192.168.12.7',
......@@ -427,7 +427,7 @@ const AddModal = props => {
const choose = () => {
let obj = form.getFieldsValue();
GetCustomBaseMapList({
m_Port: obj.Port || '8088',
m_Port: obj.Port || '18088',
m_User: obj.User || 'admin',
m_Pwd: obj.Pwd || 'geoserver',
m_Ip: obj.IP || '192.168.12.7',
......
......@@ -219,8 +219,8 @@ const NewEditModal = props => {
setAlpha(formObj.alpha);
let aa;
if (formObj.baseLayer) {
let index = formObj.baseLayer.lastIndexOf(':');
aa = formObj.baseLayer.substring(0, index);
let index = formObj.baseLayer?.lastIndexOf(':');
aa = formObj.baseLayer?.substring(0, index);
console.log(aa);
}
console.log(formObj.baseLayer);
......@@ -260,9 +260,9 @@ const NewEditModal = props => {
workSpance: aa,
// type: `${formObj.servicename}(${formObj.type})`,
});
let index = formObj.icon.lastIndexOf('/');
let index = formObj.icon?.lastIndexOf('/');
console.log(index);
let str = formObj.icon.substring(index + 1, formObj.icon.length);
let str = formObj.icon?.substring(index + 1, formObj.icon?.length);
console.log(str);
let defaultIndex = arr.filter((item, index) => {
if (item.indexOf(str) != -1) {
......@@ -270,13 +270,13 @@ const NewEditModal = props => {
}
});
console.log(defaultIndex);
if (str.indexOf(1) != -1) {
if (str?.indexOf(1) != -1) {
setPickItem(0);
} else if (str.indexOf(2) != -1) {
} else if (str?.indexOf(2) != -1) {
setPickItem(1);
} else if (str.indexOf(3) != -1) {
} else if (str?.indexOf(3) != -1) {
setPickItem(2);
} else if (str.indexOf(4) != -1) {
} else if (str?.indexOf(4) != -1) {
setPickItem(3);
}
setRadio(defaultIndex[0]);
......@@ -336,7 +336,7 @@ const NewEditModal = props => {
gis: 'geoserver217',
proxy: 'javasvc.panda-water.cn/geoserver',
levelEndEnlarge: false,
Port: '8088',
Port: '18088',
User: 'admin',
Pwd: 'geoserver',
});
......@@ -415,7 +415,7 @@ const NewEditModal = props => {
console.log(result);
}
GetGridSetList({
m_Port: obj.Port || '8088',
m_Port: obj.Port || '18088',
m_User: obj.User || 'admin',
m_Pwd: obj.Pwd || 'geoserver',
m_Ip: obj.IP || '192.168.12.7',
......@@ -438,7 +438,7 @@ const NewEditModal = props => {
const getGetCustomBaseMapByName = (a, bb, cc) => {
let obj = form.getFieldsValue();
GetCustomBaseMapByName({
m_Port: obj.Port || '8088',
m_Port: obj.Port || '18088',
m_User: obj.User || 'admin',
m_Pwd: obj.Pwd || 'geoserver',
m_Ip: obj.IP || '192.168.12.7',
......@@ -472,7 +472,7 @@ const NewEditModal = props => {
const choose = () => {
let obj = form.getFieldsValue();
GetCustomBaseMapList({
m_Port: obj.Port || '8088',
m_Port: obj.Port || '18088',
m_User: obj.User || 'admin',
m_Pwd: obj.Pwd || 'geoserver',
m_Ip: obj.IP || '192.168.12.7',
......
......@@ -142,7 +142,7 @@ const AddModal = props => {
gsAppName: 'geoserver217',
IP: '192.168.12.7',
proxy: 'javasvc.panda-water.cn/geoserver',
Port: '8088',
Port: '18088',
User: 'admin',
Pwd: 'geoserver',
isTainDiTu: 0,
......@@ -228,7 +228,7 @@ const AddModal = props => {
result = aa.substr(index + 1, aa.length);
}
GetGridSetList({
m_Port: obj.Port || '8088',
m_Port: obj.Port || '18088',
m_User: obj.User || 'admin',
m_Pwd: obj.Pwd || 'geoserver',
m_Ip: obj.IP || '192.168.12.7',
......@@ -249,7 +249,7 @@ const AddModal = props => {
const getGetCustomBaseMapByName = (a, bb, cc) => {
let obj = form.getFieldsValue();
GetCustomBaseMapByName({
m_Port: obj.Port || '8088',
m_Port: obj.Port || '18088',
m_User: obj.User || 'admin',
m_Pwd: obj.Pwd || 'geoserver',
m_Ip: obj.IP || '192.168.12.7',
......@@ -282,7 +282,7 @@ const AddModal = props => {
const choose = (e, value) => {
let obj = value ? value : form.getFieldsValue();
GetCustomBaseMapList({
m_Port: obj.Port || '8088',
m_Port: obj.Port || '18088',
m_User: obj.User || 'admin',
m_Pwd: obj.Pwd || 'geoserver',
m_Ip: obj.IP || '192.168.12.7',
......
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