代码提交

src/store/modules/dialog.js

@@ -34,6 +34,7 @@ export default {
     gsxqId: null,
     djType: null,
     szyfTalents: false,
+    viewPdf: false,
     dyfcId: null,
     yzfcId: null
 
@@ -42,6 +43,9 @@ export default {
     set_yfcj (state, visible) {
       state.yfcj = visible
     },
+    set_viewPdf (state, visible) {
+      state.viewPdf = visible
+    },
     set_garden (state, visible) {
       state.garden = visible
     },
@@ -58,7 +62,9 @@ export default {
       state.gsxq = visible
     },
     set_gsxq_id (state, value) {
+      console.log('set_gsxq_id')
       state.gsxqId = value
+      console.log('set_gsxq_id111')
     },
     set_qyjj (state, visible) {
       state.qyjj = visible
@@ -152,6 +158,9 @@ export default {
     SET_YFCJ (context, visible) {
       context.commit('set_yfcj', visible)
     },
+    SET_VIEWPDF (context, visible) {
+      context.commit('set_viewPdf', visible)
+    },
     SET_GARDEN (context, visible) {
       context.commit('set_garden', visible)
     },
@@ -213,7 +222,9 @@ export default {
       context.commit('set_ywqs_show', visible)
     },
     SET_QYJJ (context, visible) {
+      console.log('set_qyjj')
       context.commit('set_qyjj', visible)
+      console.log('set_qyjj1111')
     },
     SET_LDGH (context, visible) {
       context.commit('set_ldgh', visible)
@@ -260,6 +271,7 @@ export default {
     // 确保当前只能显示最近点击的弹窗
     showGlobalDialog (context, type) {
       context.commit('set_yfcj', false)
+      context.commit('set_viewPdf', false)
       context.commit('set_garden', false)
       context.commit('set_talents', false)
       context.commit('set_szyfTalents', false)
@@ -293,6 +305,8 @@ export default {
       }
       if (type === 'buildLeaderAttach') {
         context.commit('set_yfcj', true)
+      } else if (type === 'viewPdf') {
+        context.commit('set_viewPdf', true)
       } else if (type === 'zdyfGgqy') {
         context.commit('set_zdyf_ggqy', true)
       } else if (type === 'garden') {
@@ -354,6 +368,7 @@ export default {
   },
   getters: {
     yfcj: state => state.yfcj,
+    viewPdf: state => state.viewPdf,
     garden: state => state.garden,
     talents: state => state.talents,
     qyjj: state => state.qyjj,

src/views/next/dialog-module/zdyf-center/qyjj/index.vue

@@ -58,9 +58,9 @@
               </section>
             </div>
             <p class="unitNotation">{{ unitDetail.summary }}</p>
-            <p class="xiangqing">
+            <div class="xiangqing">
               {{ unitDetail.introduction }}
-            </p>
+            </div>
           </div>
           <div class="right">
             <div class="imgBox">
@@ -151,7 +151,11 @@ export default {
   data () {
     return {
       dialogTitle: '企业简介',
-      unitDetail: {},
+      unitDetail: {
+        monitor: [],
+        display: [],
+        honor: []
+      },
       videoUrl: process.env.VUE_APP_VIDEO_URL + 'ruikesiwang.mp4',
       videoUrl1: process.env.VUE_APP_VIDEO_URL + 'shinongzhongmiao.mp4',
       optionHover: {
@@ -164,6 +168,7 @@ export default {
         singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3
         waitTime: 2000 // 单步运动停止的时间(默认值1000ms)
       },
+      visiable: false,
       types: {
         1: '育种企业',
         2: '育苗企业',
@@ -178,45 +183,61 @@ export default {
   components: {},
   watch: {
     qyjj (val) {
-      if (process.env.NODE_ENV === 'development') {
+      this.visiable = val
-        this.videoUrl =
+      console.log(val)
-          'https://yifengdian-smps.elinkservice.cn/yifengdian-front/video/ruikesiwang.mp4'
-        this.videoUrl1 =
-          'https://yifengdian-smps.elinkservice.cn/yifengdian-front/video/shinongzhongmiao.mp4'
-      }
       if (val) {
-        seedCompanyDetail(this.gsxqId).then((res) => {
+        this.getData()
-          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: arr,
-            honor: res.data.honor ? JSON.parse(res.data.honor) : []
-          }
-        })
       }
     }
   },
-  created () {},
+  created () {
+    if (process.env.NODE_ENV === 'development') {
+      this.videoUrl =
+        'https://yifengdian-smps.elinkservice.cn/yifengdian-front/video/ruikesiwang.mp4'
+      this.videoUrl1 =
+        'https://yifengdian-smps.elinkservice.cn/yifengdian-front/video/shinongzhongmiao.mp4'
+    }
+  },
   methods: {
     ...mapActions({
-      showGlobalDialog: 'showGlobalDialog'
+      set_qyjj: 'SET_QYJJ',
+      showGlobalDialog: 'showGlobalDialog',
+      set_gsxq_id: 'SET_GSXQ_ID'
     }),
+    getData () {
+      const _this = this
+      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]
+              }
+            }
+          })
+        }
+        _this.unitDetail = {
+          ...res.data,
+          monitor: res.data.monitor ? JSON.parse(res.data.monitor) : [],
+          display: arr,
+          honor: res.data.honor ? JSON.parse(res.data.honor) : []
+        }
+      })
+    },
     closeDialog () {
-      this.showGlobalDialog('')
+      console.log('zoule?')
+      this.visiable = false
+      this.set_qyjj(false)
+      this.set_gsxq_id(null)
+      this.unitDetail = {
+        monitor: [],
+        display: [],
+        honor: []
+      }
     }
   }
 }
@@ -227,9 +248,6 @@ export default {
   line-height: 2;
   text-indent: 2em;
   font-size: 18px;
-  height: 430px;
-  overflow: hidden;
-  overflow-y: scroll;
   &::-webkit-scrollbar {
     width: 3px;
   }
@@ -253,7 +271,7 @@ export default {
   @include flex();
   align-items: center;
   justify-content: center;
-  z-index: 9999999999;
+  z-index: 999999999999999999999999;
 
   > section {
     @include flex(column);
@@ -328,11 +346,27 @@ export default {
 
         .left {
           width: 752px;
-          height: 100%;
+          height: 700px;
           background: rgba(109, 166, 255, 0.2);
           border-radius: 2px;
           padding: 16px;
+          overflow: hidden;
           box-sizing: border-box;
+          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);
+          }
 
           .unitNotation {
             color: #4af9ff;

src/views/next/dialog-module/zdyf-left/chackPdf.vue

@@ -0,0 +1,63 @@
+<template>
+  <div class="modal" v-show="viewPdf">
+    <div style="width: calc(100% - 24px); height: 100%">
+      <iframe style="width: 100%; height: 100%" frameborder="0" :src="videoUrl+'#view=FitH,top'" />
+    </div>
+    <div class="close-icon" @click="closeDialog">
+      <img src="@/assets/images/common/dialog-colse.png" alt="" />
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters, mapActions } from 'vuex'
+export default {
+  name: '',
+  data () {
+    return {
+      videoUrl: process.env.VUE_APP_VIDEO_URL + 'daguhe.pdf'
+    }
+  },
+  computed: {
+    ...mapGetters(['viewPdf'])
+  },
+  components: {},
+  mounted () {},
+  created () {
+    if (process.env.NODE_ENV === 'development') {
+      this.videoUrl =
+        'https://yifengdian-smps.elinkservice.cn/yifengdian-front/video/daguhe.pdf'
+    }
+  },
+  methods: {
+    ...mapActions({
+      showGlobalDialog: 'showGlobalDialog'
+    }),
+    closeDialog () {
+      this.showGlobalDialog('')
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.modal {
+  width: 1920px;
+  height: 100%;
+  position: absolute;
+  top: 0;
+  left: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 150;
+
+  .close-icon {
+    width: 24px;
+    padding-left: 6px;
+    img{
+      width:18px;
+    }
+  }
+}
+</style>

src/views/next/index.vue

@@ -63,6 +63,7 @@
     <KeyPersonnel />
     <ZdyfRightZx />
     <SzyfRightTalents />
+    <ZdyfLeftChackPdf />
     <yzfcModal />
   </div>
 </template>
@@ -77,6 +78,7 @@ import ScreenContentLeft from './screen-content-left'
 import ScreenContentRight from './screen-content-right'
 import ZdyfLeftYfcj from './dialog-module/zdyf-left/yfcj'
 import ZdyfLeftYflz from './dialog-module/zdyf-left/yfclz.vue'
+import ZdyfLeftChackPdf from './dialog-module/zdyf-left/chackPdf.vue'
 import ZdyfRightGarden from './dialog-module/zdyf-right/kyll/garden.vue'
 import ZdyfRightZx from './dialog-module/zdyf-right/zyzx.vue'
 import ZdyfRightTalents from './dialog-module/zdyf-right/kyll/talents.vue'
@@ -141,6 +143,7 @@ export default {
     ZdyfRightZx,
     KeyPersonnel,
     SzyfRightTalents,
+    ZdyfLeftChackPdf,
     yzfcModal
   },
   data () {

src/views/next/screen-content-left/szyf-left/index.vue

@@ -678,11 +678,12 @@ export default {
               params.seriesName !== 'mouseoutSeries' &&
               params.seriesName !== 'pie2d'
             ) {
-              const bfb = (
+              let bfb = (
                 (option.series[params.seriesIndex].pieData.endRatio -
                   option.series[params.seriesIndex].pieData.startRatio) *
                 100
-              ).toFixed(2)
+              )
+              bfb = bfb && bfb.toFixed(2)
               return (
                 `${params.seriesName}<br/>` +
                 `<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:${params.color};"></span>` +

src/views/next/screen-content-left/zdyf-left/index.vue

@@ -41,7 +41,7 @@
             <img src="@/assets/images/index/yfys1-icon.png" alt="" />
           </div>
           <div class="right">
-            <div class="top">战略优势</div>
+            <div class="top">战略机遇赋能</div>
             <div class="center yellow"><span class="num">3</span> 年</div>
             <div class="bot">中央1号文件</div>
           </div>
@@ -51,12 +51,12 @@
             <ul class="bg-bubbles">
               <li v-for="i in 10" :key="i"></li>
             </ul>
-            <img src="@/assets/images/index/yfys2-icon.png" alt="" />
+            <img src="@/assets/images/index/yfys3-icon.png" alt="" />
           </div>
           <div class="right">
-            <div class="top">自然优势</div>
+            <div class="top">区位交通便利</div>
-            <div class="center green">北纬 <span class="num">36°</span></div>
+            <div class="center violet"><span class="num">1</span> 小时</div>
-            <div class="bot">黄金育种地带</div>
+            <div class="bot">交通辐射圈</div>
           </div>
         </div>
         <div class="item">
@@ -64,12 +64,12 @@
             <ul class="bg-bubbles">
               <li v-for="i in 10" :key="i"></li>
             </ul>
-            <img src="@/assets/images/index/yfys3-icon.png" alt="" />
+            <img src="@/assets/images/index/yfys2-icon.png" alt="" />
           </div>
           <div class="right">
-            <div class="top">区位优势</div>
+            <div class="top">自然禀赋优越</div>
-            <div class="center violet"><span class="num">1</span> 小时</div>
+            <div class="center green">北纬 <span class="num">36°</span></div>
-            <div class="bot">交通辐射圈</div>
+            <div class="bot">黄金育种地带</div>
           </div>
         </div>
         <div class="item">
@@ -80,11 +80,24 @@
             <img src="@/assets/images/index/yfys4-icon.png" alt="" />
           </div>
           <div class="right">
-            <div class="top">产业优势</div>
+            <div class="top">产业链融合</div>
             <div class="center blue"><span class="num">5.2</span> 亿元</div>
             <div class="bot">种子年销售额</div>
           </div>
         </div>
+        <div class="item" @click="openPdf()">
+          <div class="item-image">
+            <ul class="bg-bubbles">
+              <li v-for="i in 10" :key="i"></li>
+            </ul>
+            <img src="@/assets/images/index/yfys5-icon.png" alt="" />
+          </div>
+          <div class="right">
+            <div class="top">规划布局科学</div>
+            <div class="center orange"><span class="num">种业</span> 主导</div>
+            <div class="bot">产业链融合</div>
+          </div>
+        </div>
       </div>
     </div>
     <div class="card h318 m-top12">
@@ -118,7 +131,11 @@
                     <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 && item.jzrPrice != '暂无'"
@@ -278,12 +295,16 @@ export default {
     ...mapActions({
       showGlobalDialog: 'showGlobalDialog',
       set_yfcj: 'SET_YFCJ',
+      set_viewPdf: 'SET_VIEWPDF',
       set_yfclz: 'SET_YFCLZ',
       set_ldhg: 'SET_LDGH'
     }),
     openClz () {
       this.set_yfclz(true)
     },
+    openPdf () {
+      this.set_viewPdf(true)
+    },
     deduplicationJs (arr) {
       const data = []
       arr.forEach((item, index) => {
@@ -304,8 +325,12 @@ export default {
             .subtract(1, 'days')
             .format('yyyy-MM-DD')
           this.getDayScData({
-            FEndDate: this.$moment(this.times).subtract(1, 'days').format('yyyy-MM-DD'),
+            FEndDate: this.$moment(this.times)
-            FStartDate: this.$moment(this.times).subtract(1, 'days').format('yyyy-MM-DD')
+              .subtract(1, 'days')
+              .format('yyyy-MM-DD'),
+            FStartDate: this.$moment(this.times)
+              .subtract(1, 'days')
+              .format('yyyy-MM-DD')
           })
         }
       })
@@ -500,19 +525,20 @@ export default {
       font-weight: 600;
     }
     .content {
-      display: flex;
       padding-top: 24px;
+      width: 100%;
+      overflow: auto;
       .content-image {
-        width: 126px;
+        float: left;
-        height: 170px;
+        width: 218px;
+        height: 120px;
         img {
-          width: 126px;
+          width: 206px;
-          height: 170px;
+          height: 120px;
         }
       }
       .content-txt {
-        padding-left: 16px;
+      width: 100%;
-        width: 286px;
         height: 170px;
         line-height: 24px;
         font-weight: 400;
@@ -540,10 +566,11 @@ export default {
     flex: 1;
     box-sizing: border-box;
     display: flex;
+    justify-content: center;
     flex-wrap: wrap;
 
     .item {
-      width: 50%;
+      width: 33%;
       color: #fff;
       display: flex;
       align-items: center;
@@ -552,15 +579,15 @@ export default {
         flex: 1;
 
         .top {
+          font-size: 14px;
           background-size: 100% 100%;
           background: url("~@/assets/images/index/yfyskuang.png") no-repeat;
-          background-position-y: 20px;
         }
 
         .center {
           .num {
             font-family: pangmenzhengdao;
-            font-size: 28px;
+            font-size: 22px;
           }
         }
 
@@ -571,16 +598,15 @@ export default {
       }
       &-image {
         position: relative;
-        top: -20px;
+        width: 48px;
-        width: 80px;
+        height: 48px;
-        height: 120px;
         img {
           position: relative;
-          top: -150px;
+          top: -190px;
-          width: 48px;
+          width: 28px;
-          height: 48px;
+          height: 28px;
           margin-right: 10px;
-          margin-left: 16px;
+          margin-left: 10px;
           z-index: 99999;
           animation: moveUpDown 3s infinite linear;
         }
@@ -589,7 +615,9 @@ export default {
     .item:nth-child(1) {
       .item-image {
         background: url("~@/assets/images/index/yfys1.png") no-repeat;
-        background-position-y: 40px;
+        background-position-y: 0px;
+        background-size:100% 100%;
+        background-attachment:fixed;
 
         .bg-bubbles li {
           background-color: rgba(247, 220, 111, 0.467);
@@ -598,34 +626,52 @@ export default {
     }
     .item:nth-child(2) {
       .item-image {
-        background: url("~@/assets/images/index/yfys2.png") no-repeat;
+        background: url("~@/assets/images/index/yfys3.png") no-repeat;
-        background-position-y: 40px;
+        background-position-y: 0px;
+        background-size:100% 100%;
+        background-attachment:fixed;
 
         .bg-bubbles li {
-          background-color: rgba(98, 205, 179, 5);
+          background-color: rgba(173, 117, 222, 0.5);
         }
       }
     }
     .item:nth-child(3) {
       .item-image {
-        background: url("~@/assets/images/index/yfys3.png") no-repeat;
+        background: url("~@/assets/images/index/yfys2.png") no-repeat;
-        background-position-y: 40px;
+        background-position-y: 0px;
+        background-size:100% 100%;
+        background-attachment:fixed;
 
         .bg-bubbles li {
-          background-color: rgba(173, 117, 222, 0.5);
+          background-color: rgba(98, 205, 179, 5);
         }
       }
     }
     .item:nth-child(4) {
       .item-image {
         background: url("~@/assets/images/index/yfys4.png") no-repeat;
-        background-position-y: 40px;
+        background-position-y: 0px;
+        background-size:100% 100%;
+        background-attachment:fixed;
 
         .bg-bubbles li {
           background-color: rgba(70, 126, 226, 0.45);
         }
       }
     }
+    .item:nth-child(5) {
+      .item-image {
+        background: url("~@/assets/images/index/yfys5.png") no-repeat;
+        background-position-y: 0px;
+        background-size:100% 100%;
+        background-attachment:fixed;
+
+        .bg-bubbles li {
+          background-color: rgba(255, 130, 61, 0.45);
+        }
+      }
+    }
   }
 }
 
@@ -645,6 +691,10 @@ export default {
   color: #d4e7ff;
 }
 
+.orange {
+  color: rgba(255, 130, 61, 1);
+}
+
 @keyframes rotate {
   from {
     transform: rotate(0deg);
@@ -669,9 +719,9 @@ export default {
 .bg-bubbles {
   // position: absolute;
   position: relative;
-  top: 0;
+  top: -40px;
-  left: 0;
+  left: -6px;
-  width: 30px;
+  width: 16px;
   height: 160px;
   // background: linear-gradient(to bottom right, #50A3A2, #53E3A6);
   overflow: hidden;
@@ -682,6 +732,7 @@ export default {
   bottom: 26px;
   width: 4px;
   height: 4px;
+  opacity: 0;
   list-style: none;
   animation: square 10s infinite;
   transition-timing-function: linear;
@@ -765,7 +816,7 @@ export default {
 
 @keyframes square {
   0% {
-    opacity: 0.3;
+    opacity: 0;
     transform: translateY(-70px);
   }
 

src/views/next/screen-content-map/cpt/point.json

@@ -89,7 +89,7 @@
                     "name": "青岛德龙种子有限公司",
                     "type": "marker",
                     "category": "unit",
-                    "id": "1739933907285520386"
+                    "id": "1777615047488180226"
                 },
                 "geometry": {
                     "type": "Point",

src/views/next/screen-content-map/cpt/zdyf-map.vue

@@ -159,6 +159,7 @@ export default {
     }),
     ...mapActions({}),
     openCompanyDetail (item) {
+      console.log('item::', item)
       this.set_qyjj(true)
       this.set_gsxq_id(item.id)
     },
@@ -360,6 +361,7 @@ export default {
         scene.addLayer(dotLayer3)
       }
       dotLayer.on('click', (e) => {
+        console.log('e::', e)
         if (gaoliang.some((item) => item === e.feature.properties.name)) {
           this.openCompanyDetail(e.feature.properties)
         }