1.墨奇手动采集修改。2.模板打印对接

src/utils/sample-code2.js

@@ -377,6 +377,7 @@ export class GrpcCameraService {
     let result = new Promise((resolve, reject) => {
       this.captureImageStream.on('data', (response) => {
         if (response) {
+          cb(this)
           const responseObject = response.toObject();
           const status = responseObject.state;
           if (status !== CaptureState.CAPTURE_OK) {

src/views/zwxt/fingerprint.scss

@@ -893,6 +893,12 @@ $versionColor: var(--versionColor, #fff);  // #000
                 left: -45px;
               }
             }
+            .Mask {
+              width: 96px;
+              height: 36px;
+              background-color: transparent;
+              z-index: 100;
+            }
           }
           .hands {
             margin-left: 40px;
@@ -902,9 +908,9 @@ $versionColor: var(--versionColor, #fff);  // #000
             background: $handsBg;
             opacity: 1;
             border-radius: 4px;
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
+            // display: flex;
+            // justify-content: space-between;
+            // align-items: center;
             padding: 16px 20px;
             position: relative;
             @keyframes pointerAnimate {
@@ -990,11 +996,14 @@ $versionColor: var(--versionColor, #fff);  // #000
                 height: 168px;
                 display: flex;
                 img {
+                  width: 120px;
+                  height: 168px;
                   object-fit: contain;
                 }
               }
             }
             .right-hand {
+              float: right;
               .txt {
                 margin-right: 0;
                 margin-left: 77px;
@@ -1041,6 +1050,7 @@ $versionColor: var(--versionColor, #fff);  // #000
               }
             }
             .left-hand {
+              float: left;
               .hand {
                 position: relative;
               }
@@ -2467,6 +2477,8 @@ $versionColor: var(--versionColor, #fff);  // #000
             height: 16px;
             display: flex;
             img {
+              width: 16px;
+              height: 16px;
               object-fit: contain;
             }
           }
@@ -2778,3 +2790,7 @@ $versionColor: var(--versionColor, #fff);  // #000
     }
   }
 }
+
+img, button {
+  user-select: none;
+}

src/views/zwxt/fingerprint6.vue

@@ -132,6 +132,7 @@
               <!-- 手动采集 -->
               <div class="anaphora hand" v-if="version.DeviceSn">
                 <el-checkbox class="right-2" v-model="handChecked" @change="setHandLu">手动采集</el-checkbox>
+                <div class="Mask" v-show="MaskDisplay" @click="MaskChange"></div>
               </div>
             </div>
             <!-- 左手|右手 -->
@@ -1158,7 +1159,9 @@ export default {
       // 设备，调节音量需要使用
       GrpcCameraService: null,
       // 视频透明度
-      playFnOpacity: 0
+      playFnOpacity: 0,
+      // 是否可以点击手动采集
+      MaskDisplay: false
     }
   },
   components: {
@@ -1214,6 +1217,7 @@ export default {
     */
 
     let self = this
+    // self.$router.replace('/print/'+self.rybh)
     self.handcaiflag = true
     /*********************** */
     // 监听刷新，清除session
@@ -1738,7 +1742,7 @@ export default {
      */
     async handcai (code, index, type) {
       let self = this
-      this.GrpcCameraService.getVideoStream(code, (imageUrlList, status, that) => {
+      this.GrpcCameraService.getVideoStream(code, async (imageUrlList, status, that) => {
         self.fingerImg = [imageUrlList]
         // console.log(status);
         // 采集结束，变化采集预览图片
@@ -1748,10 +1752,19 @@ export default {
           //   self.fingerImg = ''
           // }, 6000);
         }
+        if (!self.handChecked) {
+          that.stopVideoStream()
+          // self.GrpcCameraService.stopVideoStream();
+          // self.GrpcCameraService = new GrpcCameraService(url.BaseURL, this.sessionId);
+          // self.AutoLu(self.fingersRight, self.fingersLeft, index)
+          // self.$set(self.handObj, 'isHand', false)
+          // self.handChecked = false
+          return
+        }
         // todo 修改手动采集
         document.addEventListener('keyup', async (e) => {
           e.preventDefault()
-          if (e.code === 'Space') {
+          if (e.code === 'Space' && self.handChecked) {
             if(self.handcaiflag) {
               setTimeout(()=>{
                 self.loading = true
@@ -1764,7 +1777,16 @@ export default {
           }
         })
       })
-      let captureImage = await self.GrpcCameraService.captureImage2(code)
+      let captureImage = await self.GrpcCameraService.captureImage2(code, (that) => {
+        if (!self.handChecked) {
+          that.stopVideoStream()
+          // self.GrpcCameraService = new GrpcCameraService(url.BaseURL, this.sessionId);
+          self.AutoLu(self.fingersLeft, self.fingersRight, index)
+          // self.$set(self.handObj, 'isHand', false)
+          // self.handChecked = false
+          return
+        }
+      })
       if (captureImage) {
         // 右手
         if (type == 'r') {
@@ -2174,8 +2196,22 @@ export default {
         }, 0)
       } else {
         this.$set(this.handObj, 'isHand', false)
-        this.GrpcCameraService.stopVideoStream()
+        // this.GrpcCameraService.stopVideoStream()
       }
+      this.MaskDisplay = true
+      setTimeout(() => {
+        this.MaskDisplay = false
+      }, 10000);
+    },
+    /**
+     * @description: 手动采集遮罩层点击事件
+     * @return {*}
+     */    
+    MaskChange() {
+      this.$message({
+        message: '点击过快，请 10 秒之后再操作',
+        type: 'warning'
+      });
     },
     /**
      * @name: 指纹框点击事件
@@ -4763,7 +4799,6 @@ export default {
               self.tipTitle = self.fingerTips[index]
               //console.log('相机开始');
               // 启用相机
-              // debugger
               // self.canvas = document.getElementById("frameImage");
               // self.ctx = self.canvas.getContext("2d");
               // self.frameWidth = document.getElementById("frameImage").width;
@@ -5116,7 +5151,6 @@ export default {
               self.tipTitle = self.fingerTips[index]
               //console.log('相机开始');
               // 启用相机
-              // debugger
               // self.canvas = document.getElementById("frameImage");
               // self.ctx = self.canvas.getContext("2d");
               // self.frameWidth = document.getElementById("frameImage").width;
@@ -5468,7 +5502,6 @@ export default {
               self.tipTitle = self.fingerTips[index]
               //console.log('相机开始');
               // 启用相机
-              // debugger
               // self.canvas = document.getElementById("frameImage");
               // self.ctx = self.canvas.getContext("2d");
               // self.frameWidth = document.getElementById("frameImage").width;
@@ -5898,7 +5931,6 @@ export default {
               self.tipTitle = self.fingerTips[index]
               //console.log('相机开始');
               // 启用相机
-              // debugger
               // self.canvas = document.getElementById("frameImage");
               // self.ctx = self.canvas.getContext("2d");
               // self.frameWidth = document.getElementById("frameImage").width;
@@ -6351,7 +6383,6 @@ export default {
               self.tipTitle = self.fingerTips[index]
               //console.log('相机开始');
               // 启用相机
-              // debugger
               // self.canvas = document.getElementById("frameImage");
               // self.ctx = self.canvas.getContext("2d");
               // self.frameWidth = document.getElementById("frameImage").width;
@@ -6610,7 +6641,6 @@ export default {
               self.tipTitle = self.fingerTips[index]
               //console.log('相机开始');
               // 启用相机
-              // debugger
               // self.canvas = document.getElementById("frameImage");
               // self.ctx = self.canvas.getContext("2d");
               // self.frameWidth = document.getElementById("frameImage").width;
@@ -6869,7 +6899,6 @@ export default {
               self.tipTitle = self.fingerTips[index]
               //console.log('相机开始');
               // 启用相机
-              // debugger
               // self.canvas = document.getElementById("frameImage");
               // self.ctx = self.canvas.getContext("2d");
               // self.frameWidth = document.getElementById("frameImage").width;
@@ -7128,7 +7157,6 @@ export default {
               self.tipTitle = self.fingerTips[index]
               //console.log('相机开始');
               // 启用相机
-              // debugger
               // self.canvas = document.getElementById("frameImage");
               // self.ctx = self.canvas.getContext("2d");
               // self.frameWidth = document.getElementById("frameImage").width;
@@ -7403,7 +7431,6 @@ export default {
           self.tipTitle = self.fingerTips[index]
           //console.log('相机开始');
           // 启用相机
-          // debugger
           // self.canvas = document.getElementById("frameImage");
           // self.ctx = self.canvas.getContext("2d");
           // self.frameWidth = document.getElementById("frameImage").width;
@@ -7561,7 +7588,6 @@ export default {
           self.tipTitle = self.fingerTips[index]
           //console.log('相机开始');
           // 启用相机
-          // debugger
           // self.canvas = document.getElementById("frameImage");
           // self.ctx = self.canvas.getContext("2d");
           // self.frameWidth = document.getElementById("frameImage").width;
@@ -7711,7 +7737,6 @@ export default {
     async SmallAutoLuR (leftList, rightList, index, model = 1, contrast = -1) {
       let self = this
       while (index < 10) {
-        // debugger
         let res = await this.SmallLuR(leftList, rightList, index, model, contrast)
         if (res.status == 'ok') {
           index++
@@ -7724,9 +7749,7 @@ export default {
           this.RepeatGatherIndex = index
           self.RepeatGatherType = 'r'
           return;
-          // debugger
           // if (!self.repeatVisible) {
-          //   debugger
           //   if (!self.confirmRepeatGather) {
           //     index = index
           //   } else {
@@ -7791,7 +7814,6 @@ export default {
      * @return {*}
      */
     moqiLookFinger (finger, index, type = 'r') {
-      // debugger
       // 是否单击了
       this.dj = true
       //console.log('单击')
@@ -7804,7 +7826,6 @@ export default {
       this.checked = finger.isLackFinger
 
       if (this.GrpcCameraService && this.preStatusR != 4 && this.preStatusL != 4 && this.preStatusR != 3 && this.preStatusL != 3 && this.preStatusR != 2 && this.preStatusL != 2) {
-        // debugger
         this.GrpcCameraService.stopVideoStream()
         // this.preIndex = index
         if (this.preStatusR == 1 && this.preStatusL == 1) {
@@ -8090,7 +8111,6 @@ export default {
       let indexL = this.preIndexL
       // self.rGdzw = []
       // self.rPmzw = []
-      // debugger
       if (this.preType == 'r') {
         // 选中的是右手
         if (indexR < 5) {
@@ -8607,8 +8627,10 @@ export default {
           //     window.close();
           //   }
           // }, 3000);
-        }, 1500);
+        }, 0);
       } else {
+        // todo
+        // self.$router.replace('/print/'+self.rybh)
         // 上传成功！
         // 返回数据给后台
         // 滚动
@@ -8686,14 +8708,14 @@ export default {
           self.isUploadingFinish = true
           self.isShowUploadingTxt = false
           self.uploadingTitle = '指纹上传完成'
-          self.uploadingTip = '页面将在3秒后自动关闭'
+          self.uploadingTip = '页面将在3秒后跳转指掌纹信息卡页面'
           setTimeout(() => {
             // document.getElementsByTagName('body')[0].style.setProperty('--uploadingBorder', '2px');
           }, 300);
           setTimeout(() => {
             self.uploadingClose = 'uploadingFinish'
             setTimeout(() => {
-              self.$router.push('/print/'+self.rybh)
+              self.$router.replace('/print/'+self.rybh)
               // if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
               //   window.location.href = "about:blank";
               //   window.close();
@@ -8703,7 +8725,7 @@ export default {
               //   window.close();
               // }
             }, 3000);
-          }, 1500);
+          }, 0);
         }).catch(err => {
           //console.log(err);
           self.uploadingColor = '#E82510'
@@ -9370,7 +9392,7 @@ export default {
           // 左手
           self.$set(this.fingersLeft[this.RepeatGatherIndex - 5], 'statusL', 0)
           self.$set(this.fingersLeft[this.RepeatGatherIndex - 5], 'imgSrcL', '')
-          self.$set(this.fingersLeft[this.RepeatGatherIndex - 5], 'score:', '')
+          self.$set(this.fingersLeft[this.RepeatGatherIndex - 5], 'scoreL', '')
           self.$set(this.fingersLeft[this.RepeatGatherIndex - 5], 'isLackFingerL', false)
         }
         this.SmallAutoLuL(this.fingersLeft, this.fingersRight, this.RepeatGatherIndex, 2, -1)

src/views/zwxt/rymb.vue

@@ -145,11 +145,11 @@
             </div>
             <div class="itemOnly">
               <span class="label">复核人</span>
-              <span class="value"></span>
+              <span class="value">{{ ryInfo.fhryXm }}</span>
             </div>
             <div class="itemOnly">
               <span class="label">公安局</span>
-              <span class="value"></span>
+              <span class="value">{{ ryInfo.gaCodeName }}</span>
             </div>
           </div>
         </div>
@@ -190,6 +190,7 @@
 <script>
 import html2Canvas from 'html2canvas'
 import printJS from 'print-js'
+import axios from 'axios';
 export default {
   name: 'rymb',
   data () {
@@ -237,7 +238,6 @@ export default {
         { name: '右侧像', code: 4, img: null },
         { name: '身份证', code: 11, img: null }
       ],
-      daCount: 0,
       reqParam: {
         // 请求参数
         page: {
@@ -256,7 +256,7 @@ export default {
   },
   watch: {},
   created () {
-    console.log(this.$route.params)
+    // console.log(this.$route.params)
   },
   filters: {
     dataFilter (val) {
@@ -265,14 +265,64 @@ export default {
       return val.split('T')[0]
     }
   },
-  mounted () {
-    // this.getRyinfo()
-    // this.getFaceByBarcode()
-    // this.getRollByBarcode()
-    // this.getPlainByBarcode()
-    // this.getPalmByBarcode()
+  async mounted () {
+    const loading = this.$loading({
+      lock: true,
+      text: '正在加载中···',
+      background: 'rgba(255, 255, 255, 0.7)'
+    });
+    this.getRyinfo()
+    this.getFaceByBarcode()
+    this.getPalmByBarcode()
+    await this.getRollByBarcode()
+    await this.getPlainByBarcode()
+    await this.getNewCollect()
+    loading.close();
   },
   methods: {
+    /**
+     * @description: 获取最新的采集的图片
+     * @return {*}
+     */    
+    async getNewCollect () {
+      let self = this
+      await axios({
+        method: 'get',
+        url: '/apiDelImg/getAllFingers/'+this.htmlTitle,
+      }).then((response) => {
+        if (response.data.length > 0) {
+          response.data.forEach((item) => {
+            self.resetImages(item)
+          })
+        }
+      })
+    },
+    /**
+     * @description: 重置最新的图片
+     * @param {*} image
+     * @return {*}
+     */    
+    resetImages(image){
+      // 滚动
+      if (image.seq >=1 && image.seq <= 10) {
+        this.RollImg.forEach((item) => {
+          if (item.code == image.seq) {
+            item.img = image.image
+          }
+        })
+      }
+      // 平面
+      if (image.seq >=11 && image.seq <= 20) {
+        this.PlainImg.forEach((item) => {
+          if (item.code == image.seq) {
+            item.img = image.image
+          }
+        })
+      }
+      // 去掉加载状态
+      this.PlainImgfingerLoading = false
+      this.RollImgfingerLoading = false
+    },
     // 打印
     goPrint () {
       this.isPrint = true
@@ -295,114 +345,129 @@ export default {
     // 获取档案信息
     getRyinfo () {
       let self = this
-      if (self.daCount > 0) return
-      self.daCount++
-      this.$axios
-        .post('/api/personstore/person/list', this.reqParam)
-        .then(response => {
-          if (response.data.code === 0) {
-            self.ryInfo = response.data.ret.list[0]
-          } else {
-            self.$message.error(response.data.message)
-          }
-        })
+      axios({
+        method: 'post',
+        url: '/apizzwxxk/personstore/person/list',
+        params: {
+          zwbh: self.htmlTitle
+        }
+      }).then(response => {
+        self.ryInfo = response.data
+      }).catch(err => {
+        console.log(err);
+      })
     },
     // 获取人像
     getFaceByBarcode () {
       let self = this
-      window.NetUtil.ryxxk.getFaceByBarcode({ barcode: this.htmlTitle })
-        .then((response) => {
-          if (response.code == 0) {
-            response.ret.forEach((element) => {
-              self.FaceImg.forEach((item) => {
-                if (item.code == element.seq) {
-                  item.img = element.image
-                }
-              })
+      axios({
+        method: 'post',
+        url: '/apizzwxxk/org/face/barcode',
+        params: {
+          zwbh: this.htmlTitle
+        }
+      }).then((response) => {
+        if (response.data.code == 0) {
+          response.data.ret.forEach((element) => {
+            self.FaceImg.forEach((item) => {
+              if (item.code == element.seq) {
+                item.img = element.image
+              }
             })
-            // 去掉加载状态
-            self.FaceLoading = false
-          } else if (response.code == 4) {
-            // 去掉加载状态
-            self.FaceLoading = false
-          }
-        })
+          })
+          // 去掉加载状态
+          self.FaceLoading = false
+        } else if (response.data.code == 4) {
+          // 去掉加载状态
+          self.FaceLoading = false
+        }
+      })
     },
     // 获取掌纹
     getPalmByBarcode () {
       let self = this
-      if (self.PalmCount > 0) return
-      self.PalmCount++
-      this.PalmImgNum = 0
-      window.NetUtil.ryxxk.getPalmByBarcode({ barcode: this.htmlTitle })
-        .then((response) => {
-          if (response.code == 0) {
-            response.ret.forEach((element) => {
-              self.PlamImg.forEach((item) => {
-                if (item.code == element.seq) {
-                  item.img = element.image
-                  this.PalmImgNum++
-                }
-              })
-            })
-            // 去掉加载状态
-            self.PlamLoading = false
-          } else if (response.code == 4) {
-            // 去掉加载状态
-            self.PlamLoading = false
+      axios({
+        method: 'post',
+        url: '/apizzwxxk/png/palm/barcode',
+        params: {
+          zwbh: this.htmlTitle
+        }
+      }).then((response) => {
+        if (response.data.code == 0) {
+          response.data.ret.forEach((element) => {
             self.PlamImg.forEach((item) => {
-              item.img = ''
-              this.PalmImgNum++
+              if (item.code == element.seq) {
+                item.img = element.image
+              }
             })
-          }
-        })
+          })
+          // 去掉加载状态
+          self.PlamLoading = false
+        } else if (response.data.code == 4) {
+          // 去掉加载状态
+          self.PlamLoading = false
+          self.PlamImg.forEach((item) => {
+            item.img = ''
+          })
+        }
+      })
     },
     // 人员平面压缩图
-    getPlainByBarcode () {
+    async getPlainByBarcode () {
       let self = this
-      window.NetUtil.ryxxk.getPlainByBarcode({ barcode: this.htmlTitle })
-        .then((response) => {
-          if (response.code == 0) {
-            response.ret.forEach((element) => {
-              self.PlainImg.forEach((item) => {
-                if (item.code == element.seq) {
-                  item.img = element.image
-                }
-              })
-            })
-            // 去掉加载状态
-            self.PlainImgfingerLoading = false
-          } else if (response.code == 4) {
-            // 去掉加载状态
-            self.PlainImgfingerLoading = false
+      await axios({
+        method: 'post',
+        url: '/apizzwxxk/png/plain/barcode',
+        params: {
+          zwbh: this.htmlTitle
+        }
+      }).then((response) => {
+        if (response.data.code == 0) {
+          response.data.ret.forEach((element) => {
             self.PlainImg.forEach((item) => {
-              item.img = ''
+              if (item.code == element.seq) {
+                item.img = element.image
+              }
             })
-          }
-        })
+          })
+          // 去掉加载状态
+          self.PlainImgfingerLoading = false
+        } else if (response.data.code == 4) {
+          // 去掉加载状态
+          self.PlainImgfingerLoading = false
+          self.PlainImg.forEach((item) => {
+            item.img = ''
+          })
+        }
+      })
     },
     // 人员滚动压缩图
-    getRollByBarcode () {
-      window.NetUtil.ryxxk.getRollByBarcode({ barcode: this.htmlTitle })
-        .then((response) => {
-          if (response.code == 0) {
-            // 去掉加载状态
-            this.RollImgfingerLoading = false
-            response.ret.forEach((element) => {
-              this.RollImg.forEach((item) => {
-                if (item.code == element.seq) {
-                  item.img = element.image
-                }
-              })
-            })
-          } else if (response.code == 4) {
-            // 去掉加载状态
-            this.RollImgfingerLoading = false
+    async getRollByBarcode () {
+      await axios({
+        method: 'post',
+        url: '/apizzwxxk/png/roll/barcode',
+        params: {
+          zwbh: this.htmlTitle
+        }
+      }).then((response) => {
+        if (response.data.code == 0) {
+          // 去掉加载状态
+          this.RollImgfingerLoading = false
+          response.data.ret.forEach((element) => {
             this.RollImg.forEach((item) => {
-              item.img = ''
+              if (item.code == element.seq) {
+                item.img = element.image
+              }
             })
-          }
-        })
+          })
+        } else if (response.data.code == 4) {
+          // 去掉加载状态
+          this.RollImgfingerLoading = false
+          this.RollImg.forEach((item) => {
+            item.img = ''
+          })
+        }
+      })
     }
   }
 }
@@ -449,6 +514,7 @@ export default {
   padding: 20px;
   overflow: auto;
   background-color: #eee;
+  box-sizing: border-box;
 
   .pdfContent {
     width: 1240px;
@@ -761,4 +827,12 @@ export default {
   }
 }
 </style>
-
+<style>
+.el-loading-spinner .path{
+  stroke: #044cb9;
+}
+.el-loading-spinner .el-loading-text{
+  color: #044cb9;
+  font-size: 26px;
+}
+</style>

vue.config.js

 /*
  * @Author: your name
  * @Date: 2021-06-15 15:12:19
- * @LastEditTime: 2022-07-20 10:40:27
+ * @LastEditTime: 2022-08-22 16:12:49
  * @LastEditors: zhangchaojun 893499851@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \founder_vue\vue.config.js
@@ -113,6 +113,17 @@ module.exports = {
       // },
 
       // 新系统
+      "/apizzwxxk": {
+        // target: "http://47.92.226.24:9080/", //统一的请求头部每次修改都要重启才会生效
+        // target: "http://192.168.128.105:8091", // 新系统
+        // target: "http://39.103.132.86:9200", // 新系统
+        target: "http://65.26.10.121:9102", //新系统
+        ws: true,
+        changeOrigin: true,
+        pathRewrite: {
+          '^/apizzwxxk': ''
+        }
+      },
       "/apiInfo": {
         // target: "http://47.92.226.24:9080/", //统一的请求头部每次修改都要重启才会生效
         // target: "http://192.168.128.105:8091", // 新系统
@@ -127,8 +138,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.116.16:8091", //新系统
+        // target: "http://127.0.0.1:8091", //新系统
         ws: true,
         changeOrigin: true,
         pathRewrite: {