From 25d026bd130ec8eb1132ff3bf4497868aa20c9df Mon Sep 17 00:00:00 2001 From: zhangxuelin <959231531@qq.com> Date: Mon, 9 Sep 2024 01:14:26 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/views/classBegins/index.vue | 3 + .../src/views/login/components/Register.vue | 247 ++++++++++++++++++ .../views/login/components/forgotPassword.vue | 0 src/renderer/src/views/login/index.vue | 20 +- 4 files changed, 267 insertions(+), 3 deletions(-) create mode 100644 src/renderer/src/views/login/components/Register.vue create mode 100644 src/renderer/src/views/login/components/forgotPassword.vue diff --git a/src/renderer/src/views/classBegins/index.vue b/src/renderer/src/views/classBegins/index.vue index ccc2af4..9e9c83d 100644 --- a/src/renderer/src/views/classBegins/index.vue +++ b/src/renderer/src/views/classBegins/index.vue @@ -104,6 +104,9 @@ const switchPageMode = () => { } } onMounted(async () => { + window.addEventListener('focus', () => { + console.log(11111111111111) + }) const isDev = process.env.NODE_ENV == 'development' // toolState.showBoardAll = false // 隐藏画板 toolState.isPdfWin=true //设置打开pdf窗口 diff --git a/src/renderer/src/views/login/components/Register.vue b/src/renderer/src/views/login/components/Register.vue new file mode 100644 index 0000000..1889b04 --- /dev/null +++ b/src/renderer/src/views/login/components/Register.vue @@ -0,0 +1,247 @@ + + + + diff --git a/src/renderer/src/views/login/components/forgotPassword.vue b/src/renderer/src/views/login/components/forgotPassword.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/renderer/src/views/login/index.vue b/src/renderer/src/views/login/index.vue index b11d241..730a34e 100644 --- a/src/renderer/src/views/login/index.vue +++ b/src/renderer/src/views/login/index.vue @@ -21,12 +21,20 @@ placeholder="请输入密码" /> - 记住密码 +
+ 记住密码 + 阅读并同意《xxx》 +
+ 登录 +
+ 注册账号 | + 忘记密码 +
@@ -48,6 +56,8 @@ + + + + \ No newline at end of file diff --git a/src/renderer/src/components/file-preview/index.vue b/src/renderer/src/components/file-preview/index.vue index 350695b..198f9b4 100644 --- a/src/renderer/src/components/file-preview/index.vue +++ b/src/renderer/src/components/file-preview/index.vue @@ -17,7 +17,6 @@
-
diff --git a/src/renderer/src/layout/index.vue b/src/renderer/src/layout/index.vue index 4768cd4..2dba250 100644 --- a/src/renderer/src/layout/index.vue +++ b/src/renderer/src/layout/index.vue @@ -14,6 +14,7 @@ + @@ -23,6 +24,7 @@ import { useRouter } from 'vue-router' import Header from './components/Header.vue' import AppMain from './components/AppMain.vue' import Uploader from './components/Uploader.vue' +import AiChart from '@/components/ai-chart/index.vue' import uploaderState from '@/store/modules/uploader' import { ref } from 'vue' From c79e7966ee9cd02b8d2db9372fc1b68788a81c92 Mon Sep 17 00:00:00 2001 From: zhangxuelin <959231531@qq.com> Date: Mon, 9 Sep 2024 18:14:57 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E6=B3=A8=E5=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- electron.vite.config.mjs | 3 +- package.json | 3 +- src/renderer/src/api/login.js | 64 ++++ .../src/views/login/components/Register.vue | 352 ++++++++++++++---- src/renderer/src/views/login/index.vue | 2 +- 5 files changed, 348 insertions(+), 76 deletions(-) diff --git a/electron.vite.config.mjs b/electron.vite.config.mjs index c48cc00..6311dd1 100644 --- a/electron.vite.config.mjs +++ b/electron.vite.config.mjs @@ -24,7 +24,8 @@ export default defineConfig({ server: { proxy: { '/dev-api': { - target: 'http://27.128.240.72:7865', + // target: 'http://27.128.240.72:7865', + target: 'http://192.168.2.158:7865', // target: 'http://192.168.2.52:7863', changeOrigin: true, rewrite: (p) => p.replace(/^\/dev-api/, '') diff --git a/package.json b/package.json index f070ac6..b71641a 100644 --- a/package.json +++ b/package.json @@ -32,12 +32,13 @@ "electron-log": "^5.1.7", "electron-store": "8.0.0", "electron-updater": "^6.1.7", + "element-china-area-data": "^6.1.0", "element-plus": "^2.7.6", "fabric": "^5.3.0", + "im_electron_sdk": "^8.0.5904", "js-cookie": "^3.0.5", "jsencrypt": "^3.3.2", "jsondiffpatch": "0.6.0", - "im_electron_sdk": "^8.0.5904", "lodash": "^4.17.21", "pdfjs-dist": "4.4.168", "pinia": "^2.1.7", diff --git a/src/renderer/src/api/login.js b/src/renderer/src/api/login.js index 649f59c..308e95c 100644 --- a/src/renderer/src/api/login.js +++ b/src/renderer/src/api/login.js @@ -56,4 +56,68 @@ export function getCodeImg() { method: 'get', timeout: 20000 }) +} + +// 注册模块-生成人机验证 +export function captchaImg(data) { + return request({ + url: '/captchaImg', + headers: { + isToken: false + }, + method: 'get', + params: data + }) +} + +//注册模块-发送验证码 +export function sendCode(data) { + return request({ + url: '/smarttalk/register/authSendCode', + method: 'post', + data:data + }) +} + +//注册模块-申请注册 +export function signIn(data) { + return request({ + url: '/smarttalk/register/authSignIn', + method: 'post', + data:data + }) +} + +//注册模块-获取学校 +export function deptTree(data) { + return request({ + url: '/smarttalk/register/authDeptTree', + method: 'get', + params:data + }) +} +// 查询部门详细 +export function getDept(query) { + return request({ + url: '/system/dept/detail', + method: 'get', + params: query + }) +} + +// 查询classmain列表 +export function listClassmain(query) { + return request({ + url: '/education/classmain/list', + method: 'get', + params: query + }) +} +// 查询evaluation列表 +export function listEvaluation(query) { + return request({ + url: '/smarttalk/register/authEvaluationList', + method: 'get', + params: query + }) } \ No newline at end of file diff --git a/src/renderer/src/views/login/components/Register.vue b/src/renderer/src/views/login/components/Register.vue index 1889b04..6b660d0 100644 --- a/src/renderer/src/views/login/components/Register.vue +++ b/src/renderer/src/views/login/components/Register.vue @@ -6,12 +6,12 @@ center :before-close="handleClose" > - - + + - - 发送验证码 + + 发送验证码 - + - + - - 小学 - 中学 - + - - 1班 - 2班 - + - +
+ {{ item.name }}： + + + +
+ +
@@ -91,21 +92,81 @@ 下一步
--> + + 根据图片回答相关问题 +
+ + +
+
+ 确定 +
+ + + diff --git a/src/renderer/src/views/classManage/index.vue b/src/renderer/src/views/classManage/index.vue index edb48b9..d83e8e6 100644 --- a/src/renderer/src/views/classManage/index.vue +++ b/src/renderer/src/views/classManage/index.vue @@ -12,6 +12,11 @@ + @@ -28,7 +33,7 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + {{userStore.nickName}} + - - - - - - - - - - - - {{ userStore.nickName }} - - - + + + \ No newline at end of file diff --git a/src/renderer/src/views/desktop/index.vue b/src/renderer/src/views/desktop/index.vue index 323bf74..d5c2fab 100644 --- a/src/renderer/src/views/desktop/index.vue +++ b/src/renderer/src/views/desktop/index.vue @@ -254,6 +254,7 @@ onMounted(async ()=>{ .iconfont{ font-size: 28px; color: #707070; + font-weight: bold; } &:hover{ color: #409EFF; From 278dfd4d930d16b975bc1b27a4a74d668126a1bd Mon Sep 17 00:00:00 2001 From: zhuhao <979263092@qq.com> Date: Tue, 10 Sep 2024 17:17:10 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E7=AB=A0=E8=8A=82=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/components/choose-textbook/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/renderer/src/components/choose-textbook/index.vue b/src/renderer/src/components/choose-textbook/index.vue index 38fd5e1..007f9a0 100644 --- a/src/renderer/src/components/choose-textbook/index.vue +++ b/src/renderer/src/components/choose-textbook/index.vue @@ -100,6 +100,7 @@ const getSubjectContent = async () => { edustage, // entpcourseedituserid: userId, itemgroup: 'textbook', + orderby: 'orderidx asc', pageSize: 10000 } From 77e76fcf7df1060508992d9bf54336b423afc86c Mon Sep 17 00:00:00 2001 From: zhuhao <979263092@qq.com> Date: Tue, 10 Sep 2024 17:21:49 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A72.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 5e6e438..b43d760 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aix-win", - "version": "1.1.8", + "version": "1.2.0", "description": "An Electron application with Vue", "main": "./out/main/index.js", "author": "example.com", @@ -69,6 +69,5 @@ "vite-plugin-windicss": "^1.9.3", "vue": "^3.4.30", "windicss": "^3.5.6" - }, - "packageManager": "pnpm@9.9.0+sha512.60c18acd138bff695d339be6ad13f7e936eea6745660d4cc4a776d5247c540d0edee1a563695c183a66eb917ef88f2b4feb1fc25f32a7adcadc7aaf3438e99c1" + } } From 68df866db54218b69b0e12b88f5a2e0fb9932bab Mon Sep 17 00:00:00 2001 From: yangws <1607839436@qq.com> Date: Tue, 10 Sep 2024 17:55:48 +0800 Subject: [PATCH 11/12] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=9A=84=E7=8F=AD=E7=BA=A7;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/router/index.js | 2 +- src/renderer/src/views/classManage/index.vue | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/renderer/src/router/index.js b/src/renderer/src/router/index.js index 4a8a2f4..6bdcac9 100644 --- a/src/renderer/src/router/index.js +++ b/src/renderer/src/router/index.js @@ -71,7 +71,7 @@ export const constantRoutes = [ { path: '/classTask', component: () => import('@/views/classTask/classTask.vue'), - name: 'class', + name: 'classCorrect', meta: {title: '作业批改'}, }, { diff --git a/src/renderer/src/views/classManage/index.vue b/src/renderer/src/views/classManage/index.vue index d83e8e6..8a21df0 100644 --- a/src/renderer/src/views/classManage/index.vue +++ b/src/renderer/src/views/classManage/index.vue @@ -192,13 +192,16 @@ classList.value = [] listClassmain({ classuserid: userStore.userId, pageSize: 100, status: 'open' }).then(response => { classList.value = [...response.rows] - //这里获取组装所有班级 - gradeTree.value = groupByCondition(response.rows, item => item.agekey); if(classList.value.length > 0){ classId.value = classList.value[0].id currentIndex.value = 0 } }); + listClassmain({entpid: userStore.deptId, status: 'open', pageSize: 100}).then(response => { + //这里获取组装所有班级 + gradeTree.value = groupByCondition(response.rows, item => item.agekey); + console.log(gradeTree.value,'gradeTree.value') + }) } //将所有班级筛选成二级的数组 function groupByCondition(arr, condition) { From 08075746c0439f79883c9398a1fb33a6e87a762e Mon Sep 17 00:00:00 2001 From: yangws <1607839436@qq.com> Date: Wed, 11 Sep 2024 09:48:27 +0800 Subject: [PATCH 12/12] =?UTF-8?q?fix:=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/views/classManage/aside.vue | 1 + src/renderer/src/views/classManage/basicGroup.vue | 2 +- src/renderer/src/views/classManage/index.vue | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/renderer/src/views/classManage/aside.vue b/src/renderer/src/views/classManage/aside.vue index 2855249..32bb0d2 100644 --- a/src/renderer/src/views/classManage/aside.vue +++ b/src/renderer/src/views/classManage/aside.vue @@ -4,6 +4,7 @@ class="el-menu-vertical-demo" :default-active="activeIndex" @select="handleSelect" + unique-opened >