diff --git a/src/components/CommonTable/index.less b/src/components/CommonTable/index.less
index fe06606433479aa9d5086ac6c26e6266cc96e5d2..df4f1007e5c3978aff1426e4b92d98471285000a 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 fe9c578537bf9858a5b31f695425331d8e2112d7..2bfaf64c892fdff1b4e64008c7b4d477530c8f7b 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 bdefcf92c8014daa1f9eb4fb6113da3df4fe9d97..ce3e44ad04eb8e41d290eec165ef19bf585a251d 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 066c976235da807b4042fc7b854e199c693e79b1..dea45b06244c96bad70e7017e9ae58bdc8b4dcaf 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 26574989c70384fb2b459670b0c0988fb781d83c..3383e2d346296b548675f150d9ad4adc4b1c5a64 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 5183e7f30845de51e14d0c300779278a9c7995e2..d2755f8ec2ef9b94c557eb94e80747fb0951c887 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 3bcf5b4d5643a111f63a1482ade8e5c8c49f4c0f..7a5fb1bf1d3c1f0a6755b6444e827fbc8ebad5e6 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 64291c6304bd8e602127ece53c09c8af1cc04a5f..3c8a62208e2d599bfa19b47007d796544202451c 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 bf66130a11c2141758d6a8efd9cb41fcb7c6985d..a9a91ab18a65bcd5999d1c61ab1df275360a0a4a 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 63dc37dc0d7b797905707406bdeee74264e8b2fa..0445e6b79e82c662ab0f3949c38abd10febdc740 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 }) => {