From fcfa7fcb02428e56291cd162d24563d7cc3560ee Mon Sep 17 00:00:00 2001 From: jiang Date: Mon, 26 Aug 2024 10:15:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E8=84=B8=E8=AF=86=E5=88=AB=E4=B8=8E?= =?UTF-8?q?=E5=A4=A7=E6=A8=A1=E5=9E=8B=E9=97=AE=E7=AD=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/LargeScreen/index.vue | 2 +- src/permission.js | 2 +- src/router/index.js | 2 +- src/views/Text/textrecognition.vue | 4 +- src/views/askRequest/askRequest.vue | 8 +- src/views/largeScreen/routeIcon.vue | 19 +-- src/views/updateFace/addFace.vue | 29 +++- src/views/updateFace/faceListResWatch.vue | 142 ++++++++++--------- src/views/updateFace/faceListResultCount.vue | 131 +++++++++-------- src/views/updateFace/faceListShowPic.vue | 2 +- src/views/updateFace/midPic.vue | 9 +- 11 files changed, 194 insertions(+), 156 deletions(-) diff --git a/src/components/LargeScreen/index.vue b/src/components/LargeScreen/index.vue index 54b4608..5a2d4d9 100644 --- a/src/components/LargeScreen/index.vue +++ b/src/components/LargeScreen/index.vue @@ -43,7 +43,7 @@ export default { this.currentTime = `${hours}:${minutes}:${seconds}`; }, backToHome() { - this.$router.push('/largeScreen').then(() => { + this.$router.push('/index').then(() => { localStorage.clear(); }); }, diff --git a/src/permission.js b/src/permission.js index 4beb2c5..37af957 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ import { isRelogin } from '@/utils/request' NProgress.configure({ showSpinner: false }) -const whiteList = ['/login', '/updateFace','/largeScreen','/updateIDCard','/Violation','/Text','/Video','/askRequest','/radar'] +const whiteList = ['/login', '/updateFace','/index','/updateIDCard','/Violation','/Text','/Video','/askRequest','/radar'] router.beforeEach((to, from, next) => { NProgress.start() diff --git a/src/router/index.js b/src/router/index.js index 3acdfbd..74c4d8d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -41,7 +41,7 @@ export const constantRoutes = [ hidden: true }, { - path: '/largeScreen', + path: '/index', component: () => import('@/views/largeScreen/largeScreen'), hidden: true }, diff --git a/src/views/Text/textrecognition.vue b/src/views/Text/textrecognition.vue index 477dd1b..56c2c82 100644 --- a/src/views/Text/textrecognition.vue +++ b/src/views/Text/textrecognition.vue @@ -75,7 +75,7 @@ export default { methods: { backToHome() { this.$router.beforeEach((to, from, next) => { - if (from.path === '/largeScreen') { + if (from.path === '/index') { // 清除缓存的操作 // 可以使用 localStorage.clear() 或其他方法清除缓存 localStorage.clear(); @@ -84,7 +84,7 @@ export default { }); // 跳转到主页 - this.$router.push('/largeScreen'); + this.$router.push('/index'); }, handup() { alert(1) diff --git a/src/views/askRequest/askRequest.vue b/src/views/askRequest/askRequest.vue index 58c70b9..2770754 100644 --- a/src/views/askRequest/askRequest.vue +++ b/src/views/askRequest/askRequest.vue @@ -175,7 +175,9 @@ export default { deleteChatWindow(windowId).then(res => { if (res.code === 200) { this.$message.success("删除成功"); // 显示删除成功的提示信息 - this.getList(); // 重新获取窗口列表 + this.getList(); + /* this.answerList = [];*/ + this.generateNewWindowId();// 重新获取窗口列表 } }); }, @@ -188,6 +190,10 @@ export default { // 提交输入内容 submitInput() { + if (this.isAncestor) { + this.$message.warning("问答进行中"); + return; + } if (this.answerList.length === 0) { // 如果当前窗口没有聊天记录，插入一个新的聊天窗口 insertChatWindow({windowName: this.inputValue, windowId: this.windowId}).then(res => { diff --git a/src/views/largeScreen/routeIcon.vue b/src/views/largeScreen/routeIcon.vue index ca7fe60..8c2e610 100644 --- a/src/views/largeScreen/routeIcon.vue +++ b/src/views/largeScreen/routeIcon.vue @@ -42,15 +42,6 @@
OCR识别
-
- - error -
发票识别
-
{{ InvoiceNum }}(次) -
-
error(次)
+
+ + error +
发票识别
+
{{ InvoiceNum }}(次) +
+
+
error { + const chineseNamePattern = /^[\u4e00-\u9fa5]{2,4}$/; + if (!chineseNamePattern.test(value)) { + callback(new Error('姓名只能包含中文字符')); + } else { + callback(); + } + }, + trigger: 'blur' + } ], idCardNumber: [ - {required: true, message: '人员身份证号不能为空', trigger: 'blur'} + {required: true, message: '人员身份证号不能为空', trigger: 'blur'}, + { + validator: (rule, value, callback) => { + const idCardPattern = /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[\dXx]$/; + if (!idCardPattern.test(value)) { + callback(new Error('身份证号码格式不正确')); + } else { + callback(); + } + }, + trigger: 'blur' + } ], sex: [ {required: true, message: '请选择性别', trigger: 'change'} @@ -145,7 +167,6 @@ export default { }); }, close() { - faceListShowPic.methods.getList(); this.visible = false; this.$emit('input', this.visible); }, diff --git a/src/views/updateFace/faceListResWatch.vue b/src/views/updateFace/faceListResWatch.vue index 5f083b7..f0b7d3f 100644 --- a/src/views/updateFace/faceListResWatch.vue +++ b/src/views/updateFace/faceListResWatch.vue @@ -1,126 +1,130 @@ \ No newline at end of file + diff --git a/src/views/updateFace/faceListResultCount.vue b/src/views/updateFace/faceListResultCount.vue index 8e9fe6e..22f96a1 100644 --- a/src/views/updateFace/faceListResultCount.vue +++ b/src/views/updateFace/faceListResultCount.vue @@ -1,126 +1,131 @@ \ No newline at end of file + diff --git a/src/views/updateFace/faceListShowPic.vue b/src/views/updateFace/faceListShowPic.vue index fbb1789..ecb1439 100644 --- a/src/views/updateFace/faceListShowPic.vue +++ b/src/views/updateFace/faceListShowPic.vue @@ -2,7 +2,7 @@
- /> + />
diff --git a/src/views/updateFace/midPic.vue b/src/views/updateFace/midPic.vue index d1cf592..0b1fa56 100644 --- a/src/views/updateFace/midPic.vue +++ b/src/views/updateFace/midPic.vue @@ -59,7 +59,7 @@
Avatar @@ -85,7 +85,6 @@ import addFace from "@/views/updateFace/addFace.vue"; import {recognition} from '@/api/updateFace/updateFace' import faceListShowPic from "@/views/updateFace/faceListShowPic.vue"; - export default { components: { addFace @@ -101,9 +100,10 @@ export default { }, watch: { showModal(val) { - /* if (!val) { + console.log(val) + if (!val) { faceListShowPic.methods.getList(); - }*/ + } } }, methods: { @@ -126,6 +126,7 @@ export default { this.showModal = true }, handleVisibleChange(newVal) { + console.log(newVal); this.showModal = newVal; }, selectFile() {