墨奇增加手动采集功能

src/views/zwxt/fingerprint6.vue

@@ -1214,6 +1214,7 @@ export default {
     */
 
     let self = this
+    self.handcaiflag = true
     /*********************** */
     // 监听刷新，清除session
     window.onbeforeunload = function (e) {
@@ -1367,7 +1368,7 @@ export default {
         //console.log(error);
       }
     }
-    
+
     // canvas
     if (this.iBversion.deviceSN) {
       this.canvas = document.getElementById("frameImage");
@@ -1737,27 +1738,40 @@ export default {
      */
     async handcai (code, index, type) {
       let self = this
-      this.GrpcCameraService.getVideoStream(code, (imageUrlList, status) => {
-        // //console.log(imageUrlList);
+      this.GrpcCameraService.getVideoStream(code, (imageUrlList, status, that) => {
         self.fingerImg = [imageUrlList]
-        // //console.log(status);
+        // console.log(status);
         // 采集结束，变化采集预览图片
         if (status == 0) {
-          self.loading = true
+          // self.loading = true
           // setTimeout(() => {
           //   self.fingerImg = ''
           // }, 6000);
         }
+        // todo 修改手动采集
+        document.addEventListener('keyup', async (e) => {
+          e.preventDefault()
+          if (e.code === 'Space') {
+            if(self.handcaiflag) {
+              setTimeout(()=>{
+                self.loading = true
+                that.audioPlay('/video/gathering.mp3');
+                that.stopVideoStream()
+                self.handcaiflag = true;
+              },200);
+            }
+            self.handcaiflag = false;
+          }
+        })
       })
-      let captureImage = await this.GrpcCameraService.captureImage2(code)
-      // //console.log(captureImage)
+      let captureImage = await self.GrpcCameraService.captureImage2(code)
       if (captureImage) {
         // 右手
         if (type == 'r') {
           // 交叉验证
           let result = null
-          if (this.version.SupportNbis && self.checkList.indexOf('指纹交叉验证') != -1) {
-            result = await this.GrpcCameraService.checkRepeatFinger2(captureImage.getPlainMinutiae(), self.targets, self.indices)
+          if (self.version.SupportNbis && self.checkList.indexOf('指纹交叉验证') != -1) {
+            result = await self.GrpcCameraService.checkRepeatFinger2(captureImage.getPlainMinutiae(), self.targets, self.indices)
             if (result) {
               self.GrpcCameraService.stopVideoStream()
               self.GrpcCameraService.audioPlay(`/video/please_not_repeat.mp3`)
@@ -1771,8 +1785,8 @@ export default {
           }
           // TODO
           // 先md5校验，然后调用接口传入图片数据和md5校验
-          let rollMd5 = this.checkMd5(captureImage.getRolledFrame_asB64())
-          let plainMd5 = this.checkMd5(captureImage.getPlainFrame_asB64())
+          let rollMd5 = self.checkMd5(captureImage.getRolledFrame_asB64())
+          let plainMd5 = self.checkMd5(captureImage.getPlainFrame_asB64())
 
           let paramsR = new URLSearchParams()
           paramsR.append('rybh', self.rybh);
@@ -1786,7 +1800,7 @@ export default {
             data: paramsR
           }).then(resR => {
             if (resR.status == 200) {
-              this.$message.success(resR.data)
+              self.$message.success(resR.data)
             }
           })
 
@@ -1802,7 +1816,7 @@ export default {
             data: paramsL
           }).then(resL => {
             if (resL.status == 200) {
-              this.$message.success(resL.data)
+              self.$message.success(resL.data)
             }
           })
 
@@ -1938,8 +1952,8 @@ export default {
           // 左手
           // 交叉验证
           let result = null
-          if (this.version.SupportNbis && self.checkList.indexOf('指纹交叉验证') != -1) {
-            result = await this.GrpcCameraService.checkRepeatFinger2(captureImage.getPlainMinutiae(), self.targets, self.indices)
+          if (self.version.SupportNbis && self.checkList.indexOf('指纹交叉验证') != -1) {
+            result = await self.GrpcCameraService.checkRepeatFinger2(captureImage.getPlainMinutiae(), self.targets, self.indices)
             if (result) {
               self.GrpcCameraService.stopVideoStream()
               // await self.GrpcCameraService.audioPlay2(`/video/please_not_repeat.mp3`)
@@ -1953,8 +1967,8 @@ export default {
             }
           }
           // 先md5校验，然后调用接口传入图片数据和md5校验
-          let rollMd5 = this.checkMd5(captureImage.getRolledFrame_asB64())
-          let plainMd5 = this.checkMd5(captureImage.getPlainFrame_asB64())
+          let rollMd5 = self.checkMd5(captureImage.getRolledFrame_asB64())
+          let plainMd5 = self.checkMd5(captureImage.getPlainFrame_asB64())
 
           let paramsR = new URLSearchParams()
           paramsR.append('rybh', self.rybh);
@@ -1968,7 +1982,7 @@ export default {
             data: paramsR
           }).then(resR => {
             if (resR.status == 200) {
-              this.$message.success(resR.data)
+              self.$message.success(resR.data)
             }
           })
 
@@ -1984,7 +1998,7 @@ export default {
             data: paramsL
           }).then(resL => {
             if (resL.status == 200) {
-              this.$message.success(resL.data)
+              self.$message.success(resL.data)
             }
           })
 
@@ -8342,7 +8356,7 @@ export default {
     /**
      * @description: 关闭采集失败弹窗
      * @return {*}
-     */    
+     */
     closeUploadingError() {
       // 开始上传
       this.percentage = 0

vue.config.js

@@ -127,8 +127,8 @@ module.exports = {
       "/apiDelImg": {
         // target: "http://47.92.226.24:8091/", //统一的请求头部每次修改都要重启才会生效
         // target: "http://192.168.128.105:8091", //新系统
-        target: "http://172.18.109.63:8091", //新系统
-        // target: "http://127.0.0.1:8091", //新系统
+        // target: "http://172.18.109.63:8091", //新系统
+        target: "http://127.0.0.1:8091", //新系统
         ws: true,
         changeOrigin: true,
         pathRewrite: {