Skip to content

F
founder_vue
Commit 17cd7273 by 张超军
Options

指纹图片处理

parent 2a03532f
Showing with 117 additions and 51 deletions
package-lock.json
...@@ -10910,6 +10910,11 @@ ...@@ -10910,6 +10910,11 @@
} }
} }
}, },
"simple-uploader.js": {
"version": "0.5.6",
"resolved": "https://registry.npm.taobao.org/simple-uploader.js/download/simple-uploader.js-0.5.6.tgz",
"integrity": "sha1-03uMAjg0izmTVBxyk66d5WWLI6A="
},
"slash": { "slash": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/slash/download/slash-2.0.0.tgz", "resolved": "https://registry.npm.taobao.org/slash/download/slash-2.0.0.tgz",
...@@ -12507,6 +12512,14 @@ ...@@ -12507,6 +12512,14 @@
"resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.4.6.tgz?cache=0&sync_timestamp=1602077426782&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.4.6.tgz", "resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.4.6.tgz?cache=0&sync_timestamp=1602077426782&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.4.6.tgz",
"integrity": "sha1-972iyaQ9OYN2IcmgK6d4n12qJLI=" "integrity": "sha1-972iyaQ9OYN2IcmgK6d4n12qJLI="
}, },
"vue-simple-uploader": {
"version": "0.7.6",
"resolved": "https://registry.npm.taobao.org/vue-simple-uploader/download/vue-simple-uploader-0.7.6.tgz",
"integrity": "sha1-LajOaZXAcBybFqy3Fxs1GDUJHQ4=",
"requires": {
"simple-uploader.js": "^0.5.6"
}
},
"vue-style-loader": { "vue-style-loader": {
"version": "4.1.2", "version": "4.1.2",
"resolved": "https://registry.npm.taobao.org/vue-style-loader/download/vue-style-loader-4.1.2.tgz", "resolved": "https://registry.npm.taobao.org/vue-style-loader/download/vue-style-loader-4.1.2.tgz",
......
package.json
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
"style-loader": "^2.0.0", "style-loader": "^2.0.0",
"vue": "^2.6.11", "vue": "^2.6.11",
"vue-router": "^3.2.0", "vue-router": "^3.2.0",
"vue-simple-uploader": "^0.7.6",
"vue-wechat-title": "^2.0.7", "vue-wechat-title": "^2.0.7",
"vuedraggable": "^2.24.3", "vuedraggable": "^2.24.3",
"vuex": "^3.4.0", "vuex": "^3.4.0",
......
src/App.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-06-15 15:12:19 * @Date: 2021-06-15 15:12:19
* @LastEditTime: 2021-08-09 13:56:21 * @LastEditTime: 2021-08-11 09:30:34
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \founder_vue\src\App.vue * @FilePath: \founder_vue\src\App.vue
...@@ -25,7 +25,7 @@ export default { ...@@ -25,7 +25,7 @@ export default {
}, },
async mounted () { async mounted () {
// 墨奇启动 // 墨奇启动
try { /*try {
var sessionId = 1617779968252; //这里到时候自动生成sessionid，纯数字 var sessionId = 1617779968252; //这里到时候自动生成sessionid，纯数字
var bb = await new GrpcCameraService(url.BaseURL, sessionId); var bb = await new GrpcCameraService(url.BaseURL, sessionId);
this.version = await bb.getCameraVersion() this.version = await bb.getCameraVersion()
...@@ -39,7 +39,7 @@ export default { ...@@ -39,7 +39,7 @@ export default {
} else { } else {
// 跳转至ib vue // 跳转至ib vue
this.$router.push('/fingerprintIndex7') this.$router.push('/fingerprintIndex7')
} }*/
}, },
}; };
</script> </script>
......
src/main.js
...@@ -19,7 +19,7 @@ Vue.prototype.$lrz = lrz ...@@ -19,7 +19,7 @@ Vue.prototype.$lrz = lrz
import axios from 'axios' import axios from 'axios'
//其他vue组件中就可以this.$axios调用使用,vue3.0中不允许$axios,故改为$ajax //其他vue组件中就可以this.$axios调用使用,vue3.0中不允许$axios,故改为$ajax
Vue.prototype.$ajax = axios Vue.prototype.$ajax = axios
axios.defaults.baseURL = '/apiZwcj' //关键代码 // axios.defaults.baseURL = '/apiZwcj' //关键代码
Vue.config.productionTip = false Vue.config.productionTip = false
// 引入echarts // 引入echarts
...@@ -35,6 +35,8 @@ const LoadingCons = Vue.extend(Nsloading); ...@@ -35,6 +35,8 @@ const LoadingCons = Vue.extend(Nsloading);
Vue.prototype.$util = Util; Vue.prototype.$util = Util;
window.util = Util; window.util = Util;
Vue.use(VueWechatTitle); Vue.use(VueWechatTitle);
import uploader from 'vue-simple-uploader';
Vue.use(uploader);
Vue.directive("nsLoading", { Vue.directive("nsLoading", {
bind(el, binding) { bind(el, binding) {
......
src/router/modules/index.js
export default[ export default[
{ {
path: "/", path: "/",
// redirect: "/login" redirect: "/fingerprintIndex6"
}, },
{ {
path: "/fingerprintIndex", path: "/fingerprintIndex",
......
src/utils/sample-code2.js
import { import {
CaptureState, EmptyRequest, FingerIndex, ImageType, PreviewState, AudioFile, AudioMute, AudioVolume, AutoCaptureRequest, AutoCaptureState, CameraState, CaptureState, EmptyRequest, FingerIndex, ImageType, PreviewState, AudioFile, AudioMute, AudioVolume, AutoCaptureRequest, AutoCaptureState, CameraState,
Bozorth3Request Bozorth3Request
...@@ -137,29 +136,32 @@ export class GrpcCameraService { ...@@ -137,29 +136,32 @@ export class GrpcCameraService {
// return false // return false
} }
}) })
})
this.autoVideoStream.on('status', (status) => {
// 在这里处理 on status 状态弹窗
if (status.code == '0') {
this.audioPlay('/video/success.mp3');
} else if (status.code == '6') {
console.log("正在处理视频流，请稍候重试");
} else if (status.code == '7' || status.code == '16') {
console.log("会话过期，请重新启动相机驱动");
} else if (status.code == '14') {
console.log("USB中断，请重新连接指纹采集设备");
// 刷新页面
location.reload();
}
});
this.autoVideoStream.on('end', (status) => { this.autoVideoStream.on('status', (status) => {
// 在这里处理 on end 错误 // 在这里处理 on status 状态弹窗
console.log(status); if (status.code == '0') {
// 刷新页面 this.audioPlay('/video/success.mp3');
location.reload(); } else if (status.code == '6') {
}); console.log("正在处理视频流，请稍候重试");
} else if (status.code == '7' || status.code == '16') {
console.log("会话过期，请重新启动相机驱动");
} else if (status.code == '14') {
console.log("USB中断，请重新连接指纹采集设备");
resolve({ msg: 'USB中断，请重新连接指纹采集设备', status: 'disconnection' })
// 刷新页面
// location.reload();
}
});
this.autoVideoStream.on('end', (status) => {
// 在这里处理 on end 错误
console.log(status);
resolve({ msg: '视频流终端', status: 'disconnection' })
// 刷新页面
// location.reload();
});
})
return result return result
} }
...@@ -336,7 +338,7 @@ export class GrpcCameraService { ...@@ -336,7 +338,7 @@ export class GrpcCameraService {
// 不要在这里 console.log，会占用内存 // 不要在这里 console.log，会占用内存
// 回调用于处理结果 // 回调用于处理结果
cb(imageUrlList, status); cb(imageUrlList, status);
if(status == 0) { if (status == 0) {
this.stopVideoStream(); this.stopVideoStream();
} }
} }
...@@ -383,7 +385,7 @@ export class GrpcCameraService { ...@@ -383,7 +385,7 @@ export class GrpcCameraService {
} }
}); });
}) })
this.captureImageStream.on('status', (status) => { this.captureImageStream.on('status', (status) => {
// 在这里处理 on status 错误 // 在这里处理 on status 错误
console.log("status===" + status); console.log("status===" + status);
...@@ -531,9 +533,9 @@ export class GrpcCameraService { ...@@ -531,9 +533,9 @@ export class GrpcCameraService {
// 每次采集完成之后，把 rolledMinutiae push进一个 targets 数组中，rolledMinutiae push进去indices一个数组中 // 每次采集完成之后，把 rolledMinutiae push进一个 targets 数组中，rolledMinutiae push进去indices一个数组中
checkRepeatFinger (probe, targets, indices, cb) { checkRepeatFinger (probe, targets, indices, cb) {
console.log("能进入重复指位验证吗？"); console.log("能进入重复指位验证吗？");
console.log("probe=="+probe); console.log("probe==" + probe);
console.log("targets=="+targets); console.log("targets==" + targets);
console.log("indices=="+indices); console.log("indices==" + indices);
// 跳过第一个 // 跳过第一个
// if (!targets || !targets.length) { // if (!targets || !targets.length) {
// debugger // debugger
......
src/views/zwxt/fingerprint.scss
...@@ -851,6 +851,18 @@ $lookingBg: var(--lookingBg, #161712); ...@@ -851,6 +851,18 @@ $lookingBg: var(--lookingBg, #161712);
justify-content: center; justify-content: center;
border-radius: 5px; border-radius: 5px;
} }
.right-2 {
/deep/ .el-checkbox__label {
position: absolute;
left: -72px;
}
}
.right-1 {
/deep/ .el-checkbox__label {
position: absolute;
left: -45px;
}
}
} }
.hands { .hands {
margin-left: 40px; margin-left: 40px;
...@@ -2355,4 +2367,20 @@ $lookingBg: var(--lookingBg, #161712); ...@@ -2355,4 +2367,20 @@ $lookingBg: var(--lookingBg, #161712);
} }
} }
} }
.pop {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: rgba(0, 0, 0, 0.2);
z-index: 99999999;
.alert {
position: absolute;
left: calc(50% - 250px);
top: 50px;
width: 500px;
padding: 5px;
}
}
} }
src/views/zwxt/fingerprint4.vue
...@@ -124,11 +124,11 @@ ...@@ -124,11 +124,11 @@
</div> </div>
<!-- 缺指 --> <!-- 缺指 -->
<div class="anaphora no"> <div class="anaphora no">
缺指<el-checkbox v-model="checked" @change="setLackFinger"></el-checkbox> <el-checkbox class="right-1" v-model="checked" @change="setLackFinger">缺指</el-checkbox>
</div> </div>
<!-- 手动采集 --> <!-- 手动采集 -->
<div class="anaphora hand"> <div class="anaphora hand">
手动采集<el-checkbox v-model="handChecked" @change="setHandLu"></el-checkbox> <el-checkbox class="right-2" v-model="handChecked" @change="setHandLu">手动采集</el-checkbox>
</div> </div>
</div> </div>
<!-- 左手|右手 --> <!-- 左手|右手 -->
...@@ -1516,6 +1516,12 @@ export default { ...@@ -1516,6 +1516,12 @@ export default {
} }
}) })
console.log(finger); console.log(finger);
// 处理设备断开连接的错误
if (finger.status && finger.status == 'disconnection') {
self.$message.error(finger.msg)
// 刷新页面
location.reload();
}
// 交叉验证 // 交叉验证
let result = null let result = null
if (this.version.SupportNbis && this.checkList[0] == '指纹交叉验证' && finger.getPlainMinutiae) { if (this.version.SupportNbis && this.checkList[0] == '指纹交叉验证' && finger.getPlainMinutiae) {
...@@ -1728,6 +1734,13 @@ export default { ...@@ -1728,6 +1734,13 @@ export default {
self.isError = true self.isError = true
} }
}) })
console.log(finger);
// 处理设备断开连接的错误
if (finger.status && finger.status == 'disconnection') {
self.$message.error(finger.msg)
// 刷新页面
location.reload();
}
// 交叉验证 // 交叉验证
let result = null let result = null
if (this.version.SupportNbis && this.checkList[0] == '指纹交叉验证' && finger.getPlainMinutiae) { if (this.version.SupportNbis && this.checkList[0] == '指纹交叉验证' && finger.getPlainMinutiae) {
...@@ -1745,7 +1758,6 @@ export default { ...@@ -1745,7 +1758,6 @@ export default {
self.indices.push(rightList[index - 5].code) self.indices.push(rightList[index - 5].code)
} }
} }
console.log(finger);
if (finger == '缺指了') { if (finger == '缺指了') {
index++ index++
self.checked = false self.checked = false
......
src/views/zwxt/fingerprint6.vue
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/zwxt/fingerprint7.vue
...@@ -91,11 +91,11 @@ ...@@ -91,11 +91,11 @@
<img :src="fingerImg" alt=""> <img :src="fingerImg" alt="">
</div> </div>
<div class="loading" v-show="loading"> <div class="loading" v-show="loading">
<img src="../../assets/img/zw/loading.gif" alt=""> <img src="../../assets/img/zw/fp-loading2.gif" alt="">
</div> </div>
<!-- 缺指 --> <!-- 缺指 -->
<div class="anaphora no"> <div class="anaphora no">
缺指<el-checkbox v-model="checked" @change="setLackFinger"></el-checkbox> <el-checkbox class="right-1" v-model="checked" @change="setLackFinger">缺指</el-checkbox>
</div> </div>
</div> </div>
<!-- 左手|右手 --> <!-- 左手|右手 -->
......
vue.config.js
...@@ -41,12 +41,12 @@ module.exports = { ...@@ -41,12 +41,12 @@ module.exports = {
const oneOfsMap = config.module.rule("scss").oneOfs.store; const oneOfsMap = config.module.rule("scss").oneOfs.store;
oneOfsMap.forEach(item => { oneOfsMap.forEach(item => {
item item
.use("sass-resources-loader") .use("sass-resources-loader")
.loader("sass-resources-loader") .loader("sass-resources-loader")
.options({ .options({
resources: "./src/assets/styles/main.scss" resources: "./src/assets/styles/main.scss"
}) })
.end(); .end();
}); });
// if (process.env.NODE_ENV === 'production') { // if (process.env.NODE_ENV === 'production') {
// config.plugin('compressionPlugin') // config.plugin('compressionPlugin')
...@@ -70,14 +70,22 @@ module.exports = { ...@@ -70,14 +70,22 @@ module.exports = {
errors: false errors: false
}, },
proxy: { proxy: {
"/apiSaveImg": { "/apiDelImg": {
target: "http://localhost:8088/", //统一的请求头部每次修改都要重启才会生效 target: "http://47.92.226.24:8091/", //统一的请求头部每次修改都要重启才会生效
ws: true, ws: true,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
'^/apiSaveImg': '' '^/apiDelImg': ''
} }
}, },
"/apiSaveImg": {
target: "http://localhost:8088/", //统一的请求头部每次修改都要重启才会生效
ws: true,
changeOrigin: true,
pathRewrite: {
'^/apiSaveImg': ''
}
},
"/apiZwxt": { "/apiZwxt": {
target: "http://localhost:8080/", //统一的请求头部每次修改都要重启才会生效 target: "http://localhost:8080/", //统一的请求头部每次修改都要重启才会生效
ws: true, ws: true,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment