diff --git a/pages/apply/subPages/SE/1trainNotifyEdit.vue b/pages/apply/subPages/SE/1trainNotifyEdit.vue
index 47c5a5d..5deea30 100644
--- a/pages/apply/subPages/SE/1trainNotifyEdit.vue
+++ b/pages/apply/subPages/SE/1trainNotifyEdit.vue
@@ -42,22 +42,22 @@
inputAlign="right" customStyle="margin:0px;display:flex;padding:3px 0px">
-
-
-
+
@@ -398,7 +398,7 @@
} = this.dateTimePickerInfo
if (name === 'TRAIN_START_TIME') {
this.model.TRAIN_START_TIME = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM')
- this.model.DT_START_SIGN =uni.$u.timeFormat(new Date(e.value - 5 * 60 * 1000), 'yyyy-mm-dd hh:MM');
+ // this.model.DT_START_SIGN =uni.$u.timeFormat(new Date(e.value - 5 * 60 * 1000), 'yyyy-mm-dd hh:MM');
} else if (name === 'TRAIN_END_TIME') {
this.model.TRAIN_END_TIME = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM')
} else if (name === 'DT_START_SIGN') {
@@ -410,8 +410,8 @@
this.model.HOURS = ((new Date(this.model.TRAIN_END_TIME).getTime() - new Date(this.model
.TRAIN_START_TIME).getTime()) / 1000 / 60 / 45.0).toFixed(1)
}
-
-
+
+
this.dateTimePickerInfo.showCheckDate = false
},
//时间end
diff --git a/pages/apply/subPages/SE/2trainRecordShow.vue b/pages/apply/subPages/SE/2trainRecordShow.vue
index ebf967b..e2a1b43 100644
--- a/pages/apply/subPages/SE/2trainRecordShow.vue
+++ b/pages/apply/subPages/SE/2trainRecordShow.vue
@@ -3,39 +3,52 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -52,26 +65,33 @@
-
-
附件
-
+
-
+
-
+
-
+
*
- 培训签到表
+
+ 培训签到表
@@ -85,37 +105,48 @@
-
+
-
+
-
+
-
-
+
+
- 查看试卷
-
+ 查看试卷
+
- 查看试卷
+ 查看试卷
-
+
@@ -128,10 +159,13 @@
-
- 签到
+
+ 签到
-
+
审阅
@@ -172,7 +206,7 @@
signable: false,
userId: uni.getStorageSync('appInfo').User.ID,
passRate: '100%',
- isCHECKTYPE:true
+ isCHECKTYPE: true
}
},
onLoad(option) {
@@ -269,22 +303,26 @@
// this.model.LEVEL = this.transLevel(this.model.Nav_Notify.LEVEL);
this.model.TRAIN_TIME = this.model.Nav_Notify.TRAIN_START_TIME?.substring(0, 16) + "~" + this
.model.Nav_Notify
- .TRAIN_END_TIME?.substring(0, 16);
+ .TRAIN_END_TIME?.substring(8, 16);
this.model.TRAINCONTENT = trainContent;
this.model.trainCour = trainCour;
this.model.MissUsers = MissUsers;
this.model.LeaveUsers = LeaveUsers;
this.model.Users = Users;
let passRateThis = 0
- let userAll = res.Nav_Users.filter(e => e.STATUS == 0 && e.ENABLE_STATUS == 0 && e.EXAMINATION_RESULTS != null)
- let userPass = res.Nav_Users.filter(e => e.STATUS == 0 && e.ENABLE_STATUS == 0 && e.EXAMINATION_RESULTS != null && e.EXAMINATION_RESULTS == 1)
+ let userAll = res.Nav_Users.filter(e => e.STATUS == 0 && e.ENABLE_STATUS == 0 && e
+ .EXAMINATION_RESULTS != null)
+ let userPass = res.Nav_Users.filter(e => e.STATUS == 0 && e.ENABLE_STATUS == 0 && e
+ .EXAMINATION_RESULTS != null && e.EXAMINATION_RESULTS == 1)
if (userAll && userAll.length > 0 && userPass && userPass.length > 0) {
passRateThis = (userPass.length / userAll.length).toFixed(4) * 100;
}
- this.passRate = passRateThis+'%'
- this.isCHECKTYPE = this.model.Nav_Notify.CHECKTYPE == 51||this.model.Nav_Notify.CHECKTYPE == 56||this.model.Nav_Notify.CHECKTYPE == 81
+ this.passRate = passRateThis + '%'
+ this.isCHECKTYPE = this.model.Nav_Notify.CHECKTYPE == 51 || this.model.Nav_Notify.CHECKTYPE ==
+ 56 || this.model.Nav_Notify.CHECKTYPE == 81
- this.signable = res.STATUS == 1 && res.Nav_Users && res.Nav_Users.find(it => it.USER_ID === this.userId) && (this.tableKey == "1")
+ this.signable = res.STATUS == 1 && res.Nav_Users && res.Nav_Users.find(it => it.USER_ID ===
+ this.userId) && (this.tableKey == "1")
this.isLoadOK = true;
})
},
@@ -321,9 +359,9 @@
return '公司 ';
}
},
- openTest(id,userid) {
+ openTest(id, userid) {
uni.navigateTo({
- url: '/pages/apply/subPages/SE/7answerPageEdit?ID=' + id+'&userID='+userid
+ url: '/pages/apply/subPages/SE/7answerPageEdit?ID=' + id + '&userID=' + userid
})
},
onTableBtnAgree() {