实验报告修复

src/pages/record/show/index.vue

@@ -82,15 +82,16 @@
                         <img src="@/assets/img/report2.png" alt="">
                         实验项目名称
                     </h6>
-                    <el-input v-if="editing" v-model="form.projectName" type="textarea"></el-input>
-                    <div v-else class="pre-wrap" v-html="form.projectName"></div>
+                    <el-input v-if="editing" v-model="infoData.projectName" type="textarea"></el-input>
+                    <div v-else class="pre-wrap" v-html="infoData.projectName"></div>
                 </div>
                 <div class="m-b-20">
                     <h6 class="l-title">
                         <img src="@/assets/img/report3.png" alt="">
                         实验目的
                     </h6>
-                    <div :class="['pre-wrap', {edit: editing}]" v-html="form.purpose"></div>
+                    <quill v-if="editing" :border="true" v-model="infoData.purpose" :height="150" />
+                    <div v-else :class="['pre-wrap', {edit: editing}]" v-html="infoData.purpose"></div>
                 </div>
                 <div class="m-b-20">
                     <h6 class="l-title">
@@ -140,6 +141,7 @@
                                 <div v-else v-html='scope.row.answer' style='white-space: pre-wrap'></div>
                             </template>
                         </el-table-column>
+                        <el-table-column prop="quesScore" label="分值" width="80" align="center"></el-table-column>
                         <el-table-column prop="score" label="得分" width="80" align="center"></el-table-column>
                     </el-table>
                 </div>
@@ -148,8 +150,8 @@
                         <img src="@/assets/img/report5.png" alt="">
                         实验总结与体会
                     </h6>
-                    <quill v-if="editing" :border="true" v-model="form.summarize" :minHeight="150" :height="150" />
-                    <div v-else class="pre-wrap" v-html="form.summarize"></div>
+                    <quill v-if="editing" :border="true" v-model="infoData.summarize" :height="150" />
+                    <div v-else class="pre-wrap" v-html="infoData.summarize"></div>
                 </div>
             </div>
         </div>
@@ -171,13 +173,7 @@ export default {
             projectId: this.$route.query.projectId,
             breadPath: ['实验记录', '实验情况', '实验报告'],
             title: "实验报告",
-            form: {
-                className: "",
-                instructor: "",
-                period: "",
-                projectName: "",
-                summarize: "",
-            },
+            form: {},
             infoData: {},
             expData: [],
             editing: false,
@@ -199,8 +195,9 @@ export default {
             this.$get(`${this.api.reportDetail}?reportId=${reportId}`).then(({ report, userScores }) => {
                 this.form = report
                 const form = this.form
-
                 this.infoData = {
+                    reportId,
+                    className: form.className,
                     workNumber: form.workNumber,
                     experimentalClassName: form.experimentalClassName,
                     instructor: form.instructor,
@@ -208,7 +205,10 @@ export default {
                     laboratory: form.laboratory,
                     submitTime: form.submitTime,
                     score: form.score,
-                    userName: form.userName
+                    userName: form.userName,
+                    projectName: form.projectName,
+                    purpose: form.purpose,
+                    summarize: form.summarize
                 }
                 form.assessmentId && (this.breadPath = ['实验记录', '实验报告'])
                 const data = report.data
@@ -227,7 +227,6 @@ export default {
         // 处理实验数据
         handleList(list) {
           this.project = list.find(e => e.lcRuleRecords) // 银行系统才有lcRuleRecords
-          this.form.className = this.className
           if (this.project) {
             list.map(e => {
               e.assessmentPoint = ''
@@ -308,11 +307,7 @@ export default {
         },
         editReport() { // 编辑实验报告
             if (this.editing) {
-                let data = {
-                   ...this.form,
-                    reportId: Number(this.reportId),
-                };
-                this.$post(`${this.api.updateReport}`, data).then(res => {
+                this.$post(`${this.api.updateReport}`, this.infoData).then(res => {
                     this.editing = false;
                     util.successMsg("修改成功");
                 }).catch(err => {});

src/store/modules/user.js

@@ -79,13 +79,10 @@ export default {
         },
         logout({ commit, state, dispatch }) {
             return new Promise((resolve, reject) => {
-              if (util.local.get(Setting.storeKey)) {
-                util.local.remove(Setting.storeKey)
-                util.local.remove(Setting.tokenKey)
-              } else {
-                util.local.remove('oc_server_token')
-                util.local.remove('oc_server_store')
-              }
+              util.local.remove(Setting.storeKey)
+              util.local.remove(Setting.tokenKey)
+              util.local.remove('oc_server_token')
+              util.local.remove('oc_server_store')
               location.reload()
               resolve()
             });