+
+ {{ item.worktype }}
+
+
- |
-
{{ formatFileSize(item.fileSize) }}
- |
-
{{ toTimeText(item.uploadTime, true) }}
- |
+
|
+
{{ formatFileSize(item.fileSize) }}
+
|
+
{{ toTimeText(item.uploadTime, true) }}
+
|
-
-
-
- 重命名
-
-
-
-
-
- 删除
-
-
-
-
-
- 下载
-
-
-
-
-
-
-
- 移动
-
-
+
+
+
+
+ 布置
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+ 重命名
+
+
+
+
+
+ 删除
+
+
+
+
+
+ 下载
+
+
+
+
+
+
+
+ 移动
+
+
+
@@ -236,6 +258,10 @@ export default {
display: flex;
justify-content: center;
align-items: center;
+ .icon-zuoye{
+ font-size: 40px;
+ color: #707070
+ }
}
.prepare-body-main-item-tool {
diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue
index 35743ab..8d6dbe5 100644
--- a/src/renderer/src/views/prepare/index.vue
+++ b/src/renderer/src/views/prepare/index.vue
@@ -38,6 +38,7 @@
+
作业反馈
布置作业
上传资料
新建课件
@@ -67,15 +68,19 @@ import ChooseTextbook from '@/components/choose-textbook/index.vue'
import uploadDialog from '@/components/upload-dialog/index.vue'
import { Refresh } from '@element-plus/icons-vue'
import uploaderState from '@/store/modules/uploader'
+import useUserStore from '@/store/modules/user'
import MoveFile from '@/components/move-file/index.vue'
import FileListItem from '@/views/prepare/container/file-list-item.vue'
import { getSmarttalkPage, moveSmarttalk } from '@/api/file'
+import { homeworklist, listEntpcourse } from '@/api/teaching/classwork'
import { toTimeText } from '@/utils/date'
import { ElMessage } from 'element-plus'
import { parseCataByNode, creatPPT, asyncLocalFile } from '@/utils/talkFile'
import FileOperBatch from '@/views/prepare/container/file-oper-batch.vue'
import outLink from '@/utils/linkConfig'
import { createWindow } from '@/utils/tool'
+import { uniqBy, cloneDeep } from 'lodash'
+
const { ipcRenderer } = window.electron || {}
export default {
@@ -103,6 +108,10 @@ export default {
},
// 当前教材封面图
curBookImg: '',
+ // 用户信息
+ userStore: '',
+ entpcourseid: '',
+ timerId: null
}
},
computed: {
@@ -113,6 +122,7 @@ export default {
}
},
created() {
+ this.userStore = useUserStore().user
ipcRenderer.removeAllListeners('copy-file-default-reply')
ipcRenderer.on('copy-file-default-reply', (e, param) => {
this.callback(param)
@@ -222,7 +232,7 @@ export default {
},
asyncAllFile() {
this.isLoading = true
- getSmarttalkPage({
+ return getSmarttalkPage({
...this.uploadData,
orderByColumn: 'uploadTime',
isAsc: 'desc',
@@ -239,12 +249,14 @@ export default {
await asyncLocalFile(item)
}
this.asyncAllFileVisiable = false
+ return Promise.resolve()
})
.catch(() => {
this.isLoading = false
+ return Promise.resolve()
})
},
- nodeClick(data) {
+ async nodeClick(data) {
if (this.currentNode.id === data.node.id) return
this.curBookImg = data.textBook.curBookImg
this.checkFileList = []
@@ -254,16 +266,101 @@ export default {
this.uploadData.levelSecondId = cata[1]
this.uploadData.levelThirdId = cata[2]
this.uploadData.textbookId = data.textBook.curBookId
- this.asyncAllFile()
+ await this.asyncAllFile()
+ if (this.uploadData.levelSecondId) {
+ // 获取作业列表所需ID
+ const res = await this.getChapterId()
+ this.entpcourseid = res.rows[0].id
+ // 查询作业
+ this.getHomeWorkList()
+ }
},
+
// 打开外部链接
- handleOutLink(key){
+ handleOutLink(key) {
+ if (key == 'homeWork') {
+ // 查询作业
+ this.createTimer()
+ }
// key 对应的 linkConfig.js 外部链接配置
let configObj = outLink[key]
// 通知主进程
ipcRenderer.send('openWindow', {
fullPath: configObj.fullPath,
- cookieData: {...(configObj.data)}
+ cookieData: { ...(configObj.data) }
+ })
+ },
+ // 根据教材章节单元ID 查询作业列表所需ID
+ getChapterId() {
+ return listEntpcourse({ evalid: this.uploadData.levelSecondId, edituserid: this.userStore.userId, pageSize: 500 })
+ },
+ //
+ createTimer() {
+ this.timerId = setInterval(() => {
+ this.getHomeWorkList()
+ }, 1500)
+ },
+ // 查询作业列表
+ getHomeWorkList() {
+ homeworklist({ entpcourseid: this.entpcourseid, edituserid: this.userStore.userId, pageSize: 100 }).then(res => {
+
+ //以下代码 参照AIx web端 作业布置
+ let list = []
+ for (var i = 0; i < res.rows.length; i++) {
+
+ res.rows[i].taskconfig = [];
+
+ // 找child
+ for (var j = 0; j < res.rows.length; j++) {
+ if (res.rows[j].parentid == res.rows[i].id) {
+ var ss = [];
+ if (res.rows[j].classworkdatastudentids != null) {
+ ss = JSON.parse('[' + res.rows[j].classworkdatastudentids + ']');
+ }
+ var js = {
+ id: res.rows[j].id,
+ classid: res.rows[j].classid,
+ classcaption: res.rows[j].classcaption,
+ parentid: 0,
+ worktype: '',
+ workkey: res.rows[j].workkey,
+ worktag: '',
+ entpcourseid: 0,
+ evalid: 0,
+ edusubject: '',
+ edudegree: '',
+ workdate: '',
+ title: '',
+ workcodes: '',
+ studentlist: ss,
+ deaddate: res.rows[j].deaddate,
+ timelength: res.rows[j].timelength,
+ weights: res.rows[j].weights,
+ feedtype: res.rows[j].feedtype
+ }
+ res.rows[i].taskconfig.push(js);
+ }
+ }
+ res.rows[i].fileShowName = res.rows[i].uniquekey
+
+ // 注意slideid>0的，这一些作业是添加到PPT页面的，所以在作业管理中不能出现
+ // 2024-05-15，酉阳，jackyshen
+ if (res.rows[i].classid == 0 && res.rows[i].slideid == 0) {
+ list.push(res.rows[i]);
+ }
+
+
+ // 如果是习题训练任务，则检查一共有多少道
+ if (res.rows[i].entpcourseworklist != '') {
+ res.rows[i].entpcourseworklistarray = JSON.parse('[' + res.rows[i].entpcourseworklist + ']');
+ } else {
+ res.rows[i].entpcourseworklistarray = [];
+ }
+ }
+ // 去重
+ let ary = uniqBy([...this.currentFileList, ...list], 'id')
+ // 深度克隆
+ this.currentFileList = cloneDeep(ary)
})
},
// 打开PDF-课件
@@ -274,6 +371,13 @@ export default {
openLesson() {
createWindow('tool-sphere', { url: '/tool/sphere' })
}
+ },
+ watch: {
+ $route(to) {
+ if (to.path != '/prepare' && this.timerId) {
+ clearInterval(this.timerId)
+ }
+ }
}
}
@@ -329,7 +433,8 @@ export default {
justify-content: center;
position: relative;
background: linear-gradient(#b0d1ef, #3e7bcb);
- .top-zoom-style{
+
+ .top-zoom-style {
position: absolute;
width: 90%;
height: 30px;
@@ -337,7 +442,8 @@ export default {
bottom: 0;
clip-path: polygon(3% 0%, 97% 0%, 100% 100%, 0% 100%);
}
- .textbook-img{
+
+ .textbook-img {
height: 120px;
background-color: #ffffff;
padding: 5px;
@@ -346,36 +452,43 @@ export default {
margin-right: 20px;
z-index: 1;
}
- .top-item{
+
+ .top-item {
width: 230px;
position: relative;
flex-wrap: wrap;
z-index: 1;
- .btn{
+
+ .btn {
width: 102px;
background: none;
color: #ffffff;
border-width: 2px;
border-color: #ffffff;
- &:hover{
+
+ &:hover {
background: rgba(255, 255, 255, 0.3)
}
- &:first-child{
+
+ &:first-child {
margin-left: 12px;
margin-bottom: 15px;
}
- &:nth-child(2){
+
+ &:nth-child(2) {
margin-bottom: 15px;
}
}
}
- .to-class-btn{
+
+ .to-class-btn {
width: 130px;
height: 80px;
margin-left: 25px;
font-size: 18px;
z-index: 1;
- .icon-lingdang{
+
+ .icon-lingdang {
margin-right: 5px;
color: #ffffff;
font-size: 20px;
diff --git a/src/renderer/src/views/profile/cropperImage.vue b/src/renderer/src/views/profile/cropperImage.vue
new file mode 100644
index 0000000..5745127
--- /dev/null
+++ b/src/renderer/src/views/profile/cropperImage.vue
@@ -0,0 +1,266 @@
+
+
+
+
+
+
+
+
+
头像设置
+
+
+
+
+
![]()
+
+
+
+
+
+
+
+
+ 选择
+
+
+ 取消
+ 提交
+
+
+
+
+
+
+
+
+
diff --git a/src/renderer/src/views/profile/userAvatar.vue b/src/renderer/src/views/profile/userAvatar.vue
index 89965ca..5e945c3 100644
--- a/src/renderer/src/views/profile/userAvatar.vue
+++ b/src/renderer/src/views/profile/userAvatar.vue
@@ -2,112 +2,45 @@
![]( "点击上传头像")
-
-
-
-
-
-
-
-
-
-
-
-
-
- 选择
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 提 交
-
-
+
+
+