fix

src/api/index.js

@@ -43,4 +43,5 @@ export default {
 	removeImport: `occupationlab/occupationlab/experimentalReport/removeImport`,
 	getStartTime: `python/python/getStartTime`,
 	getProductSystemTheme: `nakadai/mall/getProductSystemTheme`,
+	heartbeatDetection : `nakadai/message/heartbeatDetection`,
 }

src/components/TestPanel.vue

@@ -439,6 +439,7 @@ export default {
       }
       this.competitionId && this.getCompetitionStatus() // 查询竞赛信息
       this.getUserDetail()
+      this.heartbeatDetection()
       this.drag()
       this.tableHeight = window.innerHeight - 360
     },
@@ -815,6 +816,8 @@ export default {
       const points = this.points
       // code和codeId,还有运行结果全部清空
       points.map(e => {
+        e.finalCode = ''
+        e.photoUrl = ''
         e.code = ''
         e.codeId = ''
         e.answer = ''
@@ -922,7 +925,7 @@ export default {
       const attributesReqList = []
       pointList.map(e => {
         attributesReqList.push({
-          code: e.code,
+          code: e.finalCode,
           codeId: e.codeId,
           bcId: e.judgmentId,
           isSubmit: e.codeId ? 1 : 0,
@@ -979,7 +982,10 @@ export default {
         this.submiting = false
         // 如果是竞赛，并且勾选了公布成绩详情的选项，则弹框提示
         if (this.competitionId) {
-          this.$alert(`提交成功！${this.resultAnnouncementTime != 0 ? '成绩将在' + this.resultAnnouncementTime + '小时后发布，请去参赛信息模块查看' : ''}`, '提示', {
+          const time = this.resultAnnouncementTime
+          const msg =
+            time === '0' ? '提交成功！成绩将在比赛结束后公布，请前往参赛信息模块查看' : time > 0 ? `提交成功！成绩将在比赛结束后${time}小时公布，请前往参赛信息模块查看` : '提交成功';
+          this.$alert(msg, '提示', {
             confirmButtonText: '确定',
             callback: action => {
               this.$parent.back()
@@ -1170,9 +1176,9 @@ export default {
       console.log(JSON.parse(msg.data));
       const { content } = JSON.parse(msg.data)
       // 1赛事、2创业、3考核、4模型。-号拼接携带id
-      if (content == 1) {
+      if (content == 1 && this.projectPermissions === 2) {
         this.getCompetitionStatus()
-      } else if (content === '3-' + this.assessmentId) { // 考核：3-考核id
+      } else if ((content === '3-' + this.assessmentId) && this.projectPermissions === 1) { // 考核：3-考核id
         this.getAssStatus()
       }
     },
@@ -1192,6 +1198,12 @@ export default {
       // 监听socket消息
       this.socket.onmessage = this.getMessage;
     },
+    // 心跳检测
+    heartbeatDetection () {
+      setInterval(async () => {
+        await this.$get(this.api.heartbeatDetection)
+      }, 58 * 1000)
+    },
     // 获取用户详情
     getUserDetail () {
       this.$get(this.api.queryUserInfoDetails).then(res => {

src/components/codemirror.vue

@@ -201,7 +201,7 @@
             <el-button type="text"
                        @click="showCode(scope.row)">查看代码</el-button>
             <el-button type="text"
-                       @click="importCode(scope.row)">导入代码</el-button>
+                       @click="importCode(scope.row)">插入代码</el-button>
             <el-button type="text"
                        @click="del(scope.row)">删除</el-button>
           </template>
@@ -222,7 +222,7 @@
       </span>
     </el-dialog>
 
-    <el-dialog title="查看代码"
+    <el-dialog :title="curRow.judgmentName"
                :visible.sync="showVisible"
                width="700px"
                :close-on-click-modal="false"
@@ -239,7 +239,7 @@
                      name="result">
           <div style="position: relative">
             <div class="result"
-                 v-html="curResult"></div>
+                 v-html="curRow.runResults"></div>
             <div v-if="curPhotoUrl.length"
                  class="pics">
               <div class="pic-item"
@@ -258,7 +258,7 @@
             class="dialog-footer">
         <el-button size="small"
                    type="primary"
-                   @click="showSubmit">导入代码</el-button>
+                   @click="showSubmit">插入代码</el-button>
       </span>
     </el-dialog>
   </div>
@@ -314,7 +314,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', 'photoUrl', 'answer'],
+  props: ['judgmentId', 'code', 'finalCode', 'codeId', 'projectId', 'systemId', 'retResult', 'modelIsShow', 'photoUrl', 'answer'],
   data () {
     return {
       token: Cookie.get('admin-token'),
@@ -417,8 +417,8 @@ export default {
 
       showVisible: false,
       showActive: 'code',
+      curRow: {},
       curCode: '',
-      curResult: '',
       curPhotoUrl: [],
     };
   },
@@ -471,12 +471,15 @@ export default {
     },
     // 清屏
     clearCode () {
+      this.picSrcList = []
       this.codeVal = ''
       this.isError = ''
       this.runResult = ''
+      this.$emit('update:finalCode', '')
       this.$emit('update:codeId', '') // 更新coddeId
       this.$emit('update:answer', '') // 更新运行结果
       this.$emit('update:retResult', '') // 更新返回结果
+      this.$emit('update:photoUrl', '') // 更新返回结果
     },
     // 导入模型
     importModel () {
@@ -608,6 +611,7 @@ export default {
             this.isError = 1
             this.runResult += result
           }
+          this.$emit('update:finalCode', this.sourceCode)
           this.$emit('update:codeId', res.codeId) // 更新coddeId
           this.$emit('update:answer', this.runResult) // 更新运行结果
           this.$emit('update:retResult', data.retResult) // 更新返回结果
@@ -674,6 +678,7 @@ export default {
                 this.isError = 1
                 this.confirmInput(result)
               }
+              this.$emit('update:finalCode', code)
               this.$emit('update:codeId', res.codeId) // 更新coddeId
               this.$emit('update:answer', this.runResult) // 更新运行结果
               this.$emit('update:retResult', data.retResult) // 更新返回结果
@@ -710,6 +715,7 @@ export default {
                   this.picSrcList = photo.split(',')
                   this.$emit('update:photoUrl', photo)
                 }
+                this.$emit('update:finalCode', code)
                 this.$emit('update:codeId', res.codeId) // 更新coddeId
                 this.$emit('update:answer', result) // 更新运行结果
                 this.$emit('update:retResult', data.retResult) // 更新返回结果
@@ -864,9 +870,10 @@ export default {
     },
     // 查看代码
     showCode (row) {
+      this.curRow = row
       this.curCode = row.runCode
-      this.curResult = row.runResults
       this.curPhotoUrl = row.photoUrl ? row.photoUrl.split(',') : []
+      this.showActive = 'code'
       this.showVisible = true
     },
     // 导入代码

src/config/index.js

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

src/views/Home.vue

@@ -60,6 +60,7 @@
                       :projectId.sync="projectId"
                       :systemId.sync="systemId"
                       :code.sync="item.code"
+                      :finalCode.sync="item.finalCode"
                       :judgmentId="item.judgmentId"
                       :codeId.sync="item.codeId"
                       :answer.sync="item.answer"
@@ -82,10 +83,14 @@
                  ref="mainindex"
                  :workbench.sync="workbench"></testPanel>
     </div>
+
+    <div v-if="isSubmit"
+         class="mask"></div>
   </div>
 </template>
 
 <script>
+import newmain from "../util/newMain";
 import testPanel from "../components/TestPanel";
 import codemirror from "../components/codemirror";
 import Cookie from 'js-cookie'
@@ -95,6 +100,7 @@ export default {
   data () {
     return {
       Config,
+      isSubmit: Cookie.get('admin-isSubmit') == 'true' ? true : false, // 是否提交的标识
       loaded: false, // 页面是否加载完的标识，页面默认隐藏，一进来先显示加载条，接口加载完后再显示页面，不然一开始会一闪而过没有样式的页面
       loadIns: null, // loading实例
       competitionId: Cookie.get('admin-competitionId'),
@@ -140,6 +146,10 @@ export default {
     this.loadIns = Loading.service({
       background: 'rgba(255, 255, 255, .1)'
     })
+    //兄弟组件传值
+    newmain.$on("isSubmit", isSubmit => {
+      this.isSubmit = isSubmit
+    })
     this.autoLogout()
     // 绑定页面离开监听
     window.onbeforeunload = () => {
@@ -359,4 +369,13 @@ export default {
     opacity: 0.9;
   }
 }
+.mask {
+  z-index: 999;
+  position: absolute;
+  top: 58px;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  background-color: rgba(0, 0, 0, 0.3);
+}
 </style>