diff --git a/src/assets/images/page/researchNew.png b/src/assets/images/page/researchNew.png new file mode 100644 index 0000000..78d0119 Binary files /dev/null and b/src/assets/images/page/researchNew.png differ diff --git a/src/components/modules/content.vue b/src/components/modules/content.vue index 315fca3..211f488 100644 --- a/src/components/modules/content.vue +++ b/src/components/modules/content.vue @@ -207,6 +207,13 @@ export default { token: Util.local.get(Setting.tokenKey) }, }).then(({ data }) => { + if (data.code === 401) { + Util.errorMsg("登录过期,请重新登录"); + setTimeout(() => { + this.$store.dispatch('user/logout') + }, 1000); + return false + } this.$set(this.curForm, 'pic', data.url) }).catch(res => { }) this.$refs.cropper.isDisabled = false diff --git a/src/components/modules/module.vue b/src/components/modules/module.vue index 6e0ab71..98ed084 100644 --- a/src/components/modules/module.vue +++ b/src/components/modules/module.vue @@ -492,6 +492,13 @@ export default { token: Util.local.get(Setting.tokenKey) }, }).then(({ data }) => { + if (data.code === 401) { + Util.errorMsg("登录过期,请重新登录"); + setTimeout(() => { + this.$store.dispatch('user/logout') + }, 1000); + return false + } this.$set(this.curForm, 'pic', data.url) }).catch(res => { }) this.$refs.cropper.isDisabled = false diff --git a/src/const/column.js b/src/const/column.js index 3fcefb8..ae029c7 100644 --- a/src/const/column.js +++ b/src/const/column.js @@ -73,3 +73,4 @@ export default { } ] } + diff --git a/src/const/modules.js b/src/const/modules.js index 5603282..500f174 100644 --- a/src/const/modules.js +++ b/src/const/modules.js @@ -3812,6 +3812,479 @@ export default { ] }, ], + researchNew: [ + { + type: 'introduce', + forms: [ + { + type: 'upload', + prop: 'pic', + label: '图片', + required: true, + crop: false + }, + { + type: 'input', + prop: 'title', + label: '标题', + required: true + }, + { + type: 'link', + prop: 'link', + label: '链接' + } + ], + form: { + pic: '', + title: '', + link: { + linkName: '无', + connectionType: 1, + columnId: [], + articleId: '', + linkAddress : '', + site: '', + otherColumnId: [], + otherArticleId: '', + isOpen: 1 + }, + isEnable: 1 + }, + list: [ + { + pic: 'http://10.10.11.7/images/research/1.png', + title: 'RESEARCH', + link: { + linkName: '无', + connectionType: 1, + columnId: [], + articleId: '', + linkAddress : '', + site: '', + otherColumnId: [], + otherArticleId: '', + isOpen: 1 + }, + isEnable: 1 + } + ] + }, + { + type: 'form', + forms: [ + { + type: 'input', + prop: 'title', + label: '标题', + required: true + }, + { + type: 'textarea', + prop: 'des', + label: '概述' + } + ], + form: { + title: 'Research Areas', + des: 'What we can do and beyound' + } + }, + { + type: 'forms', + forms: [ + { + type: 'upload', + prop: 'pic', + label: '图片', + required: true + }, + { + type: 'input', + prop: 'title', + label: '标题', + required: true + }, + { + type: 'link', + prop: 'link', + label: '链接' + }, + { + type: 'textarea', + prop: 'des', + label: '描述' + } + ], + form: { + pic: '', + title: '', + link: { + linkName: '无', + connectionType: 1, + columnId: [], + articleId: '', + linkAddress : '', + site: '', + otherColumnId: [], + otherArticleId: '', + isOpen: 1 + }, + des: '' + }, + list: [ + { + pic: 'http://10.10.11.7/images/research/res1.png', + title: 'Physics', + link: { + linkName: '无', + connectionType: 1, + columnId: [], + articleId: '', + linkAddress : '', + site: '', + otherColumnId: [], + otherArticleId: '', + isOpen: 1 + }, + des: 'Research Field Description', + }, + { + pic: 'http://10.10.11.7/images/research/res2.png', + title: 'Chemistry', + link: { + linkName: '无', + connectionType: 1, + columnId: [], + articleId: '', + linkAddress : '', + site: '', + otherColumnId: [], + otherArticleId: '', + isOpen: 1 + }, + des: 'Research Field Description', + }, + { + pic: 'http://10.10.11.7/images/research/res3.png', + title: 'Biology', + link: { + linkName: '无', + connectionType: 1, + columnId: [], + articleId: '', + linkAddress : '', + site: '', + otherColumnId: [], + otherArticleId: '', + isOpen: 1 + }, + des: 'Research Field Description', + }, + { + pic: 'http://10.10.11.7/images/research/res4.png', + title: 'Advanced Materials ', + link: { + linkName: '无', + connectionType: 1, + columnId: [], + articleId: '', + linkAddress : '', + site: '', + otherColumnId: [], + otherArticleId: '', + isOpen: 1 + }, + des: 'Research Field Description', + }, + { + pic: 'http://10.10.11.7/images/research/res5.png', + title: 'Advanced Manufacturing', + link: { + linkName: '无', + connectionType: 1, + columnId: [], + articleId: '', + linkAddress : '', + site: '', + otherColumnId: [], + otherArticleId: '', + isOpen: 1 + }, + des: 'Research Field Description', + }, + ] + }, + { + type: 'form', + forms: [ + { + type: 'input', + prop: 'title', + label: '标题', + required: true + }, + { + type: 'textarea', + prop: 'des', + label: '概述' + } + ], + form: { + title: 'R&D Group', + des: 'What makes a ligh chinese bay chaser' + } + }, + { + type: 'forms', + forms: [ + { + type: 'upload', + prop: 'pic', + label: '图片', + required: true + }, + { + type: 'input', + prop: 'title', + label: '标题', + required: true + }, + { + type: 'link', + prop: 'link', + label: '链接' + } + ], + form: { + pic: '', + title: '', + link: { + linkName: '无', + connectionType: 1, + columnId: [], + articleId: '', + linkAddress : '', + site: '', + otherColumnId: [], + otherArticleId: '', + isOpen: 1 + } + }, + list: [ + { + pic: 'http://10.10.11.7/images/research/3.png', + title: 'Accelerator Cryogenic System', + link: { + linkName: '无', + connectionType: 1, + columnId: [], + articleId: '', + linkAddress : '', + site: '', + otherColumnId: [], + otherArticleId: '', + isOpen: 1 + } + }, + { + pic: 'http://10.10.11.7/images/research/4.png', + title: 'Accelerator Laser Science ', + link: { + linkName: '无', + connectionType: 1, + columnId: [], + articleId: '', + linkAddress : '', + site: '', + otherColumnId: [], + otherArticleId: '', + isOpen: 1 + } + }, + { + pic: 'http://10.10.11.7/images/research/5.png', + title: 'Quantum Materials', + link: { + linkName: '无', + connectionType: 1, + columnId: [], + articleId: '', + linkAddress : '', + site: '', + otherColumnId: [], + otherArticleId: '', + isOpen: 1 + } + }, + { + pic: 'http://10.10.11.7/images/research/6.png', + title: 'Surface Science and Catalysis', + link: { + linkName: '无', + connectionType: 1, + columnId: [], + articleId: '', + linkAddress : '', + site: '', + otherColumnId: [], + otherArticleId: '', + isOpen: 1 + } + }, + { + pic: 'http://10.10.11.7/images/research/7.png', + title: 'Atomic and Molecular Science', + link: { + linkName: '无', + connectionType: 1, + columnId: [], + articleId: '', + linkAddress : '', + site: '', + otherColumnId: [], + otherArticleId: '', + isOpen: 1 + } + }, + { + pic: 'http://10.10.11.7/images/research/8.png', + title: 'Atmospheric and Interstellar Science', + link: { + linkName: '无', + connectionType: 1, + columnId: [], + articleId: '', + linkAddress : '', + site: '', + otherColumnId: [], + otherArticleId: '', + isOpen: 1 + } + }, + ] + }, + + { + type: 'form', + forms: [ + { + type: 'input', + prop: 'title', + label: '标题', + required: true + }, + { + type: 'textarea', + prop: 'des', + label: '概述' + } + ], + form: { + title: 'Publications', + des: 'What makes a ligh chinese bay chaser' + } + }, + { + type: 'forms', + forms: [ + { + type: 'upload', + prop: 'pic', + label: '图片', + required: true + }, + { + type: 'input', + prop: 'title', + label: '标题', + required: true + }, + { + type: 'link', + prop: 'link', + label: '链接' + }, + { + type: 'textarea', + prop: 'des', + label: '描述' + } + ], + form: { + pic: '', + title: '', + link: { + linkName: '无', + connectionType: 1, + columnId: [], + articleId: '', + linkAddress : '', + site: '', + otherColumnId: [], + otherArticleId: '', + isOpen: 1 + }, + des: '' + }, + list: [ + { + pic: 'http://10.10.11.7/images/research/12.png', + title: '这里是标题一句话标题', + link: { + linkName: '无', + connectionType: 1, + columnId: [], + articleId: '', + linkAddress : '', + site: '', + otherColumnId: [], + otherArticleId: '', + isOpen: 1 + }, + des: 'Online single-shot characterization of ultrafast pulses from high-gain free-electron lasers, Li Zeng,Chao Feng,Duan Gu,Xiaofan Wang,Kaiqing Zhang,Bo Liu,Zhentang Zhao,Fundamental Research', + }, + { + pic: 'http://10.10.11.7/images/research/13.png', + title: '这里是标题一句话标题', + link: { + linkName: '无', + connectionType: 1, + columnId: [], + articleId: '', + linkAddress : '', + site: '', + otherColumnId: [], + otherArticleId: '', + isOpen: 1 + }, + des: `产生超快水窗波段X射线的ESASE方案模拟 + 涂凌君 ,冯超 ,王晓凡 , 赵振堂 , + 强激光与粒子束, + 2022, 34(3):031019 + `, + }, + { + pic: 'http://10.10.11.7/images/research/14.png', + title: '这里是标题一句话标题', + link: { + linkName: '无', + connectionType: 1, + columnId: [], + articleId: '', + linkAddress : '', + site: '', + otherColumnId: [], + otherArticleId: '', + isOpen: 1 + }, + des: `多层膜元件热应力分析方法、系统和终端设备,申请(专利)号:CN202111530134.0, + 申请日:2021-12-14,申请公布号:CN114239355A,申请人:深圳综合粒子设施研究院,发明人:徐中民 + ` + }, + ] + }, + ], application: [ { type: 'introduce', diff --git a/src/pages/column/add/index.vue b/src/pages/column/add/index.vue index 4096c93..0d6e8a9 100644 --- a/src/pages/column/add/index.vue +++ b/src/pages/column/add/index.vue @@ -656,6 +656,15 @@ export default { token: Util.local.get(Setting.tokenKey) }, }).then(({ data }) => { + + if (data.code === 401) { + Util.errorMsg("登录过期,请重新登录"); + setTimeout(() => { + this.$store.dispatch('user/logout') + }, 1000); + return false + } + let url = this.form.columnBanner url && this.$del(this.api.delFile, [url.split('/').pop()]).then(res => { }).catch(e => { }) // 删除替换掉的图片 this.form.columnBanner = data.url diff --git a/src/pages/column/page/researchNew.vue b/src/pages/column/page/researchNew.vue new file mode 100644 index 0000000..77f5eab --- /dev/null +++ b/src/pages/column/page/researchNew.vue @@ -0,0 +1,246 @@ + + + + + \ No newline at end of file diff --git a/src/router/modules/column.js b/src/router/modules/column.js index 5d4df8b..e59414b 100644 --- a/src/router/modules/column.js +++ b/src/router/modules/column.js @@ -261,5 +261,10 @@ export default { component: () => import('@/pages/column/page/sfelNew'), meta: { title: 'SFEL(1)' } }, + { + path: `researchNew`, + component: () => import('@/pages/column/page/researchNew'), + meta: { title: 'RESEARCH(1)' } + }, ] }