diff --git a/package.json b/package.json index 0fc3692..b544cec 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aix-win", - "version": "2.1.1", + "version": "2.1.5", "description": "", "main": "./out/main/index.js", "author": "example.com", @@ -66,7 +66,7 @@ "xlsx": "^0.18.5", "less": "^4.2.0", "less-loader": "^7.3.0", - "whiteboard_lyc": "^0.0.8" + "whiteboard_lyc": "^0.1.3" }, "devDependencies": { "@electron-toolkit/eslint-config": "^1.0.2", diff --git a/src/main/index.js b/src/main/index.js index f6803fe..4dcd521 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -74,7 +74,7 @@ function createLoginWindow() { updateInit(loginWindow) } - // loginWindow.webContents.openDevTools() + loginWindow.webContents.openDevTools() loginWindow.once('ready-to-show', () => { loginWindow.show() }) @@ -128,14 +128,14 @@ function createMainWindow() { shell.openExternal(details.url) return { action: 'deny' } }) - // mainWindow.webContents.openDevTools() + mainWindow.webContents.openDevTools() if (is.dev && process.env['ELECTRON_RENDERER_URL']) { mainWindow.loadURL(process.env['ELECTRON_RENDERER_URL']) } else { mainWindow.loadFile(join(__dirname, '../renderer/index.html')) } - + // mainWindow.setAlwaysOnTop(true, "screen-saver") // 将窗口设置为顶层窗口 // mainWindow.setVisibleOnAllWorkspaces(true) // 如果窗口在所有工作区都可见 // 第三步: 开启remote服务 @@ -280,14 +280,10 @@ function handleAll() { }) // 用于监听-状态管理变化-同步所有窗口 ipcMain.handle('pinia-state-change', (e, storeName, jsonStr) => { - console.log('pinia-state-change-1', storeName, jsonStr) for(const curWin of BrowserWindow.getAllWindows()){ const id = curWin.webContents.id const bool = id !== e.sender.id && !curWin.isDestroyed() - if (id === e.sender.id) { - console.log('pinia-state-change-2', 'windows-send', curWin.type) - } if (bool) { // 除了消息发送窗口和销毁的窗口 其他都发送 curWin.webContents.send('pinia-state-set', storeName, jsonStr) } diff --git a/src/main/store.js b/src/main/store.js index 5cc0f1c..a34bd90 100644 --- a/src/main/store.js +++ b/src/main/store.js @@ -13,6 +13,7 @@ const defaultData = { showBoardAll: false, // 全屏画板-是否显示 isPdfWin: false, // pdf窗口是否打开 isToolWin: false, // 工具窗口是否打开 + isTaskWin: false, // 批改窗口是否打开 curSubjectNode: { querySearch: {} // 查询资源所需参数 }, diff --git a/src/renderer/src/api/apiService.js b/src/renderer/src/api/apiService.js index 0b28e0d..d5d1668 100644 --- a/src/renderer/src/api/apiService.js +++ b/src/renderer/src/api/apiService.js @@ -26,3 +26,13 @@ export class imChat { // 获取腾讯im-chat appid 签名 static getTxCloudSign = data => ApiService.publicHttp('/system/user/txCloudSign', data) } + +// zdg: url跳转-后端存储 +export class toLink { + // 设置链接-返回key(默认15分钟有效时间) + static setLink = url => ApiService.publicHttp(`/smarttalk/toLink`, {url}, 'post', null, 'form') + // 获取链接 + static getLink = key => ApiService.publicHttp(`/smarttalk/toLink/${key}`) + // 删除链接-缓存 + static delLink = key => ApiService.publicHttp(`/smarttalk/toLink/${key}`, null, 'delete') +} diff --git a/src/renderer/src/api/classManage/index.js b/src/renderer/src/api/classManage/index.js index 6b82a81..a0f3d53 100644 --- a/src/renderer/src/api/classManage/index.js +++ b/src/renderer/src/api/classManage/index.js @@ -147,10 +147,11 @@ export function updateSmartClassReserv(data) { }) } //查询课程预约 -export function getSelfReserv() { +export function getSelfReserv(params) { return request({ url: '/smarttalk/classReserv/getSelfReserv', - method: 'get' + method: 'get', + params }) } export function deleteSmartReserv(id) { diff --git a/src/renderer/src/api/classTask/index.js b/src/renderer/src/api/classTask/index.js index 8f8672b..56f662d 100644 --- a/src/renderer/src/api/classTask/index.js +++ b/src/renderer/src/api/classTask/index.js @@ -27,6 +27,15 @@ export function listClassworkdata(query) { }) } +// 新接口---查询classworkdata列表 班级作业列表 +export function listClassworkdataNew(query) { + return request({ + url: '/education/classworkdata/new/list', + method: 'get', + params: query + }) +} + // 查询entpcoursework列表 课程作业列表 export function listEntpcoursework(query) { return request({ @@ -72,7 +81,21 @@ export function updateClasswork(data) { }) } - +// 删除classworkeval +export function delClassworkeval(id) { + return request({ + url: '/education/classworkeval/' + id, + method: 'delete' + }) +} +// 新增classworkeval +export function addClassworkeval(data) { + return request({ + url: '/education/classworkeval', + method: 'post', + data: data + }) +} // 查询evaluationclue列表 export function listEvaluationclue(query) { diff --git a/src/renderer/src/api/teaching/classcourse.js b/src/renderer/src/api/teaching/classcourse.js index 665489c..d312f85 100644 --- a/src/renderer/src/api/teaching/classcourse.js +++ b/src/renderer/src/api/teaching/classcourse.js @@ -9,6 +9,14 @@ export function listClasscourse(query) { }) } +export function listClasscourseNew(query) { + return request({ + url: '/education/classcourse/new/list', + method: 'get', + params: query + }) +} + // 查询classcourse详细 export function getClasscourse(id) { return request({ diff --git a/src/renderer/src/assets/iconfont/iconfont.css b/src/renderer/src/assets/iconfont/iconfont.css index da8460e..75ba33d 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=1725847033097') format('woff2'), - url('iconfont.woff?t=1725847033097') format('woff'), - url('iconfont.ttf?t=1725847033097') format('truetype'), - url('iconfont.svg?t=1725847033097#iconfont') format('svg'); + src: url('iconfont.woff2?t=1728543886557') format('woff2'), + url('iconfont.woff?t=1728543886557') format('woff'), + url('iconfont.ttf?t=1728543886557') format('truetype'), + url('iconfont.svg?t=1728543886557#iconfont') format('svg'); } .iconfont { @@ -14,38 +14,110 @@ -moz-osx-font-smoothing: grayscale; } +.icon-A1:before { + content: "\e635"; +} + +.icon-A:before { + content: "\e6ef"; +} + +.icon--kejian:before { + content: "\e6a3"; +} + +.icon-a-1_jiaoxuefansi:before { + content: "\e6cd"; +} + +.icon-iconfontzhizuobiaozhunbduan3-1:before { + content: "\100af"; +} + +.icon-gongzuotai_xuanzhong:before { + content: "\e605"; +} + +.icon-yijianfankui:before { + content: "\e8a1"; +} + +.icon-zuoyesheji:before { + content: "\e619"; +} + +.icon-jihua:before { + content: "\e601"; +} + +.icon-xueqingfenxi:before { + content: "\e68a"; +} + +.icon-zuoyebuzhi:before { + content: "\e607"; +} + +.icon-zuoyepigai:before { + content: "\ec35"; +} + +.icon-jiaocai1:before { + content: "\e781"; +} + +.icon-yanjiushi:before { + content: "\e70a"; +} + +.icon-zuzhi:before { + content: "\e63b"; +} + +.icon-zhiliang:before { + content: "\e642"; +} + +.icon-jiaoxueshijian:before { + content: "\e676"; +} + +.icon-kebiao:before { + content: "\e67a"; +} + +.icon-yanjiuyuan:before { + content: "\e6bf"; +} + +.icon-kaoshi:before { + content: "\eb14"; +} + +.icon-iconfontzhizuobiaozhunbduan36:before { + content: "\e6eb"; +} + +.icon-ziyuanku:before { + content: "\eb01"; +} + +.icon-yanjiushi-2:before { + content: "\100b0"; +} + +.icon-fasong:before { + content: "\e692"; +} + .icon-aijiqiren:before { content: "\e73c"; } -.icon-saoyisao:before { - content: "\e691"; -} - -.icon-jiaoxuezhiliangfenxi:before { - content: "\e690"; -} - -.icon-jiaoxuejihua:before { - content: "\e7e9"; -} - .icon-tongji:before { content: "\e68f"; } -.icon-pigai:before { - content: "\e68d"; -} - -.icon-jiaoxuefansi:before { - content: "\e6b2"; -} - -.icon-kaoshi:before { - content: "\e68a"; -} - .icon-yiwen:before { content: "\e687"; } @@ -174,10 +246,6 @@ content: "\e642"; } -.icon-organization-framework-line:before { - content: "\e9fe"; -} - .icon-jiaocai:before { content: "\e67b"; } @@ -246,10 +314,6 @@ content: "\eb13"; } -.icon-fankui:before { - content: "\e738"; -} - .icon-tiku:before { content: "\e621"; } @@ -270,10 +334,6 @@ content: "\e61c"; } -.icon-jiaoxuefenxi:before { - content: "\e605"; -} - .icon-wenjianjia:before { content: "\ec17"; } @@ -298,14 +358,6 @@ content: "\e675"; } -.icon-yanjiushi:before { - content: "\e607"; -} - -.icon-gongzuotai:before { - content: "\e676"; -} - .icon-lunwen:before { content: "\e60e"; } @@ -322,10 +374,6 @@ content: "\e6fe"; } -.icon-pengyouquan1:before { - content: "\e635"; -} - .icon-beike1:before { content: "\e61b"; } @@ -346,10 +394,6 @@ content: "\e612"; } -.icon-fankui1:before { - content: "\e6fa"; -} - .icon-shezhi:before { content: "\e614"; } @@ -394,10 +438,6 @@ content: "\e654"; } -.icon-kecheng:before { - content: "\e619"; -} - .icon-bianji1:before { content: "\e61d"; } @@ -426,10 +466,6 @@ content: "\e79a"; } -.icon-xueqingfenxi:before { - content: "\e67a"; -} - .icon-check:before { content: "\e622"; } @@ -546,10 +582,6 @@ content: "\e636"; } -.icon-ziyuanfenxi:before { - content: "\e637"; -} - .icon-shoucang1:before { content: "\e638"; } @@ -566,10 +598,6 @@ content: "\e772"; } -.icon-xiezuo1:before { - content: "\e63b"; -} - .icon-fenxi1:before { content: "\e63c"; } @@ -798,10 +826,6 @@ content: "\e672"; } -.icon-jiaoxueziyuan:before { - content: "\e601"; -} - .icon-beike:before { content: "\e6c2"; } diff --git a/src/renderer/src/assets/iconfont/iconfont.js b/src/renderer/src/assets/iconfont/iconfont.js index acf827f..e5c0dbb 100644 --- a/src/renderer/src/assets/iconfont/iconfont.js +++ b/src/renderer/src/assets/iconfont/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_2794390='',(l=>{var c=(h=(h=document.getElementsByTagName("script"))[h.length-1]).getAttribute("data-injectcss"),h=h.getAttribute("data-disable-injectsvg");if(!h){var a,t,z,i,p,v=function(c,h){h.parentNode.insertBefore(c,h)};if(c&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}a=function(){var c,h=document.createElement("div");h.innerHTML=l._iconfont_svg_string_2794390,(h=h.getElementsByTagName("svg")[0])&&(h.setAttribute("aria-hidden","true"),h.style.position="absolute",h.style.width=0,h.style.height=0,h.style.overflow="hidden",h=h,(c=document.body).firstChild?v(h,c.firstChild):c.appendChild(h))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(a,0):(t=function(){document.removeEventListener("DOMContentLoaded",t,!1),a()},document.addEventListener("DOMContentLoaded",t,!1)):document.attachEvent&&(z=a,i=l.document,p=!1,d(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,M())})}function M(){p||(p=!0,z())}function d(){try{i.documentElement.doScroll("left")}catch(c){return void setTimeout(d,50)}M()}})(window); \ No newline at end of file +window._iconfont_svg_string_2794390='',(c=>{var h=(l=(l=document.getElementsByTagName("script"))[l.length-1]).getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var a,t,i,z,p,v=function(h,l){l.parentNode.insertBefore(h,l)};if(h&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(h){console&&console.log(h)}}a=function(){var h,l=document.createElement("div");l.innerHTML=c._iconfont_svg_string_2794390,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(h=document.body).firstChild?v(l,h.firstChild):h.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(a,0):(t=function(){document.removeEventListener("DOMContentLoaded",t,!1),a()},document.addEventListener("DOMContentLoaded",t,!1)):document.attachEvent&&(i=a,z=c.document,p=!1,d(),z.onreadystatechange=function(){"complete"==z.readyState&&(z.onreadystatechange=null,M())})}function M(){p||(p=!0,i())}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 1536757..de96ea7 100644 --- a/src/renderer/src/assets/iconfont/iconfont.json +++ b/src/renderer/src/assets/iconfont/iconfont.json @@ -5,6 +5,174 @@ "css_prefix_text": "icon-", "description": "", "glyphs": [ + { + "icon_id": "11657531", + "name": "A", + "font_class": "A1", + "unicode": "e635", + "unicode_decimal": 58933 + }, + { + "icon_id": "12688893", + "name": "A", + "font_class": "A", + "unicode": "e6ef", + "unicode_decimal": 59119 + }, + { + "icon_id": "6571029", + "name": "课件", + "font_class": "-kejian", + "unicode": "e6a3", + "unicode_decimal": 59043 + }, + { + "icon_id": "37027693", + "name": "教学反思", + "font_class": "a-1_jiaoxuefansi", + "unicode": "e6cd", + "unicode_decimal": 59085 + }, + { + "icon_id": "41983432", + "name": "朋友圈-copy", + "font_class": "iconfontzhizuobiaozhunbduan3-1", + "unicode": "100af", + "unicode_decimal": 65711 + }, + { + "icon_id": "9478557", + "name": "工作台_选中", + "font_class": "gongzuotai_xuanzhong", + "unicode": "e605", + "unicode_decimal": 58885 + }, + { + "icon_id": "2076317", + "name": " 意见反馈", + "font_class": "yijianfankui", + "unicode": "e8a1", + "unicode_decimal": 59553 + }, + { + "icon_id": "2468169", + "name": "作业指导书", + "font_class": "zuoyesheji", + "unicode": "e619", + "unicode_decimal": 58905 + }, + { + "icon_id": "3865266", + "name": "计划", + "font_class": "jihua", + "unicode": "e601", + "unicode_decimal": 58881 + }, + { + "icon_id": "4308245", + "name": "学情概览", + "font_class": "xueqingfenxi", + "unicode": "e68a", + "unicode_decimal": 59018 + }, + { + "icon_id": "5113507", + "name": "教学中心_作业批改", + "font_class": "zuoyebuzhi", + "unicode": "e607", + "unicode_decimal": 58887 + }, + { + "icon_id": "5767879", + "name": "执行反馈", + "font_class": "zuoyepigai", + "unicode": "ec35", + "unicode_decimal": 60469 + }, + { + "icon_id": "10992961", + "name": "课程标准", + "font_class": "jiaocai1", + "unicode": "e781", + "unicode_decimal": 59265 + }, + { + "icon_id": "11744086", + "name": "策略研究 选中", + "font_class": "yanjiushi", + "unicode": "e70a", + "unicode_decimal": 59146 + }, + { + "icon_id": "12732492", + "name": "组织", + "font_class": "zuzhi", + "unicode": "e63b", + "unicode_decimal": 58939 + }, + { + "icon_id": "18909227", + "name": "质量管理", + "font_class": "zhiliang", + "unicode": "e642", + "unicode_decimal": 58946 + }, + { + "icon_id": "21156217", + "name": "培训", + "font_class": "jiaoxueshijian", + "unicode": "e676", + "unicode_decimal": 58998 + }, + { + "icon_id": "33378945", + "name": "课程标准", + "font_class": "kebiao", + "unicode": "e67a", + "unicode_decimal": 59002 + }, + { + "icon_id": "33722029", + "name": "研究院", + "font_class": "yanjiuyuan", + "unicode": "e6bf", + "unicode_decimal": 59071 + }, + { + "icon_id": "35203493", + "name": "考试 (3)", + "font_class": "kaoshi", + "unicode": "eb14", + "unicode_decimal": 60180 + }, + { + "icon_id": "1236933", + "name": "朋友圈", + "font_class": "iconfontzhizuobiaozhunbduan36", + "unicode": "e6eb", + "unicode_decimal": 59115 + }, + { + "icon_id": "40912837", + "name": "智慧图书馆", + "font_class": "ziyuanku", + "unicode": "eb01", + "unicode_decimal": 60161 + }, + { + "icon_id": "41983489", + "name": "策略研究 选中-copy", + "font_class": "yanjiushi-2", + "unicode": "100b0", + "unicode_decimal": 65712 + }, + { + "icon_id": "34833984", + "name": "发送", + "font_class": "fasong", + "unicode": "e692", + "unicode_decimal": 59026 + }, { "icon_id": "34666608", "name": "ai机器人", @@ -12,27 +180,6 @@ "unicode": "e73c", "unicode_decimal": 59196 }, - { - "icon_id": "12657402", - "name": "资源库", - "font_class": "saoyisao", - "unicode": "e691", - "unicode_decimal": 59025 - }, - { - "icon_id": "6513175", - "name": "教学质量分析", - "font_class": "jiaoxuezhiliangfenxi", - "unicode": "e690", - "unicode_decimal": 59024 - }, - { - "icon_id": "38447338", - "name": "教学计划", - "font_class": "jiaoxuejihua", - "unicode": "e7e9", - "unicode_decimal": 59369 - }, { "icon_id": "8455509", "name": "统计", @@ -40,27 +187,6 @@ "unicode": "e68f", "unicode_decimal": 59023 }, - { - "icon_id": "5969226", - "name": "批改", - "font_class": "pigai", - "unicode": "e68d", - "unicode_decimal": 59021 - }, - { - "icon_id": "36295514", - "name": "教学反思", - "font_class": "jiaoxuefansi", - "unicode": "e6b2", - "unicode_decimal": 59058 - }, - { - "icon_id": "21088705", - "name": "考试", - "font_class": "kaoshi", - "unicode": "e68a", - "unicode_decimal": 59018 - }, { "icon_id": "20574719", "name": "疑问", @@ -285,13 +411,6 @@ "unicode": "e642", "unicode_decimal": 58946 }, - { - "icon_id": "6235034", - "name": "组织框架", - "font_class": "organization-framework-line", - "unicode": "e9fe", - "unicode_decimal": 59902 - }, { "icon_id": "10900222", "name": "教材", @@ -411,13 +530,6 @@ "unicode": "eb13", "unicode_decimal": 60179 }, - { - "icon_id": "577336", - "name": "反馈", - "font_class": "fankui", - "unicode": "e738", - "unicode_decimal": 59192 - }, { "icon_id": "1447760", "name": "题库", @@ -453,13 +565,6 @@ "unicode": "e61c", "unicode_decimal": 58908 }, - { - "icon_id": "4686996", - "name": "教学分析", - "font_class": "jiaoxuefenxi", - "unicode": "e605", - "unicode_decimal": 58885 - }, { "icon_id": "4893191", "name": "文件夹", @@ -502,20 +607,6 @@ "unicode": "e675", "unicode_decimal": 58997 }, - { - "icon_id": "7327280", - "name": "研究室", - "font_class": "yanjiushi", - "unicode": "e607", - "unicode_decimal": 58887 - }, - { - "icon_id": "7905547", - "name": "工作台", - "font_class": "gongzuotai", - "unicode": "e676", - "unicode_decimal": 58998 - }, { "icon_id": "9023128", "name": "论文", @@ -544,13 +635,6 @@ "unicode": "e6fe", "unicode_decimal": 59134 }, - { - "icon_id": "16364339", - "name": "朋友圈", - "font_class": "pengyouquan1", - "unicode": "e635", - "unicode_decimal": 58933 - }, { "icon_id": "37075078", "name": "备课", @@ -586,13 +670,6 @@ "unicode": "e612", "unicode_decimal": 58898 }, - { - "icon_id": "2680657", - "name": "反馈", - "font_class": "fankui1", - "unicode": "e6fa", - "unicode_decimal": 59130 - }, { "icon_id": "4520331", "name": "设置", @@ -670,13 +747,6 @@ "unicode": "e654", "unicode_decimal": 58964 }, - { - "icon_id": "6560965", - "name": "课程", - "font_class": "kecheng", - "unicode": "e619", - "unicode_decimal": 58905 - }, { "icon_id": "6682548", "name": "编辑", @@ -726,13 +796,6 @@ "unicode": "e79a", "unicode_decimal": 59290 }, - { - "icon_id": "8225912", - "name": "学情分析", - "font_class": "xueqingfenxi", - "unicode": "e67a", - "unicode_decimal": 59002 - }, { "icon_id": "9922803", "name": "check", @@ -936,13 +999,6 @@ "unicode": "e636", "unicode_decimal": 58934 }, - { - "icon_id": "39506557", - "name": "资源分析", - "font_class": "ziyuanfenxi", - "unicode": "e637", - "unicode_decimal": 58935 - }, { "icon_id": "3267408", "name": "收藏", @@ -971,13 +1027,6 @@ "unicode": "e772", "unicode_decimal": 59250 }, - { - "icon_id": "6837777", - "name": "写作", - "font_class": "xiezuo1", - "unicode": "e63b", - "unicode_decimal": 58939 - }, { "icon_id": "7171145", "name": "粮食动态决策分析系统", @@ -1377,13 +1426,6 @@ "unicode": "e672", "unicode_decimal": 58994 }, - { - "icon_id": "15841963", - "name": "教学资源", - "font_class": "jiaoxueziyuan", - "unicode": "e601", - "unicode_decimal": 58881 - }, { "icon_id": "5562910", "name": "备课", diff --git a/src/renderer/src/assets/iconfont/iconfont.svg b/src/renderer/src/assets/iconfont/iconfont.svg index 4949c8e..105c931 100644 --- a/src/renderer/src/assets/iconfont/iconfont.svg +++ b/src/renderer/src/assets/iconfont/iconfont.svg @@ -14,22 +14,58 @@ /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - @@ -94,8 +130,6 @@ - - @@ -130,8 +164,6 @@ - - @@ -142,8 +174,6 @@ - - @@ -156,10 +186,6 @@ - - - - @@ -168,8 +194,6 @@ - - @@ -180,8 +204,6 @@ - - @@ -204,8 +226,6 @@ - - @@ -220,8 +240,6 @@ - - @@ -280,8 +298,6 @@ - - @@ -290,8 +306,6 @@ - - @@ -406,8 +420,6 @@ - - diff --git a/src/renderer/src/assets/iconfont/iconfont.ttf b/src/renderer/src/assets/iconfont/iconfont.ttf index 43ac2dc..efbbc57 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 10961b9..8fd280e 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 e8cb594..f0667a9 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/assets/images/logo.png b/src/renderer/src/assets/images/logo.png index 45f6e65..f21ff02 100644 Binary files a/src/renderer/src/assets/images/logo.png and b/src/renderer/src/assets/images/logo.png differ diff --git a/src/renderer/src/components/ai-chart/index.vue b/src/renderer/src/components/ai-chart/index.vue index 18b00f5..5234683 100644 --- a/src/renderer/src/components/ai-chart/index.vue +++ b/src/renderer/src/components/ai-chart/index.vue @@ -122,7 +122,8 @@ const outerAi = [ title: '教学大模型', secondTit: '中小学基础教学大模型', img: new URL('../../../src/assets/images/ai-02.png', import.meta.url).href, - disabled: true, + path: '/ais/aimoss' + }, { id: 3, diff --git a/src/renderer/src/components/choose-textbook/index.vue b/src/renderer/src/components/choose-textbook/index.vue index 028cd02..3c4414d 100644 --- a/src/renderer/src/components/choose-textbook/index.vue +++ b/src/renderer/src/components/choose-textbook/index.vue @@ -49,7 +49,7 @@ import { useGetSubject } from '@/hooks/useGetSubject' const BaseUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH // 定义要发送的emit事件 -const emit = defineEmits(['nodeClick']) +const emit = defineEmits(['nodeClick', 'changeBook']) let useSubject = null const subjectList = ref([]) const dialogVisible = ref(false) @@ -164,7 +164,6 @@ const handleNodeClick = (data) => { sessionStore.set('subject.defaultExpandedKeys', defaultExpandedKeys) sessionStore.set('subject.curNode', nodeData) emit('nodeClick', curData) - } onMounted( async () => { treeLoading.value = true diff --git a/src/renderer/src/components/common/cForm.vue b/src/renderer/src/components/common/cForm.vue index c84dbcb..72b1956 100644 --- a/src/renderer/src/components/common/cForm.vue +++ b/src/renderer/src/components/common/cForm.vue @@ -145,7 +145,6 @@ export default { } }, created() { - window.test = this this.slotKeys = Object.keys(this.$slots) }, methods: { diff --git a/src/renderer/src/components/file-image/index.vue b/src/renderer/src/components/file-image/index.vue index 4cc856a..092c238 100644 --- a/src/renderer/src/components/file-image/index.vue +++ b/src/renderer/src/components/file-image/index.vue @@ -34,7 +34,7 @@ const getFileTypeIcon = () => { gif: 'icon-gif', txt: 'icon-txt', rar: 'icon-rar', - apt: 'icon-lunwen' + apt: 'icon-A' } if (iconObj[name]) { return '#' + iconObj[name] diff --git a/src/renderer/src/components/pdf/index copy.vue b/src/renderer/src/components/pdf/index copy.vue index a1c3487..ed17c21 100644 --- a/src/renderer/src/components/pdf/index copy.vue +++ b/src/renderer/src/components/pdf/index copy.vue @@ -285,7 +285,7 @@ onMounted(async () => { canvas2.canvas.setWidth(window.innerWidth / 2 - 100) // canvas2.canvas.isDrawingMode=false canvas1FabricVue.value = canvas2 - window.test = { canvas1, canvas2 } + // window.test = { canvas1, canvas2 } emit('update:numPagesTotal', pdf.numPages) if (props.pdfObj.allPageData.length) { diff --git a/src/renderer/src/components/pdf/index.vue b/src/renderer/src/components/pdf/index.vue index 2ac6582..a4044f4 100644 --- a/src/renderer/src/components/pdf/index.vue +++ b/src/renderer/src/components/pdf/index.vue @@ -294,7 +294,7 @@ onMounted(async () => { canvas2.canvas.setWidth(window.innerWidth / 2 - 100) // canvas2.canvas.isDrawingMode=false canvas1FabricVue.value = canvas2 - window.test = { canvas1, canvas2 } + // window.test = { canvas1, canvas2 } emit('update:numPagesTotal', pdf.numPages) if (props.pdfObj.allPageData.length) { diff --git a/src/renderer/src/components/set-homework/index.vue b/src/renderer/src/components/set-homework/index.vue index 56b42a7..380e381 100644 --- a/src/renderer/src/components/set-homework/index.vue +++ b/src/renderer/src/components/set-homework/index.vue @@ -276,6 +276,7 @@ const cloneDialog = (formEl) => { expandedKeys.value = [] formEl.resetFields() model.value = false + emit('on-close') } onMounted(() => { diff --git a/src/renderer/src/components/whiteboard/whiteboard.vue b/src/renderer/src/components/whiteboard/whiteboard.vue index 16dfc93..fdd15fc 100644 --- a/src/renderer/src/components/whiteboard/whiteboard.vue +++ b/src/renderer/src/components/whiteboard/whiteboard.vue @@ -60,10 +60,12 @@ {{ type == 'design' ? '形状' : '工具' }}