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
5f8f3a39
Commit
5f8f3a39
authored
Jul 13, 2022
by
张超军
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
墨奇设备启动
parent
0902f2e5
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
41 additions
and
32 deletions
+41
-32
src/api/base.js
+17
-16
src/views/zwxt/fingerprint6.vue
+24
-16
No files found.
src/api/base.js
View file @
5f8f3a39
...
...
@@ -5,22 +5,23 @@ var relUrlIp = window.location.host.substring(
let
base
=
{
BaseURL
:
''
,
};
if
(
relUrlIp
==
"133.8.5.1"
||
relUrlIp
==
"68.174.69.46"
||
relUrlIp
==
"68.175.7.118"
||
relUrlIp
==
"65.65.100.205"
||
relUrlIp
==
"68.175.7.150"
||
relUrlIp
==
"68.175.7.95"
||
relUrlIp
==
"68.174.25.98"
||
relUrlIp
==
"26.8.175.240"
||
relUrlIp
==
"133.8.5.67"
||
relUrlIp
==
"26.3.13.120"
)
{
//------------------------------刑侦字典服务路径**公安网**--------------------------------
base
.
BaseURL
=
"/apiZwxtGaw"
}
else
{
//------------------------------刑侦字典服务路径**阿里云**--------------------------------
base
.
BaseURL
=
"/apiZwxt"
//
if (relUrlIp == "133.8.5.1"||
//
relUrlIp == "68.174.69.46" ||
//
relUrlIp == "68.175.7.118" ||
//
relUrlIp == "65.65.100.205" ||
//
relUrlIp == "68.175.7.150" ||
//
relUrlIp == "68.175.7.95" ||
//
relUrlIp == "68.174.25.98" ||
//
relUrlIp == "26.8.175.240" ||
//
relUrlIp == "133.8.5.67" ||
//
relUrlIp == "26.3.13.120") {
//
//------------------------------刑侦字典服务路径**公安网**--------------------------------
//
base.BaseURL="/apiZwxtGaw"
//
} else{
//
//------------------------------刑侦字典服务路径**阿里云**--------------------------------
//
base.BaseURL="/apiZwxt"
}
// }
base
.
BaseURL
=
'http://localhost:8080'
export
default
base
;
src/views/zwxt/fingerprint6.vue
View file @
5f8f3a39
...
...
@@ -50,7 +50,7 @@
</div>
</div>
<!-- 对比度 -->
<div
class=
"light contrast"
>
<div
class=
"light contrast"
:style=
"
{opacity: 1-playFnOpacity}"
>
<div
class=
"light-text"
>
对比度:
<span>
{{
contrastvalue
}}
</span>
</div>
...
...
@@ -59,7 +59,7 @@
</div>
</div>
<!-- 视频 -->
<div
class=
"movie"
@
click=
"playFn"
style=
"opacity: 0;
"
>
<div
class=
"movie"
@
click=
"playFn"
:style=
"
{opacity: playFnOpacity}
">
<span
class=
"iconfont icon-bofang"
v-show=
"!isPlay"
></span>
<video
v-show=
"isPlay"
ref=
"video"
:src=
"videoSrc"
controls
muted
></video>
</div>
...
...
@@ -756,8 +756,8 @@ export default {
}],
value
:
'干燥指纹'
,
checkList
:
[
'指纹交叉验证'
,
'随时中止采集'
],
lightvalue
:
1
0
,
contrastvalue
:
20
,
lightvalue
:
8
0
,
contrastvalue
:
-
1
,
// 是否显示视频播放
isPlay
:
false
,
// 视频路径
...
...
@@ -994,7 +994,7 @@ export default {
score
:
0
},
{
lightvalue
:
0
lightvalue
:
8
0
},
{
contrastvalue
:
0
...
...
@@ -1156,7 +1156,9 @@ export default {
SupportNbis
:
false
,
SupportNfiq2
:
false
,
// 设备,调节音量需要使用
GrpcCameraService
:
null
GrpcCameraService
:
null
,
// 视频透明度
playFnOpacity
:
0
}
},
components
:
{
...
...
@@ -1341,7 +1343,7 @@ export default {
try
{
this
.
GrpcCameraService
=
new
GrpcCameraService
(
url
.
BaseURL
,
this
.
sessionId
);
this
.
version
=
await
this
.
GrpcCameraService
.
getCameraVersion
()
//
console.log(this.version);
console
.
log
(
this
.
version
);
this
.
SupportNbis
=
this
.
version
.
SupportNbis
this
.
SupportNfiq2
=
this
.
version
.
SupportNfiq2
this
.
GrpcCameraService
.
setAudioVolumeAndMayTryPlay
(
this
.
lightvalue
,
()
=>
{
...
...
@@ -1353,6 +1355,8 @@ export default {
//console.log(error);
}
console
.
log
(
this
.
version
.
DeviceSn
);
if
(
!
this
.
version
.
DeviceSn
)
{
// ib采集器相关的初始化
try
{
// 获取小指纹采集器信息
...
...
@@ -1365,6 +1369,8 @@ export default {
}
catch
(
error
)
{
//console.log(error);
}
}
// canvas
if
(
this
.
iBversion
.
deviceSN
)
{
this
.
canvas
=
document
.
getElementById
(
"frameImage"
);
...
...
@@ -1375,6 +1381,7 @@ export default {
if
(
this
.
version
.
DeviceSn
)
{
// 墨奇
this
.
playFnOpacity
=
1
// 去掉采集下方的提示性文字
this
.
tipP
=
""
this
.
pop
=
false
...
...
@@ -1421,6 +1428,7 @@ export default {
}
}
else
if
(
this
.
iBversion
.
deviceSN
)
{
// iB
this
.
playFnOpacity
=
0
this
.
pop
=
false
this
.
isAlter
=
false
// 获取到SN序列号,ip地址,发送到服务器
...
...
@@ -8438,10 +8446,10 @@ export default {
<package><packageHead><version>
${
this
.
packageHeader
.
version
}
</version><createTime>
${
this
.
packageHeader
.
createTime
}
</createTime><originSystem>
${
this
.
packageHeader
.
originSystem
}
</originSystem><fsdw_gajgjgdm>
${
this
.
packageHeader
.
fsdw_gajgjgdm
}
</fsdw_gajgjgdm><fsdw_gajgmc>
${
this
.
packageHeader
.
fsdw_gajgmc
}
</fsdw_gajgmc><fsdw_xtlx>
${
this
.
packageHeader
.
fsdw_xtlx
}
</fsdw_xtlx><fsr_xm>
${
this
.
packageHeader
.
fsr_xm
}
</fsr_xm><fsr_gmsfhm>
${
this
.
packageHeader
.
fsr_gmsfhm
}
</fsr_gmsfhm><fsr_lxdh>
${
this
.
packageHeader
.
fsr_lxdh
}
</fsr_lxdh></packageHead><fingerprintPackage><descriptiveMsg><collectingReasonSet><cjxxyydm>
${
this
.
descriptiveMsg
.
cjxxyydm
}
</cjxxyydm></collectingReasonSet><ysxt_asjxgrybh>
${
this
.
descriptiveMsg
.
ysxt_asjxgrybh
}
</ysxt_asjxgrybh><jzrybh>
${
this
.
descriptiveMsg
.
jzrybh
}
</jzrybh><asjxgrybh>
${
this
.
descriptiveMsg
.
asjxgrybh
}
</asjxgrybh><zzhwkbh>
${
this
.
descriptiveMsg
.
zzhwkbh
}
</zzhwkbh><hjdz_xzqhdm>
${
this
.
descriptiveMsg
.
hjdz_xzqhdm
}
</hjdz_xzqhdm><hjdz_dzmc>
${
this
.
descriptiveMsg
.
hjdz_dzmc
}
</hjdz_dzmc><xzz_xzqhdm>
${
this
.
descriptiveMsg
.
xzz_xzqhdm
}
</xzz_xzqhdm><xzz_dzmc>
${
this
.
descriptiveMsg
.
xzz_dzmc
}
</xzz_dzmc><xm>
${
this
.
descriptiveMsg
.
xm
}
</xm><bmch>
${
this
.
descriptiveMsg
.
bmch
}
</bmch><xbdm>
${
this
.
descriptiveMsg
.
xbdm
}
</xbdm><csrq>
${
this
.
descriptiveMsg
.
csrq
}
</csrq><gjdm>
${
this
.
descriptiveMsg
.
gjdm
}
</gjdm><mzdm>
${
this
.
descriptiveMsg
.
mzdm
}
</mzdm><cyzjdm>
${
this
.
descriptiveMsg
.
cyzjdm
}
</cyzjdm><zjhm>
${
this
.
descriptiveMsg
.
zjhm
}
</zjhm><bz>
${
this
.
descriptiveMsg
.
bz
}
</bz></descriptiveMsg><collectInfoMsg><zwbdxtlxms>
${
this
.
collectInfoMsg
.
zwbdxtlxms
}
</zwbdxtlxms><nydw_gajgjgdm>
${
this
.
collectInfoMsg
.
nydw_gajgjgdm
}
</nydw_gajgjgdm><nydw_gajgmc>
${
this
.
collectInfoMsg
.
nydw_gajgmc
}
</nydw_gajgmc><nyry_xm>
${
this
.
collectInfoMsg
.
nyry_xm
}
</nyry_xm><nyry_gmsfhm>
${
this
.
collectInfoMsg
.
nyry_gmsfhm
}
</nyry_gmsfhm><nyry_lxdh>
${
this
.
collectInfoMsg
.
nyry_lxdh
}
</nyry_lxdh><nysj>
${
this
.
collectInfoMsg
.
nysj
}
</nysj></collectInfoMsg><fingers>
${
self
.
str
}
</fingers></fingerprintPackage></package>`
}
//
//
导出文件到本地
//
let filenameexport = self.$route.params.rybh
//
this.exportRaw(`${filenameexport}.fptx`, this.xmlStr)
//
NProgress.done();
// 导出文件到本地
let
filenameexport
=
self
.
$route
.
params
.
rybh
this
.
exportRaw
(
`
${
filenameexport
}
.fptx`
,
this
.
xmlStr
)
NProgress
.
done
();
let
fingerImageMsgStr
=
[]
let
fingerMd5
=
this
.
checkMd5
(
this
.
xmlStr
)
...
...
@@ -8528,9 +8536,9 @@ export default {
}
},
1000
);
// 导出文件到本地
let
filenameexport
=
self
.
$route
.
params
.
rybh
self
.
exportRaw
(
`
${
filenameexport
}
.fptx`
,
self
.
xmlStr
)
//
//
导出文件到本地
//
let filenameexport = self.$route.params.rybh
//
self.exportRaw(`${filenameexport}.fptx`, self.xmlStr)
var
params
=
new
URLSearchParams
();
params
.
append
(
'rybh'
,
self
.
rybh
);
...
...
@@ -8638,8 +8646,8 @@ export default {
}
}).
then
(
res
=>
{
// 导出文件到本地
let
filenameexport
=
self
.
$route
.
params
.
rybh
self
.
exportRaw
(
`
${
filenameexport
}
.fptx`
,
self
.
xmlStr
)
//
let filenameexport = self.$route.params.rybh
//
self.exportRaw(`${filenameexport}.fptx`, self.xmlStr)
// console.log(res);
// 上传完成
// self.percentage = 100
...
...
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