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
a45fd468
Commit
a45fd468
authored
Jan 18, 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
dc7be1a5
6bfdfdc9
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
189 additions
and
76 deletions
+189
-76
public/JsonData/HnCodeJSON.json
+0
-0
public/JsonData/XzCodeJSON.json
+0
-0
src/utils/UserUtil.js
+5
-1
src/views/Editor/modules/imageEdAJ.vue
+21
-4
src/views/bzxxgl/bzxxsh.vue
+7
-3
src/views/xtfkgl/AjXtljfkView.vue
+2
-2
src/views/xtfkgl/RyXtljfkView.vue
+2
-2
src/views/xtfkgl/scss/dialog_table.scss
+23
-7
src/views/zzwcj/fingerprint.scss
+21
-12
src/views/zzwcj/fingerprint.vue
+44
-26
src/views/zzwlr/xzry.vue
+11
-12
src/views/zzwlr/xzryedit.vue
+53
-7
No files found.
public/JsonData/HnCodeJSON.json
View file @
a45fd468
public/JsonData/XzCodeJSON.json
View file @
a45fd468
src/utils/UserUtil.js
View file @
a45fd468
...
...
@@ -31,9 +31,13 @@ export default {
getUser
()
{
// 获取用户信息
let
userInfo
=
JSON
.
parse
(
localStorage
.
getItem
(
_USER_INFO_KEY
))
logger
.
info
(
'userInfo'
,
userInfo
)
return
userInfo
return
userInfo
.
user
},
getUserGroupId
()
{
// 获取用户信息
let
userInfo
=
JSON
.
parse
(
localStorage
.
getItem
(
_USER_INFO_KEY
))
return
userInfo
.
groupIds
},
setUser
(
userInfo
)
{
// 保存用户信息
localStorage
.
setItem
(
_USER_INFO_KEY
,
JSON
.
stringify
(
userInfo
))
},
...
...
src/views/Editor/modules/imageEdAJ.vue
View file @
a45fd468
<!--
* @Author: your name
* @Date: 2021-10-22 11:36:10
* @LastEditTime: 2022-01-18 1
5:52:01
* @LastEditTime: 2022-01-18 1
7:23:00
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
...
...
@@ -8077,7 +8077,9 @@ export default {
s
=
o
.
style
,
x
,
y
,
p
=
"onmousemove"
;
p
=
"onmousemove"
,
// 小蓝框拖拽的最小边界值(像素)
miniPix
=
10
;
self
.
dragableDiv
=
o
o
.
onmousedown
=
function
(
e
)
{
e
.
stopPropagation
()
...
...
@@ -8089,8 +8091,23 @@ export default {
o
[
p
]
=
function
(
e
)
{
e
.
stopPropagation
()
e
=
e
||
event
;
s
.
left
=
e
.
clientX
-
self
.
x
+
"px"
;
s
.
top
=
e
.
clientY
-
self
.
y
+
"px"
;
// 判断小蓝框的位置
let
left
=
e
.
clientX
-
self
.
x
;
let
top
=
e
.
clientY
-
self
.
y
;
if
(
left
>=
$
(
".preview-source"
).
width
()
-
miniPix
){
left
=
$
(
".preview-source"
).
width
()
-
miniPix
}
else
if
(
left
<=-
$
(
"#block_small"
).
width
()
+
miniPix
){
left
=-
$
(
"#block_small"
).
width
()
+
miniPix
}
if
(
top
>=
$
(
".preview-source"
).
height
()
-
miniPix
){
top
=
$
(
".preview-source"
).
height
()
-
miniPix
}
else
if
(
top
<=-
$
(
"#block_small"
).
height
()
+
miniPix
){
top
=-
$
(
"#block_small"
).
height
()
+
miniPix
}
s
.
left
=
left
+
"px"
;
s
.
top
=
top
+
"px"
;
// 存下小指纹框当前的位置
// self.small_x = e.clientX - self.x;
...
...
src/views/bzxxgl/bzxxsh.vue
View file @
a45fd468
...
...
@@ -413,9 +413,9 @@ export default {
},
shDialogVisiable
:
false
,
dwProps
:
{
value
:
"code"
,
label
:
"key"
,
children
:
"childCodeDwXz"
,
value
:
'code'
,
label
:
'key'
,
children
:
'childCodeDwXz'
,
checkStrictly
:
true
,
emitPath
:
false
,
},
...
...
@@ -712,6 +712,10 @@ export default {
_that
.
ruleForm
.
level
=
_that
.
getLevel
()
_that
.
ruleForm
.
userId
=
user
.
getUser
().
id
_that
.
ruleForm
.
userGroupIds
=
user
.
getUserGroupId
()
NetUtil
.
bzxxsh
.
shList
(
_that
.
ruleForm
)
.
then
(
res
=>
{
if
(
res
.
code
===
0
)
{
...
...
src/views/xtfkgl/AjXtljfkView.vue
View file @
a45fd468
...
...
@@ -349,8 +349,8 @@ export default {
ruleForm
.
page
=
page
ruleForm
.
limit
=
limit
ruleForm
.
userId
=
user
.
getUser
().
user
.
id
ruleForm
.
userGroupIds
=
user
.
getUser
().
groupIds
ruleForm
.
userId
=
user
.
getUser
().
id
ruleForm
.
userGroupIds
=
user
.
getUser
GroupId
()
NetUtil
.
xtfkgl
.
ajList
(
ruleForm
)
...
...
src/views/xtfkgl/RyXtljfkView.vue
View file @
a45fd468
...
...
@@ -353,8 +353,8 @@ export default {
ruleForm
.
page
=
page
ruleForm
.
limit
=
limit
ruleForm
.
userId
=
user
.
getUser
().
user
.
id
ruleForm
.
userGroupIds
=
user
.
getUser
().
groupIds
ruleForm
.
userId
=
user
.
getUser
().
id
ruleForm
.
userGroupIds
=
user
.
getUser
GroupId
()
logger
.
info
(
'user'
,
user
.
getUser
())
...
...
src/views/xtfkgl/scss/dialog_table.scss
View file @
a45fd468
...
...
@@ -121,6 +121,14 @@
color
:
#e60012
;
box-shadow
:
0px
6px
10px
2px
rgba
(
0
,
21
,
51
,
0
.06
);
}
/
deep
/
.el-form-item__label
{
&
:
:
before
{
position
:
absolute
;
left
:
-10px
;
//transform: translateY(-70px);
}
}
}
.input-item-sm
{
...
...
@@ -135,8 +143,7 @@
background
:
#F6F8FA
;
box-shadow
:
0px
1px
2px
0px
rgba
(
5
,
95
,
231
,
0
.18
);
border-radius
:
4px
;
border
:
1px
solid
#EEEEEE
;
background
:
black
;
border
:
0px
solid
#EEEEEE
;
}
/
deep
/
.el-input__inner
{
...
...
@@ -151,6 +158,15 @@
border-radius
:
4px
;
border
:
1px
solid
#EEEEEE
;
}
.el-form-item__label
{
&
:
:
before
{
position
:
absolute
;
left
:
0px
;
//transform: translateX(70px);
}
}
}
...
...
@@ -537,11 +553,11 @@
font-family
:
HarmonyOS_Sans_SC
;
color
:
#333333
;
&
:
:
before
{
position
:
absolute
;
left
:
-10px
;
//transform: translateY(3
px);
}
//
&::before {
//
position: absolute;
//
left: -10px;
// transform: translateY(-70
px);
//
}
}
.is-error
{
...
...
src/views/zzwcj/fingerprint.scss
View file @
a45fd468
...
...
@@ -69,6 +69,7 @@ $picSelected: var(--picSelected ,#0060F0); //选中边框色
$boxdesc
:
var
(
--
boxdesc
,
#666660
);
//#dddddd #21272A
$anaphoraBg
:
var
(
--
anaphoraBg
,
#ffffff
);
//#1b1b1b #D6DBE1 //补采的背景
$bucai
:
var
(
--
bucai
,
#ffffff
);
//补采两个字
$hegeBorder
:
var
(
--
hegeBorder
,
#17d010
);
//合格的边框
// 按钮
$btnBorder
:
var
(
--
btnBorder
,
#AEB5C2
);
//#464646 #979FA8
$btnfontColor
:
var
(
--
btnfontColor
,
#2E3846
);
// #efefef #343A3F
...
...
@@ -143,10 +144,12 @@ $lookingBorder: var(--lookingBorder,#cccccc);
$uploadingBg
:
var
(
--
uploadingBg
,
#ffffff
);
//上传时背景
$uploadingContentBorder
:
var
(
--
uploadingContentBorder
,
#ffffff
);
//方块边框
$uploadingProgressText
:
var
(
--
uploadingProgressText
,
#333333
);
//百分比颜色
$uploadingcircleBg
:
var
(
--
uploadingcircleBg
,
#
17D010
);
$uploading
Color
:
var
(
--
uploadingColor
,
#333333
);
$uploadingcircleBg
:
var
(
--
uploadingcircleBg
,
#
F6F8FA
);
//进度条背景
$uploading
TitleColor
:
var
(
--
uploadingTitleColor
,
#333333
);
//正在上传中字
$uploadingBorder
:
var
(
--
uploadingBorder
,
0
);
// 2px
$uploadingFinishedBg
:
var
(
--
uploadingFinishedBg
,
#ffffff
);
// 指纹上传完成背景
$uploadingFinishedTitle
:
var
(
--
uploadingFinishedTitle
,
#333333
);
//指纹上传完成 字
$uploadingErrorBg
:
var
(
--
uploadingErrorBg
,
#ffffff
);
//上传失败背景
// el-dialog背景色
$elDialog
:
var
(
--
elDialog
,
#ffffff
);
// #CCD2D8
...
...
@@ -1381,8 +1384,9 @@ $dashed:var(--dashed,#055FE7);
border
:
2px
solid
$pichover
;
}
.pic.noget
{
background
:
#292929
;
background
:
$anaphoraBg
;
position
:
relative
;
border
:
1px
solid
$hegeBorder
;
span
{
font-size
:
12px
;
font-family
:
HarmonyOS_Sans_SC
;
...
...
@@ -1415,7 +1419,7 @@ $dashed:var(--dashed,#055FE7);
}
.pic.anaphora
,
.pic.get
{
border
:
2px
solid
#
e82510
;
border
:
2px
solid
#
ff0039
;
display
:
flex
;
justify-content
:
center
;
align-items
:
center
;
...
...
@@ -1426,7 +1430,7 @@ $dashed:var(--dashed,#055FE7);
align-items
:
center
;
width
:
68px
;
height
:
28px
;
background
:
#
e82510
;
background
:
#
ff0039
;
opacity
:
1
;
border-radius
:
4px
;
font-size
:
14px
;
...
...
@@ -2818,9 +2822,11 @@ $dashed:var(--dashed,#055FE7);
.uploading-finished
{
width
:
480px
;
height
:
286px
;
background
:
#3f3f3f
;
// background: #3f3f3f;
background
:
$uploadingFinishedBg
;
border-radius
:
0px
0px
4px
4px
;
border
:
1px
solid
#535353
;
// border: 1px solid #535353;
border
:
1px
solid
$uploadingBorder
;
display
:
flex
;
justify-content
:
center
;
align-items
:
center
;
...
...
@@ -2833,7 +2839,8 @@ $dashed:var(--dashed,#055FE7);
margin-top
:
30px
;
font-size
:
24px
;
font-family
:
HarmonyOS_Sans_SC
;
color
:
#d8d8d8
;
// color: #d8d8d8;
color
:
$uploadingFinishedTitle
}
.uploading-finished-tip
{
margin-top
:
12px
;
...
...
@@ -2845,9 +2852,11 @@ $dashed:var(--dashed,#055FE7);
.uploading-error
{
width
:
480px
;
height
:
286px
;
background
:
#3f3f3f
;
// background: #3f3f3f;
background
:
$uploadingErrorBg
;
border-radius
:
0px
0px
4px
4px
;
border
:
1px
solid
#535353
;
// border: 1px solid #535353;
border
:
1px
solid
$uploadingBorder
;
display
:
flex
;
justify-content
:
center
;
align-items
:
center
;
...
...
@@ -2885,7 +2894,7 @@ $dashed:var(--dashed,#055FE7);
font-size
:
16px
;
font-family
:
HarmonyOS_Sans_SC
;
// color: #d8d8d8;
color
:
$uploadingColor
color
:
$uploading
Title
Color
}
.uploading-tip
{
margin-top
:
12px
;
...
...
src/views/zzwcj/fingerprint.vue
View file @
a45fd468
...
...
@@ -228,7 +228,8 @@
<button
v-else-if=
"item.statusR == 5"
class=
"pic noget"
>
<span>
合格指纹
</span>
<div
class=
"correct"
>
<img
src=
"../../assets/img/zw/correct.png"
alt=
""
>
<img
v-show=
"themeType == '深色'"
src=
"../../assets/img/zw/correct.png"
alt=
""
>
<img
v-show=
"themeType == '默认' || themeType == '浅色'"
src=
"../../assets/img/zw/upload-finish.png"
alt=
""
>
</div>
</button>
<button
v-else-if=
"item.statusR == 6"
class=
"pic get"
@
click=
"oddAndDouble(item, i, 'r')"
>
...
...
@@ -271,7 +272,8 @@
<button
v-else-if=
"item.statusL == 5"
class=
"pic noget"
>
<span>
合格指纹
</span>
<div
class=
"correct"
>
<img
src=
"../../assets/img/zw/correct.png"
alt=
""
>
<img
v-show=
"themeType == '深色'"
src=
"../../assets/img/zw/correct.png"
alt=
""
>
<img
v-show=
"themeType == '默认' || themeType == '浅色'"
src=
"../../assets/img/zw/upload-finish.png"
alt=
""
>
</div>
</button>
<button
v-else-if=
"item.statusL == 6"
class=
"pic get"
@
click=
"oddAndDouble(item, i, 'l')"
>
...
...
@@ -315,7 +317,8 @@
<button
v-else-if=
"item.statusR == 5"
class=
"pic noget"
>
<span>
合格指纹
</span>
<div
class=
"correct"
>
<img
src=
"../../assets/img/zw/correct.png"
alt=
""
>
<img
v-show=
"themeType == '深色'"
src=
"../../assets/img/zw/correct.png"
alt=
""
>
<img
v-show=
"themeType == '默认' || themeType == '浅色'"
src=
"../../assets/img/zw/upload-finish.png"
alt=
""
>
</div>
</button>
<button
v-else-if=
"item.statusR == 6"
class=
"pic get"
@
click=
"oddAndDouble(item, i+5, 'r')"
>
...
...
@@ -357,7 +360,8 @@
<button
v-else-if=
"item.statusL == 5"
class=
"pic noget"
>
<span>
合格指纹
</span>
<div
class=
"correct"
>
<img
src=
"../../assets/img/zw/correct.png"
alt=
""
>
<img
v-show=
"themeType == '深色'"
src=
"../../assets/img/zw/correct.png"
alt=
""
>
<img
v-show=
"themeType == '默认' || themeType == '浅色'"
src=
"../../assets/img/zw/upload-finish.png"
alt=
""
>
</div>
</button>
<button
v-else-if=
"item.statusL == 6"
class=
"pic get"
@
click=
"oddAndDouble(item, i+5, 'l')"
>
...
...
@@ -710,7 +714,7 @@ export default {
// 实现展示上传进度
uploadingStart
:
false
,
// 是否显示进度百分比
isShowUploadingTxt
:
fals
e
,
isShowUploadingTxt
:
tru
e
,
// 上传进度条颜色
uploadingColor
:
'#17D010'
,
// 是否上传失败
...
...
@@ -1157,6 +1161,7 @@ export default {
// //console.log(this.rybh);
},
async
mounted
()
{
// this.uploadingColor = "#fff"
// this.uploadingStart = true
// let timePercentage = setInterval(() => {
// this.percentage++
...
...
@@ -1164,7 +1169,6 @@ export default {
// clearInterval(timePercentage)
// }
// }, 1000);
let
self
=
this
/************************/
function
getIPs
(
callback
)
{
...
...
@@ -1408,11 +1412,12 @@ export default {
NProgress
.
done
();
}
this
.
getPersonInfo
()
// this.uploadingStart = false
// this.uploadingStart = true
// // 是否上传失败
// this.isUploadingError =
tru
e
// this.isUploadingError =
fals
e
// // 是否展示最终上传完成
// this.uploadingClose = 'uploading
Error
'
// this.uploadingClose = 'uploading
Finish
'
// // 是否上传成功
// this.isUploadingFinish = false
...
...
@@ -8944,6 +8949,7 @@ export default {
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--boxdesc'
,
'#666660'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--anaphoraBg'
,
'#FFFFFF'
);
//补采背景色
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--bucai'
,
'#FFFFFF'
);
//补采字色
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--hegeBorder'
,
'#17d010'
);
//合格边框
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--btnBorder'
,
'#AEB5C2'
);
//按钮边框
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--btnfontColor'
,
'#2E3846'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--btnhover'
,
'#efefef'
);
...
...
@@ -9009,9 +9015,12 @@ export default {
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--uploadingBg'
,
'#ffffff'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--uploadingContentBorder'
,
'#ffffff'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--uploadingProgressText'
,
'#333333'
);
// document.getElementsByTagName('body')[0].style.setProperty('--uploadingcircleBg', '#17D010
');
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--uploadingcircleBg'
,
'#F6F8FA
'
);
this
.
uploadingColor
=
"#17D010"
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--uploadingColor'
,
'#333333'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--uploadingTitleColor'
,
'#333333'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--uploadingFinishedBg'
,
'#ffffff'
);
//上传完成背景图
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--uploadingFinishedTitle'
,
'#333333'
);
//上传完成title
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--uploadingErrorBg'
,
'#ffffff'
);
//上传失败背景
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--cirBackground'
,
'#055fe7'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--cirDuigou'
,
'#fff'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--span'
,
'#055fe7'
);
...
...
@@ -9074,6 +9083,7 @@ export default {
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--boxdesc'
,
'#dddddd'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--anaphoraBg'
,
'#1B1B1B'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--bucai'
,
'#000000'
);
//补采字色
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--hegeBorder'
,
'#17d010'
);
//合格边框
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--btnBorder'
,
'#464646'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--btnfontColor'
,
'#efefef'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--btnhover'
,
'#efefef'
);
...
...
@@ -9136,12 +9146,15 @@ export default {
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--dialogBtnHover'
,
'#dddddd'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--dialogBtnHoverSpan'
,
'#dddddd'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--versionColor'
,
'#fff'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--uploadingBg'
,
'
rgba(216, 216, 216, 0.4)
'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--uploadingContentBorder'
,
'
rgba(216, 216, 216, 0.4)
'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--uploadingBg'
,
'
#3f3f3f
'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--uploadingContentBorder'
,
'
#3f3f3f
'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--uploadingProgressText'
,
'#ffffff'
);
// document.getElementsByTagName('body')[0].style.setProperty('--uploadingcircleBg', '#333333');
this
.
uploadingColor
=
"#fff"
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--uploadingColor'
,
'#d8d8d8'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--uploadingcircleBg'
,
'#333333'
);
this
.
uploadingColor
=
"#ffffff"
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--uploadingTitleColor'
,
'#d8d8d8'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--uploadingFinishedBg'
,
'#3f3f3f'
);
//上传完成背景图
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--uploadingFinishedTitle'
,
'#d8d8d8'
);
//上传完成title
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--uploadingErrorBg'
,
'#3f3f3f'
);
//上传失败背景
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--cirBackground'
,
'#D8D8D8'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--cirDuigou'
,
'#181614 '
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--span'
,
'#ffffff'
);
...
...
@@ -9203,7 +9216,8 @@ export default {
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--picSelected'
,
'#ffc005'
);
//选中的颜色
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--boxdesc'
,
'#21272A'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--anaphoraBg'
,
'#D6DBE1'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--bucai'
,
'#000000'
);
//补采字色
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--bucai'
,
'#ffffff'
);
//补采字色
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--hegeBorder'
,
'#17d010 '
);
//合格边框
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--btnBorder'
,
'#979FA8'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--btnfontColor'
,
'#343A3F'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--btnhover'
,
'#4A4E52'
);
...
...
@@ -9266,17 +9280,21 @@ export default {
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--dialogBtnHover'
,
'#86919B'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--dialogBtnHoverSpan'
,
'#323942'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--versionColor'
,
'#000'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--uploadingBg'
,
'
rgba(216, 216, 216, 0.4)
'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--uploadingContentBorder'
,
'
rgba(216, 216, 216, 0.4)
'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--uploadingBg'
,
'
#3f3f3f
'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--uploadingContentBorder'
,
'
#3f3f3f
'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--uploadingProgressText'
,
'#ffffff'
);
// document.getElementsByTagName('body')[0].style.setProperty('--uploadingcircleBg', '#333333');
this
.
uploadingColor
=
"#fff"
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--uploadingColor'
,
'#d8d8d8'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--cirBackground'
,
'#D8D8D8'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--uploadingcircleBg'
,
'#333333'
);
this
.
uploadingColor
=
"#ffffff"
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--uploadingTitleColor'
,
'#d8d8d8'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--uploadingFinishedBg'
,
'#3f3f3f'
);
//上传完成背景
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--uploadingFinishedTitle'
,
'#d8d8d8'
);
//上传完成title
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--uploadingErrorBg'
,
'#3f3f3f'
);
//上传失败背景
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--cirBackground'
,
'#2f3942'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--cirDuigou'
,
'#ffffff '
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--span'
,
'#ffffff'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--solid'
,
'#ffffff'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--dashed'
,
'#ffffff'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--span'
,
'#2f3942'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--solid'
,
'#4d5357'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--dashed'
,
'#4d5357'
);
this
.
isShowColor
=
false
},
/**
...
...
src/views/zzwlr/xzry.vue
View file @
a45fd468
...
...
@@ -217,7 +217,6 @@
},
data
()
{
return
{
isZjhm
:
/
(
^
[
1-9
]\d{5}(
18|19|
([
23
]\d))\d{2}((
0
[
1-9
])
|
(
10|11|12
))(([
0-2
][
1-9
])
|10|20|30|31
)\d{3}[
0-9Xx
]
$
)
|
(
^
[
1-9
]\d{5}\d{2}((
0
[
1-9
])
|
(
10|11|12
))(([
0-2
][
1-9
])
|10|20|30|31
)\d{2}
$
)
/
,
numbers
:
[
0
,
1
,
2
,
3
,
4
,
5
,
6
,
7
,
8
,
9
],
ryInfo
:
{},
// edit: '新增人员',
...
...
@@ -359,11 +358,17 @@
// console.log(this.$route.params.type==='edit');
this
.
edit
=
"新增人员"
;
}
// this.ruleForm.cyzjdm == "111" ? this.isZjhm : /^(?:0|[1-9]\d{3,30})?$/
if
(
this
.
ruleForm
.
cyzjdm
==
"111"
)
{
this
.
isZjhm
=
/
(
^
[
1-9
]\d{5}(
18|19|
([
23
]\d))\d{2}((
0
[
1-9
])
|
(
10|11|12
))(([
0-2
][
1-9
])
|10|20|30|31
)\d{3}[
0-9Xx
]
$
)
|
(
^
[
1-9
]\d{5}\d{2}((
0
[
1-9
])
|
(
10|11|12
))(([
0-2
][
1-9
])
|10|20|30|31
)\d{2}
$
)
/
}
else
{
this
.
isZjhm
=
/^
(?:
0|
[
1-9
]\d{3,30})?
$/
},
watch
:{
"ruleForm.cyzjdm"
(
newV
,
oldV
){
// console.log(newV)
if
(
this
.
ruleForm
.
cyzjdm
==
'111'
){
console
.
log
(
this
.
rules
.
zjhm
[
1
]);
this
.
$set
(
this
.
rules
.
zjhm
[
1
],
"pattern"
,
/
(
^
[
1-9
]\d{5}(
18|19|
([
23
]\d))\d{2}((
0
[
1-9
])
|
(
10|11|12
))(([
0-2
][
1-9
])
|10|20|30|31
)\d{3}[
0-9Xx
]
$
)
|
(
^
[
1-9
]\d{5}\d{2}((
0
[
1-9
])
|
(
10|11|12
))(([
0-2
][
1-9
])
|10|20|30|31
)\d{2}
$
)
/
)
}
else
{
this
.
$set
(
this
.
rules
.
zjhm
[
1
],
"pattern"
,
/^
(?:
0|
[
1-9
]\d{3,30})?
$/
)
}
}
},
methods
:
{
...
...
@@ -396,12 +401,6 @@
this
.
ruleForm
.
nyryGmsfhm
=
"132910199608122049"
this
.
ruleForm
.
nyryLxdh
=
"13111133331"
// if(this.ruleForm.cyzjdm == "111") {
// this.$set(this.rules.zjhm[1], 'pattern', /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}$)/)
// } else {
// this.$set(this.rules.zjhm[1], 'pattern', /^(?:0|[1-9]\d{3,30})?$/)
// }
console
.
log
(
this
.
rules
.
zjhm
);
},
disabledDate
(
a
)
{
if
(
a
.
getTime
()
>
new
Date
().
getTime
())
{
...
...
src/views/zzwlr/xzryedit.vue
View file @
a45fd468
...
...
@@ -10,7 +10,8 @@
<div
id=
"xzry"
>
<div
class=
"top"
>
<div
class=
"fir"
>
<div
class=
"cir"
@
click=
"auto"
>
1
</div>
<div
class=
"cir"
>
1
</div>
<!-- @click="auto" -->
<span>
人员信息
</span>
<div
class=
"dashed"
></div>
</div>
...
...
@@ -35,7 +36,7 @@
<!-- 二 -->
<el-row
class=
"item-row"
>
<el-form-item
label=
"人员编号:"
prop=
"ysxtAsjxgrybh"
>
<el-input
v-model
.
trim=
"ruleForm.ysxtAsjxgrybh"
placeholder=
"请输入人员编号"
maxlength=
"22"
class=
"inputBh"
<el-input
v-model
.
trim=
"ruleForm.ysxtAsjxgrybh"
placeholder=
"请输入人员编号"
maxlength=
"22"
class=
"inputBh"
disabled
show-word-limit
clearable
>
<template
slot=
"prepend"
class=
"preR"
>
R
</
template
>
</el-input>
...
...
@@ -195,7 +196,7 @@
<div>
<span
slot=
"footer"
class=
"dialog-footer"
>
<!-- <el-button @click="submitForm('ruleForm')">提交</el-button> -->
<el-button
@
click=
"tijiao('ruleForm')"
>
提交
并新增指掌纹
</el-button>
<el-button
@
click=
"tijiao('ruleForm')"
>
修改
并新增指掌纹
</el-button>
<el-button
@
click=
"resetForm('ruleForm')"
type=
"primary"
>
取消
</el-button>
</span>
...
...
@@ -299,7 +300,15 @@
cyzjdm
:
[
{
required
:
true
,
message
:
"请选择证件类型"
,
trigger
:
"blur"
},
],
zjhm
:
[{
required
:
true
,
message
:
"请输入证件号码"
,
trigger
:
"blur"
}],
zjhm
:
[
{
required
:
true
,
message
:
"请输入证件号码"
,
trigger
:
"blur"
},
{
pattern
:
/
(
^
[
1-9
]\d{5}(
18|19|
([
23
]\d))\d{2}((
0
[
1-9
])
|
(
10|11|12
))(([
0-2
][
1-9
])
|10|20|30|31
)\d{3}[
0-9Xx
]
$
)
|
(
^
[
1-9
]\d{5}\d{2}((
0
[
1-9
])
|
(
10|11|12
))(([
0-2
][
1-9
])
|10|20|30|31
)\d{2}
$
)
/
,
message
:
"证件号码格式有误!"
,
trigger
:
"blur"
,
},
],
hjdzXzqhdm
:
[
{
required
:
true
,
message
:
"请选择户籍地行政区"
,
trigger
:
"blur"
},
],
...
...
@@ -341,6 +350,17 @@
id
:
''
};
},
watch
:{
"ruleForm.cyzjdm"
(
newV
,
oldV
){
// console.log(newV)
if
(
this
.
ruleForm
.
cyzjdm
==
'111'
){
console
.
log
(
this
.
rules
.
zjhm
[
1
]);
this
.
$set
(
this
.
rules
.
zjhm
[
1
],
"pattern"
,
/
(
^
[
1-9
]\d{5}(
18|19|
([
23
]\d))\d{2}((
0
[
1-9
])
|
(
10|11|12
))(([
0-2
][
1-9
])
|10|20|30|31
)\d{3}[
0-9Xx
]
$
)
|
(
^
[
1-9
]\d{5}\d{2}((
0
[
1-9
])
|
(
10|11|12
))(([
0-2
][
1-9
])
|10|20|30|31
)\d{2}
$
)
/
)
}
else
{
this
.
$set
(
this
.
rules
.
zjhm
[
1
],
"pattern"
,
/^
(?:
0|
[
1-9
]\d{3,30})?
$/
)
}
}
},
mounted
()
{
// console.log(this.ruleForm.cjxxyydm);
// console.log(this.$route.query.barcode)
...
...
@@ -355,8 +375,34 @@
},
methods
:
{
auto
(){
this
.
ruleForm
.
ysxtAsjxgrybh
=
Math
.
random
(
22
)
console
.
log
(
this
.
ruleForm
.
ysxtAsjxgrybh
);
var
code
=
""
;
for
(
var
i
=
0
;
i
<
22
;
i
++
)
{
var
r1
=
parseInt
(
Math
.
random
()
*
this
.
numbers
.
length
)
code
+=
r1
}
// console.log(code);
this
.
ruleForm
.
ysxtAsjxgrybh
=
code
this
.
ruleForm
.
jzrybh
=
code
this
.
ruleForm
.
asjxgrybh
=
code
this
.
ruleForm
.
zzhwkbh
=
code
this
.
ruleForm
.
cjxxyydm
=
[
"01"
,
"02"
]
this
.
ruleForm
.
xm
=
"李明"
this
.
ruleForm
.
xbdm
=
"1"
this
.
ruleForm
.
csrq
=
"2022-01-17"
this
.
ruleForm
.
gjdm
=
"156"
//中国
this
.
ruleForm
.
mzdm
=
"01"
//汉族
this
.
ruleForm
.
cyzjdm
=
"111"
//身份证号
this
.
ruleForm
.
zjhm
=
"140911199909091425"
//身份证号
this
.
ruleForm
.
hjdzXzqhdm
=
"110000"
//北京市
this
.
ruleForm
.
hjdzDzmc
=
"海淀区"
this
.
ruleForm
.
xzzXzqhdm
=
"110000"
//北京市
this
.
ruleForm
.
xzzDzmc
=
"海淀区"
this
.
ruleForm
.
nydwGajgjgdm
=
"430000000000"
//湖南省公安
this
.
ruleForm
.
nyryXm
=
"李雷雷"
this
.
ruleForm
.
nysj
=
"2022-01-17"
this
.
ruleForm
.
nyryGmsfhm
=
"132910199608122049"
this
.
ruleForm
.
nyryLxdh
=
"13111133331"
},
disabledDate
(
a
)
{
if
(
a
.
getTime
()
>
new
Date
().
getTime
())
{
...
...
@@ -536,7 +582,7 @@
if
(
this
.
ryInfo
.
cjxxyydm
)
{
this
.
ruleForm
.
cjxxyydm
=
this
.
ryInfo
.
cjxxyydm
.
split
(
","
);
}
console
.
log
(
this
.
ruleForm
.
cjxxyydm
);
//
console.log(this.ruleForm.cjxxyydm);
this
.
ruleForm
.
zzhwkbh
=
this
.
ryInfo
.
zzhwkbh
;
this
.
ruleForm
.
asjxgrybh
=
this
.
ryInfo
.
asjxgrybh
;
this
.
ruleForm
.
xm
=
this
.
ryInfo
.
xm
;
...
...
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