Merge branch 'oldLogin' of ssh://171.217.92.33:2224/cityLevel/cd-comprehensive-web into oldLogin

src/pages/GlobalModalServices/modals/DyaPatrol/index.tsx

@@ -227,14 +227,6 @@ const DyaPatrol = (props: any) => {
 
   const tp3List = useMemo(() => {
     return [
-      {
-        key: '2',
-        name: starData?.data?.data?.records?.[1]?.sbr,
-        count: starData?.data?.data?.records?.[1]?.num,
-        works: starData?.data?.data?.records?.[1]?.zd,
-        bg: require('@/assets/images/administPunish/starBg2.png'),
-        icon: require('@/assets/images/administPunish/star1.png'),
-      },
       {
         key: '1',
         name: starData?.data?.data?.records?.[0]?.sbr,
@@ -243,6 +235,14 @@ const DyaPatrol = (props: any) => {
         bg: require('@/assets/images/administPunish/starBg1.png'),
         icon: require('@/assets/images/administPunish/star2.png'),
       },
+      {
+        key: '2',
+        name: starData?.data?.data?.records?.[1]?.sbr,
+        count: starData?.data?.data?.records?.[1]?.num,
+        works: starData?.data?.data?.records?.[1]?.zd,
+        bg: require('@/assets/images/administPunish/starBg2.png'),
+        icon: require('@/assets/images/administPunish/star1.png'),
+      },
       {
         key: '3',
         name: starData?.data?.data?.records?.[2]?.sbr,
@@ -464,9 +464,10 @@ const DyaPatrol = (props: any) => {
             <>
               {starData?.data?.data?.records?.length ? (
                 <div className={styles.content}>
-                  {tp3List?.map((item) => {
+                  {tp3List?.map((item,index) => {
                     return (
                       <div
+                        key={index}
                         className={styles.starItem}
                         style={{
                           backgroundImage: `url(${item.bg})`,

src/pages/GlobalModalServices/modals/LivingGarbage/index.tsx

@@ -57,7 +57,7 @@ const LivingGarbage: React.FC = () => {
   const disposalList = [
     { name: isUsingValue ? '万兴环保发电二期' : '--', value: isUsingValue ? 22.33 : '--' },
     { name: isUsingValue ? '九江环保发电厂' : '--', value: isUsingValue ? 22.33 : '--' },
-    { name: isUsingValue ? '享福环保发电厂' : '--', value: isUsingValue ? 22.33 : '--' },
+    { name: isUsingValue ? '祥福环保发电厂' : '--', value: isUsingValue ? 22.33 : '--' },
     { name: isUsingValue ? '宝林环保发电厂' : '--', value: isUsingValue ? 22.33 : '--' },
     { name: isUsingValue ? '隆丰环保发电厂' : '--', value: isUsingValue ? 22.33 : '--' },
     { name: isUsingValue ? '邓双环保发电厂' : '--', value: isUsingValue ? 22.33 : '--' },
@@ -68,9 +68,9 @@ const LivingGarbage: React.FC = () => {
 
   // 模拟管廊列表数据
   const pipelineList = [
-    { name: isUsingValue ? '焚烧厂名称1' : '--', location: { x: 103.96, y: 30.658842 } },
-    { name: isUsingValue ? '焚烧厂名称1' : '--', location: { x: 103.96, y: 30.658842 } },
-    { name: isUsingValue ? '焚烧厂名称3' : '--', location: { x: 103.96, y: 30.658842 } },
+    { name: isUsingValue ? '环保发电厂名称1' : '--', location: { x: 103.96, y: 30.658842 } },
+    { name: isUsingValue ? '环保发电厂名称1' : '--', location: { x: 103.96, y: 30.658842 } },
+    { name: isUsingValue ? '环保发电厂名称3' : '--', location: { x: 103.96, y: 30.658842 } },
     { name: isUsingValue ? '填埋场1' : '--', location: { x: 103.96, y: 30.658842 } },
     { name: isUsingValue ? '填埋场2' : '--', location: { x: 103.96, y: 30.658842 } },
   ];
@@ -159,8 +159,8 @@ const LivingGarbage: React.FC = () => {
             <div className={styles.legend}>
               <div className={styles.legendTitle}>图层图例</div>
               <div className={styles.legendItem}>
-                <img src={livingGarbageMap1} alt="焚烧厂" />
-                <span>焚烧厂</span>
+                <img src={livingGarbageMap1} alt="环保发电厂" />
+                <span>环保发电厂</span>
               </div>
               <div className={styles.legendItem}>
                 <img src={livingGarbageMap2} alt="填埋场" />