From 34e0d33a066565d1820c93c488fa38eb49d2415a Mon Sep 17 00:00:00 2001
From: tangshaojian <63377964@qq.com>
Date: Mon, 16 Dec 2024 20:58:00 +0800
Subject: [PATCH] =?UTF-8?q?tsj=EF=BC=9A=20=E4=BF=AE=E6=94=B9=E7=BB=9F?=
 =?UTF-8?q?=E8=A7=88=E5=A4=A7=E5=B1=8F=E6=95=85=E9=9A=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Common/Sign/IndustrySystem/index.tsx      |  9 +++++++
 .../Sign/SignModel/SignStatus/index.tsx       |  2 +-
 .../NewLeftSidebar/CityRealTimeCQI/index.tsx  | 12 +++++++++-
 .../HighFrequencyArea/index.tsx               |  2 +-
 .../HighFrequencyType/index.tsx               |  2 +-
 .../UrbanManagementIssues/Problem/index.css   | 24 ++++++++++++++-----
 .../UrbanManagementIssues/Problem/index.less  | 21 ++++++++++++----
 .../UrbanManagementIssues/Problem/index.tsx   |  6 ++---
 .../ResourceElements/index.tsx                |  2 +-
 9 files changed, 62 insertions(+), 18 deletions(-)

diff --git a/src/pages/Common/Sign/IndustrySystem/index.tsx b/src/pages/Common/Sign/IndustrySystem/index.tsx
index 23ea33da..4a31190a 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 0fecd2e7..17db8c0c 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 1e275048..350bd98b 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 838d5e5d..3fd4aab4 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<{
       </Space>
       <div className={styles.wrap}>
         {areaStatistics.map((item, index) => (
-          <div className={styles.litsItem}>
+          <div className={styles.litsItem} key={index}>
             <Flex justify="space-between">
               <div className={styles.name}>{item.name}</div>
               <Space size={10} className={styles.numBox}>
diff --git a/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/HighFrequencyType/index.tsx b/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/HighFrequencyType/index.tsx
index f625a6dd..13954412 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<{
 
       <div className={styles.wrap}>
         {categoryStatistics.map((item, index) => (
-          <div className={styles.litsItem}>
+          <div className={styles.litsItem} key={index}>
             <Flex justify="space-between">
               <div className={styles.name}>{item.name}</div>
               <Space size={10} className={styles.numBox}>
diff --git a/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/Problem/index.css b/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/Problem/index.css
index 04796e65..eb7d8a12 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 ff033b05..1517bcc1 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 86adb180..5c58dbdf 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}
           >
-            <span>事件总量</span>
+            <span className={styles.totalName}>事件总量</span>
             <Statistic value={statisticsData.total} formatter={formatter} />
             <span>件</span>
           </Space>
diff --git a/src/pages/NewHome/NewRightContent/ResourceElements/index.tsx b/src/pages/NewHome/NewRightContent/ResourceElements/index.tsx
index 56505101..08a0ec58 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 (
     <div className={styles.container}>
       <div className={styles.title}>
-        <span>资源要素</span>
+        <span>城管资源要素</span>
       </div>
       <div className={styles.content}>
         {cards.map((card) => (
-- 
GitLab