diff --git a/src/assets/images/page/deviceIntroBeam.png b/src/assets/images/page/deviceIntroBeam.png new file mode 100644 index 0000000..b52e60d Binary files /dev/null and b/src/assets/images/page/deviceIntroBeam.png differ diff --git a/src/assets/images/page/deviceIntroLayout.png b/src/assets/images/page/deviceIntroLayout.png new file mode 100644 index 0000000..be5b287 Binary files /dev/null and b/src/assets/images/page/deviceIntroLayout.png differ diff --git a/src/assets/images/page/deviceIntroLinear.png b/src/assets/images/page/deviceIntroLinear.png new file mode 100644 index 0000000..30fff50 Binary files /dev/null and b/src/assets/images/page/deviceIntroLinear.png differ diff --git a/src/assets/images/page/overviewLocation.png b/src/assets/images/page/overviewLocation.png new file mode 100644 index 0000000..bbc0a89 Binary files /dev/null and b/src/assets/images/page/overviewLocation.png differ diff --git a/src/assets/images/page/survey.png b/src/assets/images/page/overviewTrailer.png similarity index 100% rename from src/assets/images/page/survey.png rename to src/assets/images/page/overviewTrailer.png diff --git a/src/components/modules/link.vue b/src/components/modules/link.vue index 96849b4..ab5541c 100644 --- a/src/components/modules/link.vue +++ b/src/components/modules/link.vue @@ -153,11 +153,12 @@ export default { // 站内链接/其他站点链接 const id = this.data.connectionType === 1 ? this.data.columnId[this.data.columnId.length - 1] : this.data.otherColumnId[this.data.otherColumnId.length - 1] id && this.$post(this.api.queryArticle, { - siteId: this.site.id, + siteId: this.data.connectionType === 1 ? this.site.id : this.data.site, columnIds: [id], pageNum: 1, pageSize: 1000, - title: '' + title: '', + isDisable: 0 }).then(({ data }) => { this.articles = data.records.filter(e => e.isRelease) // 只显示已发布的文章 }).catch(err => {}) diff --git a/src/const/modules.js b/src/const/modules.js index 7ba8f2f..612d811 100644 --- a/src/const/modules.js +++ b/src/const/modules.js @@ -3491,14 +3491,13 @@ export default { ], science: [ { - type: 'introduce', + type: 'form', forms: [ { type: 'upload', prop: 'pic', label: '图片', - required: true, - crop: false + required: true }, { type: 'input', @@ -3510,11 +3509,16 @@ export default { type: 'link', prop: 'link', label: '链接' + }, + { + type: 'textarea', + prop: 'des', + label: '描述' } ], form: { - pic: '', - title: '', + pic: 'http://10.10.11.7/images/science/1.png', + title: '科普之窗', link: { linkName: '无', connectionType: 1, @@ -3526,26 +3530,8 @@ export default { otherArticleId: '', isOpen: 1 }, - isEnable: 1 - }, - list: [ - { - pic: 'http://10.10.11.7/images/edu/1.png', - title: '科普之窗', - link: { - linkName: '无', - connectionType: 1, - columnId: [], - articleId: '', - linkAddress : '', - site: '', - otherColumnId: [], - otherArticleId: '', - isOpen: 1 - }, - isEnable: 1 - } - ] + des: '向全世界科技界实行开放共享，促进信息、材料、能源、生物、环境、化学等多个基础科学领域的极速发展。' + } }, { type: 'form', @@ -3658,14 +3644,13 @@ export default { ], talent: [ { - type: 'introduce', + type: 'form', forms: [ { type: 'upload', prop: 'pic', label: '图片', - required: true, - crop: false + required: true }, { type: 'input', @@ -3677,11 +3662,16 @@ export default { type: 'link', prop: 'link', label: '链接' + }, + { + type: 'textarea', + prop: 'des', + label: '描述' } ], form: { - pic: '', - title: '', + pic: 'http://10.10.11.7/images/talent/1.png', + title: '人才队伍', link: { linkName: '无', connectionType: 1, @@ -3693,26 +3683,8 @@ export default { otherArticleId: '', isOpen: 1 }, - isEnable: 1 - }, - list: [ - { - pic: 'http://10.10.11.7/images/talent/1.png', - title: '人才队伍', - link: { - linkName: '无', - connectionType: 1, - columnId: [], - articleId: '', - linkAddress : '', - site: '', - otherColumnId: [], - otherArticleId: '', - isOpen: 1 - }, - isEnable: 1 - } - ] + des: 'S³FEL正大力引进国内、外高端创新人才和团队，成长为竞争力和影响力卓越的世界一流科学大装置。' + } }, { type: 'form', @@ -3856,7 +3828,7 @@ export default { }, list: [ { - pic: 'http://10.10.11.7/images/telent/2.png', + pic: 'http://10.10.11.7/images/talent/2.png', title: '这是一条描述', link: { linkName: '无', @@ -3872,7 +3844,7 @@ export default { isEnable: 1 }, { - pic: 'http://10.10.11.7/images/telent/3.png', + pic: 'http://10.10.11.7/images/talent/3.png', title: '这是一条描述', link: { linkName: '无', @@ -3888,7 +3860,7 @@ export default { isEnable: 1 }, { - pic: 'http://10.10.11.7/images/telent/2.png', + pic: 'http://10.10.11.7/images/talent/2.png', title: '这是一条描述', link: { linkName: '无', @@ -4006,14 +3978,13 @@ export default { ], userSharing: [ { - type: 'introduce', + type: 'form', forms: [ { type: 'upload', prop: 'pic', label: '图片', - required: true, - crop: false + required: true }, { type: 'input', @@ -4025,11 +3996,16 @@ export default { type: 'link', prop: 'link', label: '链接' + }, + { + type: 'textarea', + prop: 'des', + label: '描述' } ], form: { - pic: '', - title: '', + pic: 'http://10.10.11.7/images/userSharing/1.png', + title: '用户共享', link: { linkName: '无', connectionType: 1, @@ -4041,26 +4017,8 @@ export default { otherArticleId: '', isOpen: 1 }, - isEnable: 1 - }, - list: [ - { - pic: 'http://10.10.11.7/images/talent/1.png', - title: '用户共享', - link: { - linkName: '无', - connectionType: 1, - columnId: [], - articleId: '', - linkAddress : '', - site: '', - otherColumnId: [], - otherArticleId: '', - isOpen: 1 - }, - isEnable: 1 - } - ] + des: '向全世界科技界实行开放共享，促进信息、材料、能源、生物、环境、化学等多个基础科学领域的极速发展。' + } }, { type: 'form', @@ -4259,7 +4217,7 @@ export default { } ], form: { - pic: 'http://10.10.11.7/images/exp/1.png', + pic: 'http://10.10.11.7/images/exp/2.png', des: ` 科学实验站是S³FEL面向国家重大需求、聚焦科学前沿和引领地区产业发展的关键，旨在重点探究量子材料、能源催化、生物医药、大气与星际科学、原子分子科学等领域的关键技术和科学难题。S³FEL的供光具有超高时间分辨（40飞秒）、超高重复频率（最高百万赫兹）和超高亮度（电子束能量达2.5 Gev）的特点。 S³FEL可在原子尺度上研究复杂生物分子和材料的结构及组成，进而绘制病毒或细胞的原子量级三维精细结构，有助于科学家更深入地了解生物分子的结构和功能，为新药研发提供依据。在能源催化领域，S³FEL可研究飞秒内的化学变化，如化学键的形成和断裂、反应体系中电荷和能量的转移、反应过程中催化剂表面结构的动态演变等， 有助于科学家更好地研究复杂催化过程的反应机理和动力学过程，进而提高传统能源的利用效率，加快新能源开发。S³FEL还可用于探索极端电场或磁场强度下的物质变化，如研究星云和恒星的演变，探索生命的起源等。` diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue index 9d1dd05..d1c3f34 100644 --- a/src/layouts/header/index.vue +++ b/src/layouts/header/index.vue @@ -70,7 +70,7 @@ export default { } }, mounted() { - this.getSite() + this.btns.includes('/site/list') && this.getSite() this.setContent() }, methods: { diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue index b66ee25..a7e9b06 100644 --- a/src/layouts/navbar/index.vue +++ b/src/layouts/navbar/index.vue @@ -151,10 +151,6 @@ export default { index: 'content', title: '内容管理', subs: [ - // { - // index: '/page', - // title: '页面管理' - // }, { index: '/column', title: '栏目管理' @@ -192,6 +188,7 @@ export default { } }, created() { + // 获取当前路由，如果是在站点导航里面的页面，则展开站点导航并选中该路径 const { path } = this.$route this.collapse = !!this.sites[0].subs.find(e => path.includes(e.index)) if (this.collapse) this.siteActive = '/' + path.split('/')[1] @@ -204,6 +201,7 @@ export default { // 菜单选择 menuSelect(index) { this.collapse = false + // 用户管理只需展开导航，其他的则跳转 if (index.includes('/')) { this.$router.push(index) } else { diff --git a/src/mixins/page/index.js b/src/mixins/page/index.js index 6ea546d..c58f90e 100644 --- a/src/mixins/page/index.js +++ b/src/mixins/page/index.js @@ -127,7 +127,7 @@ export default { json: this.handleJson() }).then(res => { load.close() - window.open((Setting.isDev ? `http://${location.hostname}:8095` : 'http://10.10.11.7/front') + `/#/${this.$route.query.path}?id=${this.columnId}&preview=1&siteId=${this.$route.query.siteId}`) + window.open((Setting.isDev ? `http://${location.hostname}:8095` : 'http://10.10.11.7') + `/#/${this.$route.query.path}?id=${this.columnId}&preview=1&siteId=${this.$route.query.siteId}`) }).catch(err => { load.close() }) diff --git a/src/pages/article/add/editor.js b/src/pages/article/add/editor.js index 80e808b..2f3f8c7 100644 --- a/src/pages/article/add/editor.js +++ b/src/pages/article/add/editor.js @@ -314,21 +314,21 @@ export default { powerpaste_word_import: 'clean', powerpaste_html_import: 'clean', // 自定义上传 - images_upload_handler: (blobInfo, progress) => new Promise((resolve, reject) => { - const form = new FormData() - form.append('file', blobInfo.blob()) - Axios({ - method: 'post', - url: Api.upload, - data: form, - headers: { - 'Content-Type': 'multipart/form-data', - token: Util.local.get(Setting.tokenKey) - }, - }).then(({ data }) => { - resolve(data.url) - }).catch(res => {}) - }), + images_upload_handler: function (blobInfo, succFun, failFun) { + const form = new FormData() + form.append('file', blobInfo.blob()), + Axios({ + method: 'post', + url: Api.upload, + data: form, + headers: { + 'Content-Type': 'multipart/form-data', + token: Util.local.get(Setting.tokenKey) + }, + }).then(({ data }) => { + succFun(data.url) + }).catch(res => {}) + }, //自定义文件选择器的回调内容 此方法只有在点击上方图片按钮才会触发 file_picker_callback: function (callback, value, meta) { if (meta.filetype === 'file') { diff --git a/src/pages/article/add/index.vue b/src/pages/article/add/index.vue index cbbce16..5403b3e 100644 --- a/src/pages/article/add/index.vue +++ b/src/pages/article/add/index.vue @@ -44,27 +44,16 @@ ref="column" v-model="form.columnId" :options="columns" - :props="columnProps"> + :props="columnProps" + @change="columnChange"> - - - - - 设置 - - + @@ -91,6 +80,37 @@ +
+ + + +
+ + + + + + +
+
@@ -171,15 +192,29 @@