Commit 4dab662c authored by 皮倩雯's avatar 皮倩雯

fix: '切片管网接口修改'

parent 6597dd07
Pipeline #83033 passed with stages
This diff was suppressed by a .gitattributes entry.
......@@ -110,7 +110,7 @@ const AddModal = props => {
levelEnd: obj.levelEnd,
levelEndEnlarge: obj.levelEndEnlarge,
m_Ip: obj.IP,
m_Port: obj.Port || '8080',
m_Port: obj.Port || '8088',
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: '8080',
Port: '8088',
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 || '8080',
m_Port: obj.Port || '8088',
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 || '8080',
m_Port: obj.Port || '8088',
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 || '8080',
m_Port: obj.Port || '8088',
m_User: obj.User || 'admin',
m_Pwd: obj.Pwd || 'geoserver',
m_Ip: obj.IP || '192.168.12.7',
......
......@@ -336,7 +336,7 @@ const NewEditModal = props => {
gis: 'geoserver217',
proxy: 'javasvc.panda-water.cn/geoserver',
levelEndEnlarge: false,
Port: '8080',
Port: '8088',
User: 'admin',
Pwd: 'geoserver',
});
......@@ -415,7 +415,7 @@ const NewEditModal = props => {
console.log(result);
}
GetGridSetList({
m_Port: obj.Port || '8080',
m_Port: obj.Port || '8088',
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 || '8080',
m_Port: obj.Port || '8088',
m_User: obj.User || 'admin',
m_Pwd: obj.Pwd || 'geoserver',
m_Ip: obj.IP || '192.168.12.7',
......@@ -467,22 +467,18 @@ const NewEditModal = props => {
setCurrent(false);
setAdvanced(0);
}
console.log(e);
console.log(event);
};
const choose = () => {
let obj = form.getFieldsValue();
GetCustomBaseMapList({
m_Port: obj.Port || '8080',
m_Port: obj.Port || '8088',
m_User: obj.User || 'admin',
m_Pwd: obj.Pwd || 'geoserver',
m_Ip: obj.IP || '192.168.12.7',
gsAppName: obj.gis,
}).then(res => {
if (res.IsSuccess == true) {
console.log(res.results);
console.log(Object.keys(res.results));
setSpaceData(res.results);
setKeyData(Object.keys(res.results));
let aa = Object.keys(res.results)[0];
......@@ -490,7 +486,6 @@ const NewEditModal = props => {
let bb = res.results[aa];
let index = bb[0].indexOf(':');
let result = bb[0].substr(index + 1, bb[0].length);
console.log(result);
getGetGridSetList(aa, result);
form.setFieldsValue({ workSpance: aa, layer: bb[0] });
} else {
......
......@@ -203,9 +203,6 @@ const TileData = props => {
QueryBaseMapItems()
.then(res => {
if (res.code === '0') {
res.data.forEach(item => {
item.items = item.items.filter(i => i.type !== 'google-user');
});
setJson(res.data);
}
})
......@@ -244,7 +241,7 @@ const TileData = props => {
.then(res => {
if (res.code == '0') {
setTreeLoading(false);
let newdata = res.data.general.baseMap.layers?.filter(i => i.type !== 'google-user');
let newdata = res.data.general.baseMap.layers?.filter(i => i.isVector === 0);
setTileData(newdata);
let data = [];
res.data.general.baseMap.layers.map(item => {
......
......@@ -76,6 +76,7 @@ const AddModal = props => {
proxyUrl: obj.proxy,
levelStart: obj.levelStart,
origin: obj.origin,
isVector: 1,
resolution: obj.resolution,
tileMatrix: obj.coordinate,
levelEnd: obj.levelEnd,
......
......@@ -336,7 +336,7 @@ const VectorData = props => {
.then(res => {
setTreeTileLoading(false);
if (res.code == '0') {
let newdata = res.data.general.baseMap.layers?.filter(i => i.type === 'google-user');
let newdata = res.data.general.baseMap.layers?.filter(i => i.isVector === 1);
setTileSlicedData(newdata);
let data = [];
newdata.map(item => {
......
......@@ -167,7 +167,7 @@ const AddModal = props => {
})
.then(res => {
if (res.code == '0') {
let newdata = res.data.general.baseMap.layers?.filter(i => i.type === 'google-user');
let newdata = res.data.general.baseMap.layers?.filter(i => i.isVector === 1);
setTileSlicedData(newdata);
} else {
notification.error({
......
......@@ -72,7 +72,7 @@ const EditModal = props => {
})
.then(res => {
if (res.code == '0') {
let newdata = res.data.general.baseMap.layers?.filter(i => i.type === 'google-user');
let newdata = res.data.general.baseMap.layers?.filter(i => i.isVector === 1);
setTileSlicedData(newdata);
} else {
notification.error({
......
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