From 99ec47cda2fd3d65132418c7363a5206b48c84e6 Mon Sep 17 00:00:00 2001 From: piqianwen <302975438@qq.com> Date: Wed, 26 Jan 2022 16:59:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20'=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=E4=BC=98=E5=8C=96'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gis/schemeConfig/SchemeConfig.less | 210 +++++++++--------- .../projectMessage/projectMessage.jsx | 2 +- .../solutionConfig/solutionConfig.jsx | 62 +++--- 3 files changed, 138 insertions(+), 136 deletions(-) diff --git a/src/pages/platformCenter/gis/schemeConfig/SchemeConfig.less b/src/pages/platformCenter/gis/schemeConfig/SchemeConfig.less index 5c28eaec..3220cf9f 100644 --- a/src/pages/platformCenter/gis/schemeConfig/SchemeConfig.less +++ b/src/pages/platformCenter/gis/schemeConfig/SchemeConfig.less @@ -1,114 +1,116 @@ -.container{ - width: 100%; +.container { + width: 100%; + background-color: #ffffff; + padding: 0.8rem; + display: flex; + .ant-table { + min-height: 15rem !important; + } + .ant-table-thead tr th { + font-weight: 600; + color: rgba(0, 0, 0, 0.85); + } + overflow-y: scroll; + .ant-input-number-input { background-color: #ffffff; - padding: 0.8rem; - display: flex; - .ant-table { - min-height: 15rem !important; - } - .ant-table-thead tr th { - font-weight: 600; - color: rgba(0, 0, 0, 0.85); - } - overflow-y: scroll; - .ant-input-number-input{ - background-color: #ffffff; - color: #000000; - } - .ant-card-body { - padding: 12px 24px 24px 25px; - } -} -.imgList{ - display: flex; - flex-wrap: wrap; -} -.imgItem{ - display: flex; - flex-direction: column; - align-items: center; - margin:0 1rem 1rem 0; -} -.tileBtn{ - display: flex; - justify-content: flex-end; - width: 100%; - padding: 0 0 2rem -} -.schemeName{ - margin-right: 0.8rem; - font-weight: bold; + color: #000000; + } + .ant-card-body { + padding: 12px 24px 24px 25px; + } +} +.imgList { + display: flex; + flex-wrap: wrap; +} +.imgItem { + display: flex; + flex-direction: column; + align-items: center; + margin: 0 1rem 1rem 0; +} +.tileBtn { + display: flex; + justify-content: flex-end; + width: 100%; + padding: 0 0 2rem; +} +.schemeName { + margin-right: 0.8rem; + font-weight: bold; } -.schemeItem,.schemeBtn{ - display: flex; - align-items: center; -} -.schemeBtn{ - width: 12rem; - justify-content: center; -} -.mapItem{ - display: flex; - border: 1px solid #ccc; - border-radius: 4px; - height: 2.2rem; - align-items: center; - margin: 0.5rem 0; - width: 14.5rem; -} -.defaultTile{ - background: #ccc; - color: white; - cursor: pointer; - height: 100%; - display: flex; - align-items: center; - width: 3rem; - justify-content: center; - +.schemeItem, +.schemeBtn { + display: flex; + align-items: center; } -.mapText{ - width: 10rem; - text-align: center; +.schemeBtn { + width: 12rem; + justify-content: center; } -.mapIcon{ - display: flex; - justify-content: center; - align-items: center; - cursor: pointer; +.mapItem { + display: flex; + border: 1px solid #ccc; + border-radius: 4px; + height: 2.2rem; + align-items: center; + margin: 0.5rem 0; + width: 14.5rem; } -.activeTile{ - background-color: #4699f4 +.defaultTile { + background: #ccc; + color: white; + cursor: pointer; + height: 100%; + display: flex; + align-items: center; + width: 3rem; + justify-content: center; +} +.mapText { + width: 10rem; + text-align: center; +} +.mapIcon { + display: flex; + justify-content: center; + align-items: center; + cursor: pointer; +} +.activeTile { + background-color: #4699f4; } .dropList { - position: absolute; - right: 2%; - top: 25%; - color: rgba(0, 0, 0, 0.25); - z-index: 99; -} -.divider{ - display: flex; - align-items: center; - line-height: 100%; - padding: 0.5rem; - .dividerIcon{ - margin-left: 0.8rem; - color: #4699f4; - cursor: pointer; - } + position: absolute; + right: 2%; + top: 25%; + color: rgba(0, 0, 0, 0.25); + z-index: 99; } - - .cardsList{ - display: flex; - flex-wrap: wrap; - } - .cardItem{ - width: 18rem; - height: 26rem; - margin: 0 2rem; +.divider { + display: flex; + align-items: center; + line-height: 100%; + padding: 0.5rem; + .dividerIcon { + margin-left: 0.8rem; + color: #4699f4; + cursor: pointer; } -.solutionConfig{ - -} \ No newline at end of file +} + +.cardsList { + display: flex; + flex-wrap: wrap; + height: 710px; + overflow-y: scroll; +} +.cardItem { + width: 18rem; + height: 26rem; + margin: 0 2rem; +} +// .solutionConfig { +// height: calc(100% - 30px); +// } diff --git a/src/pages/platformCenter/gis/schemeConfig/projectMessage/projectMessage.jsx b/src/pages/platformCenter/gis/schemeConfig/projectMessage/projectMessage.jsx index c0110fce..cfa76509 100644 --- a/src/pages/platformCenter/gis/schemeConfig/projectMessage/projectMessage.jsx +++ b/src/pages/platformCenter/gis/schemeConfig/projectMessage/projectMessage.jsx @@ -46,7 +46,7 @@ const VectorData = props => { return ( <> <Spin tip="loading..." spinning={treeLoading}> - <div style={{ height: '780px', overflow: 'scroll' }}> + <div> <div className={styles.tileBtn}> <Button type="primary" diff --git a/src/pages/platformCenter/gis/schemeConfig/solutionConfig/solutionConfig.jsx b/src/pages/platformCenter/gis/schemeConfig/solutionConfig/solutionConfig.jsx index 87766f42..b099c406 100644 --- a/src/pages/platformCenter/gis/schemeConfig/solutionConfig/solutionConfig.jsx +++ b/src/pages/platformCenter/gis/schemeConfig/solutionConfig/solutionConfig.jsx @@ -337,7 +337,7 @@ const VectorData = props => { setVisible(false); setFlag(flag + 1); }; - //åˆ é™¤webé…置方案 + // åˆ é™¤webé…置方案 const delWebConfirm = record => { deleteConfig({ schemename: record['schemename'], @@ -465,36 +465,35 @@ const VectorData = props => { 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 - style={{ minHeight: '210px' }} - pagination={{ - showTotal: (total, range) => `第${range[0]}-${range[1]} æ¡/å…± ${total} æ¡`, - defaultPageSize: 8, - onChange: value => { - setWebCurrent(value - 1); - }, - }} - rowKey="schemename" - scroll={{ y: 210 }} - /> - </div> + <div> + <Divider orientation="left"> + <div className={styles.divider}> + {' '} + Web{' '} + <PlusOutlined + onClick={() => { + addType('add'); + }} + className={styles.dividerIcon} + /> + </div> + </Divider> + <Table + columns={columns} + dataSource={webData} + bordered + style={{ height: 'calc(100vh - 610px)' }} + pagination={{ + showTotal: (total, range) => `第${range[0]}-${range[1]} æ¡/å…± ${total} æ¡`, + defaultPageSize: 8, + onChange: value => { + setWebCurrent(value - 1); + }, + }} + rowKey="schemename" + scroll={{ y: 210 }} + /> + <Divider orientation="left"> <div className={styles.divider}> 手æŒ{' '} @@ -512,6 +511,7 @@ const VectorData = props => { bordered rowKey="schemename" scroll={{ y: 210 }} + style={{ height: 'calc(100vh - 610px)' }} pagination={{ showTotal: (total, range) => `第${range[0]}-${range[1]} æ¡/å…± ${total} æ¡`, defaultPageSize: 8, -- 2.17.1