diff --git a/src/api/szyf.js b/src/api/szyf.js new file mode 100644 index 0000000..e2862d9 --- /dev/null +++ b/src/api/szyf.js @@ -0,0 +1,10 @@ +import request from 'utils/request' + +// 科技人才列表 +export function getEventRate (params) { + return request({ + url: '/api/gov/project/icEvent/yifengScreen/getEventRate', + method: 'GET', + params + }) +} diff --git a/src/assets/images/common/dialog-header-yfclz.png b/src/assets/images/common/dialog-header-yfclz.png new file mode 100644 index 0000000..c32e7be Binary files /dev/null and b/src/assets/images/common/dialog-header-yfclz.png differ diff --git a/src/assets/images/home/hsyf-active.png b/src/assets/images/home/hsyf-active.png index c24b89a..ded9971 100644 Binary files a/src/assets/images/home/hsyf-active.png and b/src/assets/images/home/hsyf-active.png differ diff --git a/src/assets/images/home/hsyf-red.png b/src/assets/images/home/hsyf-red.png index b2b0b64..ded9971 100644 Binary files a/src/assets/images/home/hsyf-red.png and b/src/assets/images/home/hsyf-red.png differ diff --git a/src/assets/images/home/hsyf.png b/src/assets/images/home/hsyf.png index 2b803d8..2c01b43 100644 Binary files a/src/assets/images/home/hsyf.png and b/src/assets/images/home/hsyf.png differ diff --git a/src/assets/images/home/sy-active.png b/src/assets/images/home/sy-active.png index b21b8d9..ac78980 100644 Binary files a/src/assets/images/home/sy-active.png and b/src/assets/images/home/sy-active.png differ diff --git a/src/assets/images/home/sy-red.png b/src/assets/images/home/sy-red.png index 7e64cdf..ac78980 100644 Binary files a/src/assets/images/home/sy-red.png and b/src/assets/images/home/sy-red.png differ diff --git a/src/assets/images/home/sy.png b/src/assets/images/home/sy.png index cb43f8e..5e950ff 100644 Binary files a/src/assets/images/home/sy.png and b/src/assets/images/home/sy.png differ diff --git a/src/assets/images/home/szyf-active.png b/src/assets/images/home/szyf-active.png index 729f305..eebbb08 100644 Binary files a/src/assets/images/home/szyf-active.png and b/src/assets/images/home/szyf-active.png differ diff --git a/src/assets/images/home/szyf-red.png b/src/assets/images/home/szyf-red.png index 3f9095c..eebbb08 100644 Binary files a/src/assets/images/home/szyf-red.png and b/src/assets/images/home/szyf-red.png differ diff --git a/src/assets/images/home/szyf.png b/src/assets/images/home/szyf.png index 41c1eae..99bed68 100644 Binary files a/src/assets/images/home/szyf.png and b/src/assets/images/home/szyf.png differ diff --git a/src/assets/images/home/whyf-red.png b/src/assets/images/home/whyf-red.png index 1ea11a0..7535fac 100644 Binary files a/src/assets/images/home/whyf-red.png and b/src/assets/images/home/whyf-red.png differ diff --git a/src/assets/images/home/whyf.png b/src/assets/images/home/whyf.png index 2dc7a3d..df61a52 100644 Binary files a/src/assets/images/home/whyf.png and b/src/assets/images/home/whyf.png differ diff --git a/src/assets/images/home/zdyf-active.png b/src/assets/images/home/zdyf-active.png index 006d546..e2c5fbd 100644 Binary files a/src/assets/images/home/zdyf-active.png and b/src/assets/images/home/zdyf-active.png differ diff --git a/src/assets/images/home/zdyf-red.png b/src/assets/images/home/zdyf-red.png index 8dbd22e..e2c5fbd 100644 Binary files a/src/assets/images/home/zdyf-red.png and b/src/assets/images/home/zdyf-red.png differ diff --git a/src/assets/images/home/zdyf.png b/src/assets/images/home/zdyf.png index 462d31b..743b273 100644 Binary files a/src/assets/images/home/zdyf.png and b/src/assets/images/home/zdyf.png differ diff --git a/src/store/modules/dialog.js b/src/store/modules/dialog.js index 6d6b859..a1231ab 100644 --- a/src/store/modules/dialog.js +++ b/src/store/modules/dialog.js @@ -22,6 +22,10 @@ export default { ywqsShow: false, hsyfJzfw: false, ylqdShow: false, + sjfx: false, + sjcl: false, + zdry: false, + yfclz: false, actId: null, researchId: null, dyfcId: null @@ -94,6 +98,19 @@ export default { set_ywqs_show (state, visible) { state.ywqsShow = visible }, + set_sjfx (state, visible) { + state.sjfx = visible + }, + set_sjcl (state, visible) { + state.sjcl = visible + }, + set_zdry (state, visible) { + state.zdry = visible + }, + set_yfclz (state, visible) { + console.log('zoule?????') + state.yfclz = visible + }, set_dj_id (state, value) { state.actId = value }, @@ -168,6 +185,18 @@ export default { SET_LDGH (context, visible) { context.commit('set_ldgh', visible) }, + SET_SJFX (context, visible) { + context.commit('set_sjfx', visible) + }, + SET_SJCL (context, visible) { + context.commit('set_sjcl', visible) + }, + SET_ZDRY (context, visible) { + context.commit('set_zdry', visible) + }, + SET_YFCLZ (context, visible) { + context.commit('set_yfclz', visible) + }, SET_DJ_ID (context, val) { context.commit('set_dj_id', val) }, @@ -182,7 +211,6 @@ export default { }, // 确保当前只能显示最近点击的弹窗 showGlobalDialog (context, type) { - console.log('type::', type) context.commit('set_yfcj', false) context.commit('set_garden', false) context.commit('set_talents', false) @@ -204,6 +232,10 @@ export default { context.commit('set_gsxq', false) context.commit('set_qyjj', false) context.commit('set_ldgh', false) + context.commit('set_sjfx', false) + context.commit('set_sjcl', false) + context.commit('set_zdry', false) + context.commit('set_yfclz', false) if (type === 'zdyfGgqyClose') { context.commit('set_zdyf_ggqy', false) } @@ -249,6 +281,14 @@ export default { context.commit('set_qyjj', true) } else if (type === 'gsxq') { context.commit('set_gsxq', true) + } else if (type === 'sjfx') { + context.commit('set_sjfx', true) + } else if (type === 'sjcl') { + context.commit('set_sjcl', true) + } else if (type === 'zdry') { + context.commit('set_zdry', true) + } else if (type === 'yfclz') { + context.commit('set_yfclz', true) } else if (type === 'ldgh') { context.commit('set_ldgh', true) } @@ -278,6 +318,10 @@ export default { researchShow: state => state.researchShow, zdyfGgqy: state => state.zdyfGgqy, researchId: state => state.researchId, + sjfx: state => state.sjfx, + sjcl: state => state.sjcl, + zdry: state => state.zdry, + yfclz: state => state.yfclz, gsxq: state => state.gsxq } } diff --git a/src/views/next/dialog-module/hsyf-left/company/attractions.vue b/src/views/next/dialog-module/hsyf-left/company/attractions.vue index e756d08..4614be0 100644 --- a/src/views/next/dialog-module/hsyf-left/company/attractions.vue +++ b/src/views/next/dialog-module/hsyf-left/company/attractions.vue @@ -249,7 +249,7 @@ export default { this.currentId = res.data.list.id this.dataList = res.data.list if (this.dataList.length > 0) { - this.onDatils(this.dataList[0]); + this.onDatils(this.dataList[0]) } }) }, @@ -263,7 +263,6 @@ export default { onDatils (item) { this.currentId = item.id partyPlace(item.id).then(res => { - // console.log('res::', res); this.info = res.data }) } diff --git a/src/views/next/dialog-module/szyf-left/eventAnalysis.vue b/src/views/next/dialog-module/szyf-left/eventAnalysis.vue new file mode 100644 index 0000000..2b0674e --- /dev/null +++ b/src/views/next/dialog-module/szyf-left/eventAnalysis.vue @@ -0,0 +1,334 @@ + + + + + + + + + {{ dialogTitle }} + + + + + + + + {{ item.time }} + + + {{ item.unit }} + + + + + + + + + {{ item.name }} + + {{ item.content }} + + + + + + + + + + + + + diff --git a/src/views/next/dialog-module/szyf-left/eventProcessing.vue b/src/views/next/dialog-module/szyf-left/eventProcessing.vue new file mode 100644 index 0000000..014788f --- /dev/null +++ b/src/views/next/dialog-module/szyf-left/eventProcessing.vue @@ -0,0 +1,334 @@ + + + + + + + + + {{ dialogTitle }} + + + + + + + + {{ item.time }} + + + {{ item.unit }} + + + + + + + + + {{ item.name }} + + {{ item.content }} + + + + + + + + + + + + + diff --git a/src/views/next/dialog-module/szyf-left/keyPersonnel.vue b/src/views/next/dialog-module/szyf-left/keyPersonnel.vue new file mode 100644 index 0000000..f822660 --- /dev/null +++ b/src/views/next/dialog-module/szyf-left/keyPersonnel.vue @@ -0,0 +1,329 @@ + + + + + + + + + {{ dialogTitle }} + + + + + + + + {{ item.time }} + + + {{ item.unit }} + + + + + + + + + {{ item.name }} + + {{ item.content }} + + + + + + + + + + + + diff --git a/src/views/next/dialog-module/zdyf-left/yfclz.vue b/src/views/next/dialog-module/zdyf-left/yfclz.vue new file mode 100644 index 0000000..0b9ef1f --- /dev/null +++ b/src/views/next/dialog-module/zdyf-left/yfclz.vue @@ -0,0 +1,329 @@ + + + + + + + + + {{ dialogTitle }} + + + + + + + + + + + {{ item.name }} + + + + + + + {{ item.company }} + + + 种植时间:{{ item.zzDate }} + + + 上市时间:{{ item.ssDate }} + + + 产量:{{ item.num }} + + + + + + + + + + + + + + + + diff --git a/src/views/next/index.vue b/src/views/next/index.vue index cf609bc..665465f 100644 --- a/src/views/next/index.vue +++ b/src/views/next/index.vue @@ -47,6 +47,7 @@ + @@ -58,6 +59,9 @@ + + + @@ -70,6 +74,7 @@ import ScreenContent from './layout/screen-content' 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 ZdyfRightGarden from './dialog-module/zdyf-right/kyll/garden.vue' import ZdyfRightResearch from './dialog-module/zdyf-right/kyll/research.vue' import ZdyfRightTalents from './dialog-module/zdyf-right/kyll/talents.vue' @@ -91,6 +96,9 @@ import ywqsModal from './dialog-module/hsyf-right/ywqsModal.vue' import ylqdModal from './dialog-module/hsyf-right/ylqdModal.vue' import ZdyfCenterQyjj from './dialog-module/zdyf-center/qyjj' import ZdyfLeftldgh from './dialog-module/zdyf-left/ldgh' +import EventAnalysis from './dialog-module/szyf-left/eventAnalysis.vue' +import EventProcessing from './dialog-module/szyf-left/eventProcessing.vue' +import KeyPersonnel from './dialog-module/szyf-left/keyPersonnel.vue' let width = 0 let height = 0 @@ -120,10 +128,14 @@ export default { dyfcModal, djhdModal, ywqsModal, + ZdyfLeftYflz, ZdyfRightResearch, ZdyfKeyEnterprises, ZdyfKeyEnterprisesDetail, - ylqdModal + ylqdModal, + EventAnalysis, + EventProcessing, + KeyPersonnel }, data () { return { diff --git a/src/views/next/layout/screen-bottom.vue b/src/views/next/layout/screen-bottom.vue index e2e5b31..2d2ca9d 100644 --- a/src/views/next/layout/screen-bottom.vue +++ b/src/views/next/layout/screen-bottom.vue @@ -50,98 +50,98 @@
{{ item.content }}