From 21dbc4367436deb76aa943b3c0874f04d0bd7bfc Mon Sep 17 00:00:00 2001
From: jiang <jiang@bonus>
Date: Mon, 26 Aug 2024 17:48:44 +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/api/updateFace/updateFace.js             | 12 +++++++++
 src/utils/request.js                         |  2 +-
 src/views/updateFace/addFace.vue             | 12 +++++++--
 src/views/updateFace/faceListResWatch.vue    | 28 +++++++++++++++-----
 src/views/updateFace/faceListResultCount.vue | 28 +++++++++++++++-----
 src/views/updateFace/faceListShowPic.vue     |  1 -
 src/views/updateFace/midPic.vue              | 16 ++++++++---
 7 files changed, 78 insertions(+), 21 deletions(-)

diff --git a/src/api/updateFace/updateFace.js b/src/api/updateFace/updateFace.js
index aba5372..5a3ca18 100644
--- a/src/api/updateFace/updateFace.js
+++ b/src/api/updateFace/updateFace.js
@@ -44,3 +44,15 @@ export function recognition(formData) {
   })
 }
 
+/**
+ * 获取识别结果
+ * @returns {*}
+ */
+export function getListFaceResult() {
+  return request({
+    url: '/ai/faceResult/selectAllAiFaceRecognizeResults',
+    method: 'post',
+    isRepeatSubmit: true
+  })
+}
+
diff --git a/src/utils/request.js b/src/utils/request.js
index 7b7bec7..4479ba8 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -63,7 +63,7 @@ service.interceptors.request.use(
         cache.session.setJSON('sessionObj', requestObj)
       } else {
         const { url, data, time } = sessionObj
-        const interval = 1000 // 间隔时间(ms)，小于此时间视为重复提交
+        const interval = 0 // 间隔时间(ms)，小于此时间视为重复提交
 
         if (data === requestObj.data && requestObj.time - time < interval && url === requestObj.url) {
           const message = '数据正在处理，请勿重复提交'
diff --git a/src/views/updateFace/addFace.vue b/src/views/updateFace/addFace.vue
index 73549f0..a7623ed 100644
--- a/src/views/updateFace/addFace.vue
+++ b/src/views/updateFace/addFace.vue
@@ -60,10 +60,10 @@ import faceListShowPic from "@/views/updateFace/faceListShowPic.vue";
 const validationRules = {
   name: [
     {required: true, message: '人员名称不能为空', trigger: 'blur'},
-    {min: 2, max: 20, message: '用户名称长度必须介于 2 和 4 之间', trigger: 'blur'},
+    {min: 2, max: 20, message: '用户名称长度必须介于 2 和 10 之间', trigger: 'blur'},
     {
       validator: (rule, value, callback) => {
-        const chineseNamePattern = /^[\u4e00-\u9fa5]{2,4}$/;
+        const chineseNamePattern = /^[\u4e00-\u9fa5]{2,10}$/;
         if (!chineseNamePattern.test(value)) {
           callback(new Error('姓名只能包含中文字符'));
         } else {
@@ -168,6 +168,7 @@ export default {
     },
     close() {
       this.visible = false;
+      faceListShowPic.methods.getList();
       this.$emit('input', this.visible);
     },
     confirm() {
@@ -179,6 +180,13 @@ export default {
     handleFileChange(event) {
       const file = event.target.files[0];
       if (file) {
+        const maxSizeInMB = 20; // 最大文件大小（单位：MB）
+        const maxSizeInBytes = maxSizeInMB * 1024 * 1024;
+
+        if (file.size > maxSizeInBytes) {
+          this.$message.error(`文件大小不能超过 ${maxSizeInMB} MB`);
+          return;
+        }
         this.imageUrl = URL.createObjectURL(file);
         this.form.file = file;
       }
diff --git a/src/views/updateFace/faceListResWatch.vue b/src/views/updateFace/faceListResWatch.vue
index f0b7d3f..3459969 100644
--- a/src/views/updateFace/faceListResWatch.vue
+++ b/src/views/updateFace/faceListResWatch.vue
@@ -5,17 +5,17 @@
       <tr class="faceListResWatchRow">
         <th class="faceListResWatchColume faceListResWatchColumeSort">序号</th>
         <th class="faceListResWatchColume faceListResWatchColumeIPAddr">访问地址</th>
-        <th class="faceListResWatchColume faceListResWatchColumeDate">访问时间</th>
+        <th class="faceListResWatchColume faceListResWatchColumeIPAddr">访问时间</th>
         <th class="faceListResWatchColume faceListResWatchColumeTime">响应时长</th>
       </tr>
       </thead>
       <tbody>
-      <tr v-for="(item, index) in faceRecognition2" :key="index"
+      <tr v-for="(item, index) in faceRecognition" :key="index"
           :class="{ 'faceContentRowEven': index % 2 === 0, 'faceContentRowPrime': index % 2 !== 0 }">
         <td class="faceListResWatchColume faceListResWatchColumeSort">{{ index + 1 }}</td>
-        <td class="faceListResWatchColume faceListResWatchColumeIPAddr">{{ item.ip }}</td>
-        <td class="faceListResWatchColume faceListResWatchColumeDate">{{ item.returnTime }}</td>
-        <td class="faceListResWatchColume faceListResWatchColumeTime">{{ item.responseTime }}</td>
+        <td class="faceListResWatchColume faceListResWatchColumeIPAddr">{{ item.invokeIp }}</td>
+        <td class="faceListResWatchColume faceListResWatchColumeIPAddr">{{ item.recognizeTime }}</td>
+        <td class="faceListResWatchColume faceListResWatchColumeTime">{{ item.responseLong+"ms" }}</td>
       </tr>
       </tbody>
     </table>
@@ -23,11 +23,25 @@
 </template>
 
 <script>
+import {getListFaceResult} from '@/api/updateFace/updateFace'
+
 export default {
   name: 'faceListResWatch',
   data() {
     return {
-      faceRecognition2: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+      faceRecognition: [],
+    }
+  },
+  mounted() {
+    this.getListFaceResult();
+
+  }, methods: {
+    getListFaceResult() {
+      getListFaceResult().then(res => {
+        if (res.code === 200) {
+          this.faceRecognition = res.data;
+        }
+      })
     }
   }
 }
@@ -113,7 +127,7 @@ tbody {
 
 
 .faceListResWatchColumeSort {
-  flex: 1
+  flex: 0.5
 }
 
 .faceListResWatchColumeIPAddr {
diff --git a/src/views/updateFace/faceListResultCount.vue b/src/views/updateFace/faceListResultCount.vue
index 22f96a1..71f4ddb 100644
--- a/src/views/updateFace/faceListResultCount.vue
+++ b/src/views/updateFace/faceListResultCount.vue
@@ -6,16 +6,18 @@
         <th class="faceListRecoResultColume faceListRecoResultColumeSort">序号</th>
         <th class="faceListRecoResultColume faceListRecoResultColumeIPAddr">访问地址</th>
         <th class="faceListRecoResultColume faceListRecoResultColumeDate">访问时间</th>
-        <th class="faceListRecoResultColume faceListRecoResultColumeTime">响应时长</th>
+        <th class="faceListRecoResultColume faceListRecoResultColumeTime">响应状态</th>
       </tr>
       </thead>
       <tbody>
       <tr v-for="(item, index) in faceRecognition" :key="index"
           :class="{ 'faceContentRowEven': index % 2 === 0, 'faceContentRowPrime': index % 2 !== 0 }">
         <td class="faceListRecoResultColume faceListRecoResultColumeSort">{{ index + 1 }}</td>
-        <td class="faceListRecoResultColume faceListRecoResultColumeIPAddr">{{ item.ip }}</td>
-        <td class="faceListRecoResultColume faceListRecoResultColumeDate">{{ item.returnTime }}</td>
-        <td class="faceListRecoResultColume faceListRecoResultColumeTime">{{ item.responseTime }}</td>
+        <td class="faceListRecoResultColume faceListRecoResultColumeIPAddr">{{ item.invokeIp }}</td>
+        <td class="faceListRecoResultColume faceListRecoResultColumeDate">{{ item.recognizeTime }}</td>
+        <td class="faceListRecoResultColume faceListRecoResultColumeTime">{{
+            item.resultStatus === '0' ? "成功" : "失败"
+          }}</td>
       </tr>
       </tbody>
     </table>
@@ -23,11 +25,25 @@
 </template>
 
 <script>
+import {getListFaceResult} from '@/api/updateFace/updateFace'
+
 export default {
   name: 'faceListResultCount',
   data() {
     return {
-      faceRecognition: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+      faceRecognition: [],
+    }
+  },
+  mounted() {
+    this.getListFaceResult();
+
+  }, methods: {
+    getListFaceResult() {
+      getListFaceResult().then(res => {
+        if (res.code === 200) {
+          this.faceRecognition = res.data;
+        }
+      })
     }
   }
 }
@@ -113,7 +129,7 @@ tbody {
 
 
 .faceListRecoResultColumeSort {
-  flex: 1
+  flex: 0.5
 }
 
 .faceListRecoResultColumeIPAddr {
diff --git a/src/views/updateFace/faceListShowPic.vue b/src/views/updateFace/faceListShowPic.vue
index ecb1439..e916a97 100644
--- a/src/views/updateFace/faceListShowPic.vue
+++ b/src/views/updateFace/faceListShowPic.vue
@@ -21,7 +21,6 @@ export default {
   },
   mounted() {
     this.getList();
-
   },
   methods: {
     getList() {
diff --git a/src/views/updateFace/midPic.vue b/src/views/updateFace/midPic.vue
index 0b1fa56..4755ccd 100644
--- a/src/views/updateFace/midPic.vue
+++ b/src/views/updateFace/midPic.vue
@@ -17,7 +17,7 @@
           <div class="main-bottom-right-bg">
             <input
               type="file"
-              accept="image/jpeg"
+              accept="image/jpeg,image/png"
               style="display: none"
               ref="fileInput"
               @change="handleFileChange"
@@ -65,7 +65,7 @@
           />
           <i
             v-else
-            class="el-icon-plus avatar-uploader-icon"
+            class=" avatar-uploader-icon"
           ></i>
           <div class="content">
             <span v-if="name">姓名:{{ name }}</span>
@@ -85,6 +85,9 @@
 import addFace from "@/views/updateFace/addFace.vue";
 import {recognition} from '@/api/updateFace/updateFace'
 import faceListShowPic from "@/views/updateFace/faceListShowPic.vue";
+import faceListResultCount from "@/views/updateFace/faceListResultCount.vue";
+import faceListResWatch from "@/views/updateFace/faceListResWatch.vue";
+
 export default {
   components: {
     addFace
@@ -102,7 +105,7 @@ export default {
     showModal(val) {
       console.log(val)
       if (!val) {
-        faceListShowPic.methods.getList();
+
       }
     }
   },
@@ -118,15 +121,20 @@ export default {
           this.sex = data.sex;
           this.$message.success(res.msg)
         } else {
+          this.faceUrl = '';
+          this.name = '';
+          this.sex = '';
           this.$message.error(res.msg)
         }
+        faceListResultCount.methods.getListFaceResult();
+        faceListResWatch.methods.getListFaceResult();
       })
     },
     update() {
       this.showModal = true
     },
     handleVisibleChange(newVal) {
-      console.log(newVal);
+      faceListShowPic.methods.getList();
       this.showModal = newVal;
     },
     selectFile() {