ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

考试时间显示时分秒

This commit is contained in:
zhujunjieit 2019-01-16 20:43:59 +08:00
parent 22aae32246
commit d8c6feae78
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ruoyi-admin/src/main/resources/static/ajax/libs/datapicker/bootstrap-datetimepicker.js vendored
View File

@ -1504,6 +1504,17 @@
suffix: ['st', 'nd', 'rd', 'th'],
today: 'Today',
clear: 'Clear'
},
"zh-Cn":{
days: ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六", "星期日"],
daysShort: ["周日", "周一", "周二", "周三", "周四", "周五", "周六", "周日"],
daysMin: ["日", "一", "二", "三", "四", "五", "六", "日"],
months: ["一月份", "二月份", "三月份", "四月份", "五月份", "六月份", "七月份", "八月份", "九月份", "十月份", "十一月份", "十二月份"],
monthsShort: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"],
meridiem:['上午', '下午'],
suffix:['st', 'nd', 'rd', 'th'],
today: "今天",
clear: "清空"
}
};

7
ruoyi-exam/src/main/resources/templates/exam/examExamination/add.html
View File

@ -3,7 +3,7 @@
<meta charset="utf-8">
<head th:include="include :: header"></head>
<link th:href="@{/ruoyi/css/ry-ui.css}" rel="stylesheet"/>
<link th:href="@{/ajax/libs/datapicker/datepicker3.css}" rel="stylesheet"/>
<link th:href="@{/ajax/libs/datapicker/bootstrap-datetimepicker.css}" rel="stylesheet"/>
<link th:href="@{/ajax/libs/layui/css/layui.css}" rel="stylesheet"/>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
@ -142,10 +142,11 @@
<div th:include="include::footer"></div>
<script th:src="@{/js/jquery-ui-1.10.4.min.js}"></script>
<script th:src="@{/ajax/libs/iCheck/icheck.min.js}"></script>
<script th:src="@{/ajax/libs//datapicker/bootstrap-datepicker.js}"></script>
<script th:src="@{/ajax/libs//datapicker/bootstrap-datetimepicker.js}"></script>
<script th:src="@{/ajax/libs/beautifyhtml/beautifyhtml.js}"></script>
<script type="text/javascript">
$(".input-group.date").datepicker({todayBtn: "linked",keyboardNavigation: !1,forceParse: !1,calendarWeeks: !0,autoclose: !0});
$(".input-group.date").datetimepicker({format : 'yyyy-mm-dd hh:mm:ss',
language:"zh-Cn",todayBtn: "linked",keyboardNavigation: !1,forceParse: !1,calendarWeeks: !0,autoclose: !0});
var prefix = ctx + "exam/examExamination"

5
ruoyi-exam/src/main/resources/templates/exam/examExamination/edit.html
View File

@ -70,7 +70,7 @@
<label class="col-sm-3 control-label">开始时间：</label>
<div class="col-sm-8">
<div class="input-group date"> <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
<input type="text" th:value="*{#dates.format(startTime, 'yyyy-MM-dd hh:mm:ss')}" id="startTime" name="endTime" class="form-control" >
<input type="text" th:value="*{#dates.format(startTime, 'yyyy-MM-dd hh:mm:ss')}" id="startTime" name="startTime" class="form-control" >
</div>
</div>
</div>
@ -155,7 +155,8 @@
<script th:src="@{/ajax/libs//datapicker/bootstrap-datetimepicker.js}"></script>
<script th:src="@{/ajax/libs/beautifyhtml/beautifyhtml.js}"></script>
<script type="text/javascript">
$(".input-group.date").datepicker({format : 'yyyy-mm-dd hh:mm:ss',todayBtn: "linked",keyboardNavigation: !1,forceParse: !1,calendarWeeks: !0,autoclose: !0});
$(".input-group.date").datetimepicker({format : 'yyyy-mm-dd hh:mm:ss',
language: "zh-Cn",todayBtn: "linked",keyboardNavigation: !1,forceParse: !1,calendarWeeks: !0,autoclose: !0});
var prefix = ctx + "exam/examExamination"
$(function () {

7
ruoyi-exam/src/main/resources/templates/exam/examExamination/examExamination.html
View File

@ -74,7 +74,6 @@
{
field : 'name',
title : '试卷名称',
sortable: true
},
// {
// field : 'enableControlTime',
@ -84,17 +83,14 @@
{
field : 'startTime',
title : '开始时间',
sortable: true
},
{
field : 'endTime',
title : '结束时间',
sortable: true
},
{
field : 'timeLength',
title : '考试时长（分钟）',
sortable: true
},
// {
// field : 'examNumber',
@ -104,7 +100,6 @@
{
field : 'passMark',
title : '及格分数',
sortable: true
},
// {
// field : 'questionDisorder',
@ -124,7 +119,6 @@
{
field : 'examinationUserLimit',
title : '考试对象',
sortable: true,
formatter: function(value, item, index) {
debugger
return $.table.selectDictLabel(examinationUserLimit, item.examinationUserLimit);
@ -133,7 +127,6 @@
{
field : 'createBy',
title : '创建者',
sortable: true
},
{
field : 'createDate',