From 7b410583795efd27548439021af4cb08ae648681 Mon Sep 17 00:00:00 2001 From: liushilong <2224574157@qq.com> Date: Fri, 22 Mar 2024 18:10:52 +0800 Subject: [PATCH 1/8] =?UTF-8?q?feat:=20=E7=99=BB=E5=BD=95=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E5=BA=95=E9=83=A8=E4=B8=AD=E9=97=B4=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=80=A7=E9=97=AE=E9=A2=98,axios=E5=AE=9E?= =?UTF-8?q?=E4=BE=8B=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D,=E7=9F=AD?= =?UTF-8?q?=E4=BF=A1=E7=99=BB=E5=BD=95=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/http/axios/index.ts | 2 +- src/views/login/components/Login.vue | 22 ++- src/views/login/index.vue | 194 +++++++++++++-------------- 3 files changed, 113 insertions(+), 105 deletions(-) diff --git a/src/utils/http/axios/index.ts b/src/utils/http/axios/index.ts index 3fe822c..ecdfd9e 100644 --- a/src/utils/http/axios/index.ts +++ b/src/utils/http/axios/index.ts @@ -201,7 +201,7 @@ const transform: AxiosTransform = { // eslint-disable-next-line ts/no-use-before-define const instance = http.getAxios() const config = response.config - const whitelist = ['/api/captcha/captchatoken', '/api/captcha/captchaImage', '/api/backstage/adminlogin', '/api/oauthweb/token'] + const whitelist = ['/api/captcha/captchatoken', '/api/captcha/captchaImage', '/api/backstage/adminlogin', '/api/oauthweb/token','/api/web/smslogin/login'] const expirationTime = storage.get(TOKEN_EXPIRATION_TIME) // console.log('剩余失效时间(分):', (expirationTime - Date.now()) / 1000 / 60, config.url) diff --git a/src/views/login/components/Login.vue b/src/views/login/components/Login.vue index 99a1097..afdec29 100644 --- a/src/views/login/components/Login.vue +++ b/src/views/login/components/Login.vue @@ -54,7 +54,23 @@ const rules = { enterprisecode: { required: true, message: "请输入企业编码", trigger: "blur" }, agentcode: { required: true, message: "请输入企业编码", trigger: "blur" }, phone: { required: true, message: "请输入手机号", trigger: "blur" }, - phonecode: { required: true, message: "请输入验证码", trigger: "blur" }, + phonecode: [ + { required: true, message: "请输入验证码", trigger: "blur" }, + { + trigger: ["blur"], + level: "error", + validator(_rule, value) { + if (value.length < 4 && value.length > 0) { + return new Error("请正确填写4位手机短信验证码"); + } + if (loginSuccess.value) { + return true; + } else { + return new Error("验证码错误"); + } + }, + }, + ], username: { required: true, message: "请输入用户名", trigger: "blur" }, password: { required: true, message: "请输入密码", trigger: "blur" }, captcha: { required: true, message: "请输入验证码", trigger: "blur" }, @@ -114,6 +130,7 @@ function handleSmsSubmit(e) { }); const { code, message: msg } = res; if (code === ResultEnum.SUCCESS) { + loginSuccess.value = true; // const { code, message: msg } = await userStore.login(params) await userStore.getInformation(); @@ -125,7 +142,10 @@ function handleSmsSubmit(e) { } else { message.destroyAll(); message.info(msg || "登录失败"); + loginSuccess.value = false; } + } + catch(e){ } finally { loading.value = false; } diff --git a/src/views/login/index.vue b/src/views/login/index.vue index a71842c..f351a77 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -1,18 +1,18 @@ @@ -20,87 +20,59 @@ function close() {
- - + +
- +
- - - - - -
-
- Task approval + + + + +
+
Task approval
- - - -
-
- 企业级 SaaS 智能审批解决方案 -
- - +
企业级 SaaS 智能审批解决方案
+ +
- -
- AI一键查重 -
-
- 一键查重，生成任务包 -
+ +
AI一键查重
+
一键查重，生成任务包
- -
- AI工单管理 -
-
- 智能批量辨识真假，假图快速审批 -
+ +
AI工单管理
+
智能批量辨识真假，假图快速审批
- -
- AI快速审批 -
-
- 智能图片比对，批量审批，一键确认 -
+ +
AI快速审批
+
智能图片比对，批量审批，一键确认
- -
- OCR -
-
- 图片自动识别、文档图片版面解析 -
+ +
OCR
+
图片自动识别、文档图片版面解析
- -
- 更多功能 -
-
- 探索更多功能 -
+ +
更多功能
+
探索更多功能
- +
@@ -111,54 +83,54 @@ function close() { From 58eca990abc21a4764af74c28c727d8c22f043a8 Mon Sep 17 00:00:00 2001 From: liushilong <2224574157@qq.com> Date: Fri, 22 Mar 2024 18:13:42 +0800 Subject: [PATCH 2/8] =?UTF-8?q?feat:=20=E9=80=BB=E8=BE=91=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/components/Login.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/login/components/Login.vue b/src/views/login/components/Login.vue index afdec29..a9896bd 100644 --- a/src/views/login/components/Login.vue +++ b/src/views/login/components/Login.vue @@ -42,6 +42,7 @@ const formInline: FormState = reactive({ username: '', password: '', }); +const loginSuccess = ref(true); const formSms: FormSms = reactive({ agentcode: "", From 547314a591a0aa532907c9fde26d96c63108f1da Mon Sep 17 00:00:00 2001 From: liushilong <2224574157@qq.com> Date: Fri, 22 Mar 2024 18:19:21 +0800 Subject: [PATCH 3/8] =?UTF-8?q?feat:=20=E6=A0=B7=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/components/Login.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/login/components/Login.vue b/src/views/login/components/Login.vue index a9896bd..3cd6c6b 100644 --- a/src/views/login/components/Login.vue +++ b/src/views/login/components/Login.vue @@ -423,6 +423,7 @@ function forget() { color: #666666; line-height: 33px; margin-right: 24px; + cursor: pointer; &-active { width: 96px; @@ -496,6 +497,7 @@ function forget() { font-weight: Regular; color: #507afd; margin-left: 12px; + cursor: pointer; &-count { font-size: 14px; From 97bd8a6fe21f5befaa8d60bda5f2aec1e88d8aef Mon Sep 17 00:00:00 2001 From: liushilong <2224574157@qq.com> Date: Fri, 22 Mar 2024 20:21:43 +0800 Subject: [PATCH 4/8] =?UTF-8?q?feat:=20=E5=85=A8=E5=B1=80=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E5=BC=B9=E6=A1=86=E6=A0=B7=E5=BC=8F=E9=80=82=E9=85=8D?= =?UTF-8?q?=EF=BC=8C=E7=99=BB=E5=BD=95=E9=80=BB=E8=BE=91=E4=BF=AE=E8=A1=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icons/switchsvg.svg | 15 +- src/utils/http/axios/index.ts | 4 +- src/views/final/comp/CustomFilterModalVue.vue | 315 ++++++++++-------- src/views/final/comp/CustomTabelModal.vue | 6 + .../aside/comp/modals/CustomFilterModal.vue | 9 +- src/views/login/components/Login.vue | 45 ++- src/views/task/modal/CustomFieldModal.vue | 6 + .../worksheet/modal/CustomFieldModal copy.vue | 6 + .../worksheet/modal/CustomFieldModal.vue | 6 + 9 files changed, 258 insertions(+), 154 deletions(-) diff --git a/src/assets/icons/switchsvg.svg b/src/assets/icons/switchsvg.svg index 4bfdb2d..29226df 100644 --- a/src/assets/icons/switchsvg.svg +++ b/src/assets/icons/switchsvg.svg @@ -1 +1,14 @@ - \ No newline at end of file + + + BBD切换 + + + + + + + + + + + \ No newline at end of file diff --git a/src/utils/http/axios/index.ts b/src/utils/http/axios/index.ts index ecdfd9e..dc087ee 100644 --- a/src/utils/http/axios/index.ts +++ b/src/utils/http/axios/index.ts @@ -201,7 +201,7 @@ const transform: AxiosTransform = { // eslint-disable-next-line ts/no-use-before-define const instance = http.getAxios() const config = response.config - const whitelist = ['/api/captcha/captchatoken', '/api/captcha/captchaImage', '/api/backstage/adminlogin', '/api/oauthweb/token','/api/web/smslogin/login'] + const whitelist = ['/api/captcha/captchatoken', '/api/captcha/captchaImage', '/api/backstage/adminlogin', '/api/oauthweb/token','/api/web/smslogin/login','/api/web/smslogin/sendcode'] const expirationTime = storage.get(TOKEN_EXPIRATION_TIME) // console.log('剩余失效时间(分):', (expirationTime - Date.now()) / 1000 / 60, config.url) @@ -264,7 +264,7 @@ const transform: AxiosTransform = { if (err && err.includes('Network Error')) { $dialog.info({ title: '网络异常', - content: '请检查您的网络连接是否正常', + content: '网络错误，请重试！', positiveText: '确定', // negativeText: '取消', closable: false, diff --git a/src/views/final/comp/CustomFilterModalVue.vue b/src/views/final/comp/CustomFilterModalVue.vue index 4539cbc..04536db 100644 --- a/src/views/final/comp/CustomFilterModalVue.vue +++ b/src/views/final/comp/CustomFilterModalVue.vue @@ -1,249 +1,249 @@ - +
- +
@@ -283,12 +297,15 @@ const rightInputHandler = debounce((keyword) => {
- + - - + +
{{ item.name }}
@@ -322,10 +355,8 @@ const rightInputHandler = debounce((keyword) => {