From d01f930e3b3c54855d7d858ce47080d2f888d1fd Mon Sep 17 00:00:00 2001 From: piqianwen <302975438@qq.com> Date: Thu, 20 Jan 2022 18:19:59 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20'=E4=BF=AE=E6=94=B9=E4=B8=89=E7=BB=B4?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E5=9C=B0=E5=9B=BE=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=95=99=E7=99=BD=E6=A0=B7=E5=BC=8F'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TileConfig/TileConfig.jsx | 2 +- .../VectorData/VectorData.jsx | 2 +- .../projectMessage/projectMessage.jsx | 157 +-- .../solutionConfig/solutionConfig.jsx | 849 +++++++------- .../schemeConfig/TileConfig/TileConfig.jsx | 374 +++--- .../schemeConfig/VectorData/VectorData.jsx | 2 +- .../projectMessage/projectMessage.jsx | 165 +-- .../solutionConfig/solutionConfig.jsx | 1008 +++++++++-------- 8 files changed, 1287 insertions(+), 1272 deletions(-) diff --git a/src/pages/platformCenter/gis/dimensionsConfig/TileConfig/TileConfig.jsx b/src/pages/platformCenter/gis/dimensionsConfig/TileConfig/TileConfig.jsx index 3919e216..0204c00b 100644 --- a/src/pages/platformCenter/gis/dimensionsConfig/TileConfig/TileConfig.jsx +++ b/src/pages/platformCenter/gis/dimensionsConfig/TileConfig/TileConfig.jsx @@ -228,7 +228,7 @@ const TileData = props => { dataSource={tileData} bordered rowKey="type" - scroll={{ y: 400 }} + scroll={{ y: 600 }} pagination={{ showTotal: (total, range) => `绗�${range[0]}-${range[1]} 鏉�/鍏� ${total} 鏉, }} diff --git a/src/pages/platformCenter/gis/dimensionsConfig/VectorData/VectorData.jsx b/src/pages/platformCenter/gis/dimensionsConfig/VectorData/VectorData.jsx index f42e7b60..7740ec09 100644 --- a/src/pages/platformCenter/gis/dimensionsConfig/VectorData/VectorData.jsx +++ b/src/pages/platformCenter/gis/dimensionsConfig/VectorData/VectorData.jsx @@ -190,7 +190,7 @@ const VectorData = props => { dataSource={tileData} bordered rowKey="id" - scroll={{ y: 400 }} + scroll={{ y: 600 }} pagination={{ showTotal: (total, range) => `绗�${range[0]}-${range[1]} 鏉�/鍏� ${total} 鏉, }} diff --git a/src/pages/platformCenter/gis/dimensionsConfig/projectMessage/projectMessage.jsx b/src/pages/platformCenter/gis/dimensionsConfig/projectMessage/projectMessage.jsx index 1ca0ffec..fa0d7ab3 100644 --- a/src/pages/platformCenter/gis/dimensionsConfig/projectMessage/projectMessage.jsx +++ b/src/pages/platformCenter/gis/dimensionsConfig/projectMessage/projectMessage.jsx @@ -1,78 +1,85 @@ -import { Button,Spin } from 'antd'; +/* eslint-disable indent */ +import { Button, Spin } from 'antd'; import React, { useState, useEffect } from 'react'; -import styles from '../dimensionsConfig.less' -import { -GetSchemaInfoList -} from '@/services/webConfig/api'; -import AddModal from './AddModal' -import Cards from './components/card' +import styles from '../dimensionsConfig.less'; +import { GetSchemaInfoList } from '@/services/webConfig/api'; +import AddModal from './AddModal'; +import Cards from './components/card'; const VectorData = props => { - const [treeLoading, setTreeLoading] = useState(false);// 寮圭獥鏄剧ず - const [tileData, setTileData] = useState([]); // 椤甸潰鍒濆鍖栨暟鎹� - const [visible, setVisible] = useState(false); // 寮圭獥 - const [flag, setFlag] = useState(0); // 鐘舵€佹洿鏂� - const [type, setType] = useState(''); // 寮圭獥绫诲瀷 - const [formObj, setFormObj] = useState({}); + const [treeLoading, setTreeLoading] = useState(false); // 寮圭獥鏄剧ず + const [tileData, setTileData] = useState([]); // 椤甸潰鍒濆鍖栨暟鎹� + const [visible, setVisible] = useState(false); // 寮圭獥 + const [flag, setFlag] = useState(0); // 鐘舵€佹洿鏂� + const [type, setType] = useState(''); // 寮圭獥绫诲瀷 + const [formObj, setFormObj] = useState({}); - - const onSubmit = prop => { - setVisible(false); - setFlag(flag + 1) - }; - const onDeletebaseMap = (value) => { - setFlag(flag + 1) - } - const handleAdd = () => { - setType('schemeAdd'); - setVisible(true); - } - useEffect(() => { - renderTile(); - }, [flag]); - // 鑾峰彇鐡︾墖鏁版嵁閰嶇疆鏁版嵁 - const renderTile = () => { - setTreeLoading(true); - GetSchemaInfoList().then( - res => { - if (res.msg ==='Ok') { - setTreeLoading(false); - setTileData(res.data); - } else { - setTreeLoading(false); - - } - } - ) - }; - return ( - <> - <Spin tip="loading..." spinning={treeLoading}> - <div style={{ width: 'calc(100vw - 265px)' }}> - <div className={styles.tileBtn}> - <Button type="primary" onClick={() => { - handleAdd(); - }} > - 鏂板 - </Button> - </div> - <div className={styles.cardsList}> - {tileData && tileData.length ? - tileData.map((item, index) => { - return <div className={styles.cardItem} key={index} span={5} offset={2} style={{ marginBottom: '1rem' }}> - <Cards item={item} deletebaseMaps={onDeletebaseMap} ></Cards> - </div> - }) : ''} - </div > - <AddModal - visible={visible} - onCancel={() => setVisible(false)} - callBackSubmit={onSubmit} - type={type} - formObj={formObj} - /> - </div> - </Spin> - </> - ) -} -export default VectorData \ No newline at end of file + const onSubmit = prop => { + setVisible(false); + setFlag(flag + 1); + }; + const onDeletebaseMap = value => { + setFlag(flag + 1); + }; + const handleAdd = () => { + setType('schemeAdd'); + setVisible(true); + }; + useEffect(() => { + renderTile(); + }, [flag]); + // 鑾峰彇鐡︾墖鏁版嵁閰嶇疆鏁版嵁 + const renderTile = () => { + setTreeLoading(true); + GetSchemaInfoList().then(res => { + if (res.msg === 'Ok') { + setTreeLoading(false); + setTileData(res.data); + } else { + setTreeLoading(false); + } + }); + }; + return ( + <> + <Spin tip="loading..." spinning={treeLoading}> + <div style={{ height: '780px', overflow: 'scroll' }}> + <div className={styles.tileBtn}> + <Button + type="primary" + onClick={() => { + handleAdd(); + }} + > + 鏂板 + </Button> + </div> + <div className={styles.cardsList}> + {tileData && tileData.length + ? tileData.map((item, index) => { + return ( + <div + className={styles.cardItem} + key={index} + span={5} + offset={2} + style={{ marginBottom: '1rem' }} + > + <Cards item={item} deletebaseMaps={onDeletebaseMap} /> + </div> + ); + }) + : ''} + </div> + <AddModal + visible={visible} + onCancel={() => setVisible(false)} + callBackSubmit={onSubmit} + type={type} + formObj={formObj} + /> + </div> + </Spin> + </> + ); +}; +export default VectorData; diff --git a/src/pages/platformCenter/gis/dimensionsConfig/solutionConfig/solutionConfig.jsx b/src/pages/platformCenter/gis/dimensionsConfig/solutionConfig/solutionConfig.jsx index e509e7e7..b1e65227 100644 --- a/src/pages/platformCenter/gis/dimensionsConfig/solutionConfig/solutionConfig.jsx +++ b/src/pages/platformCenter/gis/dimensionsConfig/solutionConfig/solutionConfig.jsx @@ -1,436 +1,433 @@ import { Space, Table, Button, Popconfirm, notification, Divider, Checkbox, Spin } from 'antd'; import React, { useState, useEffect } from 'react'; -import styles from '../dimensionsConfig.less' -import VisibleRoleModal from '@/pages/platformCenter/messageManage/projectManage/components/RolseSelect/VisibleRoleModal' +import styles from '../dimensionsConfig.less'; +import VisibleRoleModal from '@/pages/platformCenter/messageManage/projectManage/components/RolseSelect/VisibleRoleModal'; +import { PlusOutlined } from '@ant-design/icons'; import { - PlusOutlined -} from '@ant-design/icons'; -import { - deleteConfig, SettingRoleWebSchema, SetServiceConfig,DeleteWebSchema,GetWebSchemaList,GetSchemaInfoList,IsActionWebSchema + deleteConfig, + SettingRoleWebSchema, + SetServiceConfig, + DeleteWebSchema, + GetWebSchemaList, + GetSchemaInfoList, + IsActionWebSchema, } from '@/services/webConfig/api'; -import { - UserAddOutlined -} from '@ant-design/icons'; -import AddModal from './AddModal' +import { UserAddOutlined } from '@ant-design/icons'; +import AddModal from './AddModal'; const VectorData = props => { - const [treeLoading, setTreeLoading] = useState(false);// 寮圭獥鏄剧ず - const [schemename, setSchemename] = useState([]); - const [record, setRecord] = useState({}); //閫変腑鍏宠仈瑙掕壊鐨勬柟妗堝悕 - const [webCurrent, setWebCurrent] = useState(0); // web鍒楄〃涓嬫爣 - const [handCurrent, setHandCurrent] = useState(0); // hand鍒楄〃涓嬫爣 - const [webData, setWebData] = useState([]); // web鏁版嵁 - const [handData, setHandData] = useState([]); //鎵嬫寔鏁版嵁 - const [visible, setVisible] = useState(false); // 寮圭獥 - const [flag, setFlag] = useState(0); // 鏇存柊list - const [handStatus, setHandStatus] = useState([]); // 鏇存柊鐘舵€� - const [webStatus, setWebStatus] = useState([]); // 鏇存柊鐘舵€� - const [type, setType] = useState(''); // 寮圭獥绫诲瀷 - const [checkLoading, setCheckLoading] = useState(false) - const [formObj, setFormObj] = useState({ user: 'admin', password: 'geoserver' }); - const columns = [ - { - title: '榛樿鏂规', - align: 'center', - render: (text, record, index) => ( - <Space> - <Checkbox - checked={webStatus[index + webCurrent * 5]} - onChange={e => { - onChangeCheck(e, record, index + webCurrent * 5); - }} - /> - </Space> - ), - }, - { - title: '鏂规鍚�', - align: 'center', - render: (text, record, index) => ( - <Space> - {record.scheme.schemename} - </Space> - ), - }, - { - title: '鍏宠仈瑙掕壊', - align: 'center', - render: (text, record, index) => ( - <Space> - <Space> - <div onClick={() => pickRole(record)} style={{ cursor: 'pointer' }}> - <VisibleRoleModal onSubmit={onPushSubmit} title={"鍏宠仈瑙掕壊"} initValues ={record.roles!=null?record.roles.split(","):[]} operate={<UserAddOutlined />} /> - </div> - </Space> - </Space> - ), - }, - { - title: '缂栬緫', - align: 'center', - render: (text, record, index) => ( - <Space> - <div onClick={e => e.stopPropagation()}> - <Popconfirm - title="鏄惁鍒犻櫎姝ゆ潯鏂规锛�" - okText="纭" - cancelText="鍙栨秷" - onConfirm={() => { - delWebConfirm(record); - }} - > - <Button size="small" danger> - 鍒犻櫎 - </Button> - </Popconfirm> - </div> - </Space> - ), - } - - ]; - // const columns1 = [ - // { - // title: '鏌ヨ鏂规', - // align: 'center', - // render: (text, record, index) => ( - // <Space> - // <Checkbox - // checked={handStatus[index + handCurrent * 5]} - // onChange={e => { - // onChangeHand(e, record, index + handCurrent * 5); - // }} - // /> - // </Space> - // ), - // }, - // { - // title: '鏂规鍚�', - // align: 'center', - // render: (text, record, index) => ( - // <Space> - // {record.scheme.schemename} - // </Space> - // ), - // }, - // { - // title: '鍏宠仈瑙掕壊', - // align: 'center', - // render: (text, record, index) => ( - // <Space> - // <div onClick={() => pickRole(record)} style={{ cursor: 'pointer' }}> - // <VisibleRoleModal onSubmit={onPushSubmit} title={"鍏宠仈瑙掕壊"} initValues ={record.roles!=null?record.roles.split(","):[]} operate={<UserAddOutlined />} /> - // </div> - // </Space> - // ), - // }, - // { - // title: '缂栬緫', - // align: 'center', - // render: (text, record, index) => ( - // <Space> - // <div onClick={e => e.stopPropagation()}> - // <Popconfirm - // title="鏄惁鍒犻櫎姝ゆ潯鏂规锛�" - // okText="纭" - // cancelText="鍙栨秷" - // onConfirm={() => { - // delhandConfirm(record); - // }} - // > - // <Button size="small" danger> - // 鍒犻櫎 - // </Button> - // </Popconfirm> - // </div> - // </Space> - // ), - // } - - // ]; - //鑾峰彇閫変腑鐨勮鑹� - const onPushSubmit = (value) => { - let id = [] - if (value.length) { - id = value.map(item => { return item.id }) - let query = { - schemaname: record.scheme.schemename, - roles: id.join(',') - } - SettingRoleWebSchema(query).then(res => { - if (res.msg === "") { - prompt('success', '鍏宠仈瑙掕壊鎴愬姛') - setFlag(flag + 1) - } - else { - prompt('fail', '鍏宠仈瑙掕壊澶辫触') - } - }).catch(err=>{ - prompt('fail', '缃戠粶璇锋眰澶辫触') - }) - - } - + const [treeLoading, setTreeLoading] = useState(false); // 寮圭獥鏄剧ず + const [schemename, setSchemename] = useState([]); + const [record, setRecord] = useState({}); //閫変腑鍏宠仈瑙掕壊鐨勬柟妗堝悕 + const [webCurrent, setWebCurrent] = useState(0); // web鍒楄〃涓嬫爣 + const [handCurrent, setHandCurrent] = useState(0); // hand鍒楄〃涓嬫爣 + const [webData, setWebData] = useState([]); // web鏁版嵁 + const [handData, setHandData] = useState([]); //鎵嬫寔鏁版嵁 + const [visible, setVisible] = useState(false); // 寮圭獥 + const [flag, setFlag] = useState(0); // 鏇存柊list + const [handStatus, setHandStatus] = useState([]); // 鏇存柊鐘舵€� + const [webStatus, setWebStatus] = useState([]); // 鏇存柊鐘舵€� + const [type, setType] = useState(''); // 寮圭獥绫诲瀷 + const [checkLoading, setCheckLoading] = useState(false); + const [formObj, setFormObj] = useState({ user: 'admin', password: 'geoserver' }); + const columns = [ + { + title: '榛樿鏂规', + align: 'center', + render: (text, record, index) => ( + <Space> + <Checkbox + checked={webStatus[index + webCurrent * 5]} + onChange={e => { + onChangeCheck(e, record, index + webCurrent * 5); + }} + /> + </Space> + ), + }, + { + title: '鏂规鍚�', + align: 'center', + render: (text, record, index) => <Space>{record.scheme.schemename}</Space>, + }, + { + title: '鍏宠仈瑙掕壊', + align: 'center', + render: (text, record, index) => ( + <Space> + <Space> + <div onClick={() => pickRole(record)} style={{ cursor: 'pointer' }}> + <VisibleRoleModal + onSubmit={onPushSubmit} + title={'鍏宠仈瑙掕壊'} + initValues={record.roles != null ? record.roles.split(',') : []} + operate={<UserAddOutlined />} + /> + </div> + </Space> + </Space> + ), + }, + { + title: '缂栬緫', + align: 'center', + render: (text, record, index) => ( + <Space> + <div onClick={e => e.stopPropagation()}> + <Popconfirm + title="鏄惁鍒犻櫎姝ゆ潯鏂规锛�" + okText="纭" + cancelText="鍙栨秷" + onConfirm={() => { + delWebConfirm(record); + }} + > + <Button size="small" danger> + 鍒犻櫎 + </Button> + </Popconfirm> + </div> + </Space> + ), + }, + ]; + // const columns1 = [ + // { + // title: '鏌ヨ鏂规', + // align: 'center', + // render: (text, record, index) => ( + // <Space> + // <Checkbox + // checked={handStatus[index + handCurrent * 5]} + // onChange={e => { + // onChangeHand(e, record, index + handCurrent * 5); + // }} + // /> + // </Space> + // ), + // }, + // { + // title: '鏂规鍚�', + // align: 'center', + // render: (text, record, index) => ( + // <Space> + // {record.scheme.schemename} + // </Space> + // ), + // }, + // { + // title: '鍏宠仈瑙掕壊', + // align: 'center', + // render: (text, record, index) => ( + // <Space> + // <div onClick={() => pickRole(record)} style={{ cursor: 'pointer' }}> + // <VisibleRoleModal onSubmit={onPushSubmit} title={"鍏宠仈瑙掕壊"} initValues ={record.roles!=null?record.roles.split(","):[]} operate={<UserAddOutlined />} /> + // </div> + // </Space> + // ), + // }, + // { + // title: '缂栬緫', + // align: 'center', + // render: (text, record, index) => ( + // <Space> + // <div onClick={e => e.stopPropagation()}> + // <Popconfirm + // title="鏄惁鍒犻櫎姝ゆ潯鏂规锛�" + // okText="纭" + // cancelText="鍙栨秷" + // onConfirm={() => { + // delhandConfirm(record); + // }} + // > + // <Button size="small" danger> + // 鍒犻櫎 + // </Button> + // </Popconfirm> + // </div> + // </Space> + // ), + // } - } - //鑾峰彇瑙掕壊 - const pickRole = (record) => { - setRecord(record) - } - //璁剧疆web鏂规 - const onChangeCheck = (e, record, index) => { - setCheckLoading(true) - IsActionWebSchema({schemaname :record.scheme.schemename}).then(res=>{ - setCheckLoading(false) - if(res.msg===''){ - prompt('success', '璁剧疆鎴愬姛') - setFlag(flag + 1) - } - else{ - prompt('fail', res.msg) - } + // ]; + //鑾峰彇閫変腑鐨勮鑹� + const onPushSubmit = value => { + let id = []; + if (value.length) { + id = value.map(item => { + return item.id; + }); + let query = { + schemaname: record.scheme.schemename, + roles: id.join(','), + }; + SettingRoleWebSchema(query) + .then(res => { + if (res.msg === '') { + prompt('success', '鍏宠仈瑙掕壊鎴愬姛'); + setFlag(flag + 1); + } else { + prompt('fail', '鍏宠仈瑙掕壊澶辫触'); + } }) - + .catch(err => { + prompt('fail', '缃戠粶璇锋眰澶辫触'); + }); } + }; + //鑾峰彇瑙掕壊 + const pickRole = record => { + setRecord(record); + }; + //璁剧疆web鏂规 + const onChangeCheck = (e, record, index) => { + setCheckLoading(true); + IsActionWebSchema({ schemaname: record.scheme.schemename }).then(res => { + setCheckLoading(false); + if (res.msg === '') { + prompt('success', '璁剧疆鎴愬姛'); + setFlag(flag + 1); + } else { + prompt('fail', res.msg); + } + }); + }; - - //閫夋嫨鎵嬫寔鏂规 - const onChangeHand = (e, record, index) => { - setCheckLoading(true) - const newLoadings = [...handStatus]; - newLoadings.map((item, loadIndex) => { - return loadIndex == index ? newLoadings[loadIndex] = !newLoadings[loadIndex] : newLoadings[loadIndex] = false - }) - setHandStatus(newLoadings) - let query = { - schemename: record['schemename'], - terminalType: 'phone', - isBaseMap: false, - jsonCfg: JSON.stringify({ - isDefault: newLoadings[index], - }) - } - if (!newLoadings[index]) { - SetServiceConfig(query).then(res => { - setCheckLoading(false) - if (res.msg === "Ok") { - const changehandData = [...handData]; - changehandData[index].isDefault = false - setHandData(changehandData) - prompt('success', '璁剧疆鎴愬姛') - } else { - prompt('fail', `${record['schemename']}榛樿璁剧疆鏃堕亣鍒伴敊璇細` + res.message) - } - - }) - return + //閫夋嫨鎵嬫寔鏂规 + const onChangeHand = (e, record, index) => { + setCheckLoading(true); + const newLoadings = [...handStatus]; + newLoadings.map((item, loadIndex) => { + return loadIndex == index + ? (newLoadings[loadIndex] = !newLoadings[loadIndex]) + : (newLoadings[loadIndex] = false); + }); + setHandStatus(newLoadings); + let query = { + schemename: record['schemename'], + terminalType: 'phone', + isBaseMap: false, + jsonCfg: JSON.stringify({ + isDefault: newLoadings[index], + }), + }; + if (!newLoadings[index]) { + SetServiceConfig(query).then(res => { + setCheckLoading(false); + if (res.msg === 'Ok') { + const changehandData = [...handData]; + changehandData[index].isDefault = false; + setHandData(changehandData); + prompt('success', '璁剧疆鎴愬姛'); + } else { + prompt('fail', `${record['schemename']}榛樿璁剧疆鏃堕亣鍒伴敊璇細` + res.message); } - var beforeDefault = handData.findIndex((item) => item['isDefault']); - SetServiceConfig({ - schemename: record['schemename'], + }); + return; + } + var beforeDefault = handData.findIndex(item => item['isDefault']); + SetServiceConfig({ + schemename: record['schemename'], + terminalType: 'phone', + isBaseMap: false, + jsonCfg: JSON.stringify({ + isDefault: true, + }), + }).then(res => { + setCheckLoading(false); + if (res.msg === 'Ok') { + const changehandData = [...handData]; + changehandData[index].isDefault = true; + setHandData(changehandData); + if (beforeDefault != -1) { + SetServiceConfig({ + schemename: changehandData[beforeDefault].schemename, terminalType: 'phone', isBaseMap: false, jsonCfg: JSON.stringify({ - isDefault: true, - }) - }).then(res => { - setCheckLoading(false) - if (res.msg === "Ok") { - const changehandData = [...handData]; - changehandData[index].isDefault = true - setHandData(changehandData) - if (beforeDefault != -1) { - SetServiceConfig({ - schemename: changehandData[beforeDefault].schemename, - terminalType: 'phone', - isBaseMap: false, - jsonCfg: JSON.stringify({ - isDefault: false, - }) - }).then(res => { - setCheckLoading(false) - if (res.IsSuccess) { - const changehandData1 = [...handData]; - changehandData1[beforeDefault].isDefault = false - setHandData(changehandData1) - prompt('success', '璁剧疆鎴愬姛') - return; - } - prompt('fail', `${record['schemename']}榛樿璁剧疆鏃堕亣鍒伴敊璇細` + res.message) - }) - } + isDefault: false, + }), + }).then(res => { + setCheckLoading(false); + if (res.IsSuccess) { + const changehandData1 = [...handData]; + changehandData1[beforeDefault].isDefault = false; + setHandData(changehandData1); + prompt('success', '璁剧疆鎴愬姛'); + return; } - }) - } - const prompt = (type, content) => { - if (type == 'success') { - notification.success({ - message: '鎻愮ず', - duration: 3, - description: content, - }); - } - else { - notification.error({ - message: '鎻愮ず', - duration: 3, - description: content, - }); + prompt('fail', `${record['schemename']}榛樿璁剧疆鏃堕亣鍒伴敊璇細` + res.message); + }); } + } + }); + }; + const prompt = (type, content) => { + if (type == 'success') { + notification.success({ + message: '鎻愮ず', + duration: 3, + description: content, + }); + } else { + notification.error({ + message: '鎻愮ず', + duration: 3, + description: content, + }); } - const onSubmit = prop => { - setVisible(false); - setFlag(flag + 1) - }; - //鍒犻櫎web閰嶇疆鏂规 - const delWebConfirm = (record) => { - DeleteWebSchema( record.scheme.schemename).then(res => { - if (res.msg === "") { - prompt('success', '鍒犻櫎鎴愬姛') - setFlag(flag + 1) + }; + const onSubmit = prop => { + setVisible(false); + setFlag(flag + 1); + }; + //鍒犻櫎web閰嶇疆鏂规 + const delWebConfirm = record => { + DeleteWebSchema(record.scheme.schemename).then(res => { + if (res.msg === '') { + prompt('success', '鍒犻櫎鎴愬姛'); + setFlag(flag + 1); + } else { + prompt('fail', '鍒犻櫎澶辫触'); + } + }); + }; + //鍒犻櫎鎵嬫寔閰嶇疆鏂规 + const delhandConfirm = record => { + deleteConfig({ + schemename: record['schemename'], + terminalType: 'phone', + isBaseMap: false, + }).then(res => { + if (res.msg === 'Ok') { + prompt('success', '鍒犻櫎鎴愬姛'); + setFlag(flag + 1); + } else { + prompt('fail', '鍒犻櫎澶辫触'); + } + }); + }; + //娣诲姞鏂规 + const addType = type => { + setType(type); + let listData = []; + type == 'add' ? (listData = webData) : (listData = handData); + let webSchemenameArr = [], + schemeArr = []; + setTreeLoading(true); + GetSchemaInfoList().then(res => { + if (res.data && res.data.length) { + setTreeLoading(false); + listData.map(item => { + webSchemenameArr.push(item.scheme.schemename); + }); + res.data.map(item => { + if (!webSchemenameArr.includes(item.schemename)) schemeArr.push(item.schemename); + }); + setSchemename(schemeArr); + if (schemeArr.length) { + setVisible(true); + } else { + notification.warning({ + message: '鎻愮ず', + duration: 3, + description: '璇峰厛閰嶇疆鏂规', + }); + } + } else { + setTreeLoading(false); + notification.warning({ + message: '鎻愮ず', + duration: 3, + description: '璇峰厛閰嶇疆鏂规', + }); + } + }); + }; + useEffect(() => { + renderTile(); + }, [flag]); + // 鑾峰彇鐡︾墖鏁版嵁閰嶇疆鏁版嵁 + const renderTile = () => { + setCheckLoading(true); + //鏌ヨ鎵嬫寔鏂规 + // var schemeConfigQueryRequest = GetMaplayerByTerminalType({ + // terminalType: 'phone', + // isBaseMap: false + // }) + //鏌ヨweb鏂规 + var webSchemeQueryRequest = GetWebSchemaList(); + Promise.all([webSchemeQueryRequest]) + .then(res => { + // if (res[0].msg==="Ok" && res[0].data.phone) { + // let arr = [] + // res[0].data.phone.optionalLayer.layers.map((item, index) => { + // if (item.isDefault) { + // arr.push(true) + // } else { + // arr.push(false) + // } - } else { - prompt('fail', '鍒犻櫎澶辫触') - }; - }) - } - //鍒犻櫎鎵嬫寔閰嶇疆鏂规 - const delhandConfirm = (record) => { - deleteConfig({ - schemename: record['schemename'], - terminalType: 'phone', - isBaseMap: false - }).then(res => { - if (res.msg === "Ok") { - prompt('success', '鍒犻櫎鎴愬姛') - setFlag(flag + 1) + // item.isStatus = 'phone' + // return item + // }) + // setHandData(res[0].data.phone.optionalLayer.layers) + // setHandStatus(arr) + // } + if (res[0].msg === 'Ok' && res[0].data) { + let arr = []; + res[0].data.map((item, index) => { + if (item.isDefault) { + arr.push(true); } else { - prompt('fail', '鍒犻櫎澶辫触') - }; - }) - } - //娣诲姞鏂规 - const addType = (type) => { - setType(type); - let listData = [] - type == 'add' ? listData = webData : listData = handData - let webSchemenameArr = [], schemeArr = [] - setTreeLoading(true); - GetSchemaInfoList().then( - res => { - if (res.data && res.data.length) { - setTreeLoading(false); - listData.map(item => { - webSchemenameArr.push(item.scheme.schemename) - }) - res.data.map(item => { - if (!webSchemenameArr.includes(item.schemename)) - schemeArr.push(item.schemename) - }) - setSchemename(schemeArr) - if (schemeArr.length) { - setVisible(true); - } - else { - notification.warning({ - message: '鎻愮ず', - duration: 3, - description: '璇峰厛閰嶇疆鏂规', - }); - } - - - } else { - setTreeLoading(false); - notification.warning({ - message: '鎻愮ず', - duration: 3, - description: '璇峰厛閰嶇疆鏂规', - }); - } - } - ) - } - useEffect(() => { - renderTile(); - }, [flag]); - // 鑾峰彇鐡︾墖鏁版嵁閰嶇疆鏁版嵁 - const renderTile = () => { - setCheckLoading(true) - //鏌ヨ鎵嬫寔鏂规 - // var schemeConfigQueryRequest = GetMaplayerByTerminalType({ - // terminalType: 'phone', - // isBaseMap: false - // }) - //鏌ヨweb鏂规 - var webSchemeQueryRequest = GetWebSchemaList() - Promise.all([ webSchemeQueryRequest]).then(res => { - // if (res[0].msg==="Ok" && res[0].data.phone) { - // let arr = [] - // res[0].data.phone.optionalLayer.layers.map((item, index) => { - // if (item.isDefault) { - // arr.push(true) - // } else { - // arr.push(false) - // } - - // item.isStatus = 'phone' - // return item - // }) - // setHandData(res[0].data.phone.optionalLayer.layers) - // setHandStatus(arr) - - // } - if (res[0].msg==="Ok" && res[0].data) { - let arr = [] - res[0].data.map((item, index) => { - if (item.isDefault) { - arr.push(true) - } else { - arr.push(false) - } - item.isStatus = 'web' - return item - }) - setWebData(res[0].data) - setWebStatus(arr) + arr.push(false); } - setCheckLoading(false) - }).catch(e=>{ - setCheckLoading(false) - }) - - }; - - - - return ( - <> - <Spin tip="loading..." spinning={checkLoading}> - <div className={styles.solutionConfig}> - <div > - <Divider orientation="left"><div className={styles.divider}> Web <PlusOutlined - onClick={() => { addType('add') }} - className={styles.dividerIcon} /></div></Divider> - <Table - columns={columns} - dataSource={webData} - bordered - pagination={{ - showTotal: (total, range) => - `绗�${range[0]}-${range[1]} 鏉�/鍏� ${total} 鏉, - defaultPageSize: 8, - onChange: (value) => { - setWebCurrent(value - 1) - } + item.isStatus = 'web'; + return item; + }); + setWebData(res[0].data); + setWebStatus(arr); + } + setCheckLoading(false); + }) + .catch(e => { + setCheckLoading(false); + }); + }; - }} - rowKey={(record, index) => record.scheme.schemename} - scroll={{ y: 400 }} - > - </Table> - </div> - {/* <Divider orientation="left"><div className={styles.divider}>鎵嬫寔 <PlusOutlined + return ( + <> + <Spin tip="loading..." spinning={checkLoading}> + <div className={styles.solutionConfig}> + <div> + <Divider orientation="left"> + <div className={styles.divider}> + {' '} + Web{' '} + <PlusOutlined + onClick={() => { + addType('add'); + }} + className={styles.dividerIcon} + /> + </div> + </Divider> + <Table + columns={columns} + dataSource={webData} + bordered + pagination={{ + showTotal: (total, range) => `绗�${range[0]}-${range[1]} 鏉�/鍏� ${total} 鏉, + defaultPageSize: 8, + onChange: value => { + setWebCurrent(value - 1); + }, + }} + rowKey={(record, index) => record.scheme.schemename} + scroll={{ y: 600 }} + /> + </div> + {/* <Divider orientation="left"><div className={styles.divider}>鎵嬫寔 <PlusOutlined onClick={() => { addType('addHand') }} className={styles.dividerIcon} /></div> </Divider> <Table @@ -450,17 +447,17 @@ const VectorData = props => { }} > </Table> */} - </div> - </Spin> - <AddModal - visible={visible} - onCancel={() => setVisible(false)} - callBackSubmit={onSubmit} - type={type} - formObj={formObj} - listData={schemename} - /> - </> - ) -} -export default VectorData \ No newline at end of file + </div> + </Spin> + <AddModal + visible={visible} + onCancel={() => setVisible(false)} + callBackSubmit={onSubmit} + type={type} + formObj={formObj} + listData={schemename} + /> + </> + ); +}; +export default VectorData; diff --git a/src/pages/platformCenter/gis/schemeConfig/TileConfig/TileConfig.jsx b/src/pages/platformCenter/gis/schemeConfig/TileConfig/TileConfig.jsx index c706a6e2..d10d49d1 100644 --- a/src/pages/platformCenter/gis/schemeConfig/TileConfig/TileConfig.jsx +++ b/src/pages/platformCenter/gis/schemeConfig/TileConfig/TileConfig.jsx @@ -1,197 +1,191 @@ import { Space, Table, Button, Popconfirm, notification, Spin } from 'antd'; import React, { useState, useEffect } from 'react'; -import styles from '../SchemeConfig.less' -import { - GettMaplayer, - deleteConfig -} from '@/services/webConfig/api'; -import AddModal from './AddModal' +import styles from '../SchemeConfig.less'; +import { GettMaplayer, deleteConfig } from '@/services/webConfig/api'; +import AddModal from './AddModal'; const TileData = props => { - const [treeLoading, setTreeLoading] = useState(false);// 寮圭獥鏄剧ず - const [tileData, setTileData] = useState([]); // table琛ㄦ牸鏁版嵁 - const [visible, setVisible] = useState(false); // 寮圭獥 - const [type, setType] = useState(''); // 寮圭獥绫诲瀷 - const [formObj, setFormObj] = useState({}); - const [flag, setFlag] = useState(0); // 寮圭獥绫诲瀷 - const [baseMap, setBaseMap] = useState([]); //搴曞浘鏁版嵁 - const columns = [ - { - title: '鏈嶅姟鍚�', - dataIndex: 'servicename', - key: 'servicename', - align: 'center' - }, - { - title: '鏍囩', - dataIndex: 'label', - key: 'label', - align: 'center' - }, - { - title: '绫诲瀷', - dataIndex: 'type', - key: 'type', - align: 'center' - }, - { - title: '閫忔槑搴�', - dataIndex: 'alpha', - key: 'alpha', - 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 [treeLoading, setTreeLoading] = useState(false); // 寮圭獥鏄剧ず + const [tileData, setTileData] = useState([]); // table琛ㄦ牸鏁版嵁 + const [visible, setVisible] = useState(false); // 寮圭獥 + const [type, setType] = useState(''); // 寮圭獥绫诲瀷 + const [formObj, setFormObj] = useState({}); + const [flag, setFlag] = useState(0); // 寮圭獥绫诲瀷 + const [baseMap, setBaseMap] = useState([]); //搴曞浘鏁版嵁 + const columns = [ + { + title: '鏈嶅姟鍚�', + dataIndex: 'servicename', + key: 'servicename', + align: 'center', + }, + { + title: '鏍囩', + dataIndex: 'label', + key: 'label', + align: 'center', + }, + { + title: '绫诲瀷', + dataIndex: 'type', + key: 'type', + align: 'center', + }, + { + title: '閫忔槑搴�', + dataIndex: 'alpha', + key: 'alpha', + 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 changebaseMap = record => { + setType('edit'); + setFormObj(record); + setVisible(true); + }; + const onSubmit = prop => { + setVisible(false); + setFlag(flag + 1); + }; - ]; - const changebaseMap = (record) => { - setType('edit'); - setFormObj(record); - setVisible(true); - } - const onSubmit = prop => { - setVisible(false); - setFlag(flag + 1) - }; - - const delConfirm = (record) => { - const { servicename = '' } = record; - setTreeLoading(true); - deleteConfig({ - servicename: servicename, - terminalType: 'base', - isBaseMap: true - }).then(res => { - setFlag(flag + 1) - setTreeLoading(false); - if (res.msg === 'Ok') { - // form.resetFields(); - // callBackSubmit(); - notification.success({ - message: '鎻愮ず', - duration: 3, - description: res.message || '鍒犻櫎鎴愬姛', - }); - } else { - notification.error({ - message: '鎻愮ず', - duration: 3, - description: res.message || '鍒犻櫎澶辫触', - }); - } - }).catch(err => { - setFlag(flag + 1) - setTreeLoading(false); - }) - } - const handleAdd = () => { - if (baseMap.length) { - setType('add'); - setVisible(true); + const delConfirm = record => { + const { servicename = '' } = record; + setTreeLoading(true); + deleteConfig({ + servicename: servicename, + terminalType: 'base', + isBaseMap: true, + }) + .then(res => { + setFlag(flag + 1); + setTreeLoading(false); + if (res.msg === 'Ok') { + // form.resetFields(); + // callBackSubmit(); + notification.success({ + message: '鎻愮ず', + duration: 3, + description: res.message || '鍒犻櫎鎴愬姛', + }); + } else { + notification.error({ + message: '鎻愮ず', + duration: 3, + description: res.message || '鍒犻櫎澶辫触', + }); } - else { - notification.warning({ - message: '鎻愮ず', - duration: 3, - description: '鍦板浘绫诲瀷宸查兘瀛樺湪,鍙紪杈戜慨鏀�', - }); - } - + }) + .catch(err => { + setFlag(flag + 1); + setTreeLoading(false); + }); + }; + const handleAdd = () => { + if (baseMap.length) { + setType('add'); + setVisible(true); + } else { + notification.warning({ + message: '鎻愮ず', + duration: 3, + description: '鍦板浘绫诲瀷宸查兘瀛樺湪,鍙紪杈戜慨鏀�', + }); } - useEffect(() => { - renderTile(); - }, [flag]); - // 鑾峰彇鐡︾墖鏁版嵁閰嶇疆鏁版嵁 - const renderTile = () => { - setTreeLoading(true); - const baseMapData = ['楂樺痉鍦板舰', '楂樺痉褰卞儚', '澶╁湴鍥惧湴褰�', '澶╁湴鍥惧奖鍍�'] - GettMaplayer({ - terminalType: 'base', - isBaseMap: true - }).then( - res => { - if (res.msg === "Ok") { - setTreeLoading(false); - setTileData(res.data.general.baseMap.layers); - res.data.general.baseMap.layers.map((item) => { - let index = baseMapData.indexOf(item.servicename); - if (index != -1) { - baseMapData.splice(index, 1); - } - }) - setBaseMap(baseMapData) - } else { - setTreeLoading(false); - notification.error({ - message: '鑾峰彇澶辫触', - description: res.message, - }); - } - } - ) - }; - - return ( - <> - <Spin tip="loading..." spinning={treeLoading}> - <div className={styles.tileBtn}> - <Button type="primary" onClick={() => { - handleAdd(); - }} > - 鏂板 - </Button> - </div> - <Table - columns={columns} - dataSource={tileData} - bordered - rowKey="type" - scroll={{ y: 400 }} - pagination={{ - showTotal: (total, range) => - `绗�${range[0]}-${range[1]} 鏉�/鍏� ${total} 鏉 + }; + useEffect(() => { + renderTile(); + }, [flag]); + // 鑾峰彇鐡︾墖鏁版嵁閰嶇疆鏁版嵁 + const renderTile = () => { + setTreeLoading(true); + const baseMapData = ['楂樺痉鍦板舰', '楂樺痉褰卞儚', '澶╁湴鍥惧湴褰�', '澶╁湴鍥惧奖鍍�']; + GettMaplayer({ + terminalType: 'base', + isBaseMap: true, + }).then(res => { + if (res.msg === 'Ok') { + setTreeLoading(false); + setTileData(res.data.general.baseMap.layers); + res.data.general.baseMap.layers.map(item => { + let index = baseMapData.indexOf(item.servicename); + if (index != -1) { + baseMapData.splice(index, 1); + } + }); + setBaseMap(baseMapData); + } else { + setTreeLoading(false); + notification.error({ + message: '鑾峰彇澶辫触', + description: res.message, + }); + } + }); + }; - }} - > - </Table> - <AddModal - visible={visible} - onCancel={() => setVisible(false)} - callBackSubmit={onSubmit} - type={type} - formObj={formObj} - baseMap={baseMap} - /> - </Spin> - </> - ) -} -export default TileData \ No newline at end of file + return ( + <> + <Spin tip="loading..." spinning={treeLoading}> + <div className={styles.tileBtn}> + <Button + type="primary" + onClick={() => { + handleAdd(); + }} + > + 鏂板 + </Button> + </div> + <Table + columns={columns} + dataSource={tileData} + bordered + rowKey="type" + scroll={{ y: 600 }} + pagination={{ + showTotal: (total, range) => `绗�${range[0]}-${range[1]} 鏉�/鍏� ${total} 鏉, + }} + /> + <AddModal + visible={visible} + onCancel={() => setVisible(false)} + callBackSubmit={onSubmit} + type={type} + formObj={formObj} + baseMap={baseMap} + /> + </Spin> + </> + ); +}; +export default TileData; diff --git a/src/pages/platformCenter/gis/schemeConfig/VectorData/VectorData.jsx b/src/pages/platformCenter/gis/schemeConfig/VectorData/VectorData.jsx index 68e1a1fd..30411167 100644 --- a/src/pages/platformCenter/gis/schemeConfig/VectorData/VectorData.jsx +++ b/src/pages/platformCenter/gis/schemeConfig/VectorData/VectorData.jsx @@ -215,7 +215,7 @@ const VectorData = props => { dataSource={tileData} bordered rowKey="CreateTime" - scroll={{ y: 400 }} + scroll={{ y: 600 }} pagination={{ showTotal: (total, range) => `绗�${range[0]}-${range[1]} 鏉�/鍏� ${total} 鏉, }} diff --git a/src/pages/platformCenter/gis/schemeConfig/projectMessage/projectMessage.jsx b/src/pages/platformCenter/gis/schemeConfig/projectMessage/projectMessage.jsx index 5f2db9d6..c0110fce 100644 --- a/src/pages/platformCenter/gis/schemeConfig/projectMessage/projectMessage.jsx +++ b/src/pages/platformCenter/gis/schemeConfig/projectMessage/projectMessage.jsx @@ -1,82 +1,89 @@ -import { Button,Spin } from 'antd'; +/* eslint-disable indent */ +import { Button, Spin } from 'antd'; import React, { useState, useEffect } from 'react'; -import styles from '../SchemeConfig.less' -import { - GetMaplayerByTerminalType -} from '@/services/webConfig/api'; -import AddModal from './AddModal' -import Cards from './components/card' +import styles from '../SchemeConfig.less'; +import { GetMaplayerByTerminalType } from '@/services/webConfig/api'; +import AddModal from './AddModal'; +import Cards from './components/card'; const VectorData = props => { - const [treeLoading, setTreeLoading] = useState(false);// 寮圭獥鏄剧ず - const [tileData, setTileData] = useState([]); // 椤甸潰鍒濆鍖栨暟鎹� - const [visible, setVisible] = useState(false); // 寮圭獥 - const [flag, setFlag] = useState(0); // 鐘舵€佹洿鏂� - const [type, setType] = useState(''); // 寮圭獥绫诲瀷 - const [formObj, setFormObj] = useState({}); + const [treeLoading, setTreeLoading] = useState(false); // 寮圭獥鏄剧ず + const [tileData, setTileData] = useState([]); // 椤甸潰鍒濆鍖栨暟鎹� + const [visible, setVisible] = useState(false); // 寮圭獥 + const [flag, setFlag] = useState(0); // 鐘舵€佹洿鏂� + const [type, setType] = useState(''); // 寮圭獥绫诲瀷 + const [formObj, setFormObj] = useState({}); - - const onSubmit = prop => { - setVisible(false); - setFlag(flag + 1) - }; - const onDeletebaseMap = (value) => { - setFlag(flag + 1) - } - const handleAdd = () => { - setType('schemeAdd'); - setVisible(true); - } - useEffect(() => { - renderTile(); - }, [flag]); - // 鑾峰彇鐡︾墖鏁版嵁閰嶇疆鏁版嵁 - const renderTile = () => { - setTreeLoading(true); - GetMaplayerByTerminalType({ - terminalType: 'scheme', - isBaseMap: false - }).then( - res => { - console.log('res',res); - if (res.msg ==='Ok') { - setTreeLoading(false); - setTileData(res.data.scheme.optionalLayer.layers); - } else { - setTreeLoading(false); - - } - } - ) - }; - return ( - <> - <Spin tip="loading..." spinning={treeLoading}> - <div style={{ width: 'calc(100vw - 265px)' }}> - <div className={styles.tileBtn}> - <Button type="primary" onClick={() => { - handleAdd(); - }} > - 鏂板 - </Button> - </div> - <div className={styles.cardsList}> - {tileData && tileData.length ? - tileData.map((item, index) => { - return <div className={styles.cardItem} key={index} span={5} offset={2} style={{ marginBottom: '1rem' }}> - <Cards item={item} deletebaseMaps={onDeletebaseMap} ></Cards> - </div> - }) : ''} - </div > - <AddModal - visible={visible} - onCancel={() => setVisible(false)} - callBackSubmit={onSubmit} - type={type} - formObj={formObj} - /> - </div> - </Spin> - </> - ) -} -export default VectorData \ No newline at end of file + const onSubmit = prop => { + setVisible(false); + setFlag(flag + 1); + }; + const onDeletebaseMap = value => { + setFlag(flag + 1); + }; + const handleAdd = () => { + setType('schemeAdd'); + setVisible(true); + }; + useEffect(() => { + renderTile(); + }, [flag]); + // 鑾峰彇鐡︾墖鏁版嵁閰嶇疆鏁版嵁 + const renderTile = () => { + setTreeLoading(true); + GetMaplayerByTerminalType({ + terminalType: 'scheme', + isBaseMap: false, + }).then(res => { + console.log('res', res); + if (res.msg === 'Ok') { + setTreeLoading(false); + setTileData(res.data.scheme.optionalLayer.layers); + } else { + setTreeLoading(false); + } + }); + }; + return ( + <> + <Spin tip="loading..." spinning={treeLoading}> + <div style={{ height: '780px', overflow: 'scroll' }}> + <div className={styles.tileBtn}> + <Button + type="primary" + onClick={() => { + handleAdd(); + }} + > + 鏂板 + </Button> + </div> + <div className={styles.cardsList}> + {tileData && tileData.length + ? tileData.map((item, index) => { + return ( + <div + className={styles.cardItem} + key={index} + span={5} + offset={2} + style={{ marginBottom: '1rem' }} + > + <Cards item={item} deletebaseMaps={onDeletebaseMap} /> + </div> + ); + }) + : ''} + </div> + <AddModal + visible={visible} + onCancel={() => setVisible(false)} + callBackSubmit={onSubmit} + type={type} + formObj={formObj} + /> + </div> + </Spin> + </> + ); +}; +export default VectorData; diff --git a/src/pages/platformCenter/gis/schemeConfig/solutionConfig/solutionConfig.jsx b/src/pages/platformCenter/gis/schemeConfig/solutionConfig/solutionConfig.jsx index 24826ee4..22381632 100644 --- a/src/pages/platformCenter/gis/schemeConfig/solutionConfig/solutionConfig.jsx +++ b/src/pages/platformCenter/gis/schemeConfig/solutionConfig/solutionConfig.jsx @@ -1,523 +1,533 @@ import { Space, Table, Button, Popconfirm, notification, Divider, Checkbox, Spin } from 'antd'; import React, { useState, useEffect } from 'react'; -import styles from '../SchemeConfig.less' -import VisibleRoleModal from '@/pages/platformCenter/messageManage/projectManage/components/RolseSelect/VisibleRoleModal' +import styles from '../SchemeConfig.less'; +import VisibleRoleModal from '@/pages/platformCenter/messageManage/projectManage/components/RolseSelect/VisibleRoleModal'; +import { PlusOutlined } from '@ant-design/icons'; import { - PlusOutlined -} from '@ant-design/icons'; -import { - deleteConfig, setServiceType, SetServiceConfig, GetMaplayerByTerminalType + deleteConfig, + setServiceType, + SetServiceConfig, + GetMaplayerByTerminalType, } from '@/services/webConfig/api'; -import { - UserAddOutlined -} from '@ant-design/icons'; -import AddModal from './AddModal' +import { UserAddOutlined } from '@ant-design/icons'; +import AddModal from './AddModal'; const VectorData = props => { - const [treeLoading, setTreeLoading] = useState(false);// 寮圭獥鏄剧ず - const [schemename, setSchemename] = useState([]); - const [record, setRecord] = useState({}); //閫変腑鍏宠仈瑙掕壊鐨勬柟妗堝悕 - const [webCurrent, setWebCurrent] = useState(0); // web鍒楄〃涓嬫爣 - const [handCurrent, setHandCurrent] = useState(0); // hand鍒楄〃涓嬫爣 - const [webData, setWebData] = useState([]); // web鏁版嵁 - const [handData, setHandData] = useState([]); //鎵嬫寔鏁版嵁 - const [visible, setVisible] = useState(false); // 寮圭獥 - const [flag, setFlag] = useState(0); // 鏇存柊list - const [handStatus, setHandStatus] = useState([]); // 鏇存柊鐘舵€� - const [webStatus, setWebStatus] = useState([]); // 鏇存柊鐘舵€� - const [type, setType] = useState(''); // 寮圭獥绫诲瀷 - const [checkLoading, setCheckLoading] = useState(false) - const [formObj, setFormObj] = useState({ user: 'admin', password: 'geoserver' }); - const columns = [ - { - title: '榛樿鏂规', - align: 'center', - key: 'url', - render: (text, record, index) => ( - <Space> - <Checkbox - checked={webStatus[index + webCurrent * 5]} - onChange={e => { - onChangeCheck(e, record, index + webCurrent * 5); - }} - /> - </Space> - ), - }, - { - title: '鏂规鍚�', - dataIndex: 'schemename', - key: 'schemename', - align: 'center' - }, - { - title: '鍏宠仈瑙掕壊', - align: 'center', - key: 'type', - render: (text, record, index) => ( - <Space> - <Space> - <div onClick={() => pickRole(record)} style={{ cursor: 'pointer' }}> - <VisibleRoleModal onSubmit={onPushSubmit} title={"鍏宠仈瑙掕壊"} initValues={record.roles != null ? record.roles.split(",") : []} operate={<UserAddOutlined />} /> - </div> - </Space> - </Space> - ), - }, - { - title: '缂栬緫', - align: 'center', - key: 'schemename', - render: (text, record, index) => ( - <Space> - <div onClick={e => e.stopPropagation()}> - <Popconfirm - title="鏄惁鍒犻櫎姝ゆ潯鏂规锛�" - okText="纭" - cancelText="鍙栨秷" - onConfirm={() => { - delWebConfirm(record); - }} - > - <Button size="small" danger> - 鍒犻櫎 - </Button> - </Popconfirm> - </div> - </Space> - ), - } - - ]; - const columns1 = [ - { - title: '鏌ヨ鏂规', - align: 'center', - key: 'url', - render: (text, record, index) => ( - <Space> - <Checkbox - checked={handStatus[index + handCurrent * 5]} - onChange={e => { - onChangeHand(e, record, index + handCurrent * 5); - }} - /> - </Space> - ), - }, - { - title: '鏂规鍚�', - dataIndex: 'schemename', - key: 'schemename', - align: 'center' - }, - { - title: '鍏宠仈瑙掕壊', - align: 'center', - key: 'type', - render: (text, record, index) => ( - <Space> - <div onClick={() => pickRole(record)} style={{ cursor: 'pointer' }}> - <VisibleRoleModal onSubmit={onPushSubmit} selectValue={[]} title={"鍏宠仈瑙掕壊"} initValues={record.roles != null ? record.roles.split(",") : []} operate={<UserAddOutlined />} /> - </div> - </Space> - ), - }, - { - title: '缂栬緫', - align: 'center', - key: 'schemename', - render: (text, record, index) => ( - <Space> - <div onClick={e => e.stopPropagation()}> - <Popconfirm - title="鏄惁鍒犻櫎姝ゆ潯鏂规锛�" - okText="纭" - cancelText="鍙栨秷" - onConfirm={() => { - delhandConfirm(record); - }} - > - <Button size="small" danger> - 鍒犻櫎 - </Button> - </Popconfirm> - </div> - </Space> - ), - } - - ]; - //鑾峰彇閫変腑鐨勮鑹� - const onPushSubmit = (value) => { - let id = [] - if (value.length) { - id = value.map(item => { return item.id }) - let query = { - schemename: record.schemename, - terminalType: record.isStatus, - isBaseMap: false, - jsonCfg: JSON.stringify({ - roles: id.join(',') - }) - } - SetServiceConfig(query).then(res => { - if (res.msg === "Ok") { - prompt('success', '鍏宠仈瑙掕壊鎴愬姛') - setFlag(flag + 1) - } - else { - prompt('fail', '鍏宠仈瑙掕壊澶辫触') - } - }).catch(err => { - prompt('fail', '缃戠粶璇锋眰澶辫触') - }) - - } - - - } - //鑾峰彇瑙掕壊 - const pickRole = (record) => { - console.log('recird', record); - setRecord(record) - } - //璁剧疆web鏂规 - const onChangeCheck = (e, record, index) => { - setCheckLoading(true) - const newLoadings = [...webStatus]; - newLoadings.map((item, loadIndex) => { - return loadIndex == index ? newLoadings[loadIndex] = !newLoadings[loadIndex] : newLoadings[loadIndex] = false + const [treeLoading, setTreeLoading] = useState(false); // 寮圭獥鏄剧ず + const [schemename, setSchemename] = useState([]); + const [record, setRecord] = useState({}); //閫変腑鍏宠仈瑙掕壊鐨勬柟妗堝悕 + const [webCurrent, setWebCurrent] = useState(0); // web鍒楄〃涓嬫爣 + const [handCurrent, setHandCurrent] = useState(0); // hand鍒楄〃涓嬫爣 + const [webData, setWebData] = useState([]); // web鏁版嵁 + const [handData, setHandData] = useState([]); //鎵嬫寔鏁版嵁 + const [visible, setVisible] = useState(false); // 寮圭獥 + const [flag, setFlag] = useState(0); // 鏇存柊list + const [handStatus, setHandStatus] = useState([]); // 鏇存柊鐘舵€� + const [webStatus, setWebStatus] = useState([]); // 鏇存柊鐘舵€� + const [type, setType] = useState(''); // 寮圭獥绫诲瀷 + const [checkLoading, setCheckLoading] = useState(false); + const [formObj, setFormObj] = useState({ user: 'admin', password: 'geoserver' }); + const columns = [ + { + title: '榛樿鏂规', + align: 'center', + key: 'url', + render: (text, record, index) => ( + <Space> + <Checkbox + checked={webStatus[index + webCurrent * 5]} + onChange={e => { + onChangeCheck(e, record, index + webCurrent * 5); + }} + /> + </Space> + ), + }, + { + title: '鏂规鍚�', + dataIndex: 'schemename', + key: 'schemename', + align: 'center', + }, + { + title: '鍏宠仈瑙掕壊', + align: 'center', + key: 'type', + render: (text, record, index) => ( + <Space> + <Space> + <div onClick={() => pickRole(record)} style={{ cursor: 'pointer' }}> + <VisibleRoleModal + onSubmit={onPushSubmit} + title={'鍏宠仈瑙掕壊'} + initValues={record.roles != null ? record.roles.split(',') : []} + operate={<UserAddOutlined />} + /> + </div> + </Space> + </Space> + ), + }, + { + title: '缂栬緫', + align: 'center', + key: 'schemename', + render: (text, record, index) => ( + <Space> + <div onClick={e => e.stopPropagation()}> + <Popconfirm + title="鏄惁鍒犻櫎姝ゆ潯鏂规锛�" + okText="纭" + cancelText="鍙栨秷" + onConfirm={() => { + delWebConfirm(record); + }} + > + <Button size="small" danger> + 鍒犻櫎 + </Button> + </Popconfirm> + </div> + </Space> + ), + }, + ]; + const columns1 = [ + { + title: '鏌ヨ鏂规', + align: 'center', + key: 'url', + render: (text, record, index) => ( + <Space> + <Checkbox + checked={handStatus[index + handCurrent * 5]} + onChange={e => { + onChangeHand(e, record, index + handCurrent * 5); + }} + /> + </Space> + ), + }, + { + title: '鏂规鍚�', + dataIndex: 'schemename', + key: 'schemename', + align: 'center', + }, + { + title: '鍏宠仈瑙掕壊', + align: 'center', + key: 'type', + render: (text, record, index) => ( + <Space> + <div onClick={() => pickRole(record)} style={{ cursor: 'pointer' }}> + <VisibleRoleModal + onSubmit={onPushSubmit} + selectValue={[]} + title={'鍏宠仈瑙掕壊'} + initValues={record.roles != null ? record.roles.split(',') : []} + operate={<UserAddOutlined />} + /> + </div> + </Space> + ), + }, + { + title: '缂栬緫', + align: 'center', + key: 'schemename', + render: (text, record, index) => ( + <Space> + <div onClick={e => e.stopPropagation()}> + <Popconfirm + title="鏄惁鍒犻櫎姝ゆ潯鏂规锛�" + okText="纭" + cancelText="鍙栨秷" + onConfirm={() => { + delhandConfirm(record); + }} + > + <Button size="small" danger> + 鍒犻櫎 + </Button> + </Popconfirm> + </div> + </Space> + ), + }, + ]; + //鑾峰彇閫変腑鐨勮鑹� + const onPushSubmit = value => { + let id = []; + if (value.length) { + id = value.map(item => { + return item.id; + }); + let query = { + schemename: record.schemename, + terminalType: record.isStatus, + isBaseMap: false, + jsonCfg: JSON.stringify({ + roles: id.join(','), + }), + }; + SetServiceConfig(query) + .then(res => { + if (res.msg === 'Ok') { + prompt('success', '鍏宠仈瑙掕壊鎴愬姛'); + setFlag(flag + 1); + } else { + prompt('fail', '鍏宠仈瑙掕壊澶辫触'); + } }) - setWebStatus(newLoadings) - let query = { - schemename: record['schemename'], - type: 'dynamic' - } - if (!newLoadings[index]) { - setServiceType(query).then(res => { - setCheckLoading(false) - if (res.IsSuccess) { - const changehandData = [...webData]; - changehandData[index].type = 'dynamic' - setWebData(changehandData) - prompt('success', '璁剧疆鎴愬姛') - } else { - prompt('fail', `${record['schemename']}榛樿璁剧疆鏃堕亣鍒伴敊璇細` + res.message) - } - - }) - return + .catch(err => { + prompt('fail', '缃戠粶璇锋眰澶辫触'); + }); + } + }; + //鑾峰彇瑙掕壊 + const pickRole = record => { + console.log('recird', record); + setRecord(record); + }; + //璁剧疆web鏂规 + const onChangeCheck = (e, record, index) => { + setCheckLoading(true); + const newLoadings = [...webStatus]; + newLoadings.map((item, loadIndex) => { + return loadIndex == index + ? (newLoadings[loadIndex] = !newLoadings[loadIndex]) + : (newLoadings[loadIndex] = false); + }); + setWebStatus(newLoadings); + let query = { + schemename: record['schemename'], + type: 'dynamic', + }; + if (!newLoadings[index]) { + setServiceType(query).then(res => { + setCheckLoading(false); + if (res.IsSuccess) { + const changehandData = [...webData]; + changehandData[index].type = 'dynamic'; + setWebData(changehandData); + prompt('success', '璁剧疆鎴愬姛'); + } else { + prompt('fail', `${record['schemename']}榛樿璁剧疆鏃堕亣鍒伴敊璇細` + res.message); } - var beforeDefault = webData.findIndex((item) => item['type'] == 'pipenet'); - setServiceType({ - schemename: record['schemename'], - type: 'pipenet' - }).then(res => { - setCheckLoading(false) + }); + return; + } + var beforeDefault = webData.findIndex(item => item['type'] == 'pipenet'); + setServiceType({ + schemename: record['schemename'], + type: 'pipenet', + }).then(res => { + setCheckLoading(false); + if (res.IsSuccess) { + const changehandData = [...webData]; + changehandData[index].type = 'pipenet'; + setWebData(changehandData); + if (beforeDefault != -1) { + setServiceType({ + schemename: changehandData[beforeDefault].schemename, + type: 'dynamic', + }).then(res => { + setCheckLoading(false); if (res.IsSuccess) { - const changehandData = [...webData]; - changehandData[index].type = 'pipenet' - setWebData(changehandData) - if (beforeDefault != -1) { - setServiceType({ - schemename: changehandData[beforeDefault].schemename, - type: 'dynamic' - }).then(res => { - setCheckLoading(false) - if (res.IsSuccess) { - const changehandData1 = [...webData]; - changehandData1[beforeDefault].type = 'dynamic' - setWebData(changehandData1) - prompt('success', '璁剧疆鎴愬姛') - return; - } - prompt('fail', `${record['schemename']}榛樿璁剧疆鏃堕亣鍒伴敊璇細` + res.message) - }) - } + const changehandData1 = [...webData]; + changehandData1[beforeDefault].type = 'dynamic'; + setWebData(changehandData1); + prompt('success', '璁剧疆鎴愬姛'); + return; } - }) - } - - - //閫夋嫨鎵嬫寔鏂规 - const onChangeHand = (e, record, index) => { - setCheckLoading(true) - const newLoadings = [...handStatus]; - newLoadings.map((item, loadIndex) => { - return loadIndex == index ? newLoadings[loadIndex] = !newLoadings[loadIndex] : newLoadings[loadIndex] = false - }) - setHandStatus(newLoadings) - let query = { - schemename: record['schemename'], - terminalType: 'phone', - isBaseMap: false, - jsonCfg: JSON.stringify({ - isDefault: newLoadings[index], - }) + prompt('fail', `${record['schemename']}榛樿璁剧疆鏃堕亣鍒伴敊璇細` + res.message); + }); } - if (!newLoadings[index]) { - SetServiceConfig(query).then(res => { - setCheckLoading(false) - if (res.msg === "Ok") { - const changehandData = [...handData]; - changehandData[index].isDefault = false - setHandData(changehandData) - prompt('success', '璁剧疆鎴愬姛') - } else { - prompt('fail', `${record['schemename']}榛樿璁剧疆鏃堕亣鍒伴敊璇細` + res.message) - } + } + }); + }; - }) - return + //閫夋嫨鎵嬫寔鏂规 + const onChangeHand = (e, record, index) => { + setCheckLoading(true); + const newLoadings = [...handStatus]; + newLoadings.map((item, loadIndex) => { + return loadIndex == index + ? (newLoadings[loadIndex] = !newLoadings[loadIndex]) + : (newLoadings[loadIndex] = false); + }); + setHandStatus(newLoadings); + let query = { + schemename: record['schemename'], + terminalType: 'phone', + isBaseMap: false, + jsonCfg: JSON.stringify({ + isDefault: newLoadings[index], + }), + }; + if (!newLoadings[index]) { + SetServiceConfig(query).then(res => { + setCheckLoading(false); + if (res.msg === 'Ok') { + const changehandData = [...handData]; + changehandData[index].isDefault = false; + setHandData(changehandData); + prompt('success', '璁剧疆鎴愬姛'); + } else { + prompt('fail', `${record['schemename']}榛樿璁剧疆鏃堕亣鍒伴敊璇細` + res.message); } - var beforeDefault = handData.findIndex((item) => item['isDefault']); - SetServiceConfig({ - schemename: record['schemename'], + }); + return; + } + var beforeDefault = handData.findIndex(item => item['isDefault']); + SetServiceConfig({ + schemename: record['schemename'], + terminalType: 'phone', + isBaseMap: false, + jsonCfg: JSON.stringify({ + isDefault: true, + }), + }).then(res => { + setCheckLoading(false); + if (res.msg === 'Ok') { + const changehandData = [...handData]; + changehandData[index].isDefault = true; + setHandData(changehandData); + if (beforeDefault != -1) { + SetServiceConfig({ + schemename: changehandData[beforeDefault].schemename, terminalType: 'phone', isBaseMap: false, jsonCfg: JSON.stringify({ - isDefault: true, - }) - }).then(res => { - setCheckLoading(false) - if (res.msg === "Ok") { - const changehandData = [...handData]; - changehandData[index].isDefault = true - setHandData(changehandData) - if (beforeDefault != -1) { - SetServiceConfig({ - schemename: changehandData[beforeDefault].schemename, - terminalType: 'phone', - isBaseMap: false, - jsonCfg: JSON.stringify({ - isDefault: false, - }) - }).then(res => { - setCheckLoading(false) - if (res.IsSuccess) { - const changehandData1 = [...handData]; - changehandData1[beforeDefault].isDefault = false - setHandData(changehandData1) - prompt('success', '璁剧疆鎴愬姛') - return; - } - prompt('fail', `${record['schemename']}榛樿璁剧疆鏃堕亣鍒伴敊璇細` + res.message) - }) - } + isDefault: false, + }), + }).then(res => { + setCheckLoading(false); + if (res.IsSuccess) { + const changehandData1 = [...handData]; + changehandData1[beforeDefault].isDefault = false; + setHandData(changehandData1); + prompt('success', '璁剧疆鎴愬姛'); + return; } - }) - } - const prompt = (type, content) => { - if (type == 'success') { - notification.success({ - message: '鎻愮ず', - duration: 3, - description: content, - }); - } - else { - notification.error({ - message: '鎻愮ず', - duration: 3, - description: content, - }); + prompt('fail', `${record['schemename']}榛樿璁剧疆鏃堕亣鍒伴敊璇細` + res.message); + }); } + } + }); + }; + const prompt = (type, content) => { + if (type == 'success') { + notification.success({ + message: '鎻愮ず', + duration: 3, + description: content, + }); + } else { + notification.error({ + message: '鎻愮ず', + duration: 3, + description: content, + }); } - const onSubmit = prop => { - setVisible(false); - setFlag(flag + 1) - }; - //鍒犻櫎web閰嶇疆鏂规 - const delWebConfirm = (record) => { - deleteConfig({ - schemename: record['schemename'], - terminalType: 'web', - isBaseMap: false - }).then(res => { - if (res.msg === "Ok") { - prompt('success', '鍒犻櫎鎴愬姛') - setFlag(flag + 1) - - } else { - prompt('fail', '鍒犻櫎澶辫触') - }; - }) - } - //鍒犻櫎鎵嬫寔閰嶇疆鏂规 - const delhandConfirm = (record) => { - deleteConfig({ - schemename: record['schemename'], - terminalType: 'phone', - isBaseMap: false - }).then(res => { - if (res.msg === "Ok") { - prompt('success', '鍒犻櫎鎴愬姛') - setFlag(flag + 1) - + }; + const onSubmit = prop => { + setVisible(false); + setFlag(flag + 1); + }; + //鍒犻櫎web閰嶇疆鏂规 + const delWebConfirm = record => { + deleteConfig({ + schemename: record['schemename'], + terminalType: 'web', + isBaseMap: false, + }).then(res => { + if (res.msg === 'Ok') { + prompt('success', '鍒犻櫎鎴愬姛'); + setFlag(flag + 1); + } else { + prompt('fail', '鍒犻櫎澶辫触'); + } + }); + }; + //鍒犻櫎鎵嬫寔閰嶇疆鏂规 + const delhandConfirm = record => { + deleteConfig({ + schemename: record['schemename'], + terminalType: 'phone', + isBaseMap: false, + }).then(res => { + if (res.msg === 'Ok') { + prompt('success', '鍒犻櫎鎴愬姛'); + setFlag(flag + 1); + } else { + prompt('fail', '鍒犻櫎澶辫触'); + } + }); + }; + //娣诲姞鏂规 + const addType = type => { + setType(type); + let listData = []; + type == 'add' ? (listData = webData) : (listData = handData); + let webSchemenameArr = [], + schemeArr = []; + setTreeLoading(true); + GetMaplayerByTerminalType({ + terminalType: 'scheme', + isBaseMap: false, + }).then(res => { + if (res.data.scheme && res.data.scheme.optionalLayer.layers.length) { + setTreeLoading(false); + listData.map(item => { + webSchemenameArr.push(item.schemename); + }); + res.data.scheme.optionalLayer.layers.map(item => { + if (!webSchemenameArr.includes(item.schemename)) schemeArr.push(item.schemename); + }); + setSchemename(schemeArr); + if (schemeArr.length) { + setVisible(true); + } else { + notification.warning({ + message: '鎻愮ず', + duration: 3, + description: '璇峰厛閰嶇疆鏂规', + }); + } + } else { + setTreeLoading(false); + notification.warning({ + message: '鎻愮ず', + duration: 3, + description: '璇峰厛閰嶇疆鏂规', + }); + } + }); + }; + useEffect(() => { + renderTile(); + }, [flag]); + // 鑾峰彇鐡︾墖鏁版嵁閰嶇疆鏁版嵁 + const renderTile = () => { + setCheckLoading(true); + //鏌ヨ鎵嬫寔鏂规 + var schemeConfigQueryRequest = GetMaplayerByTerminalType({ + terminalType: 'phone', + isBaseMap: false, + }); + //鏌ヨweb鏂规 + var webSchemeQueryRequest = GetMaplayerByTerminalType({ + terminalType: 'web', + isBaseMap: false, + }); + Promise.all([schemeConfigQueryRequest, webSchemeQueryRequest]) + .then(res => { + console.log('res', res); + if (res[0].msg === 'Ok' && res[0].data.phone) { + let arr = []; + res[0].data.phone.optionalLayer.layers.map((item, index) => { + if (item.isDefault) { + arr.push(true); } else { - prompt('fail', '鍒犻櫎澶辫触') - }; - }) - } - //娣诲姞鏂规 - const addType = (type) => { - setType(type); - let listData = [] - type == 'add' ? listData = webData : listData = handData - let webSchemenameArr = [], schemeArr = [] - setTreeLoading(true); - GetMaplayerByTerminalType({ - terminalType: 'scheme', - isBaseMap: false - }).then( - res => { - if (res.data.scheme && res.data.scheme.optionalLayer.layers.length) { - setTreeLoading(false); - listData.map(item => { - webSchemenameArr.push(item.schemename) - }) - res.data.scheme.optionalLayer.layers.map(item => { - if (!webSchemenameArr.includes(item.schemename)) - schemeArr.push(item.schemename) - }) - setSchemename(schemeArr) - if (schemeArr.length) { - setVisible(true); - } - else { - notification.warning({ - message: '鎻愮ず', - duration: 3, - description: '璇峰厛閰嶇疆鏂规', - }); - } - - - } else { - setTreeLoading(false); - notification.warning({ - message: '鎻愮ず', - duration: 3, - description: '璇峰厛閰嶇疆鏂规', - }); - } + arr.push(false); } - ) - } - useEffect(() => { - renderTile(); - }, [flag]); - // 鑾峰彇鐡︾墖鏁版嵁閰嶇疆鏁版嵁 - const renderTile = () => { - setCheckLoading(true) - //鏌ヨ鎵嬫寔鏂规 - var schemeConfigQueryRequest = GetMaplayerByTerminalType({ - terminalType: 'phone', - isBaseMap: false - }) - //鏌ヨweb鏂规 - var webSchemeQueryRequest = GetMaplayerByTerminalType({ - terminalType: 'web', - isBaseMap: false - }) - Promise.all([schemeConfigQueryRequest, webSchemeQueryRequest]).then(res => { - console.log('res', res); - if (res[0].msg === "Ok" && res[0].data.phone) { - let arr = [] - res[0].data.phone.optionalLayer.layers.map((item, index) => { - if (item.isDefault) { - arr.push(true) - } else { - arr.push(false) - } - - item.isStatus = 'phone' - return item - }) - setHandData(res[0].data.phone.optionalLayer.layers) - setHandStatus(arr) + item.isStatus = 'phone'; + return item; + }); + setHandData(res[0].data.phone.optionalLayer.layers); + setHandStatus(arr); + } + if (res[1].msg === 'Ok' && res[1].data.web) { + let arr = []; + res[1].data.web.optionalLayer.layers.map((item, index) => { + if (item.type === 'pipenet') { + arr.push(true); + } else { + arr.push(false); } - if (res[1].msg === "Ok" && res[1].data.web) { - let arr = [] - res[1].data.web.optionalLayer.layers.map((item, index) => { - if (item.type === "pipenet") { - arr.push(true) - } else { - arr.push(false) - } - item.isStatus = 'web' - return item - }) - setWebData(res[1].data.web.optionalLayer.layers) - setWebStatus(arr) - } - setCheckLoading(false) - }).catch(e => { - setCheckLoading(false) - }) - - }; - - - - return ( - <> - <Spin tip="loading..." spinning={checkLoading}> - <div className={styles.solutionConfig}> - <div > - <Divider orientation="left"><div className={styles.divider}> Web <PlusOutlined - onClick={() => { addType('add') }} - className={styles.dividerIcon} /></div></Divider> - <Table - columns={columns} - dataSource={webData} - bordered - pagination={{ - showTotal: (total, range) => - `绗�${range[0]}-${range[1]} 鏉�/鍏� ${total} 鏉, - defaultPageSize: 8, - onChange: (value) => { - setWebCurrent(value - 1) - } - - }} - rowKey="schemename" - scroll={{ y: 400 }} - > - </Table> - </div> - <Divider orientation="left"><div className={styles.divider}>鎵嬫寔 <PlusOutlined - onClick={() => { addType('addHand') }} - className={styles.dividerIcon} /></div> </Divider> - <Table - columns={columns1} - dataSource={handData} - bordered - rowKey="schemename" - scroll={{ y: 400 }} - pagination={{ - showTotal: (total, range) => - `绗�${range[0]}-${range[1]} 鏉�/鍏� ${total} 鏉, - defaultPageSize: 8, - onChange: (value) => { - setHandCurrent(value - 1) - } + item.isStatus = 'web'; + return item; + }); + setWebData(res[1].data.web.optionalLayer.layers); + setWebStatus(arr); + } + setCheckLoading(false); + }) + .catch(e => { + setCheckLoading(false); + }); + }; - }} - > - </Table> - </div> - </Spin> - <AddModal - visible={visible} - onCancel={() => setVisible(false)} - callBackSubmit={onSubmit} - type={type} - formObj={formObj} - listData={schemename} + return ( + <> + <Spin tip="loading..." spinning={checkLoading}> + <div className={styles.solutionConfig}> + <div> + <Divider orientation="left"> + <div className={styles.divider}> + {' '} + Web{' '} + <PlusOutlined + onClick={() => { + addType('add'); + }} + className={styles.dividerIcon} + /> + </div> + </Divider> + <Table + columns={columns} + dataSource={webData} + bordered + pagination={{ + showTotal: (total, range) => `绗�${range[0]}-${range[1]} 鏉�/鍏� ${total} 鏉, + defaultPageSize: 8, + onChange: value => { + setWebCurrent(value - 1); + }, + }} + rowKey="schemename" + scroll={{ y: 400 }} /> - </> - ) -} -export default VectorData \ No newline at end of file + </div> + <Divider orientation="left"> + <div className={styles.divider}> + 鎵嬫寔{' '} + <PlusOutlined + onClick={() => { + addType('addHand'); + }} + className={styles.dividerIcon} + /> + </div>{' '} + </Divider> + <Table + columns={columns1} + dataSource={handData} + bordered + rowKey="schemename" + scroll={{ y: 600 }} + pagination={{ + showTotal: (total, range) => `绗�${range[0]}-${range[1]} 鏉�/鍏� ${total} 鏉, + defaultPageSize: 8, + onChange: value => { + setHandCurrent(value - 1); + }, + }} + /> + </div> + </Spin> + <AddModal + visible={visible} + onCancel={() => setVisible(false)} + callBackSubmit={onSubmit} + type={type} + formObj={formObj} + listData={schemename} + /> + </> + ); +}; +export default VectorData; -- 2.17.1