Skip to content

F
founder_vue
Commit 7ac3f5c7 by 李姝悦
Options

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

parents e397d8ad 0217ef38
Showing with 474 additions and 291 deletions
src/icons/gongjvlan.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="1920px" height="133px" viewBox="0 0 1920 133" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>形状结合备份</title>
<defs>
<path d="M0,0 L1920,0 L1920,60 L1191,60 C1185.47715,60 1181,64.4771525 1181,70 L1181,108 C1181,116.284271 1174.28427,123 1166,123 L952,123 L952,123 L756,123 C747.715729,123 741,116.284271 741,108 L741,70 C741,64.4771525 736.522847,60 731,60 L0,60 L0,60 L0,0 Z" id="path-1"></path>
<filter x="-0.6%" y="-5.7%" width="101.1%" height="117.9%" filterUnits="objectBoundingBox" id="filter-2">
<feOffset dx="0" dy="4" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
<feGaussianBlur stdDeviation="3" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
<feColorMatrix values="0 0 0 0 0.0196078431 0 0 0 0 0.37254902 0 0 0 0 0.905882353 0 0 0 0.08 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
</filter>
</defs>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="形状结合备份">
<use fill="black" fill-opacity="1" filter="url(#filter-2)" xlink:href="#path-1"></use>
<use fill="#FFFFFF" fill-rule="evenodd" xlink:href="#path-1"></use>
</g>
</g>
</svg>
\ No newline at end of file
src/main.js
...@@ -11,6 +11,7 @@ import './utils/CrashHandle' ...@@ -11,6 +11,7 @@ import './utils/CrashHandle'
import './plugins/axios' import './plugins/axios'
import fHttp from './request/http.js' import fHttp from './request/http.js'
import NetUtil from './netmgr/NetUtil' import NetUtil from './netmgr/NetUtil'
import VerifyDataType from './utils/verify-data/VerifyDataType.js'
import App from './App.vue' import App from './App.vue'
import router from './router' import router from './router'
import store from './store' import store from './store'
...@@ -42,7 +43,8 @@ Vue.prototype.$moment = moment ...@@ -42,7 +43,8 @@ Vue.prototype.$moment = moment
import uploader from 'vue-simple-uploader' import uploader from 'vue-simple-uploader'
Vue.use(uploader) Vue.use(uploader)
import md5 from "js-md5"; import md5 from 'js-md5'
Vue.prototype.$md5 = md5 Vue.prototype.$md5 = md5
Vue.prototype.$driver = new Driver({ Vue.prototype.$driver = new Driver({
...@@ -71,6 +73,7 @@ window.util = Util ...@@ -71,6 +73,7 @@ window.util = Util
window.logger = LoggerUtil window.logger = LoggerUtil
window.user = UserUtil window.user = UserUtil
window.fHttp = fHttp window.fHttp = fHttp
window.verifyData = VerifyDataType
window.NetUtil = NetUtil window.NetUtil = NetUtil
Vue.use(VueWechatTitle) Vue.use(VueWechatTitle)
Vue.use(VueClipboard) Vue.use(VueClipboard)
......
src/utils/verify-data/VerifyDataType.js 0 → 100644
export default {
/**
* Description: 逻辑分库名称正则
* @author: li_hongchao
* @date: 2022/1/9 19:47
*/
_LJFKM: /(([\u4E00-\u9FA5·]{2,})|([a-zA-Z]{4,}))/,
_NUMBER: /^(0|([0-9]+\\.[0-9]*[1-9][0-9]*)|([0-9]*[1-9][0-9]*\\.[0-9]+)|([0-9]*[1-9][0-9]*))$/,
/**
* Description: 自然数
* @author: li_hongchao
* @date: 2022/1/9 19:06
* ^(0|([0-9]+\\.[0-9]*[1-9][0-9]*)|([0-9]*[1-9][0-9]*\\.[0-9]+)|([0-9]*[1-9][0-9]*))$"
*/
_NATURAL_NUMBER: /^\\+?[1-9][0-9]*$/,
/**
* Description: 校验中文姓名和英文姓名
* @author: li_hongchao
* @date: 2022/1/9 19:07
*/
_NAME: /(([\u4E00-\u9FA5·]{1,17})|([a-zA-Z]{1,17}))/,
/**
* Description: 18位身份证号
* @author: li_hongchao
* @date: 2022/1/9 19:41
*/
_18_IDCard: /^[1-9]\\d{5}[1-9]\\d{3}((0\\d)|(1[0-2]))(([0|1|2]\\d)|3[0-1])\\d{3}([0-9]|X|x)$/,
/**
* Description:15位身份证号
* @author: li_hongchao
* @date: 2022/1/9 19:42
*/
_15_IDCard: /^[1-9]\\d{7}((0\\[1-9])|(1[0-2]))(([0\\[1-9]|1\\d|2\\d])|3[0-1])\\d{2}([0-9]|x|X){1}$/,
/**
* Description: URL
* @author: li_hongchao
* @date: 2022/1/9 19:42
*/
_URL: /(http|https):\/\/([\w.]+\/?)\S*/,
/**
* Description: QQ号
* @author: li_hongchao
* @date: 2022/1/9 19:42
*/
_QQ: /^[1-9]\\d{4,10}$/,
/**
* Description: 一个或多个汉字
* @author: li_hongchao
* @date: 2022/1/9 19:42
*/
_CHINESE: /^[\\u0391-\\uFFE5]+$/,
/**
* Description: 手机号码
* @author: li_hongchao
* @date: 2022/1/9 19:42
*/
_MOBILE_PHONE: /^1[3|4|5|8][0-9]\\d{8}$/,
/**
* Description: 所有电话格式校验
* @author: li_hongchao
* @date: 2022/1/9 19:42
*/
_ALL_PHONE: /^((1[0,1,2,3,4,5,6,7,8,9]))\\d{9}|((\\d{4})?(\\-)?\\d{7})$/,
/**
* Description: 邮箱验证
* @author: li_hongchao
* @date: 2022/1/9 19:43
*/
_MAIL: /^[A-Za-z0-9\\u4e00-\\u9fa5]+@[a-zA-Z0-9_-]+(\\.[a-zA-Z0-9_-]+)+$"/,
/**
* Description: 邮政编码
* @author: li_hongchao
* @date: 2022/1/9 19:43
*/
_POST_CODE: /^[1-9]\\d{5}$/,
}
src/views/cxyrd/LT.scss
...@@ -307,8 +307,11 @@ $phone: var(--phone, #606266); //#ff4242; ...@@ -307,8 +307,11 @@ $phone: var(--phone, #606266); //#ff4242;
left: 0; left: 0;
width: 1920px; width: 1920px;
height: 123px; height: 123px;
img { .gongjvlan {
width: 1920px; width: 100%;
height: 123px; height: 123px;
} }
} }
.header {
z-index: 99;
}
src/views/cxyrd/LT.vue
<template> <template>
<div class="ltDiv"> <div class="ltDiv">
<div class="lt-dom" :class="{ bzActive: isShowbzDialogBg || loading_sd }"> <div class="lt-dom" :class="{ bzActive: isShowbzDialogBg || loading_sd }">
<!-- <div class="top-head"> <div class="top-head">
<img src="@/assets/img/rgrd/gongjvlan.svg" alt=""> <img src="@/assets/img/rgrd/gongjvlan.png" alt="">
</div> --> </div>
<div class="header"> <div class="header">
<div class="label">正查</div> <div class="label">
<img src="@/assets/img/rgrd/zhengcha.png" alt="">
<span>正查</span>
</div>
<div class="btns"> <div class="btns">
<div class="bz-btn" @click="Bz">比中</div> <div class="bz-btn" @click="Bz">比中</div>
<div class="rd-btn" @click="Rdwc">认定完成</div> <div class="rd-btn" @click="Rdwc">认定完成</div>
</div> </div>
</div> </div>
<div class="header_line"></div> <!-- <div class="header_line"></div> -->
<div class="lt_main"> <div class="lt_main">
<div class="lt_main_left"> <div class="lt_main_left">
<l-t-src :src-data="qid"></l-t-src> <l-t-src :src-data="qid"></l-t-src>
...@@ -595,6 +598,7 @@ export default { ...@@ -595,6 +598,7 @@ export default {
height: 100%; height: 100%;
height: 100vh; height: 100vh;
overflow: hidden; overflow: hidden;
font-family: HarmonyOS_Sans_SC;
} }
div { div {
margin: 0; margin: 0;
...@@ -604,8 +608,8 @@ div { ...@@ -604,8 +608,8 @@ div {
} }
.lt-dom { .lt-dom {
width: 100%; width: 100%;
// background-color: rgba(5, 95, 231, 0.08); background-color: #F6F8FA;
background-color: #fff; // background-color: #fff;
/*padding: 24px;*/ /*padding: 24px;*/
margin: 0; margin: 0;
display: flex; display: flex;
...@@ -625,12 +629,18 @@ div { ...@@ -625,12 +629,18 @@ div {
padding: 0 25px; padding: 0 25px;
.label { .label {
align-self: flex-start; align-self: flex-start;
height: 22px; font-size: 20px;
font-size: 16px; font-family: HarmonyOS_Sans_SC-Bold;
font-weight: bold; color: #FFFFFF;
color: #00b47a;
line-height: 22px;
margin-top: 14px; margin-top: 14px;
img {
width: 120px;
}
span {
position: absolute;
left: 52px;
line-height: 35px;
}
} }
} }
...@@ -689,10 +699,10 @@ div { ...@@ -689,10 +699,10 @@ div {
// width: 1124px; // width: 1124px;
display: flex; display: flex;
// flex-direction: row; // flex-direction: row;
justify-content: space-between; // justify-content: space-between;
} }
.lt_main_left { .lt_main_left {
width: 352px; width: 376px;
border: none; border: none;
/* margin-right: 16px; */ /* margin-right: 16px; */
margin-top: 18px; margin-top: 18px;
...@@ -701,11 +711,12 @@ div { ...@@ -701,11 +711,12 @@ div {
overflow: hidden; overflow: hidden;
} }
.lt_main_middle { .lt_main_middle {
width: 1120px; width: 1135px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin-top: -65px; // margin-top: -65px;
margin-left: -16px; // margin-left: -16px;
margin: -65px 20px 24px 20px;
} }
.lt_main_middle .lt_main_header { .lt_main_middle .lt_main_header {
height: 70px; height: 70px;
...@@ -721,8 +732,7 @@ div { ...@@ -721,8 +732,7 @@ div {
} }
.lt_main_right { .lt_main_right {
margin-top: 20px; margin-top: 20px;
margin-left: 16px; width: 376px;
width: 380px;
border: none; border: none;
border-radius: 20px 0px 0px 0px; border-radius: 20px 0px 0px 0px;
overflow: hidden; overflow: hidden;
......
src/views/cxyrd/TL.scss
...@@ -301,3 +301,17 @@ $phone: var(--phone, #606266); //#ff4242; ...@@ -301,3 +301,17 @@ $phone: var(--phone, #606266); //#ff4242;
} }
} }
} }
.top-head {
position: fixed;
top: 0;
left: 0;
width: 1920px;
height: 123px;
.gongjvlan {
width: 100%;
height: 123px;
}
}
.header {
z-index: 99;
}
src/views/cxyrd/TL.vue
<template> <template>
<div class="tlDiv"> <div class="tlDiv">
<div class="tl" :class="{ bzActive: isShowbzDialogBg || loading_sd}"> <div class="tl" :class="{ bzActive: isShowbzDialogBg || loading_sd}">
<div class="top-head">
<img src="@/assets/img/rgrd/gongjvlan.png" alt="">
</div>
<div class="header"> <div class="header">
<div class="label">倒查</div> <div class="label">
<img src="@/assets/img/rgrd/daocha.png" alt="">
<span>倒查</span>
</div>
<div class="btns"> <div class="btns">
<div class="bz-btn" @click="Bz">比中</div> <div class="bz-btn" @click="Bz">比中</div>
<div class="rd-btn" @click="Rdwc">认定完成</div> <div class="rd-btn" @click="Rdwc">认定完成</div>
</div> </div>
</div> </div>
<div class="header_line"></div> <!-- <div class="header_line"></div> -->
<div class="main"> <div class="main">
<div class="main-left"> <div class="main-left">
<t-l-src></t-l-src> <t-l-src></t-l-src>
...@@ -176,7 +182,7 @@ export default { ...@@ -176,7 +182,7 @@ export default {
mounted () { mounted () {
this.userInfo = JSON.parse(localStorage.getItem('userInfo')) this.userInfo = JSON.parse(localStorage.getItem('userInfo'))
console.log(this.userInfo); console.log(this.userInfo);
if(this.userInfo) { if (this.userInfo) {
this.bzr = this.userInfo.name this.bzr = this.userInfo.name
this.bzdw = this.userInfo.unitName this.bzdw = this.userInfo.unitName
this.dwdm = this.userInfo.unitCode this.dwdm = this.userInfo.unitCode
...@@ -365,11 +371,11 @@ export default { ...@@ -365,11 +371,11 @@ export default {
* @return {*} * @return {*}
*/ */
async Bz () { async Bz () {
if(this.bzData == null) { if (this.bzData == null) {
this.$message.error("信息不全无法比中！"); this.$message.error("信息不全无法比中！");
return return
}; };
if(this.bzData.affirmstatus == '2' || this.bzData.affirmstatus == '3') { if (this.bzData.affirmstatus == '2' || this.bzData.affirmstatus == '3') {
this.$message.error("已经比中过的数据无法再次比中！"); this.$message.error("已经比中过的数据无法再次比中！");
return return
} }
...@@ -570,6 +576,7 @@ div { ...@@ -570,6 +576,7 @@ div {
width: 100%; width: 100%;
height: 100vh; height: 100vh;
overflow: hidden; overflow: hidden;
font-family: HarmonyOS_Sans_SC;
.tl-search { .tl-search {
width: 100%; width: 100%;
} }
...@@ -579,7 +586,7 @@ div { ...@@ -579,7 +586,7 @@ div {
// background-color: #ffffff; // background-color: #ffffff;
/*padding: 24px;*/ /*padding: 24px;*/
margin: 0; margin: 0;
padding: 0 24px 24px 24px; // padding: 0 24px 24px 24px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
...@@ -590,14 +597,21 @@ div { ...@@ -590,14 +597,21 @@ div {
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
padding: 0 25px;
.label { .label {
align-self: flex-start; align-self: flex-start;
height: 22px; font-size: 20px;
font-size: 16px; font-family: HarmonyOS_Sans_SC-Bold;
font-weight: bold; color: #FFFFFF;
color: #e60012;
line-height: 22px;
margin-top: 14px; margin-top: 14px;
img {
width: 120px;
}
span {
position: absolute;
left: 52px;
line-height: 35px;
}
} }
} }
.header_line { .header_line {
...@@ -639,24 +653,29 @@ div { ...@@ -639,24 +653,29 @@ div {
justify-content: space-between; justify-content: space-between;
background: #fff; background: #fff;
.main-left { .main-left {
width: 352px; width: 376px;
border: none; border: none;
/* margin-right: 16px; */ /* margin-right: 16px; */
margin-top: 18px; margin-top: 18px;
//border: none; box-shadow: 0px 4px 10px 0px rgba(5, 95, 231, 0.3);
border-radius: 0px 20px 0px 0px;
overflow: hidden;
} }
.main-middle { .main-middle {
width: 1120px; width: 1135px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin-top: -65px; // margin-top: -65px;
margin-left: -10px; // margin-left: -16px;
margin: -65px 20px 24px 20px;
} }
.main-right { .main-right {
margin-top: 50px; margin-top: 20px;
margin-left: 20px; width: 376px;
width: 380px;
border: none; border: none;
border-radius: 20px 0px 0px 0px;
overflow: hidden;
box-shadow: 0px 4px 10px 0px rgba(5, 95, 231, 0.3);
} }
} }
/deep/.el-dialog { /deep/.el-dialog {
...@@ -665,7 +684,7 @@ div { ...@@ -665,7 +684,7 @@ div {
.bz-dialog { .bz-dialog {
.tl { .tl {
width: 100%; width: 100%;
height: 634px; height: 100%;
.type { .type {
display: flex; display: flex;
width: 100%; width: 100%;
......
src/views/cxyrd/modules/LTSrc.vue
...@@ -688,6 +688,7 @@ const datas = [ ...@@ -688,6 +688,7 @@ const datas = [
.lt_src { .lt_src {
width: 100%; width: 100%;
height: 100%; height: 100%;
background: #ffffff;
div { div {
display: inline-block; display: inline-block;
...@@ -706,6 +707,7 @@ const datas = [ ...@@ -706,6 +707,7 @@ const datas = [
} }
.lt_top { .lt_top {
font-family: HarmonyOS_Sans_SC-Bold;
width: 100%; width: 100%;
border-radius: 0px 20px 0px 0px; border-radius: 0px 20px 0px 0px;
background: linear-gradient(270deg, #3eb2ff 0%, #055fe7 100%); background: linear-gradient(270deg, #3eb2ff 0%, #055fe7 100%);
...@@ -717,7 +719,7 @@ const datas = [ ...@@ -717,7 +719,7 @@ const datas = [
justify-content: space-between; justify-content: space-between;
.rwh { .rwh {
font-size: 16px; font-size: 16px;
font-family: HarmonyOS_Sans_SC_Bold; font-family: HarmonyOS_Sans_SC-Bold;
color: #ffffff; color: #ffffff;
} }
.el-checkbox { .el-checkbox {
...@@ -768,7 +770,7 @@ const datas = [ ...@@ -768,7 +770,7 @@ const datas = [
} }
.lt_middle_finger_print { .lt_middle_finger_print {
background-color: #f6f8fa; background-color: #ffffff;
width: 100%; width: 100%;
.btns-switch { .btns-switch {
...@@ -778,7 +780,7 @@ const datas = [ ...@@ -778,7 +780,7 @@ const datas = [
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: center; justify-content: center;
background-color: #f6f8fa; background-color: #fff;
.btn { .btn {
cursor: pointer; cursor: pointer;
width: 129px; width: 129px;
...@@ -807,11 +809,12 @@ const datas = [ ...@@ -807,11 +809,12 @@ const datas = [
} }
.lt_middle_finger_prints { .lt_middle_finger_prints {
background: #f6f8fa; background: #F6F8FA;
margin-top: 12px; margin-top: 12px;
overflow-y: auto; overflow-y: auto;
width: 100%; width: 354px;
height: 340px; height: 340px;
margin-left: 10px;
.finger_print_number_active { .finger_print_number_active {
background: #055fe7; background: #055fe7;
} }
...@@ -822,13 +825,14 @@ const datas = [ ...@@ -822,13 +825,14 @@ const datas = [
.lt_middle_bottom { .lt_middle_bottom {
text-align: center; text-align: center;
background: #fff; background: #fff;
height: 40px !important; height: 40px;
line-height: 40px; line-height: 40px;
width: 100%; width: 100%;
font-size: 12px; font-size: 12px;
font-family: HarmonyOS_Sans_SC; font-family: HarmonyOS_Sans_SC;
color: #999; color: #999;
span { span {
span { span {
color: #666; color: #666;
...@@ -1303,6 +1307,14 @@ const datas = [ ...@@ -1303,6 +1307,14 @@ const datas = [
border: 1px solid #999; border: 1px solid #999;
} }
} }
.lt_middle_finger_print {
.lt_middle_bottom {
width: 376px;
height: 100%;
background: #FFFFFF;
line-height: 58px;
}
}
} }
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>
......
src/views/cxyrd/modules/TLCandidate.vue
...@@ -3,12 +3,14 @@ ...@@ -3,12 +3,14 @@
<div class="tl-search"> <div class="tl-search">
<div class="label">{{searchType}}</div> <div class="label">{{searchType}}</div>
<el-input class="input" v-model="input3" placeholder="请输入条码号/指位" @keydown.enter="search"></el-input> <el-input class="input" v-model="input3" placeholder="请输入条码号/指位" @keydown.enter="search"></el-input>
<div class="btn" @click="search">筛选</div> <div class="btn" @click="search">
<img src="@/assets/img/rgrd/fangdajing.png" alt="">
</div>
</div> </div>
<div class="checked"> <div class="checked">
<el-checkbox v-model="checked">显示已比中候选</el-checkbox> <el-checkbox v-model="checked">显示已比中候选</el-checkbox>
</div> </div>
<el-table height="46rem" ref="singleTable" highlight-current-row @current-change="handleCurrentChange" class="lt_candidate_table" :data="tableData" :row-class-name="tableRowClassName"> <el-table height="44rem" ref="singleTable" highlight-current-row @current-change="handleCurrentChange" class="lt_candidate_table" :data="tableData" :row-class-name="tableRowClassName">
<el-table-column label="排名" type="index" :width="width1"> <el-table-column label="排名" type="index" :width="width1">
</el-table-column> </el-table-column>
<el-table-column prop="score" label="得分" :width="width1"> <el-table-column prop="score" label="得分" :width="width1">
...@@ -374,11 +376,11 @@ export default { ...@@ -374,11 +376,11 @@ export default {
<style lang="scss"> <style lang="scss">
.tl-candidate { .tl-candidate {
position: relative;
box-sizing: border-box;
width: 100%; width: 100%;
height: calc(100% - 40px); height: calc(100% - 25px);
background: #f6f8fa;
border-radius: 8px; border-radius: 8px;
position: relative;
//div { //div {
// display: inline-block; // display: inline-block;
...@@ -391,52 +393,60 @@ export default { ...@@ -391,52 +393,60 @@ export default {
background: #ffffff; background: #ffffff;
display: flex; display: flex;
align-items: center; align-items: center;
padding: 20px 20px 15px 20px;
.label { .label {
width: 32px; width: 32px;
height: 24px; height: 24px;
font-size: 16px; font-size: 16px;
font-family: HarmonyOS_Sans_SC; font-family: HarmonyOS_Sans_SC;
color: #1A1A1A; color: #1a1a1a;
line-height: 24px; line-height: 24px;
margin-right: 15px;
i {
margin: 0;
}
} }
.input { .input {
width: 292px; width: 246px;
height: 34px; height: 32px;
background: #ffffff; background: #ffffff;
border-top-left-radius: 4px; border-top-left-radius: 4px;
border-bottom-left-radius: 4px; border-bottom-left-radius: 4px;
border: 1px solid #e6e6e8; border: 1px solid #e6e6e8;
margin-left: 10px;
} }
.btn { .btn {
cursor: pointer; cursor: pointer;
width: 44px; width: 32px;
height: 34px; height: 32px;
background: #006aff; background: #006AFF;
border-radius: 0px 4px 4px 0px; border-radius: 0px 4px 4px 0px;
line-height: 32px; line-height: 32px;
color: #ffffff; color: #ffffff;
text-align: center; text-align: center;
font-size: 14px; font-size: 14px;
font-family: HarmonyOS_Sans_SC; font-family: HarmonyOS_Sans_SC;
color: #FFFFFF; color: #ffffff;
img {
width: 14px;
height: 14px;
cursor: pointer;
}
} }
} }
.checked { .checked {
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
background-color: #FFFFFF; margin-right: 20px;
padding: 5px 0;
} }
.lt_candidate_bottom { .lt_candidate_bottom {
position: absolute;
bottom: 12px;
left: 20px;
text-align: center; text-align: center;
width: 352px; width: 23.5rem;
font-size: 12px; height: 3.625rem;
line-height: 3.625rem;
background: #FFFFFF;
font-size: 0.75rem;
font-family: HarmonyOS_Sans_SC; font-family: HarmonyOS_Sans_SC;
color: #999999; color: #999999;
span { span {
...@@ -447,11 +457,10 @@ export default { ...@@ -447,11 +457,10 @@ export default {
} }
} }
.el-input__inner { /deep/ .el-input__inner {
width: 260px; border: none;
height: 32px; height: 32px !important;
background: #ffffff; line-height: 32px !important;
//border: #0e0eff 1px solid;
} }
.Bizhong { .Bizhong {
...@@ -476,9 +485,11 @@ export default { ...@@ -476,9 +485,11 @@ export default {
.el-input { .el-input {
/deep/ .el-input__inner { /deep/ .el-input__inner {
border: none; border: none;
height: 30px !important;
line-height: 30px !important;
} }
width: 296px; width: 246px;
height: 32px; height: 32px;
background: #ffffff; background: #ffffff;
border-radius: 4px; border-radius: 4px;
......
src/views/cxyrd/modules/TLSrc.vue
...@@ -44,10 +44,10 @@ ...@@ -44,10 +44,10 @@
<div class="finger-print" v-show="isShowPrint"> <div class="finger-print" v-show="isShowPrint">
<div class="btns"> <div class="btns">
<div class="btn" @click="switchRoll" :class="{active: fingerShowType == 'roll'}">滚动</div> <div class="btn" @click="switchRoll" :class="{active: fingerShowType == 'roll'}">滚动</div>
<div class="line"></div> <!-- <div class="line"></div> -->
<div class="btn" v-show="!isDelete" @click="switchPain" :class="{active: fingerShowType == 'pain', isHasData: !painFlag}">平面</div> <div class="btn" v-show="!isDelete" @click="switchPain" :class="{active: fingerShowType == 'pain', isHasData: !painFlag}">平面</div>
<div class="btn isDelete" v-show="isDelete">平面</div> <div class="btn isDelete" v-show="isDelete">平面</div>
<div class="line"></div> <!-- <div class="line"></div> -->
<div class="btn" v-show="!isDelete" @click="switchZw" :class="{active: fingerShowType == 'zhangwen'}">掌纹</div> <div class="btn" v-show="!isDelete" @click="switchZw" :class="{active: fingerShowType == 'zhangwen'}">掌纹</div>
<div v-show="isDelete" class="btn isDelete">掌纹</div> <div v-show="isDelete" class="btn isDelete">掌纹</div>
</div> </div>
...@@ -1631,7 +1631,7 @@ div { ...@@ -1631,7 +1631,7 @@ div {
} }
label { label {
margin-right: 67px; // margin-right: 67px;
} }
.lt_candidate_table { .lt_candidate_table {
...@@ -1645,14 +1645,29 @@ label { ...@@ -1645,14 +1645,29 @@ label {
height: 100%; height: 100%;
.top { .top {
font-family: HarmonyOS_Sans_SC-Bold;
width: 100%; width: 100%;
margin: 0 0 10px 0; border-radius: 0px 20px 0px 0px;
background: linear-gradient(270deg, #3eb2ff 0%, #055fe7 100%);
display: flex;
align-items: center;
box-sizing: border-box;
padding: 0 20px;
height: 50px;
justify-content: space-between;
.rwh { .rwh {
font-size: 14px; font-size: 16px;
font-family: HarmonyOS_Sans_SC-Bold, HarmonyOS_Sans_SC; font-family: HarmonyOS_Sans_SC-Bold;
font-weight: bold; color: #ffffff;
color: #282F3C; }
/deep/.el-checkbox {
.el-checkbox__inner.is-checked {
background: #fff !important;
}
.el-checkbox__label {
font-family: HarmonyOS_Sans_SC;
color: #ffffff !important;
}
} }
} }
...@@ -1670,7 +1685,7 @@ label { ...@@ -1670,7 +1685,7 @@ label {
.lt_middle_bottom { .lt_middle_bottom {
text-align: center; text-align: center;
background: #f6f8fa; background: #fff;
height: 40px !important; height: 40px !important;
line-height: 40px; line-height: 40px;
width: 100%; width: 100%;
...@@ -1686,6 +1701,7 @@ label { ...@@ -1686,6 +1701,7 @@ label {
} }
.lt_middle_src_data { .lt_middle_src_data {
background: #fff;
.lt_middle_bottom { .lt_middle_bottom {
margin-top: -10px; margin-top: -10px;
display: flex; display: flex;
...@@ -1723,25 +1739,30 @@ label { ...@@ -1723,25 +1739,30 @@ label {
.finger-print { .finger-print {
width: 352px; width: 352px;
height: 600px; height: 700px;
background: #f6f8fa; margin-left: 10px;
background: #fff;
.btns { .btns {
width: 272px; width: 300px;
height: 32px; height: 32px;
margin: 12px 0 12px 41px; margin: 12px 0 12px 40px;
background-color: #FFFFFF; background-color: #FFFFFF;
display: flex; display: flex;
align-items: center; align-items: center;
.btn { .btn {
cursor: pointer; cursor: pointer;
width: 90px;
height: 32px;
line-height: 32px;
background: #ffffff; background: #ffffff;
border-radius: 2px; border-radius: 2px;
text-align: center; text-align: center;
width: 80px;
height: 32px;
line-height: 32px;
border-radius: 4px;
border: 1px solid #055FE7;
color: #055FE7;
margin-right: 10px;
&:active { &:active {
background: #055fe7; background: #055fe7;
...@@ -2230,7 +2251,7 @@ label { ...@@ -2230,7 +2251,7 @@ label {
.bottom { .bottom {
text-align: center; text-align: center;
background: #f6f8fa; background: #fff;
//height: 40px; //height: 40px;
width: 100%; width: 100%;
font-size: 12px; font-size: 12px;
...@@ -2287,10 +2308,13 @@ label { ...@@ -2287,10 +2308,13 @@ label {
.el-checkbox__input.is-checked { .el-checkbox__input.is-checked {
.el-checkbox__inner { .el-checkbox__inner {
background: #055fe7; border-color: none;
background-color: #fff;
&::after {
border-color: #055fe7; border-color: #055fe7;
} }
} }
}
} }
/deep/ .el-checkbox { /deep/ .el-checkbox {
......
src/views/login/modules/AccountsLogin.vue
...@@ -223,3 +223,15 @@ export default { ...@@ -223,3 +223,15 @@ export default {
background-color: #1689db; background-color: #1689db;
} }
</style> </style>
<style>
input:-webkit-autofill , textarea:-webkit-autofill, select:-webkit-autofill {
-webkit-text-fill-color: #ededed !important;
-webkit-box-shadow: 0 0 0px 1000px transparent inset !important;
background-color:transparent;
background-image: none;
transition: background-color 50000s ease-in-out 0s;
}
input {
background-color:transparent;
}
</style>
src/views/xtfkgl/RyXtljfkView.vue
...@@ -53,9 +53,7 @@ ...@@ -53,9 +53,7 @@
<div <div
v-for="item in scope.row.groups" v-for="item in scope.row.groups"
:class="{divtext:item.type === 1}" :class="{divtext:item.type === 1}"
:title="item.name" :title="item.name">
:key="item.id"
>
<div v-if="item.type === 1 && item.user && item.user.length >0"> <div v-if="item.type === 1 && item.user && item.user.length >0">
<el-tooltip <el-tooltip
class="item" class="item"
......
src/views/xtfkgl/SjkyhSelect.vue
...@@ -18,27 +18,36 @@ ...@@ -18,27 +18,36 @@
<el-dropdown-menu slot="dropdown" class="select-list-content"> <el-dropdown-menu slot="dropdown" class="select-list-content">
<div class="select-list-content-left"> <div class="select-list-content-left">
<div :class="{'list-item':true,'list-item-focus':isYh}" @click="toggleYh(true)">用户</div> <div :class="{'list-item':true,'list-item-focus':isYh}" @click="toggleYh(true)">
<div :class="{'list-item':true,'list-item-focus':!isYh}" @click="toggleYh(false)">用户组</div> 用户
<div v-if="userSelectSet.size > 0" style="position: absolute; right:4px;">
{{userSelectSet.size}}
</div>
</div>
<div :class="{'list-item':true,'list-item-focus':!isYh}" @click="toggleYh(false)">
用户组
<div v-if="userGroupSelectSet.size > 0" style="position: absolute; right:4px;">
{{userGroupSelectSet.size}}
</div>
</div>
</div> </div>
<div class="select-list-content-right"> <div class="select-list-content-right">
<div class="top-div"> <div class="top-div">
<div v-for="(item,index) in getItemArr()" class="top-item" @click="selectItem(item)" <div v-for="(item,index) in getItemArr()" class="top-item" @click.stop="selectItem(item)"
:key="index"> :key="index">
<span v-if='item.name.length > 6'> <!-- <span v-if='item.name.length > 7'>-->
<el-tooltip effect="dark" :content="item.name" placement="top"> <!-- <el-tooltip effect="dark" :content="item.name" placement="right">-->
<div class="span-name"> <!-- <div class="span-name">-->
{{ item.name.slice(0,6) + '...'}} <!-- {{ item.name.slice(0,7) + '...'}}-->
</div> <!-- </div>-->
</el-tooltip> <!-- </el-tooltip>-->
</span> <!-- </span>-->
<span v-else> <!-- <span v-else>{{ item.name}}</span>-->
{{ item.name}} <span style="margin-right: 36px;">{{ item.name}}</span>
</span> <div v-show="isSelect(item)" class="look"
style="position: absolute; top:0px; right:16px;">
<div v-show="isSelect(item)" class="look" style="float: right;margin-right: 17px;"> <i class=" iconfont icon-duihao"></i>
<i class="iconfont icon-duihao"></i>
</div> </div>
</div> </div>
...@@ -182,6 +191,29 @@ export default { ...@@ -182,6 +191,29 @@ export default {
}) })
} }
}, },
getAllUsers() {
let result = []
if (this.userArr.length > 0) {
this.userArr.forEach(item => {
result.push({
id: item.id,
name: item.name,
type: 0
})
})
}
if (this.userGroupArr.length > 0) {
this.userGroupArr.forEach(item => {
result.push({
id: item.id,
name: item.name,
type: 1
})
})
}
return result
},
cancel() { cancel() {
if (this.$refs.dropdown) { if (this.$refs.dropdown) {
this.$refs.dropdown.visible = false this.$refs.dropdown.visible = false
...@@ -331,20 +363,21 @@ export default { ...@@ -331,20 +363,21 @@ export default {
color: #333333; color: #333333;
line-height: 19px; line-height: 19px;
padding: 0px 0px 0px 13px; padding: 0px 0px 0px 8px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: left; justify-content: left;
border: 2px none white; border-left: 2px solid white;
border-left-style: solid;
position: relative;
} }
.list-item-focus { .list-item-focus {
border: 2px none #055FE7; border-left: 2px solid #055FE7;
border-left-style: solid;
color: #055FE7; color: #055FE7;
} }
...@@ -363,14 +396,16 @@ export default { ...@@ -363,14 +396,16 @@ export default {
.top-item { .top-item {
width: 100%; width: 100%;
height: 40px; height: 40px;
background: #FFFFFF; /*background: #FFFFFF;*/
background: transparent;
font-size: 14px; font-size: 14px;
font-family: HarmonyOS_Sans_SC; font-family: HarmonyOS_Sans_SC;
color: #333333; color: #333333;
line-height: 40px; line-height: 40px;
padding-left: 16px; padding-left: 16px;
position: relative;
} }
.top-item:hover { .top-item:hover {
...@@ -378,8 +413,8 @@ export default { ...@@ -378,8 +413,8 @@ export default {
} }
.span-name { .span-name {
overflow: hidden; /*overflow: hidden;*/
float: left; /*float: left;*/
} }
} }
......
src/views/xtfkgl/scss/dialog_table.scss
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
//margin-bottom: 40px; //margin-bottom: 40px;
top: 50%; top: 50%;
left: 50%; left: 50%;
transform: translate(-40%, -50%); transform: translate(-50%, -50%);
z-index: 1000; z-index: 1000;
width: 892px; width: 892px;
//height: 830px; //height: 830px;
...@@ -92,11 +92,6 @@ ...@@ -92,11 +92,6 @@
max-height: 600px; max-height: 600px;
overflow: scroll; overflow: scroll;
} }
.addbtns {
.el-form-item__content {
}
}
} }
.info-item { .info-item {
...@@ -159,7 +154,60 @@ ...@@ -159,7 +154,60 @@
} }
} }
.dui-lie-ming-cheng-layout {
.GongZuoDuiLieChuanXing { // 串行
display: inline-flex;
align-items: center;
justify-content: center;
position: relative;
float: left;
.itemBox {
min-width: 96px;
height: 32px;
display: inline-block;
float: left;
position: relative;
background: #F6F8FA;
box-shadow: 4px 4px 4px 0px rgba(193, 216, 251, 0.8), -4px -4px 4px 0px #FFFFFF;
border-radius: 4px;
color: #333333;
font-size: 14px;
font-family: MicrosoftYaHei;
line-height: 32px;
.dlIndexBg { // 序号背景
position: absolute;
width: 16px;
height: 19px;
}
.dlIndex { // 序号
position: absolute;
width: 16px;
height: 14px;
font-size: 12px;
font-family: MicrosoftYaHei-Bold, MicrosoftYaHei;
font-weight: bold;
color: #FFFFFF;
line-height: 14px;
text-align: center;
}
.iconChuanXing {
position: absolute;
color: #055fe7;
top: -6px;
right: -6px;
cursor: pointer;
}
}
}
.dlNoSelect {
color: #999999;
} }
...@@ -168,17 +216,14 @@ ...@@ -168,17 +216,14 @@
height: 32px; height: 32px;
border-radius: 4px; border-radius: 4px;
border: 1px solid #AEB5C2; border: 1px solid #AEB5C2;
//margin-right: 4px; margin-right: 4px;
margin-left: 20px; margin-left: 20px;
display: inline-block; display: inline-block;
background: #f6f8fa; background: #f6f8fa;
//box-shadow: 4px 4px 4px 0px rgba(193, 216, 251, 0.8), -4px -4px 4px 0px #ffffff;
position: relative; position: relative;
text-align: center; text-align: center;
margin-right: 5px;
//margin-top: 7px;
> div { > div {
line-height: 32px; line-height: 32px;
...@@ -236,7 +281,7 @@ ...@@ -236,7 +281,7 @@
border: 1px dashed #aeb5c2 !important; border: 1px dashed #aeb5c2 !important;
position: relative !important; position: relative !important;
display: inline-block; display: inline-block;
margin-right: 5px; margin-right: 4px;
margin-left: 20px; margin-left: 20px;
border-radius: 4px; border-radius: 4px;
} }
...@@ -262,145 +307,14 @@ ...@@ -262,145 +307,14 @@
line-height: 22px; line-height: 22px;
} }
.chu-li-dui-lie { .jiantou {
width: 96px; width: 14px;
height: 32px; height: 8px;
background: #F6F8FA;
box-shadow: 4px 4px 4px 0px rgba(193, 216, 251, 0.8), -4px -4px 4px 0px #FFFFFF;
border-radius: 4px;
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
color: #999999;
line-height: 22px;
//-webkit-background-clip: text;
//-webkit-text-fill-color: transparent;
margin-left: 30px;
display: inline-flex; display: inline-flex;
align-items: center; margin-left: 10px;
justify-content: center; margin-right: 10px;
}
//.gong-zuo-dui-lie-chuanxing { // 串行
// min-width: 96px;
// height: 32px;
// margin-right: 25px;
// display: inline-block;
//
// background: #F6F8FA;
// border: 1px solid #AEB5C2;
// box-shadow: 4px 4px 4px 0px rgba(193, 216, 251, 0.8), -4px -4px 4px 0px #FFFFFF;
// border-radius: 4px;
// position: relative;
// text-align: center;
//
// > div {
// line-height: 32px;
// width: 100%;
// overflow: hidden;
// text-overflow: ellipsis;
// white-space: nowrap;
// box-sizing: border-box;
// padding: 0 10px;
//
// display: flex;
// align-items: center;
// justify-content: center;
//
// .line {
// margin-right: 14px;
// margin-left: 14px;
//
// width: 1px;
// height: 16px;
// background: #D8D8D8;
// border: 1px solid #979797;
// }
//
// //.gztl-tag {
// // width: 32px;
// // height: 20px;
// // background: #D8D8D8;
// // border-radius: 2px;
// //
// // margin-right: 8px;
// // font-size: 12px;
// // font-family: HarmonyOS_Sans_SC;
// // color: #FFFFFF;
// // line-height: 16px;
// //
// // display: inline-flex;
// // align-items: center;
// // justify-content: center;
// //
// //}
// //
// //.zhengcha { /* 案件 正查*/
// // background: #08BD9E;
// //}
// //
// //.chuancha { /* 案件 串查*/
// // background: #055FE7;
// //}
// //
// //.chachong { /* 人员 查重*/
// // background: #FFA219;
// //}
// //
// //.daocha { /* 人员 倒查*/
// // background: #FE0000;
// //}
//
// }
//
// > .icon {
// position: absolute;
// top: -6px;
// right: -6px;
// cursor: pointer;
// }
//}
.gong-zuo-dui-lie-chuanxing { // 串行
min-width: 96px;
height: 32px;
margin-right: 0px;
display: inline-block;
background: #F6F8FA;
border: 1px solid #AEB5C2;
box-shadow: 4px 4px 4px 0px rgba(193, 216, 251, 0.8), -4px -4px 4px 0px #FFFFFF;
border-radius: 4px;
position: relative;
text-align: center;
margin-left: 8px;
> div {
line-height: 32px;
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
box-sizing: border-box;
padding: 0 10px;
display: flex;
align-items: center;
justify-content: center;
} }
> .icon {
position: absolute;
top: -6px;
right: -6px;
cursor: pointer;
}
}
.kk { .kk {
margin-left: 73px; margin-left: 73px;
...@@ -408,11 +322,8 @@ ...@@ -408,11 +322,8 @@
.gong-zuo-dui-lie-bingxing-item { .gong-zuo-dui-lie-bingxing-item {
height: 52px; height: 52px;
display: flex; display: flex;
vertical-align: middle; vertical-align: middle;
//align-items: center;
//justify-content: center; DialogBg
.gong-zuo-dui-lie-bingxing-item-left { .gong-zuo-dui-lie-bingxing-item-left {
width: 1px; width: 1px;
...@@ -428,39 +339,49 @@ ...@@ -428,39 +339,49 @@
background: transparent; background: transparent;
} }
.mid-line { .mid-line {
width: 14px; width: 14px;
height: 2px; height: 2px;
background: linear-gradient(90deg, #7CD5FF 0%, #49AFFF 100%); background: linear-gradient(90deg, #7CD5FF 0%, #49AFFF 100%);
} }
.mid-line-hide {
background: transparent;
}
.mid-circle { .mid-circle {
width: 7px; width: 7px;
height: 7px; height: 7px;
background: #FFFFFF; background: #FFFFFF;
border: 1px solid #49AFFF; border: 1px solid #49AFFF;
border-radius: 100px;
}
.mid-circle-hide {
border: 1px solid transparent;
background: transparent;
} }
.gong-zuo-dui-lie-bingxing-item-right { .gong-zuo-dui-lie-bingxing-item-right {
width: auto; width: auto;
height: 52px; height: 52px;
/*background: black;*/
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
.gong-zuo-dui-lie-bingxing { // 并行 .gong-zuo-dui-lie-bingxing { // 并行
min-width: 96px; min-width: 96px;
height: 32px; height: 32px;
margin-left: 12px; margin-left: 12px;
display: inline-block; display: inline-block;
background: #F6F8FA; background: #F6F8FA;
border: 1px solid #AEB5C2;
box-shadow: 4px 4px 4px 0px rgba(193, 216, 251, 0.8), -4px -4px 4px 0px #FFFFFF; box-shadow: 4px 4px 4px 0px rgba(193, 216, 251, 0.8), -4px -4px 4px 0px #FFFFFF;
border-radius: 4px; border-radius: 4px;
//border: 1px solid #AEB5C2;
border-radius: 4px;
position: relative; position: relative;
text-align: center; text-align: center;
...@@ -480,6 +401,7 @@ ...@@ -480,6 +401,7 @@
> .icon { > .icon {
position: absolute; position: absolute;
color: #055fe7;
top: -6px; top: -6px;
right: -6px; right: -6px;
cursor: pointer; cursor: pointer;
...@@ -491,8 +413,8 @@ ...@@ -491,8 +413,8 @@
.gzdl-line { .gzdl-line {
margin-right: 14px; margin-right: 12px;
margin-left: 14px; margin-left: 12px;
width: 1px; width: 1px;
height: 16px; height: 16px;
...@@ -568,6 +490,11 @@ ...@@ -568,6 +490,11 @@
} }
} }
.divider-line {
margin: 0px 31px 0px 32px;
height: 2px;
border: 1px solid #E6E6E8;
}
.slide-fade-leave-active, .slide-fade-leave-active,
.slide-fade-enter-active { .slide-fade-enter-active {
...@@ -590,15 +517,15 @@ ...@@ -590,15 +517,15 @@
} }
} }
.el-form-item__error { //.el-form-item__error {
left: 100%; // left: 0%;
width: 100%; // width: 100%;
top: 50%; // top: 100%;
box-sizing: border-box; // box-sizing: border-box;
transform: translateY(-50%); // transform: translateY(-50%);
padding-left: 10px; // padding-left: 10px;
padding-top: 0 !important; // padding-top: 0 !important;
} //}
.el-form-item__label { .el-form-item__label {
position: relative; position: relative;
......
vue.config.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:57:48 * @Date: 2021-09-07 09:57:48
* @LastEditTime: 2022-01-08 10:49:55 * @LastEditTime: 2022-01-09 00:12:44
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js * @FilePath: \指纹系统\founder_vue\vue.config.js
...@@ -113,12 +113,12 @@ module.exports = { ...@@ -113,12 +113,12 @@ module.exports = {
// target: "http://192.168.128.166:8099/", // 张 认定 // target: "http://192.168.128.166:8099/", // 张 认定
// target: "http://192.168.128.104:8099", // 湖南-马 // target: "http://192.168.128.104:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王 // target: "http://192.168.128.116:8099", // 湖南-王
target: "http://192.168.128.114:8099", // 湖南-张呈光 // target: "http://192.168.128.114:8099", // 湖南-张呈光
// target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma // target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
// target: "http://127.0.0.1:8099", // target: "http://127.0.0.1:8099",
// target: "http://47.92.225.109:5602", // target: "http://47.92.225.109:5602",
// target: "http://www.meetfood.cn:2390", // 湖南-线上 // target: "http://www.meetfood.cn:2390", // 湖南-线上
// target: "http://zwpt.xzclub.top:9333/", target: "http://zwpt.xzclub.top:9333/",
// target: "http://192.168.128.101:8099", // 江 // target: "http://192.168.128.101:8099", // 江
ws: true, ws: true,
changeOrigin: true, changeOrigin: true,
......
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