Skip to content

C
CivManage
Commit 5448ff80 authored by 张志伟's avatar 张志伟
Browse files
Options

perf:地图支持设置底图设置范围

parent f8d3d6df
Pipeline #95622 waiting for manual action with stages
        Hide whitespace changes
        Inline Side-by-side
        Showing with 189 additions and 311 deletions
        src/pages/platformCenter/gis/schemeConfig/TileConfig/AddModal.jsx
        View file @ 5448ff80
        ......@@ -38,6 +38,7 @@ import {
        GetGridSetList,
        GetCustomBaseMapByName,
        } from '@/services/webConfig/api';
        import { handleMapMaxZoom } from '@/utils/utils';
        const { Item } = Form;
        const { Option } = Select;
        ......@@ -71,6 +72,7 @@ const AddModal = props => {
        const [radio1, setRadio1] = useState();
        const [keepJsonData, setKeepJsonData] = useState([]);
        const [maplayer, setMaplayer] = useState([]);
        const [baseMapMaxZoom,setBaseMapMaxZoom] = useState (handleMapMaxZoom('amap-v'))
        const arr = [
        'assets/images/thumbnail/thumbnail_1.jpg',
        'assets/images/thumbnail/thumbnail_2.jpg',
        ......@@ -85,7 +87,6 @@ const AddModal = props => {
        setLoading(true);
        let obj = form.getFieldsValue();
        let arr = {};
        console.log(obj.url);
        // 连点
        if (obj.servicename) {
        if (mapType == 1) {
        ......@@ -114,6 +115,8 @@ const AddModal = props => {
        m_User: obj.User || 'admin',
        m_Pwd: obj.Pwd || 'panda_server@2023',
        gsAppName: obj.gis,
        baseMaxZoom:obj.baseMaxZoom,
        baseMinZoom:obj.baseMinZoom,
        }),
        };
        } else {
        ......@@ -122,17 +125,6 @@ const AddModal = props => {
        if (list) {
        url = list.url;
        }
        // if (obj.type == 'streetPurplishBlue') {
        // url = '//map.geoq.cn/ArcGIS/rest/services/ChinaOnlineStreetPurplishBlue/MapServer';
        // } else if (obj.type == 'streetGray') {
        // url = '//map.geoq.cn/ArcGIS/rest/services/ChinaOnlineStreetGray/MapServer';
        // } else if (obj.type == 'streetWarm') {
        // 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 == 'tianditu-arcgis-i') {
        // url = '//services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer';
        // }
        arr = {
        servicename: obj.servicename,
        terminalType: 'base',
        ......@@ -146,6 +138,8 @@ const AddModal = props => {
        type: obj.type,
        isTainDiTu: obj.isTainDiTu,
        levelEnd: obj.levelEnd,
        baseMaxZoom:obj.baseMaxZoom,
        baseMinZoom:obj.baseMinZoom,
        }),
        };
        }
        ......@@ -221,6 +215,8 @@ const AddModal = props => {
        Pwd: 'panda_server@2023',
        isTainDiTu: 0,
        levelEndEnlarge: false,
        baseMinZoom:1,
        baseMaxZoom:handleMapMaxZoom('amap-v')
        });
        break;
        ......@@ -282,12 +278,15 @@ const AddModal = props => {
        };
        const handleChange = (value, label) => {
        let str = label[0].split('（');
        let maxZoom = handleMapMaxZoom(value)
        setAdvanced(0);
        setCurrent(false);
        form.setFieldsValue({
        label: str[0],
        servicename: str[0],
        baseMaxZoom: maxZoom
        });
        setBaseMapMaxZoom(maxZoom)
        if (value == 'google-user' || value == 'pipenet-tile') {
        setMapType(1);
        } else {
        ......@@ -570,21 +569,37 @@ const AddModal = props => {
        <Item label="标签" name="label" rules={[{ required: true, message: '请输入标签' }]}>
        <Input placeholder="请输入标签名" allowClear />
        </Item>
        {/* <Item label="URL" name="url">
        <Input placeholder="请输入URL" allowClear />
        </Item> */}
        {/* <Item label="透明度" name="alpha">
        <Slider
        marks={marks}
        min={0}
        max={100}
        onChange={onChange}
        // step={0.1}
        tipFormatter={tipFormatter}
        // tooltipVisible
        defaultValue={100}
        />
        </Item> */}
        <Item label="缩放级别">
        <Row>
        <Col span={5}>
        <Item name="baseMinZoom" rules={[{ required: true, message: '请输入最小级别' }]}>
        <InputNumber min={1} max={baseMapMaxZoom} />
        </Item>
        </Col>
        <Col span={1}>
        <div style={{ marginTop: '4px' }}>~</div>
        </Col>
        <Col span={10}>
        <Item
        name="baseMaxZoom"
        rules={[
        {
        validator: (rule, value) => {
        const obj = form.getFieldsValue().baseMinZoom;
        const objmax = form.getFieldsValue().baseMaxZoom;
        if (objmax < obj) {
        return Promise.reject('最大级别不能小于最小级别');
        }
        return Promise.resolve();
        },
        },
        ]}
        >
        <InputNumber min={1} max={baseMapMaxZoom} />
        </Item>
        </Col>
        </Row>
        </Item>
        <Item
        label="选择缩略图"
        name="icon"
        ......@@ -608,9 +623,6 @@ const AddModal = props => {
        form.setFieldsValue({ icon: arr[index] });
        }}
        />
        {/* <Radio.Group options={item} onChange={radioChange} value={radio}>
        <Radio value={arr[index]} />
        </Radio.Group> */}
        </div>
        ))}
        </div>
        ......@@ -638,9 +650,6 @@ const AddModal = props => {
        </Item>
        </>
        )}
        {/* <Item label="缩略图" name="icon" rules={[{ required: true, message: '请选择缩略图' }]}>
        <Input placeholder="请输入URL" disabled />
        </Item> */}
        {mapType === 1 ? (
        <>
        <Item label="ip地址" name="IP" rules={[{ required: true, message: '请输入ip地址' }]}>
        ......
        src/pages/platformCenter/gis/schemeConfig/TileConfig/AddProjectModal.jsx
        View file @ 5448ff80
        ......@@ -9,13 +9,17 @@ import {
        bindSchemeBaseMap,
        SetBaseMapschemeName,
        } from '@/services/webConfig/api';
        import { InfoCircleOutlined } from '@ant-design/icons';
        import { handleMapMaxZoom } from '@/utils/utils';
        const { Item } = Form;
        const { Option } = Select;
        const AddProjectModal = props => {
        const { callBackSubmit = () => {}, type, formObj, visible, serviceList, cardData, all } = props;
        const { callBackSubmit = () => {}, type, formObj, visible, serviceList, cardData, all, allBaseMap } = props;
        const [loading, setLoading] = useState(false);
        const [baseMap, setBaseMap] = useState([]);
        const [baseMapZoomRange,setBaseMapZoomRange] = useState ({
        max:20,
        min:1
        })
        const [pipeArr, setPipeArr] = useState([]);
        const [arr, setArr] = useState([]);
        ......@@ -26,35 +30,7 @@ const AddProjectModal = props => {
        if (validate) {
        setLoading(true);
        let obj = form.getFieldsValue();
        if (type === 'add') {
        // let aa = cardData.find(i => i.schemename == formObj.schemename);
        // aa.baseMap.push(obj.serverName);
        // aa.baseMapDetail.push({ servicename: obj.serverName, zoom: obj.zoom });
        // let query = {
        // schemename: formObj.schemename,
        // terminalType: 'baseMapscheme',
        // isBaseMap: 'false',
        // jsonCfg: JSON.stringify({
        // baseMap: aa.baseMap,
        // baseMapDetail: aa.baseMapDetail,
        // }),
        // };
        // SetServiceConfig(query)
        // .then(res => {
        // setLoading(false);
        // if (res.msg === 'Ok') {
        // form.resetFields();
        // callBackSubmit();
        // prompt('success', '瓦片新增成功');
        // } else {
        // prompt('fail', '瓦片新增失败');
        // }
        // })
        // .catch(err => {
        // setLoading(false);
        // });
        let data = {
        schemename: formObj.schemename,
        servicename: obj.serverName,
        ......@@ -98,19 +74,12 @@ const AddProjectModal = props => {
        };
        const handleEdit = () => {
        let obj = form.getFieldsValue();
        // let query = {
        // schemename: obj.schemename,
        // terminalType: 'baseMapscheme',
        // isBaseMap: 'false',
        // jsonCfg: JSON.stringify({
        // baseMap: [obj.baseMap],
        // alpha: 1,
        // }),
        // };
        let currentMap = allBaseMap.find(i=>i.servicename === obj.baseMap)
        let data = {
        schemename: obj.schemename,
        servicename: obj.baseMap,
        zoom: 0,
        zoom: currentMap.baseMinZoom,
        maxZoom: currentMap.baseMaxZoom,
        };
        SetBaseMapschemeName(data)
        .then(res => {
        ......@@ -126,25 +95,10 @@ const AddProjectModal = props => {
        .catch(err => {
        setLoading(false);
        });
        // SetServiceConfig(query)
        // .then(res => {
        // setLoading(false);
        // if (res.msg === 'Ok') {
        // form.resetFields();
        // callBackSubmit();
        // prompt('success', '方案新增成功');
        // } else {
        // prompt('fail', '方案新增失败');
        // }
        // })
        // .catch(err => {
        // setLoading(false);
        // });
        };
        const onFinish = value => {};
        useEffect(() => {
        console.log(type);
        switch (type) {
        case 'add':
        addTile();
        ......@@ -164,10 +118,16 @@ const AddProjectModal = props => {
        aa.baseMapDetail.map(i => {
        arrNew.push(i.zoom);
        });
        console.log(arrNew);
        setArr(arrNew);
        let _baseMapMaxZoom = handleMapMaxZoom(all[0].servicename)
        setBaseMapZoomRange({
        max: _baseMapMaxZoom < all[0].baseMaxZoom ? _baseMapMaxZoom :all[0].baseMaxZoom,
        min: all[0].baseMinZoom < 1 ? 1 : all[0].baseMinZoom
        })
        form.setFieldsValue({
        serverName: serviceList[0],
        serverName: all[0].servicename,
        zoom:1,
        maxzoom:_baseMapMaxZoom,
        });
        };
        // 获取管网及默认底图
        ......@@ -206,18 +166,18 @@ const AddProjectModal = props => {
        };
        // 选择服务名
        const handleChange = () => {};
        // 选择管网
        const handleService = value => {
        form.setFieldsValue({
        label: value,
        // url: `http://{IP}/PandaGIS/MapServer/Export?mapServerName=${value}`,
        url: `http://{IP}/CityInterface/rest/services/MapServer.svc/${value}`,
        });
        const handleChange = (name) => {
        const currentMapInfo = all.find(i=>i.servicename === name)
        form.setFieldsValue({
        zoom:currentMapInfo.baseMinZoom,
        maxzoom:currentMapInfo.baseMaxZoom
        })
        };
        // 选择底图
        const handleBaseMap = () => {};
        return (
        <Modal
        title={`${type === 'add' ? '添加基础底图' : '添加分级底图'}`}
        ......@@ -242,37 +202,12 @@ const AddProjectModal = props => {
        <Row>
        <Col span={7}>
        <Item
        // label={
        // <div>
        // {/* <Tooltip title="同一分级底图中的不同基础底图级别不能相同">
        // <InfoCircleOutlined
        // style={{
        // color: 'rgb(24, 144, 255)',
        // marginLeft: '0px',
        // marginRight: '5px',
        // }}
        // />
        // </Tooltip> */}
        // <span>最小级别</span>
        // </div>
        // }
        name="zoom"
        rules={[
        { required: true, message: '请输入最小级别' },
        // {
        // validator: (rule, value) => {
        // const obj = form.getFieldsValue().zoom;
        // console.log(obj);
        // if (arr.indexOf(obj) != -1) {
        // console.log(111);
        // return Promise.reject('已存在该级别的基础底图');
        // }
        // return Promise.resolve();
        // },
        // },
        ]}
        >
        <InputNumber min={0} max={99} />
        <InputNumber min={baseMap.min} max={baseMapZoomRange.max} />
        </Item>
        </Col>
        <Col span={2}>
        ......@@ -295,7 +230,7 @@ const AddProjectModal = props => {
        },
        ]}
        >
        <InputNumber min={0} max={99} />
        <InputNumber min={baseMap.min} max={baseMapZoomRange.max} />
        </Item>
        </Col>
        </Row>
        ......@@ -306,10 +241,10 @@ const AddProjectModal = props => {
        rules={[{ required: true, message: '请输入基础底图' }]}
        >
        <Select onChange={handleChange}>
        {serviceList.length
        ? serviceList.map((item, index) => (
        <Option key={index} value={item}>
        {item}
        {all.length
        ? all.map((item, index) => (
        <Option key={index} value={item.servicename}>
        {item.servicename}
        </Option>
        ))
        : ''}
        ......
        src/pages/platformCenter/gis/schemeConfig/TileConfig/BaseMap.jsx
        View file @ 5448ff80
        ......@@ -19,22 +19,26 @@ import { InfoCircleOutlined } from '@ant-design/icons';
        const { Item } = Form;
        const { Option } = Select;
        const BaseMap = props => {
        const { visible, onCancel, keepItem, keepProject, callBackSubmit = () => {} } = props;
        const { visible, onCancel, keepItem, keepProject, callBackSubmit = () => {}, allBaseMap } = props;
        const [arr, setArr] = useState([]);
        const [form] = Form.useForm();
        const [baseMapZoomRange,setBaseMapZoomRange] = useState ({
        max:20,
        min:1
        })
        // 删除瓦片
        useEffect(() => {
        console.log(keepItem);
        console.log(keepProject);
        if (visible) {
        let list = [];
        keepItem.baseMapDetail.map(i => {
        list.push(i.zoom);
        });
        setArr(list);
        let aa = keepItem.baseMapDetail.find(i => i.servicename == keepProject);
        form.setFieldsValue({ zoom: aa.zoom, maxzoom: aa.maxzoom });
        let findMap = keepItem.baseMapDetail.find(i => i.servicename == keepProject);
        let currentBaseMap = allBaseMap.find(i => i.servicename == keepProject)
        setBaseMapZoomRange({max:currentBaseMap.baseMaxZoom,min:currentBaseMap.baseMinZoom})
        form.setFieldsValue({ zoom: findMap.zoom, maxzoom: findMap.maxzoom });
        } else {
        form.resetFields();
        }
        ......@@ -44,29 +48,6 @@ const BaseMap = props => {
        form.validateFields().then(validate => {
        if (validate) {
        let obj = form.getFieldsValue();
        // let aa = keepItem.baseMapDetail.find(i => i.servicename == keepProject);
        // console.log(aa);
        // aa.zoom = obj.zoom;
        // let query = {
        // schemename: keepItem.schemename,
        // terminalType: 'baseMapscheme',
        // isBaseMap: 'false',
        // jsonCfg: JSON.stringify({
        // baseMap: keepItem.baseMap,
        // baseMapDetail: keepItem.baseMapDetail,
        // }),
        // };
        // SetServiceConfig(query)
        // .then(res => {
        // if (res.msg === 'Ok') {
        // form.resetFields();
        // callBackSubmit();
        // prompt('success', '编辑成功');
        // } else {
        // prompt('fail', '编辑失败');
        // }
        // })
        // .catch(err => {});
        let data = {
        schemename: keepItem.schemename,
        servicename: keepProject,
        ......@@ -137,38 +118,12 @@ const BaseMap = props => {
        <Row>
        <Col span={8}>
        <Item
        // label={
        // <div>
        // <Tooltip title="同一分级底图中的不同基础底图级别不能相同">
        // <InfoCircleOutlined
        // style={{
        // color: 'rgb(24, 144, 255)',
        // marginLeft: '0px',
        // marginRight: '5px',
        // }}
        // />
        // </Tooltip>
        // <span>最小级别</span>
        // </div>
        // }
        name="zoom"
        rules={[
        { required: true, message: '请输入级别' },
        // {
        // validator: (rule, value) => {
        // const obj = form.getFieldsValue().zoom;
        // console.log(obj);
        // if (arr.indexOf(obj) != -1) {
        // console.log(111);
        // return Promise.reject('已存在该级别的基础底图');
        // }
        // return Promise.resolve();
        // },
        // },
        ]}
        >
        <InputNumber min={0} />
        <InputNumber min={baseMapZoomRange.min} max={baseMapZoomRange.max} />
        </Item>
        </Col>
        <Col span={3}>
        ......@@ -190,7 +145,7 @@ const BaseMap = props => {
        },
        ]}
        >
        <InputNumber min={0} max={99} />
        <InputNumber min={baseMapZoomRange.min} max={baseMapZoomRange.max} />
        </Item>
        </Col>
        </Row>
        ......
        src/pages/platformCenter/gis/schemeConfig/TileConfig/NewEditModal.jsx
        View file @ 5448ff80
        ......@@ -38,6 +38,7 @@ import {
        GetGridSetList,
        GetCustomBaseMapByName,
        } from '@/services/webConfig/api';
        import { handleMapMaxZoom } from '@/utils/utils';
        const { Item } = Form;
        const { Option } = Select;
        const { TreeNode } = TreeSelect;
        ......@@ -67,6 +68,7 @@ const NewEditModal = props => {
        const [form] = Form.useForm();
        const [radio1, setRadio1] = useState();
        const [keepJsonData, setKeepJsonData] = useState([]);
        const [baseMapMaxZoom,setBaseMapMaxZoom] = useState (20)
        const arr = [
        'assets/images/thumbnail/thumbnail_1.jpg',
        'assets/images/thumbnail/thumbnail_2.jpg',
        ......@@ -81,10 +83,9 @@ const NewEditModal = props => {
        if (validate) {
        setLoading(true);
        let obj = form.getFieldsValue();
        let arr = {};
        console.log(mapType);
        let submitObj = {};
        if (mapType == 1) {
        arr = {
        submitObj = {
        servicename: obj.servicename,
        terminalType: 'base',
        isBaseMap: true,
        ......@@ -109,6 +110,8 @@ const NewEditModal = props => {
        m_User: obj.User,
        m_Pwd: obj.Pwd,
        gsAppName: obj.gis,
        baseMaxZoom: obj.baseMaxZoom,
        baseMinZoom: obj.baseMinZoom,
        }),
        };
        } else {
        ......@@ -117,18 +120,7 @@ const NewEditModal = props => {
        if (list) {
        url = list.url;
        }
        // if (obj.type == 'streetPurplishBlue') {
        // url = '//map.geoq.cn/ArcGIS/rest/services/ChinaOnlineStreetPurplishBlue/MapServer';
        // } else if (obj.type == 'streetGray') {
        // url = '//map.geoq.cn/ArcGIS/rest/services/ChinaOnlineStreetGray/MapServer';
        // } else if (obj.type == 'streetWarm') {
        // 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 == 'tianditu-arcgis-i') {
        // url = '//services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer';
        // }
        arr = {
        submitObj = {
        servicename: obj.servicename,
        terminalType: 'base',
        isBaseMap: true,
        ......@@ -154,11 +146,13 @@ const NewEditModal = props => {
        m_User: null,
        m_Pwd: null,
        gsAppName: null,
        baseMinZoom: obj.baseMinZoom,
        baseMaxZoom: obj.baseMaxZoom
        }),
        };
        }
        SetServiceConfig(arr)
        SetServiceConfig(submitObj)
        .then(res => {
        if (res.code == '0') {
        form.resetFields();
        ......@@ -188,12 +182,6 @@ const NewEditModal = props => {
        const onFinish = value => {};
        useEffect(() => {
        // let data = [];
        // jsonData.forEach(item => {
        // data = [...data, ...item.items];
        // });
        // setKeepJsonData(data);
        if (json.length > 0) {
        setMaplayer(json);
        let data = [];
        ......@@ -215,15 +203,12 @@ const NewEditModal = props => {
        setKeyData([]);
        setData([]);
        setAreaData([]);
        console.log(formObj);
        setAlpha(formObj.alpha);
        let aa;
        if (formObj.baseLayer) {
        let index = formObj.baseLayer?.lastIndexOf(':');
        aa = formObj.baseLayer?.substring(0, index);
        console.log(aa);
        }
        console.log(formObj.baseLayer);
        if (formObj.type == 'pipenet-tile' || formObj.type == 'google-user') {
        setMapType(1);
        } else {
        ......@@ -241,10 +226,11 @@ const NewEditModal = props => {
        setAdvanced(0);
        setCurrent(false);
        }
        console.log(formObj.isTainDiTu);
        setRadio1(formObj.isTainDiTu);
        switch (type) {
        case 'edit':
        let _baseMapMaxZoom = handleMapMaxZoom(formObj.layerType)
        setBaseMapMaxZoom(_baseMapMaxZoom)
        form.setFieldsValue({
        ...formObj,
        isTainDiTu: formObj.isTainDiTu,
        ......@@ -258,18 +244,17 @@ const NewEditModal = props => {
        User: formObj.m_User,
        Pwd: formObj.m_Pwd,
        workSpance: aa,
        // type: `${formObj.servicename}（${formObj.type}）`,
        baseMaxZoom:formObj?.baseMaxZoom && formObj?.baseMaxZoom !== 99 ?
        formObj?.baseMaxZoom : _baseMapMaxZoom,
        baseMinZoom:formObj?.baseMinZoom ? formObj?.baseMinZoom : 1,
        });
        let index = formObj.icon?.lastIndexOf('/');
        console.log(index);
        let str = formObj.icon?.substring(index + 1, formObj.icon?.length);
        console.log(str);
        let defaultIndex = arr.filter((item, index) => {
        if (item.indexOf(str) != -1) {
        return item;
        }
        });
        console.log(defaultIndex);
        if (str?.indexOf(1) != -1) {
        setPickItem(0);
        } else if (str?.indexOf(2) != -1) {
        ......@@ -325,11 +310,10 @@ const NewEditModal = props => {
        // label: servicenameToType(value),
        // servicename: servicenameToType(value),
        // });
        console.log(value);
        let _baseMapMaxZoom = handleMapMaxZoom(value)
        setBaseMapMaxZoom(_baseMapMaxZoom)
        if (value == 'google-user' || value == 'pipenet-tile') {
        setMapType(1);
        console.log(form.getFieldsValue().IP);
        console.log(form.getFieldsValue().gis);
        if (!form.getFieldsValue().IP) {
        form.setFieldsValue({
        IP: '192.168.12.7',
        ......@@ -381,27 +365,22 @@ const NewEditModal = props => {
        let lay = form.getFieldsValue().layer;
        let index = lay.indexOf(':');
        let result = lay.substr(index + 1, lay.length);
        console.log(result);
        getGetCustomBaseMapByName(work, result, e);
        };
        // 选择图层
        const handleLayer = e => {
        let index = e.indexOf(':');
        let result = e.substr(index + 1, e.length);
        console.log(result);
        let work = form.getFieldsValue().workSpance;
        console.log(work);
        getGetGridSetList(work, result);
        };
        // 选择工作空间
        const handleWorkSpance = e => {
        console.log(e);
        setData(spaceData[e]);
        form.setFieldsValue({ layer: spaceData[e][0] });
        let aa = form.getFieldsValue().layer;
        let index = aa.indexOf(':');
        let result = aa.substr(index + 1, aa.length);
        console.log(result);
        getGetGridSetList(e, result);
        };
        ......@@ -412,7 +391,6 @@ const NewEditModal = props => {
        if (aa) {
        let index = aa.indexOf(':');
        result = aa.substr(index + 1, aa.length);
        console.log(result);
        }
        GetGridSetList({
        m_Port: obj.Port || '18088',
        ......@@ -424,11 +402,9 @@ const NewEditModal = props => {
        workSpaceName: a,
        }).then(res => {
        let data = [];
        console.log(res.results);
        res.results.map(i => {
        data.push(i.gridSetName);
        });
        console.log(data);
        setAreaData(data);
        form.setFieldsValue({ coordinate: data[0] });
        getGetCustomBaseMapByName(a, bb, data[0]);
        ......@@ -448,9 +424,6 @@ const NewEditModal = props => {
        gridSet: cc,
        }).then(res => {
        let aa = res.results.coords;
        console.log(JSON.parse(aa)[2]);
        console.log(JSON.parse(aa)[3]);
        console.log(JSON.parse(aa).toString());
        form.setFieldsValue({
        range: JSON.parse(aa).toString(),
        resolution: res.results.resolutions,
        ......@@ -602,21 +575,38 @@ const NewEditModal = props => {
        <Item label="标签" name="label" rules={[{ required: true, message: '请输入标签' }]}>
        <Input placeholder="请输入标签名" allowClear />
        </Item>
        {/* <Item label="URL" name="url">
        <Input placeholder="请输入URL" allowClear />
        </Item> */}
        {/* <Item label="透明度" name="alpha">
        {console.log(formObj.alpha)}
        <Slider
        marks={marks}
        min={0}
        max={100}
        onChange={onChange}
        tipFormatter={tipFormatter}
        // // tooltipVisible={true}
        defaultValue={formObj.alpha * 100}
        />
        </Item> */}
        <Item label="缩放级别">
        <Row>
        <Col span={5}>
        <Item name="baseMinZoom" rules={[{ required: true, message: '请输入最小级别' }]}>
        <InputNumber min={1} max={baseMapMaxZoom} />
        </Item>
        </Col>
        <Col span={1}>
        <div style={{ marginTop: '4px' }}>~</div>
        </Col>
        <Col span={10}>
        <Item
        name="baseMaxZoom"
        rules={[
        {
        validator: (rule, value) => {
        const obj = form.getFieldsValue().baseMinZoom;
        const objmax = form.getFieldsValue().baseMaxZoom;
        if (objmax < obj) {
        return Promise.reject('最大级别不能小于最小级别');
        }
        return Promise.resolve();
        },
        },
        ]}
        >
        <InputNumber min={1} max={baseMapMaxZoom} />
        </Item>
        </Col>
        </Row>
        </Item>
        <Item
        label="选择缩略图"
        name="icon"
        ......@@ -675,7 +665,11 @@ const NewEditModal = props => {
        </Item> */}
        {mapType === 1 ? (
        <>
        <Item label="ip地址" name="IP" rules={[{ required: true, message: '请输入ip地址' }]}>
        <Item
        label="ip地址"
        name="IP"
        rules={[{ required: true, message: '请输入ip地址' }]}
        >
        <Input placeholder="请输入ip地址" allowClear />
        </Item>
        <Row>
        ......@@ -805,7 +799,11 @@ const NewEditModal = props => {
        >
        <Input placeholder="请输入用户名" allowClear />
        </Item>
        <Item label="密码" name="Pwd" rules={[{ required: true, message: '请输入密码' }]}>
        <Item
        label="密码"
        name="Pwd"
        rules={[{ required: true, message: '请输入密码' }]}
        >
        <Input placeholder="请输入密码" allowClear />
        </Item>
        <Item
        ......
        src/pages/platformCenter/gis/schemeConfig/TileConfig/TileConfig.jsx
        View file @ 5448ff80
        ......@@ -61,13 +61,6 @@ const TileData = props => {
        key: 'type',
        align: 'center',
        },
        // {
        // title: '透明度',
        // dataIndex: 'alpha',
        // key: 'alpha',
        // align: 'center',
        // render: (text, record) => <span>{`${(text * 100).toFixed()}%`}</span>,
        // },
        {
        title: '编辑',
        align: 'center',
        ......@@ -102,13 +95,13 @@ const TileData = props => {
        ];
        useEffect(() => {
        if(!flagAdd) return
        setTreeLoading(true);
        GetMaplayerByTerminalType({
        terminalType: 'baseMapscheme',
        isBaseMap: false,
        })
        .then(res => {
        console.log('res', res);
        if (res.code == '0') {
        setTreeLoading(false);
        setCardData(res.data.optionalLayer.layers);
        ......@@ -162,8 +155,6 @@ const TileData = props => {
        setFlagAdd(flagAdd + 1);
        setTreeLoading(false);
        if (res.code == '0') {
        // form.resetFields();
        // callBackSubmit();
        notification.success({
        message: '提示',
        duration: 3,
        ......@@ -183,17 +174,8 @@ const TileData = props => {
        });
        };
        const handleAdd = () => {
        // console.log(baseMap);
        // if (baseMap.length) {
        setType('add');
        setAddVisible(true);
        // } else {
        // notification.warning({
        // message: '提示',
        // duration: 3,
        // description: '地图类型已都存在,可编辑修改',
        // });
        // }
        };
        useEffect(() => {
        renderTile();
        ......@@ -251,6 +233,8 @@ const TileData = props => {
        baseMapData.splice(index, 1);
        }
        });
        let _cardLayers = res.data.specific.baseMapscheme.optionalLayer.layers
        setCardData(_cardLayers)
        setName(data);
        setBaseMap(baseMapData);
        } else {
        ......@@ -287,6 +271,7 @@ const TileData = props => {
        const onDeletebaseMap = value => {
        setFlagAdd(flagAdd + 1);
        };
        return (
        <div className={styles.tileContainer}>
        <div>
        ......@@ -329,13 +314,6 @@ const TileData = props => {
        </div>{' '}
        </Divider>
        <div className={styles.cardsList1}>
        {/* <AutoResponsive
        itemMargin="10"
        containerWidth="100%"
        itemClassName="item"
        gridWidth="100"
        transitionDuration=".5"
        > */}
        {cardData && cardData.length ? (
        cardData.map((item, index) => (
        <div
        ......@@ -345,13 +323,12 @@ const TileData = props => {
        offset={2}
        style={{ marginBottom: '1rem' }}
        >
        <Cards item={item} deletebaseMaps={onDeletebaseMap} cardData={cardData} />
        <Cards item={item} deletebaseMaps={onDeletebaseMap} cardData={cardData} allBaseMap={tileData} />
        </div>
        ))
        ) : (
        <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} style={{ margin: 'auto' }} />
        )}
        {/* </AutoResponsive> */}
        </div>
        <AddModal
        ......@@ -388,6 +365,7 @@ const TileData = props => {
        callBackSubmit={onSubmitProject}
        type={type1}
        formObj={formObj}
        allBaseMap={tileData}
        />
        </Spin>
        </div>
        ......
        src/pages/platformCenter/gis/schemeConfig/TileConfig/card.jsx
        View file @ 5448ff80
        ......@@ -16,7 +16,7 @@ import { createGuid } from '@/utils/transformUtil';
        import BaseMap from './BaseMap';
        import styles from '../SchemeConfig.less';
        const CardData = props => {
        const { deletebaseMaps = () => {}, item, cardData } = props;
        const { deletebaseMaps = () => {}, item, cardData, allBaseMap } = props;
        const [visible, setVisible] = useState(false); // 弹窗
        const [flag, setFlag] = useState(0); // 状态更新
        const [type, setType] = useState(''); // 弹窗类型
        ......@@ -29,9 +29,7 @@ const CardData = props => {
        const [keepProject, setKeepProject] = useState('');
        // 删除瓦片
        useEffect(() => {
        console.log(props.item);
        }, []);
        const deletebaseMap = (item, baseMapItem) => {
        DeletMapServicename({ schemename: item.schemename, servicename: baseMapItem }).then(res => {
        if (res.code == '0') {
        ......@@ -86,9 +84,6 @@ const CardData = props => {
        GettMaplayer({ terminalType: 'base', isBaseMap: true }).then(res => {
        if (res.code == '0') {
        res.data.general.baseMap.layers.map(item => {
        console.log(value);
        console.log(value.baseMap);
        console.log(item.servicename);
        if (value.baseMap.indexOf(item.servicename) == -1) {
        serverList.push(item.servicename);
        }
        ......@@ -183,18 +178,6 @@ const CardData = props => {
        }
        style={{ width: 360 }}
        >
        {/* <p>
        <span className={styles.schemeName}>管网</span> {props.item.servicename}
        </p> */}
        {/* <div>
        <span className={styles.schemeName}>范围</span>
        <Button
        style={{ width: '12rem', marginBottom: '0.5rem' }}
        onClick={() => setMapScopeVisible(true)}
        >
        选择范围
        </Button>
        </div> */}
        <div className={styles.schemeItem}>
        <span className={styles.schemeName}>基础底图</span>
        <Button className={styles.schemeBtn1} onClick={() => addTile(props.item)}>
        ......@@ -208,11 +191,6 @@ const CardData = props => {
        ? props.item.baseMapDetail.map((baseMapItem, baseindex) => (
        <div className={styles.mapItem1} key={baseindex}>
        <div
        // onClick={() => pick(props.item.schemename, baseindex)}
        // className={classnames({
        // [styles.defaultTile]: true,
        // [styles.activeTile]: baseindex == props.item.defaultBaseMap,
        // })}
        className={styles.defaultTile1}
        >
        {baseMapItem.maxzoom === 0
        ......@@ -272,6 +250,7 @@ const CardData = props => {
        callBackSubmit={onSubmit}
        keepItem={keepItem}
        keepProject={keepProject}
        allBaseMap={allBaseMap}
        />
        </div>
        );
        ......
        src/pages/platformCenter/gis/schemeConfig/projectMessage/components/card.jsx
        View file @ 5448ff80
        ......@@ -37,26 +37,13 @@ const CardData = props => {
        // 删除瓦片
        useEffect(() => {
        // GettMaplayer({ terminalType: 'base', isBaseMap: true }).then(res => {
        // if (res.msg === 'Ok') {
        // let arr = [];
        // res.data.general.baseMap.layers.map(i => {
        // arr.push(i.servicename);
        // });
        // }
        // });
        setCardData(keepData);
        console.log(props.item);
        }, [cardFlag]);
        const deletebaseMap = (item, baseMapItem) => {
        console.log(item);
        console.log(props.item.defaultOldBaseMap);
        console.log(baseMapItem);
        let j = props.item.defaultOldBaseMap.indexOf(baseMapItem);
        let i = props.item.defaultBaseMap;
        console.log(j);
        console.log(i);
        if (item.baseMap.length > 1) {
        unbindSchemeBaseMap({ schemename: item.schemename, basemapName: baseMapItem }).then(res => {
        if (res.code == '0') {
        ......
        src/utils/utils.js
        View file @ 5448ff80
        import { get } from '@/services/index';
        import { mapConfig } from '@wisdom-map/gis-utils';
        export function compress(
        base64, // 源图片
        rate, // 缩放比例
        ......@@ -46,3 +47,39 @@ export function checkInternalNetwork() {
        }
        })
        }
        export function handleMapMaxZoom(layerType) {
        let configName = '';
        switch (layerType) {
        case 'amap-v':
        case 'amap-i':
        case 'amap-ia':
        case 'amap-v2':
        case 'amap-i2':
        case 'googlemap-v':
        case 'googlemap-i':
        case 'amap-ia2':
        case 'amap-i-ia':
        case 'amap-i2-ia2':
        case 'amap-v-va':
        configName = 'gaoDe';
        break;
        case 'tianditu-v':
        case 'tianditu-va':
        case 'tianditu-i':
        case 'tianditu-ia':
        case 'tianditu-t':
        case 'tianditu-ta':
        case 'tianditu-v-va':
        case 'tianditu-i-ia':
        configName = 'tianDiTu';
        break;
        case 'mapbox-i-ia':
        configName = 'mapBox';
        break;
        default:
        configName = 'default';
        break;
        }
        return mapConfig.baseMapMaxLevel[configName];
        }
        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