Skip to content

F
founder_vue
Commit f5491c9b by 李姝悦
Options

1.隐藏按钮 2.采集指纹弹窗

parent 38c3f44d
Showing with 89 additions and 24 deletions
src/views/zzwcj/fingerprint.scss
...@@ -69,6 +69,7 @@ $picSelected: var(--picSelected ,#0060F0); //选中边框色 ...@@ -69,6 +69,7 @@ $picSelected: var(--picSelected ,#0060F0); //选中边框色
$boxdesc: var(--boxdesc,#666660 ); //#dddddd #21272A $boxdesc: var(--boxdesc,#666660 ); //#dddddd #21272A
$anaphoraBg: var(--anaphoraBg,#ffffff ); //#1b1b1b #D6DBE1 //补采的背景 $anaphoraBg: var(--anaphoraBg,#ffffff ); //#1b1b1b #D6DBE1 //补采的背景
$bucai: var(--bucai,#ffffff); //补采两个字 $bucai: var(--bucai,#ffffff); //补采两个字
$hegeBorder: var(--hegeBorder , #17d010);//合格的边框
// 按钮 // 按钮
$btnBorder: var(--btnBorder, #AEB5C2 ); //#464646 #979FA8 $btnBorder: var(--btnBorder, #AEB5C2 ); //#464646 #979FA8
$btnfontColor: var(--btnfontColor,#2E3846); // #efefef #343A3F $btnfontColor: var(--btnfontColor,#2E3846); // #efefef #343A3F
...@@ -143,10 +144,12 @@ $lookingBorder: var(--lookingBorder,#cccccc); ...@@ -143,10 +144,12 @@ $lookingBorder: var(--lookingBorder,#cccccc);
$uploadingBg:var(--uploadingBg,#ffffff); //上传时背景 $uploadingBg:var(--uploadingBg,#ffffff); //上传时背景
$uploadingContentBorder:var(--uploadingContentBorder,#ffffff); //方块边框 $uploadingContentBorder:var(--uploadingContentBorder,#ffffff); //方块边框
$uploadingProgressText: var(--uploadingProgressText, #333333);//百分比颜色 $uploadingProgressText: var(--uploadingProgressText, #333333);//百分比颜色
$uploadingcircleBg:var(--uploadingcircleBg,#17D010); $uploadingcircleBg:var(--uploadingcircleBg,#F6F8FA);//进度条背景
$uploadingColor:var(--uploadingColor,#333333); $uploadingTitleColor:var(--uploadingTitleColor,#333333); //正在上传中字
$uploadingBorder: var(--uploadingBorder, 0); // 2px $uploadingBorder: var(--uploadingBorder, 0); // 2px
$uploadingFinishedBg:var(--uploadingFinishedBg , #ffffff);// 指纹上传完成背景
$uploadingFinishedTitle:var(--uploadingFinishedTitle,#333333); //指纹上传完成 字
$uploadingErrorBg:var(--uploadingErrorBg , #ffffff);//上传失败背景
// el-dialog背景色 // el-dialog背景色
$elDialog: var(--elDialog, #ffffff); // #CCD2D8 $elDialog: var(--elDialog, #ffffff); // #CCD2D8
...@@ -1381,8 +1384,9 @@ $dashed:var(--dashed,#055FE7); ...@@ -1381,8 +1384,9 @@ $dashed:var(--dashed,#055FE7);
border: 2px solid $pichover; border: 2px solid $pichover;
} }
.pic.noget { .pic.noget {
background: #292929; background: $anaphoraBg;
position: relative; position: relative;
border:1px solid $hegeBorder;
span { span {
font-size: 12px; font-size: 12px;
font-family: HarmonyOS_Sans_SC; font-family: HarmonyOS_Sans_SC;
...@@ -1415,7 +1419,7 @@ $dashed:var(--dashed,#055FE7); ...@@ -1415,7 +1419,7 @@ $dashed:var(--dashed,#055FE7);
} }
.pic.anaphora, .pic.anaphora,
.pic.get { .pic.get {
border: 2px solid #e82510; border: 2px solid #ff0039;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
...@@ -1426,7 +1430,7 @@ $dashed:var(--dashed,#055FE7); ...@@ -1426,7 +1430,7 @@ $dashed:var(--dashed,#055FE7);
align-items: center; align-items: center;
width: 68px; width: 68px;
height: 28px; height: 28px;
background: #e82510; background: #ff0039;
opacity: 1; opacity: 1;
border-radius: 4px; border-radius: 4px;
font-size: 14px; font-size: 14px;
...@@ -2818,9 +2822,11 @@ $dashed:var(--dashed,#055FE7); ...@@ -2818,9 +2822,11 @@ $dashed:var(--dashed,#055FE7);
.uploading-finished { .uploading-finished {
width: 480px; width: 480px;
height: 286px; height: 286px;
background: #3f3f3f; // background: #3f3f3f;
background: $uploadingFinishedBg;
border-radius: 0px 0px 4px 4px; border-radius: 0px 0px 4px 4px;
border: 1px solid #535353; // border: 1px solid #535353;
border:1px solid $uploadingBorder;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
...@@ -2833,7 +2839,8 @@ $dashed:var(--dashed,#055FE7); ...@@ -2833,7 +2839,8 @@ $dashed:var(--dashed,#055FE7);
margin-top: 30px; margin-top: 30px;
font-size: 24px; font-size: 24px;
font-family: HarmonyOS_Sans_SC; font-family: HarmonyOS_Sans_SC;
color: #d8d8d8; // color: #d8d8d8;
color:$uploadingFinishedTitle
} }
.uploading-finished-tip { .uploading-finished-tip {
margin-top: 12px; margin-top: 12px;
...@@ -2845,9 +2852,11 @@ $dashed:var(--dashed,#055FE7); ...@@ -2845,9 +2852,11 @@ $dashed:var(--dashed,#055FE7);
.uploading-error { .uploading-error {
width: 480px; width: 480px;
height: 286px; height: 286px;
background: #3f3f3f; // background: #3f3f3f;
background: $uploadingErrorBg;
border-radius: 0px 0px 4px 4px; border-radius: 0px 0px 4px 4px;
border: 1px solid #535353; // border: 1px solid #535353;
border:1px solid $uploadingBorder;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
...@@ -2885,7 +2894,7 @@ $dashed:var(--dashed,#055FE7); ...@@ -2885,7 +2894,7 @@ $dashed:var(--dashed,#055FE7);
font-size: 16px; font-size: 16px;
font-family: HarmonyOS_Sans_SC; font-family: HarmonyOS_Sans_SC;
// color: #d8d8d8; // color: #d8d8d8;
color:$uploadingColor color:$uploadingTitleColor
} }
.uploading-tip { .uploading-tip {
margin-top: 12px; margin-top: 12px;
......
src/views/zzwlr/xzry.vue
...@@ -217,7 +217,6 @@ ...@@ -217,7 +217,6 @@
}, },
data() { data() {
return { 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], numbers : [0,1,2,3,4,5,6,7,8,9],
ryInfo: {}, ryInfo: {},
// edit: '新增人员', // edit: '新增人员',
...@@ -304,9 +303,8 @@ ...@@ -304,9 +303,8 @@
zjhm: [ zjhm: [
{ required: true, message: "请输入证件号码", trigger: "blur" }, { required: true, message: "请输入证件号码", trigger: "blur" },
{ {
pattern: this.isZjhm, 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}$)/, /(^[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: "证件号码格式有误！", message: "证件号码格式有误！",
trigger: "blur", trigger: "blur",
}, },
...@@ -360,7 +358,18 @@ ...@@ -360,7 +358,18 @@
// console.log(this.$route.params.type==='edit'); // console.log(this.$route.params.type==='edit');
this.edit = "新增人员"; this.edit = "新增人员";
} }
this.ruleForm.cyzjdm = "111" ? 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: { methods: {
auto(){ auto(){
...@@ -391,6 +400,7 @@ ...@@ -391,6 +400,7 @@
this.ruleForm.nysj = "2022-01-17" this.ruleForm.nysj = "2022-01-17"
this.ruleForm.nyryGmsfhm = "132910199608122049" this.ruleForm.nyryGmsfhm = "132910199608122049"
this.ruleForm.nyryLxdh = "13111133331" this.ruleForm.nyryLxdh = "13111133331"
}, },
disabledDate(a) { disabledDate(a) {
if (a.getTime() > new Date().getTime()) { if (a.getTime() > new Date().getTime()) {
......
src/views/zzwlr/xzryedit.vue
...@@ -10,7 +10,8 @@ ...@@ -10,7 +10,8 @@
<div id="xzry"> <div id="xzry">
<div class="top"> <div class="top">
<div class="fir"> <div class="fir">
<div class="cir" @click="auto">1</div> <div class="cir">1</div>
<!-- @click="auto" -->
<span>人员信息 </span> <span>人员信息 </span>
<div class="dashed"></div> <div class="dashed"></div>
</div> </div>
...@@ -35,7 +36,7 @@ ...@@ -35,7 +36,7 @@
<!-- 二 --> <!-- 二 -->
<el-row class="item-row"> <el-row class="item-row">
<el-form-item label="人员编号：" prop="ysxtAsjxgrybh"> <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> show-word-limit clearable>
<template slot="prepend" class="preR">R</template> <template slot="prepend" class="preR">R</template>
</el-input> </el-input>
...@@ -195,7 +196,7 @@ ...@@ -195,7 +196,7 @@
<div> <div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<!-- <el-button @click="submitForm('ruleForm')">提交</el-button> --> <!-- <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> <el-button @click="resetForm('ruleForm')" type="primary">取消</el-button>
</span> </span>
...@@ -299,7 +300,15 @@ ...@@ -299,7 +300,15 @@
cyzjdm: [ cyzjdm: [
{ required: true, message: "请选择证件类型", trigger: "blur" }, { 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: [ hjdzXzqhdm: [
{ required: true, message: "请选择户籍地行政区", trigger: "blur" }, { required: true, message: "请选择户籍地行政区", trigger: "blur" },
], ],
...@@ -341,6 +350,17 @@ ...@@ -341,6 +350,17 @@
id: '' 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() { mounted() {
// console.log(this.ruleForm.cjxxyydm); // console.log(this.ruleForm.cjxxyydm);
// console.log(this.$route.query.barcode) // console.log(this.$route.query.barcode)
...@@ -355,8 +375,34 @@ ...@@ -355,8 +375,34 @@
}, },
methods: { methods: {
auto(){ auto(){
this.ruleForm.ysxtAsjxgrybh = Math.random(22) var code = "";
console.log(this.ruleForm.ysxtAsjxgrybh); 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) { disabledDate(a) {
if (a.getTime() > new Date().getTime()) { if (a.getTime() > new Date().getTime()) {
...@@ -536,7 +582,7 @@ ...@@ -536,7 +582,7 @@
if (this.ryInfo.cjxxyydm) { if (this.ryInfo.cjxxyydm) {
this.ruleForm.cjxxyydm = this.ryInfo.cjxxyydm.split(","); 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.zzhwkbh = this.ryInfo.zzhwkbh;
this.ruleForm.asjxgrybh = this.ryInfo.asjxgrybh; this.ruleForm.asjxgrybh = this.ryInfo.asjxgrybh;
this.ruleForm.xm = this.ryInfo.xm; this.ruleForm.xm = this.ryInfo.xm;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment