From b0254c5a17b3915eb00fdcb33f0eea222cff78ee Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 06 三月 2024 15:06:54 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord.js | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord.js b/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord.js
index c2d777f..4d4f177 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord.js
@@ -16,7 +16,13 @@
{field: 'selectItem', radio: true},
{title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'},
{title: '日期', field: 'classDate', align: 'center', valign: 'middle'},
- {title: '请假学员', field: 'registered', align: 'center', valign: 'middle'},
+ {title: '请假学员', field: 'registered', align: 'center', valign: 'middle',formatter: function (v, row) {
+ if (row.cancelClasses === undefined) {
+ return 0;
+ } else {
+ return v;
+ }
+ }},
{title: '实到学员', field: 'actualArrival', align: 'center', valign: 'middle',
formatter: function (v, row) {
if (row.cancelClasses === undefined) {
@@ -28,7 +34,7 @@
},
{title: '未到学员', field: 'nonArrival', align: 'center', valign: 'middle',
formatter: function (v, row) {
- if (row.absencesNumber === undefined) {
+ if (row.cancelClasses === undefined) {
return 0;
} else {
return v;
@@ -252,15 +258,9 @@
console.log("最终结果");
console.log(res);
// 获取当前时间
- let now = new Date();
-// 将指定时间转换为 Date 对象
- let specifiedTime = new Date(res);
+
// 比较当前时间是否大于指定时间
- if (now > specifiedTime) {
- console.log("当前时间大于指定时间");
- Feng.error("当前课程还未结束，不能上传消课记录")
- return
- }
+
let htmlStr =
'<div class="form-horizontal">' +
' <div class="col-sm-11" style="padding: 20px;">' +
@@ -310,7 +310,7 @@
}
let div_array = $('#cancelClasses').find('div');
let str = '';
- for (let i = 0; i < div_array.length; i++) {
+ for (let i = 1; i < div_array.length; i++) {
let v = $($(div_array[i]).find('img')[0]).attr('src');
str += v + ";";
}
--
Gitblit v1.7.1