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
44df25cf
Commit
44df25cf
authored
Dec 27, 2021
by
米嘉伟
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev_zwpt' of
http://47.92.108.28/changchao/founder_vue
into dev_zwpt
parents
c0908581
76d062d4
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
116 additions
and
237 deletions
+116
-237
src/components/ImageEd.scss
+2
-2
src/components/ImageEd.vue
+7
-3
src/views/Editor/modules/imageEd.vue
+4
-1
src/views/Editor/modules/imageEdAJ.vue
+12
-1
src/views/bzxxgl/bzxxsh.vue
+10
-10
src/views/bzxxgl/fhxxLL.vue
+11
-3
src/views/bzxxgl/fhxxLT.vue
+21
-5
src/views/bzxxgl/fhxxTL.vue
+21
-5
src/views/cxyrd/modules/LTSrc.vue
+24
-10
src/views/login/modules/AccountsLogin.vue
+1
-0
src/views/zzwcj/fingerprint.vue
+0
-194
vue.config.js
+3
-3
No files found.
src/components/ImageEd.scss
View file @
44df25cf
...
...
@@ -1537,7 +1537,7 @@ div {
background
:
transparent
;
overflow
:
hidden
;
transform-origin
:
center
center
;
border
:
2px
solid
green
;
//
border: 2px solid green;
.pointer
{
position
:
absolute
;
right
:
0
;
...
...
@@ -1758,7 +1758,7 @@ div {
background
:
transparent
;
overflow
:
hidden
;
transform-origin
:
center
center
;
border
:
2px
solid
green
;
//
border: 2px solid green;
.pointer
{
position
:
absolute
;
right
:
0
;
...
...
src/components/ImageEd.vue
View file @
44df25cf
<!--
* @Author: your name
* @Date: 2021-09-09 09:28:46
* @LastEditTime: 2021-12-2
4 17:15:41
* @LastEditTime: 2021-12-2
6 18:57:44
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue
-->
...
...
@@ -343,7 +343,7 @@
</div>
<div
class=
"tzdDrawing_2_source"
></div>
<div
class=
"tzdDrawing_source"
>
<
div
class=
"pointer"
></div
>
<
!--
<div
class=
"pointer"
></div>
--
>
</div>
</div>
<div
class=
"edit"
id=
"sourceEdit"
v-show=
"!isFHxx"
@
click=
"sourceChange"
v-if=
"roleArr.includes('C-1-9')"
>
编辑
</div>
...
...
@@ -385,7 +385,7 @@
</div>
<div
class=
"tzdDrawing_2_target"
></div>
<div
class=
"tzdDrawing_target"
>
<
div
class=
"pointer"
></div
>
<
!--
<div
class=
"pointer"
></div>
--
>
</div>
</div>
<div
class=
"edit"
id=
"targetEdit"
v-show=
"!isFHxx"
@
click=
"targetChange"
v-if=
"roleArr.includes('C-1-9')"
>
编辑
</div>
...
...
@@ -4742,6 +4742,8 @@ export default {
$
(
".el-checkbox"
).
css
(
'opacity'
,
'1'
)
});
}
else
if
(
this
.
$route
.
name
==
'fhxxLT'
||
this
.
$route
.
name
==
'fhxxTL'
||
this
.
$route
.
name
==
'fhxxLL'
)
{
$
(
".fhxx-top"
).
css
(
'box-shadow'
,
'none'
)
$
(
".el-textarea__inner"
).
css
(
'box-shadow'
,
'none'
)
html2canvas
(
document
.
querySelector
(
".fhxxLT"
),
{
...
...
@@ -4764,6 +4766,8 @@ export default {
a
.
href
=
canvas
.
toDataURL
(
"image/jpeg"
);
a
.
download
=
"screenshot"
;
a
.
click
();
$
(
".fhxx-top"
).
css
(
'box-shadow'
,
'0px 1px 2px 0px rgba(5, 95, 231, 0.4),0px -1px 2px 0px rgba(5, 95, 231, 0.19);'
)
$
(
".el-textarea__inner"
).
css
(
'box-shadow'
,
'0px 1px 2px 0px rgba(5, 95, 231, 0.18);'
)
});
}
},
...
...
src/views/Editor/modules/imageEd.vue
View file @
44df25cf
<!--
* @Author: your name
* @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-12-2
3 11:43:37
* @LastEditTime: 2021-12-2
5 16:12:58
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
...
...
@@ -1737,10 +1737,13 @@ export default {
);
//邻边
let
heng
=
Math
.
abs
(
this
.
originX
-
e
.
clientX
);
console
.
log
(
"heng:-------"
,
heng
);
//cos
let
cos
=
heng
/
distance
;
console
.
log
(
"cos:--------"
,
cos
);
//角度
self
.
deg
=
parseInt
((
Math
.
acos
(
cos
)
*
180
)
/
Math
.
PI
);
console
.
log
(
"deg:--------"
,
self
.
deg
);
// 根据象限判断
if
(
e
.
clientX
>=
this
.
originX
&&
e
.
clientY
<=
this
.
originY
)
{
// console.log(self.deg);
...
...
src/views/Editor/modules/imageEdAJ.vue
View file @
44df25cf
<!--
* @Author: your name
* @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-12-2
2 15:03:21
* @LastEditTime: 2021-12-2
5 14:26:32
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
...
...
@@ -1897,6 +1897,17 @@ export default {
self
.
tzdDrawing_left
=
0
self
.
tzdDrawing_top
=
0
self
.
startPlace
=
0
// 遮罩层
self
.
isHideImageExport
=
false
// 隐藏手纹框
self
.
isSwk_flag
=
false
;
self
.
isTpdr_flag
=
false
// 缩放改为1
self
.
bb
=
1
;
self
.
frame_max_bb
=
1
self
.
frame_min_bb
=
1
// 裁剪之后,小框框就不拖拽背景图,拖着大框移动
self
.
isCrop
=
true
;
// 初始化缩略图
self
.
isShowSourcePrivew
=
false
...
...
src/views/bzxxgl/bzxxsh.vue
View file @
44df25cf
...
...
@@ -348,16 +348,16 @@ export default {
TAG
:
'比中信息审核-'
,
ruleForm
:
initRuleFrom
,
YTMH
:
{
width
:
'2
2
0'
,
prop
:
'ytmh'
,
label
:
'源条码号'
,
isShow
:
true
},
MBTMH
:
{
width
:
'2
20
'
,
prop
:
'mbtmh'
,
label
:
'目标条码号'
,
isShow
:
true
},
YZW
:
{
width
:
'1
25
'
,
prop
:
'yzw'
,
label
:
'源指位/序号'
,
isShow
:
true
},
MBZW
:
{
width
:
'1
25
'
,
prop
:
'mbzw'
,
label
:
'目标指位/序号'
,
isShow
:
true
},
SBDW
:
{
width
:
'1
60
'
,
prop
:
'sbdwGajgjgdmStr'
,
label
:
'上报单位'
,
isShow
:
true
},
SBSJ
:
{
width
:
'16
0
'
,
prop
:
'sbsj'
,
label
:
'上报时间'
,
isShow
:
true
},
SHR
:
{
width
:
'
120
'
,
prop
:
'shrXm'
,
label
:
'审核人'
,
isShow
:
true
},
SHSJ
:
{
width
:
'1
20
'
,
prop
:
'shsj'
,
label
:
'审核时间'
,
isShow
:
true
},
ZGZT
:
{
width
:
'1
20
'
,
prop
:
'sfjrzg'
,
label
:
'战果状态'
,
isShow
:
true
},
SHZT
:
{
width
:
'1
2
0'
,
prop
:
'shzt'
,
label
:
'审核状态'
,
isShow
:
true
},
YTMH
:
{
width
:
'2
1
0'
,
prop
:
'ytmh'
,
label
:
'源条码号'
,
isShow
:
true
},
MBTMH
:
{
width
:
'2
07
'
,
prop
:
'mbtmh'
,
label
:
'目标条码号'
,
isShow
:
true
},
YZW
:
{
width
:
'1
08
'
,
prop
:
'yzw'
,
label
:
'源指位/序号'
,
isShow
:
true
},
MBZW
:
{
width
:
'1
12
'
,
prop
:
'mbzw'
,
label
:
'目标指位/序号'
,
isShow
:
true
},
SBDW
:
{
width
:
'1
72
'
,
prop
:
'sbdwGajgjgdmStr'
,
label
:
'上报单位'
,
isShow
:
true
},
SBSJ
:
{
width
:
'16
6
'
,
prop
:
'sbsj'
,
label
:
'上报时间'
,
isShow
:
true
},
SHR
:
{
width
:
'
96
'
,
prop
:
'shrXm'
,
label
:
'审核人'
,
isShow
:
true
},
SHSJ
:
{
width
:
'1
15
'
,
prop
:
'shsj'
,
label
:
'审核时间'
,
isShow
:
true
},
ZGZT
:
{
width
:
'1
14
'
,
prop
:
'sfjrzg'
,
label
:
'战果状态'
,
isShow
:
true
},
SHZT
:
{
width
:
'1
3
0'
,
prop
:
'shzt'
,
label
:
'审核状态'
,
isShow
:
true
},
queryTypeBtns
:
[
{
value
:
2
,
name
:
'正查'
},
...
...
src/views/bzxxgl/fhxxLL.vue
View file @
44df25cf
<!--
* @Author: your name
* @Date: 2021-12-03 15:35:26
* @LastEditTime: 2021-12-2
4 17:20:45
* @LastEditTime: 2021-12-2
5 13:33:18
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue
...
...
@@ -332,7 +332,11 @@ export default {
}).
then
(
res
=>
{
console
.
log
(
res
)
if
(
res
.
data
.
code
===
0
)
{
self
.
$bus
.
emit
(
'changImageEdit'
,
res
.
data
.
ret
.
image
)
if
(
res
.
data
.
ret
.
image
!=
null
)
{
self
.
$bus
.
emit
(
'changImageEdit'
,
res
.
data
.
ret
.
image
)
}
else
{
self
.
$bus
.
emit
(
'changImageEdit'
,
'xxx'
)
}
}
else
{
self
.
$bus
.
emit
(
'changImageEdit'
,
'xxx'
)
}
...
...
@@ -347,7 +351,11 @@ export default {
}).
then
(
res
=>
{
console
.
log
(
res
)
if
(
res
.
data
.
code
===
0
)
{
self
.
$bus
.
emit
(
'changImageEditTarget'
,
res
.
data
.
ret
.
image
)
if
(
res
.
data
.
ret
.
image
!=
null
)
{
self
.
$bus
.
emit
(
'changImageEditTarget'
,
res
.
data
.
ret
.
image
)
}
else
{
self
.
$bus
.
emit
(
'changImageEditTarget'
,
'xxx'
)
}
}
else
{
self
.
$bus
.
emit
(
'changImageEditTarget'
,
'xxx'
)
}
...
...
src/views/bzxxgl/fhxxLT.vue
View file @
44df25cf
<!--
* @Author: your name
* @Date: 2021-12-03 15:35:26
* @LastEditTime: 2021-12-2
4 17:20:49
* @LastEditTime: 2021-12-2
5 13:32:35
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue
...
...
@@ -325,7 +325,11 @@ export default {
}
}).
then
(
res
=>
{
if
(
res
.
data
.
code
===
0
)
{
self
.
$bus
.
emit
(
'changImageEditTarget'
,
res
.
data
.
ret
.
image
)
if
(
res
.
data
.
ret
.
image
!=
null
)
{
self
.
$bus
.
emit
(
'changImageEditTarget'
,
res
.
data
.
ret
.
image
)
}
else
{
self
.
$bus
.
emit
(
'changImageEditTarget'
,
'xxx'
)
}
}
else
{
self
.
$bus
.
emit
(
'changImageEditTarget'
,
'xxx'
)
}
...
...
@@ -341,7 +345,11 @@ export default {
}
}).
then
(
res
=>
{
if
(
res
.
data
.
code
===
0
)
{
self
.
$bus
.
emit
(
'changImageEditTarget'
,
res
.
data
.
ret
.
image
)
if
(
res
.
data
.
ret
.
image
!=
null
)
{
self
.
$bus
.
emit
(
'changImageEditTarget'
,
res
.
data
.
ret
.
image
)
}
else
{
self
.
$bus
.
emit
(
'changImageEditTarget'
,
'xxx'
)
}
}
else
{
self
.
$bus
.
emit
(
'changImageEditTarget'
,
'xxx'
)
}
...
...
@@ -357,7 +365,11 @@ export default {
}
}).
then
(
res
=>
{
if
(
res
.
data
.
code
===
0
)
{
self
.
$bus
.
emit
(
'changImageEditTarget'
,
res
.
data
.
ret
.
image
)
if
(
res
.
data
.
ret
.
image
!=
null
)
{
self
.
$bus
.
emit
(
'changImageEditTarget'
,
res
.
data
.
ret
.
image
)
}
else
{
self
.
$bus
.
emit
(
'changImageEditTarget'
,
'xxx'
)
}
}
else
{
self
.
$bus
.
emit
(
'changImageEditTarget'
,
'xxx'
)
}
...
...
@@ -383,7 +395,11 @@ export default {
}).
then
(
res
=>
{
console
.
log
(
res
)
if
(
res
.
data
.
code
===
0
)
{
self
.
$bus
.
emit
(
'changImageEdit'
,
res
.
data
.
ret
.
image
)
if
(
res
.
data
.
ret
.
image
!=
null
)
{
self
.
$bus
.
emit
(
'changImageEdit'
,
res
.
data
.
ret
.
image
)
}
else
{
self
.
$bus
.
emit
(
'changImageEdit'
,
'xxx'
)
}
}
else
{
self
.
$bus
.
emit
(
'changImageEdit'
,
'xxx'
)
}
...
...
src/views/bzxxgl/fhxxTL.vue
View file @
44df25cf
<!--
* @Author: your name
* @Date: 2021-12-03 15:35:26
* @LastEditTime: 2021-12-2
4 17:20:58
* @LastEditTime: 2021-12-2
5 13:34:35
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue
...
...
@@ -344,7 +344,11 @@ export default {
}
}).
then
(
res
=>
{
if
(
res
.
data
.
code
===
0
)
{
self
.
$bus
.
emit
(
'changImageEdit'
,
res
.
data
.
ret
.
image
)
if
(
res
.
data
.
ret
.
image
!=
null
)
{
self
.
$bus
.
emit
(
'changImageEdit'
,
res
.
data
.
ret
.
image
)
}
else
{
self
.
$bus
.
emit
(
'changImageEdit'
,
'xxx'
)
}
}
else
{
self
.
$bus
.
emit
(
'changImageEdit'
,
'xxx'
)
}
...
...
@@ -360,7 +364,11 @@ export default {
}
}).
then
(
res
=>
{
if
(
res
.
data
.
code
===
0
)
{
self
.
$bus
.
emit
(
'changImageEdit'
,
res
.
data
.
ret
.
image
)
if
(
res
.
data
.
ret
.
image
!=
null
)
{
self
.
$bus
.
emit
(
'changImageEdit'
,
res
.
data
.
ret
.
image
)
}
else
{
self
.
$bus
.
emit
(
'changImageEdit'
,
'xxx'
)
}
}
else
{
self
.
$bus
.
emit
(
'changImageEdit'
,
'xxx'
)
}
...
...
@@ -376,7 +384,11 @@ export default {
}
}).
then
(
res
=>
{
if
(
res
.
data
.
code
===
0
)
{
self
.
$bus
.
emit
(
'changImageEdit'
,
res
.
data
.
ret
.
image
)
if
(
res
.
data
.
ret
.
image
!=
null
)
{
self
.
$bus
.
emit
(
'changImageEdit'
,
res
.
data
.
ret
.
image
)
}
else
{
self
.
$bus
.
emit
(
'changImageEdit'
,
'xxx'
)
}
}
else
{
self
.
$bus
.
emit
(
'changImageEdit'
,
'xxx'
)
}
...
...
@@ -399,7 +411,11 @@ export default {
}).
then
(
res
=>
{
console
.
log
(
res
)
if
(
res
.
data
.
code
===
0
)
{
self
.
$bus
.
emit
(
'changImageEditTarget'
,
res
.
data
.
ret
.
image
)
if
(
res
.
data
.
ret
.
image
!=
null
)
{
self
.
$bus
.
emit
(
'changImageEditTarget'
,
res
.
data
.
ret
.
image
)
}
else
{
self
.
$bus
.
emit
(
'changImageEditTarget'
,
'xxx'
)
}
}
else
{
self
.
$bus
.
emit
(
'changImageEditTarget'
,
'xxx'
)
}
...
...
src/views/cxyrd/modules/LTSrc.vue
View file @
44df25cf
...
...
@@ -59,7 +59,9 @@
<!-- {{ Number(index + 1) < 9 ? ("0" + Number(index + 1)) : Number(index + 1) }} -->
{{ Number(item.seq)
<
9 ? ("0" + Number(item.seq)) : Number(item.seq) }}
</div>
<img
:src=
"'data:image/jpeg;base64,'+item.image"
/>
<div
class=
"zw_img"
>
<img
:src=
"'data:image/jpeg;base64,'+item.image"
/>
</div>
<div
class=
"finger-tips"
>
<!-- 认定完成 -->
<div
class=
"affirmstatus1"
v-if=
"item.affirmstatus==1"
>
...
...
@@ -93,7 +95,9 @@
<div
class=
"finger_print_number"
:class=
"{ finger_print_number_active: item.seq === isActive, fingerLookNum: item.clickLog==1, fingerRDNum: item.affirmstatus==1, fingerBZNum:item.affirmstatus==2, fingerRBNum:item.affirmstatus==3 }"
>
{{ item.seq }}
</div>
<img
:src=
"'data:image/jpeg;base64,'+item.image"
/>
<div
class=
"zw_img"
>
<img
:src=
"'data:image/jpeg;base64,'+item.image"
/>
</div>
<div
class=
"finger-tips"
>
<!-- 认定完成 -->
<div
class=
"affirmstatus1"
v-if=
"item.affirmstatus==1"
>
...
...
@@ -772,10 +776,15 @@ const datas = [
border
:
1px
solid
#999
;
}
img
{
position
:
absolute
;
top
:
0
;
left
:
0
;
.zw_img
{
width
:
100%
;
height
:
100%
;
display
:
flex
;
justify-content
:
center
;
margin-left
:
0
;
img
{
object-fit
:
contain
;
}
}
.finger_print_number
{
...
...
@@ -937,10 +946,15 @@ const datas = [
border
:
1px
solid
#999
;
}
img
{
position
:
absolute
;
top
:
0
;
left
:
0
;
.zw_img
{
width
:
100%
;
height
:
100%
;
display
:
flex
;
justify-content
:
center
;
margin-left
:
0
;
img
{
object-fit
:
contain
;
}
}
.finger_print_number
{
...
...
src/views/login/modules/AccountsLogin.vue
View file @
44df25cf
...
...
@@ -121,6 +121,7 @@ export default {
/
deep
/
.el-input__inner
{
cursor
:
text
;
/* height: 100%; */
width
:
75%
;
font-size
:
16px
;
color
:
#ffffff
;
...
...
src/views/zzwcj/fingerprint.vue
View file @
44df25cf
...
...
@@ -7989,9 +7989,6 @@ export default {
// ib
this
.
smallLackFinger
()
}
// //console.log('缺指');
// this.moqiLackFinger()
// this.smallLackFinger()
},
/**
* @name: 完成采集
...
...
@@ -8040,10 +8037,6 @@ export default {
this
.
fingersLeftNo
.
push
(
item
)
}
})
//console.log(this.fingersRight);
// //console.log(this.fingersLeftNo);
// //console.log(this.fingersRightNo);
//console.log(this.flag);
if
(
this
.
fingersLeftNo
.
length
>
0
||
this
.
fingersRightNo
.
length
>
0
)
{
this
.
flag
=
false
}
else
{
...
...
@@ -8068,60 +8061,6 @@ export default {
NProgress
.
start
();
// 生成时间
self
.
packageHeader
.
createTime
=
moment
(
new
Date
()).
format
(
"YYYYMMDDHHmmss"
)
//console.log(self.packageHeader.createTime)
// 做上传处理
// 滚动
/*
for (const item of this.fingersLeft) {
if (item.imgSrcR != '') {
let img = item.imgSrcR.replace(/^data:image\/\w+;base64,/, "");
// let img = item.imgSrcR
let md5str = this.checkMd5(img)
let res = await self.dealImg(img, md5str)
this.fingerPic.push({ zwzwdm: (Number(item.code) > 9) ? Number(item.code) : ('0' + Number(item.code)), zw_txsj: res, zw_txzl: item.scoreR })
self.finishFingers.push(item.nameR)
} else {
self.errorFingers.push(item.nameR)
}
}
for (const item of this.fingersRight) {
if (item.imgSrcR != '') {
let img = item.imgSrcR.replace(/^data:image\/\w+;base64,/, "");
// let img = item.imgSrcR
let md5str = this.checkMd5(img)
let res = await self.dealImg(img, md5str)
this.fingerPic.push({ zwzwdm: (Number(item.code) > 9) ? Number(item.code) : ('0' + Number(item.code)), zw_txsj: res, zw_txzl: item.scoreR })
self.finishFingers.push(item.nameR)
} else {
self.errorFingers.push(item.nameR)
}
}
// 平面
for (const item of this.fingersLeft) {
if (item.imgSrcL != '') {
let img = item.imgSrcL.replace(/^data:image\/\w+;base64,/, "");
// let img = item.imgSrcL
let md5str = this.checkMd5(img)
let res = await self.dealImg(img, md5str)
this.fingerPic.push({ zwzwdm: Number(item.code) + 10, zw_txsj: res, zw_txzl: item.scoreL })
self.finishFingers.push(item.nameL)
} else {
self.errorFingers.push(item.nameL)
}
}
for (const item of this.fingersRight) {
if (item.imgSrcL != '') {
let img = item.imgSrcL.replace(/^data:image\/\w+;base64,/, "");
// let img = item.imgSrcL
let md5str = this.checkMd5(img)
let res = await self.dealImg(img, md5str)
this.fingerPic.push({ zwzwdm: Number(item.code) + 10, zw_txsj: res, zw_txzl: item.scoreL })
self.finishFingers.push(item.nameL)
} else {
self.errorFingers.push(item.nameL)
}
}*/
//console.log(this.fingerPic);
// 指纹数据
this
.
fingerPic
.
map
((
item
)
=>
{
// //console.log(item);
...
...
@@ -8963,7 +8902,6 @@ export default {
* @return {*}
*/
setRepeat
()
{
// this.repeatClick = true
let
self
=
this
self
.
confirmRepeatGather
=
true
self
.
repeatVisible
=
false
...
...
@@ -8974,11 +8912,6 @@ export default {
// 平面
this
.
SmallAutoLuL
(
this
.
fingersLeft
,
this
.
fingersRight
,
++
this
.
RepeatGatherIndex
,
2
,
-
1
)
}
// this.setRepeatMethod = new Promise((resolve, reject) => {
// self.confirmRepeatGather = true
// self.repeatVisible = false
// resolve(true)
// })
},
/**
* @description: 重复--重新采集当前的
...
...
@@ -9024,133 +8957,6 @@ export default {
}
this
.
SmallAutoLuL
(
this
.
fingersLeft
,
this
.
fingersRight
,
this
.
RepeatGatherIndex
,
2
,
-
1
)
}
// this.cancelRepeatMethod = new Promise((resolve, reject) => {
// self.confirmRepeatGather = false
// self.repeatVisible = false
// resolve(false)
// })
},
async
addPic
()
{
// this.dealImg();
let
self
=
this
let
str
=
''
/*
// 上传,后端保存图片
let plainMd5 = this.checkMd5(str)
//console.log(plainMd5)
let paramsL = new URLSearchParams()
paramsL.append('rybh', this.rybh);
paramsL.append('md5str', plainMd5);
paramsL.append('filename', "1.bmp,11.bmp");
paramsL.append('rollimgstr', null);//这里可为null
paramsL.append('plaimimgstr', str);//这里可为null
let resL = await self.$axios({
url: '/apiDelImg/saveFingerImg',
method: 'post',
data: paramsL
});
//console.log(resL);
*/
// 后台处理图片,获得处理后的base64
let
md5str
=
this
.
checkMd5
(
str
)
var
res
=
await
self
.
dealImg
(
str
,
md5str
)
/*
// 上传fptx文件
this.fingerPic = [
{
zwzwdm: 11,
zw_txsj: res.data
}
]
this.fingerPic.forEach((item) => {
let fingerIndex = (Number(item.zwzwdm) > 9) ? Number(item.zwzwdm) : ('0' + Number(item.zwzwdm))
self.str += `<fingerMsg><zwzwdm>${fingerIndex}</zwzwdm><zzhwtztqfsdm>${this.fingerMsg.zzhwtztqfsdm}</zzhwtztqfsdm><zzhwqsqkdm>${this.fingerMsg.zzhwqsqkdm}</zzhwqsqkdm><zwwxzfl_zwwxdm>${this.fingerMsg.zwwxzfl_zwwxdm}</zwwxzfl_zwwxdm><zwwxffl_zwwxdm>${this.fingerMsg.zwwxffl_zwwxdm}</zwwxffl_zwwxdm><zwfx_tzfx>${this.fingerMsg.zwfx_tzfx}</zwfx_tzfx><zwfx_tzfxfw>${this.fingerMsg.zwfx_tzfxfw}</zwfx_tzfxfw><zwzxd_tzxzb>${this.fingerMsg.zwzxd_tzxzb}</zwzxd_tzxzb><zwzxd_tzyzb>${this.fingerMsg.zwzxd_tzyzb}</zwzxd_tzyzb><zwzxd_tzzbfw>${this.fingerMsg.zwzxd_tzzbfw}</zwzxd_tzzbfw><zwzxd_tzfx>${this.fingerMsg.zwzxd_tzfx}</zwzxd_tzfx><zwzxd_tzfxfw>${this.fingerMsg.zwzxd_tzfxfw}</zwzxd_tzfxfw><zwzxd_tzkkd>${this.fingerMsg.zwzxd_tzkkd}</zwzxd_tzkkd><zwfzx_tzxzb>${this.fingerMsg.zwfzx_tzxzb}</zwfzx_tzxzb><zwfzx_tzyzb>${this.fingerMsg.zwfzx_tzyzb}</zwfzx_tzyzb><zwfzx_tzzbfw>${this.fingerMsg.zwfzx_tzzbfw}</zwfzx_tzzbfw><zwfzx_tzfx>${this.fingerMsg.zwfzx_tzfx}</zwfzx_tzfx><zwfzx_tzfxfw>${this.fingerMsg.zwfzx_tzfxfw}</zwfzx_tzfxfw><zwfzx_tzkkd>${this.fingerMsg.zwfzx_tzkkd}</zwfzx_tzkkd><zwzsj_tzxzb>${this.fingerMsg.zwzsj_tzxzb}</zwzsj_tzxzb><zwzsj_tzyzb>${this.fingerMsg.zwzsj_tzyzb}</zwzsj_tzyzb><zwzsj_tzzbfw>${this.fingerMsg.zwzsj_tzzbfw}</zwzsj_tzzbfw><zwzsj_tzfx>${this.fingerMsg.zwzsj_tzfx}</zwzsj_tzfx><zwzsj_tzfxfw>${this.fingerMsg.zwzsj_tzfxfw}</zwzsj_tzfxfw><zwzsj_tzkkd>${this.fingerMsg.zwzsj_tzkkd}</zwzsj_tzkkd><zwysj_tzxzb>${this.fingerMsg.zwysj_tzxzb}</zwysj_tzxzb><zwysj_tzyzb>${this.fingerMsg.zwysj_tzyzb}</zwysj_tzyzb><zwysj_tzzbfw>${this.fingerMsg.zwysj_tzzbfw}</zwysj_tzzbfw><zwysj_tzfx>${this.fingerMsg.zwysj_tzfx}</zwysj_tzfx><zwysj_tzfxfw>${this.fingerMsg.zwysj_tzfxfw}</zwysj_tzfxfw><zwysj_tzkkd>${this.fingerMsg.zwysj_tzkkd}</zwysj_tzkkd><minutiaSet><minutia><zwtzd_tzxzb>${this.fingerMsg.zwtzd_tzxzb}</zwtzd_tzxzb><zwtzd_tzyzb>${this.fingerMsg.zwtzd_tzyzb}</zwtzd_tzyzb><zwtzd_tzfx>${this.fingerMsg.zwtzd_tzfx}</zwtzd_tzfx><zwtzd_tzzl>${this.fingerMsg.zwtzd_tzzl}</zwtzd_tzzl></minutia></minutiaSet><zw_zdyxx>${this.fingerMsg.zw_zdyxx}</zw_zdyxx><zw_txspfxcd>${this.fingerMsg.zw_txspfxcd}</zw_txspfxcd><zw_txczfxcd>${this.fingerMsg.zw_txczfxcd}</zw_txczfxcd><zw_txfbl>${this.fingerMsg.zw_txfbl}</zw_txfbl><zw_txysffms>${this.fingerMsg.zw_txysffms}</zw_txysffms><zw_txzl>${this.fingerMsg.zw_txzl}</zw_txzl><zw_txsj>${item.zw_txsj}</zw_txsj></fingerMsg>`
})
// 处理文件
this.xmlStr =
`<?xml version="1.0" encoding="UTF-8"?>
<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>`
// 导出文件到本地
this.exportRaw('finger.fptx', this.xmlStr)
NProgress.done();
let fingerImageMsgStr = []
let fingerMd5 = this.checkMd5(this.xmlStr)
this.fingerPic.forEach(item => {
fingerImageMsgStr.push({
zwzwdm: item.zwzwdm,
zzhwtztqfsdm: self.fingerMsg.zzhwtztqfsdm,
zzhwqsqkdm: self.fingerMsg.zzhwqsqkdm,
zwwxzfl_zwwxdm: self.fingerMsg.zwwxzfl_zwwxdm,
zwwxffl_zwwxdm: self.fingerMsg.zwwxffl_zwwxdm,
zwfx_tzfx: self.fingerMsg.zwfx_tzfx,
zwfx_tzfxfw: self.fingerMsg.zwfx_tzfxfw,
zwzxd_tzxzb: self.fingerMsg.zwzxd_tzxzb,
zwzxd_tzyzb: self.fingerMsg.zwzxd_tzyzb,
zwzxd_tzzbfw: self.fingerMsg.zwzxd_tzzbfw,
zwzxd_tzfx: self.fingerMsg.zwzxd_tzfx,
zwzxd_tzfxfw: self.fingerMsg.zwzxd_tzfxfw,
zwzxd_tzkkd: self.fingerMsg.zwzxd_tzkkd,
zwfzx_tzxzb: self.fingerMsg.zwfzx_tzxzb,
zwfzx_tzyzb: self.fingerMsg.zwfzx_tzyzb,
zwfzx_tzzbfw: self.fingerMsg.zwfzx_tzzbfw,
zwfzx_tzfx: self.fingerMsg.zwfzx_tzfx,
zwfzx_tzfxfw: self.fingerMsg.zwfzx_tzfxfw,
zwfzx_tzkkd: self.fingerMsg.zwfzx_tzkkd,
zwzsj_tzxzb: self.fingerMsg.zwzsj_tzxzb,
zwzsj_tzyzb: self.fingerMsg.zwzsj_tzyzb,
zwzsj_tzzbfw: self.fingerMsg.zwzsj_tzzbfw,
zwzsj_tzfx: self.fingerMsg.zwzsj_tzfx,
zwzsj_tzfxfw: self.fingerMsg.zwzsj_tzfxfw,
zwzsj_tzkkd: self.fingerMsg.zwzsj_tzkkd,
zwysj_tzxzb: self.fingerMsg.zwysj_tzxzb,
zwysj_tzyzb: self.fingerMsg.zwysj_tzyzb,
zwysj_tzzbfw: self.fingerMsg.zwysj_tzzbfw,
zwysj_tzfx: self.fingerMsg.zwysj_tzfx,
zwysj_tzfxfw: self.fingerMsg.zwysj_tzfxfw,
zwysj_tzkkd: self.fingerMsg.zwysj_tzkkd,
minutiaSet: '',
zw_zdyxx: self.fingerMsg.zw_zdyxx,
zw_txspfxcd: self.fingerMsg.zw_txspfxcd,
zw_txczfxcd: self.fingerMsg.zw_txczfxcd,
zw_txfbl: self.fingerMsg.zw_txfbl,
zw_txysffms: self.fingerMsg.zw_txysffms,
zw_txzl: self.fingerMsg.zw_txzl,
zw_txsj: '',
zwtzd_tzxzb: self.fingerMsg.zwtzd_tzxzb,
zwtzd_tzyzb: self.fingerMsg.zwtzd_tzyzb,
zwtzd_tzfx: self.fingerMsg.zwtzd_tzfx,
zwtzd_tzzl: self.fingerMsg.zwtzd_tzzl,
})
})
let fingerInfo = {
packageHeader: this.packageHeader,
collectInfoMsg: this.collectInfoMsg,
descriptiveMsg: this.descriptiveMsg,
fingerImageMsg: fingerImageMsgStr
}
var params = new URLSearchParams();
params.append('rybh', this.rybh);
params.append('fingerInfo', JSON.stringify(fingerInfo));
params.append('md5str', this.checkMd5(JSON.stringify(fingerInfo)));
// params.append('md5str', fingerMd5);
params.append('fptxmd5str', fingerMd5);
let fingerRes = await self.$axios({
url: '/apiDelImg/saveImgXmlFile',
method: 'post',
data: params
})
//console.log(fingerRes);
*/
},
},
watch
:
{
...
...
vue.config.js
View file @
44df25cf
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-25 1
3:19:44
* @LastEditTime: 2021-12-25 1
6:15:21
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
...
...
@@ -110,14 +110,14 @@ module.exports = {
"/api"
:
{
// target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
// target: "http://192.168.128.166:8099/", // 张 认定
target
:
"http://192.168.128.114:8099"
,
// 湖南-马
//
target: "http://192.168.128.114:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王
// target: "http://192.168.128.102:8099", // 湖南-张呈光
// target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
// target: "http://127.0.0.1:8099",
// target: "http://47.92.225.109:5602",
// target: "http://www.meetfood.cn:2390", // 湖南-线上
//
target:"http://zwpt.xzclub.top:9333/",
target
:
"http://zwpt.xzclub.top:9333/"
,
// target: "http://192.168.128.102:8099", // 江
ws
:
true
,
changeOrigin
:
true
,
...
...
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