Skip to content

F
founder_vue
Commit e97bf407 by li_hongchao
Options

Merge remote-tracking branch 'origin/dev_zwpt' into dev_zwpt

parents 7d2dfbbb dd4d1c84
Showing with 101 additions and 39 deletions
src/netmgr/NetUtil.js
/*
* @Author: your name
* @Date: 2021-12-24 17:21:54
* @LastEditTime: 2022-01-18 20:30:08
* @LastEditTime: 2022-02-07 16:18:26
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\netmgr\NetUtil.js
......@@ -12,6 +12,7 @@ import ajxxk from '../netmgr/xxk/ajxxk'
import xtfkgl from '../netmgr/xtfkgl/xtfkgl'
import cxyrd from '../netmgr/cxyrd/cxyrd'
import workstream from '../netmgr/workstream/workstream'
import fingerprint from '../netmgr/fingerprint/fingerprint'
export default {
bzxxsh,
......@@ -19,5 +20,6 @@ export default {
ajxxk,
xtfkgl,
cxyrd,
workstream
workstream,
fingerprint
}
src/netmgr/fingerprint/fingerprint.js 0 → 100644
/*
* @Author: your name
* @Date: 2022-02-07 16:05:52
* @LastEditTime: 2022-02-07 16:17:12
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\netmgr\fingerprint\fingerprint.js
*/
import addrType from '../../netmgr/NetAddressType'
const _path = {
saveScoreUrl: addrType.api + '/api/',
}
export default {
saveScore(_parameter) {
return fHttp.postJson(_path.saveScoreUrl + 'score/save', _parameter)
},
}
src/plugins/axios.js
......@@ -35,7 +35,6 @@ let config = {
};
const _axios = axios.create(config);
_axios.interceptors.request.use(
function (config) {
//判断是否登录
......@@ -63,6 +62,7 @@ _axios.interceptors.request.use(
}
);
// Add a response interceptor
_axios.interceptors.response.use(
function (response) {
......
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/Home.vue
......@@ -129,7 +129,7 @@
</el-aside>
</transition>
<el-container class="container-dom">
<el-header class="header">
<el-header class="header" height="4rem">
<div
class="collapse"
@click="switchCollapse"
......
src/views/cxyrd/QueryConfirm.vue
......@@ -819,6 +819,9 @@ export default {
getQueryType (data, type) {
let { name, value } = data;
let list = this.reqParam.contrastCustomSearchReq[type];
console.log(name);
console.log(value);
console.log(list);
if (list.includes(value)) {
list = list.filter((item) => item !== value);
this.dynamicTags = this.dynamicTags.filter(
......@@ -1346,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;
}
......@@ -1654,7 +1658,7 @@ b {
// border: 1px solid #e6e6e8;
}
.tmh {
width: 260px;
width: 270px;
}
/deep/.el-input__inner {
height: 32px !important;
......@@ -2163,4 +2167,5 @@ b {
background-repeat: no-repeat;
transform: rotate(180deg) !important;
}
</style>
src/views/cxyrd/modules/TLSrc.vue
......@@ -1789,10 +1789,10 @@ label {
// background: #fff;
.btns {
padding-top: 10px;
width: 100%;
height: 32px;
padding: 12px 40px;
background-color: #FFFFFF;
background-color: #f6f8fa;
display: flex;
align-items: center;
justify-content: space-around;
......@@ -1837,7 +1837,7 @@ label {
margin-top: 0px;
overflow-y: auto;
width: 100%;
height: 500px;
height: 495px;
padding-left: 18px;
.outside {
......@@ -2302,7 +2302,7 @@ label {
font-size: 12px;
font-family: HarmonyOS_Sans_SC;
color: #999999;
margin-top: 18px;
margin-top: 0px;
height: 40px;
display: flex;
justify-content: center;
......
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;
......@@ -1273,8 +1274,8 @@ $foundColor: var(--foundColor,#ffffff);//ffc005
.pic:hover {
cursor: pointer;
border: 1px solid $pichover;
box-shadow:$pichoverShadow;
background:$fingerboxHoverBg
box-shadow: $pichoverShadow;
background: $fingerboxHoverBg;
}
.pic.select {
border: 3px solid $picSelected;
......@@ -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/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
......@@ -360,4 +360,7 @@
// }
// }
// }
\ No newline at end of file
// }
// /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++) {
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2022-01-20 10:28:50
* @LastEditTime: 2022-02-07 10:40:32
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -110,7 +110,7 @@ module.exports = {
},
"/api": {
// target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
// target: "http://192.168.128.166:8099/", // 张 认定
// target: "http://192.168.128.103:8099/", // 张 认定
// target: "http://192.168.128.108:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王
// target: "http://192.168.128.122:8099", // 湖南-张呈光
......@@ -119,7 +119,7 @@ module.exports = {
// target: "http://47.92.225.109:5602",
// target: "http://www.meetfood.cn:2390", // 湖南-线上
// target: "http://zwpt.xzclub.top:9333/",
target: "http://192.168.128.106:8099", // 江
target: "http://192.168.128.101:8099", // 江
ws: true,
changeOrigin: true,
pathRewrite: {
......
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