zdg #96

Merged
zhengdegang merged 2 commits from zdg into main 2024-08-02 16:09:32 +08:00
7 changed files with 335 additions and 127 deletions
Showing only changes of commit 99c6fe85d4 - Show all commits

View File

@ -17,3 +17,20 @@ export function listEntpcourse(query) {
params: query
})
}
// 布置作业
export function saveByClassWorkArray(data) {
return request({
url: '/education/classwork/saveByClassWorkArray',
method: 'post',
data: data
})
}
// 删除classwork 作业
export function delClasswork(id) {
return request({
url: '/education/classwork/' + id,
method: 'delete'
})
}

View File

@ -158,13 +158,19 @@ const getSubject = async () => {
curBookId.value = subjectList.value[0].id
}
const isHaveUnit = (id) => {
return evaluationList.value.some(item => {
return item.rootid == id
})
}
const getTreeData = () => {
//
let upData = transData(volumeOne.value)
let downData = transData(volumeTwo.value)
treeData.value = upData.length ? upData : downData
defaultExpandedKeys.value = [treeData.value[0].id]
nextTick(() => {
defaultExpandedKeys.value = [treeData.value[0].id]
currentNodeId.value = getLastLevelData(treeData.value)[0].id
currentNodeName.value = getLastLevelData(treeData.value)[0].label
emitChangeBook()

View File

@ -6,8 +6,19 @@
</div>
<div class="prepare-body-main-item-info" @click="openFileWin(item)">
<div class="prepare-item-info-title" :title="item.fileShowName">
<div></div>
<div
style="
flex: 1;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
width: 200px;
"
>
{{ item.fileShowName }}
</div>
</div>
<div class="prepare-item-info-message">
<div style="width: 60px">
<template v-if="item.uniquekey">
@ -27,15 +38,21 @@
</template>
</div>
<template v-if="item.fileSize">|</template>
<div style="width: 70px" v-if="item.fileSize">{{ formatFileSize(item.fileSize) }}</div>
<div v-if="item.fileSize" style="width: 70px">{{ formatFileSize(item.fileSize) }}</div>
<template v-if="item.uploadTime">|</template>
<div style="width: 70px" v-if="item.uploadTime">{{ toTimeText(item.uploadTime, true) }}</div>
<div v-if="item.uploadTime" style="width: 70px">
{{ toTimeText(item.uploadTime, true) }}
</div>
<template v-if="item.levelFirstName">|&nbsp;</template>
<div
v-if="item.levelFirstName"
style="
flex: 1;
text-align: left;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
width: 200px;
"
:title="
item.levelFirstName +
@ -70,7 +87,7 @@
</el-button>
</div>
<div class="item-popover-item">
<el-button text @click="deleteTalk(item)">
<el-button text @click="deleteHomework(item)">
<i class="iconfont icon-shanchu"></i>
<span>删除</span>
</el-button>
@ -142,10 +159,10 @@ export default {
}
}
},
emits: { 'on-move': null, 'on-delete': null, 'on-set': null },
emits: { 'on-move': null, 'on-delete': null, 'on-set': null, 'on-delhomework': null },
data() {
return {
listenList: [],
listenList: []
}
},
methods: {
@ -229,8 +246,12 @@ export default {
})
},
//
setHomeWork(item){
setHomeWork(item) {
this.$emit('on-set', item)
},
//
deleteHomework(item){
this.$emit('on-delhomework', item)
}
}
}
@ -259,9 +280,9 @@ export default {
display: flex;
justify-content: center;
align-items: center;
.icon-zuoye{
.icon-zuoye {
font-size: 40px;
color: #707070
color: #707070;
}
}
@ -281,9 +302,7 @@ export default {
.prepare-item-info-title {
text-align: left;
font-size: 16px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
display: flex;
}
.prepare-item-info-message {

View File

@ -1,20 +1,21 @@
<template>
<el-dialog v-model="dialogVisible" center top="10vh" width="600px" :show-close="false"
<el-dialog v-model="dialogVisible" center top="10vh" width="600px" :show-close="false" append-to-body
style="border-radius: 10px; padding: 10px 15px;">
<template #header>
<div class="homerwork-header flex">
<span>布置作业</span>
<i class="iconfont icon-guanbi" @click="cloneDialog"></i>
</div>
</template>
<div>
<el-form :model="form" label-width="80px">
<el-form-item label="班级">
<el-tree ref="treeRef" :data="treeData" :props="defaultProps" :load="getLoad" node-key="id"
<div v-loading="setLoading">
<el-form :model="form" label-width="80px" ref="ruleForm" :rules="rules">
<el-form-item label="班级" prop="grade">
<el-scrollbar max-height="200px" style="width: 100%;">
<el-tree ref="treeRef" :data="gradeList" :props="defaultProps" :load="getLoad" node-key="id"
@check="handleCheckChange" lazy show-checkbox />
</el-scrollbar>
</el-form-item>
<el-form-item label="选中学生">
<el-form-item label="选中学生" prop="student">
<el-scrollbar max-height="200px">
<el-tag v-for="(tag, index) in studentList" :key="tag.studentid" closable type="primary"
@close="delStudent(index)">
@ -22,17 +23,17 @@
</el-tag>
</el-scrollbar>
</el-form-item>
<el-form-item label="完成要求">
<el-radio-group v-model="form.feedtype">
<el-form-item label="完成要求" prop="feedback">
<el-radio-group v-model="form.feedback">
<el-radio value="必做" size="large">必做</el-radio>
<el-radio value="选做" size="large">选做</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="截至时间">
<el-date-picker v-model="endTime" value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="请选择截至时间"
@change="changeTime" />
<el-form-item label="截止时间" prop="deaddate">
<el-date-picker v-model="form.deaddate" value-format="YYYY-MM-DD HH:mm" format="YYYY-MM-DD HH:mm"
time-format="HH:mm" type="datetime" :clearable="false" placeholder="请选择截止时间" />
</el-form-item>
<el-form-item label="推荐用时">
<el-form-item label="推荐用时" prop="timelength">
<el-input-number v-model="form.timelength" :min="1" :max="500" />
</el-form-item>
</el-form>
@ -41,7 +42,7 @@
<template #footer>
<div class="dialog-footer">
<el-button @click="cloneDialog">取消</el-button>
<el-button type="primary" @click="dialogVisible = false">
<el-button type="primary" @click="onSubmit('ruleForm')">
确定
</el-button>
</div>
@ -50,17 +51,27 @@
</template>
<script>
import { ElMessage } from 'element-plus'
import { listClassmain, listClassgroup } from '@/api/classManage/index'
import { saveByClassWorkArray } from '@/api/teaching/classwork'
import useUserStore from '@/store/modules/user'
import { uniqBy, cloneDeep } from 'lodash'
import { uniqBy, groupBy } from 'lodash'
export default {
props: {
modelValue: {
type: Boolean,
default: false
},
entpcourseid: {
default: ''
},
row: {
default: ''
}
},
data() {
return {
dialogVisible: false,
defaultProps: {
@ -68,7 +79,7 @@ export default {
label: 'label',
isLeaf: 'leaf',
},
treeData: [],
setLoading: false,
//
userInfo: null,
//
@ -80,19 +91,26 @@ export default {
studentList: [],
//
form: {
feedtype: '必做',
endTime: '',
feedback: '必做',
deaddate: '',
timelength: 1
},
endTime: ''
//
rules: {
grade: [
{ validator: this.validateGrade, trigger: 'blur' }
],
student: [
{ validator: this.validateStudent, trigger: 'blur' }
]
}
}
},
created() {
//
this.endTime = this.getCurrentDate() + ' ' + '10:00:00'
this.form.deaddate = this.getCurrentDate() + ' ' + '10:00:00'
this.userInfo = useUserStore().user
this.getGradeList()
},
methods: {
//
@ -104,28 +122,31 @@ export default {
item.level = 0
item.children = []
item.classstudentlist = JSON.parse("[" + item.classstudentlist + "]")
item.classstudentlist.forEach(el => {
el.classId = item.id
})
})
console.log(list)
this.gradeList = list
this.treeData = list
})
},
//
getLoad(node, resolve) {
console.log(node.level)
if (node.level == 0) return resolve([])
//
if (node.level == 1) {
listClassgroup({ classid: node.key, orderby: 'orderidx', pageSize: 100 }).then(res => {
console.log(res)
if (res.rows.length > 0) {
let ary = []
res.rows.forEach(item => {
if (item.parentid === 0) {
//studentGroup
let studentGroup = JSON.parse("[" + item.studentlist + "]")
studentGroup.forEach(el => {
el.label = el.name
el.leaf = true
el.level = 2,
el.id = el.studentid
el.classId = item.classid
})
ary.push({
label: item.groupname,
@ -135,7 +156,6 @@ export default {
})
}
})
// console.log(ary)
resolve(ary)
}
else {
@ -143,23 +163,28 @@ export default {
}
})
}
//
if (node.level == 2) {
resolve(node.data.children)
}
},
//
handleCheckChange(data, checked) {
this.studentList = []
//
let checkNodes = checked.checkedNodes
let ary = []
checkNodes.forEach(item => {
//
if (item.level == 0) {
ary = [...ary, ...(item.classstudentlist)]
}
//
if (item.level == 1) {
ary = [...ary, ...(item.children)]
}
//
if (item.level == 2) {
ary = [...ary, item]
}
@ -170,13 +195,63 @@ export default {
delStudent(index) {
this.studentList.splice(index, 1)
},
onSubmit(formName) {
this.$refs[formName].validate(valid => {
if (valid) {
/**
* 根据学生列表中的classId分班
* studentList 为选中的所有学生 这些学生可能来自不同班级
*/
let gradeObj = groupBy(this.studentList, 'classId')
//
let ary = []
for (const value in gradeObj) {
// AIx web
let obj = {
id: 0,
parentid: this.row.id,
classid: value,
classcourseid: 0,
entpcourseid: this.entpcourseid,
studentlist: JSON.stringify(gradeObj[value]),
feedback: this.form.feedback,
workkey: "",
timelength: this.form.timelength,
weights: 1,
deaddate: this.form.deaddate,
workdate: this.getCurrentDate(),
uniquekey: this.row.uniquekey,
entpcourseworklist: "[" + this.row.entpcourseworklist + "]",
needMsgNotifine: 'false',
msgkey: 'newclasswork',
title: "作业任务",
msgcontent: '',
teachername: this.userInfo.nickName,
unixstamp: new Date().getTime(),
}
ary.push(obj)
}
this.setLoading = true
saveByClassWorkArray({
classworkarray: JSON.stringify(ary)
}).then(() => {
this.setLoading = false
ElMessage.success('操作成功')
this.cloneDialog()
}).catch(()=>{
this.setLoading = false
})
} else {
return false
}
})
},
//
cloneDialog() {
this.$emit('on-close')
},
//
changeTime(value) {
console.log(value, 100)
this.studentList = []
this.$refs['ruleForm'].resetFields();
},
//
getCurrentDate() {
@ -185,13 +260,33 @@ export default {
const month = now.getMonth() + 1; // 0+1
const day = now.getDate()
return `${year}-${month.length == 2 ? month : '0' + month}-${day.length == 2 ? day : '0' + day}`;
},
validateGrade(rule, value, callback) {
if (this.studentList.length == 0) {
callback(new Error('请勾选班级或者学生'));
}
else {
callback()
}
},
validateStudent(rule, value, callback) {
if (this.studentList.length == 0) {
callback(new Error('学生不能为空'));
}
else {
callback()
}
},
},
watch: {
modelValue(val) {
this.dialogVisible = val
if (val) {
this.getGradeList()
}
}
},
}
</script>
@ -212,4 +307,14 @@ export default {
margin-right: 10px;
margin-bottom: 10px;
}
.dialog-footer{
padding-bottom: 10px
}
:deep(.el-checkbox){
transform : scale(1.3)
}
:deep(.el-icon){
transform : scale(1.3)
}
</style>

View File

@ -65,8 +65,9 @@
@on-move="onMoveSingleFile"
@on-delete="deleteTalk"
@on-set="openSet"
@on-delhomework="delhomework"
>
<el-checkbox label="" :value="item" />
<el-checkbox label="" :value="item" v-if="!item.uniquekey"/>
</file-list-item>
</el-checkbox-group>
<file-oper-batch
@ -82,7 +83,7 @@
</div>
<MoveFile v-model="isMoveDialogOpen" @on-submit="chooseMoveCata" />
<uploadDialog v-model="isDialogOpen" @submit-file="submitFile" />
<SetHomework v-model="setDialog" @on-close="closeHomework" />
<SetHomework v-model="setDialog" :entpcourseid="entpcourseid" :row="row" @on-close="closeHomework" />
</div>
</template>
<script setup>
@ -106,6 +107,7 @@ import SetHomework from './container/set-homework.vue'
import outLink from '@/utils/linkConfig'
import { createWindow } from '@/utils/tool'
import { uniqBy, cloneDeep } from 'lodash'
import { delClasswork } from '@/api/teaching/classwork'
const { ipcRenderer } = window.electron || {}
@ -147,7 +149,8 @@ export default {
entpcourseid: '',
timerId: null,
//
setDialog: false
setDialog: false,
row: ''
}
},
computed: {
@ -309,9 +312,10 @@ export default {
this.uploadData.textbookId = data.textBook.curBookId
await this.asyncAllFile()
if (this.uploadData.levelSecondId) {
// ID
const res = await this.getChapterId()
this.entpcourseid = res.rows[0].id
// ID
const { rows } = await this.getChapterId()
if(!rows.length) return
this.entpcourseid = rows[0].id
//
this.getHomeWorkList()
}
@ -339,7 +343,7 @@ export default {
pageSize: 500
})
},
//
//
createTimer() {
this.timerId = setInterval(() => {
this.getHomeWorkList()
@ -412,9 +416,22 @@ export default {
})
},
//
openSet() {
openSet(row) {
this.row = row
this.setDialog = true
},
//
delhomework(item){
this.isLoading = true
delClasswork(item.id).then( async res =>{
ElMessage.success('操作成功')
this.isLoading = false
await this.asyncAllFile()
this.getHomeWorkList()
}).catch(()=>{
this.isLoading = false
})
},
closeHomework() {
this.setDialog = false
},

View File

@ -1,13 +1,31 @@
<template>
<div class="resource-list" v-loading="sourceStore.loading">
<el-scrollbar height="400px">
<el-empty description="暂无数据" v-if="!sourceStore.result.list.length" />
<div v-loading="sourceStore.loading" class="resource-list">
<el-scrollbar>
<el-empty v-if="!sourceStore.result.list.length" description="暂无数据" />
<ul>
<li class="list-item" v-for="item in sourceStore.result.list" :key="item.id" @click="handleRow">
<li
v-for="item in sourceStore.result.list"
:key="item.id"
class="list-item"
@click="handleRow"
>
<div class="item-left flex">
<FileImage :fileName="item.fileShowName" :size="50" />
<FileImage :file-name="item.fileShowName" :size="50" />
<div class="flex item-left-content">
<div class="name flex">{{ item.fileShowName }}</div>
<div class="name flex" :title="item.fileShowName">
<div></div>
<div
style="
flex: 1;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
width: 200px;
"
>
{{ item.fileShowName }}
</div>
</div>
<div class="item-tags flex">
<el-tag type="info" class="mr-10">{{ item.fileFlag }}</el-tag>
<el-tag type="info" class="mr-10">{{ getFileSuffix(item.fileShowName) }}</el-tag>
@ -18,10 +36,16 @@
</div>
</div>
<div class="item-btns" @click.stop>
<el-popover placement="bottom-end" trigger="hover" popper-class="custom-popover"
:visible="item.showPopover">
<el-popover
placement="bottom-end"
trigger="hover"
popper-class="custom-popover"
:visible="item.showPopover"
>
<template #reference>
<el-button link type="primary"> <i class="iconfont icon-shenglvehao"></i></el-button>
<el-button link type="primary">
<i class="iconfont icon-shenglvehao"></i
></el-button>
</template>
<template #default>
<div class="item-popover">
@ -29,7 +53,11 @@
<i class="iconfont icon-bianji"></i>
<span>编辑</span>
</div>
<div class="item-popover-item" v-if="userInfo.userId == item.uploadUserId" @click="delRow(item)">
<div
v-if="userInfo.userId == item.uploadUserId"
class="item-popover-item"
@click="delRow(item)"
>
<i class="iconfont icon-shanchu"></i>
<span>删除</span>
</div>
@ -37,24 +65,29 @@
<i class="iconfont icon-xiazai"></i>
<span>下载</span>
</div>
</div>
</template>
</el-popover>
<el-button size="small" plain round type="primary" @click="addLesson(item)">
<i class="iconfont icon-jiahao"></i>
备课</el-button>
备课</el-button
>
</div>
</li>
</ul>
</el-scrollbar>
<div class="pagination-box">
<el-pagination v-model:current-page="sourceStore.query.pageNum" v-model:page-size="sourceStore.query.pageSize"
:page-sizes="[10, 20, 30, 50]" background layout="total, sizes, prev, pager, next, jumper"
:total="sourceStore.result.total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
<el-pagination
v-model:current-page="sourceStore.query.pageNum"
v-model:page-size="sourceStore.query.pageSize"
:page-sizes="[10, 20, 30, 50]"
background
layout="total, sizes, prev, pager, next, jumper"
:total="sourceStore.result.total"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
/>
</div>
</div>
</template>
@ -108,7 +141,7 @@ const editRow = (item) => {
}
})
})
.catch(() => { })
.catch(() => {})
}
//
const delRow = (item) => {
@ -128,7 +161,7 @@ const addLesson = ({ id }) => {
let data = {
id,
fileRoot: '备课',
...(toRaw(sourceStore.nodeData)),
...toRaw(sourceStore.nodeData)
}
//
for (let key in data) {
@ -142,13 +175,12 @@ const addLesson = ({ id }) => {
addFileToPrepare(data).then(() => {
ElMessage.success('操作成功')
})
}
finally {
} finally {
sourceStore.loading = false
}
}
//
const handleRow = () =>{
const handleRow = () => {
ElMessage.warning('请先加入备课,在备课里面进行预览!')
}
</script>
@ -181,6 +213,10 @@ const handleRow = () =>{
}
.resource-list {
flex: 1;
display: flex;
flex-direction: column;
overflow: auto;
.list-item {
flex: 1;
padding: 10px 20px;
@ -189,10 +225,13 @@ const handleRow = () =>{
justify-content: space-between;
align-items: center;
cursor: pointer;
&:hover {
background-color: rgba(144, 147, 153, 0.2);
cursor: pointer;
}
.item-left {
align-items: center;
flex: 1;
.icon {
font-size: 50px;
}
@ -200,12 +239,14 @@ const handleRow = () =>{
.item-left-content {
margin-left: 10px;
flex-direction: column;
flex: 1;
text-align: left;
}
.name {
font-size: 14px;
color: #3b3b3b;
margin-bottom: 10px
margin-bottom: 10px;
}
.line {
@ -226,7 +267,6 @@ const handleRow = () =>{
color: #909399;
font-size: 13px;
}
}
&:last-child {
@ -258,15 +298,13 @@ const handleRow = () =>{
margin-right: 3px;
font-weight: bold;
}
}
}
.pagination-box {
margin-top: 20px;
display: flex;
justify-content: center;
height: 65px;
}
}
</style>

View File

@ -1,21 +1,28 @@
<template>
<div class="page-resource flex">
<!--左侧 教材 目录-->
<ChooseTextbook @changeBook="getData" @nodeClick="getData" />
<ChooseTextbook @change-book="getData" @node-click="getData" />
<div class="page-right">
<!-- 搜索 -->
<ResoureSearch #add>
<el-button v-if="sourceStore.isCreate" type="primary" round @click="openDialog" class="create-btn">
<el-button
v-if="sourceStore.isCreate"
type="primary"
round
class="create-btn"
@click="openDialog"
>
<i class="iconfont icon-jiahao"></i>
新建资源</el-button>
新建资源</el-button
>
</ResoureSearch>
<!-- 列表 -->
<ResoureList />
</div>
</div>
<!-- 上传弹窗 -->
<uploadDialog v-model="isDialogOpen" @submitFile="submitFile" />
<uploadDialog v-model="isDialogOpen" @submit-file="submitFile" />
<!-- <el-button @click="testClick">测试</el-button> -->
</template>
@ -40,7 +47,7 @@ onMounted(async () => {
// const res = await ipcMsgSend('tool-sphere:create', params)
// console.log('', res)
})
const testClick = async() => {
const testClick = async () => {
const win = await createWindow('tool-sphere', { url: '/tool/sphere' })
console.log('消息返回:', win)
}
@ -50,10 +57,9 @@ const getData = (data) => {
let textbookId = textBook.curBookId
let levelSecondId = node.id
let levelFirstId
if(node.parentNode){
if (node.parentNode) {
levelFirstId = node.parentNode.id
}
else{
} else {
levelFirstId = node.id
levelSecondId = ''
}
@ -63,7 +69,7 @@ const getData = (data) => {
sourceStore.nodeData = {
textbookId,
levelFirstId,
levelSecondId,
levelSecondId
}
sourceStore.handleQuery()
}
@ -73,7 +79,7 @@ const submitFile = (data) => {
let fileList = toRaw(data)
const { textbookId, levelFirstId, levelSecondId, fileSource, fileRoot } = sourceStore.query
//
fileList.forEach(item => {
fileList.forEach((item) => {
let fileData = { textbookId, levelFirstId, levelSecondId, fileSource, fileRoot }
fileData.fileShowName = item.fileData.fileShowName
fileData.fileFlag = item.fileData.fileFlag
@ -83,17 +89,15 @@ const submitFile = (data) => {
uploaderState().pushFile(fileList)
}
const fileCallBack = (res) => {
if (res.code == 200) {
sourceStore.handleQuery()
}
}
onMounted(()=>{
onMounted(() => {
sourceStore.getCreate()
})
</script>
<style lang="scss" scoped>
@ -103,6 +107,8 @@ onMounted(()=>{
.page-right {
min-width: 0;
display: flex;
flex-direction: column;
flex: 1;
margin-left: 20px;
height: 100%;
@ -116,7 +122,7 @@ onMounted(()=>{
font-weight: bold;
}
}
.create-btn{
.create-btn {
font-size: 13px;
padding: 5px 13px;
}