diff --git a/electron-builder.yml b/electron-builder.yml index c8b395c..46e484d 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -13,11 +13,6 @@ asarUnpack: win: executableName: AIx icon: resources/logo2.ico - extraFiles: - - from: ./node_modules/im_electron_sdk/lib/ - to: ./resources - filter: - - '**/*' nsis: oneClick: false allowToChangeInstallationDirectory: true @@ -50,3 +45,9 @@ publish: url: https://file.ysaix.com:7868/src/assets/smarttalk/ electronDownload: mirror: https://npmmirror.com/mirrors/electron/ +# 额外依赖打包到输出目录 +extraFiles: + - from: ./node_modules/im_electron_sdk/lib/ + to: ./resources + filter: + - '**/*' diff --git a/src/renderer/src/components/choose-textbook/third.vue b/src/renderer/src/components/choose-textbook/third.vue index 14d3d45..554a6f5 100644 --- a/src/renderer/src/components/choose-textbook/third.vue +++ b/src/renderer/src/components/choose-textbook/third.vue @@ -163,6 +163,10 @@ const handleNodeClick = (data,node) => { onMounted(() => { titleName.value = `${useStore.user.edustage}-${useStore.user.edusubject}` treeLoading.value = true + //存在查看无课程的情况,两秒后关闭loading框 + setTimeout(() => { + treeLoading.value = false + },2000) }) //监听数据变化 watch(() => useThird,() => { diff --git a/src/renderer/src/components/choose-textbook/third/index.vue b/src/renderer/src/components/choose-textbook/third/index.vue index 354f79d..2b7a6a2 100644 --- a/src/renderer/src/components/choose-textbook/third/index.vue +++ b/src/renderer/src/components/choose-textbook/third/index.vue @@ -34,6 +34,7 @@ const getSubject = (value) => { const currentIndex = gradeList.findIndex(item => item.value === value) getSubjects({stage:value}).then(res => { if(res.code === 200){ + if(res.data.length === 0) return subjectList.value = res.data.map(item => { return { ...item, diff --git a/src/renderer/src/components/set-homework/index.vue b/src/renderer/src/components/set-homework/index.vue index 233bf99..7518cf2 100644 --- a/src/renderer/src/components/set-homework/index.vue +++ b/src/renderer/src/components/set-homework/index.vue @@ -250,10 +250,10 @@ const onSubmit = (formEl) => { saveByClassWorkArray({ classworkarray: JSON.stringify(ary) }) - .then(() => { + .then((res) => { setLoading.value = false ElMessage.success('操作成功') - emit('on-success') + emit('on-success', res.data) cloneDialog(formEl) }) .catch(() => { diff --git a/src/renderer/src/views/tool/components/homework.vue b/src/renderer/src/views/tool/components/homework.vue index 35c1c61..d6a29b3 100644 --- a/src/renderer/src/views/tool/components/homework.vue +++ b/src/renderer/src/views/tool/components/homework.vue @@ -111,9 +111,10 @@ const closeHomework = async() => { ipcMsgSend('tool-sphere:set:ignore', true) } // 推送成功 -const successHomework = ()=>{ +const successHomework = (data)=>{ + // console.log('推送成功', data) // 发送im消息-推送作业(app|平板) - ipcMsgInvoke('im-chat:msg', curRow.value.id, MsgEnum.HEADS.MSG_0016) + ipcMsgInvoke('im-chat:msg', data, MsgEnum.HEADS.MSG_0016) } // 章节目录change const changeChapter = async (data)=>{