人脸识别与大模型问答

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();
       });
     },

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()

src/router/index.js

@@ -41,7 +41,7 @@ export const constantRoutes = [
     hidden: true
   },
   {
-    path: '/largeScreen',
+    path: '/index',
     component: () => import('@/views/largeScreen/largeScreen'),
     hidden: true
   },

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)

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 => {

src/views/largeScreen/routeIcon.vue

@@ -42,15 +42,6 @@
     <div class="boxMidTwoc">
       <div class="boxMidLevelThreec">OCR识别</div>
       <div class="midIconMainc">
-        <div class="midIconc">
-          <a href="javascript:;" class="midIconLinkc">
-            <img src="../../assets/images/midFiveIcon.png" alt="error" class="midIconLinkPicc"
-                 @click="goToViolation"></a>
-          <div class="midTextc midTextFithc">发票识别</div>
-          <div class="hatInsertc"><span class="bigTextc">{{ InvoiceNum }}</span><span
-            class="smallTextc">(次)</span>
-          </div>
-        </div>
         <div class="midIconc">
           <a href="javascript:;" class="midIconLinkc">
             <img src="../../assets/images/midSixIcon.png" alt="error" class="midIconLinkPicc"
@@ -60,6 +51,16 @@
             class="smallTextc">(次)</span>
           </div>
         </div>
+        <div class="midIconc">
+          <a href="javascript:;" class="midIconLinkc">
+            <img src="../../assets/images/midFiveIcon.png" alt="error" class="midIconLinkPicc"
+                 @click="goToViolation"></a>
+          <div class="midTextc midTextFithc">发票识别</div>
+          <div class="hatInsertc"><span class="bigTextc">{{ InvoiceNum }}</span><span
+            class="smallTextc">(次)</span>
+          </div>
+        </div>
+
         <div class="midIconc ">
           <a href="javascript:;" class="midIconLinkc">
             <img src="../../assets/images/midSevenIcon.png" alt="error" class="midIconLinkPicc"

src/views/updateFace/addFace.vue

@@ -9,7 +9,7 @@
         <div class="modal-body-left">
           <input
             type="file"
-            accept="image/jpeg"
+            accept="image/jpeg,image/png"
             style="display: none"
             ref="fileInput"
             @change="handleFileChange"
@@ -60,10 +60,32 @@ import faceListShowPic from "@/views/updateFace/faceListShowPic.vue";
 const validationRules = {
   name: [
     {required: true, message: '人员名称不能为空', trigger: 'blur'},
-    {min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur'}
+    {min: 2, max: 20, message: '用户名称长度必须介于 2 和 4 之间', trigger: 'blur'},
+    {
+      validator: (rule, value, callback) => {
+        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);
     },

src/views/updateFace/faceListResWatch.vue

@@ -1,8 +1,7 @@
 <template>
-    <div class="faceListResWatchBox">
+  <div class="body-container">
-        <img src="../../assets/images/resultHeader.png" alt="error" class="faceListResWatchPic">
+    <table class="mian">
-        <table class="faceListResWatchTable">
+      <thead class="thead-dark">
-            <thead>
       <tr class="faceListResWatchRow">
         <th class="faceListResWatchColume faceListResWatchColumeSort">序号</th>
         <th class="faceListResWatchColume faceListResWatchColumeIPAddr">访问地址</th>
@@ -39,6 +38,13 @@ export default {
   display: none;
 }
 
+.mian {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column
+}
+
 /* Firefox */
 html {
   scrollbar-width: none;
@@ -49,19 +55,22 @@ html {
 * {
   -ms-overflow-style: none;
 }
+
 .faceListResWatchBox {
   padding-left: 1.25rem;
   padding-right: 1.25rem;
   position: relative;
 
 }
+
 tbody {
-    height: 14.5rem;
+  width: 100%;
+  height: 100%;
   overflow: auto;
   display: block;
   scroll-behavior: smooth;
-
 }
+
 .faceListResWatchPic {
   width: 100%;
   height: 3.0625rem;
@@ -103,7 +112,6 @@ tbody {
 }
 
 
-
 .faceListResWatchColumeSort {
   flex: 1
 }
@@ -114,10 +122,6 @@ tbody {
   flex: 2
 }
 
-.faceListResWatchColumeDate {
-    /* border: #2f6ca2 1px solid; */
-    flex: 2
-}
 
 .faceListResWatchColumeTime {
   /* border: #530303 1px solid; */

src/views/updateFace/faceListResultCount.vue

@@ -1,7 +1,6 @@
 <template>
-    <div class="faceListRecoResultBox">
+  <div class="body-container">
-        <img src="../../assets/images/resultHeader.png" alt="error" class="faceListRecoResultPic">
+    <table class="mian">
-        <table class="faceListRecoResultTable">
       <thead>
       <tr class="faceListRecoResultRow">
         <th class="faceListRecoResultColume faceListRecoResultColumeSort">序号</th>
@@ -39,6 +38,13 @@ export default {
   display: none;
 }
 
+.mian {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column
+}
+
 /* Firefox */
 html {
   scrollbar-width: none;
@@ -69,7 +75,7 @@ html {
 }
 
 tbody {
-    height: 14.5rem;
+  height: 100%;
   overflow: auto;
   display: block;
   scroll-behavior: smooth;
@@ -106,7 +112,6 @@ tbody {
 }
 
 
-
 .faceListRecoResultColumeSort {
   flex: 1
 }

src/views/updateFace/faceListShowPic.vue

@@ -2,7 +2,7 @@
   <div class="body-container">
     <div class="content">
       <div class="face_img" v-for="(item, index) in faceList" :key="index">
-        <img :src="'http://127.0.0.1:9300/'+item.faceAddress" class="face_img" alt="">/>
+        <img :src="'http://192.168.0.56:18093/'+item.faceAddress" class="face_img" alt="">/>
       </div>
     </div>
   </div>

src/views/updateFace/midPic.vue

@@ -59,7 +59,7 @@
         <div class="bottom-right-content">
           <img
             v-if="faceUrl"
-            :src="'http://127.0.0.1:9300/'+faceUrl"
+            :src="'http://192.168.0.56:18093/'+faceUrl"
             class="avatar"
             alt="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() {