Skip to content

F
founder_vue
Commit ec814c33 by 张超军
Options

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

parents cea35057 6dff25f0
Showing with 81 additions and 35 deletions
src/views/AllPersonnelBase/dclb.vue
......@@ -829,7 +829,7 @@ export default {
color: #055fe7;
line-height: 20px;
text-align: center;
margin-left: 8px;
/* margin-left: 8px; */
}
// 脱密
.tm {
......@@ -843,7 +843,7 @@ export default {
color: #e60012;
line-height: 20px;
text-align: center;
margin-left: 8px;
/* margin-left: 8px; */
}
// 隐藏掉table多选框
.delSelection /deep/.el-table-column--selection .cell {
......@@ -892,7 +892,7 @@ export default {
align-items: center;
}
.barcode {
margin-left: 24px;
margin-left: 30px;
.item {
width: 100px;
font-size: 14px;
......@@ -900,7 +900,7 @@ export default {
color: #333333;
}
/deep/.el-input.el-input--suffix {
width: 256px;
width: 270px;
height: 32px;
}
/deep/.el-input--suffix .el-input__inner {
......@@ -908,7 +908,7 @@ export default {
}
}
.taskNumber {
// margin-left: 24px;
/* margin-left: 24px; */
.item {
width: 80px;
font-size: 14px;
......@@ -916,7 +916,7 @@ export default {
color: #333333;
}
/deep/.el-input.el-input--suffix {
width: 168px;
width: 210px;
height: 32px;
}
/deep/.el-input--suffix .el-input__inner {
......@@ -1214,4 +1214,7 @@ export default {
background-color: #006aff;
border-color: #006aff;
}
.el-table__row{
height: 56px !important;
}
</style>
src/views/cxyrd/QueryConfirm.vue
......@@ -1349,8 +1349,9 @@ const setQueryClass = [
.el-checkbox-group {
.el-checkbox {
height: 32px;
width: 102px;
width: 117px;
padding-left: 16px;
line-height:32px;
&:hover {
background: #f5f5f7;
}
......@@ -1657,7 +1658,7 @@ b {
// border: 1px solid #e6e6e8;
}
.tmh {
width: 260px;
width: 270px;
}
/deep/.el-input__inner {
height: 32px !important;
......@@ -2166,4 +2167,5 @@ b {
background-repeat: no-repeat;
transform: rotate(180deg) !important;
}
</style>
src/views/zzwcj/fingerprint.scss
......@@ -74,10 +74,11 @@ $hegeBorder: var(--hegeBorder , #17d010);//合格的边框
// 按钮
$btnBorder: var(--btnBorder, #AEB5C2 ); //#464646 #979FA8
$btnfontColor: var(--btnfontColor,#2E3846); // #efefef #343A3F
$btnhover: var(--btnhover, #efefef); // #4A4E52
$btnfontcolorHover: var(--btnfontcolorHover,#055fe7);// #efefef #343A3F
$btnhover: var(--btnhover,#055fe7 ); //#efefef #4A4E52
// 弹出对话框
$btndialogBg: var(--btndialogBg,#F6F8FA ); //#535353 #E7EAEE
$btndialogTitle: var(--btndialogTitle,#333333 ); //#ffc005 #323942
$btndialogTitle: var(--btndialogTitle,#333333 ); //#333333 #323942
$btndialogbodyBg: var(--btndialogbodyBg,#ffffff ); //#3f3f3f #CCD2D8
$btndialogbodyTxt: var(--btndialogbodyTxt,#282F3C ); //#dddddd #222222
$btndialogPrimary:var(--btndialogPrimary,#282f3c);//是
......@@ -132,7 +133,7 @@ $settingTitleChange: var(--settingTitleChange, #9f9f9f); // #738290
// 底部按钮
$dialogBtn: var(--dialogBtn,#282F3C ); //#9f9f9f #323942
$dialogBtnBg: var(--dialogBtnBg,#ffffff ); //#3f3f3f #E7EAEE
$dialogBtnBorder: var(--dialogBtnBorder,#AEB5C2 ); //#909090 #E7EAEE
$dialogBtnBorder: var(--dialogBtnBorder,#AEB5C2 ); //#3f3f3f #E7EAEE
$dialogSpan: var(--dialogSpan,#282F3C ); //#9f9f9f #323942
$dialogBtnHover: var(--dialogBtnHover, #0060f0); //#dddddd #86919B
$dialogBtnHoverSpan: var(--dialogBtnHoverSpan,#0060f0 ); //#dddddd #323942
......@@ -1114,8 +1115,8 @@ $foundColor: var(--foundColor,#ffffff);//ffc005
position: absolute;
width: 18px;
height: 62px;
top: -2px;
right: 42px;
top: -4px;
right: 41.5px;
}
.finger4 {
position: absolute;
......@@ -1592,14 +1593,14 @@ $foundColor: var(--foundColor,#ffffff);//ffc005
}
}
.el-button.el-button--primary:hover {
border: 1px solid $btndialogPrimaryHoverBorder;
border: 1px solid $btndialogPrimaryHoverBorder !important;
span{
color:$btndialogPrimaryHover
color:$btndialogPrimaryHover !important
}
}
.el-button.el-button--default:hover {
border: 1px solid $btndialogDefaultHoverBorder;
border: 1px solid $btndialogDefaultHoverBorder !important;
background:$btndialogDefaultBgHover !important
// span{
// color:$btndialogDefaultBg
......@@ -2525,14 +2526,17 @@ $foundColor: var(--foundColor,#ffffff);//ffc005
padding-right: 20px !important;
.dialog-footer {
.el-button.el-button--default {
width: 30px;
height: 20px;
width: 108px;
height: 32px;
border:1px solid $btndialogBorder;
border-radius: 18px;
background: $btndialogDefaultBg !important;
span {
font-size: 15px;
font-family: HarmonyOS_Sans_SC;
font-weight: 400;
line-height: 20px;
color: $dialogBtn;
color: $btndialogDefault;
}
}
.el-button.el-button--primary {
......@@ -2551,11 +2555,18 @@ $foundColor: var(--foundColor,#ffffff);//ffc005
}
}
.el-button.el-button--primary:hover {
border: 1px solid $dialogBtnHover;
border: 1px solid $dialogBtnHover !important;
span {
color: $dialogBtnHoverSpan;
}
}
.el-button.el-button--default:hover {
border: 1px solid $btndialogDefaultHoverBorder !important;
background:$btndialogDefaultBgHover !important
// span{
// color:$btndialogDefaultBg
// }
}
}
}
}
......@@ -2584,9 +2595,11 @@ $foundColor: var(--foundColor,#ffffff);//ffc005
}
.save:hover {
border: 2px solid $btnhover;
color:$btnfontcolorHover;
}
.finish:hover {
border: 2px solid $finishTrue; //2px
border: 2px solid $btnhover; //2px
color:$btnfontcolorHover;
}
.save {
margin-top: 23px;
......@@ -2804,7 +2817,7 @@ $foundColor: var(--foundColor,#ffffff);//ffc005
}
}
.el-button.el-button--primary:hover {
border: 1px solid $btndialogbodyTxt;
// border: 1px solid $btndialogbodyTxt;
}
}
}
......
src/views/zzwcj/fingerprint.vue
......@@ -589,7 +589,7 @@
</div>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="settingConfirm">确定</el-button>
<el-button type="primary" @click="cancelSetting">取消</el-button>
<el-button type="default" @click="cancelSetting">取消</el-button>
</span>
</el-dialog>
</div>
......@@ -1348,7 +1348,7 @@ export default {
self.ip = ipRes
//console.log(self.ip);
NProgress.start();
this.pop = true
this.pop = false
this.isAlter = true
this.errTitle = '设备初始化'
this.errDescription = '设备正在启动中。。。'
......@@ -9743,7 +9743,8 @@ export default {
document.getElementsByTagName('body')[0].style.setProperty('--handTxt', '#666666');//左右手俩字
document.getElementsByTagName('body')[0].style.setProperty('--tipTitle', '#333333');//框下边的大字
document.getElementsByTagName('body')[0].style.setProperty('--tipP', '#999999');//大字下边的小字
document.getElementsByTagName('body')[0].style.setProperty('--fingerboxBg', '#ffffff');
document.getElementsByTagName('body')[0].style.setProperty('--fingerboxBg', '#f9f9F9');//指纹格子
document.getElementsByTagName('body')[0].style.setProperty('--fingerboxHoverBg', '#ffffff');
document.getElementsByTagName('body')[0].style.setProperty('--fingerboxBorder', '#cccccc');
document.getElementsByTagName('body')[0].style.setProperty('--fingerboxTxt', '#333333');//左八字颜色
document.getElementsByTagName('body')[0].style.setProperty('--fingerboxtxtBg', '#F6F8FA'); //左八字背景
......@@ -9757,7 +9758,8 @@ export default {
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');
document.getElementsByTagName('body')[0].style.setProperty('--btnfontcolorHover', '#055fe7');
document.getElementsByTagName('body')[0].style.setProperty('--btnhover', '#055fe7');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogBg', '#F6F8FA');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogTitle', '#333333');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogbodyBg', '#ffffff');
......@@ -9879,6 +9881,7 @@ export default {
document.getElementsByTagName('body')[0].style.setProperty('--tipTitle', '#ffc005');
document.getElementsByTagName('body')[0].style.setProperty('--tipP', '#c4c4c4');
document.getElementsByTagName('body')[0].style.setProperty('--fingerboxBg', '#1B1B1B');
document.getElementsByTagName('body')[0].style.setProperty('--fingerboxHoverBg', '#1b1b1b');
document.getElementsByTagName('body')[0].style.setProperty('--fingerboxBorder', '#464646');
document.getElementsByTagName('body')[0].style.setProperty('--fingerboxTxt', '#909090');
document.getElementsByTagName('body')[0].style.setProperty('--fingerboxtxtBg', '#1b1b1b'); //左八字背景
......@@ -9892,15 +9895,16 @@ export default {
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('--btnfontcolorHover', '#efefef');
document.getElementsByTagName('body')[0].style.setProperty('--btnhover', '#efefef');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogBg', '#535353');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogTitle', '#ffc005');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogTitle', '#333333');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogbodyBg', '#3f3f3f');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogbodyTxt', '#dddddd');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogPrimary', '#dddddd');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogPrimaryHover', '#dddddd');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogPrimaryHoverBorder', '#dddddd');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogDefaultHoverBorder', '#dddddd');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogDefaultHoverBorder', '#86919B');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogPrimaryBg', '#535353');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogDefaultBg', '#535353');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogDefaultBgHover', '#535353');
......@@ -9946,10 +9950,10 @@ export default {
document.getElementsByTagName('body')[0].style.setProperty('--settingAfter', '#1b1b1b');
document.getElementsByTagName('body')[0].style.setProperty('--settingTitleChange', '#9F9F9F');
document.getElementsByTagName('body')[0].style.setProperty('--dialogBtn', '#9F9F9F');
document.getElementsByTagName('body')[0].style.setProperty('--dialogBtnBg', '#3f3f3f');
document.getElementsByTagName('body')[0].style.setProperty('--dialogBtnBorder', '#909090');
document.getElementsByTagName('body')[0].style.setProperty('--dialogSpan', '#9f9f9f');
document.getElementsByTagName('body')[0].style.setProperty('--dialogBtnHover', '#dddddd');
document.getElementsByTagName('body')[0].style.setProperty('--dialogBtnBg', '#535353');
document.getElementsByTagName('body')[0].style.setProperty('--dialogBtnBorder', '#3f3f3f');
document.getElementsByTagName('body')[0].style.setProperty('--dialogSpan', '#dddddd');
document.getElementsByTagName('body')[0].style.setProperty('--dialogBtnHover', '#86919B');
document.getElementsByTagName('body')[0].style.setProperty('--dialogBtnHoverSpan', '#dddddd');
document.getElementsByTagName('body')[0].style.setProperty('--versionColor', '#fff');
document.getElementsByTagName('body')[0].style.setProperty('--uploadingBg', '#3f3f3f');
......@@ -10014,6 +10018,7 @@ export default {
document.getElementsByTagName('body')[0].style.setProperty('--tipTitle', '#121619');
document.getElementsByTagName('body')[0].style.setProperty('--tipP', '#4D5358');
document.getElementsByTagName('body')[0].style.setProperty('--fingerboxBg', '#878D96');
document.getElementsByTagName('body')[0].style.setProperty('--fingerboxHoverBg', '#878d96');
document.getElementsByTagName('body')[0].style.setProperty('--fingerboxBorder', '#DDE1E6');
document.getElementsByTagName('body')[0].style.setProperty('--fingerboxTxt', '#DDE1E6');
document.getElementsByTagName('body')[0].style.setProperty('--fingerboxtxtBg', '#878D96'); //左八字背景
......@@ -10027,6 +10032,7 @@ export default {
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('--btnfontcolorHover', '#343A3F');
document.getElementsByTagName('body')[0].style.setProperty('--btnhover', '#4A4E52');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogBg', '#E7EAEE');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogTitle', '#323942');
......@@ -10035,7 +10041,7 @@ export default {
document.getElementsByTagName('body')[0].style.setProperty('--btndialogPrimary', '#222222');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogPrimaryHover', '#222222');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogPrimaryHoverBorder', '#222222');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogDefaultHoverBorder', '#222222');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogDefaultHoverBorder', '#86919B');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogPrimaryBg', '#E7EAEE');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogDefaultBg', '#E7EAEE');
document.getElementsByTagName('body')[0].style.setProperty('--btndialogDefaultBgHover', '#E7EAEE');
......
src/views/zzwlr/htcj.vue
......@@ -437,7 +437,6 @@
//console.log("每页条数", this.reqParam.page.pageSize);
},
handleCurrentChange(page) {
//console.log("当前页", this.reqParam.page.currPage);
this.search(page);
},
......
src/views/zzwlr/xzry.scss
......@@ -361,3 +361,6 @@
// }
// }
// /deep/.el-message-box__btns .el-button:nth-child(1){
// }
src/views/zzwlr/xzryedit.vue
......@@ -112,7 +112,7 @@
</SelectCode>
</el-form-item>
<el-form-item label="证件号码：" prop="zjhm">
<el-input v-model.trim="ruleForm.zjhm" placeholder="请输入证件号码" maxlength="30" show-word-limit clearable>
<el-input v-model.trim="ruleForm.zjhm" placeholder="请输入证件号码" maxlength="30" show-word-limit clearable @blur="isRight">
</el-input>
</el-form-item>
</el-row>
......@@ -208,6 +208,7 @@
</template>
<script>
import moment from "moment";
import Cascader from "@/components/Cascader.vue";
import SelectCode from "@/components/SelectCode.vue";
export default {
......@@ -381,6 +382,25 @@
this.id = this.$route.params.id
},
methods: {
isRight() {
if (this.ruleForm.cyzjdm === "111" && this.ruleForm.zjhm != '') {
console.log(1111);
let b = moment(this.ruleForm.csrq).format("YYYYMMDD")
if (b != this.ruleForm.zjhm.toString().substr(6, 8)) {
// alert("请输入和出生日期匹配的证件号码")
this.$alert('请输入和出生日期匹配的证件号码', '提示', {
confirmButtonText: '确定',
callback: action => {
// this.$message({
// type: 'info',
// // message: `action: ${action}`
// });
}
});
}
}
},
auto(){
var code = "";
for (var i = 0; i < 22; i++) {
......
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