diff --git a/src/api/hsyf.js b/src/api/hsyf.js
new file mode 100644
index 0000000..ea31345
--- /dev/null
+++ b/src/api/hsyf.js
@@ -0,0 +1,19 @@
+import request from 'utils/request'
+// const intranetApiUrl = 'https://epdc-jinshui.elinkservice.cn/epdc-api'
+const intranetApiUrl = 'https://yifengdian-smps.elinkservice.cn/'
+
+export function partyOrgCategoryAndQuantity(params) {
+    return request({
+        baseURL: intranetApiUrl,
+        url: '/api/resi/partymember/yifengScreen/partyOrgCategoryAndQuantity',
+        method: 'GET',
+    })
+}
+
+// export function partyOrgCategoryAndQuantity (params) {
+//   return request({
+//     url: '/resi/partymember/yifengScreen/partyOrgCategoryAndQuantity',
+//     method: 'GET',
+//     params
+//   })
+// }
diff --git a/src/assets/images/home/gmdListBg.png b/src/assets/images/home/gmdListBg.png
new file mode 100644
index 0000000..a79603b
Binary files /dev/null and b/src/assets/images/home/gmdListBg.png differ
diff --git a/src/assets/images/home/yfgfLeftBg.png b/src/assets/images/home/yfgfLeftBg.png
new file mode 100644
index 0000000..3597026
Binary files /dev/null and b/src/assets/images/home/yfgfLeftBg.png differ
diff --git a/src/assets/images/home/yfgfRightBg.png b/src/assets/images/home/yfgfRightBg.png
new file mode 100644
index 0000000..cdfc288
Binary files /dev/null and b/src/assets/images/home/yfgfRightBg.png differ
diff --git a/src/assets/images/icon/dyfxDian.png b/src/assets/images/icon/dyfxDian.png
new file mode 100644
index 0000000..9f4aadf
Binary files /dev/null and b/src/assets/images/icon/dyfxDian.png differ
diff --git a/src/assets/images/icon/gfgsIcon.png b/src/assets/images/icon/gfgsIcon.png
new file mode 100644
index 0000000..3d2aa66
Binary files /dev/null and b/src/assets/images/icon/gfgsIcon.png differ
diff --git a/src/assets/images/icon/gmdIcon.png b/src/assets/images/icon/gmdIcon.png
new file mode 100644
index 0000000..d3e51fa
Binary files /dev/null and b/src/assets/images/icon/gmdIcon.png differ
diff --git a/src/assets/images/resource/yfxy/1.png b/src/assets/images/resource/ywqs/1.png
similarity index 100%
rename from src/assets/images/resource/yfxy/1.png
rename to src/assets/images/resource/ywqs/1.png
diff --git a/src/assets/images/resource/yfxy/2.png b/src/assets/images/resource/ywqs/2.png
similarity index 100%
rename from src/assets/images/resource/yfxy/2.png
rename to src/assets/images/resource/ywqs/2.png
diff --git a/src/assets/images/resource/yfxy/3.png b/src/assets/images/resource/ywqs/3.png
similarity index 100%
rename from src/assets/images/resource/yfxy/3.png
rename to src/assets/images/resource/ywqs/3.png
diff --git a/src/assets/images/resource/yfxy/4.png b/src/assets/images/resource/ywqs/4.png
similarity index 100%
rename from src/assets/images/resource/yfxy/4.png
rename to src/assets/images/resource/ywqs/4.png
diff --git a/src/assets/images/resource/ywqs/ydxy.png b/src/assets/images/resource/ywqs/ydxy.png
new file mode 100644
index 0000000..0c8acde
Binary files /dev/null and b/src/assets/images/resource/ywqs/ydxy.png differ
diff --git a/src/utils/config.js b/src/utils/config.js
index ad120da..6836cb6 100644
--- a/src/utils/config.js
+++ b/src/utils/config.js
@@ -5,7 +5,8 @@ export default {
 
 function getApiUrl () {
   if (process.env.NODE_ENV === 'development') {
-    return 'https://epdc-jinshui.elinkservice.cn/epdc-api'
+    return 'https://yifengdian-smps.elinkservice.cn/'
+    // return 'https://epdc-jinshui.elinkservice.cn/epdc-api'
   } else if (process.env.NODE_ENV === 'production') {
     return 'https://epdc-jinshui.elinkservice.cn/epdc-api'
   }
diff --git a/src/utils/request.js b/src/utils/request.js
index c69570f..a9d8a19 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -3,8 +3,9 @@ import config from './config'
 import { Message } from 'element-ui'
 import { getCookie } from 'utils/cookie'
 
+// console.log('config.apiUrl::', config.apiUrl);
 const request = axios.create({
-  baseURL: config.apiUrl,
+  baseURL: 'http://localhost:9090',
   timeout: 60 * 1000
 })
 
@@ -12,7 +13,8 @@ const request = axios.create({
 request.interceptors.request.use(
   config => {
     if (getCookie('token')) {
-      config.headers.Authorization = `Bearer ${getCookie('token')}`
+      config.headers.Authorization = `Bearer ${getCookie('token')}`;
+      config.headers.Referer = config.apiUrl;
     }
     return config
   },
diff --git a/src/views/next/screen-content-left/hsyf-left/index.scss b/src/views/next/screen-content-left/hsyf-left/index.scss
index d819ff5..9225d94 100644
--- a/src/views/next/screen-content-left/hsyf-left/index.scss
+++ b/src/views/next/screen-content-left/hsyf-left/index.scss
@@ -385,67 +385,67 @@
 
 @keyframes dian6 {
     0% {
+        opacity: 0;
+        top: -26px;
+        left: 30px;
+        transform: scale(0.5, 0.5);
+    }
+    13% {
         opacity: 0.4;
         top: -26px;
         left: 170px;
         transform: scale(0.6, 0.6);
     }
 
-    13% {
+    25% {
         opacity: 0.5;
         top: 0px;
         left: 240px;
         transform: scale(0.7, 0.7);
     }
 
-    25% {
+    38% {
         opacity: 0.9;
         top: 34px;
         left: 180px;
         transform: scale(0.8, 0.8);
     }
 
-    38% {
+    50% {
         opacity: 0.8;
         top: 46px;
         left: 80px;
         transform: scale(0.9, 0.9);
     }
 
-    50% {
+    63% {
         opacity: 0.8;
         top: 23px;
         left: 0px;
         transform: scale(0.8, 0.8);
     }
 
-    63% {
+    75% {
         opacity: 0.6;
         top: 0px;
         left: -90px;
         transform: scale(0.7, 0.7);
     }
 
-    75% {
+    88% {
         opacity: 0.4;
         top: -26px;
         left: -20px;
         transform: scale(0.6, 0.6);
     }
 
-    88% {
+    100% {
         opacity: 0;
         top: -26px;
         left: 30px;
         transform: scale(0.3, 0.3);
     }
 
-    100% {
-        opacity: 0;
-        top: -26px;
-        left: 30px;
-        transform: scale(0.5, 0.5);
-    }
 }
 
 @keyframes dian7 {
diff --git a/src/views/next/screen-content-left/hsyf-left/index.vue b/src/views/next/screen-content-left/hsyf-left/index.vue
index a2d9594..f64b43d 100644
--- a/src/views/next/screen-content-left/hsyf-left/index.vue
+++ b/src/views/next/screen-content-left/hsyf-left/index.vue
@@ -89,30 +89,62 @@
         <div slot="left" class="screen-title-left">党员分析</div>
       </screen-title-red>
       <div class="card-item-dyfx">
-        <div class="pei">
-          <div class="echarts-header">
-            <img src="@/assets/images/common/dto.png" alt="" class="dto" />
-            <span>年龄统计</span>
-            <div></div>
-            <img src="@/assets/images/common/echarts-header.png" alt="" />
+        <div class="card-item-dyfx-left">
+          <div class="top-title">
+            <div>
+              <img :src="require('@/assets/images/icon/dyfxDian.png')" />
+            </div>
+            <div class="title-txt">移风共富</div>
+          </div>
+          <div class="content">
+            <div class="content-left">
+              <div class="content-left-icon">
+                <img :src="require('@/assets/images/icon/gfgsIcon.png')" />
+              </div>
+              <div class="content-left-name">共富公司</div>
+            </div>
+            <div class="content-right">
+              <span class="content-right-num">4 </span>家
+            </div>
+          </div>
+          <div class="bottom-list">
+            <div
+              class="bottom-list-item"
+              v-for="(item, index) in yfgfList"
+              :key="item.companyName + index"
+            >
+              <span>{{ index + 1 }}</span> {{ item.companyName }}
+            </div>
           </div>
-          <div
-            id="charts"
-            style="width: 201px; height: 203px; z-index: 10"
-          ></div>
-          <div class="buttomCharts"></div>
         </div>
-        <div class="bar">
-          <div class="echarts-header">
-            <img src="@/assets/images/common/dto.png" alt="" class="dto" />
-            <span>各新村党员统计</span>
-            <div></div>
-            <img src="@/assets/images/common/echarts-header.png" alt="" />
+        <div class="card-item-dyfx-right">
+          <div class="top-title">
+            <div>
+              <img :src="require('@/assets/images/icon/dyfxDian.png')" />
+            </div>
+            <div class="title-txt">移风阵地</div>
+          </div>
+          <div class="content">
+            <div class="content-left">
+              <div class="content-left-icon">
+                <img :src="require('@/assets/images/icon/gmdIcon.png')" />
+              </div>
+              <div class="content-left-name">观摩点</div>
+            </div>
+            <div class="content-right">
+              <span class="content-right-num">3 </span>处
+            </div>
+          </div>
+          <div class="bottom-list">
+            <div
+              class="bottom-list-item"
+              v-for="(item, index) in yfzdList"
+              :key="item.jdName + index"
+            >
+              <span class="bottom-list-item-span">{{ index + 1 }}</span
+              >{{ item.jdName }}
+            </div>
           </div>
-          <div
-            id="chartsBar"
-            style="width: 100%; height: 100%; z-index: 10"
-          ></div>
         </div>
       </div>
     </div>
@@ -121,6 +153,7 @@
 
 <script>
 import { mapActions } from "vuex";
+import { partyOrgCategoryAndQuantity } from "@/api/hsyf";
 const RADIUS = 100; // 3d球的半径
 const FALLLENGTH = 500;
 let CX = null;
@@ -358,6 +391,17 @@ export default {
           x: 65,
         },
       ],
+      yfgfList: [
+        { companyName: "青岛益成河农业科技有限公司" },
+        { companyName: "青岛滨源农产品有限公司" },
+        { companyName: "青岛上泊建晟建设发展有限公司" },
+        { companyName: "青岛圆可方诚工贸有限公司" },
+      ],
+      yfzdList: [
+        { jdName: "大欧鸟笼乡村记忆馆" },
+        { jdName: "七彩田园" },
+        { jdName: "中共即墨县委纪念馆" },
+      ],
     };
   },
   created() {
@@ -368,6 +412,7 @@ export default {
         this.forArrayValue(["#00BABC", "#009FA4", "#00FFC0"], index)
       );
     });
+    this.getData();
   },
   mounted() {
     this.$nextTick(function () {
@@ -383,6 +428,16 @@ export default {
       // set_garden: 'SET_GARDEN',
       set_organization: "SET_ORGANIZATION",
     }),
+    getData() {
+      // fetch(
+      //   "https://yifengdian-smps.elinkservice.cn/api/resi/partymember/yifengScreen/partyOrgCategoryAndQuantity"
+      // ).then((res) => {
+      //   console.log('res::', res);
+      // });
+      partyOrgCategoryAndQuantity().then((res) => {
+        console.log("tongle?", res);
+      });
+    },
     forArrayValue(array, sort) {
       return array[sort % array.length];
     },
@@ -1001,22 +1056,22 @@ export default {
         animation: dian4 8s linear infinite;
       }
       .cundian:nth-child(5) {
-        animation: dian5 8s linear infinite;
+        animation: dian5 12s linear infinite;
       }
       .cundian:nth-child(6) {
-        animation: dian6 8s linear infinite;
+        animation: dian6 12s linear infinite;
       }
       .cundian:nth-child(7) {
-        animation: dian7 8s linear infinite;
+        animation: dian7 12s linear infinite;
       }
       .cundian:nth-child(8) {
-        animation: dian8 8s linear infinite;
+        animation: dian8 12s linear infinite;
       }
       .cundian:nth-child(9) {
-        animation: dian9 8s linear infinite;
+        animation: dian9 12s linear infinite;
       }
       .cundian:nth-child(10) {
-        animation: dian10 8s linear infinite;
+        animation: dian10 12s linear infinite;
       }
     }
     .tag {
@@ -1057,48 +1112,169 @@ export default {
     }
   }
 
+  // &-item-dyfx {
+  //   display: flex;
+  //   padding: 16px;
+  //   flex: 1;
+
+  //   .pei,
+  //   .bar {
+  //     .echarts-header {
+  //       display: flex;
+  //       align-items: center;
+
+  //       :nth-child(1) {
+  //         width: 18px;
+  //         height: 18px;
+  //         margin-right: 8px;
+  //       }
+
+  //       :nth-child(2) {
+  //       }
+
+  //       :nth-child(3) {
+  //         flex: 1;
+  //         height: 1px;
+  //         border-top: 2px dotted #2e8bbd;
+  //         margin: 0 3px;
+  //       }
+
+  //       :nth-child(4) {
+  //         width: 12px;
+  //         height: 12px;
+  //       }
+  //     }
+  //   }
+
+  //   .pei {
+  //     width: 47%;
+  //     @include flex(column);
+  //     margin-right: 50px;
+  //   }
+
+  //   .bar {
+  //     flex: 1;
+  //   }
+  // }
   &-item-dyfx {
+    padding: 16px 20px;
     display: flex;
-    padding: 16px;
-    flex: 1;
-
-    .pei,
-    .bar {
-      .echarts-header {
+    justify-content: space-between;
+    &-left,
+    &-right {
+      width: 214px;
+      background: url("~@/assets/images/home/yfgfLeftBg.png") no-repeat;
+      background-size: 100% 14px;
+      background-position: center 58px;
+      .top-title {
+        width: 214px;
         display: flex;
-        align-items: center;
-
-        :nth-child(1) {
+        img {
           width: 18px;
           height: 18px;
-          margin-right: 8px;
+          margin-top: 2px;
         }
-
-        :nth-child(2) {
+        .title-txt {
+          padding-left: 8px;
+          height: 16px;
+          font-family: PingFang SC;
+          font-weight: 500;
+          font-size: 16px;
+          color: #ffffff;
         }
-
-        :nth-child(3) {
-          flex: 1;
-          height: 1px;
-          border-top: 2px dotted #2e8bbd;
-          margin: 0 3px;
+      }
+      .content {
+        display: flex;
+        justify-content: space-between;
+        padding: 15px 20px;
+        &-left {
+          display: flex;
+          &-icon {
+            width: 26px;
+            img {
+              width: 26px;
+              height: 26px;
+            }
+          }
+          &-name {
+            padding-left: 8px;
+            width: 90px;
+            height: 26px;
+            font-family: PingFang SC;
+            font-weight: bold;
+            font-size: 14px;
+            color: #ffffff;
+            line-height: 26px;
+          }
         }
-
-        :nth-child(4) {
-          width: 12px;
-          height: 12px;
+        &-right {
+          font-weight: 500;
+          &-num {
+            height: 13px;
+            font-family: PangMenZhengDao;
+            font-weight: 400;
+            font-size: 20px;
+            color: #ffffff;
+          }
+        }
+      }
+      .bottom-list {
+        padding-top: 12px;
+        &-item {
+          margin-top: 3px;
+          &-span {
+            padding-left: 10px;
+            padding-right: 12px;
+          }
+          // width: 180px;
+          height: 30px;
+          font-family: PingFang SC;
+          font-weight: 500;
+          font-size: 14px;
+          color: #fbe9c5;
+          line-height: 30px;
+          border-bottom: 1px dashed #bb7053;
+        }
+        &-item:hover {
+          cursor: pointer;
+          color: #ffffff;
         }
       }
     }
-
-    .pei {
-      width: 47%;
-      @include flex(column);
-      margin-right: 50px;
-    }
-
-    .bar {
-      flex: 1;
+    &-right {
+      width: 190px;
+      background: url("~@/assets/images/home/yfgfRightBg.png") no-repeat;
+      background-size: 100% 14px;
+      background-position: center 58px;
+      .top-title {
+        width: 190px;
+      }
+      .content {
+        display: flex;
+        justify-content: space-between;
+        padding: 15px 20px;
+        &-left {
+          display: flex;
+          &-name {
+            width: 60px;
+          }
+        }
+      }
+      .bottom-list {
+        &-item {
+          width: 190px;
+          height: 29px;
+          background: rgba(187, 112, 83, 0.2);
+          border-radius: 2px;
+          border: 1px solid #bb7053;
+        }
+        &-item:hover {
+          cursor: pointer;
+          color: #ffffff;
+          background: url("~@/assets/images/home/gmdListBg.png") no-repeat;
+          background-size: 100% 100%;
+        }
+      }
     }
   }
 }
diff --git a/src/views/next/screen-content-right/hsyf-right/index.vue b/src/views/next/screen-content-right/hsyf-right/index.vue
index 2b3f71f..0e7f32b 100644
--- a/src/views/next/screen-content-right/hsyf-right/index.vue
+++ b/src/views/next/screen-content-right/hsyf-right/index.vue
@@ -44,10 +44,19 @@
     </div>
     <div class="card h292 m-top12">
       <screen-title-red>
-        <div slot="left" class="screen-title-left">移风心愿</div>
+        <div slot="left" class="screen-title-left">移网情深</div>
       </screen-title-red>
       <div class="card-item-yfxy">
-        <div class="item" v-for="(item, index) in wishList" :key="index">
+        <div
+          class="item"
+          :style="
+            index == 0
+              ? 'width:100%;height:110px'
+              : 'width:calc(50% - 3px);height:110px'
+          "
+          v-for="(item, index) in wishList"
+          :key="index"
+        >
           <img :src="item.imgSrc" alt="" />
           <div class="name">{{ item.name }}</div>
         </div>
@@ -58,80 +67,80 @@
 
 <script>
 export default {
-  data() {
+  data () {
     return {
       activityList: [
         {
-          imgSrc: require("@/assets/images/resource/djhd/1.jpg"),
-          title: "“奋斗新征程，基层谱新篇”乡村振兴宣传月服务活动",
-          unit: "移风村党支部",
+          imgSrc: require('@/assets/images/resource/djhd/1.jpg'),
+          title: '“奋斗新征程，基层谱新篇”乡村振兴宣传月服务活动',
+          unit: '移风村党支部'
         },
         {
-          imgSrc: require("@/assets/images/resource/djhd/2.jpg"),
-          title: "集体学习 “研究部署学习宣传贯彻党的二十大精神 ”",
-          unit: "移风村党支部",
+          imgSrc: require('@/assets/images/resource/djhd/2.jpg'),
+          title: '集体学习 “研究部署学习宣传贯彻党的二十大精神 ”',
+          unit: '移风村党支部'
         },
         {
-          imgSrc: require("@/assets/images/resource/djhd/3.jpg"),
-          title: "以“主题党日＋为民办事”为平台，组织广大党员积极投身宣传活动",
-          unit: "移风村党支部",
-        },
+          imgSrc: require('@/assets/images/resource/djhd/3.jpg'),
+          title: '以“主题党日＋为民办事”为平台，组织广大党员积极投身宣传活动',
+          unit: '移风村党支部'
+        }
       ],
       imgList: [
-        require("@/assets/images/resource/zbfc/1.jpg"),
-        require("@/assets/images/resource/zbfc/2.jpg"),
-        require("@/assets/images/resource/zbfc/3.jpg"),
-        require("@/assets/images/resource/zbfc/4.jpg"),
-        require("@/assets/images/resource/zbfc/5.jpg"),
+        require('@/assets/images/resource/zbfc/1.jpg'),
+        require('@/assets/images/resource/zbfc/2.jpg'),
+        require('@/assets/images/resource/zbfc/3.jpg'),
+        require('@/assets/images/resource/zbfc/4.jpg'),
+        require('@/assets/images/resource/zbfc/5.jpg')
       ],
       wishList: [
         {
-          imgSrc: require("@/assets/images/resource/yfxy/1.png"),
-          name: "“移”点心愿",
-        },
-        {
-          imgSrc: require("@/assets/images/resource/yfxy/2.png"),
-          name: "“移”列清单",
+          imgSrc: require('@/assets/images/resource/ywqs/ydxy.png'),
+          name: '“移”点心愿'
         },
         {
-          imgSrc: require("@/assets/images/resource/yfxy/3.png"),
-          name: "“移”语化开",
+          imgSrc: require('@/assets/images/resource/ywqs/2.png'),
+          name: '“移”列清单'
         },
+        // {
+        //   imgSrc: require("@/assets/images/resource/ywqs/3.png"),
+        //   name: "“移”语化开",
+        // },
         {
-          imgSrc: require("@/assets/images/resource/yfxy/4.png"),
-          name: "“移”站到家",
-        },
+          imgSrc: require('@/assets/images/resource/ywqs/4.png'),
+          name: '“移”站到家'
+        }
       ],
       partList: [
         {
-          name: "徐法佑",
-          unit: "徐家沟村人",
-          title: "丹心一片风华百年带着两个兵，敢挡一个团",
-          imgSrc: require("@/assets/images/resource/dyfc/1.jpg"),
+          name: '徐法佑',
+          unit: '徐家沟村人',
+          title: '丹心一片风华百年带着两个兵，敢挡一个团',
+          imgSrc: require('@/assets/images/resource/dyfc/1.jpg')
         },
         {
-          name: "傅祖聪",
-          unit: "移风中学",
-          title: "培桃育李四十三载乐善好施奉献一生",
-          imgSrc: require("@/assets/images/resource/dyfc/2.jpg"),
+          name: '傅祖聪',
+          unit: '移风中学',
+          title: '培桃育李四十三载乐善好施奉献一生',
+          imgSrc: require('@/assets/images/resource/dyfc/2.jpg')
         },
         {
-          name: "朱爱香",
-          unit: "太平庄村人",
-          title: "一座大棚撑起新型农民致富梦",
-          imgSrc: require("@/assets/images/resource/dyfc/3.jpg"),
-        },
-      ],
-    };
+          name: '朱爱香',
+          unit: '太平庄村人',
+          title: '一座大棚撑起新型农民致富梦',
+          imgSrc: require('@/assets/images/resource/dyfc/3.jpg')
+        }
+      ]
+    }
   },
-  created() {},
-  mounted() {},
-  beforeDestroy() {},
+  created () {},
+  mounted () {},
+  beforeDestroy () {},
   methods: {},
   components: {},
   computed: {},
-  watch: {},
-};
+  watch: {}
+}
 </script>
 
 <style lang="scss" scoped>
@@ -163,7 +172,8 @@ export default {
         height: 100%;
 
         > :nth-child(2) {
-          color: #bdceea;
+          // color: #bdceea;
+          color: #FBE9C5;
           font-size: 14px;
         }
       }
@@ -177,7 +187,7 @@ export default {
 
     .item {
       @include flex(column);
-      border: 1px solid #77a5d8;
+      border: 1px solid #e0470c;
       padding: 5px;
       box-sizing: border-box;
       margin-right: 4px;
@@ -191,13 +201,14 @@ export default {
         margin: 11px 0 8px 0;
         padding-left: 12px;
         position: relative;
+        color: #ffffff;
 
         &::after {
           content: "";
           width: 4px;
           height: 4px;
           border-radius: 4px;
-          background: #6beac6;
+          background: #fffb90;
           position: absolute;
           left: 2px;
           top: 10px;
@@ -207,24 +218,28 @@ export default {
       .unit {
         font-size: 12px;
         padding: 0 5px;
-        color: #bdceea;
+        color: #fbe9c5;
         margin-bottom: 9px;
       }
 
       .title {
+        font-family: PingFang SC;
         font-size: 14px;
         padding: 0 5px;
-        color: #dbe9ff;
+        font-weight: 400;
+        color: #FFFFFF;
       }
     }
   }
 
   &-item-yfxy {
     padding: 16px;
-    display: grid;
-    grid-template-columns: 50% 50%;
-    grid-template-rows: 48% 48%;
+    display: flex;
+    flex-wrap: wrap;
+    // grid-template-columns: 50% 50%;
+    // grid-template-rows: 48% 48%;
     grid-gap: 8px 5px;
+    flex: 1;
 
     > .item {
       position: relative;