diff --git a/src/pages/Common/Sign/IndustrySystem/index.tsx b/src/pages/Common/Sign/IndustrySystem/index.tsx
index 23ea33da4eff5725891d60b9c4e501be388e912d..4a31190ab7e1d498b39cba8d6aaa8918e640e477 100644
--- a/src/pages/Common/Sign/IndustrySystem/index.tsx
+++ b/src/pages/Common/Sign/IndustrySystem/index.tsx
@@ -25,6 +25,15 @@ const IndustrySystem = () => {
},
],
},
+ {
+ name: '城研院',
+ sub: [
+ {
+ name: '成都市城市综合管理数据资源中心',
+ url: '',
+ },
+ ],
+ },
{
name: '执法总队',
sub: [
diff --git a/src/pages/Common/Sign/SignModel/SignStatus/index.tsx b/src/pages/Common/Sign/SignModel/SignStatus/index.tsx
index 0fecd2e7587f39a5994e42b32aac56a9d987c222..17db8c0c60ac1c0f45825f69cbf94d2693291fa4 100644
--- a/src/pages/Common/Sign/SignModel/SignStatus/index.tsx
+++ b/src/pages/Common/Sign/SignModel/SignStatus/index.tsx
@@ -15,7 +15,7 @@ const SignStatus = () => {
},
{
name: '预警态',
- pre: '(85分一下)',
+ pre: '(85分以下)',
desc: '提示问题积压或处置效率下降,需要加大治理力度。',
color: 'rgb(255, 162, 80)',
},
diff --git a/src/pages/NewHome/NewLeftSidebar/CityRealTimeCQI/index.tsx b/src/pages/NewHome/NewLeftSidebar/CityRealTimeCQI/index.tsx
index 1e2750486c939405fc95acbba00dda00760162af..350bd98bc5a2cd70e7f571e8010e12db38c21af3 100644
--- a/src/pages/NewHome/NewLeftSidebar/CityRealTimeCQI/index.tsx
+++ b/src/pages/NewHome/NewLeftSidebar/CityRealTimeCQI/index.tsx
@@ -35,7 +35,17 @@ const CityRealTimeCQI: React.FC = () => {
};
services.Physicalsign.getComparisonIndexInstance(params).then((res) => {
if (res.code === 200) {
- setCqiData(res.data);
+ console.log(res.data);
+ let isAdjust = true;
+ if (isAdjust && res.data.currentIndex?.indexs) {
+ const indexs = res.data.currentIndex.indexs.map((item: any) =>
+ item.name === '美观' ? { ...item, value: '--' } : item
+ );
+ const updatedData = { ...res.data, currentIndex: { ...res.data.currentIndex, indexs } };
+ setCqiData(updatedData);
+ } else {
+ setCqiData(res.data);
+ }
}
});
};
diff --git a/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/HighFrequencyArea/index.tsx b/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/HighFrequencyArea/index.tsx
index 838d5e5dadc32b688d15dfc4d17c717af61a02f8..3fd4aab43ab62572f74fe66efe833fc7e675f362 100644
--- a/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/HighFrequencyArea/index.tsx
+++ b/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/HighFrequencyArea/index.tsx
@@ -13,7 +13,7 @@ const HighFrequencyArea: React.FC<{
{areaStatistics.map((item, index) => (
-
+
{item.name}
diff --git a/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/HighFrequencyType/index.tsx b/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/HighFrequencyType/index.tsx
index f625a6dd322f6f5c4c2f072a146884e5cff19a46..139544127206bb22cd34d53f0176b1ff58a37ff8 100644
--- a/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/HighFrequencyType/index.tsx
+++ b/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/HighFrequencyType/index.tsx
@@ -67,7 +67,7 @@ const HighFrequencyType: React.FC<{
{categoryStatistics.map((item, index) => (
-
+
{item.name}
diff --git a/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/Problem/index.css b/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/Problem/index.css
index 04796e65315a1b2c976a34721f3c3b4510f66ce2..eb7d8a128891ba855021aa1257d6ff61eeda264e 100644
--- a/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/Problem/index.css
+++ b/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/Problem/index.css
@@ -2,8 +2,6 @@
width: 100%;
height: 100%;
border-radius: 40px;
- background: linear-gradient(180deg, rgba(27, 50, 89, 0.3), rgba(27, 50, 89, 0) 100%);
- padding: 20px;
}
.wrap .content {
flex: 1;
@@ -15,18 +13,24 @@
text-align: center;
}
.wrap .content .card .numCard {
+ padding: 20px;
width: 115px;
height: 112px;
border-radius: 10px;
background: rgba(67, 113, 180, 0.3);
text-align: center;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
color: #bccee9;
cursor: pointer;
}
.wrap .content .card .numCard .name {
- font-size: 14px;
+ font-family: D-DIN;
+ font-size: 18px;
font-weight: 400;
- line-height: 1;
+ line-height: 18px;
}
.wrap .content .center {
width: 557px;
@@ -41,10 +45,18 @@
align-items: center;
gap: 2vh;
font-size: clamp(14px, 1.8vh, 18px);
- font-weight: 700;
+ font-weight: 400;
color: #fff;
}
+.wrap .content .totalName {
+ font-family: '微软雅黑';
+ font-size: 18px;
+ font-weight: 700;
+ line-height: 24px;
+}
.wrap .content .unit {
+ font-family: '微软雅黑';
+ font-size: 14px;
font-weight: 400;
color: #bccee9;
}
@@ -54,6 +66,6 @@
-webkit-text-fill-color: transparent;
background-clip: text;
font-family: D-DIN;
- font-size: clamp(20px, 2.5vh, 30px);
+ font-size: 26px;
font-weight: 700;
}
diff --git a/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/Problem/index.less b/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/Problem/index.less
index ff033b05dc62af1f77e8dc251c20e25c0095f096..1517bcc10d95a3ac69633fd01ed4cbeaa8a66353 100644
--- a/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/Problem/index.less
+++ b/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/Problem/index.less
@@ -18,6 +18,7 @@
text-align: center;
.numCard {
+ padding: 20px;
width: 115px;
height: 112px;
@@ -36,9 +37,11 @@
.name {
// font-size: clamp(14px, 1.8vh, 18px);
- font-size: 14px;
+ font-family: D-DIN;
+ font-size: 18px;
font-weight: 400;
- line-height: 1;
+ line-height: 18px;
+ // line-height: 1;
}
}
}
@@ -64,11 +67,20 @@
align-items: center;
gap: 2vh;
font-size: clamp(14px, 1.8vh, 18px);
- font-weight: 700;
+ font-weight: 400;
color: #fff;
}
+ .totalName {
+ font-family: '微软雅黑';
+ font-size: 18px;
+ font-weight: 700;
+ line-height: 24px;
+ }
+
.unit {
+ font-family: '微软雅黑';
+ font-size: 14px;
font-weight: 400;
color: #bccee9;
}
@@ -84,7 +96,8 @@
-webkit-text-fill-color: transparent;
background-clip: text;
font-family: D-DIN;
- font-size: clamp(20px, 2.5vh, 30px);
+ font-size: 26px;
+ // font-size: clamp(20px, 2.5vh, 30px);
font-weight: 700;
}
}
diff --git a/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/Problem/index.tsx b/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/Problem/index.tsx
index 86adb18042c56c34ea4384f1f403322c2f03b7a3..5c58dbdf01eca2f0055e501c2dae2bccfff701fe 100644
--- a/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/Problem/index.tsx
+++ b/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/Problem/index.tsx
@@ -86,11 +86,11 @@ const Problem: React.FC = () => {
},
},
{
- name: '其他',
+ name: '其它',
value: statisticsData.otherSourceNum,
modalConf: {
type: 'otherEvent',
- title: '其他处置渠道',
+ title: '其它处置渠道',
isOther: '1',
},
},
@@ -238,7 +238,7 @@ const Problem: React.FC = () => {
style={{ cursor: 'pointer' }}
onClick={handleGeneralSituationClick}
>
- 事件总量
+ 事件总量
件
diff --git a/src/pages/NewHome/NewRightContent/ResourceElements/index.tsx b/src/pages/NewHome/NewRightContent/ResourceElements/index.tsx
index 565051013cd98442cc8b8a216f5e24e86838b553..08a0ec583e69c12ee448e6291413fd73e1194e88 100644
--- a/src/pages/NewHome/NewRightContent/ResourceElements/index.tsx
+++ b/src/pages/NewHome/NewRightContent/ResourceElements/index.tsx
@@ -46,7 +46,7 @@ const ResourceElements: React.FC = () => {
return (
- 资源要素
+ 城管资源要素
{cards.map((card) => (