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
22794b07
Commit
22794b07
authored
Feb 14, 2022
by
张超军
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
复核6个按钮逻辑
parent
e5f61726
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
49 additions
and
15 deletions
+49
-15
src/components/ImageEd.vue
+27
-5
src/netmgr/cxyrd/cxyrd.js
+2
-2
src/views/bzxxgl/fhxxLL.vue
+3
-1
src/views/bzxxgl/fhxxTL.vue
+3
-1
src/views/bzxxgl/scss/fhxxLT.scss
+2
-1
src/views/cxyrd/QueryConfirm.vue
+3
-0
src/views/cxyrd/modules/TTPlam.vue
+6
-1
src/views/rgrd/rgTT.vue
+0
-1
vue.config.js
+3
-3
No files found.
src/components/ImageEd.vue
View file @
22794b07
<!--
<!--
* @Author: your name
* @Author: your name
* @Date: 2021-09-09 09:28:46
* @Date: 2021-09-09 09:28:46
* @LastEditTime: 2022-02-14
15:16:35
* @LastEditTime: 2022-02-14
20:24:34
* @Description: In User Settings Edit
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue
-->
-->
...
@@ -2007,7 +2007,7 @@ export default {
...
@@ -2007,7 +2007,7 @@ export default {
// 事件不能连续重复执行,需要缓存时间
// 事件不能连续重复执行,需要缓存时间
setTimeout
(()
=>
{
setTimeout
(()
=>
{
console
.
log
(
11111
,
-
self
.
startPlaceSource
);
console
.
log
(
11111
,
-
self
.
startPlaceSource
);
imageEditor
.
rotate
(
-
parseInt
(
self
.
startPlaceSourc
e
));
imageEditor
.
rotate
(
-
parseInt
(
imageEditor
.
_graphics
.
getCanvasImage
().
angl
e
));
imageEditor
.
resetZoom
();
imageEditor
.
resetZoom
();
self
.
startPlaceSource
=
0
;
self
.
startPlaceSource
=
0
;
// 旋转角度同样恢复到0
// 旋转角度同样恢复到0
...
@@ -2369,6 +2369,8 @@ export default {
...
@@ -2369,6 +2369,8 @@ export default {
});
});
}
}
// 重置6个按钮的展示
self
.
initFeatures
()
self
.
isShowSourcePrivew
=
false
self
.
isShowSourcePrivew
=
false
self
.
sourceImage
=
sourceImage
;
self
.
sourceImage
=
sourceImage
;
self
.
targetIsDelete
=
false
self
.
targetIsDelete
=
false
...
@@ -2452,6 +2454,8 @@ export default {
...
@@ -2452,6 +2454,8 @@ export default {
});
});
}
}
// 重置6个按钮的展示
self
.
initFeatures
()
self
.
lines2
=
[]
self
.
lines2
=
[]
self
.
path2
=
[]
self
.
path2
=
[]
self
.
circleArr2
=
[]
self
.
circleArr2
=
[]
...
@@ -2684,7 +2688,7 @@ export default {
...
@@ -2684,7 +2688,7 @@ export default {
if
(
bdjqData
.
ret
.
personDestFingerTrait
&&
bdjqData
.
ret
.
personDestFingerTrait
.
fingerMsg
.
fpt5TraitMinutiaSet
&&
bdjqData
.
ret
.
personDestFingerTrait
.
fingerMsg
.
fpt5TraitMinutiaSet
.
minutia
)
{
if
(
bdjqData
.
ret
.
personDestFingerTrait
&&
bdjqData
.
ret
.
personDestFingerTrait
.
fingerMsg
.
fpt5TraitMinutiaSet
&&
bdjqData
.
ret
.
personDestFingerTrait
.
fingerMsg
.
fpt5TraitMinutiaSet
.
minutia
)
{
this
.
bdjqData_target
=
bdjqData
.
ret
.
personDestFingerTrait
.
fingerMsg
.
fpt5TraitMinutiaSet
.
minutia
this
.
bdjqData_target
=
bdjqData
.
ret
.
personDestFingerTrait
.
fingerMsg
.
fpt5TraitMinutiaSet
.
minutia
}
}
if
(
bdjqData
.
ret
.
personDestFingerTrait
&&
bdjqData
.
ret
.
personDestFingerTrait
.
fingerMsg
.
fpt5TraitMinutiaSet
&&
bdjqData
.
ret
.
personDestFingerTrait
.
fingerMsg
)
{
if
(
bdjqData
.
ret
.
personDestFingerTrait
&&
bdjqData
.
ret
.
personDestFingerTrait
.
fingerMsg
.
fpt5TraitMinutiaSet
&&
bdjqData
.
ret
.
personDestFingerTrait
.
fingerMsg
)
{
this
.
pptzxzjd
=
bdjqData
.
ret
.
personDestFingerTrait
.
fingerMsg
.
pptzxzjd
this
.
pptzxzjd
=
bdjqData
.
ret
.
personDestFingerTrait
.
fingerMsg
.
pptzxzjd
}
}
console
.
log
(
this
.
pptzxzjd
);
console
.
log
(
this
.
pptzxzjd
);
...
@@ -3330,6 +3334,24 @@ export default {
...
@@ -3330,6 +3334,24 @@ export default {
}
}
},
},
/**
/**
* @description: 重置6个按钮的展示
* @param {*}
* @return {*}
*/
initFeatures
()
{
this
.
features1
=
true
this
.
xstz
=
true
this
.
features2
=
true
this
.
xsfx
=
true
this
.
features3
=
false
this
.
only_pptz
=
false
this
.
all_pptz
=
false
this
.
features4
=
false
this
.
features5
=
false
this
.
xssz
=
false
this
.
features6
=
false
},
/**
* 显示特征
* 显示特征
*/
*/
features1Change
()
{
features1Change
()
{
...
@@ -3395,8 +3417,8 @@ export default {
...
@@ -3395,8 +3417,8 @@ export default {
// this.features6 = !this.features6
// this.features6 = !this.features6
this
.
features6
=
true
this
.
features6
=
true
let
canvasImage
=
this
.
imageEditor2
.
_graphics
.
getCanvasImage
();
let
canvasImage
=
this
.
imageEditor2
.
_graphics
.
getCanvasImage
();
console
.
log
(
canvasImage
);
//
console.log(canvasImage);
if
(
canvasImage
.
angle
==
this
.
pptzxzjd
)
{
if
(
canvasImage
.
angle
==
this
.
pptzxzjd
)
{
return
;
return
;
}
}
this
.
rotateImage_target
(
this
.
pptzxzjd
);
this
.
rotateImage_target
(
this
.
pptzxzjd
);
...
...
src/netmgr/cxyrd/cxyrd.js
View file @
22794b07
/*
/*
* @Author: your name
* @Author: your name
* @Date: 2022-01-07 17:40:44
* @Date: 2022-01-07 17:40:44
* @LastEditTime: 2022-02-1
0 10:02:30
* @LastEditTime: 2022-02-1
4 17:02:06
* @LastEditors: Please set LastEditors
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\netmgr\cxyrd\cxyrd.js
* @FilePath: \指纹系统\founder_vue\src\netmgr\cxyrd\cxyrd.js
...
@@ -23,7 +23,7 @@ const _path = {
...
@@ -23,7 +23,7 @@ const _path = {
}
}
export
default
{
export
default
{
// 获取案件指纹
// 获取案件指纹
ajfinger
(
_parameter
)
{
A
ajfinger
(
_parameter
)
{
return
fHttp
.
postJson
(
_path
.
ajfinger
,
_parameter
,
HttpConfigUtil
.
closeLoadAndTip
())
return
fHttp
.
postJson
(
_path
.
ajfinger
,
_parameter
,
HttpConfigUtil
.
closeLoadAndTip
())
},
},
// 获取案件掌纹
// 获取案件掌纹
...
...
src/views/bzxxgl/fhxxLL.vue
View file @
22794b07
<!--
<!--
* @Author: your name
* @Author: your name
* @Date: 2021-12-03 15:35:26
* @Date: 2021-12-03 15:35:26
* @LastEditTime: 2022-02-14 1
6:07:23
* @LastEditTime: 2022-02-14 1
7:10:47
* @LastEditors: Please set LastEditors
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue
* @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue
...
@@ -552,6 +552,8 @@ export default {
...
@@ -552,6 +552,8 @@ export default {
this
.
jcbzFlag
=
false
this
.
jcbzFlag
=
false
}
}
this
.
getFingerPic
()
this
.
getFingerPic
()
// 传递目标数据 -- 目标条码号,目标指位号
self
.
$bus
.
emit
(
'target_info'
,
{
barcode_source
:
this
.
allData
.
ysxtAsjbh
,
seq_source
:
this
.
allData
.
xczwxh
,
barcode_target
:
this
.
allData
.
destYsxtAsjbh
,
seq_target
:
this
.
allData
.
bzxxXczwxh
})
}
}
}).
catch
(
err
=>
{
}).
catch
(
err
=>
{
console
.
log
(
err
)
console
.
log
(
err
)
...
...
src/views/bzxxgl/fhxxTL.vue
View file @
22794b07
<!--
<!--
* @Author: your name
* @Author: your name
* @Date: 2021-12-03 15:35:26
* @Date: 2021-12-03 15:35:26
* @LastEditTime: 2022-02-14 1
6:08:52
* @LastEditTime: 2022-02-14 1
7:21:25
* @LastEditors: Please set LastEditors
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue
* @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue
...
@@ -611,6 +611,8 @@ export default {
...
@@ -611,6 +611,8 @@ export default {
sessionStorage
.
setItem
(
'srcbarcode'
,
this
.
allData
.
ysxtAsjbh
)
sessionStorage
.
setItem
(
'srcbarcode'
,
this
.
allData
.
ysxtAsjbh
)
sessionStorage
.
setItem
(
'destseqno'
,
this
.
allData
.
bzxxZwXh
)
sessionStorage
.
setItem
(
'destseqno'
,
this
.
allData
.
bzxxZwXh
)
sessionStorage
.
setItem
(
'destbarcode'
,
this
.
allData
.
ysxtAsjxgrybh
)
sessionStorage
.
setItem
(
'destbarcode'
,
this
.
allData
.
ysxtAsjxgrybh
)
// 传递目标数据 -- 目标条码号,目标指位号
self
.
$bus
.
emit
(
'target_info'
,
{
barcode_source
:
this
.
allData
.
ysxtAsjbh
,
seq_source
:
this
.
allData
.
bzxxXh
,
barcode_target
:
this
.
allData
.
ysxtAsjxgrybh
,
seq_target
:
this
.
allData
.
bzxxZwXh
})
}
}
}).
catch
(
err
=>
{
}).
catch
(
err
=>
{
console
.
log
(
err
)
console
.
log
(
err
)
...
...
src/views/bzxxgl/scss/fhxxLT.scss
View file @
22794b07
...
@@ -381,7 +381,8 @@
...
@@ -381,7 +381,8 @@
.fhxx-btns
{
.fhxx-btns
{
margin-top
:
20px
;
margin-top
:
20px
;
display
:
flex
;
display
:
flex
;
justify-content
:
flex-end
;
// justify-content: flex-end;
justify-content
:
center
;
align-items
:
center
;
align-items
:
center
;
.pass
{
.pass
{
margin-right
:
24px
;
margin-right
:
24px
;
...
...
src/views/cxyrd/QueryConfirm.vue
View file @
22794b07
...
@@ -583,6 +583,9 @@ export default {
...
@@ -583,6 +583,9 @@ export default {
querystates
:
[],
querystates
:
[],
remoteflags
:
[],
remoteflags
:
[],
queryclasss
:
[],
queryclasss
:
[],
// 添加逻辑库
personLogicIds
:
ljkUtil
.
getRyLjkIds
().
personLogicIds
,
caseLogicIds
:
ljkUtil
.
getAjLjkIds
().
caseLogicIds
},
},
},
},
list
:
[],
list
:
[],
...
...
src/views/cxyrd/modules/TTPlam.vue
View file @
22794b07
<!--
<!--
* @Author: your name
* @Author: your name
* @Date: 2021-10-23 17:43:14
* @Date: 2021-10-23 17:43:14
* @LastEditTime: 202
1-12-27 17:03:49
* @LastEditTime: 202
2-02-14 20:11:41
* @LastEditors: Please set LastEditors
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\modules\TTPlam.vue
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\modules\TTPlam.vue
...
@@ -248,9 +248,13 @@ export default {
...
@@ -248,9 +248,13 @@ export default {
let
self
=
this
;
let
self
=
this
;
this
.
loadingIndex
++
;
this
.
loadingIndex
++
;
self
.
$emit
(
"loadingIndex"
,
true
);
self
.
$emit
(
"loadingIndex"
,
true
);
// self.arr.forEach(item => {
// item.list = {}
// })
this
.
$axios
this
.
$axios
.
post
(
"/api/png/palm/barcode"
,
{
barcode
:
val
})
.
post
(
"/api/png/palm/barcode"
,
{
barcode
:
val
})
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
console
.
log
(
res
);
self
.
loadingIndex
--
;
self
.
loadingIndex
--
;
self
.
$emit
(
"loadingIndex"
,
false
);
self
.
$emit
(
"loadingIndex"
,
false
);
if
(
res
.
data
.
code
==
0
&&
res
.
data
.
message
==
"success"
)
{
if
(
res
.
data
.
code
==
0
&&
res
.
data
.
message
==
"success"
)
{
...
@@ -277,6 +281,7 @@ export default {
...
@@ -277,6 +281,7 @@ export default {
this
.
$axios
this
.
$axios
.
post
(
"/api/png/palm/barcode"
,
{
barcode
:
val
})
.
post
(
"/api/png/palm/barcode"
,
{
barcode
:
val
})
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
console
.
log
(
res
);
self
.
loadingIndex
--
;
self
.
loadingIndex
--
;
self
.
$emit
(
"loadingIndex"
,
false
);
self
.
$emit
(
"loadingIndex"
,
false
);
if
(
res
.
data
.
code
==
0
&&
res
.
data
.
message
==
"success"
)
{
if
(
res
.
data
.
code
==
0
&&
res
.
data
.
message
==
"success"
)
{
...
...
src/views/rgrd/rgTT.vue
View file @
22794b07
...
@@ -1221,7 +1221,6 @@ export default {
...
@@ -1221,7 +1221,6 @@ export default {
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
me
.
loadingIndex
--
;
me
.
loadingIndex
--
;
if
(
res
.
data
.
code
==
0
)
{
if
(
res
.
data
.
code
==
0
)
{
debugger
;
me
.
sourcedatas
=
res
.
data
.
ret
;
me
.
sourcedatas
=
res
.
data
.
ret
;
me
.
sourcedatasLength
=
res
.
data
.
ret
.
length
;
me
.
sourcedatasLength
=
res
.
data
.
ret
.
length
;
me
.
sourcebarcode
=
res
.
data
.
ret
[
0
].
barcode
;
me
.
sourcebarcode
=
res
.
data
.
ret
[
0
].
barcode
;
...
...
vue.config.js
View file @
22794b07
/*
/*
* @Author: your name
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2022-02-14
16:50:09
* @LastEditTime: 2022-02-14
20:53:47
* @LastEditors: Please set LastEditors
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
* @FilePath: \指纹系统\founder_vue\vue.config.js
...
@@ -129,9 +129,9 @@ module.exports = {
...
@@ -129,9 +129,9 @@ module.exports = {
"/security"
:
{
"/security"
:
{
// target: "http://192.168.128.106:8765", // 湖南-王
// target: "http://192.168.128.106:8765", // 湖南-王
target
:
"http://192.168.128.108:8765/"
,
// 张 认定
//
target: "http://192.168.128.108:8765/", // 张 认定
// target: "http://www.meetfood.cn:2390", // 湖南-王
// target: "http://www.meetfood.cn:2390", // 湖南-王
//
target: "http://zwpt.xzclub.top:9333/",
target
:
"http://zwpt.xzclub.top:9333/"
,
// target: "http://192.168.128.109:8765",
// target: "http://192.168.128.109:8765",
ws
:
true
,
ws
:
true
,
changeOrigin
:
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