Skip to content

F
founder_vue
Commit 3e858a1f by 张超军
Options

Merge branch 'dev_zwpt' of http://39.99.224.27:9022/changchao/founder_vue into dev_zwpt

parents 30c2f424 38c3f44d
Showing with 147 additions and 23 deletions
src/assets/img/zw/duigou.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="37px" height="26px" viewBox="0 0 37 26" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Rectangle 34备份</title>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="补采-上传完成2" transform="translate(-942.000000, -375.000000)" fill="#17D010">
<g id="编组-5" transform="translate(720.000000, 300.000000)">
<g id="编组-9备份" transform="translate(172.000000, 20.000000)">
<path d="M62.4089152,79.6193352 L51.1028239,68.7493606 C50.532963,68.2014813 50.5151434,67.2953737 51.0630227,66.7255128 C51.0850134,66.7026398 51.1077586,66.6805044 51.1312205,66.6591431 C51.7680133,66.0793674 52.7450855,66.0919785 53.3667023,66.6879966 L63.844974,76.7347645 L63.844974,76.7347645 L83.6921156,56.1081157 C84.2830401,55.4939823 85.2580012,55.4693559 85.8791771,56.0528728 C86.4886453,56.6253919 86.5185985,57.583582 85.9460794,58.1930502 C85.9407097,58.1987664 85.9352958,58.2044407 85.929838,58.2100728 L65.2313048,79.5694103 C64.4647705,80.3604163 63.2029452,80.3827366 62.4089152,79.6193352 Z" id="Rectangle-34备份"></path>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/views/zzwcj/fingerprint.scss
......@@ -143,6 +143,8 @@ $lookingBorder: var(--lookingBorder,#cccccc);
$uploadingBg:var(--uploadingBg,#ffffff); //上传时背景
$uploadingContentBorder:var(--uploadingContentBorder,#ffffff); //方块边框
$uploadingProgressText: var(--uploadingProgressText, #333333);//百分比颜色
$uploadingcircleBg:var(--uploadingcircleBg,#17D010);
$uploadingColor:var(--uploadingColor,#333333);
$uploadingBorder: var(--uploadingBorder, 0); // 2px
// el-dialog背景色
......@@ -154,6 +156,11 @@ $finishTrue: var(--finishTrue, #464646); // 2px
// 设备信息颜色
$versionColor: var(--versionColor, #000); // #000
$cirBackground:var(--cirBackground,#055fe7);
$cirDuigou:var(--cirDuigou,#fff);
$span:var(--span,#055fe7);
$solid:var(--solid,#055FE7);
$dashed:var(--dashed,#055FE7);
* {
margin: 0;
padding: 0;
......@@ -2782,7 +2789,7 @@ $versionColor: var(--versionColor, #000); // #000
}
// .el-progress-circle
/deep/.el-progress-circle__track {
stroke: #f66;
stroke: $uploadingcircleBg;
}
.pro {
border: $uploadingBorder solid #26d31f;
......@@ -2877,7 +2884,8 @@ $versionColor: var(--versionColor, #000); // #000
margin-top: 38px;
font-size: 16px;
font-family: HarmonyOS_Sans_SC;
color: #d8d8d8;
// color: #d8d8d8;
color:$uploadingColor
}
.uploading-tip {
margin-top: 12px;
......@@ -2894,17 +2902,20 @@ $versionColor: var(--versionColor, #000); // #000
.cir {
width: 24px;
height: 24px;
background: #055fe7;
// background: #055fe7;
background:$cirBackground;
font-size: 12px;
border-radius: 50%;
padding: 3px 8px;
color: #fff;
// color: #fff;
color:$cirDuigou
}
span {
font-size: 16px !important;
font-family: HarmonyOS_Sans_SC;
color: #055fe7 !important;
// color: #055fe7 !important;
color:$span !important;
line-height: 22px;
margin-left: 5px;
}
......@@ -2913,7 +2924,8 @@ $versionColor: var(--versionColor, #000); // #000
margin: 10px 10px;
width: 112px;
height: 1px;
border: 1px dashed #055fe7;
// border: 1px dashed #055fe7;
border:1px dashed $dashed
}
.solid {
......@@ -2921,7 +2933,8 @@ $versionColor: var(--versionColor, #000); // #000
width: 112px;
height: 1px;
// background: #cccccc;
border: 1px solid #055fe7;
// border: 1px solid #055fe7;
border:1px solid $solid
}
}
......@@ -2940,7 +2953,7 @@ $versionColor: var(--versionColor, #000); // #000
}
span {
font-size: 16px;
font-size: 16px !important;
font-family: HarmonyOS_Sans_SC;
color: #999999 !important;
line-height: 22px;
......
src/views/zzwcj/fingerprint.vue
......@@ -12,10 +12,29 @@
<!-- 顶部 -->
<div class="head_box">
<div class="head-left">
<div>
<span class="iconfont icon-zhiwen">&#xe64b;</span>
<span>指纹采集</span>
<!-- <p>采集设备型号</p> -->
</div>
<div style="display: flex;margin-left: 220px;">
<div class="fir">
<div class="cir">√</div>
<span>人员信息 </span>
<div class="solid"></div>
</div>
<!-- <div class="unactive">
<div class="cir">2</div>
<span>人像采集</span>
<div class="solid"></div>
</div> -->
<div class="fir">
<div class="cir">2</div>
<span>指掌纹采集</span>
</div>
</div>
</div>
<div class="head-right">
<span class="equipment-model" @click="switchSkin">切换皮肤</span>
<div class="setting" @click="settingFn">
......@@ -141,7 +160,8 @@
<div class="left-hand">
<div class="txt">左手</div>
<div class="hand">
<img src="../../assets/img/zw/zwleft2x.png" alt="">
<img v-show="themeType == '深色' || themeType == '浅色'" src="../../assets/img/zw/zwleft2x.png" alt="">
<img v-show="themeType == '默认'" src="../../assets/img/zw/L.png" alt="">
<div ref="leftFinger" class="left-finger">
<img class="finger6" src="../../assets/img/zw/fingers/6-d.png" alt="">
<img class="finger7" src="../../assets/img/zw/fingers/7-d.png" alt="">
......@@ -153,7 +173,8 @@
</div>
<div class="right-hand">
<div class="hand">
<img src="../../assets/img/zw/zwright2x.png" alt="">
<img v-show="themeType == '深色' || themeType == '浅色'" src="../../assets/img/zw/zwright2x.png" alt="">
<img v-show="themeType == '默认'" src="../../assets/img/zw/R.png" alt="">
<div ref="rightFinger" class="right-finger">
<img class="finger1" src="../../assets/img/zw/fingers/1-d.png" alt="">
<img class="finger2" src="../../assets/img/zw/fingers/2-d.png" alt="">
......@@ -588,8 +609,8 @@
<div class="uploading-title">{{uploadingTitle}}</div>
<div class="uploading-tip">{{uploadingTip}}</div>
<div v-show="isUploadingFinish" class="uploading-finish">
<img v-if="themeType == '深色' || '浅色'" src="../../assets/img/zw/upload-finish.png" alt="">
<img v-else src="../../assets/img/zw/upload-finish.png" alt="">
<img v-show="themeType == '深色' || themeType == '浅色'" src="../../assets/img/zw/upload-finish.png" alt="">
<img v-show="themeType == '默认'" src="../../assets/img/zw/duigou.svg" alt="">
</div>
<div v-show="isUploadingError" class="uploading-error-img">
<img src="../../assets/img/zw/upload-error.png" alt="">
......@@ -685,13 +706,13 @@ export default {
// 采集类型
cj_type: 0,
// 主题模式
themeType: '深色',
themeType: '默认',
// 实现展示上传进度
uploadingStart: false,
// 是否显示进度百分比
isShowUploadingTxt: true,
isShowUploadingTxt: false,
// 上传进度条颜色
uploadingColor: '#fff',
uploadingColor: '#17D010',
// 是否上传失败
isUploadingError: false,
// 是否展示最终上传完成
......@@ -1136,9 +1157,10 @@ export default {
// //console.log(this.rybh);
},
async mounted () {
setInterval(() => {
this.percentage++
}, 5000);
// setInterval(() => {
// this.percentage++
// }, 5000);
// console.log(this.themeType);
let self = this
/************************/
function getIPs (callback) {
......@@ -1382,7 +1404,18 @@ export default {
NProgress.done();
}
this.getPersonInfo()
// this.uploadingStart = false
// // 是否上传失败
// this.isUploadingError = true
// // 是否展示最终上传完成
// this.uploadingClose = 'uploadingError'
// // 是否上传成功
// this.isUploadingFinish = false
// self.percentage = 100
// self.isShowUploadingTxt = false
// self.uploadingTitle = '指纹上传完成'
// self.uploadingTip = '页面将在3秒后自动关闭'
},
methods: {
/**
......@@ -8858,7 +8891,7 @@ export default {
* @return {*}
*/
defaultChange () {
console.log('默认模式');
// console.log('默认模式');
this.themeType = '默认'
document.getElementsByTagName('body')[0].style.setProperty('--elDialog', '#ffffff');//设置
document.getElementsByTagName('body')[0].style.setProperty('--deepBtn', '#fff');
......@@ -8972,6 +9005,14 @@ 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');
this.uploadingColor = "#17D010"
document.getElementsByTagName('body')[0].style.setProperty('--uploadingColor', '#333333');
document.getElementsByTagName('body')[0].style.setProperty('--cirBackground', '#055fe7');
document.getElementsByTagName('body')[0].style.setProperty('--cirDuigou', '#fff');
document.getElementsByTagName('body')[0].style.setProperty('--span', '#055fe7');
document.getElementsByTagName('body')[0].style.setProperty('--solid', '#055FE7');
document.getElementsByTagName('body')[0].style.setProperty('--dashed', '#055FE7');
this.isShowColor = false
},
/**
......@@ -9094,6 +9135,14 @@ export default {
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('--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('--cirDuigou', '#181614 ');
document.getElementsByTagName('body')[0].style.setProperty('--span', '#ffffff');
document.getElementsByTagName('body')[0].style.setProperty('--solid', '#ffffff');
document.getElementsByTagName('body')[0].style.setProperty('--dashed', '#ffffff');
this.isShowColor = false
},
/**
......@@ -9216,6 +9265,14 @@ export default {
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('--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('--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');
this.isShowColor = false
},
/**
......
src/views/zzwlr/xzry.vue
......@@ -10,7 +10,7 @@
<div id="xzry">
<div class="top">
<div class="fir">
<div class="cir">1</div>
<div class="cir" @click="auto">1</div>
<span>人员信息 </span>
<div class="dashed"></div>
</div>
......@@ -217,6 +217,8 @@
},
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: '新增人员',
dialogVisible: false, // 弹窗状态
......@@ -302,8 +304,9 @@
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}$)/,
pattern: 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}$)/,
message: "证件号码格式有误！",
trigger: "blur",
},
......@@ -357,8 +360,38 @@
// console.log(this.$route.params.type==='edit');
this.edit = "新增人员";
}
this.ruleForm.cyzjdm = "111" ? this.isZjhm : /^(?:0|[1-9]\d{3,30})?$/
},
methods: {
auto(){
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()) {
return true;
......
src/views/zzwlr/xzryedit.vue
......@@ -10,7 +10,7 @@
<div id="xzry">
<div class="top">
<div class="fir">
<div class="cir">1</div>
<div class="cir" @click="auto">1</div>
<span>人员信息 </span>
<div class="dashed"></div>
</div>
......@@ -342,6 +342,7 @@
};
},
mounted() {
// console.log(this.ruleForm.cjxxyydm);
// console.log(this.$route.query.barcode)
if (this.$route.params.type === "edit") {
this.edit = "修改人员";
......@@ -353,6 +354,10 @@
this.id = this.$route.params.id
},
methods: {
auto(){
this.ruleForm.ysxtAsjxgrybh = Math.random(22)
console.log(this.ruleForm.ysxtAsjxgrybh);
},
disabledDate(a) {
if (a.getTime() > new Date().getTime()) {
return true;
......@@ -420,6 +425,8 @@
});
} else {
self.$message.error("修改失败！");
this.$set(this.ruleForm, 'ysxtAsjxgrybh', this.ruleForm.ysxtAsjxgrybh.substring(1, 23))
}
});
self.$bus.emit("isBlur", false);
......
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