fix

public/static/ueditorPlus/ueditor.config.js

@@ -62,7 +62,7 @@
 
     //工具栏上的所有的功能按钮和下拉框，可以在new编辑器的实例时选择自己需要的重新定义
     toolbars: [
-      ["fullscreen", "source", "|", "bold", "italic", "underline", "forecolor", "fontfamily", "fontsize", "|", "justifyleft", "justifycenter", "justifyright", "justifyjustify", "|", "insertimage", "inserttable", 'formula', 'combox']
+      ["fullscreen", "source", "|", "bold", "italic", "underline", 'removeformat', 'formatmatch', 'blockquote', 'pasteplain', "rowspacingtop", "rowspacingbottom", "lineheight", "|", "customstyle", "paragraph", "fontfamily", "fontsize", "|", "forecolor", "backcolor", "insertorderedlist", "insertunorderedlist", "|", "link", "unlink", "anchor", "|", "imagenone", "imageleft", "imagecenter", "imageright", "|", "justifyleft", "justifycenter", "justifyright", "justifyjustify", "|", "insertcode", "insertimage", "inserttable", 'formula', 'combox']
     ]
     // 公式配置
     , formulaConfig: {

src/components/editor.js

@@ -4,7 +4,7 @@ export default {
   //skin:'oxide-dark',
   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',
@@ -212,7 +212,8 @@ export default {
   },
   //为内容模板插件提供预置模板
   templates: [
-		{ title: '个股分析报告', description: '', content: `
+    {
+      title: '个股分析报告', description: '', content: `
 			<div class="tiny-report">
 				<h2>个股分析报告</h2>
 				<h6>1.引言</h6>
@@ -271,7 +272,8 @@ export default {
 			`
     },
 
-		{ title: '行业数据分析报告', description: '', content: `
+    {
+      title: '行业数据分析报告', description: '', content: `
 			<div class="tiny-report">
 				<h2>行业数据分析报告</h2>
 				<h6>1.引言</h6>
@@ -344,7 +346,8 @@ export default {
 			`
     },
 
-		{ title: '宏观数据分析报告', description: '', content: `
+    {
+      title: '宏观数据分析报告', description: '', content: `
 			<div class="tiny-report">
 				<h2>宏观数据分析报告</h2>
 				<h6>1.引言</h6>
@@ -403,7 +406,8 @@ export default {
 			`
     },
 
-		{ title: '可视化报告', description: '', content: `
+    {
+      title: '可视化报告', description: '', content: `
 			<div class="tiny-report">
 				<h2>可视化报告</h2>
 				<h6>1.封面</h6>
@@ -474,7 +478,8 @@ export default {
 			`
     },
 
-		{ title: '数据分析报告', description: '', content: `
+    {
+      title: '数据分析报告', description: '', content: `
 			<div class="tiny-report">
 				<h2>数据分析报告</h2>
 				<h6>1.引言</h6>

src/pages/match/details/index.vue

@@ -183,10 +183,11 @@
                   <th>学号：</th>
                   <td>{{ info.person.workNumber }}</td>
                 </tr>
+              </template>
               <tr>
                 <th>学校：</th>
                 <td>
-                    <div v-if="fromOffical" class="flex a-center">
+                  <div class="flex a-center">
                     <template v-if="schoolEdit">
                       <el-select class="m-r-10" v-model="curRealSchoolId" filterable>
                         <el-option v-for="(item, i) in schools" :key="i" :label="item.schoolName"
@@ -198,20 +199,17 @@
                       <span class="m-r-10">{{ info.person.realSchool }}</span>
                       <i class="el-icon-edit icon" @click="schoolEdit = 1"></i>
                     </template>
-
                   </div>
-                    <span v-else>{{ info.person.realSchool }}</span>
+                  <!-- <span v-else>{{ info.person.realSchool }}</span> -->
                 </td>
               </tr>
-              </template>
+              <template v-if="form.completeCompetitionSetup.competitionType && info.team.captain">
-              <template v-if="form.completeCompetitionSetup.competitionType">
+                <tr>
-                <tr v-if="info.team.captain">
                   <th width="150">团队名称：</th>
                   <td>
                     <span>{{ info.team.teamName }}</span>
                   </td>
                 </tr>
-                <template v-if="info.team.captain">
                 <tr>
                   <th>队长：</th>
                   <td>{{ info.caption.userName }}{{ info.caption.realSchool && '，' + info.caption.realSchool }}{{
@@ -231,7 +229,6 @@
                   </td>
                 </tr>
               </template>
-              </template>
               <tr>
                 <th width="130">指导老师：</th>
                 <td v-if="info.team.captain === 0 || !form.completeCompetitionSetup.competitionType">
@@ -1414,7 +1411,6 @@ export default {
       if (!form.teamId) return Util.errorMsg('请选择团队')
       if (!form.invitationCode) return Util.errorMsg('请输入团队邀请码')
       if (this.form.completeCompetitionSetup.isNeedCode && !form.registrationInvitationCode) return Util.errorMsg('请输入大赛邀请码')
-      delete form.realSchoolId
       await this.$post(this.api.joinCompetitionTeam, form)
       this.status = 1
       this.enterVisible = false

src/pages/match/list/index.vue

@@ -715,7 +715,6 @@ export default {
       if (!form.teamId) return Util.errorMsg('请选择团队')
       if (!form.invitationCode) return Util.errorMsg('请输入团队邀请码')
       if (this.curItem.isNeedCode && !form.registrationInvitationCode) return Util.errorMsg('请输入大赛邀请码')
-      delete form.realSchoolId
       this.$post(this.api.joinCompetitionTeam, form).then(res => {
         this.enterVisible = false
         this.getData()

src/pages/match/theoryExam/index.vue

@@ -674,8 +674,8 @@ export default {
         // 缓存跟提交接口的参数一样
         await this.$post(this.api[isSubmit ? 'submitTheExamPaper' : 'examPaperRecordCache'], data)
 
-        window.opener && window.opener.location.reload()
         if (isSubmit) {
+          window.opener && window.opener.location.reload()
           clearInterval(this.counterTimer)
           this.submiting = false
           this.submited = true

src/pages/record/trialReport/index.vue

@@ -231,24 +231,25 @@ export default {
         }
         this.routes = routes
 
-        const { data } = report
+        let { data } = report
-        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 {
-          const cacheData = JSON.parse(data)
+          data = JSON.parse(data)
-          cacheData.forEach((e, i) => {
+          // this.userScores = data
-            const item = userScores.find(n => n.judgmentId === e.judgmentId)
+          // cacheData.forEach((e, i) => {
-            if (item) {
+          //   const item = userScores.find(n => n.judgmentId === e.judgmentId)
-              e.answer = item.answer
+          //   if (item) {
-            }
+          //     e.answer = item.answer
-          })
+          //   }
-          this.handleList(userScores.find(e => e.lcRuleRecords) ? userScores : cacheData)
+          // })
+          this.handleList(data)
         }
       }).catch(res => { })
     },

src/pages/touristMatch/list/index.vue

@@ -606,7 +606,6 @@ export default {
       if (!form.teamId) return Util.errorMsg('请选择团队')
       if (!form.invitationCode) return Util.errorMsg('请输入团队邀请码')
       if (this.curItem.isNeedCode && !form.registrationInvitationCode) return Util.errorMsg('请输入大赛邀请码')
-      delete form.realSchoolId
       await this.$post(this.api.joinCompetitionTeam, form)
       this.enterVisible = false
       this.getData()