From af20ff49318a2b1462c8834bf60abc437061439c Mon Sep 17 00:00:00 2001 From: lyc Date: Thu, 25 Jul 2024 10:52:29 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=95=99=E5=AD=A6=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/utils/linkConfig.js | 9 ++++++++- src/renderer/src/views/prepare/index.vue | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/renderer/src/utils/linkConfig.js b/src/renderer/src/utils/linkConfig.js index 54e03ea..09c7aa1 100644 --- a/src/renderer/src/utils/linkConfig.js +++ b/src/renderer/src/utils/linkConfig.js @@ -33,8 +33,15 @@ const standard = { fullPath: `${baseConfig.url}/teaching/chatwithstandard` } +// 教学大模型 +const aiModel = { + data: { ...baseConfig}, + fullPath: `${baseConfig.url}/platofai` +} + export default { homeWork, gk, - standard + standard, + aiModel } \ No newline at end of file diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue index 7d1954f..9ae9fef 100644 --- a/src/renderer/src/views/prepare/index.vue +++ b/src/renderer/src/views/prepare/index.vue @@ -10,7 +10,7 @@ 课标研读 电子课本 高考研读 - 教学大模型 + 教学大模型 上课 @@ -73,8 +73,8 @@ 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' + const { ipcRenderer } = window.electron || {} export default { From 0ec1a7327a385ad17c7466ff7f40fae85505f294 Mon Sep 17 00:00:00 2001 From: lyc Date: Thu, 25 Jul 2024 16:45:17 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dev-app-update.yml | 2 +- electron-builder-test.yml | 46 +++++++++++++++++++++++++++++ electron-builder.yml | 2 +- package.json | 4 ++- src/main/index.js | 7 +++-- src/main/update.js | 61 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 116 insertions(+), 6 deletions(-) create mode 100644 electron-builder-test.yml create mode 100644 src/main/update.js diff --git a/dev-app-update.yml b/dev-app-update.yml index 0a21494..0083a29 100644 --- a/dev-app-update.yml +++ b/dev-app-update.yml @@ -1,3 +1,3 @@ provider: generic -url: https://example.com/auto-updates +url: http://localhost:3000/ updaterCacheDirName: electron-app-updater diff --git a/electron-builder-test.yml b/electron-builder-test.yml new file mode 100644 index 0000000..86eda95 --- /dev/null +++ b/electron-builder-test.yml @@ -0,0 +1,46 @@ +appId: com.electron.app +productName: AIx +directories: + buildResources: build +files: + - '!**/.vscode/*' + - '!src/*' + - '!electron.vite.config.{js,ts,mjs,cjs}' + - '!{.eslintignore,.eslintrc.cjs,.prettierignore,.prettierrc.yaml,dev-app-update.yml,CHANGELOG.md,README.md}' + - '!{.env,.env.*,.npmrc,pnpm-lock.yaml}' +asarUnpack: + - resources/** +win: + executableName: AIx +nsis: + oneClick: false + allowToChangeInstallationDirectory: true + artifactName: ${name}-${version}-setup.${ext} + shortcutName: ${productName} + uninstallDisplayName: ${productName} + createDesktopShortcut: always +mac: + entitlementsInherit: build/entitlements.mac.plist + extendInfo: + - NSCameraUsageDescription: Application requests access to the device's camera. + - NSMicrophoneUsageDescription: Application requests access to the device's microphone. + - NSDocumentsFolderUsageDescription: Application requests access to the user's Documents folder. + - NSDownloadsFolderUsageDescription: Application requests access to the user's Downloads folder. + notarize: false +dmg: + artifactName: ${name}-${version}.${ext} +linux: + target: + - AppImage + - snap + - deb + maintainer: electronjs.org + category: Utility +appImage: + artifactName: ${name}-${version}.${ext} +npmRebuild: false +publish: + provider: generic + url: http://localhost:3000 +electronDownload: + mirror: https://npmmirror.com/mirrors/electron/ diff --git a/electron-builder.yml b/electron-builder.yml index 52741c5..2834cf9 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -41,6 +41,6 @@ appImage: npmRebuild: false publish: provider: generic - url: https://example.com/auto-updates + url: https://file.ysaix.com:7868/src/assets/smarttalk/ electronDownload: mirror: https://npmmirror.com/mirrors/electron/ diff --git a/package.json b/package.json index c92e305..31fd129 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,8 @@ "build": "electron-vite build", "postinstall": "electron-builder install-app-deps", "build:unpack": "npm run build && electron-builder --dir", - "build:win": "npm run build && electron-builder --win", + "build:test": "npm run build && electron-builder --win --config ./electron-builder-test.yml", + "build:prod": "npm run build && electron-builder --win --config ./electron-builder.yml", "build:mac": "npm run build && electron-builder --mac", "build:linux": "npm run build && electron-builder --linux" }, @@ -24,6 +25,7 @@ "@vueuse/core": "^10.11.0", "crypto-js": "^4.2.0", "electron-dl-manager": "^3.0.0", + "electron-log": "^5.1.7", "electron-updater": "^6.1.7", "element-plus": "^2.7.6", "js-cookie": "^3.0.5", diff --git a/src/main/index.js b/src/main/index.js index 12395b8..7acd4ca 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -3,6 +3,7 @@ import { join } from 'path' import { electronApp, optimizer, is } from '@electron-toolkit/utils' import icon from '../../resources/icon.png?asset' import File from './file' +import updateInit from './update' File({ app, shell, BrowserWindow, ipcMain }) process.env['ELECTRON_DISABLE_SECURITY_WARNINGS'] = 'true' @@ -31,13 +32,14 @@ function createLoginWindow() { loginWindow.loadURL('http://localhost:5173/#/login') } else { loginWindow.loadFile(join(__dirname, '../renderer/index.html'), {hash: 'login'}) + updateInit(loginWindow) } - loginWindow.webContents.openDevTools() + // loginWindow.webContents.openDevTools() loginWindow.once('ready-to-show', () => { loginWindow.show() }) - + loginWindow.on('closed', () => { loginWindow = null }) @@ -114,7 +116,6 @@ async function createLinkWin(data) { // 初始化完成 app.on('ready', () => { - // 设置应用程序用户模型标识符 electronApp.setAppUserModelId('com.electron') diff --git a/src/main/update.js b/src/main/update.js new file mode 100644 index 0000000..d59d155 --- /dev/null +++ b/src/main/update.js @@ -0,0 +1,61 @@ +import { dialog } from 'electron' +import logger from 'electron-log' +const updateURL = 'http://27.128.240.72:3000/zhuhao/AIx_Smarttalk/releases/tag/V1.0.0%28%E6%B5%8B%E8%AF%95%E7%89%88%29/' + +// 主进程中的更新检查 +const { autoUpdater } = require('electron-updater') + +const updateInit = (win) => { + logger.info('进来了') + // 检查更新 + autoUpdater.checkForUpdates() + // 自动下载 + autoUpdater.autoDownload = false + // 设置版本更新服务器地址 + // autoUpdater.setFeedURL(updateURL) + + //监听更新事件 + autoUpdater.on('update-available', (info) => { + logger.info('发现新版本') + dialog + .showMessageBox(win,{ + type: 'info', + title: '新版本可用', + message: '有一个可用的新版本,要更新吗', + buttons: ['是', '否'] + }) + .then((result) => { + if (result.response === 0) { + // 用户选择更新,触发下载和安装 + autoUpdater.downloadUpdate() + } + }) + }) + + // 没有新版本 + autoUpdater.on('update-not-available', () => { + logger.info('没有新版本') + }) + + // 更新发生错误 + autoUpdater.on('error', () => { + logger.error('检查更新失败') + }) + + // 跟新下载完毕 + autoUpdater.on('update-downloaded', () => { + dialog + .showMessageBox({ + type: 'info', + title: '更新下载完成', + message: '点击确定重启获取最新内容', + buttons: ['确定'] + }) + .then(() => { + // 调用 quitAndInstall 来安装更新 + autoUpdater.quitAndInstall() + }) + }) +} + +export default updateInit \ No newline at end of file From 5fea7e094d52ff6addf209f3694546fb2d252bd2 Mon Sep 17 00:00:00 2001 From: lyc Date: Fri, 26 Jul 2024 09:43:59 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=B5=84=E6=BA=90-=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- electron-builder-test.yml | 1 + electron-builder.yml | 1 + resources/logo.ico | Bin 0 -> 270398 bytes .../src/components/upload-dialog/index.vue | 62 ++++++++++++------ src/renderer/src/views/resource/index.vue | 1 - 5 files changed, 45 insertions(+), 20 deletions(-) create mode 100644 resources/logo.ico diff --git a/electron-builder-test.yml b/electron-builder-test.yml index 86eda95..61fba8f 100644 --- a/electron-builder-test.yml +++ b/electron-builder-test.yml @@ -12,6 +12,7 @@ asarUnpack: - resources/** win: executableName: AIx + icon: resources/logo.ico nsis: oneClick: false allowToChangeInstallationDirectory: true diff --git a/electron-builder.yml b/electron-builder.yml index 2834cf9..cb2cf97 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -12,6 +12,7 @@ asarUnpack: - resources/** win: executableName: AIx + icon: resources/logo.ico nsis: oneClick: false allowToChangeInstallationDirectory: true diff --git a/resources/logo.ico b/resources/logo.ico new file mode 100644 index 0000000000000000000000000000000000000000..4c332396f6524ed32670a964a89389834a94f246 GIT binary patch literal 270398 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�|H&wJhM@6|PzH+E|!7Z7W1M>rqx4UiT15<_meTy?yc zt*nnv*rMifTI)xT5dM3jawY#~aqbBG-{hD#i(KI|%F?|n$!le=(ErTwqjs-w{Lj_r ztc9K@2f*2Vp|Lyee}l7r>n6Ybg6Q9$B_^L(oj_n?FiYrH_wut3>%I0dB;){buiB>` zD)z@D%}*v|2dLe$Lw$$41_tL0mNoof^IvlQnL1l5Q5!mk`=a-|wymC*``NWOH(k+6 zIUILxM~Iyfg$w4&IS}qbMls&xV)2Og1{QgZ#gHc>l(xd6z3w_bfx zV++0p$;*IRryv8w7m!?kA~Jx_B`3g{ay}v%9&F{HC=*CNun%Tpe)ZbCVKTi6K>d2Ws*kbI7%H*8>oniW# z@cx}}J}3LT=l{q%t~LG_kpB-1zcJnRz(mCF5PlF)_pDR=hXfe{XhEN{y8(H66H$buM6t$;nwYsUpd;7Jg)LuxeP9Rtp8GyZC=QQaZ6W+5XKiC?~xnZVZaK=FV zI3uplJ0Fs(PBj;XlsNg|&|El!_H8*1EJ`(K6Iv3LUa@#EJ^J^xjgHq!6Ly=R~B z&*A=^{kv!P3FPgsjlAv>%`b9(5A{IwZL)^X>udjx)K<~cJ%8TkG5dESuOHps4}ZPq z|0DMf2>36uF_AsA*95g!)X|K6Xt3u06S0*O=Y4KG(7%Ux0C9Z!h4C}7VLe|pCLnTv zJU=tV5{(H2oE7`x)As~_K~1S&lke8N#?fw-%m85CQ2e@sAkToT8hBkhwM|MBPWWEf z))&-oGszJ9CPd2KrGDe{T=an$f~ zre8Q`Q~A5{U(OA9?7<<*e{7@Dbk9ojwXj#jkH?F?3+DL8p5yCzT+m1S0s4F37d=As zlZVcdAWuNu@O9nK6Tf{+!Z87406xad&!z~r56@!P$jvl6Y{ZL<@cm#IWL-+L4m_(xS!@|e|&;KXK3^)EK>HmBFKR<3%vG5<>!7uu7 zu*sPpR`2xRYArAPf@fS4I*NG$ix*0rfV_@)Up(G2r-XW*&u4s~G9a-3g}1UMGJrW? z+B+29jUP1N+8=E;CI>RT<{4V9b_VCinb77uZ3}1J9_u#9P zr-{z!C2qeqBf|~3wOgLNKKIVoW54>sSd|Zn_U{yi`@wrTH)x~I4+&zwr9)Pi27M9l z8a)4Be)f^z953NeEZvx@=inEdhTDr5%o1*%kjF0Ny6GdXd)i^{-HFd75feZL{NiTI zys`!|mnKIB$a>hM7uGvLWWY+Tb&Mwi)TR)5^7LbO>9w&}@%FPQpXd6ozO13z)9Ulb znAxp*TI%npi|KoH8|~xc`jM}m`<$~y?Hz0J`sh5&_Vpz$xLES`-P=ixu*l~eUq4$e zUDW6#>ED^E+)t)|C;I0m9s_{?6UINRzEMfvr=r9_s@GQji@o;7OJkM)%*sg>#}iv; ztNP_x>(^?%2zuZ5n}SvBN%YDC!*0@A0_KCn_u;AQ{l(3h^^xHHcX?z0`m&c{ruxV28aw{ zExt2x$IDvFyd$YkWKMW28KBoD{f*2Ogk5qazY?2IcfsTZ6VltAqv@yf|>PtZ65`Lg1=Kj>NX^&R~#SI*Mw7L6}n zR}-6i=$>1Zn{eLieQckRcU&jy>`1`o|3YVMXRKSN^B&Rpq4f~C{W}lob*+l)LqwNZ z(Y{YIe|9QF$SPksLlwTFvZ*T-5P89;83v$sC^V4~pmNY!6l zuh-py?Rl7-Bl?W?86{FD@O`!&z-$>G4}e$L8Tix4op|R9_}O81^zEXtfY3cG%6}8j z>d@?DjmKY)iSu7&gUA4S z5UAT_wpjZnr{#%TBL|2HfM@1efAihs1$O z?;|tEqWJ>+U1fyK48afgbw)+WefZ0Fog%&S!MvU5I+Xf9&dzx1vAZ=c?`I@cI*-v z5X1v=eF6Lm`V;RO&`o28@$3owfDhh%SvgjeegK>c;&efbK307%`kETxS6`6$7j?_o zebJu#BNNd3fv>+-WW+W%_Tf8)M~CWKV4eNO_NPYk_M5tB{1Lvzt361DzlD7*=MaA| zd7|3>eD8GPXi=6E zYBR)(33y)s-@^L>*g*IK^gw+t{N~)iXm)_lSq{0SQ<3@s*cY8zoTgk`EqT0XT!Z`Q z^*3L6N;&F#EV-}94~_LnJRo+CFR0oT*G*aFvsyeKSZQ~7?b zed>qrNX|FV4MoYBbXprd3jXKK{#57q#o}X0JO>Y%14?b*E6+WWGfPbGf#@Y3$q&{& z?YEAz$eBO1dw1;fLWA7kRC#Z%9e^%J28@01HeEyKAj)Tle`l_Tvr##(ti`!U>-D6% zE(q=t`+QgOZSm%8Qhz^r(koI!RZ*`+?R0s65bL`pj?EwB^^qS7#Mi&P&DnW!h3e~z z&Oh&*W3_*W*aEr0(#Cz{2y;t6{dkJ>d>yL#ES)%7l-~v2&-x4J&D47PaJ-j>-{GA0 z5K1l1w5e|k9*+=>?-fevlrAOzdB*G&IAf( zq2!kV>oQd(e4X5&z9Qxh<3l&-qgFznLS;3 z>*JZ&FmT`3^hUG!y|0fgKlb6F8e_!9=h}52k%Qtp^u4;ho*h!u{X41PKYKN6#;5MQ z>c7i#c4%SmN4meCev+nVA1-tB7nW}Ri_Y~t+%LU>%mDJ|Q=qrK4DfXVoD;TSUeNbT z?hYHmzd!des1=^|+56%H9TwODA_L$cKg-p}U`@?U)GN#^VO>$-M<+htHRh!BC`mBQ;MQ;D0 zd-}^d+Y+At6X{xu^KWY;H#+C@8RC=u!T6tq9^&3Nukm~7kNraPThXvyn*I)#@xkfO z88d2t>MHmOemw`#;dTC5QR)PqjuY1pdWPs7*10vJ2OEkE2=w9M!tYPi){pf4eSg5n ze_g417k}A*enB3IM{*7$v21#0!ubRD@pGBi+3lhl%6&eE+&p^!F6rUL=8s&96Zrc0 z4D{=FyXf3JHTRmjc-P>1K=?; z%Fy?9{u#^>Y9ulMJ~XNN2e(pY2Vm>xe{WC|uxZlRu2tDU%@VbcdcX(=^n@Iv*l@E;kVF#(C|-`KOI@ONW&oj_hYp7jG6@T;39X91Aw#t!EF z@Pv8g#QT{Km|q5L(U`gfCSxlm_sg~$BhFTOmv0Q!0G&G{U-&-eXT z->%vh5UGEk_fj`Vo?zS<>DQO<7TT}R{;2@ZKsfAU0Ef|GHwx`xNlwves3^-q_{7mR_K68NiHFY6m+uJ4s^*$zqAvLH#oh z72W%Z<)7ExQrpLz4*G8SJ{q5w>l%D>7tIqy;yzr(*C#hV@cND_H?T3-7k-fa z#14nwc4dk8?-W+9ARp;DzNqmD#{VSrKN!EL(Fua-O=?ejcOnP*;$b%R!ET^FTPS5E}rF@P29ouJ7JVKO<6|F!{hqua8%b z!B790i9Dju@9f`Ae0S{br6K&!t?6gB6|W=C=jGX;8#)EEI`h@z_}P40^_<>rZDlr} z$O>P>&o$vI5%YZM+0kn6M~)d3-Y+jKuM>Sg@e*V}`=+A2-ygsvcLw$X|2XdrUoxe%{&P2CaYW+(?|4!)lF37)E2>;1x zT-^K=ohO&*{+IXH!H-U|XW)6KV7Rn%Jl^#o1GI-w;&~sw_p0#rh@3dNmjT4u=wrF& z@@8(+rYw~g%nqYwAXq<$D*Y=Jl~1cz^Fp z>dX5UiOs(y=e>T7vieATlNz8dt2=M^T+^d_o(k- zwix{Z;2!>X8Q{6hnez+h&v5hwgvJC|1AZd|o*6q_-wzMr5Wc{8nF)rU5LzRM4M2}z zrxqvY^v=Y(56F~;l`3ZI{>(gFBwqLNhm+)bkI2C@b_?h6ajqV^E|mN5mbw6P1h-3G z9~~c>*XQ5(KSOTm8l1mV%KCQ-D|Z6^uak2Ps^;uhti8AA0xrP+u5GGlKAoDjvcT_T zu8}jo(d$=V)+p#96#i;lQ2YTffPK%oq2v&?cOWDtpfX@*aCV75cUbdu!dv|3cPBop z`A6c0{+fsbJoEV7>SK6$6Af$d@%Ec8(b#;B-!D3x+P?Xc%Vw@N*T?(eey@(TbRJLM z^Z0UW_^H$7oNiv56aSR=67R?F8TaVjrM7=375pd8*{kEZ+B*?#&+YF4p8P(54fc$B zd9`Ol>g+tG%km=}-YY&n-*32_GasrK*#jRFz-GUH*bNd7*rzc8?+fsL>>~P)M&H{n zC$~UckRN6Z6HD}a^rg%aSueTNW@jI%HoM>F@JH+j-v9o4Z|GUM;2(WX?GH2lIyO5+ z^)>I~nlF|71M#ik`M~Dq_2@nF_2l(Aw=CS(=X58a_QZ>X>DYXiEp zs-(Sr!~_BxBR5`98hD$kYaoV+UvzD^rpAB4jmLJpM=*SS_ok{N(^3C>z3gpy>inik ze!pq8Kjq98^LqrR&l20YZG(TvoRCjd=d&lgS7nIw6@Mpn219P?qA~z(!_PJiPL$_2 z<K#3h}v-D}H_dsIo)&&%9b{df+m;omhW=>H8zc&)V4j7s#0f*!9%qc<#d) zdUDpRUE>B^*GaFz=Q@#P#1)V|{jcp1^zTSqAXPjot?LB*&yv{a`9XbCcC5$mxjp8` zA$x)zy5-7N!v6yr|MGlE%g1c}j2>URdb#U-{#iM?JTxYNU(WoSiLZ=Po$u!fAOo=P z_aFGiT_<{mTmXBBzum2EHLVY#F9DgsW4E@IBh~|9_qVEjjPjYf9c*&qeItfkrEx~& z1G>Cf^*>5a+b5dm(|TZ$6Xh1CW-yj}X)Fv&EFQ%@Dxa0UohvoR=p}0e@Q;)Y{ z(-zIWlY@U!W*#GVhzk&_t9x2S_t6J$t4#ne(EarNFyn91n-ipG^XQzl{dM#HCRP6^ zvw+5HOn{ttsLfCqewFt3QZr4hp_8vjKnh2kyRzrBq)SYpuFtmTRS@E9G<{7`0w zpu^#v=Ms;;ci_5i&80qioxGNqz*hAI_DS#WdO5SCO@qJZ@R0hTd++F@IYaEJ%#78t z-f!~sqoS+%oVQ+oR&99Z_R()g9R@Z$Kj?nngXg(VULSdZua935>g!`KaQ*Z=m(~8A z!pawFfANWi+;W-Pw5I>#%K*>+q5Zo$@Eqi_^Y_N2t4$F2^z;z^A~S!+h~F${2a7$F zBQHe;P;ZBQK)u|8xt}SweVqXFMd%I0PRHh^zLq+J@sAF5KmYrG)lTTvwn|RF4eL_J zb3xr>#2*i4c21QXKW7tg1}eHA9Zvs0GkCG}(ceK0f2N+949`P-ePk4WyRla*@gtUN zoS?8=DvR%@R+7Bw&;dP-|4Hb7dR#{g?ya*d${YWYYsdijOn#4E|MP1euN)57AHj^l zite=+#so2e>^cEv3eTDOk@6a!f!G@{!4KYh+3_EB1LWZRdf5JhZn)U(`f|VYtIpF| zKgb-f!|%K62A$=LKdZjJ#0BPjKHXh*VKwD>sISlGQHL;M@YNbeTr2tS@?!6Y%P97W z80mx&J*nHJ5eAC=={c>e@BQup-VxR;(AqrN`*gYwFKWP#`Z zsG&D#-o*GHV#h|2eV+dhkGLiK?CNRK$=8n_HArO%vw*z};`P`U7uG+~O_lf{H9go0(a!}cJ3V~iIz5@+;XiXz z9vsov_#cJu;kJ!pN%YTS_YczgmC!oYy!z4eBmE!o2dLqP*N@&eNU;>!L&&Ue^f>yu zP5pnk`E#aa`vYI94>7d={5pcfLIK4sF2qR%U;Z6A&wxLfn&LnS8g zn7)>|q?{!P$IkO%e8tSEDY;H+PoU3zhTb^@;iO zdCdBu&Ye2o@EKu6!>h7mKWq^Gb9RyUslxA<{hpuy%)5Vf>+`xjl(?!?+J;z@6IMSGaa2R`>Isy9sfByBq*=L0ZIRRel`H$^@Z@}yx{0MS* z)Bq9-z>c5z+S4+dFK@p-@25utS-~0HaQq<;@E`6P z)YI+$N@fZQryqS_u*!qbygsi(wvdx}PtF2L=l-2k$PeQG&pa_o<)!gIKkmYD$R3f` zdiD9yYX3*VzWq&PqSyk|^Pu1F?AKN80On}=SUmd*SBd?#uKQOvXVz4e0T17Eb55T? z=-$KWo*inq9lO4k+k<#z8Qe%Eyq+cJN`&=V31vxJ`@tSzZ*oQku`A!$>;4k=t(_=;r z)Epu9yT>GQqo^3s#venIR1jQ_Fuulpl*0CiII5UyIWMCMJNk<&xy&jI!^0qO_v7oHk( zr|9&GYBLPJxwCujsRyLD;E>!oHE>_<2XX5ra{kW5*Pac0{c_a5lM4QmJ7w>PxloH8 zj(7V#@1C$nN{6^cRSs2bs%-(vnn)1$TYS$Y7V{;$bh`!=y#;22Y{*UoLIsUU>$N>8Ni3`5; z%tK;N9in!Axb7i8;D2}y?jtLR2aFhUjn4CCu4j3#<1LKrqW|fm_utZe2G`;Dz<$rW zC-jb@i)PQ9DtavFWic60Fd4wiAL4?ur5CVyjbqgofbY>TM=f8y(|@b=Kji<*d;d;h zc<3GJV=da(?@v5$mpu_jzTa)~1PHx_IGiorRN&<-+j5-n(CV z2={!s#|^x$qvi$z|6hD9iMLSqcjYAww01w8&foDmxFjE$pZxjEX|8dVipGEOG2_WQ zdRrS+{*Csj)AMHhPmSy%CJ@XPJLn!6*-!g+$n8;=e&>K*I;YzDcT%hSkvsHF&z&>N zHL3Pn?c0ur|MLDkvHvDj4|A(mF4MWT#{bmtpM69IaAp880nQO^Sm_v@-M4w$4w=cl zx?IodC@LF)zNm!@=gZkEM`&KFyz@KW_oq&^S@pxEMs2;;wi^Fa$A2#a=pkgb>Z+AX z^~^q-)scF=@8t<{m47#{@q4Yoj)(v9{yh9|diL+c?%y2r|K^;3n_3=}ce%oRpiP^% zh|Uk@cze9sW9no9v(JeCGaI2*oujp`t-SL)-uEZ=PY$|A`4H#Jz8oVwXd%ZKZKPxjmppgiNyG1PO|j+aqbE8Yv^GQ$Flui@I4_eNKD|obN(#7 zLGQUAfBui#A#*RxA1IhFVER9Ga)UDv@%4LOQcr6s^YmONQ1fPTA#u4tOaPzY#b+MW zbMGxCVEj*9Pp6La*!%uGqz@*)=~~x2LFX>njK9RWToAeEV*;Ex!5o{ta^4lSEYu4W z)D|v}?=$^ha9IHNsq5P$=O8lMm$^xK&S*8AU!=Z|j|m_HdUdSjGBQ@W?+#i_AQ?Gk z{4Xf~gR_sBkvv$=^=4K*_9&Pvh(5FT6nx)^37jP{ffnZ;>t@gRQ0v<1dAFEAe4oJh zpDh2EuR!(sx)|5U^U;XX4wsOcGV|LyKv zvGx6VNXFa3@ivwFhYVnLF!Qaux2x&0)~|KnANON*I#~0deM)vv%AY+J`;by_YMs0-$Q!` z_8p*3AipjwkAE}%=jT7%Un{=;2I<{<OoG_P@-oB7$4?B0R$T_<4t5BQJH z_dUDQrDylz=BF$7bykPykK)3peNNHuH8Fu&ryQa&f$yY;usrt;82^L0XZZS?C9nVL z3uEQniNhUdr5hL1a}TsmK=QZL4G-<#UC$RRuXO_Dp8ulv>DkTNu*uzRJ-g*b=J}Wa zGT@4f>$uE}Rnj|9{^|tEJO7!_^~D#9-F4l?*O$66&Yc1qru)ms9%%1?+;{CAkn{1F ziC><22g)P=17Cl+=Jr1M=w0pEWww;{?3NGCN0RNncVNP}`^r`CKzZXo+}EC6sp)xU z?7hPIiZ-9C4CeJCakwyl)0lwt4lrBj?%S^l=^aS#I)U=V|0Oz`i=N%P2KClC9rTNs zyDjGiJ-ep!qsDlAoq+ZZ zOq-n6=MJPh|FQRVJ{LW^lU|YYcm8HQyT<*f+z+(}s1sm*>nqPaqH)1=tP@CQ{;RJq z=kAi%ANT0p+8bW|M6-26F>e2kjt7kiNSy$&;kyR(NXwW&I`e;B)<)^sU+V^5-${FS z=mTkBxxIvRpUH(lE+7MZ?*MfI#00+m{)e=gCy;*p&-L}^&7JAGwymzSxQXjnoG-er zGrq^(8y^#BQS*2=Yx)P$JMe2-%o9i_{;RLQa;2WVGwICR-%Jx}=X~Tbs^D&=m!^SP{;gJK>*SDTs<9sSOAG(Id1SDrn-SDu1z2wY+ z1HriiWi&sSF8p6FzCQE0`u4d<=Reju#q9l1+}giWCkuT{02$D`Q$4pXb9HW=Kp8uK zq)hW)bpA3qXP5Z?%;_Jyj^~}Gv0CfdO&!)vZbaWp-#c)At>fIBSyQD>pzQSylvV!Y z>(jH#Y`)iCe9|?pdZf+gvb=tY#CeDbFb{gd`1?c#{9LBy36w?t!~L}xnU3=|?;Ccr z*6-Jl8IKmhJwO?O* zcCDtTMC@LZ4f$n*uM?ooe3r}@EbTFYvcP}r{Z$g%-?D9&_*f50J=SlmXV-lFQZ4he zcR=!luTB`F{X?a-PM|FCKXcuB?b{uGdmneU)bG=?Yr4nwpfqE^#{^1y??CD1|5B~z zS+Zo2yYi9-TE|<*=5v|sDDCWP#XEKb-XK9sJ;KeT>a|cQr|Ka}XHEZ0)&D-4g$49EK&ulis znC(GX$3QiiDbKkBFF*T8sp%akUHoT0SC(Tw*Wg<&)7&0CyVy}>{odR4+dcF#fwN@Z z@bKGuyL|`f9XQ~&lwj{b>EOTb+1=*m&7I}CT~x#7bCnSv*W_Aqa?QsCg5H7pCEhzw z(){&)S?VMfnb;^g?p8nT%)Hxm2vs<=w znAseKzh6EkK<~gkLxSFcz55PG&2aIYJ5c=m$JbxxHc5Pc?wlE}bF0eQuV43ci}M+u z3eTsqxQ9L_K<_}Wj?z1@L3#(|T;k&B9VkxzWACqAxk}I7qGz{B)jwFzZaK1b%OW?6 z^O}8~zy)J{XP5Ifna{;+u5+Ykw>bCLKFjvIEMR~-0czY|oA9W{ z1a=qUjKSjKf7XW0GOuHWyP;=G&Fxvwu5qy}aIqw=(Z>X|cVJ-8?0Ev;6iG~=Nck^1 zpPpTEd!K$h*|l$ansVRfa~bzbf>&kfGc_h4y)N_)^y$*jZQNKiy#qzXf9!o?`*8o& z7siU6e}ww_W$7N+wVIqNX$<(705b+ZpYdVJdk2by|HA!@%=O~yZ*s%sEM=XKM$fL* z@mjpY;++M;fc6fY%2|Y?b=GjI<_V;p|4TK-w`9pecg^KZ0$<;Hb_;aROIr8X=a(M) z$HxTd9T+kAD(xNEn}XhfRPi5sKk)T;x=*IQ=UUf0A@KFjFuiX)Dm^?Z%lE?92~anD z`gLmxT_=zV{=@y%tJkQn|Frb%);;YoXFa=y`LfKlQhV*}o{YjyE z2U5X*=5u9aX1couUg4_zHOO5et4i%2nh$FCCJitU^bQ>2UV7#s_k+|5?I}R-K*9N+ z+q1iP@dDSq-ML!F%UQ|BeUp7A`->g}J|l@}x?v-K;XiPwA?#__j zfvYcT9P|!+_e1tPfxL4?V(}mD2j}c=br0RsPknvs*-hLhEAP6tbfPwR}lQ!drB5JJ|;l#z&(Texcvvdar6!l6WA{2 zlV@gTxFt&#JM4Ymv-`?~$6ezpGM`Ii2X=(rL)!zxK-tBBuM?nm;Hu7zT-N%vau(r_ zZu|D_E;D1T@PASEe6CII{$V$3&u$Iob6Fj)$-Yt?>oS>?giH$Q9bm@b{5jL4ZunQ1 zm9^fj%i1J!dB4zjA$0_`t!LMGZ@f=i3~2AbDTm68!7=XJgTKgpt|_j4lasAy*D#;9 zm^WJ?*H*wEsPR8RuilVbFLljp{6TGg+oRk)vc0gqNM{Tn12}iX&lckMbpF2f-R%Av z2J&OT;`{mc#BgGJVi+(C7zPXjh5^HXVZbn87%&VN1`Gp+0mFb{z%XDKFbo(53GHFkl!k3>XFs1BL;^fMLKeU>GnA7zPXjh5^HXVZbn87%&VN1`Gp+0mFb{z%XDK zFbo(53GHFkl!k3>XFs1BL;^KyhQBg8gSZU^`$tU^`$tU^`$tU^`$tU^`$t vU^`$tU^`$tU^`$tU^`$tU^`$tU^`$tU^`$tU^`$tU^`$tU^`Ieci{g6gY04~ literal 0 HcmV?d00001 diff --git a/src/renderer/src/components/upload-dialog/index.vue b/src/renderer/src/components/upload-dialog/index.vue index 9d73b35..4615780 100644 --- a/src/renderer/src/components/upload-dialog/index.vue +++ b/src/renderer/src/components/upload-dialog/index.vue @@ -4,11 +4,12 @@
- 选择文件 - 说明:一次最多上传5个文件,单个文件大小不能大于100M + 说明:一次最多上传{{ limit }}个文件,单个文件大小不能大于100M + 仅支持图片、音频、视频、word、ppt、pdf、txt、zip文件
@@ -16,14 +17,15 @@
标题: - - + + .{{ getFileSuffix(item.name) }}
类别: - +
@@ -58,6 +60,7 @@ const props = defineProps({ }, }) const dialogValue = ref(false) +const limit = ref(5) // 定义要发送的emit事件 const emit = defineEmits(['update:modelValue', 'submitFile']) // 文件列表 @@ -68,7 +71,7 @@ watch(() => props.modelValue, (newVal) => { }) const hanleFileChange = (file) => { - console.log(file) + console.log(file) //音频 类型 const audioTypes = ['audio/mpeg', 'audio/wav', 'audio/ogg', 'audio/aac'] @@ -81,9 +84,9 @@ const hanleFileChange = (file) => { // pdf 类型 const pdfTypes = ['application/pdf'] // zip 类型 - const zipTypes = ['application/x-zip-compressed','application/x-compressed'] + const zipTypes = ['application/x-zip-compressed', 'application/x-compressed'] // 图片 类型 - const imgTypes = ['image/jpeg','image/gif', 'image/png'] + const imgTypes = ['image/jpeg', 'image/gif', 'image/png'] // text 类型 const textTypes = ['text/plain'] @@ -93,22 +96,39 @@ const hanleFileChange = (file) => { return false } // 验证文件大小 + // B < KB < MB < GB + // file.raw.size 单位是B const fileSize = file.raw.size / 1024 / 1024 > 100 if (fileSize) { ElMessage.error('文件大小错误! 请上传小于100M的文件!') return false } if (file.status === 'ready') { - + // 给一个默认的fileData file.fileData = { - fileFlag: '课件', + fileFlag: '素材', name: getFileName(file.name), } fileList.value.push(file) + console.log(fileList.value) } } +// 检查文件类型 +const checkFile = (item, file) => { + const type = file.raw.type + const pptTypes = ['application/vnd.ms-powerpoint', 'application/vnd.openxmlformats-officedocument.presentationml.presentation'] + let isPpt = pptTypes.includes(type) + if(!isPpt && item.value == '教案'){ + return true + } + else{ + return false + } + +} + // 删除 const delFile = (index) => { fileList.value.splice(index, 1) @@ -133,7 +153,7 @@ const submitFile = () => { item.fileData.fileShowName = item.fileData.name + '.' + suffix delete item.fileData.name }) - emit('submitFile',fileList.value) + emit('submitFile', fileList.value) closeDialog() } @@ -203,24 +223,28 @@ const submitFile = () => { } } } + .file-input { border-bottom: solid #dfdfdf 1px; + &:hover { border-color: #409EFF; } - &:focus{ + + &:focus { border-color: #409EFF; } } -:deep(.el-input__wrapper){ - box-shadow: none -} -:deep(.el-input__wrapper.is-focus){ - box-shadow: none -} -:deep(.el-input__wrapper:hover){ +:deep(.el-input__wrapper) { box-shadow: none } +:deep(.el-input__wrapper.is-focus) { + box-shadow: none +} + +:deep(.el-input__wrapper:hover) { + box-shadow: none +} diff --git a/src/renderer/src/views/resource/index.vue b/src/renderer/src/views/resource/index.vue index 8550e42..6720e26 100644 --- a/src/renderer/src/views/resource/index.vue +++ b/src/renderer/src/views/resource/index.vue @@ -71,7 +71,6 @@ const submitFile = (data) => { item.fileData = fileData item.callback = fileCallBack }) - // console.log(fileList) uploaderState().pushFile(fileList) } From c0c3324d9d649932b7e6d01f8bbc3ec9086afe86 Mon Sep 17 00:00:00 2001 From: lyc Date: Fri, 26 Jul 2024 10:43:46 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/logo.ico | Bin 270398 -> 270398 bytes src/main/index.js | 2 ++ src/renderer/src/views/resource/index.vue | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/logo.ico b/resources/logo.ico index 4c332396f6524ed32670a964a89389834a94f246..774da954e424572f47c1b2f9cbc1414301e95eae 100644 GIT binary patch delta 5141 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 delta 1074 zcmd^;>r2y77{__e*T$w(oFF+tX>`E?ZH2xlmKYSQi=&H0f{KN`$S!0Tp|BvjLD-Uz z4n+7uB_)Q1zu_|?)+m#btb`(?SV>_Nw1@~|m35xA`U`s3n;)MK-}78JhhH?78;#|5 zR9b<^D_9MYNB`-k%U=R(>W*Jo0Sc22Y$Ut&{$5H$WW~p7BoG?^OHb0oaR+V4=<_Oa zve!mKSv=*S)fvaV$u{Wt)IaW30laBW*CvS7$xian{Zpg-j^!1WnFsU+muL~oJ z2l`YwadSTIOIA+0?42oVbt5M3Bi>hpVZjx|hdqc0`bk%QF{e(=MM!)t@zMDR3)Ya% z8B-2ESBf6-I^y6W^!~vLgB)!}6Y1h-%FbO&&>`8bRGFQ-m!Vz!0CD$ngB-lAP7n{S zM4RDGw2|K9Mka?>p;gYAY@pg?2HQy|u9?X<*JEeeQ%m03geLJ$(q>5~kJO@3{8D=4 zXg%u0dx=N4VvAru>0kx2`RR775f2eR*nxF|k#tpjH>$*A#PJsR1cwbC{Ec_h*O)kj z5{br%-yXq2!567DZT$5Z-10D!sk?OWx09GD`J42b>I||Z|3o}}R`5f?4>NnSva$0# zrpZbad{3?E`OeUY9bZ|e}IqxDqio2A&g`Eq#@LIe`abY)J3VM__yE=K^WjvNv za}*a}!GvI`;@JauDCkpMHi(#DmBAt05cDfvd>vP%O|9akQS^{i9~u9rzjCmt5q&K` GG3yr|5Vpbq diff --git a/src/main/index.js b/src/main/index.js index 7acd4ca..a93360e 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -18,6 +18,7 @@ function createLoginWindow() { show: false, frame: false, autoHideMenuBar: true, + icon: join(__dirname, '../../resources/logo.ico'), ...(process.platform === 'linux' ? { icon } : {}), webPreferences: { preload: join(__dirname, '../preload/index.js'), @@ -52,6 +53,7 @@ function createMainWindow() { show: false, frame: false, // 无边框 autoHideMenuBar: true, + icon: join(__dirname, '../../resources/logo.ico'), ...(process.platform === 'linux' ? { icon } : {}), webPreferences: { preload: join(__dirname, '../preload/index.js'), diff --git a/src/renderer/src/views/resource/index.vue b/src/renderer/src/views/resource/index.vue index 6720e26..ecae1b5 100644 --- a/src/renderer/src/views/resource/index.vue +++ b/src/renderer/src/views/resource/index.vue @@ -64,8 +64,8 @@ const submitFile = (data) => { let fileList = toRaw(data) const { textbookId, levelFirstId, levelSecondId, fileSource, fileRoot } = sourceStore.query // 给每个文件添加属性 - let fileData = { textbookId, levelFirstId, levelSecondId, fileSource, fileRoot } fileList.forEach(item => { + let fileData = { textbookId, levelFirstId, levelSecondId, fileSource, fileRoot } fileData.fileShowName = item.fileData.fileShowName fileData.fileFlag = item.fileData.fileFlag item.fileData = fileData From 7e3978d532308cfe225bc4f9d48ec4b567f1c749 Mon Sep 17 00:00:00 2001 From: lyc Date: Fri, 26 Jul 2024 11:06:06 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- electron-builder-test.yml | 2 +- electron-builder.yml | 2 +- resources/logo2.ico | Bin 0 -> 270398 bytes src/main/index.js | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 resources/logo2.ico diff --git a/electron-builder-test.yml b/electron-builder-test.yml index 61fba8f..ed4e1e2 100644 --- a/electron-builder-test.yml +++ b/electron-builder-test.yml @@ -12,7 +12,7 @@ asarUnpack: - resources/** win: executableName: AIx - icon: resources/logo.ico + icon: resources/logo2.ico nsis: oneClick: false allowToChangeInstallationDirectory: true diff --git a/electron-builder.yml b/electron-builder.yml index cb2cf97..911fb1c 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -12,7 +12,7 @@ asarUnpack: - resources/** win: executableName: AIx - icon: resources/logo.ico + icon: resources/logo2.ico nsis: oneClick: false allowToChangeInstallationDirectory: true diff --git a/resources/logo2.ico b/resources/logo2.ico new file mode 100644 index 0000000000000000000000000000000000000000..9afc9f1c63cfcb1a0af3debd991296116a23dff5 GIT binary patch literal 270398 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 literal 0 HcmV?d00001 diff --git a/src/main/index.js b/src/main/index.js index a93360e..d7d7d6e 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -18,7 +18,7 @@ function createLoginWindow() { show: false, frame: false, autoHideMenuBar: true, - icon: join(__dirname, '../../resources/logo.ico'), + icon: join(__dirname, '../../resources/logo2.ico'), ...(process.platform === 'linux' ? { icon } : {}), webPreferences: { preload: join(__dirname, '../preload/index.js'), @@ -53,7 +53,7 @@ function createMainWindow() { show: false, frame: false, // 无边框 autoHideMenuBar: true, - icon: join(__dirname, '../../resources/logo.ico'), + icon: join(__dirname, '../../resources/logo2.ico'), ...(process.platform === 'linux' ? { icon } : {}), webPreferences: { preload: join(__dirname, '../preload/index.js'), From d2f57fd18e4cfaaf4060285c338a9bf66c7f98d7 Mon Sep 17 00:00:00 2001 From: yangws <1607839436@qq.com> Date: Fri, 26 Jul 2024 12:09:31 +0800 Subject: [PATCH 6/7] =?UTF-8?q?add:=E7=8F=AD=E7=BA=A7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 6 +- src/renderer/src/api/classManage/index.js | 132 +++++ .../src/components/avatar-handle/index.vue | 75 +++ .../components/classManage/select/index.vue | 23 + src/renderer/src/layout/components/Header.vue | 1 + src/renderer/src/store/modules/delClass.js | 22 + src/renderer/src/views/classManage/aside.vue | 53 ++ .../src/views/classManage/basicGroup.vue | 417 ++++++++++++++++ .../src/views/classManage/classInfo.vue | 80 +++ src/renderer/src/views/classManage/index.vue | 292 +++++++++++ .../src/views/classManage/studentList.vue | 454 ++++++++++++++++++ 11 files changed, 1553 insertions(+), 2 deletions(-) create mode 100644 src/renderer/src/api/classManage/index.js create mode 100644 src/renderer/src/components/avatar-handle/index.vue create mode 100644 src/renderer/src/components/classManage/select/index.vue create mode 100644 src/renderer/src/store/modules/delClass.js create mode 100644 src/renderer/src/views/classManage/aside.vue create mode 100644 src/renderer/src/views/classManage/basicGroup.vue create mode 100644 src/renderer/src/views/classManage/classInfo.vue create mode 100644 src/renderer/src/views/classManage/index.vue create mode 100644 src/renderer/src/views/classManage/studentList.vue diff --git a/package.json b/package.json index 31fd129..8ea8298 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "@electron-toolkit/preload": "^3.0.1", "@electron-toolkit/utils": "^3.0.0", "@element-plus/icons-vue": "^2.3.1", + "@vitejs/plugin-vue-jsx": "^4.0.0", "@vueuse/core": "^10.11.0", "crypto-js": "^4.2.0", "electron-dl-manager": "^3.0.0", @@ -34,8 +35,9 @@ "pinia": "^2.1.7", "pinia-plugin-persistedstate": "^3.2.1", "spark-md5": "^3.0.2", - "vue-cropper": "^1.0.3", - "vue-router": "^4.4.0" + "vue-cropper": "^1.1.4", + "vue-router": "^4.4.0", + "xlsx": "^0.18.5" }, "devDependencies": { "@electron-toolkit/eslint-config": "^1.0.2", diff --git a/src/renderer/src/api/classManage/index.js b/src/renderer/src/api/classManage/index.js new file mode 100644 index 0000000..14a8314 --- /dev/null +++ b/src/renderer/src/api/classManage/index.js @@ -0,0 +1,132 @@ +// 查询evaluation列表 +import request from '@/utils/request' +// 查询班级列表 +export function listClassmain(query) { + return request({ + url: '/education/classmain/list', + method: 'get', + params: query + }) +} +// 查询学生列表 +export function listClassuser(query) { + return request({ + url: '/education/classuser/list', + method: 'get', + params: query + }) +} +// 新增班级 +export function addClassmain(data) { + return request({ + url: '/education/classmain', + method: 'post', + data: data + }) +} +// 查询所有学科的列表 +export function listEvaluation(query) { + return request({ + url: '/education/evaluation/list', + method: 'get', + params: query + }) +} +// 新增小组 +export function addClassgroup(data) { + return request({ + url: '/education/classgroup', + method: 'post', + data: data + }) +} +//班级详情 +export function getClassmain(id) { + return request({ + url: '/education/classmain/' + id, + method: 'get' + }) +} +// 获取小组列表 +export function listClassgroup(query) { + return request({ + url: '/education/classgroup/list', + method: 'get', + params: query + }) +} +//删除小组 +export function delClassgroup(id) { + return request({ + url: '/education/classgroup/' + id, + method: 'delete' + }) +} +//查询小组信息 +export function getClassgroup(id) { + return request({ + url: '/education/classgroup/' + id, + method: 'get' + }) +} +//修改小组信息 +export function updateClassgroup(data) { + return request({ + url: '/education/classgroup', + method: 'put', + data: data + }) +} +//新增学生 +export function addStudentmain(data) { + return request({ + url: '/education/studentmain', + method: 'post', + data: data + }) +} +//修改学生信息 +export function updateStudentmain(data) { + return request({ + url: '/education/studentmain', + method: 'put', + data: data + }) +} +//获取学生信息 +export function getStudentmain(id) { + return request({ + url: '/education/studentmain/' + id, + method: 'get' + }) +} +//删除学生 +export function leaveClass(data) { + return request({ + url: '/education/classuser/leaveClass', + method: 'post', + data: data + }) +} +//删除学生所有数据 +export function removeStudentDataAll(id) { + return request({ + url: '/education/studentmain/removeStudent/' + id, + method: 'post' + }) +} +//删除教室 +export function delClassroom(id) { + return request({ + url: '/education/classroom/' + id, + method: 'delete' + }) +} +//导入学生 +export function addStudentmainByNameArray(data) { + return request({ + url: '/education/studentmain/addByNameArray', + method: 'post', + data: data + }) +} diff --git a/src/renderer/src/components/avatar-handle/index.vue b/src/renderer/src/components/avatar-handle/index.vue new file mode 100644 index 0000000..774955f --- /dev/null +++ b/src/renderer/src/components/avatar-handle/index.vue @@ -0,0 +1,75 @@ + + + + + diff --git a/src/renderer/src/components/classManage/select/index.vue b/src/renderer/src/components/classManage/select/index.vue new file mode 100644 index 0000000..b8959c3 --- /dev/null +++ b/src/renderer/src/components/classManage/select/index.vue @@ -0,0 +1,23 @@ + + + diff --git a/src/renderer/src/layout/components/Header.vue b/src/renderer/src/layout/components/Header.vue index e4642b3..18968b4 100644 --- a/src/renderer/src/layout/components/Header.vue +++ b/src/renderer/src/layout/components/Header.vue @@ -25,6 +25,7 @@