diff --git a/src/renderer/src/api/teaching/classwork.js b/src/renderer/src/api/teaching/classwork.js index caeea2d..9412901 100644 --- a/src/renderer/src/api/teaching/classwork.js +++ b/src/renderer/src/api/teaching/classwork.js @@ -16,4 +16,21 @@ export function listEntpcourse(query) { method: 'get', 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' + }) } \ No newline at end of file diff --git a/src/renderer/src/components/move-file/index.vue b/src/renderer/src/components/move-file/index.vue index c53f726..4fd42d8 100644 --- a/src/renderer/src/components/move-file/index.vue +++ b/src/renderer/src/components/move-file/index.vue @@ -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() diff --git a/src/renderer/src/views/prepare/container/file-list-item.vue b/src/renderer/src/views/prepare/container/file-list-item.vue index 07e3489..849d7f0 100644 --- a/src/renderer/src/views/prepare/container/file-list-item.vue +++ b/src/renderer/src/views/prepare/container/file-list-item.vue @@ -6,36 +6,53 @@
- {{ item.fileShowName }} +
+
+ {{ item.fileShowName }} +
+ + + + + {{ item.async === true ? '已同步' : '' }} + {{ !item.async ? '待同步' : '' }} + {{ item.async === 'on' ? '同步中' : '' }} +
-
{{ formatFileSize(item.fileSize) }}
+
{{ formatFileSize(item.fileSize) }}
-
{{ toTimeText(item.uploadTime, true) }}
+
+ {{ toTimeText(item.uploadTime, true) }} +
- + 删除 @@ -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 { diff --git a/src/renderer/src/views/prepare/container/set-homework.vue b/src/renderer/src/views/prepare/container/set-homework.vue index e23f526..7e821ac 100644 --- a/src/renderer/src/views/prepare/container/set-homework.vue +++ b/src/renderer/src/views/prepare/container/set-homework.vue @@ -1,38 +1,39 @@ @@ -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; } } - \ No newline at end of file + diff --git a/src/renderer/src/views/resource/index.vue b/src/renderer/src/views/resource/index.vue index d4565dd..4f66881 100644 --- a/src/renderer/src/views/resource/index.vue +++ b/src/renderer/src/views/resource/index.vue @@ -1,21 +1,28 @@ @@ -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) } @@ -48,12 +55,11 @@ const testClick = async() => { const getData = (data) => { const { textBook, node } = data let textbookId = textBook.curBookId - let levelSecondId = node.id + let levelSecondId = node.id let levelFirstId - if(node.parentNode){ - levelFirstId = node.parentNode.id - } - else{ + if (node.parentNode) { + levelFirstId = node.parentNode.id + } 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() }) -