fix: '瓦片管网'

src/pages/platformCenter/gis/schemeConfig/SchemeConfig.less

@@ -43,7 +43,6 @@
 .imgHidden {
   border: none;
 }
-
 .tileBtn {
   display: flex;
   justify-content: flex-end;
@@ -52,8 +51,29 @@
   padding: 0 0 2rem;
 }
 
+.tileBtnVe {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+  padding: 0 0 2rem;
+  .tileBtnLeft {
+    display: flex;
+    align-items: center;
+  }
+  .tileBtnLeft {
+    display: flex;
+    align-items: center;
+  }
+}
+
 .schemeName {
-  width: 68px;
+  width: 30px;
+  margin-right: 0.8rem;
+  font-weight: bold;
+}
+.schemeNameL {
+  width: 60px;
   margin-right: 0.8rem;
   font-weight: bold;
 }
@@ -298,4 +318,4 @@
 // }
 .schemeBox {
   height: calc(100% - 51px);
-}
\ No newline at end of file
+}

src/pages/platformCenter/gis/schemeConfig/TileConfig/AddModal.jsx

@@ -203,7 +203,6 @@ const AddModal = props => {
     setCurrent(false);
     setPickItem('');
     setAlpha(1);
-    console.log(baseMap);
     switch (type) {
       case 'add':
         setRadio1(0);
@@ -225,7 +224,6 @@ const AddModal = props => {
 
         break;
       case 'edit':
-        console.log(formObj);
         setRadio1(formObj.isTainDiTu || 0);
         form.setFieldsValue({ ...formObj });
         let index = formObj.icon.lastIndexOf('/');

src/pages/platformCenter/gis/schemeConfig/TileConfig/NewEditModal.jsx

@@ -198,7 +198,7 @@ const NewEditModal = props => {
       setMaplayer(json);
       let data = [];
       json.forEach(item => {
-        data = [...data, ...item.items];
+        data = [...data, ...item.items].filter(i => i.type !== 'google-user');
       });
       setKeepJsonData(data);
     } else {
@@ -245,8 +245,6 @@ const NewEditModal = props => {
     setRadio1(formObj.isTainDiTu);
     switch (type) {
       case 'edit':
-        console.log(formObj);
-
         form.setFieldsValue({
           ...formObj,
           isTainDiTu: formObj.isTainDiTu,

src/pages/platformCenter/gis/schemeConfig/TileConfig/TileConfig.jsx

@@ -203,6 +203,9 @@ 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);
         }
       })
@@ -241,7 +244,8 @@ const TileData = props => {
       .then(res => {
         if (res.code == '0') {
           setTreeLoading(false);
-          setTileData(res.data.general.baseMap.layers);
+          let newdata = res.data.general.baseMap.layers?.filter(i => i.type !== 'google-user');
+          setTileData(newdata);
           let data = [];
           res.data.general.baseMap.layers.map(item => {
             data.push(item.servicename);

src/pages/platformCenter/gis/schemeConfig/TileConfig/TileMap.json

@@ -3,7 +3,7 @@
     "groupName": "地形",
     "items": [
       {
-        "title": "高德地形",
+        "title": "高德地形11",
         "type": "amap-v",
         "url": "",
         "key": "",
@@ -96,13 +96,6 @@
   {
     "groupName": "其他",
     "items": [
-      {
-        "title": "自定义底图",
-        "type": "google-user",
-        "url": "",
-        "key": "",
-        "maxleve": 18
-      },
       {
         "title": "矢量底图切片",
         "type": "pipenet-tile",

src/pages/platformCenter/gis/schemeConfig/VectorData/VectorData.jsx

-import { Space, Table, Button, Popconfirm, notification, Spin, Input } from 'antd';
+/* eslint-disable no-restricted-syntax */
+import { Space, Table, Button, Popconfirm, notification, Spin, Input, Radio } from 'antd';
 import React, { useState, useEffect } from 'react';
 import styles from '../SchemeConfig.less';
 import {
@@ -6,13 +7,16 @@ import {
   deleteVectorService,
   getSolutionList,
   updatePublishedMetaData,
+  GettMaplayer,
 } from '@/services/webConfig/api';
 import AddModal from './AddModal';
 import PreviewModal from './VectorPreviewModal';
 import MeteDataModal from './MeteDataModal';
+import AddSlicedModal from './AddSlicedModal';
 const VectorData = props => {
   const [treeLoading, setTreeLoading] = useState(false); // 弹窗显示
   const [tileData, setTileData] = useState([]); // table表格数据
+  const [tileSlicedData, setTileSlicedData] = useState([]);
   const [visible, setVisible] = useState(false); // 弹窗
   const [previewVisible, setPreviewVisible] = useState(false); // 预览弹窗
   const [meteDataVisible, setMeteDataVisible] = useState(false); // 预览弹窗
@@ -22,8 +26,12 @@ const VectorData = props => {
   const [type, setType] = useState(''); // 弹窗类型
   const [solutionNames, setSolutionNames] = useState('');
   const [formObj, setFormObj] = useState({ user: 'admin', password: 'geoserver' });
+  const [record, setRecord] = useState();
   const [currentMetaData, setCurrentMetaData] = useState(null);
   const [searchValue, setSearchValue] = useState('');
+  const [radioType, setRadioType] = useState('1');
+  const [addVisible, setAddVisible] = useState(false); // 弹窗
+  const [name, setName] = useState([]);
   const { Search } = Input;
   const columns = [
     {
@@ -94,6 +102,57 @@ const VectorData = props => {
       ),
     },
   ];
+  const columnsPart = [
+    {
+      title: '服务名',
+      dataIndex: 'servicename',
+      key: 'servicename',
+      align: 'center',
+    },
+    {
+      title: '标签',
+      dataIndex: 'label',
+      key: 'label',
+      align: 'center',
+    },
+    {
+      title: '类型',
+      dataIndex: 'type',
+      key: 'type',
+      align: 'center',
+    },
+    {
+      title: '编辑',
+      align: 'center',
+      render: (text, record) => (
+        <Space>
+          <Button
+            type="primary"
+            size="small"
+            onClick={() => {
+              changebaseMap(record);
+            }}
+          >
+            编辑
+          </Button>
+          <div onClick={e => e.stopPropagation()}>
+            <Popconfirm
+              title="是否删除该底图？"
+              okText="确认"
+              cancelText="取消"
+              onConfirm={() => {
+                delConfirm(record);
+              }}
+            >
+              <Button size="small" danger>
+                删除
+              </Button>
+            </Popconfirm>
+          </div>
+        </Space>
+      ),
+    },
+  ];
   // 更新
   const enterLoading = (record, index) => {
     const newLoadings = [...loading];
@@ -156,6 +215,7 @@ const VectorData = props => {
   const onSubmit = prop => {
     setVisible(false);
     setFlag(flag + 1);
+    setAddVisible(false);
   };
   const delConfirm = record => {
     console.log(' record.ServiceName', record.ServiceName.split('.'));
@@ -183,10 +243,15 @@ const VectorData = props => {
   };
   const handleAdd = () => {
     setType('add');
-    setVisible(true);
+    if (radioType == 1) {
+      setVisible(true);
+    } else {
+      setAddVisible(true);
+    }
   };
   useEffect(() => {
     renderTile({ info: searchValue });
+    renderTileSliced();
   }, [flag]);
   // 获取瓦片数据配置数据
   const renderTile = (params = { info: '' }) => {
@@ -194,16 +259,57 @@ const VectorData = props => {
     solutionName();
     GetVectorService(params)
       .then(res => {
+        setTreeLoading(false);
         if (res.msg === 'Ok') {
           let arr = [];
           res.data.VectorList.map(item => {
             arr.push(false);
           });
           setLoading(arr);
-          setTreeLoading(false);
+
           setTileData(res.data.VectorList);
         } else {
-          setTreeLoading(false);
+          notification.error({
+            message: '获取失败',
+            description: res.message,
+          });
+        }
+      })
+      .catch(err => {
+        if (err.message.indexOf('timeout') !== -1) {
+          notification.error({
+            message: '提示',
+            duration: 3,
+            description: '请求超时',
+          });
+        } else {
+          notification.error({
+            message: '提示',
+            duration: 3,
+            description: err.message,
+          });
+        }
+        setTreeLoading(false);
+      });
+  };
+
+  const renderTileSliced = () => {
+    setTreeLoading(true);
+    GettMaplayer({
+      terminalType: 'base',
+      isBaseMap: true,
+    })
+      .then(res => {
+        setTreeLoading(false);
+        if (res.code == '0') {
+          let newdata = res.data.general.baseMap.layers?.filter(i => i.type === 'google-user');
+          setTileSlicedData(newdata);
+          let data = [];
+          newdata.map(item => {
+            data.push(item.servicename);
+          });
+          setName(data);
+        } else {
           notification.error({
             message: '获取失败',
             description: res.message,
@@ -268,44 +374,71 @@ const VectorData = props => {
     }
   };
 
+  const handleSelect = e => {
+    setRadioType(e.target.value);
+  };
+
+  const changebaseMap = e => {
+    setType('edit');
+    setRecord(e);
+    setAddVisible(true);
+  };
+
   return (
     <>
       <div className={styles.pipeNetwork}>
         <Spin tip="loading..." spinning={treeLoading}>
-          <div className={styles.tileBtn}>
-            <span style={{ marginLeft: '20px', marginRight: '5px' }}>快速检索</span>
-            <Search
-              allowClear
-              placeholder="请输入服务名或工程名"
-              onSearch={handleSearch}
-              onChange={handleChange}
-              value={searchValue}
-              enterButton
-              style={{ width: '300px', marginRight: '20px' }}
-            />
-            <Button
-              type="primary"
-              onClick={() => {
-                updateAll();
-              }}
-              loading={allLoading}
-              style={{ marginRight: '20px' }}
-            >
-              批量更新
-            </Button>
-            <Button
-              type="primary"
-              onClick={() => {
-                handleAdd();
-              }}
-            >
-              新增
-            </Button>
+          <div className={styles.tileBtnVe}>
+            <div className={styles.tileBtnLeft}>
+              <span>管网类型：</span>
+              <Radio.Group defaultValue="1" value={radioType} onChange={e => handleSelect(e)}>
+                <Radio.Button value="1" style={{ width: '90px', textAlign: 'center' }}>
+                  管网
+                </Radio.Button>
+                <Radio.Button value="2" style={{ width: '90px', textAlign: 'center' }}>
+                  切片管网
+                </Radio.Button>
+              </Radio.Group>
+            </div>
+            <div className={styles.tileBtnRight}>
+              {radioType == 1 && (
+                <>
+                  <span style={{ marginLeft: '20px', marginRight: '5px' }}>快速检索</span>
+                  <Search
+                    allowClear
+                    placeholder="请输入服务名或工程名"
+                    onSearch={handleSearch}
+                    onChange={handleChange}
+                    value={searchValue}
+                    enterButton
+                    style={{ width: '300px', marginRight: '20px' }}
+                  />
+                  <Button
+                    type="primary"
+                    onClick={() => {
+                      updateAll();
+                    }}
+                    loading={allLoading}
+                    style={{ marginRight: '20px' }}
+                  >
+                    批量更新
+                  </Button>
+                </>
+              )}
+              <Button
+                type="primary"
+                onClick={() => {
+                  handleAdd();
+                }}
+              >
+                新增
+              </Button>
+            </div>
           </div>
           <div style={{ height: 'calc(100% - 51px)', width: '100%' }}>
             <Table
-              columns={columns}
-              dataSource={tileData}
+              columns={radioType == 1 ? columns : columnsPart}
+              dataSource={radioType == 1 ? tileData : tileSlicedData}
               bordered
               rowKey="CreateTime"
               scroll={{ y: 'calc(100% - 70px)' }}
@@ -332,6 +465,14 @@ const VectorData = props => {
             onCancel={() => setMeteDataVisible(false)}
             metaData={currentMetaData}
           />
+          <AddSlicedModal
+            visible={addVisible}
+            onCancel={() => setAddVisible(false)}
+            callBackSubmit={onSubmit}
+            type={type}
+            formObj={record}
+            name={name}
+          />
         </Spin>
       </div>
     </>

src/pages/platformCenter/gis/schemeConfig/projectMessage/AddModal.jsx

@@ -25,6 +25,7 @@ const AddModal = props => {
   const [pipeArr, setPipeArr] = useState([]);
   const [list, setList] = useState([]);
   const [radio, setRadio] = useState('');
+  const [tileSlicedData, setTileSlicedData] = useState([]);
 
   const [form] = Form.useForm();
   // 提交
@@ -77,6 +78,7 @@ const AddModal = props => {
       jsonCfg: JSON.stringify({
         baseMap: [obj.baseMap],
         servicename: obj.servicename,
+        tileMaps: obj.tileMaps ? [obj.tileMaps] : [],
         label: obj.label,
         url: obj.url,
         alpha: 1,
@@ -108,6 +110,7 @@ const AddModal = props => {
           break;
         case 'schemeAdd':
           pipeNetwork();
+          renderTileSliced();
           setRadio('基础底图');
           form.setFieldsValue({ choose: '基础底图' });
           form.setFieldsValue({
@@ -148,7 +151,7 @@ const AddModal = props => {
           pipeArr.push(item.ServiceName.split('.')[0]);
         });
       }
-      console.log(baseMap);
+
       setPipeArr(pipeArr);
       setBaseMap(baseMap);
       // form.setFieldsValue({
@@ -156,6 +159,40 @@ const AddModal = props => {
       // });
     });
   };
+
+  const renderTileSliced = () => {
+    GettMaplayer({
+      terminalType: 'base',
+      isBaseMap: true,
+    })
+      .then(res => {
+        if (res.code == '0') {
+          let newdata = res.data.general.baseMap.layers?.filter(i => i.type === 'google-user');
+          setTileSlicedData(newdata);
+        } else {
+          notification.error({
+            message: '获取失败',
+            description: res.message,
+          });
+        }
+      })
+      .catch(err => {
+        if (err.message.indexOf('timeout') !== -1) {
+          notification.error({
+            message: '提示',
+            duration: 3,
+            description: '请求超时',
+          });
+        } else {
+          notification.error({
+            message: '提示',
+            duration: 3,
+            description: err.message,
+          });
+        }
+        setTreeLoading(false);
+      });
+  };
   const layout = {
     layout: 'horizontal',
     labelCol: {
@@ -254,6 +291,17 @@ const AddModal = props => {
                     : ''}
                 </Select>
               </Item>
+              <Item label="切片管网" name="tileMaps" placeholder="请选择切片管网">
+                <Select showSearch>
+                  {tileSlicedData.length
+                    ? tileSlicedData.map((item, index) => (
+                        <Option key={index} value={item.servicename}>
+                          {item.servicename}
+                        </Option>
+                      ))
+                    : ''}
+                </Select>
+              </Item>
               <Item label="标签" name="label">
                 <Input placeholder="请输入标签" allowClear />
               </Item>

src/pages/platformCenter/gis/schemeConfig/projectMessage/EditModal.jsx

@@ -5,6 +5,7 @@ import {
   GetVectorService,
   bindSchemeBaseMap,
   UpdateSchemPipeNetwork,
+  GettMaplayer,
 } from '@/services/webConfig/api';
 const { Item } = Form;
 const { Option } = Select;
@@ -12,6 +13,7 @@ const EditModal = props => {
   const { callBackSubmit = () => {}, formObj, visible } = props;
   const [loading, setLoading] = useState(false);
   const [pipeArr, setPipeArr] = useState([]);
+  const [tileSlicedData, setTileSlicedData] = useState([]);
 
   const [form] = Form.useForm();
   // 提交
@@ -22,7 +24,10 @@ const EditModal = props => {
         let obj = form.getFieldsValue();
         UpdateSchemPipeNetwork({
           schemename: formObj.schemename,
-          ...obj,
+          servicename: obj.servicename,
+          label: obj.label,
+          url: obj.url,
+          tileMaps: obj.tileMaps || [],
         }).then(res => {
           setLoading(false);
           if (res.code == '0') {
@@ -48,8 +53,10 @@ const EditModal = props => {
   useEffect(() => {
     if (visible) {
       pipeNetwork();
+      renderTileSliced();
       form.setFieldsValue({
         servicename: formObj.servicename,
+        tileMaps: formObj.tileMaps?.[0],
         label: formObj.label,
         url: formObj.url,
       });
@@ -58,6 +65,39 @@ const EditModal = props => {
     }
   }, [visible]);
 
+  const renderTileSliced = () => {
+    GettMaplayer({
+      terminalType: 'base',
+      isBaseMap: true,
+    })
+      .then(res => {
+        if (res.code == '0') {
+          let newdata = res.data.general.baseMap.layers?.filter(i => i.type === 'google-user');
+          setTileSlicedData(newdata);
+        } else {
+          notification.error({
+            message: '获取失败',
+            description: res.message,
+          });
+        }
+      })
+      .catch(err => {
+        if (err.message.indexOf('timeout') !== -1) {
+          notification.error({
+            message: '提示',
+            duration: 3,
+            description: '请求超时',
+          });
+        } else {
+          notification.error({
+            message: '提示',
+            duration: 3,
+            description: err.message,
+          });
+        }
+      });
+  };
+
   // 获取管网及默认底图
   const pipeNetwork = () => {
     form.resetFields();
@@ -111,7 +151,7 @@ const EditModal = props => {
     >
       {visible && (
         <Form form={form} {...layout}>
-          <Item label="管网" name="servicename">
+          <Item label="管网" name="servicename" rules={[{ required: true, message: '请选择管网' }]}>
             <Select onChange={handleService} placeholder="请选择管网">
               {pipeArr.length
                 ? pipeArr.map((item, index) => {
@@ -124,6 +164,19 @@ const EditModal = props => {
                 : ''}
             </Select>
           </Item>
+          <Item label="切片管网" name="tileMaps">
+            <Select placeholder="请选择管网">
+              {tileSlicedData.length
+                ? tileSlicedData.map((item, index) => {
+                    return (
+                      <Option key={index} value={item.servicename}>
+                        {item.servicename}
+                      </Option>
+                    );
+                  })
+                : ''}
+            </Select>
+          </Item>
           <Item label="标签" name="label">
             <Input placeholder="请输入标签" allowClear />
           </Item>

src/pages/platformCenter/gis/schemeConfig/projectMessage/components/card.jsx

@@ -293,8 +293,37 @@ const CardData = props => {
         style={{ width: 360 }}
       >
         <div style={{ display: 'flex', justifyContent: 'space-between', marginBottom: '13px' }}>
-          <div>
-            <span className={styles.schemeName}>管网</span> {props.item.servicename}
+          <div style={{ display: 'flex', alignItems: 'center' }}>
+            <span className={styles.schemeName}>管网</span>{' '}
+            <Tooltip title={props.item.servicename}>
+              <span
+                style={{
+                  display: 'inline-block',
+                  width: '80px',
+                  overflow: 'hidden',
+                  textOverflow: 'ellipsis',
+                  whiteSpace: 'nowrap',
+                }}
+              >
+                {props.item.servicename}
+              </span>
+            </Tooltip>
+          </div>
+          <div style={{ display: 'flex', alignItems: 'center' }}>
+            <span className={styles.schemeNameL}>切片管网</span>{' '}
+            <Tooltip title={props.item.tileMaps}>
+              <span
+                style={{
+                  display: 'inline-block',
+                  width: '80px',
+                  overflow: 'hidden',
+                  textOverflow: 'ellipsis',
+                  whiteSpace: 'nowrap',
+                }}
+              >
+                {props.item.tileMaps}
+              </span>
+            </Tooltip>
           </div>
           <div>
             <FormOutlined