luoluo
/
ry_zhky
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/new-exam' into new-exam

Browse Source
pg_adapter
wangxy 9 months ago
parent 7bdd2687a0 1311d36649
commit 833ae3ac7e
2 changed files with 53 additions and 56 deletions
Show Stats Download Patch File Download Diff File

2
ruoyi-admin/src/main/resources/templates/system/elExam/onlineExam/toExam.html
Unescape View File

@ -56,7 +56,7 @@
<div><strong>试卷总分：</strong>[[${ exam.totalScore }]]分</div> <div><strong>试卷总分：</strong>[[${ exam.totalScore }]]分</div>
<div><strong>及格分数：</strong>[[${ exam.qualifyScore }]]分</div> <div><strong>及格分数：</strong>[[${ exam.qualifyScore }]]分</div>
<div><strong>考试描述：</strong>[[${ exam.content }]]</div> <div><strong>考试描述：</strong>[[${ exam.content }]]</div>
<div><strong>开放类型：</strong>[[${ exam.openType}]]</div> <div><strong>开放类型：</strong><span th:text="${exam.openType == 1 ? '完全开放' : (exam.openType == 2 ? '部门开放' : '默认值')}"></span></div>
</el-card> </el-card>

107
ruoyi-admin/src/main/resources/templates/system/elExam/userExam/view.html
Unescape View File

@ -2,66 +2,63 @@
<html lang="zh" xmlns:th="http://www.thymeleaf.org" > <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head> <head>
<th:block th:include="include :: header('详情')" /> <th:block th:include="include :: header('详情')" />
<th:block th:include="include :: element-css" />
</head> </head>
<body class="white-bg"> <body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content" > <div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
<tbody th:each="columns : ${list}"> <div>
<div style="border-bottom: 1px solid #ccc;line-height: 41px;box-sizing: border-box"> <el-card v-for="item in paperList" style="margin-bottom: 10px; line-height: 30px;">
<div class="row">
<div class="col-sm-6"> <el-row :gutter="20">
<div class="form-group"> <el-col :span="12">
<label class="col-sm-4 control-label">考试时间：</label> 考试时间：{{ formatDate(item.createTime) }}
<div class="col-sm-8"> </el-col>
<span class="date">[[${#dates.format(columns.updateTime, 'yyyy-MM-dd hh:MM:ss')}]]</span>
</div> <el-col :span="12">
</div> 考试用时：{{ item.userTime }}分钟
</div> </el-col>
<div class="col-sm-6">
<div class="form-group"> <el-col :span="12">
<label class="col-sm-4 control-label">考试用时：</label> 考试得分：{{ item.userScore }}
<div class="col-sm-8"> </el-col>
<span class="date">[[${columns.userTime}]]分钟</span>
</div> <el-col :span="12">
</div> 是否合格：{{ item.userScore > item.qualifyScore ?'是':'否' }}
</div> </el-col>
</div>
<div class="row"> <el-col :span="12">
<div class="col-sm-6"> 考试状态：{{ item.state | paperStateFilter }}
<div class="form-group"> </el-col>
<label class="col-sm-4 control-label">考试得分：</label>
<div class="col-sm-8"> </el-row>
<span class="date">[[${columns.userScore}]]</span>
</div> </el-card>
</div> </div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">及格分：</label>
<div class="col-sm-8">
<span class="date">[[${columns.qualifyScore}]]</span>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">考试状态：</label>
<div class="col-sm-8">
<span th:if="${columns.state} eq 0 ">考试中</span>
<span th:if="${columns.state} eq 1 ">待阅卷</span>
<span th:if="${columns.state} eq 2 ">已完成</span>
<span th:if="${columns.state} eq 3 ">弃考</span>
</div>
</div>
</div>
</div>
</div>
</tbody>
</div> </div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<th:block th:include="include :: element-js" />
<script th:inline="javascript"> <script th:inline="javascript">
var app = new Vue({
el: '#app',
data: {
paperList: []
},
mounted(){
this.paperList = [[${list}]];
},
methods:{
formatDate(dateString) {
const date = new Date(dateString);
const year = date.getFullYear();
const month = ('0' + (date.getMonth() + 1)).slice(-2);
const day = ('0' + date.getDate()).slice(-2);
const hours = ('0' + date.getHours()).slice(-2);
const minutes = ('0' + date.getMinutes()).slice(-2);
const seconds = ('0' + date.getSeconds()).slice(-2);
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
}
}
})
</script> </script>
</body> </body>
</html> </html>

Write Preview
Loading…
Cancel
Save