课程管理调整
This commit is contained in:
parent
efee6ddfc4
commit
36e9d7c6bd
@ -58,23 +58,16 @@
|
||||
<div style="width: 100%;">
|
||||
<div style="display: flex;flex-wrap:wrap;width: 100%;">
|
||||
<div style="width: 50%;padding: 20px;">
|
||||
<el-tag>学习时长:</el-tag>
|
||||
<el-table :data="learningTimeData" style="margin-top: 10px;" border>
|
||||
<el-table-column prop="lessonIds" label="学习课程">
|
||||
<template slot-scope="scope">
|
||||
<template v-for="lessonId in scope.row.lessonIds">
|
||||
<el-tag>{{ getLessonName(lessonId) }}</el-tag>
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="startTime" label="开始时间" />
|
||||
<el-table-column prop="endTime" label="截止时间" />
|
||||
<el-table-column prop="duration4FullMarks" label="学习时长" />
|
||||
<el-table-column prop="weight" label="权重占比(%)" width="100" />
|
||||
<el-tag>考勤:</el-tag>
|
||||
<el-table :data="attendanceData" style="margin-top: 10px;" border>
|
||||
<el-table-column prop="startDate" label="开始日期" />
|
||||
<el-table-column prop="endDate" label="截止日期" />
|
||||
<el-table-column prop="days4FullMarks" label="考勤天数" />
|
||||
<el-table-column prop="weight" label="权重占比(%)" />
|
||||
<el-table-column label="操作" width="100">
|
||||
<template slot-scope="scope">
|
||||
<el-button :disabled="isDetail" type="text" size="small" @click="editUsual(scope.row,scope.$index, 'learningTime')">编辑</el-button>
|
||||
<el-button :disabled="isDetail" type="text" size="small" @click="deleteUsual(scope.row, scope.$index, 'learningTime')">删除</el-button>
|
||||
<el-button :disabled="isDetail" type="text" size="small" @click="editUsual(scope.row,scope.$index, 'attendance')">编辑</el-button>
|
||||
<el-button :disabled="isDetail" type="text" size="small" @click="deleteUsual(scope.row, scope.$index, 'attendance')">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@ -96,17 +89,24 @@
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
<div style="width: 50%;padding: 20px;">
|
||||
<el-tag>考勤:</el-tag>
|
||||
<el-table :data="attendanceData" style="margin-top: 10px;" border>
|
||||
<el-table-column prop="startDate" label="开始日期" />
|
||||
<el-table-column prop="endDate" label="截止日期" />
|
||||
<el-table-column prop="days4FullMarks" label="考勤天数" />
|
||||
<el-table-column prop="weight" label="权重占比(%)" />
|
||||
<div style="width: 100%;padding: 20px;">
|
||||
<el-tag>学习时长:</el-tag>
|
||||
<el-table :data="learningTimeData" style="margin-top: 10px;" border>
|
||||
<el-table-column prop="lessonIds" label="学习课程">
|
||||
<template slot-scope="scope">
|
||||
<template v-for="lessonId in scope.row.lessonIds">
|
||||
<el-tag :key="lessonId">{{ getLessonName(lessonId) }}</el-tag>
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="startTime" label="开始时间" />
|
||||
<el-table-column prop="endTime" label="截止时间" />
|
||||
<el-table-column prop="duration4FullMarks" label="学习时长" />
|
||||
<el-table-column prop="weight" label="权重占比(%)" width="100" />
|
||||
<el-table-column label="操作" width="100">
|
||||
<template slot-scope="scope">
|
||||
<el-button :disabled="isDetail" type="text" size="small" @click="editUsual(scope.row,scope.$index, 'attendance')">编辑</el-button>
|
||||
<el-button :disabled="isDetail" type="text" size="small" @click="deleteUsual(scope.row, scope.$index, 'attendance')">删除</el-button>
|
||||
<el-button :disabled="isDetail" type="text" size="small" @click="editUsual(scope.row,scope.$index, 'learningTime')">编辑</el-button>
|
||||
<el-button :disabled="isDetail" type="text" size="small" @click="deleteUsual(scope.row, scope.$index, 'learningTime')">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
@ -28,6 +28,13 @@ export default {
|
||||
textAlign: 'right',
|
||||
reset: true,
|
||||
queryObject: {
|
||||
orgId:{
|
||||
type: 'select',
|
||||
label: '班级:',
|
||||
config: {
|
||||
data: []
|
||||
}
|
||||
},
|
||||
schoolYear: {
|
||||
type: 'select',
|
||||
label: '学年:',
|
||||
@ -123,6 +130,9 @@ export default {
|
||||
}
|
||||
getClassListUnPageSelf().then(resp => {
|
||||
this.classList = resp.data;
|
||||
this.classList.forEach(item => {
|
||||
this.ruleQueryForm.queryObject.orgId.config.data.push({ label: item.name, value: item.id });
|
||||
});
|
||||
});
|
||||
},
|
||||
methods: {
|
||||
|
Loading…
Reference in New Issue
Block a user