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
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
116 additions
and
43 deletions
+116
-43
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
-0
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
This diff is collapsed.
Click to expand it.
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