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
4c09dbb0
Commit
4c09dbb0
authored
Apr 06, 2022
by
张超军
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
问题修改
parent
784dd778
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
37 additions
and
38 deletions
+37
-38
src/components/ImageEd.scss
+2
-1
src/components/ImageEd.vue
+3
-3
src/store/modules/ljk.js
+6
-6
src/views/AllPersonnelBase/modules/ryxxk.vue
+14
-17
src/views/cxyrd/QueryConfirm.vue
+2
-1
src/views/cxyrd/modules/LTCandidate.vue
+4
-4
src/views/drFPTX/Index.vue
+2
-2
src/views/login/modules/AccountsLogin.vue
+4
-4
No files found.
src/components/ImageEd.scss
View file @
4c09dbb0
...
@@ -84,7 +84,8 @@ div {
...
@@ -84,7 +84,8 @@ div {
color
:
#333333
;
color
:
#333333
;
}
}
.center
{
.center
{
z-index
:
2022
;
//z-index: 2022;
z-index
:
99999
;
width
:
1120px
;
width
:
1120px
;
display
:
flex
;
display
:
flex
;
align-items
:
center
;
align-items
:
center
;
...
...
src/components/ImageEd.vue
View file @
4c09dbb0
...
@@ -2355,7 +2355,7 @@ export default {
...
@@ -2355,7 +2355,7 @@ export default {
self
.
$bus
.
on
(
'target_info'
,
(
target_info
)
=>
{
self
.
$bus
.
on
(
'target_info'
,
(
target_info
)
=>
{
console
.
log
(
target_info
);
console
.
log
(
target_info
);
// 西藏上云暂时不用
// 西藏上云暂时不用
//
self.getBdjqData(target_info.barcode_source, target_info.seq_source, target_info.barcode_target, target_info.seq_target, target_info.type)
self
.
getBdjqData
(
target_info
.
barcode_source
,
target_info
.
seq_source
,
target_info
.
barcode_target
,
target_info
.
seq_target
,
target_info
.
type
)
})
})
let
canvasImage
=
self
.
imageEditor
.
_graphics
.
getCanvasImage
();
let
canvasImage
=
self
.
imageEditor
.
_graphics
.
getCanvasImage
();
...
@@ -2450,7 +2450,7 @@ export default {
...
@@ -2450,7 +2450,7 @@ export default {
self
.
$bus
.
on
(
'target_info'
,
(
target_info
)
=>
{
self
.
$bus
.
on
(
'target_info'
,
(
target_info
)
=>
{
console
.
log
(
target_info
);
console
.
log
(
target_info
);
// 西藏上云暂时不用
// 西藏上云暂时不用
//
self.getBdjqData(target_info.barcode_source, target_info.seq_source, target_info.barcode_target, target_info.seq_target, target_info.type)
self
.
getBdjqData
(
target_info
.
barcode_source
,
target_info
.
seq_source
,
target_info
.
barcode_target
,
target_info
.
seq_target
,
target_info
.
type
)
})
})
this
.
imageEditor2
.
changeCursor
(
"auto"
);
this
.
imageEditor2
.
changeCursor
(
"auto"
);
let
canvasImage
=
this
.
imageEditor2
.
_graphics
.
getCanvasImage
();
let
canvasImage
=
this
.
imageEditor2
.
_graphics
.
getCanvasImage
();
...
@@ -7558,6 +7558,6 @@ export default {
...
@@ -7558,6 +7558,6 @@ export default {
</
style
>
</
style
>
<
style
lang=
"scss"
>
<
style
lang=
"scss"
>
.el-tooltip__popper
{
.el-tooltip__popper
{
z-index
:
9999
!important
;
//
z-index
:
9999
!important
;
}
}
</
style
>
</
style
>
src/store/modules/ljk.js
View file @
4c09dbb0
...
@@ -40,7 +40,7 @@ const actions = {
...
@@ -40,7 +40,7 @@ const actions = {
// }
// }
// })
// })
// },
// },
_ljkRy
(
context
,
options
)
{
// 获取人员逻辑库
async
_ljkRy
(
context
,
options
)
{
// 获取人员逻辑库
let
userInfo
=
JSON
.
parse
(
localStorage
.
getItem
(
"userInfo"
))
let
userInfo
=
JSON
.
parse
(
localStorage
.
getItem
(
"userInfo"
))
let
params
=
{
let
params
=
{
userId
:
null
,
userId
:
null
,
...
@@ -48,14 +48,14 @@ const actions = {
...
@@ -48,14 +48,14 @@ const actions = {
}
}
params
.
userId
=
userInfo
.
user
.
id
params
.
userId
=
userInfo
.
user
.
id
params
.
userGroupIds
=
userInfo
.
groupIds
params
.
userGroupIds
=
userInfo
.
groupIds
_axios
.
post
(
'/api/code/personLogic'
,
params
).
then
(
res
=>
{
await
_axios
.
post
(
'/api/code/personLogic'
,
params
).
then
(
res
=>
{
console
.
log
(
res
,
'/api/code/personLogic luojiku '
)
console
.
log
(
res
,
'/api/code/personLogic luojiku '
)
if
(
res
.
data
.
code
==
0
&&
res
.
data
.
message
==
"success"
)
{
if
(
res
.
data
.
code
==
0
&&
res
.
data
.
message
==
"success"
)
{
context
.
commit
(
'ljkRy'
,
res
.
data
.
ret
);
context
.
commit
(
'ljkRy'
,
res
.
data
.
ret
);
}
}
})
})
},
},
_ljkAj
(
context
,
options
)
{
// 获取案件逻辑库
async
_ljkAj
(
context
,
options
)
{
// 获取案件逻辑库
let
userInfo
=
JSON
.
parse
(
localStorage
.
getItem
(
"userInfo"
))
let
userInfo
=
JSON
.
parse
(
localStorage
.
getItem
(
"userInfo"
))
let
params
=
{
let
params
=
{
userId
:
null
,
userId
:
null
,
...
@@ -63,14 +63,14 @@ const actions = {
...
@@ -63,14 +63,14 @@ const actions = {
}
}
params
.
userId
=
userInfo
.
user
.
id
params
.
userId
=
userInfo
.
user
.
id
params
.
userGroupIds
=
userInfo
.
groupIds
params
.
userGroupIds
=
userInfo
.
groupIds
_axios
.
post
(
'/api/code/caseLogic'
,
params
).
then
(
res
=>
{
await
_axios
.
post
(
'/api/code/caseLogic'
,
params
).
then
(
res
=>
{
console
.
log
(
res
,
'/api/code/caseLogic luojiku '
)
console
.
log
(
res
,
'/api/code/caseLogic luojiku '
)
if
(
res
.
data
.
code
==
0
&&
res
.
data
.
message
==
"success"
)
{
if
(
res
.
data
.
code
==
0
&&
res
.
data
.
message
==
"success"
)
{
context
.
commit
(
'ljkAj'
,
res
.
data
.
ret
);
context
.
commit
(
'ljkAj'
,
res
.
data
.
ret
);
}
}
})
})
},
},
_ljkAll
(
context
,
options
)
{
// 获取全部逻辑库名称
async
_ljkAll
(
context
,
options
)
{
// 获取全部逻辑库名称
let
userInfo
=
JSON
.
parse
(
localStorage
.
getItem
(
"userInfo"
))
let
userInfo
=
JSON
.
parse
(
localStorage
.
getItem
(
"userInfo"
))
let
params
=
{
let
params
=
{
userId
:
null
,
userId
:
null
,
...
@@ -78,7 +78,7 @@ const actions = {
...
@@ -78,7 +78,7 @@ const actions = {
}
}
params
.
userId
=
userInfo
.
user
.
id
params
.
userId
=
userInfo
.
user
.
id
params
.
userGroupIds
=
userInfo
.
groupIds
params
.
userGroupIds
=
userInfo
.
groupIds
_axios
.
post
(
'/api/code/allLogicName'
,
params
).
then
(
res
=>
{
await
_axios
.
post
(
'/api/code/allLogicName'
,
params
).
then
(
res
=>
{
console
.
log
(
res
,
'/api/code/allLogicName luojiku '
)
console
.
log
(
res
,
'/api/code/allLogicName luojiku '
)
if
(
res
.
data
.
code
==
0
&&
res
.
data
.
message
==
"success"
)
{
if
(
res
.
data
.
code
==
0
&&
res
.
data
.
message
==
"success"
)
{
context
.
commit
(
'ljkAll'
,
res
.
data
.
ret
);
context
.
commit
(
'ljkAll'
,
res
.
data
.
ret
);
...
...
src/views/AllPersonnelBase/modules/ryxxk.vue
View file @
4c09dbb0
...
@@ -511,9 +511,8 @@ export default {
...
@@ -511,9 +511,8 @@ export default {
this
.
FaceImgNum
=
0
;
this
.
FaceImgNum
=
0
;
NetUtil
.
ryxxk
.
getFaceByBarcode
({
barcode
:
this
.
ysryjbxx
.
ysxtAsjxgrybh
})
NetUtil
.
ryxxk
.
getFaceByBarcode
({
barcode
:
this
.
ysryjbxx
.
ysxtAsjxgrybh
})
.
then
((
response
)
=>
{
.
then
((
response
)
=>
{
console
.
log
(
response
.
data
);
if
(
response
.
code
==
0
)
{
if
(
response
.
data
.
code
==
0
)
{
response
.
ret
.
forEach
((
element
,
index
)
=>
{
response
.
data
.
ret
.
forEach
((
element
,
index
)
=>
{
self
.
FaceImg
.
forEach
((
item
)
=>
{
self
.
FaceImg
.
forEach
((
item
)
=>
{
if
(
item
.
code
==
element
.
seq
)
{
if
(
item
.
code
==
element
.
seq
)
{
item
.
img
=
element
.
image
;
item
.
img
=
element
.
image
;
...
@@ -523,7 +522,7 @@ export default {
...
@@ -523,7 +522,7 @@ export default {
});
});
// 去掉加载状态
// 去掉加载状态
self
.
FaceLoading
=
false
;
self
.
FaceLoading
=
false
;
}
else
if
(
response
.
data
.
code
==
4
)
{
}
else
if
(
response
.
code
==
4
)
{
// 去掉加载状态
// 去掉加载状态
self
.
FaceLoading
=
false
;
self
.
FaceLoading
=
false
;
}
}
...
@@ -540,9 +539,8 @@ export default {
...
@@ -540,9 +539,8 @@ export default {
this
.
PalmImgNum
=
0
;
this
.
PalmImgNum
=
0
;
NetUtil
.
ryxxk
.
getPalmByBarcode
({
barcode
:
this
.
ysryjbxx
.
ysxtAsjxgrybh
})
NetUtil
.
ryxxk
.
getPalmByBarcode
({
barcode
:
this
.
ysryjbxx
.
ysxtAsjxgrybh
})
.
then
((
response
)
=>
{
.
then
((
response
)
=>
{
console
.
log
(
response
.
data
);
if
(
response
.
code
==
0
)
{
if
(
response
.
data
.
code
==
0
)
{
response
.
ret
.
forEach
((
element
,
index
)
=>
{
response
.
data
.
ret
.
forEach
((
element
,
index
)
=>
{
self
.
PlamImg
.
forEach
((
item
)
=>
{
self
.
PlamImg
.
forEach
((
item
)
=>
{
if
(
item
.
code
==
element
.
seq
)
{
if
(
item
.
code
==
element
.
seq
)
{
item
.
img
=
element
.
image
;
item
.
img
=
element
.
image
;
...
@@ -552,7 +550,7 @@ export default {
...
@@ -552,7 +550,7 @@ export default {
});
});
// 去掉加载状态
// 去掉加载状态
self
.
PlamLoading
=
false
;
self
.
PlamLoading
=
false
;
}
else
if
(
response
.
data
.
code
==
4
)
{
}
else
if
(
response
.
code
==
4
)
{
// 去掉加载状态
// 去掉加载状态
self
.
PlamLoading
=
false
;
self
.
PlamLoading
=
false
;
}
}
...
@@ -567,9 +565,9 @@ export default {
...
@@ -567,9 +565,9 @@ export default {
NetUtil
.
ryxxk
.
getPlainByBarcode
({
barcode
:
this
.
ysryjbxx
.
ysxtAsjxgrybh
})
NetUtil
.
ryxxk
.
getPlainByBarcode
({
barcode
:
this
.
ysryjbxx
.
ysxtAsjxgrybh
})
.
then
((
response
)
=>
{
.
then
((
response
)
=>
{
// console.log(response.data);
// console.log(response.data);
if
(
response
.
data
.
code
==
0
)
{
if
(
response
.
code
==
0
)
{
this
.
PlainImgNum
=
response
.
data
.
ret
.
length
;
this
.
PlainImgNum
=
response
.
ret
.
length
;
response
.
data
.
ret
.
forEach
((
element
,
index
)
=>
{
response
.
ret
.
forEach
((
element
,
index
)
=>
{
self
.
PlainImg
.
forEach
((
item
)
=>
{
self
.
PlainImg
.
forEach
((
item
)
=>
{
if
(
item
.
code
==
element
.
seq
)
{
if
(
item
.
code
==
element
.
seq
)
{
item
.
img
=
element
.
image
;
item
.
img
=
element
.
image
;
...
@@ -579,7 +577,7 @@ export default {
...
@@ -579,7 +577,7 @@ export default {
});
});
// 去掉加载状态
// 去掉加载状态
self
.
PlainImgfingerLoading
=
false
;
self
.
PlainImgfingerLoading
=
false
;
}
else
if
(
response
.
data
.
code
==
4
)
{
}
else
if
(
response
.
code
==
4
)
{
// 去掉加载状态
// 去掉加载状态
self
.
PlainImgfingerLoading
=
false
;
self
.
PlainImgfingerLoading
=
false
;
}
}
...
@@ -593,12 +591,11 @@ export default {
...
@@ -593,12 +591,11 @@ export default {
// let self = this;
// let self = this;
NetUtil
.
ryxxk
.
getRollByBarcode
({
barcode
:
this
.
ysryjbxx
.
ysxtAsjxgrybh
})
NetUtil
.
ryxxk
.
getRollByBarcode
({
barcode
:
this
.
ysryjbxx
.
ysxtAsjxgrybh
})
.
then
((
response
)
=>
{
.
then
((
response
)
=>
{
console
.
log
(
response
.
data
);
if
(
response
.
code
==
0
)
{
if
(
response
.
data
.
code
==
0
)
{
// 去掉加载状态
// 去掉加载状态
this
.
RollImgfingerLoading
=
false
;
this
.
RollImgfingerLoading
=
false
;
this
.
RollImgNum
=
response
.
data
.
ret
.
length
;
this
.
RollImgNum
=
response
.
ret
.
length
;
response
.
data
.
ret
.
forEach
((
element
,
index
)
=>
{
response
.
ret
.
forEach
((
element
,
index
)
=>
{
this
.
RollImg
.
forEach
((
item
)
=>
{
this
.
RollImg
.
forEach
((
item
)
=>
{
if
(
item
.
code
==
element
.
seq
)
{
if
(
item
.
code
==
element
.
seq
)
{
item
.
img
=
element
.
image
;
item
.
img
=
element
.
image
;
...
@@ -608,7 +605,7 @@ export default {
...
@@ -608,7 +605,7 @@ export default {
});
});
// console.log("RollImgNum", this.RollImgNum);
// console.log("RollImgNum", this.RollImgNum);
// console.log("RollImgfingerLoading", this.RollImgfingerLoading);
// console.log("RollImgfingerLoading", this.RollImgfingerLoading);
}
else
if
(
response
.
data
.
code
==
4
)
{
}
else
if
(
response
.
code
==
4
)
{
// 去掉加载状态
// 去掉加载状态
this
.
RollImgfingerLoading
=
false
;
this
.
RollImgfingerLoading
=
false
;
}
}
...
...
src/views/cxyrd/QueryConfirm.vue
View file @
4c09dbb0
...
@@ -1014,6 +1014,7 @@ export default {
...
@@ -1014,6 +1014,7 @@ export default {
//点击列表进入页面
//点击列表进入页面
enterInto
(
row
)
{
enterInto
(
row
)
{
// !scope.row.querycfg
// !scope.row.querycfg
if
(
row
.
queryStateName
===
'等待比对'
)
return
;
if
(
row
.
children
&&
row
.
children
.
length
>
0
)
{
if
(
row
.
children
&&
row
.
children
.
length
>
0
)
{
if
(
row
.
children
[
0
].
querytype
===
'0'
)
{
if
(
row
.
children
[
0
].
querytype
===
'0'
)
{
let
routeUrl
=
this
.
$router
.
resolve
({
let
routeUrl
=
this
.
$router
.
resolve
({
...
@@ -2519,7 +2520,7 @@ $expendStyle: var(--expendStyle, 1);
...
@@ -2519,7 +2520,7 @@ $expendStyle: var(--expendStyle, 1);
//
去除子级移入时的
hover
背景色
//
去除子级移入时的
hover
背景色
/
deep
/
.el-table
.el-table__body
.el-table__row--level-1
:hover
>
td
{
/
deep
/
.el-table
.el-table__body
.el-table__row--level-1
:hover
>
td
{
background-color
:
#f5f6f7
!important
;
background-color
:
#f5f6f7
!important
;
}
}
/
deep
/
.hiddenFather
{
/
deep
/
.hiddenFather
{
:nth-child(n
+
3)
{
:nth-child(n
+
3)
{
...
...
src/views/cxyrd/modules/LTCandidate.vue
View file @
4c09dbb0
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
<div
class=
"lt_candidate"
>
<div
class=
"lt_candidate"
>
<div
class=
"lt_cnadidate_search"
>
<div
class=
"lt_cnadidate_search"
>
<div
class=
"search-top"
>
<div
class=
"search-top"
>
<div
class=
"search-top-left"
>
<div
class=
"search-top-left"
>
<span>
{{
searchType
}}
</span>
<span>
{{
searchType
}}
</span>
</div>
</div>
<div
class=
"search-top-right"
>
<div
class=
"search-top-right"
>
...
@@ -261,9 +261,9 @@ export default {
...
@@ -261,9 +261,9 @@ export default {
name
:
"LTCandidate"
,
name
:
"LTCandidate"
,
data
()
{
data
()
{
return
{
return
{
width3
:
80
,
width3
:
75
,
width2
:
60
,
width2
:
55
,
width1
:
50
,
width1
:
48
,
checked
:
true
,
checked
:
true
,
tableData
:
null
,
tableData
:
null
,
// 不做处理的数据
// 不做处理的数据
...
...
src/views/drFPTX/Index.vue
View file @
4c09dbb0
...
@@ -515,7 +515,7 @@
...
@@ -515,7 +515,7 @@
class=
'ckxq'
class=
'ckxq'
style=
"background: #055FE7;border-radius: .25rem; border-color:#055FE7;"
style=
"background: #055FE7;border-radius: .25rem; border-color:#055FE7;"
@
click=
"goList"
@
click=
"goList"
><span
style=
"color:#fff;font-size: 0.875rem;"
>
{{$t('
FptxDr
.see_details')}}
</span></el-button>
><span
style=
"color:#fff;font-size: 0.875rem;"
>
{{$t('
Common
.see_details')}}
</span></el-button>
</div>
</div>
</el-dialog>
</el-dialog>
...
@@ -1196,7 +1196,7 @@ export default {
...
@@ -1196,7 +1196,7 @@ export default {
this
.
UploadPercent
=
0
this
.
UploadPercent
=
0
}
}
}).
catch
(()
=>
{
}).
catch
(()
=>
{
this
.
$message
.
error
(
this
.
$t
(
'
FptxDr
.server_error'
))
this
.
$message
.
error
(
this
.
$t
(
'
Common
.server_error'
))
this
.
showProgress
=
false
this
.
showProgress
=
false
this
.
UploadPercent
=
0
this
.
UploadPercent
=
0
})
})
...
...
src/views/login/modules/AccountsLogin.vue
View file @
4c09dbb0
...
@@ -204,7 +204,7 @@ export default {
...
@@ -204,7 +204,7 @@ export default {
'appToken'
:
me
.
appToken
,
'appToken'
:
me
.
appToken
,
'token'
:
me
.
userToken
'token'
:
me
.
userToken
},
},
}).
then
((
res
)
=>
{
}).
then
(
async
(
res
)
=>
{
me
.
btnLoading
=
false
me
.
btnLoading
=
false
if
(
res
.
data
.
code
==
200
)
{
if
(
res
.
data
.
code
==
200
)
{
localStorage
.
setItem
(
'token'
,
res
.
data
.
token
)
localStorage
.
setItem
(
'token'
,
res
.
data
.
token
)
...
@@ -219,9 +219,9 @@ export default {
...
@@ -219,9 +219,9 @@ export default {
this
.
$message
.
success
(
this
.
$t
(
'Login.login_success_tip'
))
this
.
$message
.
success
(
this
.
$t
(
'Login.login_success_tip'
))
//所在单位数据
//所在单位数据
this
.
$store
.
dispatch
(
"ljk/_ljkRy"
)
// 获取用户人员逻辑库JSON
await
this
.
$store
.
dispatch
(
"ljk/_ljkRy"
)
// 获取用户人员逻辑库JSON
this
.
$store
.
dispatch
(
"ljk/_ljkAj"
)
// 获取用户案件逻辑库JSON
await
this
.
$store
.
dispatch
(
"ljk/_ljkAj"
)
// 获取用户案件逻辑库JSON
this
.
$store
.
dispatch
(
"ljk/_ljkAll"
)
// 获取用户所有逻辑库名称NAME
await
this
.
$store
.
dispatch
(
"ljk/_ljkAll"
)
// 获取用户所有逻辑库名称NAME
this
.
$router
.
push
(
"/index"
);
this
.
$router
.
push
(
"/index"
);
this
.
$bus
.
emit
(
"goLogin"
);
this
.
$bus
.
emit
(
"goLogin"
);
this
.
$store
.
commit
(
"layout/setMenu"
,
res
.
data
.
auth
);
this
.
$store
.
commit
(
"layout/setMenu"
,
res
.
data
.
auth
);
...
...
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