diff --git a/src/assets/images/index/bannerX.png b/src/assets/images/index/bannerX.png index f08fb57..63db48d 100644 Binary files a/src/assets/images/index/bannerX.png and b/src/assets/images/index/bannerX.png differ diff --git a/src/assets/images/index/yfcjkuang.png b/src/assets/images/index/yfcjkuang.png index 0b618bf..e9f03af 100644 Binary files a/src/assets/images/index/yfcjkuang.png and b/src/assets/images/index/yfcjkuang.png differ diff --git a/src/assets/images/index/yfys5-icon.png b/src/assets/images/index/yfys5-icon.png new file mode 100644 index 0000000..2b15837 Binary files /dev/null and b/src/assets/images/index/yfys5-icon.png differ diff --git a/src/assets/images/index/yfys5.png b/src/assets/images/index/yfys5.png new file mode 100644 index 0000000..a18e3a8 Binary files /dev/null and b/src/assets/images/index/yfys5.png differ diff --git a/src/store/modules/dialog.js b/src/store/modules/dialog.js index 56f4549..57407ea 100644 --- a/src/store/modules/dialog.js +++ b/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, 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 40a83ba..53ac502 100644 --- a/src/views/next/dialog-module/zdyf-center/qyjj/index.vue +++ b/src/views/next/dialog-module/zdyf-center/qyjj/index.vue @@ -58,9 +58,9 @@

{{ unitDetail.summary }}

-

+

{{ unitDetail.introduction }} -

+
@@ -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.videoUrl = - 'https://yifengdian-smps.elinkservice.cn/yifengdian-front/video/ruikesiwang.mp4' - this.videoUrl1 = - 'https://yifengdian-smps.elinkservice.cn/yifengdian-front/video/shinongzhongmiao.mp4' - } + this.visiable = val + console.log(val) 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: arr, - honor: res.data.honor ? JSON.parse(res.data.honor) : [] - } - }) + this.getData() } } }, - 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; diff --git a/src/views/next/dialog-module/zdyf-left/chackPdf.vue b/src/views/next/dialog-module/zdyf-left/chackPdf.vue new file mode 100644 index 0000000..0d865dd --- /dev/null +++ b/src/views/next/dialog-module/zdyf-left/chackPdf.vue @@ -0,0 +1,63 @@ +