From 3ab973452f1601d75c323ba395529754e7e0cde5 Mon Sep 17 00:00:00 2001
From: lijingqi <1437862981@qq.com>
Date: Mon, 23 Dec 2024 14:43:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E4=B8=80=E5=BC=A0=E5=9B=BE?=
=?UTF-8?q?=E5=8F=AF=E7=82=B9=E5=87=BB=E5=8C=BA=E5=9F=9F=E6=B7=BB=E5=8A=A0?=
=?UTF-8?q?=E6=89=8B=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/CommonTable/index.less | 40 ++++++++--------
.../IndustryWarn/IndustryWiget/index.less | 2 +-
.../IndustryWarn/IndustryWiget/index.tsx | 2 +-
.../RightLayout/RiskNotice/index.less | 2 +-
.../SafetyAccident/AccidentItem/index.less | 2 +-
.../SafetyTips/SafetyTipItem/index.less | 1 +
.../SecurityState/SafetyTips/index.less | 2 +-
.../SecurityState/index.less | 1 +
.../components/IndustrySign/index.less | 2 +-
.../components/IndustrySign/index.tsx | 46 ++-----------------
10 files changed, 29 insertions(+), 71 deletions(-)
diff --git a/src/components/CommonTable/index.less b/src/components/CommonTable/index.less
index fe066064..df4f1007 100644
--- a/src/components/CommonTable/index.less
+++ b/src/components/CommonTable/index.less
@@ -2,7 +2,10 @@
:global {
-
+ .ant-table-body {
+ scrollbar-width: auto;
+ scrollbar-color: auto;
+ }
.ant-table-wrapper .ant-table-tbody>tr>td {
padding: 5px 16px !important;
}
@@ -13,15 +16,15 @@
::-webkit-scrollbar {
/*滚动条整体样式*/
- width: 5px !important;
+ width: 10px !important;
/*高宽分别对应横竖滚动条的尺寸*/
- height: 5px !important;
+ height: 10px !important;
}
::-webkit-scrollbar-thumb {
/*滚动条里面小方块*/
border-radius: 10px !important;
- background: #4f98e2 !important;
+ background: #113f67 !important;
}
@@ -62,8 +65,13 @@
background: rgba(57, 122, 183, 0.402) !important;
}
+ .ant-table-wrapper .ant-table-tbody>tr {
+ border-radius: 16px !important;
+ }
+
.ant-table-wrapper .ant-table-tbody>tr>td {
+ border-bottom: 7px solid #113f67;
font-weight: 700;
font-size: 20px;
@@ -75,28 +83,14 @@
background: transparent !important;
}
- .css-dev-only-do-not-override-z0m7uc.ant-table-wrapper table {
- border-collapse: separate !important;
- border-spacing: 0 10px !important;
- }
- .ant-table-wrapper .ant-table-tbody>tr>td {
- border: 0;
- }
- // .ant-pagination .ant-pagination-prev .ant-pagination-item-link {
- // font-size: 20px;
- // color: #1086BE
- // }
- // .ant-pagination .ant-pagination-next .ant-pagination-item-link {
- // font-size: 20px;
- // color: #1086BE
- // }
+
.ant-pagination .ant-pagination-item {
background-color: transparent;
@@ -139,10 +133,10 @@
.tablewrap {
.rowStyle {
height: 50px !important;
- border: 0;
+
background-color: rgba(57, 122, 183, 0.241);
- background-size: 100% 100%;
- border-radius: 16px 0 0 16px !important;
+
+ border-radius: 16px !important;
overflow: hidden !important;
}
@@ -152,6 +146,8 @@
}
+
}
+
}
\ No newline at end of file
diff --git a/src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/IndustryWiget/index.less b/src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/IndustryWiget/index.less
index fe9c5785..2bfaf64c 100644
--- a/src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/IndustryWiget/index.less
+++ b/src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/IndustryWiget/index.less
@@ -2,7 +2,7 @@
display: flex;
align-items: center;
min-width: 150px;
-
+cursor: pointer;
.leftWrap {
.icon {
width: 52px;
diff --git a/src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/IndustryWiget/index.tsx b/src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/IndustryWiget/index.tsx
index bdefcf92..ce3e44ad 100644
--- a/src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/IndustryWiget/index.tsx
+++ b/src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/IndustryWiget/index.tsx
@@ -57,7 +57,7 @@ const IndustryWiget = ({
title={wayModalOpt?.title}
onCancel={() => setWayModalOpt({ open: false, title: '' })}
width={1772}
- height={846}
+ height={856}
>
{wayModalOpt?.parentCode && }
diff --git a/src/pages/SecurityServiceOverview/SecurityState/RightLayout/RiskNotice/index.less b/src/pages/SecurityServiceOverview/SecurityState/RightLayout/RiskNotice/index.less
index 066c9762..dea45b06 100644
--- a/src/pages/SecurityServiceOverview/SecurityState/RightLayout/RiskNotice/index.less
+++ b/src/pages/SecurityServiceOverview/SecurityState/RightLayout/RiskNotice/index.less
@@ -82,7 +82,7 @@
color: var(--color);
margin-bottom: 20px;
position: relative;
-
+cursor: pointer;
.icon {
width: 100px;
position: absolute;
diff --git a/src/pages/SecurityServiceOverview/SecurityState/SafetyAccident/AccidentItem/index.less b/src/pages/SecurityServiceOverview/SecurityState/SafetyAccident/AccidentItem/index.less
index 26574989..3383e2d3 100644
--- a/src/pages/SecurityServiceOverview/SecurityState/SafetyAccident/AccidentItem/index.less
+++ b/src/pages/SecurityServiceOverview/SecurityState/SafetyAccident/AccidentItem/index.less
@@ -5,7 +5,7 @@
background-color: rgba(18, 40, 69, 0.3);
border-radius: 15px;
height: 143px;
-
+cursor: pointer;
.img {
width: 110px;
height: 120px;
diff --git a/src/pages/SecurityServiceOverview/SecurityState/SafetyTips/SafetyTipItem/index.less b/src/pages/SecurityServiceOverview/SecurityState/SafetyTips/SafetyTipItem/index.less
index 5183e7f3..d2755f8e 100644
--- a/src/pages/SecurityServiceOverview/SecurityState/SafetyTips/SafetyTipItem/index.less
+++ b/src/pages/SecurityServiceOverview/SecurityState/SafetyTips/SafetyTipItem/index.less
@@ -7,6 +7,7 @@
display: flex;
margin-bottom: 10px;
align-items: center;
+ cursor: pointer;
.leftWarp{
display: flex;
diff --git a/src/pages/SecurityServiceOverview/SecurityState/SafetyTips/index.less b/src/pages/SecurityServiceOverview/SecurityState/SafetyTips/index.less
index 3bcf5b4d..7a5fb1bf 100644
--- a/src/pages/SecurityServiceOverview/SecurityState/SafetyTips/index.less
+++ b/src/pages/SecurityServiceOverview/SecurityState/SafetyTips/index.less
@@ -37,7 +37,7 @@
width: 270px;
height: 280px;
border-radius: 10px;
-
+cursor: pointer;
.img {
width: 100%;
height: 280px;
diff --git a/src/pages/SecurityServiceOverview/SecurityState/index.less b/src/pages/SecurityServiceOverview/SecurityState/index.less
index 64291c63..3c8a6220 100644
--- a/src/pages/SecurityServiceOverview/SecurityState/index.less
+++ b/src/pages/SecurityServiceOverview/SecurityState/index.less
@@ -11,6 +11,7 @@
padding-top: 20px;
padding-right: 20px;
padding-left: 20px;
+ padding-bottom: 20px;
}
diff --git a/src/pages/SecurityServiceOverview/components/IndustrySign/index.less b/src/pages/SecurityServiceOverview/components/IndustrySign/index.less
index bf66130a..a9a91ab1 100644
--- a/src/pages/SecurityServiceOverview/components/IndustrySign/index.less
+++ b/src/pages/SecurityServiceOverview/components/IndustrySign/index.less
@@ -53,7 +53,7 @@
.right {
flex: 1;
- overflow: auto;
+
.top {
.card {
width: 403px;
diff --git a/src/pages/SecurityServiceOverview/components/IndustrySign/index.tsx b/src/pages/SecurityServiceOverview/components/IndustrySign/index.tsx
index 63dc37dc..0445e6b7 100644
--- a/src/pages/SecurityServiceOverview/components/IndustrySign/index.tsx
+++ b/src/pages/SecurityServiceOverview/components/IndustrySign/index.tsx
@@ -17,19 +17,10 @@ import styles from './index.less';
*/
const IndustrySign = ({ param }: { param: any }) => {
- const { initialState } = useModel('@@initialState');
- const { areaId } = initialState;
+
+
const { selectAreaId } = useModel('safetyAreaId');
- const indexIdMap: Record = {
- dlql: '202', //道桥
- gf: '209', //固废
- ggzp: '205', //广告牌
- gl: '208', //管廊
- hw: '204', //环卫
- yyrq: '208', //油烟
- zm: '203', //照明
- };
// 事件详情弹窗
const [detailModalOpt, setDetailModalOpt] = useState<{
@@ -74,37 +65,6 @@ const IndustrySign = ({ param }: { param: any }) => {
});
}, [selectAreaId]);
- // const { data: signData } = useRequest(() => {
- // return services.Physicalsign.getComparisonIndexInstance({
- // indexId: indexIdMap[param?.typeCode],
- // physicalSignType: 1,
- // indexType: 1,
- // objectId: areaId,
- // });
- // });
- // const { data: eventData } = useRequest(
- // () => services.CityRiskApi.getEventPage(fetchParams),
- // {
- // refreshDeps: [fetchParams],
- // onSuccess: (res) => {
- // console.log(res);
-
- // setListData({
- // ...res?.data,
- // items: [
- // ...listData.items,
- // ...res?.data?.items?.map((item: any) => ({
- // ...item,
- // standardEventTitle: item?.eventType,
- // caseStatusText: item?.currentStatus,
- // reportTime: item?.warningTime,
- // collectionModeName: item?.sourceType,
- // })),
- // ],
- // });
- // },
- // },
- // );
/** 标题渲染 */
const titleRender = () => {
@@ -342,7 +302,7 @@ const IndustrySign = ({ param }: { param: any }) => {