diff --git a/src/components/TestPanel.vue b/src/components/TestPanel.vue
index 4d8c0fd..5c64a3f 100644
--- a/src/components/TestPanel.vue
+++ b/src/components/TestPanel.vue
@@ -191,12 +191,13 @@ export default {
       competitionId: Cookie.get('admin-competitionId'),
       stageId: Cookie.get('admin-stageId'),
       teamId: Cookie.get('admin-teamId'),
+      mallId: Cookie.get('admin-mallId'),
       resultsDetails: Cookie.get('admin-resultsDetails'),
       resultAnnouncementTime: Cookie.get('admin-resultAnnouncementTime'),
       curriculumName: Cookie.get('admin-curriculumName') ? unescape(Cookie.get('admin-curriculumName')) : 'python', // 课程名称
       curSystemId: 1,
       projectPermissions: 0, // 项目权限(0、练习 1、考核 2、竞赛)
-      isSubmit: false, // 是否提交的标识
+      isSubmit: Cookie.get('admin-isSubmit') == 'true' ? true : false, // 是否提交的标识
       entryTime: new Date(),
       startTime: Cookie.get('admin-startTime'),
       endTime: Cookie.get('admin-stopTime'),
@@ -233,6 +234,10 @@ export default {
     if (this.assessmentId) { // 考核（考核才会从外面带进来assessmentId，练习是默认显示第一个项目，竞赛会带进来competitionId)
       this.getAssList()
     } else { // 练习
+      if (Cookie.get('doneProjectId')) {
+        this.projectId = +Cookie.get('doneProjectId')
+      }
+      Cookie.remove('doneProjectId')
       // 获取项目列表
       this.getList().then(() => {
         let cache = localStorage.getItem('codeCache') // 获取本地缓存
@@ -277,7 +282,7 @@ export default {
     },
     // 获取项目详情
     getProDetail () {
-      const projectId = this.projectId
+      const { projectId } = this
       return new Promise((resolve, reject) => {
         this.$get(this.api.getProjectDetail, {
           projectId,
@@ -339,6 +344,12 @@ export default {
       this.$parent.loadIns.close()
       this.$parent.loaded = true
     },
+    // 设置isSubmit
+    setSubmit (status) {
+      this.isSubmit = status
+      newmain.$emit('isSubmit', status)
+      Cookie.set('admin-isSubmit', status)
+    },
     // 获取考核列表来查询该考核是否已经考过
     getAssList () {
       this.$post(`${this.api.pageStuAssessment}`, {
@@ -346,14 +357,13 @@ export default {
         pageSize: 10000
       }).then(res => {
         const list = res.list
-        const assessmentId = this.assessmentId
+        const { assessmentId } = this
         let done = false
         const classId = this.classId
         // 匹配到该考核，并且已经提交过（有reportId则说明有实验记录），并且classId跟当前用户的classId相同，就提示提交了考核然后返回上一页
         if (list.find(e => e.assessmentId == assessmentId && e.reportId && e.classId == classId)) {
           done = true
-          this.isSubmit = true
-          newmain.$emit('isSubmit', this.isSubmit)
+          this.setSubmit(true)
           this.$message.error('你已经提交过该考核！')
           setTimeout(_ => {
             history.back() // 直接返回上一页面
@@ -518,15 +528,15 @@ export default {
       this.getProDetail().then(() => {
         this.getCache()
       }).catch(res => { })
-      this.isSubmit = false
+      this.setSubmit(false)
       this.countVal = 0
       this.grade = '00'
       this.pannelTab = 'first'
       this.$emit('recoveryCode') // 切换实训项目后回到第一个判分点
-      newmain.$emit('isSubmit', this.isSubmit) // 选择项目后把提交状态重置为未提交
     },
     // 查看实验报告
     toReport () {
+      Cookie.set('doneProjectId', this.projectId) // 进入实验报告之前先存储当前项目id,从实验报告返回来后把这个id恢复
       this.$router.push(`/report?reportId=${this.reportId}`)
     },
     //重新开始
@@ -534,8 +544,7 @@ export default {
       this.reloadCount()
       this.grade = '00'
       localStorage.removeItem('codeCache')
-      this.isSubmit = false
-      newmain.$emit('isSubmit', this.isSubmit)
+      this.setSubmit(false)
       const points = this.points
       // code和codeId,还有运行结果全部清空
       points.map(e => {
@@ -616,12 +625,12 @@ export default {
         competitionId: this.competitionId,
         stageId: this.stageId,
         teamId: this.teamId,
+        mallId: this.mallId
       }
 
       this.$post(this.api.submit, data).then(({ retInfo, reportId }) => {
         localStorage.removeItem('codeCache')
-        this.isSubmit = true
-        newmain.$emit('isSubmit', this.isSubmit)
+        this.setSubmit(true)
         clearInterval(this.statusTimer)
         let list = retInfo
         let taskList = this.taskList
diff --git a/src/components/codemirror.vue b/src/components/codemirror.vue
index 9e159c7..574fb8c 100644
--- a/src/components/codemirror.vue
+++ b/src/components/codemirror.vue
@@ -195,7 +195,7 @@ export default {
       runResult: '', // 运行结果
       isError: false, // 运行正确与否
       errLine: '', // 错误代码的位置
-      isSubmit: false, // 是否提交了
+      isSubmit: Cookie.get('admin-isSubmit') == 'true' ? true : false, // 是否提交的标识
       runEnable: false, // 是否禁用运行按钮
       tipsVisible: false, // 答案提示弹框显示标识
       picSrcList: [],
@@ -608,6 +608,9 @@ export default {
 <style lang="scss" scoped>
 .code-wrap {
   position: relative;
+  .code-mirror {
+    line-height: 30px;
+  }
 }
 .left {
   position: relative;
@@ -686,11 +689,6 @@ export default {
     opacity: 0.9;
   }
 }
-/deep/.CodeMirror-wrap pre.CodeMirror-line,
-.CodeMirror-wrap pre.CodeMirror-line-like {
-  height: 30px;
-  line-height: 30px;
-}
 .result-right {
   background-color: rgba(43, 40, 22, 1);
 }
diff --git a/src/views/Report.vue b/src/views/Report.vue
index 6eaca00..494a308 100644
--- a/src/views/Report.vue
+++ b/src/views/Report.vue
@@ -1,142 +1,224 @@
 <template>
-    <!--  实验报告  -->
-    <div class="wrap">
-      <breadcrumb data="返回实验/我的数据"></breadcrumb>
-      <div class="content" :class="{loading}" id="pdfDom">
-          <div style="text-align: right" v-if="!loading">
-              <el-button size="mini" @click="editReport">
-                  {{ editing ? "保存" : "编辑" }}
-              </el-button>
-              <el-button type="primary" size="mini" @click="exportPage">导出报告</el-button>
-          </div>
-          <h6 class="r-title">标准实验报告</h6>
-          <div class="info">
-              <h6 class="l-title">
-                  <img src="@/assets/images/report1.png" alt="">
-                  基本信息
-              </h6>
-              <ul :class="['info-list', {edit: editing}]">
-                  <li>
-                      <label>学生姓名：</label>
-                      <el-input v-if="editing" v-model="infoData.userName" disabled></el-input>
-                      <span v-else>{{ infoData.userName }}</span>
-                  </li>
-                  <li>
-                      <label>学生学号：</label>
-                      <el-input v-if="editing" v-model="infoData.workNumber" disabled></el-input>
-                      <span v-else>{{ infoData.workNumber }}</span>
-                  </li>
-                  <li>
-                      <label>实验时间：</label>
-                      <el-input v-if="editing" v-model="infoData.submitTime" disabled></el-input>
-                      <span v-else>{{ infoData.submitTime }}</span>
-                  </li>
-                  <li>
-                      <label>实验成绩：</label>
-                      <el-input v-if="editing" v-model="infoData.score" disabled></el-input>
-                      <div v-else class="score-wrap">
-                          <em>{{ infoData.score }}</em>
-                          <img src="@/assets/images/point.png" alt="">
-                      </div>
-                  </li>
-                  <li>
-                      <label>学生班级：</label>
-                      <el-input v-if="editing" v-model="infoData.className"></el-input>
-                      <span v-else>{{ infoData.className }}</span>
-                  </li>
-                  <li>
-                      <label>指导老师：</label>
-                      <el-input v-if="editing" v-model="infoData.instructor"></el-input>
-                      <span v-else>{{ infoData.instructor }}</span>
-                  </li>
-                  <li>
-                      <label>实验学时：</label>
-                      <el-input v-if="editing" v-model="infoData.period"></el-input>
-                      <span v-else>{{ infoData.period }}</span>
-                  </li>
-              </ul>
-              <div class="m-b-20">
-                  <h6 class="l-title">
-                      <img src="@/assets/images/report2.png" alt="">
-                      实验项目名称
-                  </h6>
-                  <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/images/report3.png" alt="">
-                      实验目的
-                  </h6>
-                  <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">
-                      <img src="@/assets/images/report4.png" alt="">
-                      实验数据
-                  </h6>
-                  <el-table :data="expData" class="table" border stripe header-align="center">
-                      <el-table-column type="index" label="序号" align="center" width="60">
-                          <template slot-scope="scope">
-                              {{ scope.$index + 1 }}
-                          </template>
-                      </el-table-column>
-                      <el-table-column prop="judgmentName" label="判分点" width="270" align="center"></el-table-column>
-                      <el-table-column v-if='project' prop="judgmentName" label="考核点" align="center" width="150">
-                          <template slot-scope="scope">
-                              <div v-for="(item, index) in scope.row.lcRuleRecords" :key="index">
-                                  <span>
-                                      <span>{{index+1}}. </span>{{item.name}}
-                                  </span>
-                              </div>
-                          </template>
-                      </el-table-column>
-                      <el-table-column prop="ruleAnswer" label="参考答案" style='word-wrap: break-word'>
-                          <template slot-scope="scope">
-                              <div v-if='scope.row.lcRuleRecords'>
-                                  <div v-for="(item, index) in scope.row.lcRuleRecords" :key="index">
-                                  <span>
-                                      <span>{{index+1}}. </span>{{item.ruleAnswer}}
-                                  </span>
-                                  </div>
-                              </div>
-                              <div v-else v-html="scope.row.referenceAnswer"></div>
-                          </template>
-                      </el-table-column>
-                      <el-table-column prop="userAnswer" label="学生答案">
-                          <template slot-scope="scope">
-                              <div v-if='scope.row.lcRuleRecords'>
-                                  <div v-for="(item, index) in scope.row.lcRuleRecords" :key="index">
-                                      <span v-if='item.userAnswer'>
-                                          <span>{{index+1}}. </span>{{item.userAnswer}}
-                                      </span>
-                                      <span v-else>
-                                          <span>{{index+1}}. </span>未填写
-                                      </span>
-                                  </div>
-                              </div>
-                              <div v-else v-html='scope.row.answer' style='white-space: pre-wrap'></div>
-                              <template v-if="scope.row.runThePictureList">
-                                <img v-for="(img, i) in scope.row.runThePictureList" :key="i" width="200" class="result-pic" :src="img" alt="">
-                              </template>
-                          </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>
-              <div class="m-b-20">
-                  <h6 class="l-title">
-                      <img src="@/assets/images/report5.png" alt="">
-                      实验总结与体会
-                  </h6>
-                  <quill v-show="editing" :border="true" v-model="infoData.summarize" :height="150" :index="1" />
-                  <div v-show="!editing" class="pre-wrap" v-html="infoData.summarize"></div>
-              </div>
-          </div>
+  <!--  实验报告  -->
+  <div class="wrap">
+    <breadcrumb data="返回实验/我的数据"></breadcrumb>
+    <div class="content"
+         :class="{loading}"
+         id="pdfDom">
+      <div style="text-align: right"
+           v-if="!loading">
+        <el-button size="mini"
+                   @click="editReport">
+          {{ editing ? "保存" : "编辑" }}
+        </el-button>
+        <el-button type="primary"
+                   size="mini"
+                   @click="exportPage">导出报告</el-button>
+      </div>
+      <h6 class="r-title">标准实验报告</h6>
+      <div class="info">
+        <h6 class="l-title">
+          <img src="@/assets/images/report1.png"
+               alt="">
+          基本信息
+        </h6>
+        <ul :class="['info-list', {edit: editing}]">
+          <li>
+            <label>学生姓名：</label>
+            <el-input v-if="editing"
+                      v-model="infoData.userName"
+                      disabled></el-input>
+            <span v-else>{{ infoData.userName }}</span>
+          </li>
+          <li>
+            <label>学生学号：</label>
+            <el-input v-if="editing"
+                      v-model="infoData.workNumber"
+                      disabled></el-input>
+            <span v-else>{{ infoData.workNumber }}</span>
+          </li>
+          <li>
+            <label>实验时间：</label>
+            <el-input v-if="editing"
+                      v-model="infoData.submitTime"
+                      disabled></el-input>
+            <span v-else>{{ infoData.submitTime }}</span>
+          </li>
+          <li>
+            <label>实验成绩：</label>
+            <el-input v-if="editing"
+                      v-model="infoData.score"
+                      disabled></el-input>
+            <div v-else
+                 class="score-wrap">
+              <em>{{ infoData.score }}</em>
+              <img src="@/assets/images/point.png"
+                   alt="">
+            </div>
+          </li>
+          <li>
+            <label>学生班级：</label>
+            <el-input v-if="editing"
+                      v-model="infoData.className"></el-input>
+            <span v-else>{{ infoData.className }}</span>
+          </li>
+          <li>
+            <label>指导老师：</label>
+            <el-input v-if="editing"
+                      v-model="infoData.instructor"></el-input>
+            <span v-else>{{ infoData.instructor }}</span>
+          </li>
+          <li>
+            <label>实验学时：</label>
+            <el-input v-if="editing"
+                      v-model="infoData.period"></el-input>
+            <span v-else>{{ infoData.period }}</span>
+          </li>
+        </ul>
+        <div class="m-b-20">
+          <h6 class="l-title">
+            <img src="@/assets/images/report2.png"
+                 alt="">
+            实验项目名称
+          </h6>
+          <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/images/report3.png"
+                 alt="">
+            实验目的
+          </h6>
+          <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">
+            <img src="@/assets/images/report4.png"
+                 alt="">
+            实验数据
+          </h6>
+          <el-table :data="expData"
+                    class="table"
+                    border
+                    stripe
+                    header-align="center">
+            <el-table-column type="index"
+                             label="序号"
+                             align="center"
+                             width="60">
+              <template slot-scope="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="judgmentName"
+                             label="判分点"
+                             width="200"
+                             align="center"></el-table-column>
+            <el-table-column v-if='project'
+                             prop="judgmentName"
+                             label="考核点"
+                             align="center"
+                             width="150">
+              <template slot-scope="scope">
+                <div v-for="(item, index) in scope.row.lcRuleRecords"
+                     :key="index">
+                  <span>
+                    <span>{{index+1}}. </span>{{item.name}}
+                  </span>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="ruleAnswer"
+                             label="参考答案"
+                             style='word-wrap: break-word'>
+              <template slot-scope="scope">
+                <div v-if='scope.row.lcRuleRecords'>
+                  <div v-for="(item, index) in scope.row.lcRuleRecords"
+                       :key="index">
+                    <span>
+                      <span>{{index+1}}. </span>{{item.ruleAnswer}}
+                    </span>
+                  </div>
+                </div>
+                <div v-else
+                     v-html="scope.row.referenceAnswer"></div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="userAnswer"
+                             label="学生答案">
+              <template slot-scope="scope">
+                <div v-if='scope.row.lcRuleRecords'>
+                  <div v-for="(item, index) in scope.row.lcRuleRecords"
+                       :key="index">
+                    <span v-if='item.userAnswer'>
+                      <span>{{index+1}}. </span>{{item.userAnswer}}
+                    </span>
+                    <span v-else>
+                      <span>{{index+1}}. </span>未填写
+                    </span>
+                  </div>
+                </div>
+                <div v-else
+                     v-html='scope.row.answer'
+                     style='white-space: pre-wrap'></div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="runResult"
+                             label="学生运行结果"
+                             align="center">
+              <template slot-scope="scope">
+                <div class="m-b-20"
+                     v-html='scope.row.runResult'
+                     style='white-space: pre-wrap'></div>
+                <template v-if="scope.row.runThePictureList">
+                  <img v-for="(img, i) in scope.row.runThePictureList"
+                       :key="i"
+                       width="200"
+                       class="result-pic"
+                       :src="img"
+                       alt="">
+                </template>
+              </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>
+        <div class="m-b-20">
+          <h6 class="l-title">
+            <img src="@/assets/images/report5.png"
+                 alt="">
+            实验总结与体会
+          </h6>
+          <quill v-show="editing"
+                 :border="true"
+                 v-model="infoData.summarize"
+                 :height="150"
+                 :index="1" />
+          <div v-show="!editing"
+               class="pre-wrap"
+               v-html="infoData.summarize"></div>
+        </div>
       </div>
     </div>
+  </div>
 </template>
 
 <script>
@@ -145,126 +227,129 @@ import util from '@/util'
 import breadcrumb from '@/components/breadcrumb'
 import quill from "@/components/quill";
 export default {
-    data() {
-        return {
-            reportId: this.$route.query.reportId,
-            title: "实验报告",
-            form: {},
-            infoData: {},
-            expData: [],
-            editing: false,
-            loadIns: null,
-            loading: false,
-            project:false,
-            userScores: []
-        };
-    },
-    components: {
-        breadcrumb,
-        quill
-    },
-    mounted() {
-        this.getData()
+  data () {
+    return {
+      reportId: this.$route.query.reportId,
+      title: "实验报告",
+      form: {},
+      infoData: {},
+      expData: [],
+      editing: false,
+      loadIns: null,
+      loading: false,
+      project: false,
+      userScores: []
+    };
+  },
+  components: {
+    breadcrumb,
+    quill
+  },
+  mounted () {
+    this.getData()
+  },
+  methods: {
+    getData () { // 查询详情
+      const { reportId } = this
+      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,
+          period: form.period,
+          laboratory: form.laboratory,
+          submitTime: form.submitTime,
+          score: form.score,
+          userName: form.userName,
+          projectName: form.projectName,
+          purpose: form.purpose,
+          summarize: form.summarize
+        }
+        const data = report.data
+        this.userScores = userScores
+        // 如果没有data，则添加，否则，直接使用
+        if (!data) {
+          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))
+        }
+      }).catch(res => { })
     },
-    methods: {
-        getData() { // 查询详情
-            const { reportId } = this
-            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,
-                    period: form.period,
-                    laboratory: form.laboratory,
-                    submitTime: form.submitTime,
-                    score: form.score,
-                    userName: form.userName,
-                    projectName: form.projectName,
-                    purpose: form.purpose,
-                    summarize: form.summarize
-                }
-                const data = report.data
-                this.userScores = userScores
-                // 如果没有data，则添加，否则，直接使用
-                if (!data) {
-                  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))
-                }
-            }).catch(res => {})
-        },
-        // 处理实验数据
-        handleList(list) {
-          this.project = list.find(e => e.lcRuleRecords) // 银行系统才有lcRuleRecords
-          if (this.project) {
-            list.map(e => {
-              e.assessmentPoint = ''
-              e.referenceAnswer = ''
-              e.answer = ''
-              e.lcRuleRecords.map((n, i) => {
-                e.assessmentPoint += `${i + 1}.${n.name}`
-                e.referenceAnswer += `${i + 1}.${n.ruleAnswer}`
-                e.answer += `${i + 1}.${n.userAnswer}`
-              })
-            })
-          } else { // python系统显示图片（从userScores里取）
-            list.forEach(e => {
-              const item = this.userScores.find(n => n.judgmentId == e.judgmentId)
-              if (item && item.runThePictureList) e.runThePictureList = item.runThePictureList
-            })
-          }
-          this.expData = list
-        },
-        exportPage() {
-          const form = Object.assign(this.form, this.infoData)
-          const list = JSON.parse(JSON.stringify(this.expData))
-          list.map((e, i) => {
-            const item = this.userScores.find(n => n.judgmentId == e.judgmentId)
-            if (item && item.runThePicture) e.runThePicture = item.runThePicture
-            if (item && item.runThePictureList) e.runThePictureList = item.runThePictureList
-            e.id = i + 1
-            if (e.referenceAnswer && typeof e.referenceAnswer === 'string') e.referenceAnswer = e.referenceAnswer.replace(/<[^>]+>/g, '').replace(/(&nbsp;|&amp;|%s)/g, '').replace(/>/g, '&gt;').replace(/</g, '&lt;')
-            if (e.answer && typeof e.answer === 'string') e.answer = e.answer.replace(/<[^>]+>/g, '').replace(/(&nbsp;|&amp;|%s)/g, '').replace(/>/g, '&gt;').replace(/</g, '&lt;')
+    // 处理实验数据
+    handleList (list) {
+      this.project = list.find(e => e.lcRuleRecords) // 银行系统才有lcRuleRecords
+      if (this.project) {
+        list.map(e => {
+          e.assessmentPoint = ''
+          e.referenceAnswer = ''
+          e.answer = ''
+          e.lcRuleRecords.map((n, i) => {
+            e.assessmentPoint += `${i + 1}.${n.name}`
+            e.referenceAnswer += `${i + 1}.${n.ruleAnswer}`
+            e.answer += `${i + 1}.${n.userAnswer}`
           })
-          for (const i in form) {
-            if (form[i] && typeof form[i] === 'string') form[i] = form[i].replace(/<[^>]+>/g, '')
+        })
+      } else { // python系统显示图片（从userScores里取）
+        list.forEach(e => {
+          const item = this.userScores.find(n => n.judgmentId == e.judgmentId)
+          if (item) {
+            if (item.runThePictureList) e.runThePictureList = item.runThePictureList
+            if (item.runResult) e.runResult = item.runResult
           }
-          form.purpose = form.purpose.replace(/<[^>]+>/g, '')
-          this.loading = true;
-          this.loadIns = Loading.service({
-              background: "#fff"
-          });
-          this.$post(this.project ? this.api.exportBankExperimentReport : this.api.exportLabReport, {
-            ...form,
-            experimentalData: list
-          }).then(res => {
-            this.loadIns.close();
-            this.loading = false;
-            util.downloadFileDirect(`实验报告.docx`,new Blob([res]))
-          }).catch(res => {
-            this.loadIns.close();
-            this.loading = false;
-          })
-        },
-        editReport() { // 编辑实验报告
-            if (this.editing) {
-                this.$post(`${this.api.updateReport}`, this.infoData).then(res => {
-                    this.editing = false;
-                    this.$message.success('修改成功')
-                }).catch(err => {});
-            } else {
-                this.editing = true;
-            }
-        }
+        })
+      }
+      this.expData = list
+    },
+    exportPage () {
+      const form = Object.assign(this.form, this.infoData)
+      const list = JSON.parse(JSON.stringify(this.expData))
+      list.map((e, i) => {
+        const item = this.userScores.find(n => n.judgmentId == e.judgmentId)
+        if (item && item.runThePicture) e.runThePicture = item.runThePicture
+        if (item && item.runThePictureList) e.runThePictureList = item.runThePictureList
+        e.id = i + 1
+        if (e.referenceAnswer && typeof e.referenceAnswer === 'string') e.referenceAnswer = e.referenceAnswer.replace(/<[^>]+>/g, '').replace(/(&nbsp;|&amp;|%s)/g, '').replace(/>/g, '&gt;').replace(/</g, '&lt;')
+        if (e.answer && typeof e.answer === 'string') e.answer = e.answer.replace(/<[^>]+>/g, '').replace(/(&nbsp;|&amp;|%s)/g, '').replace(/>/g, '&gt;').replace(/</g, '&lt;')
+      })
+      for (const i in form) {
+        if (form[i] && typeof form[i] === 'string') form[i] = form[i].replace(/<[^>]+>/g, '')
+      }
+      form.purpose = form.purpose.replace(/<[^>]+>/g, '')
+      this.loading = true;
+      this.loadIns = Loading.service({
+        background: "#fff"
+      });
+      this.$post(this.project ? this.api.exportBankExperimentReport : this.api.exportLabReport, {
+        ...form,
+        experimentalData: list
+      }).then(res => {
+        this.loadIns.close();
+        this.loading = false;
+        util.downloadFileDirect(`实验报告.docx`, new Blob([res]))
+      }).catch(res => {
+        this.loadIns.close();
+        this.loading = false;
+      })
+    },
+    editReport () { // 编辑实验报告
+      if (this.editing) {
+        this.$post(`${this.api.updateReport}`, this.infoData).then(res => {
+          this.editing = false;
+          this.$message.success('修改成功')
+        }).catch(err => { });
+      } else {
+        this.editing = true;
+      }
     }
+  }
 };
 </script>
 
@@ -273,132 +358,137 @@ export default {
   margin-bottom: 20px;
 }
 .wrap {
-    padding: 12px 300px 20px;
+  padding: 12px 300px 20px;
 }
-code, kbd, samp{
-    font-family: 'PingFang SC', "Helvetica Neue", Helvetica, "microsoft yahei", arial, STHeiTi, sans-serif;
-    word-wrap: break-word;
-    white-space: pre-wrap;
+code,
+kbd,
+samp {
+  font-family: 'PingFang SC', 'Helvetica Neue', Helvetica, 'microsoft yahei',
+    arial, STHeiTi, sans-serif;
+  word-wrap: break-word;
+  white-space: pre-wrap;
 }
-/deep/ pre{
-    white-space: pre-wrap;       /* css-3 */
-    white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
-    white-space: pre-wrap;      /* Opera 4-6 */
-    white-space: -o-pre-wrap;    /* Opera 7 */
-    word-wrap: break-word;       /* Internet Explorer 5.5+ */
-    word-break:break-all;
-    overflow:hidden;
-    font-size: 12px;
-    font-weight:400;
-    font-family:'PingFang SC', "Helvetica Neue", Helvetica, "microsoft yahei", arial, STHeiTi, sans-serif
+/deep/ pre {
+  white-space: pre-wrap; /* css-3 */
+  white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
+  white-space: pre-wrap; /* Opera 4-6 */
+  white-space: -o-pre-wrap; /* Opera 7 */
+  word-wrap: break-word; /* Internet Explorer 5.5+ */
+  word-break: break-all;
+  overflow: hidden;
+  font-size: 12px;
+  font-weight: 400;
+  font-family: 'PingFang SC', 'Helvetica Neue', Helvetica, 'microsoft yahei',
+    arial, STHeiTi, sans-serif;
 }
 .content {
-    padding: 16px 0;
-    background: #fff;
-    &.loading {
-        padding-top: 30px;
+  padding: 16px 0;
+  background: #fff;
+  &.loading {
+    padding-top: 30px;
+  }
+  .r-title {
+    margin-bottom: 40px;
+    font-size: 24px;
+    text-align: center;
+    color: #333;
+  }
+  .info {
+    padding: 20px 16px;
+    border: 1px solid #e1e6f2;
+  }
+  .l-title {
+    display: flex;
+    align-items: center;
+    padding: 5px 8px;
+    margin-bottom: 12px;
+    font-size: 14px;
+    color: #333;
+    background-color: #f7f9fc;
+    img {
+      margin-right: 5px;
     }
-    .r-title {
-        margin-bottom: 40px;
-        font-size: 24px;
-        text-align: center;
-        color: #333;
+  }
+  .info-list {
+    display: flex;
+    flex-wrap: wrap;
+    padding: 10px 0 0 20px;
+    li {
+      display: inline-flex;
+      width: 25%;
+      padding: 0 10px;
+      margin-bottom: 34px;
     }
-    .info {
-        padding: 20px 16px;
-        border: 1px solid #E1E6F2;
+    &.edit {
+      li {
+        align-items: center;
+      }
     }
-    .l-title{
-      display: flex;
-      align-items: center;
-      padding: 5px 8px;
-      margin-bottom: 12px;
+    label {
       font-size: 14px;
       color: #333;
-      background-color: #F7F9FC;
-      img{
-        margin-right: 5px;
-      }
+      white-space: nowrap;
     }
-    .info-list {
-        display: flex;
-        flex-wrap: wrap;
-        padding: 10px 0 0 20px;
-        li {
-            display: inline-flex;
-            width: 25%;
-            padding: 0 10px;
-            margin-bottom: 34px;
-        }
-        &.edit {
-            li {
-                align-items: center;
-            }
-        }
-        label {
-            font-size: 14px;
-            color: #333;
-            white-space: nowrap;
-        }
-        span {
-            min-width: 150px;
-            padding: 0 10px 3px;
-            border-bottom: 1px solid #E1E6F2;
-        }
-        /deep/.el-input {
-            width: 174px;
-        }
+    span {
+      min-width: 150px;
+      padding: 0 10px 3px;
+      border-bottom: 1px solid #e1e6f2;
     }
-    .score-wrap {
-        position: relative;
-        min-width: 150px;
-        border-bottom: 1px solid #E1E6F2;
-        em {
-            position: absolute;
-            top: -12px;
-            left: 30px;
-            font-family: din;
-            font-size: 30px;
-            font-weight: 600;
-            color: #0B1D30;
-        }
-        img {
-            position: absolute;
-            bottom: -15px;
-            left: 0;
-        }
+    /deep/.el-input {
+      width: 174px;
     }
-    /deep/.el-textarea .el-textarea__inner, .pre-wrap {
-        min-height: 72px;
-        padding: 10px 16px;
-        font-size: 14px;
-        color: #333;
-        &.edit {
-            color: #ABB3C6;
-            border: 1px solid #CACFDB;
-            border-radius: 4px;
-            background-color: #F6F7F9;
-        }
+  }
+  .score-wrap {
+    position: relative;
+    min-width: 150px;
+    border-bottom: 1px solid #e1e6f2;
+    em {
+      position: absolute;
+      top: -12px;
+      left: 30px;
+      font-family: din;
+      font-size: 30px;
+      font-weight: 600;
+      color: #0b1d30;
     }
-    /deep/ .table th {
-        background-color: #e1eaff !important;
-        .cell {
-            line-height: 35px;
-            color: #555555;
-        }
+    img {
+      position: absolute;
+      bottom: -15px;
+      left: 0;
+    }
+  }
+  /deep/.el-textarea .el-textarea__inner,
+  .pre-wrap {
+    min-height: 72px;
+    padding: 10px 16px;
+    font-size: 14px;
+    color: #333;
+    &.edit {
+      color: #abb3c6;
+      border: 1px solid #cacfdb;
+      border-radius: 4px;
+      background-color: #f6f7f9;
     }
+  }
+  /deep/ .table th {
+    background-color: #e1eaff !important;
+    .cell {
+      line-height: 35px;
+      color: #555555;
+    }
+  }
 }
 .result-pic {
   margin: 10px 0;
 }
 @media (max-width: 1650px) {
-    .wrap {
-        padding: 12px 200px 20px;
-    }
+  .wrap {
+    padding: 12px 200px 20px;
+  }
 }
 @media (max-width: 1430px) {
-    .wrap {
-        padding: 12px 100px 20px;
-    }
+  .wrap {
+    padding: 12px 100px 20px;
+  }
 }
 </style>
\ No newline at end of file