Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
founder_vue
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
常超
founder_vue
Commits
58226cec
Commit
58226cec
authored
Jun 26, 2022
by
张超军
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.墨奇上传文件,失败后不退出页面,可重新上传。
2.修改墨奇流程,先本地生成fptx文件,再调接口。 3.修改墨奇在补采的情况下,采集失败,再次双击后跳到下一个指位的问题。
parent
3496600b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
108 additions
and
53 deletions
+108
-53
src/views/zwxt/fingerprint6.vue
+104
-51
vue.config.js
+4
-2
No files found.
src/views/zwxt/fingerprint6.vue
View file @
58226cec
...
...
@@ -603,7 +603,7 @@
<div
class=
"uploading-error"
v-show=
"uploadingClose == 'uploadingError'"
>
<img
src=
"../../assets/img/zw/uploading-error.png"
alt=
""
>
<div
class=
"uploading-error-title"
>
指纹上传失败
</div>
<div
class=
"uploading-error-tip"
>
页面
将在3秒后自动关闭
</div>
<div
class=
"uploading-error-tip"
>
弹窗
将在3秒后自动关闭
</div>
</div>
</div>
...
...
@@ -1390,25 +1390,28 @@ export default {
this
.
errTitle
=
'IP校验'
this
.
errDescription
=
'正在校验IP中。。。'
//
let machineRes = await axios({
//
url: '/apiMachine/checkClientVp',
//
method: 'post',
//
params: {
//
ip: self.ip,
//
sbbh: self.deviceSn,
//
sblx: 1
//
}
//
})
let
machineRes
=
await
axios
({
url
:
'/apiMachine/checkClientVp'
,
method
:
'post'
,
params
:
{
ip
:
self
.
ip
,
sbbh
:
self
.
deviceSn
,
sblx
:
1
}
})
// //console.log(machineRes);
//
if (machineRes.data.success) {
if
(
true
)
{
if
(
machineRes
.
data
.
success
)
{
//
if (true) {
this
.
pop
=
false
this
.
isAlter
=
false
this
.
errTitle
=
''
this
.
errDescription
=
''
// 发送服务器成功
NProgress
.
done
();
// this.getPersonInfo()
this
.
getPersonInfo
()
// 测试补采问题
// this.ceshiSupplementarymining()
}
else
{
this
.
pop
=
true
this
.
isAlter
=
true
...
...
@@ -1466,6 +1469,27 @@ export default {
},
methods
:
{
/**
* 测试补采
*/
ceshiSupplementarymining
()
{
let
data
=
{
rGdzw
:
'0-0-0-0-0-0-0-0-0-0'
,
rPmzw
:
'0-0-0-0-0-0-0-0-0-0'
}
if
(
data
.
rGdzw
)
{
this
.
rGdzw
=
data
.
rGdzw
.
split
(
'-'
)
}
if
(
data
.
rPmzw
)
{
this
.
rPmzw
=
data
.
rPmzw
.
split
(
'-'
)
}
console
.
log
(
this
.
rGdzw
);
console
.
log
(
this
.
rPmzw
);
this
.
dealIsGetFinger
()
// 测试全部采集用***************************
// self.rGdzw = []
// self.rPmzw = []
},
/**
* @description: 找出重复的指纹的位置
* @param {*} fingerZwzwdm
* @return {*}
...
...
@@ -2110,23 +2134,26 @@ export default {
* @return {*}
*/
async
setHandLu
()
{
console
.
log
(
this
.
handChecked
);
if
(
this
.
handChecked
)
{
this
.
$set
(
this
.
handObj
,
'isHand'
,
true
)
//console.log('手动采集')
// 确认单击了
if
(
this
.
dj
)
{
this
.
GrpcCameraService
=
new
GrpcCameraService
(
url
.
BaseURL
,
this
.
sessionId
);
// 右手
if
(
this
.
preIndex
<
5
)
{
await
this
.
handcai
(
this
.
fingersRight
[
this
.
preIndex
].
code
,
this
.
preIndex
,
'r'
)
}
else
{
// 左手
await
this
.
handcai
(
this
.
fingersLeft
[
this
.
preIndex
-
5
].
code
,
this
.
preIndex
,
'l'
)
setTimeout
(
async
()
=>
{
this
.
$set
(
this
.
handObj
,
'isHand'
,
true
)
//console.log('手动采集')
// 确认单击了
if
(
this
.
dj
)
{
this
.
GrpcCameraService
=
new
GrpcCameraService
(
url
.
BaseURL
,
this
.
sessionId
);
// 右手
if
(
this
.
preIndex
<
5
)
{
await
this
.
handcai
(
this
.
fingersRight
[
this
.
preIndex
].
code
,
this
.
preIndex
,
'r'
)
}
else
{
// 左手
await
this
.
handcai
(
this
.
fingersLeft
[
this
.
preIndex
-
5
].
code
,
this
.
preIndex
,
'l'
)
}
this
.
$set
(
this
.
handObj
,
'isHand'
,
false
)
this
.
handChecked
=
false
this
.
dj
=
false
}
this
.
$set
(
this
.
handObj
,
'isHand'
,
false
)
this
.
handChecked
=
false
this
.
dj
=
false
}
},
0
)
}
else
{
this
.
$set
(
this
.
handObj
,
'isHand'
,
false
)
this
.
GrpcCameraService
.
stopVideoStream
()
...
...
@@ -4070,10 +4097,11 @@ export default {
async
moqiChangeSelect
(
finger
,
index
)
{
//console.log(finger.statusR);
//console.log('双击')
//console.log(this.getStatus);
//console.log(this.preIndex);
//console.log(this.preStatusL);
if
(
!
this
.
getStatus
&&
this
.
preStatusL
!=
4
&&
this
.
preStatusR
!=
4
&&
this
.
preStatusL
!=
3
&&
this
.
preStatusR
!=
3
&&
this
.
preStatusL
!=
2
&&
this
.
preStatusR
!=
2
)
{
// console.log(this.getStatus);
// console.log(this.preIndex);
// console.log(this.preStatusL);
// console.log(this.preStatusR);
if
(
!
this
.
getStatus
&&
this
.
preStatusL
!=
4
&&
this
.
preStatusR
!=
4
&&
this
.
preStatusL
!=
3
&&
this
.
preStatusR
!=
3
&&
this
.
preStatusL
!=
2
&&
this
.
preStatusR
!=
2
&&
this
.
preStatusL
!=
1
&&
this
.
preStatusR
!=
1
)
{
// 关闭设备
if
(
this
.
GrpcCameraService
)
{
this
.
GrpcCameraService
.
stopVideoStream
()
...
...
@@ -4113,7 +4141,7 @@ export default {
//console.log(finger.statusR);
this
.
fingerImg
=
''
this
.
stop
=
false
if
(
finger
.
statusR
==
0
)
{
if
(
finger
.
statusR
==
0
&&
finger
.
statusL
==
0
)
{
//console.log('执行自动录指纹');
this
.
AutoLu
(
this
.
fingersLeft
,
this
.
fingersRight
,
index
)
}
else
{
...
...
@@ -8375,6 +8403,7 @@ export default {
}*/
//console.log(this.fingerPic);
// 指纹数据
self
.
str
=
''
// 先清空指纹数据
this
.
fingerPic
.
map
((
item
)
=>
{
// //console.log(item);
if
(
item
.
zwzwdm
)
{
...
...
@@ -8472,6 +8501,19 @@ export default {
}
// 开始上传
this
.
percentage
=
0
self
.
isUploadingError
=
false
self
.
isShowUploadingTxt
=
true
self
.
uploadingClose
=
'uploading'
// 指纹上传时的小提示
self
.
uploadingTip
=
'上传期间请勿关闭此页面'
// 指纹上传时的标题
self
.
uploadingTitle
=
'指纹上传中…'
self
.
uploadingColor
=
'#FFFFFF'
// self.uploadingTitle = '指纹上传失败'
this
.
uploadingStart
=
true
let
timePercentage
=
setInterval
(()
=>
{
this
.
percentage
++
...
...
@@ -8486,6 +8528,10 @@ export default {
}
},
1000
);
// 导出文件到本地
let
filenameexport
=
self
.
$route
.
params
.
rybh
self
.
exportRaw
(
`
${
filenameexport
}
.fptx`
,
self
.
xmlStr
)
var
params
=
new
URLSearchParams
();
params
.
append
(
'rybh'
,
self
.
rybh
);
params
.
append
(
'username'
,
self
.
username
);
...
...
@@ -8505,19 +8551,22 @@ export default {
self
.
isShowUploadingTxt
=
false
// self.uploadingTitle = '指纹上传失败'
self
.
uploadingTitle
=
fingerRes
.
data
self
.
uploadingTip
=
'
页面
将在3秒后自动关闭'
self
.
uploadingTip
=
'
弹窗
将在3秒后自动关闭'
setTimeout
(()
=>
{
self
.
uploadingClose
=
'uploadingError'
setTimeout
(()
=>
{
if
(
navigator
.
userAgent
.
indexOf
(
"Firefox"
)
!=
-
1
||
navigator
.
userAgent
.
indexOf
(
"Chrome"
)
!=
-
1
)
{
window
.
location
.
href
=
"about:blank"
;
window
.
close
();
}
else
{
window
.
opener
=
null
;
window
.
open
(
""
,
"_self"
);
window
.
close
();
}
self
.
uploadingStart
=
false
},
3000
);
// setTimeout(() => {
// if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
// window.location.href = "about:blank";
// window.close();
// } else {
// window.opener = null;
// window.open("", "_self");
// window.close();
// }
// }, 3000);
},
1500
);
}
else
{
// 上传成功!
...
...
@@ -8620,19 +8669,23 @@ export default {
self
.
isUploadingError
=
true
self
.
isShowUploadingTxt
=
false
self
.
uploadingTitle
=
'指纹上传失败'
self
.
uploadingTip
=
'
页面
将在3秒后自动关闭'
self
.
uploadingTip
=
'
弹窗
将在3秒后自动关闭'
setTimeout
(()
=>
{
self
.
uploadingClose
=
'uploadingError'
setTimeout
(()
=>
{
if
(
navigator
.
userAgent
.
indexOf
(
"Firefox"
)
!=
-
1
||
navigator
.
userAgent
.
indexOf
(
"Chrome"
)
!=
-
1
)
{
window
.
location
.
href
=
"about:blank"
;
window
.
close
();
}
else
{
window
.
opener
=
null
;
window
.
open
(
""
,
"_self"
);
window
.
close
();
}
self
.
uploadingStart
=
false
},
3000
);
// setTimeout(() => {
// if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
// window.location.href = "about:blank";
// window.close();
// } else {
// window.opener = null;
// window.open("", "_self");
// window.close();
// }
// }, 3000);
},
1500
);
})
}
...
...
vue.config.js
View file @
58226cec
...
...
@@ -114,9 +114,10 @@ module.exports = {
// 新系统
"/apiInfo"
:
{
target
:
"http://47.92.226.24:9080/"
,
//统一的请求头部每次修改都要重启才会生效
//
target: "http://47.92.226.24:9080/", //统一的请求头部每次修改都要重启才会生效
// target: "http://192.168.128.105:8091", // 新系统
// target: "http://39.103.132.86:9200", // 新系统
target
:
"http://127.0.0.1:8091"
,
//新系统
ws
:
true
,
changeOrigin
:
true
,
pathRewrite
:
{
...
...
@@ -126,7 +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://172.18.109.63:8091", //新系统
target
:
"http://127.0.0.1:8091"
,
//新系统
ws
:
true
,
changeOrigin
:
true
,
pathRewrite
:
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment