Commit bcaf4157 by 张超军

Merge branch 'dev_zwpt' of http://47.92.108.28/changchao/founder_vue into dev_zwpt

parents 55f7f8c9 d30d7552
...@@ -476,7 +476,6 @@ export default { ...@@ -476,7 +476,6 @@ export default {
startEndDate: null, startEndDate: null,
account: "00000000", account: "00000000",
number: 15, number: 15,
tableData: datas1,
queryClassList: setQueryClass, queryClassList: setQueryClass,
userOption: [], userOption: [],
// userOption:users, // userOption:users,
...@@ -918,11 +917,13 @@ export default { ...@@ -918,11 +917,13 @@ export default {
// 复制成功时的回调函数 // 复制成功时的回调函数
onCopy(e) { onCopy(e) {
console.info(this.barcode); console.info(this.barcode);
if (this.barcode.length !== 0) {
this.$message({ this.$message({
type: "success", type: "success",
// message: "复制条码号:" + this.barcode + "成功!" // message: "复制条码号:" + this.barcode + "成功!"
message: "已复制到剪切板" message: "已复制到剪切板"
}); });
}
}, },
// 复制失败时的回调函数 // 复制失败时的回调函数
onError(e) { onError(e) {
...@@ -1058,273 +1059,6 @@ const content = [ ...@@ -1058,273 +1059,6 @@ const content = [
{ colume: "发送时间", prop: "requestdatetime", width: 200 }, { colume: "发送时间", prop: "requestdatetime", width: 200 },
{ colume: "用户名", prop: "username", width: 100 } { colume: "用户名", prop: "username", width: 100 }
]; ];
// 数据
const datas1 = [
{
qid: 21,
id: 5,
pid: 4791,
barcode: "R1100002487002018050033",
srcdbid: "PFP",
querytype: "3",
destdbid: "PFP",
requestdatetime: "2021-09-13T23:33:19.000+0000",
finisheddatetime: null,
querystate: 21,
querymethod: null,
maxcandidatecnt: 54,
curcandidatenum: null,
userid: 4567,
hitpossibility: "54",
queryclass: "3",
multiresult: null,
remoteflag: 0,
srcdatatype: "1,2",
destdatatype: "1,2",
seqno: "0",
srcsourceid: null,
destsourceid: "0",
qqid: 485,
affirmtime: null,
ifsend: "0",
querycfg:
"PD94bWwgdmVyc2lvbj0iMS4wIj8+PFRFWFQ+PSM1NCokISMxMT8kPC9URVhUPjxMT0dJQ1BTTj4wMDAwMDAwMDAwMDAwMTExPC9MT0dJQ1BTTj4=",
userdesc: "张三",
useraccount: "11",
queryCfgStr:
'<?xml version="1.0"?><TEXT>=#54*$!#11?$</TEXT><LOGICPSN>0000000000000111</LOGICPSN>',
queryStateName: "正在复核",
queryTypeName: "串案",
children: [
{
qid: 21,
id: 51,
pid: 4791,
barcode: "R1100002487002018050033",
srcdbid: "PFP",
querytype: "3",
destdbid: "PFP",
requestdatetime: "2021-09-13T23:33:19.000+0000",
finisheddatetime: null,
querystate: 21,
querymethod: null,
maxcandidatecnt: 54,
curcandidatenum: null,
userid: 4567,
hitpossibility: "54",
queryclass: "3",
multiresult: null,
remoteflag: 0,
srcdatatype: "1,2",
destdatatype: "1,2",
seqno: "0",
srcsourceid: null,
destsourceid: "0",
qqid: 485,
affirmtime: null,
ifsend: "0",
querycfg:
"PD94bWwgdmVyc2lvbj0iMS4wIj8+PFRFWFQ+PSM1NCokISMxMT8kPC9URVhUPjxMT0dJQ1BTTj4wMDAwMDAwMDAwMDAwMTExPC9MT0dJQ1BTTj4=",
userdesc: "张三",
useraccount: "11",
queryCfgStr:
'<?xml version="1.0"?><TEXT>=#54*$!#11?$</TEXT><LOGICPSN>0000000000000111</LOGICPSN>',
queryStateName: "正在复核",
queryTypeName: "串案",
private: "0"
},
{
qid: 21,
id: 52,
pid: 4773,
barcode: "R1100002487002018050015",
srcdbid: "PFP",
querytype: "1",
destdbid: "PFP",
requestdatetime: "2021-09-13T23:33:19.000+0000",
finisheddatetime: null,
querystate: 19,
querymethod: null,
maxcandidatecnt: 68,
curcandidatenum: null,
userid: 4567,
hitpossibility: "68",
queryclass: "1",
multiresult: null,
remoteflag: 0,
srcdatatype: "1,2",
destdatatype: "1,2",
seqno: "0",
srcsourceid: null,
destsourceid: "0",
qqid: 467,
affirmtime: "2021-09-14T07:32:24.000+0000",
ifsend: "0",
querycfg:
"PD94bWwgdmVyc2lvbj0iMS4wIj8+PFRFWFQ+PSM1NCokISMxMT8kPC9URVhUPjxMT0dJQ1BTTj4wMDAwMDAwMDAwMDAwMTExPC9MT0dJQ1BTTj4=",
userdesc: "张三",
useraccount: "11",
queryCfgStr:
'<?xml version="1.0"?><TEXT>=#54*$!#11?$</TEXT><LOGICPSN>0000000000000111</LOGICPSN>',
queryStateName: "认定出错",
queryTypeName: "倒查",
private: "0"
},
{
qid: 21,
id: 53,
pid: 4769,
barcode: "R1100002487002018050011",
srcdbid: "PFP",
querytype: "1",
destdbid: "PFP",
requestdatetime: "2021-09-01T23:33:19.000+0000",
finisheddatetime: null,
querystate: 29,
querymethod: null,
maxcandidatecnt: 54,
curcandidatenum: null,
userid: 4567,
hitpossibility: "54",
queryclass: "1",
multiresult: null,
remoteflag: 0,
srcdatatype: "1,2",
destdatatype: "1,2",
seqno: "0",
srcsourceid: null,
destsourceid: "0",
qqid: 463,
affirmtime: null,
ifsend: "0",
querycfg:
"PD94bWwgdmVyc2lvbj0iMS4wIj8+PFRFWFQ+PSM1NCokISMxMT8kPC9URVhUPjxMT0dJQ1BTTj4wMDAwMDAwMDAwMDAwMTExPC9MT0dJQ1BTTj4=",
userdesc: "张三",
useraccount: "11",
queryCfgStr:
'<?xml version="1.0"?><TEXT>=#54*$!#11?$</TEXT><LOGICPSN>0000000000000111</LOGICPSN>',
queryStateName: "复核出错",
queryTypeName: "倒查",
private: "0"
}
]
},
{
qid: 23,
id: 4,
pid: 4780,
barcode: "R1100002487002018050022",
srcdbid: "PFP",
querytype: "0",
destdbid: "PFP",
requestdatetime: "2021-09-13T23:33:19.000+0000",
finisheddatetime: null,
querystate: 21,
querymethod: null,
maxcandidatecnt: 54,
curcandidatenum: null,
userid: 4567,
hitpossibility: "54",
queryclass: "4",
multiresult: null,
remoteflag: 0,
srcdatatype: "1,2",
destdatatype: "1,2",
seqno: "0",
srcsourceid: null,
destsourceid: "0",
qqid: 474,
affirmtime: null,
ifsend: "0",
querycfg:
"PD94bWwgdmVyc2lvbj0iMS4wIj8+PFRFWFQ+PSM1NCokISMxMT8kPC9URVhUPjxMT0dJQ1BTTj4wMDAwMDAwMDAwMDAwMTExPC9MT0dJQ1BTTj4=",
userdesc: "张三",
useraccount: "11",
queryCfgStr:
'<?xml version="1.0"?><TEXT>=#54*$!#11?$</TEXT><LOGICPSN>0000000000000111</LOGICPSN>',
queryStateName: "正在复核",
queryTypeName: "查重",
children: null,
private: "0"
},
{
qid: 8,
id: 999,
pid: 4785,
barcode: "R1100002487002018050037",
srcdbid: "PFP",
querytype: "1",
destdbid: "PFP",
requestdatetime: "2021-09-13T23:33:19.000+0000",
finisheddatetime: null,
querystate: 29,
querymethod: null,
maxcandidatecnt: 65,
curcandidatenum: null,
userid: 4567,
hitpossibility: "65",
queryclass: "1",
multiresult: null,
remoteflag: 0,
srcdatatype: "1,2",
destdatatype: "1,2",
seqno: "0",
srcsourceid: null,
destsourceid: "0",
qqid: 479,
affirmtime: null,
ifsend: "0",
querycfg:
"PD94bWwgdmVyc2lvbj0iMS4wIj8+PFRFWFQ+PSM1NCokISMxMT8kPC9URVhUPjxMT0dJQ1BTTj4wMDAwMDAwMDAwMDAwMTExPC9MT0dJQ1BTTj4=",
userdesc: "张三",
useraccount: "11",
queryCfgStr:
'<?xml version="1.0"?><TEXT>=#54*$!#11?$</TEXT><LOGICPSN>0000000000000111</LOGICPSN>',
queryStateName: "复核出错",
queryTypeName: "倒查",
// children: null,
children: [
{
qid: 21,
id: 9991,
pid: 4769,
barcode: "R1100002487002018050011",
srcdbid: "PFP",
querytype: "1",
destdbid: "PFP",
requestdatetime: "2021-09-01T23:33:19.000+0000",
finisheddatetime: null,
querystate: 29,
querymethod: null,
maxcandidatecnt: 54,
curcandidatenum: null,
userid: 4567,
hitpossibility: "54",
queryclass: "1",
multiresult: null,
remoteflag: 0,
srcdatatype: "1,2",
destdatatype: "1,2",
seqno: "0",
srcsourceid: null,
destsourceid: "0",
qqid: 463,
affirmtime: null,
ifsend: "0",
querycfg:
"PD94bWwgdmVyc2lvbj0iMS4wIj8+PFRFWFQ+PSM1NCokISMxMT8kPC9URVhUPjxMT0dJQ1BTTj4wMDAwMDAwMDAwMDAwMTExPC9MT0dJQ1BTTj4=",
userdesc: "张三",
useraccount: "11",
queryCfgStr:
'<?xml version="1.0"?><TEXT>=#54*$!#11?$</TEXT><LOGICPSN>0000000000000111</LOGICPSN>',
queryStateName: "复核出错",
queryTypeName: "倒查",
private: "0"
}
],
private: "0"
}
];
const setQueryClass = [ const setQueryClass = [
{ queryclass: "1", name: "最高" }, { queryclass: "1", name: "最高" },
{ queryclass: "2", name: "高" }, { queryclass: "2", name: "高" },
...@@ -1599,6 +1333,7 @@ b { ...@@ -1599,6 +1333,7 @@ b {
border-radius: 4px; border-radius: 4px;
border: 1px solid #e6e6e8; border: 1px solid #e6e6e8;
} }
.el_input { .el_input {
width: 168px; width: 168px;
height: 32px; height: 32px;
......
...@@ -94,11 +94,11 @@ $phone: var(--phone, #606266); //#ff4242; ...@@ -94,11 +94,11 @@ $phone: var(--phone, #606266); //#ff4242;
.bzcontent { .bzcontent {
box-sizing: border-box; box-sizing: border-box;
position: absolute; position: absolute;
top: calc(50% - 317px); top: calc(50% - 337px);
left: calc(50% - 371.5px); left: calc(50% - 371.5px);
z-index: 1000; z-index: 1000;
width: 743px; width: 743px;
height: 634px; height: 704px;
background: #ffffff; background: #ffffff;
box-shadow: 0px 14px 30px 0px rgba(0, 21, 51, 0.25); box-shadow: 0px 14px 30px 0px rgba(0, 21, 51, 0.25);
border-radius: 6px; border-radius: 6px;
...@@ -128,8 +128,9 @@ $phone: var(--phone, #606266); //#ff4242; ...@@ -128,8 +128,9 @@ $phone: var(--phone, #606266); //#ff4242;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
color: #333333; color: #333333;
.bz-source { .bz-source {
//border: 1px saddlebrown solid;
width: 743px; width: 743px;
height: 160px; height: 235px;
background: rgba(255, 207, 54, 0.06); background: rgba(255, 207, 54, 0.06);
padding: 24px 32px; padding: 24px 32px;
.bzitem { .bzitem {
...@@ -175,6 +176,48 @@ $phone: var(--phone, #606266); //#ff4242; ...@@ -175,6 +176,48 @@ $phone: var(--phone, #606266); //#ff4242;
height: 8px; height: 8px;
} }
} }
.bz-src-item{
width: 333px;
height: 150px;
.img{
border: 1px #CCCCCC solid;
width: 105px;
height: 150px;
position: relative;
top: -105px;
margin-right: 5px;
.title{
text-align: center;
position: relative;
bottom: -100px;
left: 0;
width: 104px;
height: 20px;
background: linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, #000000 100%);
color: #FFFFFF;
font-size: 12px;
line-height: 20px;
z-index: 100;
}
}
.item{
height: 150px;
width: 220px;
font-size: 14px;
.title{
color: #999999;
height:22px ;
width: 180px;
height: 22px;
}
.value{
color: #333333; height:22px ;
width: 180px;
height: 22px;
}
}
}
} }
.bz-target { .bz-target {
width: 743px; width: 743px;
...@@ -308,5 +351,17 @@ $phone: var(--phone, #606266); //#ff4242; ...@@ -308,5 +351,17 @@ $phone: var(--phone, #606266); //#ff4242;
width: calc(50vh - 35px); width: calc(50vh - 35px);
height: calc(50vh - 35px);; height: calc(50vh - 35px);;
margin-bottom: 20px; margin-bottom: 20px;
} // .wtx {
} // position: absolute;
// width: 75%;
// left: 50%;
// top: 45%;
// transform: translate(-50%, -50%);
// > span {
// display: inline-block;
// margin-top: 20px;
// font-size: 14px;
// color: #cccccc;
// }
//}
}}
<template> <template>
<div id="homepage_hero_module" class="homepage_hero_module"> <el-container class="manage-page" direction="vertical">
<!-- <div id="homepage_hero_module" class="homepage_hero_module">-->
<!-- <div class="video_container">--> <!-- <div class="video_container">-->
<!-- <div :style="fixStyle" class="filter"></div>--> <!-- <div :style="fixStyle" class="filter"></div>-->
<!-- autoplay 自动播放 loop 循环播放 muted 静音播放--> <!-- autoplay 自动播放 loop 循环播放 muted 静音播放-->
...@@ -15,7 +16,7 @@ ...@@ -15,7 +16,7 @@
<!-- </div>--> <!-- </div>-->
<!-- <img class="bg" src="@/assets/img/login/login.gif" />--> <!-- <img class="bg" src="@/assets/img/login/login.gif" />-->
<transition name="slide_fade"> <!-- <transition name="slide_fade">-->
<div :style="drawerStyle" class="login_main_layer" v-if="isShow"> <div :style="drawerStyle" class="login_main_layer" v-if="isShow">
<!-- <transition name="login_fade">--> <!-- <transition name="login_fade">-->
<div> <div>
...@@ -43,9 +44,7 @@ ...@@ -43,9 +44,7 @@
</el-button> </el-button>
</div> </div>
<div> <div>
<accountsLogin <accountsLogin :login-type="loginType.accountStatus"></accountsLogin>
:login-type="loginType.accountStatus"
></accountsLogin>
</div> </div>
<div> <div>
<keyLogin :login-type="loginType.keyStatus"></keyLogin> <keyLogin :login-type="loginType.keyStatus"></keyLogin>
...@@ -53,13 +52,11 @@ ...@@ -53,13 +52,11 @@
</div> </div>
<!-- </transition>--> <!-- </transition>-->
<div class="login_bottom_layer "> <div class="login_bottom_layer ">
<span class=" font_color" <span class=" font_color">Copyright&nbsp;©&nbsp;2021&nbsp;Founder</span>
>Copyright&nbsp;©&nbsp;2021&nbsp;Founder</span
>
</div> </div>
</div> </div>
</transition> <!-- </transition>-->
</div> </el-container>
</template> </template>
<script> <script>
...@@ -174,7 +171,7 @@ export default { ...@@ -174,7 +171,7 @@ export default {
</script> </script>
<style scoped> <style scoped>
.homepage_hero_module { .manage-page {
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;
overflow: hidden; overflow: hidden;
...@@ -182,14 +179,9 @@ export default { ...@@ -182,14 +179,9 @@ export default {
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
} }
/*.homepage_hero_module img {*/ div {
/* width: 100%;*/ /*display: inline-block;*/
/* height: 100%;*/ }
/*}*/
/*video {*/
/* width: 100%;*/
/* height: 100%;*/
/*}*/
.el-button--text { .el-button--text {
width: 108px; width: 108px;
......
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