Skip to content

F
founder_vue
Commit a45fd468 by 米嘉伟
Options

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

parents dc7be1a5 6bfdfdc9
Showing with 147 additions and 52 deletions
public/JsonData/HnCodeJSON.json
This source diff could not be displayed because it is too large. You can view the blob instead.
public/JsonData/XzCodeJSON.json
This source diff could not be displayed because it is too large. You can view the blob instead.
src/utils/UserUtil.js
......@@ -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
<!--
* @Author: your name
* @Date: 2021-10-22 11:36:10
* @LastEditTime: 2022-01-18 15:52:01
* @LastEditTime: 2022-01-18 17: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
......@@ -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
......@@ -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.getUserGroupId()
NetUtil.xtfkgl
.ajList(ruleForm)
......
src/views/xtfkgl/RyXtljfkView.vue
......@@ -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.getUserGroupId()
logger.info('user', user.getUser())
......
src/views/xtfkgl/scss/dialog_table.scss
......@@ -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(3px);
}
//&::before {
// position: absolute;
// left: -10px;
// transform: translateY(-70px);
//}
}
.is-error {
......
src/views/zzwcj/fingerprint.scss
......@@ -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);
$uploadingColor:var(--uploadingColor,#333333);
$uploadingcircleBg:var(--uploadingcircleBg,#F6F8FA);//进度条背景
$uploadingTitleColor: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:$uploadingTitleColor
}
.uploading-tip {
margin-top: 12px;
......
src/views/zzwlr/xzry.vue
......@@ -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: '新增人员',
......@@ -357,13 +356,19 @@
// this.getRyinfo(this.$route.params.barcode);
} else {
// console.log(this.$route.params.type==='edit');
this.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: {
......@@ -395,13 +400,7 @@
this.ruleForm.nysj = "2022-01-17"
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
......@@ -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;
......
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