huoran
/
FE_python_trial
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 8 Wiki Activity

缓存运行结果

Browse Source
master
yujialong 9 months ago
parent 8198ae9034
commit 2d4ad84aa6
3 changed files with 56 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      src/components/TestPanel.vue
  2. 42
      src/components/codemirror.vue
  3. 2
      src/config/index.js

32
src/components/TestPanel.vue
Unescape View File

@ -119,7 +119,7 @@
:subfield="false" :subfield="false"
:editable="false" :editable="false"
:toolbarsFlag="false" :toolbarsFlag="false"
:boxShadowStyle="none" /> boxShadowStyle="none" />
</div> </div>
</div> </div>
<div class="aside-footer"> <div class="aside-footer">
@ -194,7 +194,7 @@
:subfield="false" :subfield="false"
:editable="false" :editable="false"
:toolbarsFlag="false" :toolbarsFlag="false"
:boxShadowStyle="none" /> boxShadowStyle="none" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="实验要求" <el-tab-pane label="实验要求"
name="second"> name="second">
@ -221,7 +221,7 @@
:subfield="false" :subfield="false"
:editable="false" :editable="false"
:toolbarsFlag="false" :toolbarsFlag="false"
:boxShadowStyle="none" /> boxShadowStyle="none" />
</el-collapse-item> </el-collapse-item>
</el-collapse> </el-collapse>
</el-tab-pane> </el-tab-pane>
@ -242,7 +242,7 @@
:subfield="false" :subfield="false"
:editable="false" :editable="false"
:toolbarsFlag="false" :toolbarsFlag="false"
:boxShadowStyle="none" /> boxShadowStyle="none" />
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</el-main> </el-main>
@ -649,12 +649,16 @@ export default {
cid // 课程id cid // 课程id
}).then(res => { }).then(res => {
this.closeLoad() this.closeLoad()
const code = res.getLastCache const result = res.runningResult
// 如果有缓存代码 // 如果有缓存代码
if (code) { if (result) {
hasCache = 1 hasCache = 1
if (newJudgmentId === '') newJudgmentId = i if (newJudgmentId === '') newJudgmentId = i
e.code = code e.code = result.code
e.codeId = result.id
e.answer = result.runResult
e.retResult = result.retResult
e.photoUrl = result.runPhotoUrl
} }
resolve() resolve()
}).catch(res => { }).catch(res => {
@ -677,7 +681,13 @@ export default {
this.getProDetail().then(() => { this.getProDetail().then(() => {
this.points.map(e => { this.points.map(e => {
const item = points.find(n => n.judgmentId === e.judgmentId) const item = points.find(n => n.judgmentId === e.judgmentId)
if (item && item.code) this.$set(e, 'code', item.code) if (item) {
item.code && this.$set(e, 'code', item.code)
item.codeId && this.$set(e, 'codeId', item.codeId)
item.answer && this.$set(e, 'answer', item.answer)
item.photoUrl && this.$set(e, 'photoUrl', item.photoUrl)
this.$set(e, 'retResult', isNaN(item.retResult) ? '' : item.retResult)
}
}) })
this.$emit('tell', projectId, this.curSystemId, this.points) this.$emit('tell', projectId, this.curSystemId, this.points)
this.$emit('recoveryCode', newJudgmentId + '') // 切换为缓存的判分点，tab索引值要为字符串 this.$emit('recoveryCode', newJudgmentId + '') // 切换为缓存的判分点，tab索引值要为字符串
@ -685,7 +695,11 @@ export default {
} else { } else {
this.points.map(e => { this.points.map(e => {
const item = points.find(n => n.judgmentId === e.judgmentId) const item = points.find(n => n.judgmentId === e.judgmentId)
if (item && item.code) this.$set(e, 'code', item.code) item.code && this.$set(e, 'code', item.code)
item.codeId && this.$set(e, 'codeId', item.codeId)
item.answer && this.$set(e, 'answer', item.answer)
item.photoUrl && this.$set(e, 'photoUrl', item.photoUrl)
this.$set(e, 'retResult', isNaN(item.retResult) ? '' : item.retResult)
}) })
this.$emit('tell', projectId, this.curSystemId, this.points) this.$emit('tell', projectId, this.curSystemId, this.points)
this.$emit('recoveryCode') this.$emit('recoveryCode')

42
src/components/codemirror.vue
Unescape View File

@ -71,7 +71,7 @@
<el-tabs> <el-tabs>
<el-tab-pane label="参考答案"> <el-tab-pane label="参考答案">
<div :class="['answer-wrap', {client: !fromManager}]" <div :class="['answer-wrap', {client: !fromManager}]"
v-html="answer"></div> v-html="correctAnswer"></div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</el-dialog> </el-dialog>
@ -142,6 +142,12 @@
width="1200px" width="1200px"
:close-on-click-modal="false" :close-on-click-modal="false"
custom-class="code-dia"> custom-class="code-dia">
<el-tooltip class="item"
content="列表中展示当前课程已提交的实验代码"
placement="right">
<i class="info el-icon-warning"
style="margin-right: 10px"></i>
</el-tooltip>
<div class="tool"> <div class="tool">
<el-input style="width: 250px" <el-input style="width: 250px"
placeholder="请输入项目名称、判分点名称" placeholder="请输入项目名称、判分点名称"
@ -308,7 +314,7 @@ import config from '@/config'
import { saveAs } from 'file-saver' import { saveAs } from 'file-saver'
const CANCEL_TOKEN = axios.CancelToken // 用于input中中断请求 const CANCEL_TOKEN = axios.CancelToken // 用于input中中断请求
export default { export default {
props: ['judgmentId', 'code', 'codeId', 'projectId', 'systemId', 'retResult', 'modelIsShow', 'photoUrl'], props: ['judgmentId', 'code', 'codeId', 'projectId', 'systemId', 'retResult', 'modelIsShow', 'photoUrl', 'answer'],
data () { data () {
return { return {
token: Cookie.get('admin-token'), token: Cookie.get('admin-token'),
@ -318,10 +324,10 @@ export default {
courseId: Cookie.get('admin-courseId'), // 课程id courseId: Cookie.get('admin-courseId'), // 课程id
mallId: Cookie.get('admin-mallId'), mallId: Cookie.get('admin-mallId'),
isPrac: false, // 练习 isPrac: false, // 练习
answer: '', // 正确答案 correctAnswer: '', // 正确答案
codeVal: this.code, codeVal: this.code,
runResult: '', // 运行结果 runResult: this.answer, // 运行结果
isError: false, // 运行正确与否 isError: this.retResult, // 运行正确与否
errLine: '', // 错误代码的位置 errLine: '', // 错误代码的位置
isSubmit: Cookie.get('admin-isSubmit') == 'true' ? true : false, // 是否提交的标识 isSubmit: Cookie.get('admin-isSubmit') == 'true' ? true : false, // 是否提交的标识
runEnable: false, // 是否禁用运行按钮 runEnable: false, // 是否禁用运行按钮
@ -431,6 +437,12 @@ export default {
}, },
}, },
mounted () { mounted () {
// 缓存里返回了运行结果并且是错误的运行，则获取第几行有错误
if (this.runResult && this.isError === 0) this.errLine = this.getErrLine(this.runResult)
// 缓存里返回了图片则分割成数组
if (this.photoUrl) this.picSrcList = this.photoUrl.split(',')
if (!this.assessmentId && !this.competitionId) this.isPrac = true if (!this.assessmentId && !this.competitionId) this.isPrac = true
//兄弟组件传值 //兄弟组件传值
newmain.$on("isSubmit", isSubmit => { newmain.$on("isSubmit", isSubmit => {
@ -587,7 +599,7 @@ export default {
const result = data.runResult const result = data.runResult
if (result.includes('File ')) { if (result.includes('File ')) {
this.runResult = result this.runResult = result
this.errLine = parseInt(result.substring(result.indexOf('line') + 4, result.length)) this.errLine = this.getErrLine(result)
this.isError = data.retResult this.isError = data.retResult
} else if (result.includes('validing:')) { } else if (result.includes('validing:')) {
this.isError = 1 this.isError = 1
@ -608,6 +620,10 @@ export default {
}).catch(err => { }) }).catch(err => { })
}, },
// 获取第几行代码有错误
getErrLine (result) {
return parseInt(result.substring(result.indexOf('line') + 4, result.length)) || 1
},
// 运行代码 // 运行代码
runCode (isWhile) { // isWhile为true表示代码里有while循环，右边的运行结果需要拼接展示，而不是直接覆盖 runCode (isWhile) { // isWhile为true表示代码里有while循环，右边的运行结果需要拼接展示，而不是直接覆盖
if (!this.isSubmit) { if (!this.isSubmit) {
@ -652,7 +668,7 @@ export default {
} else { } else {
this.runResult = result this.runResult = result
} }
this.errLine = parseInt(result.substring(result.indexOf('line') + 4, result.length)) this.errLine = this.getErrLine(result)
this.isError = data.retResult this.isError = data.retResult
} else if (result.includes('validing:')) { } else if (result.includes('validing:')) {
this.isError = 1 this.isError = 1
@ -709,7 +725,7 @@ export default {
const text = result.replace(photo, '') // 结果里包含了图片路径，所以要把图片路径给去掉 const text = result.replace(photo, '') // 结果里包含了图片路径，所以要把图片路径给去掉
this.runResult = text this.runResult = text
this.picSrcList = photo.split(',') this.picSrcList = photo.split(',')
this.errLine = parseInt(result.substring(result.indexOf("line") + 4, result.length)) this.errLine = this.getErrLine(result)
} else if (imgList instanceof Array && imgList.length && typeof firtImg === 'string' && (firtImg.includes('.jpg') || firtImg.includes('.png') || firtImg.includes('img'))) { } else if (imgList instanceof Array && imgList.length && typeof firtImg === 'string' && (firtImg.includes('.jpg') || firtImg.includes('.png') || firtImg.includes('img'))) {
/** /**
* 这段是为要下载图片的项目案例写的，后端会返回图片名称的数组，前端负责循环这个数组，然后下载下来 * 这段是为要下载图片的项目案例写的，后端会返回图片名称的数组，前端负责循环这个数组，然后下载下来
@ -722,7 +738,7 @@ export default {
} else { } else {
this.isError = data.retResult this.isError = data.retResult
this.runResult = result this.runResult = result
this.errLine = parseInt(result.substring(result.indexOf("line") + 4, result.length)) this.errLine = this.getErrLine(result)
} }
} else if (res.data && res.data.current) { } else if (res.data && res.data.current) {
// 进入运行队列 // 进入运行队列
@ -763,7 +779,7 @@ export default {
this.$get(this.api.queryBcJudgmentByBcId, { this.$get(this.api.queryBcJudgmentByBcId, {
bcId: this.judgmentId bcId: this.judgmentId
}).then(res => { }).then(res => {
this.answer = res.experimentCode this.correctAnswer = res.experimentCode
}).catch(err => { }) }).catch(err => { })
}, },
// 中间拖拽 // 中间拖拽
@ -1104,6 +1120,12 @@ export default {
.el-dialog__body { .el-dialog__body {
padding: 0 20px; padding: 0 20px;
} }
.info {
position: absolute;
top: 18px;
left: 100px;
color: #88aef5;
}
.code-tab { .code-tab {
.el-tabs__item.is-active { .el-tabs__item.is-active {
color: #333 !important; color: #333 !important;

2
src/config/index.js
Unescape View File

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

Write Preview
Loading…
Cancel
Save