diff --git a/src/renderer/src/assets/iconfont/iconfont.css b/src/renderer/src/assets/iconfont/iconfont.css index 37480ed..a56adb1 100644 --- a/src/renderer/src/assets/iconfont/iconfont.css +++ b/src/renderer/src/assets/iconfont/iconfont.css @@ -1,9 +1,9 @@ @font-face { font-family: "iconfont"; /* Project id 2794390 */ - src: url('iconfont.woff2?t=1723099371232') format('woff2'), - url('iconfont.woff?t=1723099371232') format('woff'), - url('iconfont.ttf?t=1723099371232') format('truetype'), - url('iconfont.svg?t=1723099371232#iconfont') format('svg'); + src: url('iconfont.woff2?t=1723186593107') format('woff2'), + url('iconfont.woff?t=1723186593107') format('woff'), + url('iconfont.ttf?t=1723186593107') format('truetype'), + url('iconfont.svg?t=1723186593107#iconfont') format('svg'); } .iconfont { @@ -14,6 +14,10 @@ -moz-osx-font-smoothing: grayscale; } +.icon-xiangzuo:before { + content: "\e64d"; +} + .icon-kechengziyuan1:before { content: "\e647"; } diff --git a/src/renderer/src/assets/iconfont/iconfont.js b/src/renderer/src/assets/iconfont/iconfont.js index 877986f..b8bbfb9 100644 --- a/src/renderer/src/assets/iconfont/iconfont.js +++ b/src/renderer/src/assets/iconfont/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_2794390='',function(l){var h=(h=document.getElementsByTagName("script"))[h.length-1],c=h.getAttribute("data-injectcss"),h=h.getAttribute("data-disable-injectsvg");if(!h){var a,v,t,z,i,p=function(h,c){c.parentNode.insertBefore(h,c)};if(c&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(h){console&&console.log(h)}}a=function(){var h,c=document.createElement("div");c.innerHTML=l._iconfont_svg_string_2794390,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(h=document.body).firstChild?p(c,h.firstChild):h.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(a,0):(v=function(){document.removeEventListener("DOMContentLoaded",v,!1),a()},document.addEventListener("DOMContentLoaded",v,!1)):document.attachEvent&&(t=a,z=l.document,i=!1,d(),z.onreadystatechange=function(){"complete"==z.readyState&&(z.onreadystatechange=null,M())})}function M(){i||(i=!0,t())}function d(){try{z.documentElement.doScroll("left")}catch(h){return void setTimeout(d,50)}M()}}(window); \ No newline at end of file +window._iconfont_svg_string_2794390='',function(l){var h=(h=document.getElementsByTagName("script"))[h.length-1],c=h.getAttribute("data-injectcss"),h=h.getAttribute("data-disable-injectsvg");if(!h){var a,v,t,z,i,p=function(h,c){c.parentNode.insertBefore(h,c)};if(c&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(h){console&&console.log(h)}}a=function(){var h,c=document.createElement("div");c.innerHTML=l._iconfont_svg_string_2794390,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(h=document.body).firstChild?p(c,h.firstChild):h.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(a,0):(v=function(){document.removeEventListener("DOMContentLoaded",v,!1),a()},document.addEventListener("DOMContentLoaded",v,!1)):document.attachEvent&&(t=a,z=l.document,i=!1,d(),z.onreadystatechange=function(){"complete"==z.readyState&&(z.onreadystatechange=null,M())})}function M(){i||(i=!0,t())}function d(){try{z.documentElement.doScroll("left")}catch(h){return void setTimeout(d,50)}M()}}(window); \ No newline at end of file diff --git a/src/renderer/src/assets/iconfont/iconfont.json b/src/renderer/src/assets/iconfont/iconfont.json index f18e77b..b240442 100644 --- a/src/renderer/src/assets/iconfont/iconfont.json +++ b/src/renderer/src/assets/iconfont/iconfont.json @@ -5,6 +5,13 @@ "css_prefix_text": "icon-", "description": "", "glyphs": [ + { + "icon_id": "6176588", + "name": "向左", + "font_class": "xiangzuo", + "unicode": "e64d", + "unicode_decimal": 58957 + }, { "icon_id": "3053509", "name": "课程资源", @@ -630,7 +637,7 @@ }, { "icon_id": "22779610", - "name": "数译_教学管理", + "name": "教学管理", "font_class": "shuyi_jiaoxueguanli", "unicode": "e678", "unicode_decimal": 59000 diff --git a/src/renderer/src/assets/iconfont/iconfont.svg b/src/renderer/src/assets/iconfont/iconfont.svg index 0731898..21c7399 100644 --- a/src/renderer/src/assets/iconfont/iconfont.svg +++ b/src/renderer/src/assets/iconfont/iconfont.svg @@ -14,6 +14,8 @@ /> + + diff --git a/src/renderer/src/assets/iconfont/iconfont.ttf b/src/renderer/src/assets/iconfont/iconfont.ttf index a08d65f..25f16da 100644 Binary files a/src/renderer/src/assets/iconfont/iconfont.ttf and b/src/renderer/src/assets/iconfont/iconfont.ttf differ diff --git a/src/renderer/src/assets/iconfont/iconfont.woff b/src/renderer/src/assets/iconfont/iconfont.woff index 9364823..60e8778 100644 Binary files a/src/renderer/src/assets/iconfont/iconfont.woff and b/src/renderer/src/assets/iconfont/iconfont.woff differ diff --git a/src/renderer/src/assets/iconfont/iconfont.woff2 b/src/renderer/src/assets/iconfont/iconfont.woff2 index 2a2f9f6..7432906 100644 Binary files a/src/renderer/src/assets/iconfont/iconfont.woff2 and b/src/renderer/src/assets/iconfont/iconfont.woff2 differ diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue index 8a2aaab..403faab 100644 --- a/src/renderer/src/views/prepare/index.vue +++ b/src/renderer/src/views/prepare/index.vue @@ -26,13 +26,7 @@ @@ -50,60 +44,24 @@ 作业反馈 布置作业 上传资料 - 新建课件 + 新建课件 - - - - - - + + + - + :choose="checkFileList" :check-all="isCheckAll" @click-delete="clickDelete" @click-move="clickMove" + @cancel="checkFileList = []" @click-choose="clickChoose"> - + @@ -160,7 +118,6 @@ export default { fileList: [], currentNode: {}, currentFileList: [], - currentWorkList: [], curBookPath: '', curClassReserv: {}, downloadNum: 0, @@ -236,7 +193,7 @@ export default { let fileName = this.curBookPath if (!fileName) return fileName = fileName.replace('.txt', '.pdf') - return new Promise((resolve, reject) => { + return new Promise((resolve, reject)=>{ const userDataPath = Remote.app.getPath('userData') const appRootFilePath = userDataPath + '\\selfFile\\' let filePath = appRootFilePath + fileName @@ -252,7 +209,7 @@ export default { ipcRenderer.on('download-file-default-prog' + fileName, this.progDownFile) ipcRenderer.once('download-file-default' + fileName, (e, isSuccess) => { if (isSuccess === true) { - resolve(fileName) + resolve(appRootFilePath + fileName) } else { ElMessage({ type: 'info', @@ -261,7 +218,7 @@ export default { } }) } else { - resolve(fileName) + resolve(appRootFilePath + fileName) } }) }) @@ -400,9 +357,9 @@ export default { this.uploadData.textbookId = data.textBook.curBookId this.initHomeWork() await this.asyncAllFile() + }, async initHomeWork() { - this.currentWorkList = [] if (this.timerId) { clearInterval(this.timerId) } @@ -411,10 +368,11 @@ export default { let { rows } = await this.getChapterId() if (rows.length > 0) { this.entpcourseid = rows[0].id - } else { - await this.createEntpcourse() - let { rows } = await this.getChapterId() - this.entpcourseid = rows[0].id + } + else{ + await this.createEntpcourse() + let { rows } = await this.getChapterId() + this.entpcourseid = rows[0].id } // 查询作业 @@ -423,27 +381,28 @@ export default { }, // 创建新的entpcourse createEntpcourse() { - var cform = {} - cform.entpid = this.userStore.deptId - cform.level = 1 - cform.parentid = 0 - cform.dictid = 0 - cform.evalid = this.currentNode.id - cform.evalparentid = 0 - cform.edusubject = this.currentNode.edusubject - cform.edudegree = this.currentNode.edudegree - cform.edustage = this.currentNode.edustage - cform.coursetype = '课标学科' - cform.coursetitle = this.currentNode.itemtitle - cform.coursedesc = '' - cform.status = '' - cform.dflag = 0 - cform.edituserid = this.userStore.userId - cform.createblankfile = 'yes' + // 参照 web AIx 传入参数 + var cform = {}; + cform.entpid = this.userStore.deptId; + cform.level = 1; + cform.parentid = 0; + cform.dictid = 0; + cform.evalid = this.currentNode.id; + cform.evalparentid = 0; + cform.edusubject = this.currentNode.edusubject; + cform.edudegree = this.currentNode.edudegree; + cform.edustage = this.currentNode.edustage; + cform.coursetype = '课标学科'; + cform.coursetitle = this.currentNode.itemtitle; + cform.coursedesc = ''; + cform.status = ''; + cform.dflag = 0; + cform.edituserid = this.userStore.userId; + cform.createblankfile = 'yes'; return addEntpcourse(cform) }, - openReserv() { - this.$refs['reservDialog'].openDialog() + openReserv(){ + // this.$refs['reservDialog'].openDialog() }, // 打开外部链接 handleOutLink(key) { @@ -535,9 +494,9 @@ export default { } } // 去重 - let ary = uniqBy([...list], 'id') + let ary = uniqBy([...this.currentFileList, ...list], 'id') // 深度克隆 - this.currentWorkList = cloneDeep(ary) + this.currentFileList = cloneDeep(ary) }) }, getWeekday1(date) { @@ -553,16 +512,14 @@ export default { // 删除作业 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 - }) + delClasswork(item.id).then(async res => { + ElMessage.success('操作成功') + this.isLoading = false + await this.asyncAllFile() + this.getHomeWorkList() + }).catch(() => { + this.isLoading = false + }) }, closeHomework() { this.setDialog = false @@ -581,7 +538,7 @@ export default { const toolStore = useToolState() if (toolStore.isToolWin) return this.$message.error('您当前已开始上课，请勿重复操作') startClass(this.curClassReserv.id) - createWindow('tool-sphere', { url: '/tool/sphere?entpcourseid=' + this.entpcourseid + "&reservId=" + this.curClassReserv.id }) + createWindow('tool-sphere', { url: '/tool/sphere?entpcourseid=' + this.entpcourseid +'&label=' + this.currentNode.label+ "&reservId=" + this.curClassReserv.id }) } } } diff --git a/src/renderer/src/views/tool/components/homework.vue b/src/renderer/src/views/tool/components/homework.vue index 1f05924..b2aa971 100644 --- a/src/renderer/src/views/tool/components/homework.vue +++ b/src/renderer/src/views/tool/components/homework.vue @@ -1,67 +1,126 @@ \ No newline at end of file diff --git a/src/renderer/src/views/tool/components/lesson.vue b/src/renderer/src/views/tool/components/lesson.vue new file mode 100644 index 0000000..b8c5c71 --- /dev/null +++ b/src/renderer/src/views/tool/components/lesson.vue @@ -0,0 +1,129 @@ + + + + + \ No newline at end of file diff --git a/src/renderer/src/views/tool/components/upvote.vue b/src/renderer/src/views/tool/components/upvote.vue new file mode 100644 index 0000000..beaa0b7 --- /dev/null +++ b/src/renderer/src/views/tool/components/upvote.vue @@ -0,0 +1,87 @@ + + + + \ No newline at end of file diff --git a/src/renderer/src/views/tool/sphere.vue b/src/renderer/src/views/tool/sphere.vue index d0861fc..a0b06fb 100644 --- a/src/renderer/src/views/tool/sphere.vue +++ b/src/renderer/src/views/tool/sphere.vue @@ -2,8 +2,13 @@
+ + + + +