diff --git a/src/components/editor.js b/src/components/editor.js index 9f5ef0f..c35f1cf 100644 --- a/src/components/editor.js +++ b/src/components/editor.js @@ -2,9 +2,9 @@ import Oss from '@/components/upload/upload.js' import { Loading } from 'element-ui' export default { //skin:'oxide-dark', - language:'zh_CN', + language: 'zh_CN', language_url: './styles/tinymce/langs/zh_CN.js', - plugins: 'print powerpaste preview searchreplace autolink directionality visualblocks visualchars fullscreen image link media template advcode codesample table charmap hr pagebreak nonbreaking anchor insertdatetime advlist lists wordcount imagetools textpattern help emoticons autosave autoresize formatpainter', + plugins: 'print powerpaste preview searchreplace autolink directionality visualblocks visualchars fullscreen image link media template advcode codesample table charmap hr pagebreak nonbreaking anchor insertdatetime advlist lists wordcount imagetools textpattern help emoticons autoresize formatpainter', toolbar: 'code undo redo restoredraft | cut copy powerpaste pastetext | forecolor backcolor headings fontsize lineHeight bold italic underline strikethrough link anchor | alignleft aligncenter alignright alignjustify | \ styleselect fontselect fontsizeselect | bullist numlist | blockquote subscript superscript removeformat | \ table image media charmap emoticons hr pagebreak insertdatetime print preview | fullscreen | indent2em formatpainter', @@ -20,40 +20,40 @@ export default { { title: '行高', items: [{ - title: '1', - styles: { - 'line-height': '1' - }, - inline: 'span' + title: '1', + styles: { + 'line-height': '1' }, - { - title: '1.5', - styles: { - 'line-height': '1.5' - }, - inline: 'span' + inline: 'span' + }, + { + title: '1.5', + styles: { + 'line-height': '1.5' }, - { - title: '2', - styles: { - 'line-height': '2' - }, - inline: 'span' + inline: 'span' + }, + { + title: '2', + styles: { + 'line-height': '2' }, - { - title: '2.5', - styles: { - 'line-height': '2.5' - }, - inline: 'span' + inline: 'span' + }, + { + title: '2.5', + styles: { + 'line-height': '2.5' }, - { - title: '3', - styles: { - 'line-height': '3' - }, - inline: 'span' - } + inline: 'span' + }, + { + title: '3', + styles: { + 'line-height': '3' + }, + inline: 'span' + } ] }, //默认的配置 @@ -186,33 +186,34 @@ export default { fontsize_formats: '12px 14px 16px 19px 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' }, - { title: '预置链接2', value: 'http://tinymce.ax-z.cn' } + { title: '预置链接1', value: 'http://www.tinymce.com' }, + { title: '预置链接2', value: 'http://tinymce.ax-z.cn' } ], image_list: [ - { title: '预置图片1', value: 'https://www.tiny.cloud/images/glyph-tinymce@2x.png' }, - { title: '预置图片2', value: 'https://www.baidu.com/img/bd_logo1.png' } + { title: '预置图片1', value: 'https://www.tiny.cloud/images/glyph-tinymce@2x.png' }, + { title: '预置图片2', value: 'https://www.baidu.com/img/bd_logo1.png' } ], image_class_list: [ - { title: 'None', value: '' }, - { title: 'Some class', value: 'class-name' } + { title: 'None', value: '' }, + { title: 'Some class', value: 'class-name' } ], //importcss_append: true, //自定义文件选择器的回调内容 file_picker_callback: function (callback, value, meta) { - if (meta.filetype === 'file') { - callback('https://www.baidu.com/img/bd_logo1.png', { text: 'My text' }); - } - if (meta.filetype === 'image') { - callback('https://www.baidu.com/img/bd_logo1.png', { alt: 'My alt text' }); - } - if (meta.filetype === 'media') { - callback('movie.mp4', { source2: 'alt.ogg', poster: 'https://www.baidu.com/img/bd_logo1.png' }); - } + if (meta.filetype === 'file') { + callback('https://www.baidu.com/img/bd_logo1.png', { text: 'My text' }); + } + if (meta.filetype === 'image') { + callback('https://www.baidu.com/img/bd_logo1.png', { alt: 'My alt text' }); + } + if (meta.filetype === 'media') { + callback('movie.mp4', { source2: 'alt.ogg', poster: 'https://www.baidu.com/img/bd_logo1.png' }); + } }, //为内容模板插件提供预置模板 templates: [ - { title: '个股分析报告', description: '', content: ` + { + title: '个股分析报告', description: '', content: `

个股分析报告

1.引言
@@ -268,10 +269,11 @@ export default {
  • 列出用于报告的参考文献和数据来源
    • - ` - }, - - { title: '行业数据分析报告', description: '', content: ` + ` + }, + + { + title: '行业数据分析报告', description: '', content: `

    行业数据分析报告

    1.引言
    @@ -341,10 +343,11 @@ export default {
  • 列出用于报告的参考文献和数据来源
    • - ` - }, - - { title: '宏观数据分析报告', description: '', content: ` + ` + }, + + { + title: '宏观数据分析报告', description: '', content: `

    宏观数据分析报告

    1.引言
    @@ -400,10 +403,11 @@ export default {
  • 列出用于报告的参考文献和数据来源
    • - ` - }, - - { title: '可视化报告', description: '', content: ` + ` + }, + + { + title: '可视化报告', description: '', content: `

    可视化报告

    1.封面
    @@ -471,10 +475,11 @@ export default {
  • 提供其他补充信息和参考资料
    • - ` - }, - - { title: '数据分析报告', description: '', content: ` + ` + }, + + { + title: '数据分析报告', description: '', content: `

    数据分析报告

    1.引言
    @@ -548,8 +553,8 @@ export default {
  • 提供其他补充信息和参考资料
    • - ` - }, + ` + }, ], // content_security_policy: "https://cdn.tiny.cloud/1/rnk6zw9v267xqz7pf98twt1vmrvltmd436je7a642pckltda/tinymce/6/tinymce.min.js", // extended_valid_elements:'script[src]', @@ -557,7 +562,7 @@ export default { // template_cdate_format: '[CDATE: %m/%d/%Y : %H:%M:%S]', // template_mdate_format: '[MDATE: %m/%d/%Y : %H:%M:%S]', // autosave_ask_before_unload: false, - toolbar_mode : 'wrap', + toolbar_mode: 'wrap', // automatic_uploads: true, // images_upload_base_path: '/demo', // images_upload_url: 'http://10.10.11.7:10000/iasf/sysFiles/upload', @@ -565,25 +570,25 @@ export default { powerpaste_allow_local_images: true, powerpaste_word_import: 'clean', powerpaste_html_import: 'clean', - urlconverter_callback: (url, node, onSave, name) => { - if (node === 'img' && url.startsWith('blob:')) { - // Do some custom URL conversion - tinymce.activeEditor && tinymce.activeEditor.uploadImages() - } - // Return new URL - return url - }, + urlconverter_callback: (url, node, onSave, name) => { + if (node === 'img' && url.startsWith('blob:')) { + // Do some custom URL conversion + tinymce.activeEditor && tinymce.activeEditor.uploadImages() + } + // Return new URL + return url + }, // 自定义上传 images_upload_handler: function (blobInfo, succFun, failFun) { - const blob = blobInfo.blob() - // blob转换为file - const file = new File([blob], blobInfo.filename(), { - type: 'application/json', - lastModified: Date.now() - }); - Oss.upload(file).then(res => { - succFun(res.url) - }) + const blob = blobInfo.blob() + // blob转换为file + const file = new File([blob], blobInfo.filename(), { + type: 'application/json', + lastModified: Date.now() + }); + Oss.upload(file).then(res => { + succFun(res.url) + }) }, //自定义文件选择器的回调内容 此方法只有在点击上方图片按钮才会触发 file_picker_callback: function (callback, value, meta) { @@ -599,23 +604,23 @@ export default { let input = document.createElement('input');//创建一个隐藏的input input.setAttribute('type', 'file'); input.setAttribute("accept", ".mp4"); - input.onchange = function(){ + input.onchange = function () { let file = this.files[0]; const load = Loading.service() - Oss.upload(file).then(res => { - load.close() - callback(res.url) - }).catch(e => { - load.close() - }) + Oss.upload(file).then(res => { + load.close() + callback(res.url) + }).catch(e => { + load.close() + }) } //触发点击 input.click(); } }, // 初始化事件 - setup: function(editor) { - editor.on('init', function(ed) { + setup: function (editor) { + editor.on('init', function (ed) { // 设置默认字体 ed.target.editorCommands.execCommand("fontName", false, "Microsoft Yahei") ed.target.editorCommands.execCommand("fontSize", false, "14px") diff --git a/src/pages/achievement/show/index.vue b/src/pages/achievement/show/index.vue index 65574b5..3fd5a8a 100644 --- a/src/pages/achievement/show/index.vue +++ b/src/pages/achievement/show/index.vue @@ -169,8 +169,6 @@ export default { this.loading = true const { report, userScores } = await this.$get(`${this.api.reportDetail}?reportId=${this.reportId}`) this.form = report - this.expData = userScores - this.isLc = this.expData.find(e => e.lcRuleRecords) // 流程系统才有lcRuleRecords let form = this.form; this.infoData = { workNumber: form.workNumber, @@ -184,16 +182,16 @@ export default { className: form.className } const data = report.data - this.userScores = userScores // 如果没有data，则添加，否则，直接使用 if (!data) { + this.userScores = userScores this.handleList(userScores) this.$post(this.api.editExperimentalData, { reportId, data: JSON.stringify(userScores) }).then(res => { }).catch(err => { }) } else { - this.handleList(userScores.find(e => e.lcRuleRecords) ? userScores : JSON.parse(data)) + this.handleList(JSON.parse(data)) } }, // 处理实验数据 diff --git a/src/pages/match/manage/matchSignup.vue b/src/pages/match/manage/matchSignup.vue index ee5677f..d0e8aa8 100644 --- a/src/pages/match/manage/matchSignup.vue +++ b/src/pages/match/manage/matchSignup.vue @@ -25,6 +25,7 @@

    报名结束前，设置的自动分配将在报名结束时触发一次系统自动分配（取消则不触发）

    报名结束后，也可以手动点击自动分配按钮来立即触发系统自动分配，并且点击一次就触发一次

    +

    注：自动分配仅对触发时已报名的人员进行。对于分配后才报名的人员，如需自动分配，则需手动再次触发自动分配

    diff --git a/src/pages/student/list/index.vue b/src/pages/student/list/index.vue index cc659a5..a2c43b9 100644 --- a/src/pages/student/list/index.vue +++ b/src/pages/student/list/index.vue @@ -1,11 +1,9 @@