From 9720880a1c1b0634f13b31ad4db48235113e7d54 Mon Sep 17 00:00:00 2001 From: jl-zhoujl2 Date: Thu, 22 Sep 2022 13:37:42 +0800 Subject: [PATCH] =?UTF-8?q?9.22=20=E5=A4=A7=E5=B1=8F=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9=E5=B9=B6=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ElecBidEvaluation/BidEvalAppointment.tsx | 4 +-- .../MonitorScreen/Home/index.tsx | 4 +++ .../MonitorScreen/Home/style.less | 20 +++++------ .../MonitorScreen/MonitorRoom/index.tsx | 1 + .../MonitorScreen/MonitorRoom/style.less | 9 +++++ .../ProjectMonitorRoom/index.tsx | 8 ++--- .../ProjectMonitorRoom/style.less | 33 +++++++++++++++++-- 7 files changed, 61 insertions(+), 18 deletions(-) diff --git a/src/components/ElecBidEvaluation/BidEvalAppointment.tsx b/src/components/ElecBidEvaluation/BidEvalAppointment.tsx index f55b424..338e3ff 100644 --- a/src/components/ElecBidEvaluation/BidEvalAppointment.tsx +++ b/src/components/ElecBidEvaluation/BidEvalAppointment.tsx @@ -301,7 +301,7 @@ const BidEvalAppointment: React.FC = (props) => { rules={[{ required: true, message: '请选择' }]} extra={预约时间范围 7:00 ~ 18:00} > - otherDisabledDateTime(current, disabledMap)} showMinute={false} showSecond={false} format={dateFormat} style={{ width: '100%' }} renderExtraFooter={() => "注：若时间被占用，则置灰不可选"} /> + otherDisabledDateTime(current, disabledMap)} showMinute={false} showSecond={false} format={dateFormat} style={{ width: '100%' }} renderExtraFooter={() => 注：若时间被占用，则置灰不可选} /> @@ -310,7 +310,7 @@ const BidEvalAppointment: React.FC = (props) => { name="reserveEndDate" rules={[{ required: true, message: '请选择' }]} > - otherDisabledDateTime(current, disabledMap)} showMinute={false} showSecond={false} format={dateFormat} style={{ width: '100%' }} renderExtraFooter={() => "注：若时间被占用，则置灰不可选"} /> + otherDisabledDateTime(current, disabledMap)} showMinute={false} showSecond={false} format={dateFormat} style={{ width: '100%' }} renderExtraFooter={() => 注：若时间被占用，则置灰不可选} /> diff --git a/src/pages/ElecEvaluation/MonitorScreen/Home/index.tsx b/src/pages/ElecEvaluation/MonitorScreen/Home/index.tsx index 2779b8a..d587b47 100644 --- a/src/pages/ElecEvaluation/MonitorScreen/Home/index.tsx +++ b/src/pages/ElecEvaluation/MonitorScreen/Home/index.tsx @@ -826,6 +826,10 @@ export default () => { className="screen-table" rowKey="id" size="small" + scroll={{ + y: 200, + scrollToFirstRowOnChange: true, + }} dataSource={bidProjectData} columns={evalColumn} onRow={record => { diff --git a/src/pages/ElecEvaluation/MonitorScreen/Home/style.less b/src/pages/ElecEvaluation/MonitorScreen/Home/style.less index 9584890..bd45d0d 100644 --- a/src/pages/ElecEvaluation/MonitorScreen/Home/style.less +++ b/src/pages/ElecEvaluation/MonitorScreen/Home/style.less @@ -87,14 +87,6 @@ .screen-warn-list { height: 67.4%; margin-top: 0; - - ::-webkit-scrollbar { - display: none; - } - - .ant-table-cell-scrollbar { - display: none; - } } .screen-graph-top { @@ -372,8 +364,8 @@ } .screen-table { - margin-top: 0.5rem; - height: calc(100% - 40px - 0.5rem); + margin-top: 0.25rem; + height: calc(100% - 40px - 0.25rem); overflow: hidden; .ant-table-container table>thead>tr:first-child th:first-child { @@ -409,4 +401,12 @@ .ant-table-small .ant-table-thead>tr>th { background-color: #045da8; } + + ::-webkit-scrollbar { + display: none; + } + + .ant-table-cell-scrollbar { + display: none; + } } \ No newline at end of file diff --git a/src/pages/ElecEvaluation/MonitorScreen/MonitorRoom/index.tsx b/src/pages/ElecEvaluation/MonitorScreen/MonitorRoom/index.tsx index 9c9cdce..f8b0ab4 100644 --- a/src/pages/ElecEvaluation/MonitorScreen/MonitorRoom/index.tsx +++ b/src/pages/ElecEvaluation/MonitorScreen/MonitorRoom/index.tsx @@ -333,6 +333,7 @@ export default () => { pagination={{ defaultPageSize: 6, onChange: onPageChange, + current: pageNo.current, total: totalItem, showTotal: (total, range) => `当前第 ${range[0]}-${range[1]} 条，共计 ${total} 条`, // itemRender diff --git a/src/pages/ElecEvaluation/MonitorScreen/MonitorRoom/style.less b/src/pages/ElecEvaluation/MonitorScreen/MonitorRoom/style.less index 0b143c0..30961fc 100644 --- a/src/pages/ElecEvaluation/MonitorScreen/MonitorRoom/style.less +++ b/src/pages/ElecEvaluation/MonitorScreen/MonitorRoom/style.less @@ -476,6 +476,15 @@ .ant-pagination-prev { margin-right: 0.5rem; } + + .ant-pagination-item-ellipsis { + color: #8de3f3; + } + + .ant-pagination-jump-prev .ant-pagination-item-container .ant-pagination-item-link-icon, + .ant-pagination-jump-next .ant-pagination-item-container .ant-pagination-item-link-icon { + color: #8de3f3; + } } } \ No newline at end of file diff --git a/src/pages/ElecEvaluation/MonitorScreen/ProjectMonitorRoom/index.tsx b/src/pages/ElecEvaluation/MonitorScreen/ProjectMonitorRoom/index.tsx index d546cad..585080d 100644 --- a/src/pages/ElecEvaluation/MonitorScreen/ProjectMonitorRoom/index.tsx +++ b/src/pages/ElecEvaluation/MonitorScreen/ProjectMonitorRoom/index.tsx @@ -350,7 +350,7 @@ export default (props: any) => {
{basicInfo?.areaName}
-
{bidStatusMap[basicInfo?.status]}
+
{basicInfo?.status &&
{bidStatusMap[basicInfo?.status]}
}
@@ -367,7 +367,7 @@ export default (props: any) => {
供应商名称（{basicInfo?.supplierLength}）： - {basicInfo?.sectionPayerList?.map((item: any) =>

{item.sectionName}（{item.payerNumber}）：{item.payerNames.join("、")}

)}} visible={visible} color="rgba(4,20,47,0.85)" overlayInnerStyle={{ width: '250%' }} overlayClassName="screen-tag"> + {basicInfo?.sectionPayerList?.map((item: any, index: any) =>

{item.sectionName}（{item.payerNumber}）：{item.payerNames.join("、")}

)}} visible={visible} color="rgba(4,20,47,0.85)" overlayInnerStyle={{ width: '250%' }} overlayClassName="screen-tag"> {basicInfo?.sectionPayerList?.[0]?.payerNames.slice(0, 5).join("、")} setVisible(true)} onMouseLeave={() => setVisible(false)}>全部
@@ -381,7 +381,7 @@ export default (props: any) => {
- {caremaList.map(item =>
onCaremaPlay(item)} key={item.id}>{item.deviceName}
)} + {caremaList.map((item, index) =>
onCaremaPlay(item)} key={index}>{item.deviceName}
)}
@@ -400,7 +400,7 @@ export default (props: any) => { {btnSelect == "0" ? (
{basicInfo?.status == "2" - ? backStrangerList.slice(0, 5).map((item: any, index: any) => ( + ? backStrangerList.map((item: any, index: any) => (

时间：{item.createDate}

diff --git a/src/pages/ElecEvaluation/MonitorScreen/ProjectMonitorRoom/style.less b/src/pages/ElecEvaluation/MonitorScreen/ProjectMonitorRoom/style.less index cc47a1b..480fb85 100644 --- a/src/pages/ElecEvaluation/MonitorScreen/ProjectMonitorRoom/style.less +++ b/src/pages/ElecEvaluation/MonitorScreen/ProjectMonitorRoom/style.less @@ -259,23 +259,52 @@ text-align: center; .stranger-list { - height: calc(100% - 76px); + // height: calc(100% - 76px); + height: calc(100% - 36px); + overflow-y: auto; + overflow-x: hidden; + margin-top: 4px; .stranger-list-card { // border: 1px solid #2B5093; // background-color: #051666; border-bottom: 1px solid #5c6aa2; height: 20%; - margin-top: 8px; + // margin-top: 8px; padding: 8px; color: #99f6ff; display: flex; justify-content: space-between; + text-align: left; &>div>p>span { color: #fff; } } + + /*设置宽度,轨道颜色*/ + &::-webkit-scrollbar { + width: 6px; + height: 6px; + // padding-right: 3px; + } + + /*滚动条*/ + &::-webkit-scrollbar-thumb { + background: #b9bfd7; + border-radius: 10px; + } + + /*增加悬停样式*/ + &::-webkit-scrollbar-thumb:hover { + background: #dcdfeb; + } + + /*滚动轨道样式*/ + &::-webkit-scrollbar-track-piece { + background: #505e9a; + border-radius: 3px; + } } .ant-drawer-close {