diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue
index 90fa94af..2c5b5b16 100644
--- a/src/components/drawers/ActiveAttendance.vue
+++ b/src/components/drawers/ActiveAttendance.vue
@@ -11,14 +11,14 @@
起止时间:{{
- datasource.info && datasource.info.liveStartTime ? datasource.info.liveStartTime : "-"
+ datasource.startTime ? datasource.startTime : "-"
}}
~
- {{ datasource.info && datasource.info.liveEndTime ? datasource.info.liveEndTime : "-" }}
+ {{ datasource.endTime ? datasource.endTime : "-" }}
-
签到时间:{{ beginTime }}
-
签退时间:{{ endTime }}
+
签到时间:{{ beginTime }} ~ {{ endTime }}
+
@@ -354,25 +354,24 @@ export default {
// 计算签到时间
const isSignClick = () => {
- // debugger
- console.log("计算签到时间", props.datasource.info);
- let beginTime = new Date(props.datasource.info.liveStartTime).getTime();
- let endTime = !props.datasource.info.afterSignIn
- ? new Date(props.datasource.info.liveEndTime).getTime()
- : new Date(props.datasource.info.liveStartTime).getTime();
+ console.log("计算签到时间", props.datasource);
+ let beginTime = new Date(props.datasource.startTime).getTime();
+ let endTime = !props.datasource.afterStart
+ ? new Date(props.datasource.endTime).getTime()
+ : new Date(props.datasource.startTime).getTime();
- if (props.datasource.info.beforeSignIn && props.datasource.info.afterSignIn) {
+ if (props.datasource.beforeStart && props.datasource.afterStart) {
//有开始前有开始后
- beginTime = beginTime - props.datasource.info.beforeSignIn * 60 * 1000;
- endTime = endTime + props.datasource.info.afterSignIn * 60 * 1000;
+ beginTime = beginTime - props.datasource.beforeStart * 60 * 1000;
+ endTime = endTime + props.datasource.afterStart * 60 * 1000;
console.log("1111", beginTime, endTime);
- } else if (props.datasource.info.beforeSignIn && !props.datasource.info.afterSignIn) {
+ } else if (props.datasource.beforeStart && !props.datasource.afterStart) {
//只有开始前无开始后
- beginTime = beginTime - props.datasource.info.beforeSignIn * 60 * 1000;
+ beginTime = beginTime - props.datasource.beforeStart * 60 * 1000;
console.log("11112222", beginTime);
- } else if (!props.datasource.info.beforeSignIn && props.datasource.info.afterSignIn) {
+ } else if (!props.datasource.beforeStart && props.datasource.afterStart) {
//无开始前有开始后
- endTime = endTime + props.datasource.info.afterSignIn * 60 * 1000;
+ endTime = endTime + props.datasource.afterStart * 60 * 1000;
console.log("1111333", endTime);
}
@@ -393,7 +392,6 @@ export default {
};
const getTableData = () => {
- debugger
// debugger
console.log('当前是项目还是路径图 1 项目 2 路径图', props)
console.log('当前是项目还是路径图 1 项目 2 路径图', props.types)
@@ -690,7 +688,6 @@ export default {
{
- debugger
{/* debugger */ }
console.log("点击签到", value);
// 获取当前时间
@@ -858,7 +855,6 @@ export default {
// 导出数据
function exportTaskStu() {
- debugger
{/* debugger */ }
console.log("props.datasource此处的taskId 应该是router_task 表中主键", props.datasource);
console.log("props.datasource", props.datasource);
diff --git a/src/components/student/ChangeGroupModal.vue b/src/components/student/ChangeGroupModal.vue
index ab4fa38f..c88bb7d8 100644
--- a/src/components/student/ChangeGroupModal.vue
+++ b/src/components/student/ChangeGroupModal.vue
@@ -85,7 +85,6 @@ const selectGroup = (e, v) => {
};
//确认换组
const changeGroup = (item) => {
- debugger
console.log("换组", selectGroupId.value, item);
props.checkgroupStuId.forEach(stu => {
let obj = {
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index e6ce26d4..bd9e004a 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -427,7 +427,6 @@ const stuRowSelection = computed(() => ({
//显示学员换组弹窗
function showChangeGroupModal() {
- debugger
console.log("批量")
const d = props.groupList
console.log("d" + d)
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index c1ed3866..b9b1e719 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -3747,7 +3747,7 @@ export default defineComponent({
state.cstm_hs = true;
state.kk_eidt = true;
};
- const columnFun = (itm) => {
+ const columnFun = () => {
//新加
state.stuColumns = [
{
diff --git a/vue.config.js b/vue.config.js
index 6723a260..dd5b1af5 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -15,8 +15,8 @@ module.exports = defineConfig({
port: 8070,
proxy: {
"/manageApi": {
- target: 'http:' + process.env.VUE_APP_PROXY_URL,
- //target: 'http://localhost:30001',
+ // target: 'http:' + process.env.VUE_APP_PROXY_URL,
+ target: 'http://localhost:30001',
changeOrigin: true, //表示是否改变原域名
pathRewrite: {
"^/manageApi": "",