diff --git a/src/store/modules/dialog.js b/src/store/modules/dialog.js index f129c89..b5cf05d 100644 --- a/src/store/modules/dialog.js +++ b/src/store/modules/dialog.js @@ -37,7 +37,8 @@ export default { viewPdf: false, dyfcId: null, yzfcId: null, - vrImg:false + vrImg:false, + researchList:false }, mutations: { set_yfcj (state, visible) { @@ -156,8 +157,14 @@ export default { set_hsyf_vr_img(state, value) { state.vrImg = value }, + set_research_list_show(state, value) { + state.researchList = value + }, }, actions: { + SET_RESEARCH_LIST_SHOW(context, visible) { + context.commit('set_research_list_show', visible) + }, SET_YFCJ (context, visible) { context.commit('set_yfcj', visible) }, @@ -225,9 +232,7 @@ 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) @@ -306,6 +311,7 @@ export default { context.commit('set_yfclz', false) context.commit('set_zyzx', false) context.commit('set_zx_id', null) + context.commit('set_research_list_show', false) if (type === 'zdyfGgqyClose') { context.commit('set_zdyf_ggqy', false) } @@ -411,5 +417,6 @@ export default { szyfTalents: state => state.szyfTalents, gsxq: state => state.gsxq, vrImg:state => state.vrImg, + researchList:state=> state.researchList } } diff --git a/src/views/next/dialog-module/zdyf-right/kyll/garden.vue b/src/views/next/dialog-module/zdyf-right/kyll/garden.vue index 570476b..fb47642 100644 --- a/src/views/next/dialog-module/zdyf-right/kyll/garden.vue +++ b/src/views/next/dialog-module/zdyf-right/kyll/garden.vue @@ -117,10 +117,12 @@ export default { created () {}, methods: { ...mapActions({ - showGlobalDialog: 'showGlobalDialog' + showGlobalDialog: 'showGlobalDialog', + set_research_list_show:'SET_RESEARCH_LIST_SHOW' }), closeDialog () { this.showGlobalDialog('') + this.set_research_list_show(true) } } } diff --git a/src/views/next/dialog-module/zdyf-right/kyll/researchList.vue b/src/views/next/dialog-module/zdyf-right/kyll/researchList.vue new file mode 100644 index 0000000..fd516d9 --- /dev/null +++ b/src/views/next/dialog-module/zdyf-right/kyll/researchList.vue @@ -0,0 +1,250 @@ + + + + + diff --git a/src/views/next/index.vue b/src/views/next/index.vue index 3892fe1..7ffbddc 100644 --- a/src/views/next/index.vue +++ b/src/views/next/index.vue @@ -65,6 +65,7 @@ + @@ -105,6 +106,7 @@ 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' +import researchList from './dialog-module/zdyf-right/kyll/researchList.vue' let width = 0 let height = 0 @@ -144,7 +146,8 @@ export default { KeyPersonnel, SzyfRightTalents, ZdyfLeftChackPdf, - yzfcModal + yzfcModal, + researchList }, data () { return { 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 f8761a5..8af6da4 100644 --- a/src/views/next/screen-content-right/zdyf-right/index.vue +++ b/src/views/next/screen-content-right/zdyf-right/index.vue @@ -291,7 +291,7 @@ export default { set_zyzx: 'SET_ZYZX', set_research_show: 'SET_RESEARCH_SHOW', set_zdyf_ggqy: 'SET_ZDYF_GGQY', - set_research_id: 'SET_RESEARCH_ID' + set_research_list_show:'SET_RESEARCH_LIST_SHOW' }), switchZYZX(){ this.zyzxType = this.zyzxType === 1?2:1 @@ -316,8 +316,7 @@ export default { } }, handelClickResearch (item) { - this.set_research_show(true) - this.set_research_id(item.id) + this.set_research_list_show(true) }, handelClickGgqy () { this.set_zdyf_ggqy(true)