From b36e2c667b67e05bb5d4b583ab468c59289762b4 Mon Sep 17 00:00:00 2001
From: piqianwen <302975438@qq.com>
Date: Mon, 13 Dec 2021 11:04:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=95=B0=E6=8D=AE=E5=AD=97?=
=?UTF-8?q?=E5=85=B8=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/dataCenter/dictionary1/WebDic.js | 4 +-
src/pages/dataCenter/dictionary1/WebDic.less | 102 +++++++++---------
.../bsmanager/workOrder/AddFlowsModal.jsx | 2 +-
.../bsmanager/workOrder/AddModal.jsx | 2 +-
.../bsmanager/workOrder/changeAdd.jsx | 12 +--
5 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/src/pages/dataCenter/dictionary1/WebDic.js b/src/pages/dataCenter/dictionary1/WebDic.js
index cca14260..b74ca4a0 100644
--- a/src/pages/dataCenter/dictionary1/WebDic.js
+++ b/src/pages/dataCenter/dictionary1/WebDic.js
@@ -822,7 +822,7 @@ const WebDic = () => {
setSelectID(record.nodeID);
}}
ItemTypes="first"
- pagination={pagenation}
+ pagination={false}
/>
</Col>
<Col span={16}>
@@ -859,7 +859,7 @@ const WebDic = () => {
</Tooltip>
</div>
)}
- pagination={pagenation}
+ pagination={false}
/>
</Spin>
</Col>
diff --git a/src/pages/dataCenter/dictionary1/WebDic.less b/src/pages/dataCenter/dictionary1/WebDic.less
index 266713d6..d00e07e2 100644
--- a/src/pages/dataCenter/dictionary1/WebDic.less
+++ b/src/pages/dataCenter/dictionary1/WebDic.less
@@ -1,54 +1,54 @@
-.WebDic{
- .item{
- margin-bottom: 20px;
- }
- .ant-table-content{
+.WebDic {
+ .item {
+ margin-bottom: 20px;
+ }
+ .ant-table-content {
max-height: calc(100vh - 260px);
border-right: white;
overflow: auto !important;
- }
- .divv{
- .ant-modal-wrap {
- z-index: 1001 !important;
- }
- }
- .ant-table-tbody{
- .clickRowStyle{
- background: #cfe7fd;
- }
- .clickRowStyle:hover>td{
- background: #aed8fa;
- }
- .clickRowStyle1{
- background: #b9dbfa;
- }
- .clickRowStyle1:hover>td{
- background: #9ec3e2;
- }
- }
- .ant-table-body{
- max-height: calc(100vh - 345px) !important;
- min-height:calc(100vh - 345px);
- margin-right: -6px;
- width:100%;
- }
- .ant-table-pagination.ant-pagination {
- margin: 10px 0 !important;
- }
- .font {
- font-weight: bold;
- }
- .tab{
- padding-right: 5px;
- .ant-table-body{
- margin-right: -7px;
- }
- }
- // .pad{
- // overflow-x: hidden;
- // }
- .ant-table-wrapper {
- max-width: 98%;
- margin-left: 2%;
- }
-}
\ No newline at end of file
+ }
+ .divv {
+ .ant-modal-wrap {
+ z-index: 1001 !important;
+ }
+ }
+ .ant-table-tbody {
+ .clickRowStyle {
+ background: #cfe7fd;
+ }
+ .clickRowStyle:hover > td {
+ background: #aed8fa;
+ }
+ .clickRowStyle1 {
+ background: #b9dbfa;
+ }
+ .clickRowStyle1:hover > td {
+ background: #9ec3e2;
+ }
+ }
+ .ant-table-body {
+ max-height: calc(100vh - 300px) !important;
+ min-height: calc(100vh - 300px);
+ margin-right: -6px;
+ width: 100%;
+ }
+ .ant-table-pagination.ant-pagination {
+ margin: 10px 0 !important;
+ }
+ .font {
+ font-weight: bold;
+ }
+ .tab {
+ padding-right: 5px;
+ .ant-table-body {
+ margin-right: -7px;
+ }
+ }
+ // .pad{
+ // overflow-x: hidden;
+ // }
+ .ant-table-wrapper {
+ max-width: 98%;
+ margin-left: 2%;
+ }
+}
diff --git a/src/pages/platformCenter/bsmanager/workOrder/AddFlowsModal.jsx b/src/pages/platformCenter/bsmanager/workOrder/AddFlowsModal.jsx
index 9bb0b52b..1a4373a4 100644
--- a/src/pages/platformCenter/bsmanager/workOrder/AddFlowsModal.jsx
+++ b/src/pages/platformCenter/bsmanager/workOrder/AddFlowsModal.jsx
@@ -130,7 +130,7 @@ const AddFlowsModal = props => {
let a1 = [];
let a2;
let a3 = [];
- initialArr.map(i => {
+ initialArr.data.map(i => {
// console.log(i.groupType)
a2 = i.groupType;
// console.log(a2)
diff --git a/src/pages/platformCenter/bsmanager/workOrder/AddModal.jsx b/src/pages/platformCenter/bsmanager/workOrder/AddModal.jsx
index bfa11bcd..ad49b90d 100644
--- a/src/pages/platformCenter/bsmanager/workOrder/AddModal.jsx
+++ b/src/pages/platformCenter/bsmanager/workOrder/AddModal.jsx
@@ -796,7 +796,7 @@ const AddModal = props => {
let a1 = [];
let a2;
let a3 = [];
- initialArr.map(i => {
+ initialArr.data.map(i => {
// console.log(i.groupType)
a2 = i.groupType;
// console.log(a2)
diff --git a/src/pages/platformCenter/bsmanager/workOrder/changeAdd.jsx b/src/pages/platformCenter/bsmanager/workOrder/changeAdd.jsx
index 34704f89..191754ac 100644
--- a/src/pages/platformCenter/bsmanager/workOrder/changeAdd.jsx
+++ b/src/pages/platformCenter/bsmanager/workOrder/changeAdd.jsx
@@ -740,7 +740,7 @@ const AddModal = props => {
forceRender
getContainer={false}
>
- {/* <Search
+ <Search
style={{
width: 260,
marginRight: '20px',
@@ -751,8 +751,8 @@ const AddModal = props => {
onChange={e => handleSearch(e)}
enterButton
value={searchWord}
- /> */}
- {/* <Button
+ />
+ <Button
type="primary"
htmlType="submit"
// onClick={() => {
@@ -762,7 +762,7 @@ const AddModal = props => {
// }}
>
閲嶇疆
- </Button> */}
+ </Button>
{visible && (
<div className={styles.listCard1}>
<div className={styles.cardItem1}>
@@ -819,7 +819,7 @@ const AddModal = props => {
</div>
</div>
)}
- {/* <Pagination
+ <Pagination
total={total}
showTotal={item => `鍏� ${item} 鏉}
defaultPageSize={pageSize}
@@ -829,7 +829,7 @@ const AddModal = props => {
style={{ marginBottom: '10px' }}
size="small"
showQuickJumper
- /> */}
+ />
</Modal>
);
}
--
2.17.1