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
8f6bbebd
Commit
8f6bbebd
authored
Dec 13, 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
424b96b4
9175ed99
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
31 additions
and
17 deletions
+31
-17
src/views/Editor/modules/imageEd.vue
+8
-5
src/views/Editor/modules/imageEdAJ.vue
+4
-2
src/views/Editor/modules/ryzwbjLeft.vue
+4
-1
src/views/bzxxgl/fhxxLT.vue
+12
-6
vue.config.js
+3
-3
No files found.
src/views/Editor/modules/imageEd.vue
View file @
8f6bbebd
<!--
* @Author: your name
* @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-12-13 11:0
2:20
* @LastEditTime: 2021-12-13 11:0
3:35
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
...
...
@@ -1150,6 +1150,7 @@ export default {
});
this
.
$bus
.
on
(
"ryzwbjImage"
,
(
sourceImage
)
=>
{
console
.
log
(
sourceImage
);
// 缩放为1
self
.
zoomLevel
=
1
;
imageEditor
.
resetZoom
();
...
...
@@ -1268,10 +1269,12 @@ export default {
// 清空特征点数量
this
.
$bus
.
on
(
"ryzwbjTDZ"
,
()
=>
{
self
.
tzdArr
=
[];
self
.
tzdnumber
=
0
;
self
.
isHandTZD
=
false
;
$
(
".tzdDom"
).
remove
();
// self.tzdArr = [];
// self.tzdnumber = 0;
// self.isHandTZD = false;
// $(".tzdDom").remove();
// $(".auto_tzdDom").remove();
self
.
clearALL
()
});
$
(
document
).
keydown
(
function
(
event
)
{
...
...
src/views/Editor/modules/imageEdAJ.vue
View file @
8f6bbebd
<!--
* @Author: your name
* @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-12-1
1 14:46:20
* @LastEditTime: 2021-12-1
3 11:01:01
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
...
...
@@ -2251,7 +2251,7 @@ export default {
// 清除所有
self
.
clearALL
()
// 导入图片成功,可以保存入库
self
.
bcrkActive
=
tru
e
self
.
bcrkActive
=
fals
e
console
.
log
(
result
);
self
.
newHeight
=
result
.
newHeight
;
self
.
newWidth
=
result
.
newWidth
;
...
...
@@ -4374,6 +4374,7 @@ export default {
blcConfirm
(
type
)
{
$
(
".rule_line"
).
css
(
"z-index"
,
"1"
);
this
.
calcChange
(
type
);
this
.
bcrkActive
=
true
},
/**
* @description: 计算比例
...
...
@@ -4576,6 +4577,7 @@ export default {
// 掌纹
await
this
.
cutImageHand
()
}
this
.
bcrkActive
=
false
// 修改层级
$
(
".rule_line"
).
css
(
"z-index"
,
"9"
);
...
...
src/views/Editor/modules/ryzwbjLeft.vue
View file @
8f6bbebd
<!--
* @Author: your name
* @Date: 2021-10-22 09:42:07
* @LastEditTime: 2021-12-1
1 15:54:08
* @LastEditTime: 2021-12-1
2 22:12:06
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
...
...
@@ -927,6 +927,9 @@ export default {
self
.
preSeq
=
this
.
activerollFinger
// 默认选中第一个出现的掌纹
this
.
HandsChange
(
self
.
hand
)
}
else
{
self
.
$bus
.
emit
(
'ryzwbjImage'
,
'xxx'
)
self
.
$bus
.
emit
(
'ryzwbjTDZ'
)
}
}
else
if
(
this
.
zwSelect
===
'人像'
)
{
// 传入判断,为人像则关闭图像编辑的功能
...
...
src/views/bzxxgl/fhxxLT.vue
View file @
8f6bbebd
<!--
* @Author: your name
* @Date: 2021-12-03 15:35:26
* @LastEditTime: 2021-12-1
1 11:48:57
* @LastEditTime: 2021-12-1
3 10:55:58
* @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
...
...
@@ -25,11 +25,11 @@
<div
class=
"fhxx-top-top-left-content"
>
<div
class=
"content-item"
>
<div
class=
"label-name"
>
案事件编号:
</div>
<div
class=
"label-value"
>
A1231231231231231231232
</div>
<div
class=
"label-value"
>
{{
allData
.
ysxtAsjbh
}}
</div>
</div>
<div
class=
"content-item"
>
<div
class=
"label-name"
>
现场勘验编号:
</div>
<div
class=
"label-value"
>
A1231231231231231231232
</div>
<div
class=
"label-value"
>
{{
allData
.
xckybh
}}
</div>
</div>
<div
class=
"content-item"
>
<div
class=
"label-name"
>
案发地点:
</div>
...
...
@@ -73,7 +73,7 @@
<div
class=
"fhxx-top-top-left-content"
>
<div
class=
"content-item"
>
<div
class=
"label-name"
>
人员编号:
</div>
<div
class=
"label-value"
>
A1231231231231231231232
</div>
<div
class=
"label-value"
>
{{
allData
.
ysxtAsjxgrybh
}}
</div>
</div>
<div
class=
"content-item content-item2"
>
<div
class=
"label-name"
>
姓名:
</div>
...
...
@@ -200,7 +200,11 @@ export default {
textarea2
:
'暂无犯罪描述;'
,
textarea3
:
'2021年8月5日晚21点时分,北京市昌平区东小口镇天通苑二区疫情通报,现确诊4人;'
,
fhyj
:
''
,
allData
:
{}
allData
:
{
ysxtAsjbh
:
''
,
ysxtAsjxgrybh
:
''
,
xckybh
:
''
}
}
},
components
:
{
...
...
@@ -219,11 +223,13 @@ export default {
url
:
'/api/hit/lthit/info'
,
data
:
{
id
:
self
.
id
}
},
loading
:
true
}).
then
(
res
=>
{
console
.
log
(
res
);
if
(
res
.
data
.
code
===
0
)
{
this
.
allData
=
res
.
data
.
ret
console
.
log
(
this
.
allData
);
}
}).
catch
(
err
=>
{
console
.
log
(
err
);
...
...
vue.config.js
View file @
8f6bbebd
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-13 11:0
2:04
* @LastEditTime: 2021-12-13 11:0
3:46
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
...
...
@@ -92,14 +92,14 @@ module.exports = {
// 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.124: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.118:8764", // 湖南-张呈光
// 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.115:8099", // 江
ws
:
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