diff --git a/src/components/editor.js b/src/components/editor.js index 8021948..1ae1b7a 100644 --- a/src/components/editor.js +++ b/src/components/editor.js @@ -183,7 +183,7 @@ export default { './styles/css/editor.css', ], // content_style: Style, - fontsize_formats: '12px 14px 16px 19px 24px 36px 48px 56px 72px', + fontsize_formats: '12px 14px 16px 18px 19px 22px 24px 36px 48px 56px 72px', font_formats: '苹果苹方=PingFang SC,Microsoft YaHei,sans-serif;宋体=simsun,serif;微软雅黑=Microsoft YaHei,Helvetica Neue,PingFang SC,sans-serif;仿宋体=FangSong,serif;黑体=SimHei,sans-serif;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats;知乎配置=BlinkMacSystemFont, Helvetica Neue, PingFang SC, Microsoft YaHei, Source Han Sans SC, Noto Sans CJK SC, WenQuanYi Micro Hei, sans-serif;小米配置=Helvetica Neue,Helvetica,Arial,Microsoft Yahei,Hiragino Sans GB,Heiti SC,WenQuanYi Micro Hei,sans-serif', link_list: [ { title: '预置链接1', value: 'http://www.tinymce.com' }, diff --git a/src/const/modules.js b/src/const/modules.js index e1850a0..c477a93 100644 --- a/src/const/modules.js +++ b/src/const/modules.js @@ -9166,8 +9166,8 @@ export default { }, ], iasf: [ - { - type: 'form', + { + type: 'introduce', forms: [ { type: 'upload', @@ -9181,22 +9181,20 @@ export default { label: '标题', required: true }, - { - type: 'input', - prop: 'des', - label: '描述', - required: true - }, { type: 'link', prop: 'link', label: '链接' }, + { + type: 'textarea', + prop: 'des', + label: '描述' + } ], form: { - pic: 'http://10.10.11.7/images/home/1.png', - title: '粤港澳深化合作典范', - des: 'IASF的建设邀请大湾区所有创新要素共同参与,以科技合作点亮东方之珠璀璨明天。', + pic: '', + title: '', link: { linkName: '无', connectionType: 1, @@ -9207,7 +9205,99 @@ export default { otherColumnId: [], otherArticleId: '', isOpen: 1 + }, + des: '' + }, + list: [ + { + pic: 'http://10.10.11.7/images/iasf/banner1.png', + title: '粤港澳科技与产业合作典范', + des: '——为大湾区打造具有全球影响力的产业科技创新中心贡献关键支撑', + link: { + linkName: '无', + connectionType: 1, + columnId: [], + articleId: '', + linkAddress : '', + site: '', + otherColumnId: [], + otherArticleId: '', + isOpen: 1 + }, + isEnable: 1 + }, + { + pic: 'http://10.10.11.7/images/iasf/banner2.png', + title: '聚焦高质量发展首要任务', + des: '——抓住新一轮科技革命和产业变革机遇,以大科学装置释放的创新动能驱动引领高质量发展', + link: { + linkName: '无', + connectionType: 1, + columnId: [], + articleId: '', + linkAddress : '', + site: '', + otherColumnId: [], + otherArticleId: '', + isOpen: 1 + }, + isEnable: 1 + }, + { + pic: 'http://10.10.11.7/images/iasf/banner3.png', + title: '开放合作共同应对时代挑战', + des: '——坚持开放合作的设施建设理念,携手推动科学技术更好造福人类。', + link: { + linkName: '无', + connectionType: 1, + columnId: [], + articleId: '', + linkAddress : '', + site: '', + otherColumnId: [], + otherArticleId: '', + isOpen: 1 + }, + isEnable: 1 + }, + { + pic: 'http://10.10.11.7/images/iasf/banner4.png', + title: '敢闯敢试、敢为人先、埋头苦干', + des: '——秉承“特区精神”勇攀高峰、勇立潮头,无愧深圳“先行示范”的历史使命', + 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: 'input', + prop: 'des', + label: '描述' } + ], + form: { + title: '综合粒子设施', + des: '将微观粒子作为认知微观世界的利器', } }, { @@ -9238,7 +9328,7 @@ export default { ], form: { pic: 'http://10.10.11.7/images/home/2.png', - title: 'Shenzhen Innovation Lightsource Facility', + title: '深圳产业光源', link: { linkName: '无', connectionType: 1, @@ -9250,7 +9340,7 @@ export default { otherArticleId: '', isOpen: 1 }, - des: 'The Shenzhen synchrotron radiation facility has a fourth-generation diffraction-limited storage ring with an electron energy of 3 GeV at a low emittance of 50-150 pm·rad, and it provides photons with broad range energy from 4 meV to 160 keV.' + des: '首台聚焦高新技术产业发展需要的第四代中能同步辐射光源' } }, { @@ -9281,7 +9371,7 @@ export default { ], form: { pic: 'http://10.10.11.7/images/home/3.png', - title: 'Shenzhen Soft X-ray Superconducting Free-electron Laser Facility ', + title: '深圳自由电子激光', link: { linkName: '无', connectionType: 1, @@ -9293,7 +9383,7 @@ export default { otherArticleId: '', isOpen: 1 }, - des: 'Shenzhen XFEL consists of a 2.5 GeV CW superconducting linear accelerator and four initial undulator lines, aiming at generating X-Rays between 40 eV and 1 keV at rates up to 1MHz.' + des: '世界最亮的软X射线光源装置' } }, { @@ -9305,9 +9395,15 @@ export default { label: '标题', required: true }, + { + type: 'input', + prop: 'des', + label: '描述' + } ], form: { title: '新闻动态', + des: '支撑大湾区综合性国家科学中心建设的公益性科研事业单位', } }, { @@ -9421,11 +9517,11 @@ export default { { type: 'input', prop: 'subTitle', - label: '标题', - required: true + label: '小标题', + required: false }, { - type: 'input', + type: 'editor', prop: 'des', label: '描述', required: true @@ -9439,8 +9535,9 @@ export default { form: { pic: 'http://10.10.11.7/images/estate/9.png', title: '大湾区科技之光由你点亮!', - subTitle: 'The light of science and technology in the Greater Bay Area is lit by you!', - des: '以宏伟事业吸引人才、以发展空间留住人才,以优厚待遇保障人才。', + subTitle: '', + des: `
大科学装置建设在即,部分专业岗位面向优秀人才长期开放。在IASF,我们不仅提供一片
+大展才能的宏伟热土,更能提供广阔的事业发展空间和具有国际竞争力的和待遇保障。
`, link: { linkName: '无', connectionType: 1, diff --git a/src/mixins/page/index.js b/src/mixins/page/index.js index 3010332..3d4c7da 100644 --- a/src/mixins/page/index.js +++ b/src/mixins/page/index.js @@ -73,7 +73,8 @@ export default { const list = JSON.parse(str) list.map((e, i) => { - if (this.modules[i].forms) e.forms = this.modules[i].forms + if (this.modules[i].forms) e.forms = this.modules[i].forms // forms即数据结构,直接用本地配置文件里的,方便随时更改结构 + if (this.modules[i].forms && this.modules[i].forms.length !== e.forms.length) e = this.modules[i] if (this.withOriginForm.includes(e.type) && !e.originForm) { e.originForm = modules[i].originForm } diff --git a/src/pages/column/page/iasf.vue b/src/pages/column/page/iasf.vue index 1ebe700..48336f2 100644 --- a/src/pages/column/page/iasf.vue +++ b/src/pages/column/page/iasf.vue @@ -15,48 +15,57 @@{{ modules[1].form.des }}
+{{ modules[1].form.des }}
- +{{ modules[2].form.des }}
{{ modules[2].form.des }}
- +{{ modules[3].form.des }}
{{ modules[4].form.des }}
2022-07-24
{{ modules[8].form.des }}
+ data-wow-delay="0.5s">{{ modules[9].form.des }}{{ modules[10].form.des }}
+ data-wow-delay="0.5s">{{ modules[11].form.des }}{{ modules[13].form.title }}
-{{ modules[14].form.title }}
{{ modules[15].form.title }}
{{ modules[16].form.title }}
{{ modules[17].form.title }}
{{ modules[18].form.title }}
+