fix

src/components/TestPanel.vue

@@ -665,7 +665,7 @@ export default {
         })
         // 如果有缓存代码，再提示用户是否要继续上次的实验
         Promise.all(promiseList).then(_ => {
-          hasCache && this.$confirm('是否要继续上次的实验？', '提示', {
+          hasCache && this.$confirm('是否要继续上次的操作记录？', '提示', {
             confirmButtonText: '是',
             cancelButtonText: '否',
             type: 'success'
@@ -911,6 +911,7 @@ export default {
           bcId: e.judgmentId,
           isSubmit: e.codeId ? 1 : 0,
           answer: e.answer,
+          photoUrl: e.photoUrl || '',
           retResult: e.retResult,
           judgmentName: e.name
         })
@@ -962,7 +963,7 @@ export default {
         this.submiting = false
         // 如果是竞赛，并且勾选了公布成绩详情的选项，则弹框提示
         if (this.competitionId) {
-          this.$alert(`提交成功！${this.resultsDetails == 0 && this.resultAnnouncementTime != 0 ? '成绩将在' + this.resultAnnouncementTime + '小时后发布，请去参赛信息模块查看' : ''}`, '提示', {
+          this.$alert(`提交成功！${this.resultAnnouncementTime != 0 ? '成绩将在' + this.resultAnnouncementTime + '小时后发布，请去参赛信息模块查看' : ''}`, '提示', {
             confirmButtonText: '确定',
             callback: action => {
               this.$parent.back()

src/components/codemirror.vue

@@ -33,10 +33,12 @@
         <div class="pic-item"
              v-for="(img, i) in picSrcList"
              :key="i">
-          <el-image class="pic"
+          <div class="pic-inner">
-                    :src="img"
+            <el-image class="pic"
-                    :preview-src-list="picSrcList">
+                      :src="img"
-          </el-image>
+                      :preview-src-list="picSrcList">
+            </el-image>
+          </div>
           <el-button class="download-btn btn"
                      type="primary"
                      size="mini"
@@ -229,8 +231,21 @@
         </el-tab-pane>
         <el-tab-pane label="结果"
                      name="result">
-          <div class="result"
+          <div style="position: relative">
-               v-html="curResult"></div>
+            <div class="result"
+                 v-html="curResult"></div>
+            <div v-if="curPhotoUrl.length"
+                 class="pics">
+              <div class="pic-item"
+                   v-for="(img, i) in curPhotoUrl"
+                   :key="i">
+                <el-image class="pic"
+                          :src="img"
+                          :preview-src-list="curPhotoUrl">
+                </el-image>
+              </div>
+            </div>
+          </div>
         </el-tab-pane>
       </el-tabs>
       <span slot="footer"
@@ -293,7 +308,7 @@ import config from '@/config'
 import { saveAs } from 'file-saver'
 const CANCEL_TOKEN = axios.CancelToken // 用于input中中断请求
 export default {
-  props: ['judgmentId', 'code', 'codeId', 'projectId', 'systemId', 'retResult', 'modelIsShow'],
+  props: ['judgmentId', 'code', 'codeId', 'projectId', 'systemId', 'retResult', 'modelIsShow', 'photoUrl'],
   data () {
     return {
       token: Cookie.get('admin-token'),
@@ -398,6 +413,7 @@ export default {
       showActive: 'code',
       curCode: '',
       curResult: '',
+      curPhotoUrl: [],
     };
   },
   components: {
@@ -673,7 +689,11 @@ export default {
                 this.$emit('cache') // 每次运行代码都要把代码传给后端做缓存
                 this.loadIns.close()
                 this.picSrcList = []
-                if (photo) this.picSrcList = photo.split(',')
+                this.$emit('update:photoUrl', '')
+                if (photo) {
+                  this.picSrcList = photo.split(',')
+                  this.$emit('update:photoUrl', photo)
+                }
                 this.$emit('update:codeId', res.codeId) // 更新coddeId
                 this.$emit('update:answer', result) // 更新运行结果
                 this.$emit('update:retResult', data.retResult) // 更新返回结果
@@ -830,6 +850,7 @@ export default {
     showCode (row) {
       this.curCode = row.runCode
       this.curResult = row.runResults
+      this.curPhotoUrl = row.photoUrl ? row.photoUrl.split(',') : []
       this.showVisible = true
     },
     // 导入代码
@@ -1009,7 +1030,13 @@ export default {
   }
   .pic-item {
     margin: 0 5px 5px;
+    .pic-inner {
+      height: 100px;
+    }
     &:only-child {
+      .pic-inner {
+        height: auto;
+      }
       .pic {
         width: 50%;
         max-height: none;
@@ -1020,6 +1047,7 @@ export default {
     display: block;
     width: 100px;
     max-height: 100px;
+    object-fit: cover;
     margin: 0 auto 10px;
   }
 }
@@ -1095,5 +1123,26 @@ export default {
     line-height: 50px;
     color: #333;
   }
+  .pics {
+    display: flex;
+    margin-top: 20px;
+    overflow: auto;
+    .pic-item {
+      margin: 0 5px 5px;
+      &:only-child {
+        .pic {
+          width: 50%;
+          max-height: none;
+        }
+      }
+    }
+    .pic {
+      display: block;
+      width: 100px;
+      max-height: 100px;
+      object-fit: cover;
+      margin: 0 auto 10px;
+    }
+  }
 }
 </style>

src/config/index.js

@@ -13,7 +13,7 @@ let host = location.origin + '/'
 let bankPath = `${location.origin}/banksystem` // 银行系统
 // 121.37.12.51 | 192.168.31.151
 if (isDev) {
-  host = 'http://192.168.31.51:9000/'
+  host = 'http://192.168.31.217:9000/'
   host = 'http://121.37.12.51:9000/'
   // host = 'https://occupationlab.com/'
   bankPath = `http://${location.hostname}:8093`

src/views/Home.vue

@@ -64,6 +64,7 @@
                       :codeId.sync="item.codeId"
                       :answer.sync="item.answer"
                       :retResult.sync="item.retResult"
+                      :photoUrl.sync="item.photoUrl"
                       :modelIsShow.sync="modelIsShow"
                       @cache="leavePage"></codemirror>
           <iframe v-else