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
98afc3ba
Commit
98afc3ba
authored
May 05, 2022
by
米嘉伟
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev_zwpt' of
http://39.99.224.27:9022/changchao/founder_vue
into dev_zwpt
parents
112f86b8
7a73c5d5
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
32 additions
and
19 deletions
+32
-19
src/components/ImageEd.vue
+5
-3
src/views/AllPersonnelBase/modules/ajxxk.vue
+1
-1
src/views/AllPersonnelBase/modules/fcx.vue
+4
-4
src/views/Editor/modules/ajzwbjLeft.vue
+4
-1
src/views/Editor/modules/imageEdAJ.vue
+6
-2
src/views/cxyrd/LT.vue
+1
-0
src/views/cxyrd/QueryConfirm.vue
+6
-3
src/views/cxyrd/modules/TLSrc.vue
+1
-1
vue.config.js
+4
-4
No files found.
src/components/ImageEd.vue
View file @
98afc3ba
<!--
* @Author: your name
* @Date: 2021-09-09 09:28:46
* @LastEditTime: 2022-04-2
4 19:54:01
* @LastEditTime: 2022-04-2
5 23:10:39
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue
-->
...
...
@@ -5582,7 +5582,7 @@ export default {
// 历史记录背景色
$
(
".icon_history"
).
css
(
"background"
,
"rgba(5, 95, 231, 0.1)"
);
this
.
isLineOptions
=
!
this
.
isLineOptions
;
//
this.isLineOptions = !this.isLineOptions;
this
.
isActive_line
=
!
this
.
isActive_line
;
// this.isNormalActiveIcon = true;
// this.isNormalActiveName = true;
...
...
@@ -5592,12 +5592,14 @@ export default {
// this.isMediumActiveName = false;
// this.isBoldActiveIcon = false;
// this.isBoldActiveName = false;
if
(
!
this
.
isLineOptions
)
{
if
(
!
this
.
isActive_line
)
{
this
.
isLineOptions
=
false
this
.
isShowLineColor
=
false
;
this
.
imageEditor
.
stopDrawingMode
();
this
.
imageEditor2
.
stopDrawingMode
();
//console.log(777);
}
else
{
this
.
isLineOptions
=
true
// $selectLine.click()
}
if
(
this
.
isActive_line
)
{
...
...
src/views/AllPersonnelBase/modules/ajxxk.vue
View file @
98afc3ba
...
...
@@ -514,7 +514,7 @@ export default {
display
:
flex
;
justify-content
:
center
;
img
{
height
:
300px
;
height
:
100%
;
}
.noImg
{
img
{
...
...
src/views/AllPersonnelBase/modules/fcx.vue
View file @
98afc3ba
...
...
@@ -322,7 +322,7 @@ export default {
cxtype
:
[],
querytype
:
''
,
// 查询类型
},
srcDataType
:
[
'1'
,
'2'
],
// 源数据类型人员
srcDataType
:
[
'1'
],
// 源数据类型人员
queryClass
:
'3'
,
// 优先级
matchCount
:
'10'
,
// 候选个数
srcDataTypeAj
:
[
'7'
],
//源数据类型案件
...
...
@@ -396,7 +396,7 @@ export default {
this
.
$emit
(
'closeFcx'
,
this
.
dialogVisible
);
},
'ruleForm.cxlx.querytype'
(
val
)
{
this
.
ruleForm
.
srcDataType
=
[
'1'
,
'2'
]
// 查询类型切换清空数据类型
this
.
ruleForm
.
srcDataType
=
[
'1'
]
// 查询类型切换清空数据类型
this
.
ruleForm
.
srcDataTypeAj
=
[
'7'
]
//源数据类型案件
this
.
dxcx
=
{
// 定向查询
domains
:
[],
...
...
@@ -511,7 +511,7 @@ export default {
cityOptions
=
[]
this
.
cities
=
cityOptions
this
.
dialogVisible
=
false
;
this
.
ruleForm
.
srcDataType
=
[
'1'
,
'2'
]
// 查询类型切换清空数据类型
this
.
ruleForm
.
srcDataType
=
[
'1'
]
// 查询类型切换清空数据类型
this
.
ruleForm
.
srcDataTypeAj
=
[
'7'
]
//源数据类型案件
this
.
dataRy
=
[
1
]
this
.
dataAj
=
[
1
]
...
...
@@ -548,7 +548,7 @@ export default {
cityOptions
=
[]
this
.
cities
=
cityOptions
this
.
dialogVisible
=
false
;
this
.
ruleForm
.
srcDataType
=
[
'1'
,
'2'
]
// 查询类型切换清空数据类型
this
.
ruleForm
.
srcDataType
=
[
'1'
]
// 查询类型切换清空数据类型
this
.
ruleForm
.
srcDataTypeAj
=
[
'7'
]
//源数据类型案件
this
.
dataRy
=
[
1
]
this
.
dataAj
=
[
1
]
...
...
src/views/Editor/modules/ajzwbjLeft.vue
View file @
98afc3ba
<!--
* @Author: your name
* @Date: 2021-10-22 09:42:07
* @LastEditTime: 2022-04-
08 17:12:29
* @LastEditTime: 2022-04-
26 11:01:38
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
...
...
@@ -136,6 +136,9 @@ export default {
// 不是新增就查询案件指纹,进行编辑
this
.
getCaseFinger
()
// this.changeCaseFingerPNG()
}
else
{
// 防止在新增时,刷新不调接口
this
.
getCaseFinger
()
}
// 更新图片列表
...
...
src/views/Editor/modules/imageEdAJ.vue
View file @
98afc3ba
<!--
* @Author: your name
* @Date: 2021-10-22 11:36:10
* @LastEditTime: 2022-04-2
3 21:18:47
* @LastEditTime: 2022-04-2
6 18:19:51
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
...
...
@@ -2290,6 +2290,10 @@ export default {
file
=
event
.
target
.
files
[
0
];
console
.
log
(
file
,
222222222
);
// 更新图片
self
.
zoomImage
(
1
);
// 隐藏手纹框
self
.
isSwk_flag
=
false
imageEditor
.
loadImageFromFile
(
file
).
then
(
function
(
result
)
{
// 设置遮罩层
self
.
isHideImageExport
=
true
...
...
@@ -5827,7 +5831,7 @@ export default {
$
(
"#input-image-file"
).
val
(
""
);
$
(
"#input-image-file"
).
click
();
this
.
picType
=
'dr'
this
.
zoomImage
(
1
);
//
this.zoomImage(1);
}
},
/**
...
...
src/views/cxyrd/LT.vue
View file @
98afc3ba
...
...
@@ -197,6 +197,7 @@ export default {
}
},
mounted
()
{
console
.
log
(
this
.
$route
);
let
self
=
this
;
this
.
$bus
.
on
(
"bzJudge"
,
(
val
)
=>
{
self
.
bzData
=
val
;
...
...
src/views/cxyrd/QueryConfirm.vue
View file @
98afc3ba
...
...
@@ -832,7 +832,7 @@ export default {
qid
:
row
.
qid
,
barcode
:
row
.
children
[
0
].
barcode
,
type
:
'father'
,
}
,
}
})
window
.
open
(
routeUrl
.
href
,
'_blank'
)
}
else
if
(
row
.
children
[
0
].
querytype
===
'1'
)
{
...
...
@@ -852,6 +852,9 @@ export default {
let
routeUrl
=
this
.
$router
.
resolve
({
path
:
'/confirm/LT'
,
query
:
{
qid
:
row
.
qid
,
qqid
:
row
.
qqid
,
type
:
'father'
},
params
:
{
a
:
5
}
})
window
.
open
(
routeUrl
.
href
,
'_blank'
)
}
else
{
...
...
@@ -908,11 +911,11 @@ export default {
self
.
$message
({
type
:
'success'
,
// message: "复制条码号:" + this.copyNum + "成功!"
message
:
this
.
$t
(
'Common.copy_plate'
),
message
:
self
.
$t
(
'Common.copy_plate'
),
})
},
function
(
e
)
{
this
.
$message
.
error
(
this
.
$t
(
'Common.sorry_copy_barcode_fail'
))
this
.
$message
.
error
(
self
.
$t
(
'Common.sorry_copy_barcode_fail'
))
}
)
},
...
...
src/views/cxyrd/modules/TLSrc.vue
View file @
98afc3ba
...
...
@@ -43,7 +43,7 @@
<!-- 指纹图 -->
<div
class=
"finger-print"
v-show=
"isShowPrint"
>
<div
class=
"btns"
>
<div
class=
"btn"
@
click=
"switchRoll"
:class=
"{active: fingerShowType == 'roll'}"
>
{{$t('Commonroll')}}
</div>
<div
class=
"btn"
@
click=
"switchRoll"
:class=
"{active: fingerShowType == 'roll'}"
>
{{$t('Common
.
roll')}}
</div>
<!-- <div class="line"></div> -->
<div
class=
"btn"
v-show=
"!isDelete"
@
click=
"switchPain"
:class=
"{active: fingerShowType == 'pain', isHasData: !painFlag}"
>
{{$t('FingerPrint.plane')}}
</div>
<div
class=
"btn isDelete"
v-show=
"isDelete"
>
{{$t('FingerPrint.plane')}}
</div>
...
...
vue.config.js
View file @
98afc3ba
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2022-04-25
15:53:53
* @LastEditTime: 2022-04-25
23:11:49
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
...
...
@@ -104,11 +104,11 @@ module.exports = {
// 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.104:8099", // 江
// target: "http://172.20.0.149:8099", // 北京 张
target
:
"http://192.168.0.109:8099"
,
// 西藏 张
// target: "http://192.168.0.1
34
:8099", // 西藏 马
//
target: "http://192.168.0.109:8099", // 西藏 张
// target: "http://192.168.0.1
43
:8099", // 西藏 马
// target: "http://192.168.0.130: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