diff --git a/src/assets/images/zdyf/logo/1.png b/src/assets/images/zdyf/logo/1.png
index b010966..f275de8 100644
Binary files a/src/assets/images/zdyf/logo/1.png and b/src/assets/images/zdyf/logo/1.png differ
diff --git a/src/assets/images/zdyf/logo/10.png b/src/assets/images/zdyf/logo/10.png
index 094ac87..f275de8 100644
Binary files a/src/assets/images/zdyf/logo/10.png and b/src/assets/images/zdyf/logo/10.png differ
diff --git a/src/assets/images/zdyf/logo/2.png b/src/assets/images/zdyf/logo/2.png
index 6c65271..25330f8 100644
Binary files a/src/assets/images/zdyf/logo/2.png and b/src/assets/images/zdyf/logo/2.png differ
diff --git a/src/assets/images/zdyf/logo/3.png b/src/assets/images/zdyf/logo/3.png
index 4a0adfa..f7c1b4a 100644
Binary files a/src/assets/images/zdyf/logo/3.png and b/src/assets/images/zdyf/logo/3.png differ
diff --git a/src/assets/images/zdyf/logo/4.png b/src/assets/images/zdyf/logo/4.png
index ae528b5..6355de8 100644
Binary files a/src/assets/images/zdyf/logo/4.png and b/src/assets/images/zdyf/logo/4.png differ
diff --git a/src/assets/images/zdyf/logo/5.png b/src/assets/images/zdyf/logo/5.png
index ee4c17c..5130720 100644
Binary files a/src/assets/images/zdyf/logo/5.png and b/src/assets/images/zdyf/logo/5.png differ
diff --git a/src/assets/images/zdyf/logo/6.png b/src/assets/images/zdyf/logo/6.png
index 152020b..3875d5c 100644
Binary files a/src/assets/images/zdyf/logo/6.png and b/src/assets/images/zdyf/logo/6.png differ
diff --git a/src/assets/images/zdyf/logo/7.png b/src/assets/images/zdyf/logo/7.png
index 84cca03..2575f7b 100644
Binary files a/src/assets/images/zdyf/logo/7.png and b/src/assets/images/zdyf/logo/7.png differ
diff --git a/src/assets/images/zdyf/logo/8.png b/src/assets/images/zdyf/logo/8.png
index aa8dcc6..724ab19 100644
Binary files a/src/assets/images/zdyf/logo/8.png and b/src/assets/images/zdyf/logo/8.png differ
diff --git a/src/assets/images/zdyf/logo/9.png b/src/assets/images/zdyf/logo/9.png
index 796ac35..be08431 100644
Binary files a/src/assets/images/zdyf/logo/9.png and b/src/assets/images/zdyf/logo/9.png differ
diff --git a/src/components/screen-map-header-home/index.vue b/src/components/screen-map-header-home/index.vue
index 78d977b..632988a 100644
--- a/src/components/screen-map-header-home/index.vue
+++ b/src/components/screen-map-header-home/index.vue
@@ -4,10 +4,10 @@
       <div class="item" v-for="(item, index) in data" :key="index">
         <div class="name">{{ item.name }}</div>
         <section>
-          <span :class="{ num: true, yellow: index === 4 }">{{
+          <span :class="{ num: true }">{{
             item.num
           }}</span>
-          <span :class="{ units: true, yellow: index === 4 }">{{
+          <span :class="{ units: true }">{{
             item.units
           }}</span>
         </section>
diff --git a/src/components/screen-map-header/index.vue b/src/components/screen-map-header/index.vue
index b297917..b55442a 100644
--- a/src/components/screen-map-header/index.vue
+++ b/src/components/screen-map-header/index.vue
@@ -4,10 +4,10 @@
       <div class="item" v-for="(item, index) in data" :key="index">
         <div class="name">{{ item.name }}</div>
         <section>
-          <span :class="{ num: true, yellow: index === 4 }">{{
+          <span :class="{ num: true }">{{
             item.num
           }}</span>
-          <span :class="{ units: true, yellow: index === 4 }">{{
+          <span :class="{ units: true }">{{
             item.units
           }}</span>
         </section>
diff --git a/src/views/next/dialog-module/zdyf-center/qyjj/index.vue b/src/views/next/dialog-module/zdyf-center/qyjj/index.vue
index 4b91f05..40a83ba 100644
--- a/src/views/next/dialog-module/zdyf-center/qyjj/index.vue
+++ b/src/views/next/dialog-module/zdyf-center/qyjj/index.vue
@@ -58,7 +58,7 @@
               </section>
             </div>
             <p class="unitNotation">{{ unitDetail.summary }}</p>
-            <p style="line-height: 2; text-indent: 2em; font-size: 18px">
+            <p class="xiangqing">
               {{ unitDetail.introduction }}
             </p>
           </div>
@@ -85,7 +85,7 @@
               />
             </div>
 
-            <div class="imgBox" style="height: 334px">
+            <div class="imgBox" style="height: 285px">
               <div class="header">
                 <img
                   src="@/assets/images/common/title-small.png"
@@ -93,17 +93,23 @@
                   style="width: 20px; height: 20px"
                 />企业展示
               </div>
-              <!-- <div v-if="unitDetail.id=='1772542305774510081'"></div>
-              <div v-else-if="unitDetail.id=='17725423057745100811'"></div>
-              <div v-else class="imgBox-items imgBox-items-qy"> -->
               <div class="imgBox-items imgBox-items-qy">
-                <div
-                  class="imgBox-items-item"
-                  v-for="item in unitDetail.display || []"
-                  :key="item"
+                <vue-seamless-scroll
+                  :class-option="optionHover"
+                  :data="unitDetail.display"
                 >
-                  <img :src="item" />
-                </div>
+                  <div class="imgBox-items-qy1">
+                    <div
+                      class="imgBox-items-item"
+                      v-for="(item, index) in unitDetail.display || []"
+                      :key="item"
+                    >
+                      <div v-for="item1 in item" :key="item1">
+                        <img :src="item1" />
+                      </div>
+                    </div>
+                  </div>
+                </vue-seamless-scroll>
               </div>
               <screen-nodata
                 v-if="!unitDetail.display && unitDetail.display.length == 0"
@@ -148,6 +154,16 @@ export default {
       unitDetail: {},
       videoUrl: process.env.VUE_APP_VIDEO_URL + 'ruikesiwang.mp4',
       videoUrl1: process.env.VUE_APP_VIDEO_URL + 'shinongzhongmiao.mp4',
+      optionHover: {
+        step: 1, // 数值越大速度滚动越快
+        limitMoveNum: 3, // 开始无缝滚动的数据量 this.dataList.length
+        hoverStop: true, // 是否开启鼠标悬停stop
+        direction: 2, // 0向下 1向上 2向左 3向右
+        openWatch: true, // 开启数据实时监控刷新dom
+        singleHeight: 0, // 单步运动停止的高度(默认值0是无缝不停止的滚动) direction => 0/1
+        singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3
+        waitTime: 2000 // 单步运动停止的时间(默认值1000ms)
+      },
       types: {
         1: '育种企业',
         2: '育苗企业',
@@ -170,10 +186,24 @@ export default {
       }
       if (val) {
         seedCompanyDetail(this.gsxqId).then((res) => {
+          const arr = []
+          if (res.data.display) {
+            const data = JSON.parse(res.data.display)
+            data.forEach((item, index) => {
+              if (index % 2 == 0) {
+                arr.push([])
+                arr[arr.length - 1][0] = item
+                if (data[index + 1]) {
+                  arr[arr.length - 1][1] = data[index + 1]
+                }
+              }
+            })
+          }
+          console.log('arrarr:', arr)
           this.unitDetail = {
             ...res.data,
             monitor: res.data.monitor ? JSON.parse(res.data.monitor) : [],
-            display: res.data.display ? JSON.parse(res.data.display) : [],
+            display: arr,
             honor: res.data.honor ? JSON.parse(res.data.honor) : []
           }
         })
@@ -193,6 +223,27 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.xiangqing {
+  line-height: 2;
+  text-indent: 2em;
+  font-size: 18px;
+  height: 430px;
+  overflow: hidden;
+  overflow-y: scroll;
+  &::-webkit-scrollbar {
+    width: 3px;
+  }
+
+  &::-webkit-scrollbar-track {
+    border-radius: 10px;
+    background: rgba(12, 129, 254, 0.24);
+  }
+
+  &::-webkit-scrollbar-thumb {
+    border-radius: 10px;
+    background: linear-gradient(270deg, #0063fe, #0095ff);
+  }
+}
 .modal {
   width: 100%;
   height: 100%;
@@ -320,7 +371,7 @@ export default {
             @include flex(column);
             width: 100%;
             overflow: hidden;
-            height: 167px;
+            height: 205px;
             background: rgba(109, 166, 255, 0.2);
 
             &:nth-child(1),
@@ -351,10 +402,9 @@ export default {
 }
 
 .imgBox-items {
-  width: calc(100% - 25px);
   display: flex;
   flex-wrap: wrap;
-  padding: 12px;
+  padding: 16px;
   gap: 6px;
   overflow: hidden;
   overflow-y: scroll;
@@ -380,21 +430,26 @@ export default {
   }
 }
 .imgBox-items-qy {
-  height: 300px;
+  height: 285px;
+  width: 500px;
+  margin: 0 16px;
   overflow: hidden;
-  overflow-y: scroll;
-  &::-webkit-scrollbar {
-    width: 3px;
-  }
-
-  &::-webkit-scrollbar-track {
-    border-radius: 10px;
-    background: rgba(12, 129, 254, 0.24);
-  }
-
-  &::-webkit-scrollbar-thumb {
-    border-radius: 10px;
-    background: linear-gradient(270deg, #0063fe, #0095ff);
+}
+.imgBox-items-qy1 {
+  height: 285px;
+  display: flex;
+  flex-wrap: nowrap;
+  overflow: hidden;
+  overflow-x: scroll;
+  justify-content: flex-start;
+  .imgBox-items-item {
+    padding: 0 0 0 10px; /* 子元素之间的间隔 */
+    width: 155px;
+    img {
+      height: 100px;
+      width: 155px;
+      margin-bottom: 10px;
+    }
   }
 }
 </style>
diff --git a/src/views/next/dialog-module/zdyf-right/kyll/keyEnterprisesDetail.vue b/src/views/next/dialog-module/zdyf-right/kyll/keyEnterprisesDetail.vue
index f30be83..a607788 100644
--- a/src/views/next/dialog-module/zdyf-right/kyll/keyEnterprisesDetail.vue
+++ b/src/views/next/dialog-module/zdyf-right/kyll/keyEnterprisesDetail.vue
@@ -40,41 +40,41 @@
 </template>
 
 <script>
-import { mapGetters, mapActions } from "vuex";
-import { seedPowerList } from "@/api/zdyf";
+import { mapGetters, mapActions } from 'vuex'
+import { seedPowerList } from '@/api/zdyf'
 export default {
-  name: "",
-  data() {
+  name: '',
+  data () {
     return {
-      dialogTitle: "企业详情",
-    };
+      dialogTitle: '企业详情'
+    }
   },
   computed: {
     ...mapActions({
-      set_gsxq: "SET_GSXQ",
+      set_gsxq: 'SET_GSXQ'
     }),
-    ...mapGetters(["gsxq", "gsxqId"]),
+    ...mapGetters(['gsxq', 'gsxqId'])
   },
   components: {},
   watch: {
-    gsxq(val) {
+    gsxq (val) {
       if (val) {
         seedPowerList(val).then((res) => {
-          this.list = res.data;
-        });
+          this.list = res.data
+        })
       }
-    },
+    }
   },
-  created() {},
+  created () {},
   methods: {
     ...mapActions({
-      showGlobalDialog: "showGlobalDialog",
+      showGlobalDialog: 'showGlobalDialog'
     }),
-    closeDialog() {
-      this.showGlobalDialog("");
-    },
-  },
-};
+    closeDialog () {
+      this.showGlobalDialog('')
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/next/layout/screen-content.vue b/src/views/next/layout/screen-content.vue
index 092cabc..8f0a5fd 100644
--- a/src/views/next/layout/screen-content.vue
+++ b/src/views/next/layout/screen-content.vue
@@ -5,11 +5,17 @@
 </template>
 
 <script>
+import { mapGetters, mapActions } from 'vuex'
 import ScreenContentMap from '../screen-content-map'
 export default {
   name: 'screen-content',
   components: {
     ScreenContentMap
+  },
+  computed: {
+    ...mapGetters(['scale', 'navId'])
+  },
+  mounted () {
   }
 }
 </script>
diff --git a/src/views/next/screen-content-left/home-left/index.vue b/src/views/next/screen-content-left/home-left/index.vue
index 7305fcb..4155eca 100644
--- a/src/views/next/screen-content-left/home-left/index.vue
+++ b/src/views/next/screen-content-left/home-left/index.vue
@@ -184,7 +184,7 @@ export default {
   },
   created () {
     const arr5 = []
-    for (let i = 1; i < 11; i++) {
+    for (let i = 1; i < 10; i++) {
       arr5.push({
         title: 'parent',
         slide: 23424234234234,
diff --git a/src/views/next/screen-content-left/szyf-left/index.vue b/src/views/next/screen-content-left/szyf-left/index.vue
index 5b577df..c6d3758 100644
--- a/src/views/next/screen-content-left/szyf-left/index.vue
+++ b/src/views/next/screen-content-left/szyf-left/index.vue
@@ -119,7 +119,7 @@
       <div>
         <el-carousel height="190px">
           <el-carousel-item
-            v-for="(item, index) in stabilizeList"
+            v-for="(item, index) in stabilizeList1"
             :key="'key' + index"
           >
             <div class="card-item-wwry" @click="set_zdry(true)">
@@ -149,7 +149,7 @@ export default {
       optionData: [
         {
           name: '待处理',
-          value: 51
+          value: 50
         },
         {
           name: '处理中',
@@ -179,107 +179,125 @@ export default {
       ],
       stabilizeList: [[]],
       stabilizeList1: [
-        {
-          imgSrc: require('@/assets/images/icon/xfry.png'),
-          value: 312,
-          name: '信访人员'
-        },
-        {
-          imgSrc: require('@/assets/images/icon/azbj.png'),
-          value: 97,
-          name: '安置帮教'
-        },
-        {
-          imgSrc: require('@/assets/images/icon/sqjz.png'),
-          value: 63,
-          name: '社区矫正'
-        },
-        {
-          imgSrc: require('@/assets/images/icon/jshz.png'),
-          value: 29,
-          name: '精神患者'
-        },
-        {
-          imgSrc: require('@/assets/images/icon/jdry.png'),
-          value: 23,
-          name: '戒毒人员'
-        },
-        {
-          imgSrc: require('@/assets/images/icon/snry.png'),
-          value: 16,
-          name: '失能人员'
-        },
-        {
-          imgSrc: require('@/assets/images/icon/cjr.png'),
-          value: 312,
-          name: '残疾'
-        },
-        {
-          imgSrc: require('@/assets/images/icon/dbry111.png'),
-          value: 97,
-          name: '低保人员'
-        },
-        {
-          imgSrc: require('@/assets/images/icon/dbry11.png'),
-          value: 63,
-          name: '大病人员'
-        },
-        {
-          imgSrc: require('@/assets/images/icon/gllr.png'),
-          value: 29,
-          name: '高龄老人'
-        },
-        {
-          imgSrc: require('@/assets/images/icon/tkry.png'),
-          value: 23,
-          name: '特困人员'
-        },
-        {
-          imgSrc: require('@/assets/images/icon/ylfn.png'),
-          value: 16,
-          name: '育龄妇女'
-        },
-        {
-          imgSrc: require('@/assets/images/icon/tyjr.png'),
-          value: 16,
-          name: '退役军人'
-        }
+        [
+          {
+            imgSrc: require('@/assets/images/icon/xfry.png'),
+            value: 312,
+            name: '信访人员'
+          },
+          {
+            imgSrc: require('@/assets/images/icon/azbj.png'),
+            value: 97,
+            name: '安置帮教'
+          },
+          {
+            imgSrc: require('@/assets/images/icon/sqjz.png'),
+            value: 63,
+            name: '社区矫正'
+          },
+          {
+            imgSrc: require('@/assets/images/icon/jshz.png'),
+            value: 29,
+            name: '精神患者'
+          },
+          {
+            imgSrc: require('@/assets/images/icon/jdry.png'),
+            value: 23,
+            name: '戒毒人员'
+          },
+          {
+            imgSrc: require('@/assets/images/icon/snry.png'),
+            value: 16,
+            name: '失能人员'
+          }
+        ],
+        [
+          {
+            imgSrc: require('@/assets/images/icon/cjr.png'),
+            value: 312,
+            name: '残疾'
+          },
+          {
+            imgSrc: require('@/assets/images/icon/dbry111.png'),
+            value: 97,
+            name: '低保人员'
+          },
+          {
+            imgSrc: require('@/assets/images/icon/dbry11.png'),
+            value: 63,
+            name: '大病人员'
+          },
+          {
+            imgSrc: require('@/assets/images/icon/gllr.png'),
+            value: 29,
+            name: '高龄老人'
+          },
+          {
+            imgSrc: require('@/assets/images/icon/tkry.png'),
+            value: 23,
+            name: '特困人员'
+          },
+          {
+            imgSrc: require('@/assets/images/icon/ylfn.png'),
+            value: 16,
+            name: '育龄妇女'
+          }
+        ],
+        [
+          {
+            imgSrc: require('@/assets/images/icon/tyjr.png'),
+            value: 16,
+            name: '退役军人'
+          }
+        ]
       ],
       peiOption: null,
-      fxInfo: {},
-      totalNum: 0,
+      fxInfo: {
+        jiSuJiBan: 137,
+        zhiTongLianBan: 46,
+        wangGeHua: 28,
+        yiJieAn: 26,
+        daiChuLi: 6,
+        chuLiZhong: 3,
+        guiDang: 102,
+        yiJieAnRate: 0.19,
+        daiChuLiRate: 0.05,
+        chuLiZhongRate: 0.02,
+        guiDangRate: 0.74
+      },
+      totalNum: 1762,
       optionData3D: [
         {
           name: '城市管理', // 名称
-          value: 0, // 值
+          value: 26, // 值
           itemStyle: {
             color: 'rgba(13, 144, 254,1)'
           }
         },
         {
           name: '交通设施',
-          value: 0,
+          value: 30,
           itemStyle: {
             color: 'rgba(68, 212, 205,1)'
           }
         },
         {
           name: '噪音扰民',
-          value: 0,
+          value: 14,
           itemStyle: {
             color: 'rgba(242, 169, 128, 1)'
           }
         },
         {
           name: '环境卫生',
-          value: 0,
+          value: 20,
           itemStyle: {
             color: 'rgba(219, 219, 138, 1)'
           }
         },
         {
           name: '其他',
-          value: 0,
+          value: 10,
           itemStyle: {
             color: 'rgba(238, 116, 56,1)'
           }
@@ -301,51 +319,51 @@ export default {
       set_zdry: 'SET_ZDRY'
     }),
     async chushihua () {
-      await getEventRate({
-        orgId: '1739891126105206786',
-        orgType: 'agency'
-      }).then((res) => {
-        if (res.data.category) {
-          const data = res.data.category.filter((item) => item.value > 0)
-          this.optionData3D = data || this.optionData3D
-        }
-        this.eventTotalList[0].num = res.data.hongDeng
-        this.eventTotalList[1].num = res.data.huangDeng
-        this.eventTotalList[2].num = res.data.lanDeng
-        this.totalNum = res.data.total
-      })
-      await getEventAnalysis({
-        orgId: '1739891126105206786',
-        orgType: 'agency',
-        eventType: ''
-      }).then((res) => {
-        this.fxInfo = res.data || {}
-        this.optionData[0].value = res.data ? res.data.daiChuLiRate * 100 : 0
-        this.optionData[1].value = res.data ? res.data.chuLiZhongRate * 100 : 0
-        this.optionData[2].value = res.data ? res.data.yiJieAnRate * 100 : 0
-      })
-      await statsByCategory({
-        orgId: '1739891126105206786',
-        orgType: 'agency',
-        eventType: ''
-      }).then((res) => {
-        let num = 0
-        let index = 0
-        res.data.forEach((item, i) => {
-          if (num < 6) {
-            num = num + 1
-          } else {
-            num = 1
-            index = index + 1
-            this.stabilizeList.push([])
-          }
-          this.stabilizeList[index][num - 1] = {
-            ...item,
-            imgSrc: this.stabilizeList1[i].imgSrc
-          }
-        })
-        console.log('this.stabilizeList::', this.stabilizeList)
-      })
+      // await getEventRate({
+      //   orgId: '1739891126105206786',
+      //   orgType: 'agency'
+      // }).then((res) => {
+      //   if (res.data.category) {
+      //     const data = res.data.category.filter((item) => item.value > 0)
+      //     this.optionData3D = data || this.optionData3D
+      //   }
+      //   this.eventTotalList[0].num = res.data.hongDeng
+      //   this.eventTotalList[1].num = res.data.huangDeng
+      //   this.eventTotalList[2].num = res.data.lanDeng
+      //   this.totalNum = res.data.total
+      // })
+      // await getEventAnalysis({
+      //   orgId: '1739891126105206786',
+      //   orgType: 'agency',
+      //   eventType: ''
+      // }).then((res) => {
+      //   this.fxInfo = res.data || {}
+      //   this.optionData[0].value = res.data ? res.data.daiChuLiRate * 100 : 0
+      //   this.optionData[1].value = res.data ? res.data.chuLiZhongRate * 100 : 0
+      //   this.optionData[2].value = res.data ? res.data.yiJieAnRate * 100 : 0
+      // })
+      // await statsByCategory({
+      //   orgId: '1739891126105206786',
+      //   orgType: 'agency',
+      //   eventType: ''
+      // }).then((res) => {
+      //   let num = 0
+      //   let index = 0
+      //   res.data.forEach((item, i) => {
+      //     if (num < 6) {
+      //       num = num + 1
+      //     } else {
+      //       num = 1
+      //       index = index + 1
+      //       this.stabilizeList.push([])
+      //     }
+      //     this.stabilizeList[index][num - 1] = {
+      //       ...item,
+      //       imgSrc: this.stabilizeList1[i].imgSrc
+      //     }
+      //   })
+      //   console.log('this.stabilizeList::', this.stabilizeList)
+      // })
 
       this.initChartPei()
       this.initChartPei3D()
diff --git a/src/views/next/screen-content-left/zdyf-left/index.vue b/src/views/next/screen-content-left/zdyf-left/index.vue
index c086b05..6a316d5 100644
--- a/src/views/next/screen-content-left/zdyf-left/index.vue
+++ b/src/views/next/screen-content-left/zdyf-left/index.vue
@@ -118,17 +118,17 @@
                     <div>{{ item.price && item.price.toFixed(2) }}</div>
                     <div style="display: flex">
                       <div style="width: 38px">
-                        {{ item.jzrPrice && item.jzrPrice.toFixed(2) }}
+                        {{ item.jzrPrice != '暂无' ? item.jzrPrice.toFixed(2): '暂无'  }}
                       </div>
                       <img
-                        v-if="item.jzrPrice >= 0"
+                        v-if="item.jzrPrice >= 0 && item.jzrPrice != '暂无'"
                         width="16px"
                         height="16px"
                         src="@/assets/images/icon/upRed.png"
                         alt=""
                       />
                       <img
-                        v-else
+                        v-else-if="item.jzrPrice != '暂无'"
                         width="16px"
                         height="16px"
                         src="@/assets/images/icon/downLv.png"
@@ -300,10 +300,12 @@ export default {
           this.dayList = res.priceslist
           this.getDayScTData()
         } else {
-          this.times = this.$moment(this.times).subtract(1, 'days').format('yyyy-MM-DD')
+          this.times = this.$moment(this.times)
+            .subtract(1, 'days')
+            .format('yyyy-MM-DD')
           this.getDayScData({
-            FEndDate: this.$moment().subtract(1, 'days').format('yyyy-MM-DD'),
-            FStartDate: this.$moment().subtract(1, 'days').format('yyyy-MM-DD')
+            FEndDate: this.$moment(this.times).subtract(1, 'days').format('yyyy-MM-DD'),
+            FStartDate: this.$moment(this.times).subtract(1, 'days').format('yyyy-MM-DD')
           })
         }
       })
@@ -315,12 +317,11 @@ export default {
         FStartDate: this.times
       }).then((res1) => {
         if (res1.priceslist.length > 0) {
-          this.shichangList = this.getScData(
-            this.dayList,
-            res1.priceslist
-          )
+          this.shichangList = this.getScData(this.dayList, res1.priceslist)
         } else {
-          this.times = this.$moment(this.times).subtract(1, 'days').format('yyyy-MM-DD')
+          this.times = this.$moment(this.times)
+            .subtract(1, 'days')
+            .format('yyyy-MM-DD')
           this.getDayScTData()
         }
       })
@@ -329,12 +330,19 @@ export default {
       const dataD = this.deduplicationJs(arr)
       const dataTd = this.deduplicationJs(arr1)
       return dataD.map((item, index) => {
-        const priceTd = dataTd.filter((item1) => item.Name === item1.Name)[0]
-          .price
-        const jzrPrice = item.price - priceTd
-        return {
-          ...item,
-          jzrPrice
+        const priceTd = dataTd.filter((item1) => item.Name === item1.Name)
+        // [0].price
+        if (priceTd.length > 0) {
+          const jzrPrice = item.price - priceTd[0].price
+          return {
+            ...item,
+            jzrPrice
+          }
+        } else {
+          return {
+            ...item,
+            jzrPrice: '暂无'
+          }
         }
       })
     },
diff --git a/src/views/next/screen-content-map/cpt/home-map.vue b/src/views/next/screen-content-map/cpt/home-map.vue
index 2be36e7..0c36b2c 100644
--- a/src/views/next/screen-content-map/cpt/home-map.vue
+++ b/src/views/next/screen-content-map/cpt/home-map.vue
@@ -3,78 +3,13 @@
     <div class="bg_img">
       <screen-map-header-home :data="headerList"></screen-map-header-home>
     </div>
-    <!-- <div id="myMap" style="background-color: #f0f0f0">
-    </div> -->
   </div>
 </template>
 <script>
-import { Scene, PolygonLayer, LineLayer } from '@antv/l7'
-import { GaodeMap } from '@antv/l7-maps'
-import yifengJson from './yifeng.json'
-import chinaMap from './chinaMap.vue'
 import { selectConfigList } from '@/api/home'
-import jdbandaoJson from './jdbandao.json'
-import { mapActions } from 'vuex'
-let myMap
-let scene
-let polygonLayer
-let lineLayer
-let textLayer
 export default {
   data () {
     return {
-      darkStyle: {
-        style: 'amap://styles/blue',
-        polygonColor: [
-          // "rgba(255, 100, 60, 0.5)",
-          // "rgba(43, 231, 253, 0.35)",
-          'rgba(0, 127, 241, .5)'
-          // "rgba(255, 255, 50, 0.35)",
-        ],
-        lineColor: [
-          // "rgba(255, 180, 150, 0.9)",
-          // "rgba(43, 231, 253, 0.7)",
-          'rgba(0, 127, 241, .6)'
-          // "rgba(255, 255, 50, 0.7)",
-        ],
-        circleColor: [
-          // "rgba(255, 180, 150, 0.99)",
-          // "rgba(43, 231, 253, 0.99)",
-          'rgba(0, 127, 241, 0.99)'
-          // "rgba(255, 255, 50, 0.99)",
-        ],
-        textColor: [
-          // "rgba(255, 100, 60, 0.99)",
-          // "rgba(43, 231, 253, 0.99)",
-          'rgba(126, 187, 255, 1)'
-          // "rgba(255, 255, 50, 0.99)",
-        ],
-        textStrokeColor: '#fff'
-      },
-      lightStyle: {
-        style: 'amap://styles/whitesmoke',
-        polygonColor: [
-          // "rgba(255, 100, 60, 0.3)",
-          'rgba(43, 231, 253, 0.3)'
-          // "rgba(255, 255, 50, 0.3)",
-        ],
-        lineColor: [
-          // "rgba(220, 150, 120, 0.9)",
-          'rgba(155, 212, 242, 1)'
-          // "rgba(200, 200, 50, 0.9)",
-        ],
-        circleColor: [
-          // "rgba(255, 180, 150, 0.99)",
-          'rgba(13, 181, 203, 0.8)'
-          // "rgba(255, 255, 50, 0.99)",
-        ],
-        textColor: [
-          // "rgba(200, 50, 10, 0.99)",
-          'rgba(0, 130, 153, 0.99)'
-          // "rgba(120, 120, 0, 0.99)",
-        ],
-        textStrokeColor: '#666'
-      },
       headerList: [
         { name: '镇域面积', units: '公里²', num: '199' },
         { name: '耕地面积', units: '万亩', num: '17.4' },
@@ -99,134 +34,7 @@ export default {
     })
   },
   methods: {
-    init () {
-      if (!yifengJson) return false
-      myMap = new GaodeMap({
-        pitch: 40.24716321414439,
-        mapStyle: 'amap://styles/blue',
-        // mapStyle: 'amap://styles/darkblue',
-        // mapStyle: 'amap://styles/3bd5ec68d60de6542634c3e701f64523',
-        // style: styleConfig.style,
-        showLabel: false,
-        center: [120.220563, 36.496127],
-        token: 'fc14b42e0ca18387866d68ebd4f150c1',
-        zoom: 9,
-        isHotspot: false,
-        showIndoorMap: false,
-        showBuildingBlock: false,
-        resizeEnable: true,
-        doubleClickZoom: false,
-        showRoad: false,
-        viewMode: '3D'
-      })
-
-      scene = new Scene({
-        id: 'myMap',
-        logoVisible: false,
-        map: myMap
-      })
-      scene.on('loaded', () => {
-        // scene.getMap().setStyle({
-        //   backgroundStyle: {
-        //     fill: '#f0f0f0' // 设置背景为浅灰色
-        //   }
-        // })
-        this.initPolygonLayer()
-      })
-      // scene.on("click", (feature) => {
-      //     // console.log(feature);
-      // });
-    },
-    initPolygonLayer () {
-      const { darkStyle } = this
-      const styleConfig = darkStyle
-      const data = yifengJson
-      const data1 = jdbandaoJson
-      // 画区域面积
-      polygonLayer = new PolygonLayer({
-        autoFit: true
-      })
-        .size(1000)
-        .source(data1)
-        .color('name', ['rgba(0, 0, 255,0.2)'])
-        .shape('fill')
-        .style({
-          // opacityLinear: {
-          //   enable: true, // true - false
-          //   dir: 'out' // in - out
-          // },
-          opacity: 0.6,
-          // heightfixed: true,
-          sourceColor: '#4ee8fc',
-          targetColor: '#00284e'
-        })
-      scene.addLayer(polygonLayer)
-      polygonLayer = new PolygonLayer({
-        autoFit: true
-      })
-        .size(1000)
-        .source(data)
-        .color('name', ['rgba(0,106,235, .9)'])
-        .shape('extrude')
-        // .shape("fill")
-        .style({
-          opacityLinear: {
-            enable: true, // true - false
-            dir: 'out' // in - out
-          },
-          opacity: 0.8,
-          heightfixed: true,
-          sourceColor: '#3072d0',
-          targetColor: '#00284e'
-          // targetColor: '#4ee8fc'
-        })
-      scene.addLayer(polygonLayer)
-
-      // 画区域边
-      lineLayer = new LineLayer({
-        zIndex: 2,
-        name: 'line2'
-      })
-        .source(data)
-        .shape('line')
-        .size(1)
-        .color('name', styleConfig.lineColor)
-        .style({
-          opacity: 1,
-          raisingHeight: 300
-        })
-        .animate({
-          interval: 1, // 间隔
-          duration: 2, // 持续时间，延时
-          trailLength: 2 // 流线长度
-        })
-      scene.addLayer(lineLayer)
-
-      textLayer = new PolygonLayer({
-        zIndex: 20
-      })
-        .source(data)
-        .color('name', styleConfig.textColor)
-        .shape('name', 'text')
-        .size(14)
-        .style({
-          textAnchor: 'center', // 文本相对锚点的位置 center|left|right|top|bottom|top-left
-          textOffset: [0, 40], // 文本相对锚点的偏移量 [水平, 垂直]
-          spacing: 2, // 字符间距
-          padding: [2, 2], // 文本包围盒 padding [水平，垂直]，影响碰撞检测结果，避免相邻文本靠的太近
-          stroke: styleConfig.textStrokeColor, // 描边颜色
-          strokeWidth: 0.1, // 描边宽度
-          strokeOpacity: 0.8,
-          raisingHeight: 300,
-          textAllowOverlap: true
-        })
-        .active(true)
-      scene.addLayer(textLayer)
-      const _this = this
-      polygonLayer.on('click', (e) => {})
-    }
   },
-  components: { chinaMap },
   computed: {},
   watch: {}
 }
diff --git a/src/views/next/screen-content-map/cpt/hsyf-iframe.vue b/src/views/next/screen-content-map/cpt/hsyf-iframe.vue
index c867e38..72c555d 100644
--- a/src/views/next/screen-content-map/cpt/hsyf-iframe.vue
+++ b/src/views/next/screen-content-map/cpt/hsyf-iframe.vue
@@ -4,8 +4,8 @@
  * @LastEditors: mk 2403457699@qq.com
  * @LastEditTime: 2024-02-27 15:10:40
  * @Description: 介绍一下改动了什么
- * 
- * 
+ *
+ *
 -->
 <template>
     <div style="width: 100%; height: 100%;">
@@ -16,14 +16,14 @@
 
 <script>
 export default {
-    data() {
-        return {};
-    },
-    created() { },
-    methods: {},
-    components: {},
-    computed: {},
-    watch: {},
+  data () {
+    return {}
+  },
+  created () { },
+  methods: {},
+  components: {},
+  computed: {},
+  watch: {}
 }
 </script>
 
@@ -38,4 +38,4 @@ export default {
     align-items: center;
     cursor: pointer;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/next/screen-content-map/cpt/point.json b/src/views/next/screen-content-map/cpt/point.json
index 0635739..02ffa91 100644
--- a/src/views/next/screen-content-map/cpt/point.json
+++ b/src/views/next/screen-content-map/cpt/point.json
@@ -9,13 +9,13 @@
                     "name": "瑞克斯旺（中国）农业科技有限公司",
                     "type": "marker",
                     "category": "unit",
-                    "id": "11"
+                    "id": "1772542305774510081"
                 },
                 "geometry": {
                     "type": "Point",
                     "coordinates": [
-                        120.224506,
-                        36.542165
+                        120.21399,
+                        36.54200
                     ]
                 }
             },
@@ -57,13 +57,13 @@
                     "name": "青岛世农种苗有限公司",
                     "type": "marker",
                     "category": "unit",
-                    "id": "11"
+                    "id": "1777620943127711745"
                 },
                 "geometry": {
                     "type": "Point",
                     "coordinates": [
-                        120.219312,
-                        36.565069
+                        120.21425,
+                        36.56496
                     ]
                 }
             },
@@ -89,13 +89,13 @@
                     "name": "青岛德龙种子有限公司",
                     "type": "marker",
                     "category": "unit",
-                    "id": "11"
+                    "id": "1739933907285520386"
                 },
                 "geometry": {
                     "type": "Point",
                     "coordinates": [
-                        120.215301,
-                        36.517811
+                        120.21047,
+                        36.517690
                     ]
                 }
             },
@@ -182,16 +182,16 @@
             {
                 "type": "Feature",
                 "properties": {
-                    "name": "青岛海育种业有限公司",
+                    "name": "山东汉研种业科技有限公司",
                     "type": "marker",
                     "category": "unit",
-                    "id": "11"
+                    "id": "1777617911371534337"
                 },
                 "geometry": {
                     "type": "Point",
                     "coordinates": [
-                        120.20024,
-                        36.465497
+                        120.23914,
+                        36.48409
                     ]
                 }
             },
@@ -255,7 +255,7 @@
                     "name": "青岛润之禾农业科技有限公司",
                     "type": "marker",
                     "category": "unit",
-                    "id": "1"
+                    "id": "1774613614792564738"
                 },
                 "geometry": {
                     "type": "Point",
@@ -300,7 +300,7 @@
             {
                 "type": "Feature",
                 "properties": {
-                    "name": "青岛润之禾农业科技有限公司",
+                    "name": "青岛旺禾农业科技有限公司",
                     "type": "marker",
                     "category": "unit",
                     "id": "1"
@@ -341,7 +341,7 @@
                     "name": "青岛润涵食品有限公司",
                     "type": "marker",
                     "category": "unit",
-                    "id": "1"
+                    "id": "1777605184087396353"
                 },
                 "geometry": {
                     "type": "Point",
@@ -373,7 +373,7 @@
                     "name": "青岛地平线蔬菜专业合作社",
                     "type": "marker",
                     "category": "unit",
-                    "id": "1"
+                    "id": "1774615823391416321"
                 },
                 "geometry": {
                     "type": "Point",
@@ -389,7 +389,7 @@
                     "name": "青岛诚一果蔬现代农业专业合作社",
                     "type": "marker",
                     "category": "unit",
-                    "id": "1"
+                    "id": "1774615189523030018"
                 },
                 "geometry": {
                     "type": "Point",
@@ -421,7 +421,7 @@
                     "name": "青岛贸润蔬菜瓜果专业合作社",
                     "type": "marker",
                     "category": "unit",
-                    "id": "1"
+                    "id": "1777604628077875202"
                 },
                 "geometry": {
                     "type": "Point",
@@ -667,7 +667,7 @@
                     "name": "青岛龙之园绿色食品有限公司",
                     "type": "marker",
                     "category": "unit",
-                    "id": "1"
+                    "id": "1777603244213407745"
                 },
                 "geometry": {
                     "type": "Point",
@@ -715,7 +715,7 @@
                     "name": "青岛润涵食品有限公司",
                     "type": "marker",
                     "category": "unit",
-                    "id": "1"
+                    "id": "1777605184087396353"
                 },
                 "geometry": {
                     "type": "Point",
diff --git a/src/views/next/screen-content-map/cpt/szyf-map.vue b/src/views/next/screen-content-map/cpt/szyf-map.vue
index 29bbfda..03819ac 100644
--- a/src/views/next/screen-content-map/cpt/szyf-map.vue
+++ b/src/views/next/screen-content-map/cpt/szyf-map.vue
@@ -10,162 +10,19 @@
   </div>
 </template>
 <script>
-import { Scene, PolygonLayer } from "@antv/l7";
-import { GaodeMap } from "@antv/l7-maps";
-import yifengJson from "./yifeng.json";
-import jdbandaoJson from "./jdbandao.json";
-import chinaMap from "./chinaMap.vue";
-import { mapActions } from "vuex";
-let myMap;
-let scene;
-let polygonLayer;
 export default {
-  data() {
+  data () {
     return {
-      darkStyle: {
-        style: "amap://styles/blue",
-        polygonColor: [
-          // "rgba(255, 100, 60, 0.5)",
-          // "rgba(43, 231, 253, 0.35)",
-          "rgba(0, 127, 241, .5)",
-          // "rgba(255, 255, 50, 0.35)",
-        ],
-        lineColor: [
-          // "rgba(255, 180, 150, 0.9)",
-          // "rgba(43, 231, 253, 0.7)",
-          "rgba(0, 127, 241, .6)",
-          // "rgba(255, 255, 50, 0.7)",
-        ],
-        circleColor: [
-          // "rgba(255, 180, 150, 0.99)",
-          // "rgba(43, 231, 253, 0.99)",
-          "rgba(0, 127, 241, 0.99)",
-          // "rgba(255, 255, 50, 0.99)",
-        ],
-        textColor: [
-          // "rgba(255, 100, 60, 0.99)",
-          // "rgba(43, 231, 253, 0.99)",
-          "rgba(126, 187, 255, 1)",
-          // "rgba(255, 255, 50, 0.99)",
-        ],
-        textStrokeColor: "#fff",
-      },
-      lightStyle: {
-        style: "amap://styles/blue",
-        polygonColor: [
-          // "rgba(255, 100, 60, 0.3)",
-          "rgba(43, 231, 253, 0.3)",
-          // "rgba(255, 255, 50, 0.3)",
-        ],
-        lineColor: [
-          // "rgba(220, 150, 120, 0.9)",
-          "rgba(155, 212, 242, 1)",
-          // "rgba(200, 200, 50, 0.9)",
-        ],
-        circleColor: [
-          // "rgba(255, 180, 150, 0.99)",
-          "rgba(13, 181, 203, 0.8)",
-          // "rgba(255, 255, 50, 0.99)",
-        ],
-        textColor: [
-          // "rgba(200, 50, 10, 0.99)",
-          "rgba(0, 130, 153, 0.99)",
-          // "rgba(120, 120, 0, 0.99)",
-        ],
-        textStrokeColor: "#666",
-      },
-    };
-  },
-  created() {},
-  mounted() {
-    this.$nextTick(() => {
-      this.init();
-    });
+    }
   },
   methods: {
-    init() {
-      if (!yifengJson) return false;
-      myMap = new GaodeMap({
-        pitch: 40.24716321414439,
-        // mapStyle: 'amap://styles/3bd5ec68d60de6542634c3e701f64523',
-        style: this.darkStyle.style,
-        showLabel: false,
-        center: [120.220563, 36.496127],
-        token: "fc14b42e0ca18387866d68ebd4f150c1",
-        zoom: 10,
-        isHotspot: false,
-        showIndoorMap: false,
-        showBuildingBlock: false,
-        resizeEnable: true,
-        doubleClickZoom: false,
-        showRoad: false,
-        viewMode: "3D",
-      });
-
-      scene = new Scene({
-        id: "myMap",
-        logoVisible: false,
-        map: myMap,
-      });
-
-      const data = yifengJson;
-      const data1 = jdbandaoJson;
-      // 画区域面积
-      if (polygonLayer) {
-        scene.removeLayer(polygonLayer);
-      }
-      polygonLayer = new PolygonLayer({
-        autoFit: true,
-      })
-        .size(1000)
-        .source(data1)
-        .color("name", ["rgba(0, 0, 255,0.2)"])
-        .shape("fill")
-        .style({
-          // opacityLinear: {
-          //   enable: true, // true - false
-          //   dir: 'out' // in - out
-          // },
-          opacity: 0.6,
-          // heightfixed: true,
-          sourceColor: "#4ee8fc",
-          targetColor: "#00284e",
-        });
-      scene.addLayer(polygonLayer);
-      // 画区域面积
-      polygonLayer = new PolygonLayer({
-        autoFit: true,
-      })
-        .size(1000)
-        .source(data)
-        .color("name", ["rgba(0, 127, 241, .0)"])
-        .shape("fill")
-        .style({
-          // opacityLinear: {
-          //   enable: true, // true - false
-          //   dir: 'out' // in - out
-          // },
-          opacity: 0,
-          // heightfixed: true,
-          sourceColor: "#4ee8fc",
-          targetColor: "#00284e",
-        });
-      scene.addLayer(polygonLayer);
-      scene.on("loaded", () => {});
-    },
   },
-  components: { chinaMap },
   computed: {},
-  watch: {},
-};
+  watch: {}
+}
 </script>
 
 <style lang="scss" scoped>
-#myMap {
-  width: 100%;
-  height: 100%;
-}
-
 .mapImage {
   @include flex(column);
   align-items: center;
diff --git a/src/views/next/screen-content-map/cpt/whyf.vue b/src/views/next/screen-content-map/cpt/whyf.vue
index 66359de..1dffb1f 100644
--- a/src/views/next/screen-content-map/cpt/whyf.vue
+++ b/src/views/next/screen-content-map/cpt/whyf.vue
@@ -44,78 +44,78 @@
   </div>
 </template>
 <script>
-import { cultureLegacyList } from "@/api/home";
+import { cultureLegacyList } from '@/api/home'
 export default {
-  data() {
+  data () {
     return {
       tabList: [
         {
-          name: "大欧鸟笼制作技艺",
-          src: require("@/assets/images/resource/whyf/1.jpg"),
+          name: '大欧鸟笼制作技艺',
+          src: require('@/assets/images/resource/whyf/1.jpg')
         },
         {
-          name: "虎头鞋虎头帽",
-          src: require("@/assets/images/resource/whyf/2.jpg"),
+          name: '虎头鞋虎头帽',
+          src: require('@/assets/images/resource/whyf/2.jpg')
         },
         {
-          name: "毛子埠升制作技艺",
-          src: require("@/assets/images/resource/whyf/5.jpg"),
+          name: '毛子埠升制作技艺',
+          src: require('@/assets/images/resource/whyf/5.jpg')
         },
         {
-          name: "大沽河的传说",
-          src: require("@/assets/images/resource/whyf/7.jpg"),
+          name: '大沽河的传说',
+          src: require('@/assets/images/resource/whyf/7.jpg'),
           imageList: [
-            require("@/assets/images/resource/whyf/7.jpg"),
-            require("@/assets/images/resource/whyf/9.jpg"),
-            require("@/assets/images/resource/whyf/10.jpg"),
+            require('@/assets/images/resource/whyf/7.jpg'),
+            require('@/assets/images/resource/whyf/9.jpg'),
+            require('@/assets/images/resource/whyf/10.jpg')
           ],
           content:
-            "<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2008年公布为第一批即墨市级非物质文化遗产名录。</p><p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;《大沾河的传说》，起始于春秋战国时期，距今已有二千余年历史。其流传区域.以即墨市移风店镇为中心，涉及到沿大洁河周边镇以及平度、胶州、莱西等区市。同时，有些故事在东北三省等地区也广为流传。</p><p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;移风店镇历史您久，文化底蕴丰厚，新石器时代的龙山文化遗址、春秋棠邑古城遗址及即墨县抗日民主政府旧址均位于该镇，是即墨柳腔的发源地之一。该镇民风淳朴，人民群众勤劳朴实，有传统的布艺加工、草编等民间手工技艺，并流传着许多美丽的传说，其主要故事有:“大沽河的传说&quot;(两个版本)、“入洞房的传说&quot;、“老人是宝”、“三湾崖的传说&quot;、“三个日头”、“挂甲树”、“泰山石敢当二则”、“天地传说&quot;“神医乔范”、“油匠口子”、“徐仙姑传说”、“好人好报”、“吕洞宾典故”、“虎头鞋与虎头帽的传说”、&quot;李师傅的传说”、&quot;张柄寺的传说&quot;等。这些故事经当地百姓口口相传，深深地影响了一代又一代的大沽河人。</p><p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;《大沽河的传说》，具有浓厚的民间文化底蕴，脍炙人口的故事都充分体现了沽河沿岸人民的勒劳朴实、宽厚仁爱的传统道德观念和坚忍不拔的奋斗精神</p><p><br/></p>",
+            '<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2008年公布为第一批即墨市级非物质文化遗产名录。</p><p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;《大沾河的传说》，起始于春秋战国时期，距今已有二千余年历史。其流传区域.以即墨市移风店镇为中心，涉及到沿大洁河周边镇以及平度、胶州、莱西等区市。同时，有些故事在东北三省等地区也广为流传。</p><p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;移风店镇历史您久，文化底蕴丰厚，新石器时代的龙山文化遗址、春秋棠邑古城遗址及即墨县抗日民主政府旧址均位于该镇，是即墨柳腔的发源地之一。该镇民风淳朴，人民群众勤劳朴实，有传统的布艺加工、草编等民间手工技艺，并流传着许多美丽的传说，其主要故事有:“大沽河的传说&quot;(两个版本)、“入洞房的传说&quot;、“老人是宝”、“三湾崖的传说&quot;、“三个日头”、“挂甲树”、“泰山石敢当二则”、“天地传说&quot;“神医乔范”、“油匠口子”、“徐仙姑传说”、“好人好报”、“吕洞宾典故”、“虎头鞋与虎头帽的传说”、&quot;李师傅的传说”、&quot;张柄寺的传说&quot;等。这些故事经当地百姓口口相传，深深地影响了一代又一代的大沽河人。</p><p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;《大沽河的传说》，具有浓厚的民间文化底蕴，脍炙人口的故事都充分体现了沽河沿岸人民的勒劳朴实、宽厚仁爱的传统道德观念和坚忍不拔的奋斗精神</p><p><br/></p>'
         },
         {
-          name: "陈仙姑传说",
-          src: require("@/assets/images/resource/whyf/8.jpg"),
+          name: '陈仙姑传说',
+          src: require('@/assets/images/resource/whyf/8.jpg')
         },
         {
-          name: "金吉友拳法",
-          src: require("@/assets/images/resource/whyf/3.jpg"),
+          name: '金吉友拳法',
+          src: require('@/assets/images/resource/whyf/3.jpg')
         },
         {
-          name: "张院簸箕制作技艺",
-          src: require("@/assets/images/resource/whyf/4.jpg"),
+          name: '张院簸箕制作技艺',
+          src: require('@/assets/images/resource/whyf/4.jpg')
         },
         {
-          name: "上泊金银器打造工艺",
-          src: require("@/assets/images/resource/whyf/6.jpg"),
-        },
+          name: '上泊金银器打造工艺',
+          src: require('@/assets/images/resource/whyf/6.jpg')
+        }
       ],
       active: 7,
-      selfObj: {},
-    };
+      selfObj: {}
+    }
   },
-  created() {
+  created () {
     cultureLegacyList().then((res) => {
-      this.tabList = res.data.list;
+      this.tabList = res.data.list
       this.selfObj = {
         content: this.tabList[7].content,
-        imageList: this.tabList[7].imageList,
-      };
-    });
+        imageList: this.tabList[7].imageList
+      }
+    })
   },
-  mounted() {},
+  mounted () {},
   methods: {
-    handelTab(index) {
-      this.active = index;
+    handelTab (index) {
+      this.active = index
       this.selfObj = {
         content: this.tabList[index].content,
-        imageList: this.tabList[index].imageList,
-      };
-    },
+        imageList: this.tabList[index].imageList
+      }
+    }
   },
   components: {},
   computed: {},
-  watch: {},
-};
+  watch: {}
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/next/screen-content-map/cpt/zdyf-map.vue b/src/views/next/screen-content-map/cpt/zdyf-map.vue
index ffbb567..41f0667 100644
--- a/src/views/next/screen-content-map/cpt/zdyf-map.vue
+++ b/src/views/next/screen-content-map/cpt/zdyf-map.vue
@@ -1,9 +1,6 @@
 <template>
   <div style="width: 100%; height: 100%">
     <div class="bg_img" v-if="mapFlag == 'Emap'">
-      <!-- <div class="title">
-        {{ title }}
-      </div> -->
       <chinaMap />
       <div class="pot" @click="toProvince">
         <img src="@/assets/images/map/yellowPot.png" alt="" />
@@ -16,22 +13,19 @@
         </div>
       </div>
     </div>
-    <div id="myMap" v-if="mapFlag == 'Amap'">
-      <div v-if="mapType == 'polygon'">
-        <screen-map-header :data="headerList"></screen-map-header>
-        <screen-map-legeng></screen-map-legeng>
+    <div id="myMapZd" v-if="mapFlag == 'Amap'">
+      <div>
+        <screen-map-header
+          v-if="showPage"
+          :data="headerList"
+        ></screen-map-header>
+        <screen-map-legeng v-if="showPage"></screen-map-legeng>
       </div>
     </div>
   </div>
 </template>
 <script>
-import {
-  Scene,
-  PolygonLayer,
-  LineLayer,
-  ImageLayer,
-  PointLayer
-} from '@antv/l7'
+import { Scene, PolygonLayer, LineLayer, PointLayer } from '@antv/l7'
 import { GaodeMap } from '@antv/l7-maps'
 import yifengJson from './yifeng.json'
 import jdbandaoJson from './jdbandao.json'
@@ -39,14 +33,13 @@ import point from './point.json'
 import chinaMap from './chinaMap.vue'
 import { selectConfigList } from '@/api/home'
 import { mapActions, mapGetters } from 'vuex'
-let myMap
+const width = 0
+const height = 0
+let myMapZd
 let scene
-let circleLayerSmall
-let roadLayer
 let polygonLayer
+let polygonLayer1
 let lineLayer
-let textLayer
-let dotTextLayer
 let dotLayer
 let dotLayer1
 let dotLayer2
@@ -116,18 +109,35 @@ export default {
         { name: '年平均降水', units: '毫升', num: '687' },
         { name: '土壤有机质', units: '含量', num: '1.5%' }
       ],
-      mapType: ''
+      mapType: '',
+      showPage: false,
+      width: 1920,
+      height: 960
+    }
+  },
+  created () {
+    // 获取屏幕高度
+    const screenHeight = window.innerHeight
+    // 判断屏幕高度并设置变量的值
+    if (screenHeight === 960) {
+      this.height = 960
+    } else if (screenHeight === 1080) {
+      this.height = 1080
+    } else {
+      this.height = 960
+    }
+    // console.log(this.height, 'this.height')
+
+    if (width && height) {
+      this.width = width
+      this.height = height
     }
   },
-  created () {},
   mounted () {
     window._AMapSecurityConfig = {
       securityJsCode: '92ea2c965c6cf1ba7ee3a8fe01449ef2'
     }
     this.$nextTick(() => {
-      this.$EventBus.$on('switcMapType', (data) => {
-        this.switcMapType(data)
-      })
       this.$EventBus.$on('switcMapType1', (data) => {
         this.switcMapType1(data)
       })
@@ -144,35 +154,23 @@ export default {
   },
   methods: {
     ...mapActions({
-      set_qyjj: 'SET_QYJJ'
+      set_qyjj: 'SET_QYJJ',
+      set_gsxq_id: 'SET_GSXQ_ID'
     }),
+    ...mapActions({}),
+    openCompanyDetail (item) {
+      this.set_qyjj(true)
+      this.set_gsxq_id(item.id)
+    },
     async switcMapType1 (arr) {
       this.removeDotLayers()
       this.initDot(point, arr)
     },
-    async switcMapType (type) {
-      if (type === 'Emap') {
-        this.mapType = null
-        this.mapFlag = 'Emap'
-        scene.destroy()
-        myMap = null
-        return
-      }
-      this.mapFlag = 'Amap'
-      if (!myMap) {
-        await new Promise((resolve) => setTimeout(resolve, 5000))
-        await this.init(type)
-      } else {
-        this.initPolygonLayer(type)
-        if (type === 'unit') {
-          this.removeDotLayers()
-          this.initDot(point)
-        }
-      }
-    },
     removeDotLayers () {
-      scene.removeLayer(dotTextLayer)
       scene.removeLayer(dotLayer)
+      scene.removeLayer(dotLayer1)
+      scene.removeLayer(dotLayer2)
+      scene.removeLayer(dotLayer3)
     },
     toProvince () {
       this.mapFlag = 'Amap'
@@ -180,141 +178,55 @@ export default {
         this.init()
       }, 1000)
     },
-    init (type) {
+    init () {
       if (!yifengJson) return false
-      myMap = new GaodeMap({
+      myMapZd = new GaodeMap({
         pitch: 40.24716321414439,
         mapStyle: 'amap://styles/blue',
         // style: styleConfig.style,
         showLabel: false,
         center: [120.220563, 36.496127],
         token: 'fc14b42e0ca18387866d68ebd4f150c1',
-        zoom: 15,
+        zoom: 13,
         isHotspot: false,
         showIndoorMap: false,
         showBuildingBlock: false,
         resizeEnable: true,
-        doubleClickZoom: false,
+        // doubleClickZoom: false,
         showRoad: false,
         viewMode: '3D'
       })
       scene = new Scene({
-        id: 'myMap',
+        id: 'myMapZd',
         logoVisible: false,
-        map: myMap
+        map: myMapZd
       })
+      this.showPage = true
+      const mapContent = document.getElementById('myMapZd')
+      const scaleWH = this.$store.state.basic.scale
+      mapContent.style.transform = `scale(${1 / scaleWH})`
+      scene.addImage(
+        'yuzhong',
+        require('@/assets/images/map/keyQy/yuzhong.png')
+      )
+      scene.addImage('yumiao', require('@/assets/images/map/keyQy/yumiao.png'))
+      scene.addImage(
+        'zhongzhi',
+        require('@/assets/images/map/keyQy/zhongzhi.png')
+      )
+      scene.addImage(
+        'jiagong',
+        require('@/assets/images/map/keyQy/jiagong.png')
+      )
       scene.on('loaded', () => {
-        if (!type) {
-          // this.initCircle()
-          this.initPolygonLayer(type)
-        } else if (type == 'unit') {
-          this.initDot(point)
-          // this.initPolygonLayer()
-        } else if (type == 'resource') {
-          this.initPolygonLayer(type)
-        } else if (type == 'szyf') {
-          this.initFlow(type)
-        }
+        this.initPolygonLayer()
       })
-      // scene.on('click', (feature) => {
-      //   // console.log(feature);
-      // })
     },
-    initCircle () {
-      circleLayerSmall = new ImageLayer({})
-      // circleLayerSmall.source(
-      // 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/yifeng/2024-02-03/circle.png',
-      // {
-      circleLayerSmall.source(`${process.env.VUE_APP_MAP_IMG}/circle1.png`, {
-        parser: {
-          type: 'image',
-          extent: [121.0819, 35.8908, 119.2372, 37.2278]
-        }
-      })
-      scene.addLayer(circleLayerSmall)
-      const data = jdbandaoJson
-      // 画区域面积
-      polygonLayer = new PolygonLayer({
-        autoFit: true
-      })
-        .size(300)
-        .source(data)
-        .color('name', ['rgba(0, 127, 241, .5)'])
-        // .shape('extrude')
-        .shape('fill')
-        .style({
-          opacityLinear: {
-            enable: true, // true - false
-            dir: 'out' // in - out
-          },
-          opacity: 1,
-          heightfixed: true,
-          sourceColor: '#4ee8fc',
-          targetColor: '#00284e'
-        })
-      scene.addLayer(polygonLayer)
-
-      const that = this
-      // circleLayerSmall.on('click', (ev) => {
-      //   // 处理点击事件的逻辑
-      //   that.initRoadLayer()
-      // })
-    },
-    initRoadLayer () {
-      if (circleLayerSmall) {
-        scene.removeLayer(circleLayerSmall)
-      }
-      scene.setZoom(10)
-      roadLayer = new ImageLayer({})
-      // roadLayer.source(
-      //   'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/yifeng/2024-02-03/road.png',
-      //   {
-      roadLayer.source(`${process.env.VUE_APP_MAP_IMG}/road1.png`, {
-        parser: {
-          type: 'image',
-          extent: [119.7829, 36.7398, 120.5205, 36.2552]
-        }
-      })
-      scene.addLayer(roadLayer)
-      const that = this
-      // roadLayer.on('click', (ev) => {
-      //   // 处理点击事件的逻辑
-      //   that.initPolygonLayer()
-      // })
-    },
-    initFlow () {
-      if (circleLayerSmall) {
-        scene.removeLayer(circleLayerSmall)
-      }
-      if (roadLayer) {
-        scene.removeLayer(roadLayer)
-      }
-      if (polygonLayer) {
-        scene.removeLayer(polygonLayer)
-      }
-      scene.setZoom(15)
-      roadLayer = new ImageLayer({})
-      roadLayer.source('/images/map/flow.png', {
-        parser: {
-          type: 'image',
-          extent: [119.7829, 36.7398, 120.5205, 36.2552]
-        }
-      })
-      scene.addLayer(roadLayer)
-    },
-    initPolygonLayer (type) {
-      if (type == 'szyf') {
-        this.initFlow()
-        return
-      }
-      if (type == 'unit') {
-        return
-      }
-      scene.removeLayer(roadLayer)
-      scene.removeLayer(circleLayerSmall)
+    initPolygonLayer () {
       scene.removeLayer(polygonLayer)
+      scene.removeLayer(polygonLayer1)
       scene.removeLayer(lineLayer)
-      scene.removeLayer(dotTextLayer)
+      this.removeDotLayers()
       this.mapType = 'polygon'
       const { darkStyle } = this
       const styleConfig = darkStyle
@@ -322,6 +234,7 @@ export default {
       const data1 = jdbandaoJson
       // 画区域面积
       polygonLayer = new PolygonLayer({
+        zIndex: 1,
         autoFit: true
       })
         .source(data1)
@@ -339,7 +252,8 @@ export default {
           targetColor: '#00284e'
         })
       scene.addLayer(polygonLayer)
-      polygonLayer = new PolygonLayer({
+      polygonLayer1 = new PolygonLayer({
+        zIndex: 2,
         autoFit: true
       })
         .size(1)
@@ -355,12 +269,8 @@ export default {
           heightfixed: true,
           sourceColor: '#3372d0',
           targetColor: '#00284e'
-          // targetColor: '#4ee8fc'
         })
-      scene.addLayer(polygonLayer)
-      polygonLayer.on('click', (e) => {
-        console.log('111')
-      })
+      scene.addLayer(polygonLayer1)
       // 画区域边
       lineLayer = new LineLayer({
         zIndex: 2,
@@ -379,146 +289,95 @@ export default {
           trailLength: 2 // 流线长度
         })
       scene.addLayer(lineLayer)
-      lineLayer.on('click', (e) => {
-        console.log('222')
+      polygonLayer1.on('click', (e) => {
+        console.log('222', e)
       })
-      // lineLayer.on('mousemove', (e) => {
-      //   console.log('e::', e)
-      // })
     },
     initDot (data, arr) {
-      scene.addImage(
-        'yuzhong',
-        require('@/assets/images/map/keyQy/yuzhong.png')
-      )
-      scene.addImage('yumiao', require('@/assets/images/map/keyQy/yumiao.png'))
-      scene.addImage(
-        'zhongzhi',
-        require('@/assets/images/map/keyQy/zhongzhi.png')
-      )
-      scene.addImage(
-        'jiagong',
-        require('@/assets/images/map/keyQy/jiagong.png')
-      )
+      this.removeDotLayers()
       // textOffset改为动态的 this.buttonIndex == 3 [10,60] 否则就是 [-30 60]
-      scene.removeLayer(dotLayer)
-      scene.removeLayer(dotLayer1)
-      scene.removeLayer(dotLayer2)
-      scene.removeLayer(dotLayer3)
-      // dotTextLayer = new PointLayer({
-      //   zIndex: 21000000000
-      // })
-      //   .source(data['育种企业'])
-      //   .shape('name', 'text')
-      //   .color('#000')
-      //   .size(11)
-      //   .style({
-      //     strokeWidth: 1,
-      //     strokeOpacity: 0.1,
-      //     fontWeight: '500',
-      //     stroke: '#fff',
-      //     textOffset: [20, 0],
-      //     raisingHeight: 300,
-      //     heightfixed: true,
-      //     textAnchor: 'left'
-      //   })
-      // scene.addLayer(dotTextLayer)
       const images = {
         育种企业: 'yuzhong',
         育苗企业: 'yumiao',
         种植企业: 'zhongzhi',
         加工企业: 'jiagong'
       }
+      const gaoliang = [
+        '瑞克斯旺（中国）农业科技有限公司',
+        '青岛德龙种子有限公司',
+        '青岛世农种苗有限公司',
+        '山东汉研种业科技有限公司',
+        '青岛润之禾农业科技有限公司',
+        '青岛诚一果蔬现代农业专业合作社',
+        '青岛龙之园绿色食品有限公司'
+      ]
       if (arr.some((item) => item === '育种企业')) {
-        dotLayer = new PointLayer({
-          zIndex: 20000000
-        })
+        dotLayer = new PointLayer({ zIndex: 30 })
           .source(data['育种企业'])
           .shape(images['育种企业'])
-          .size(10)
-          .style({
-            layerType: 'fillImage',
-            heightfixed: true
+          .size('name', (val) => {
+            if (gaoliang.some((item) => item === val)) {
+              return 12
+            }
+            return 10
           })
         scene.addLayer(dotLayer)
-        // dotTextLayer = new PointLayer({
-        //   zIndex: 2000000021
-        // })
-        //   .source(data['种植企业'])
-        //   .shape('name', 'text')
-        //   .color('#000')
-        //   .size(11)
-        //   .style({
-        //     strokeWidth: 1,
-        //     strokeOpacity: 0.1,
-        //     fontWeight: '500',
-        //     stroke: '#fff',
-        //     textOffset: [10, 0],
-        //     raisingHeight: 300,
-        //     heightfixed: true,
-        //     textAnchor: 'center-left'
-        //   })
-        // scene.addLayer(dotTextLayer)
-
-        // dotTextLayer.on('click', (e) => {
-        //   console.log('eee1111')
-        // })
-        dotLayer.on('click', (e) => {
-          console.log('eee')
-          that.set_qyjj(true)
-        })
       }
       if (arr.some((item) => item === '育苗企业')) {
-        dotLayer1 = new PointLayer({
-          zIndex: 20000000
-        })
+        dotLayer1 = new PointLayer({ zIndex: 30 })
           .source(data['育苗企业'])
           .shape(images['育苗企业'])
-          .size(10)
-          .style({
-            layerType: 'fillImage',
-            heightfixed: true
+          .size('name', (val) => {
+            if (gaoliang.some((item) => item === val)) {
+              return 12
+            }
+            return 10
           })
         scene.addLayer(dotLayer1)
       }
       if (arr.some((item) => item === '种植企业')) {
-        dotLayer2 = new PointLayer({
-          zIndex: 20000000
-        })
+        dotLayer2 = new PointLayer({ zIndex: 30 })
           .source(data['种植企业'])
           .shape(images['种植企业'])
-          .size(10)
-          .style({
-            layerType: 'fillImage',
-            heightfixed: true
+          .size('name', (val) => {
+            if (gaoliang.some((item) => item === val)) {
+              return 12
+            }
+            return 10
           })
         scene.addLayer(dotLayer2)
       }
       if (arr.some((item) => item === '加工企业')) {
-        dotLayer3 = new PointLayer({
-          zIndex: 20000000
-        })
+        dotLayer3 = new PointLayer({ zIndex: 30 })
           .source(data['加工企业'])
           .shape(images['加工企业'])
-          .size(10)
-          .style({
-            layerType: 'fillImage',
-            heightfixed: true
+          .size('name', (val) => {
+            if (gaoliang.some((item) => item === val)) {
+              return 12
+            }
+            return 10
           })
         scene.addLayer(dotLayer3)
       }
-      const that = this
+      dotLayer.on('click', (e) => {
+        if (gaoliang.some((item) => item === e.feature.properties.name)) {
+          this.openCompanyDetail(e.feature.properties)
+        }
+      })
       dotLayer1.on('click', (e) => {
-        console.log('eee1')
-        that.set_qyjj(true)
+        if (gaoliang.some((item) => item === e.feature.properties.name)) {
+          this.openCompanyDetail(e.feature.properties)
+        }
       })
       dotLayer2.on('click', (e) => {
-        console.log('eee2')
-        that.set_qyjj(true)
+        if (gaoliang.some((item) => item === e.feature.properties.name)) {
+          this.openCompanyDetail(e.feature.properties)
+        }
       })
       dotLayer3.on('click', (e) => {
-        console.log('eee3')
-        that.set_qyjj(true)
+        if (gaoliang.some((item) => item === e.feature.properties.name)) {
+          this.openCompanyDetail(e.feature.properties)
+        }
       })
     }
   },
@@ -531,24 +390,34 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.map-header {
+.next1 {
+  box-sizing: border-box;
   position: absolute;
-  top: 100px;
   left: 50%;
-  transform: translate(-50%);
+  top: 50%;
+  transition: 0.2s;
+  transform-origin: 0 0;
+  overflow: hidden;
+  z-index: 99;
+}
+.map-header {
+  position: absolute;
+  top: 200px;
+  left: 45%;
+  transform: scale(0.7) translate(-50%);
   width: 745px;
   height: 58px;
-  z-index: 10;
+  z-index: 99;
 }
 
 .map-legeng {
   position: absolute;
-  top: 686px;
-  left: 554px;
-  transform: translate(-50%);
+  top: 550px;
+  left: 654px;
+  transform: scale(0.7) translate(-50%);
   width: 140px;
   height: 260px;
-  z-index: 10;
+  z-index: 99;
 }
 
 .bg_img {
@@ -698,8 +567,12 @@ export default {
   }
 }
 
-#myMap {
+#myMapZd {
+  position: absolute;
+  top: 0;
+  left: 0;
   width: 100%;
   height: 100%;
+  // z-index: 100000000000000000000000000000;
 }
 </style>
diff --git a/src/views/next/screen-content-map/index.vue b/src/views/next/screen-content-map/index.vue
index 286634c..79371f5 100644
--- a/src/views/next/screen-content-map/index.vue
+++ b/src/views/next/screen-content-map/index.vue
@@ -16,8 +16,7 @@ import szyfMap from './cpt/szyf-map.vue'
 export default {
   name: 'screen-content-map',
   data () {
-    return {
-    }
+    return {}
   },
   computed: {
     ...mapGetters(['scale', 'navId']),
@@ -48,13 +47,9 @@ export default {
       }
     }
   },
-  created () {
-
-  },
-  mounted () {
-  },
-  beforeDestroy () {
-  },
+  created () {},
+  mounted () {},
+  beforeDestroy () {},
   methods: {
     ...mapActions({
       set_mapLevel: 'SET_MAPLEVEL',
diff --git a/src/views/next/screen-content-right/zdyf-right/index.vue b/src/views/next/screen-content-right/zdyf-right/index.vue
index afbb945..1e2593c 100644
--- a/src/views/next/screen-content-right/zdyf-right/index.vue
+++ b/src/views/next/screen-content-right/zdyf-right/index.vue
@@ -365,7 +365,8 @@ export default {
             padding-left: 3px;
             box-sizing: border-box;
             width: 217px;
-            height: 98px;
+            height: 92px;
+            line-height: 22px;
             /* 显示的行数 */
             display: -webkit-box;
             -webkit-line-clamp: 4; /* 最多显示4行 */