Skip to content

F
founder_vue
Commit 30300145 by 米嘉伟
Options

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

parents da3b7192 981e82d1
Showing with 137 additions and 37 deletions
src/views/cxyrd/TL.vue
...@@ -74,7 +74,6 @@ div { ...@@ -74,7 +74,6 @@ div {
font-weight: bold; font-weight: bold;
color: #333333; color: #333333;
line-height: 22px; line-height: 22px;
border: #0e9a00 1px solid;
} }
.btns { .btns {
align-self: flex-end; align-self: flex-end;
...@@ -89,12 +88,16 @@ div { ...@@ -89,12 +88,16 @@ div {
background: #ff0039; background: #ff0039;
border-radius: 4px; border-radius: 4px;
margin-right: 16px; margin-right: 16px;
text-align: center;
line-height: 32px;
} }
.rd-btn { .rd-btn {
width: 96px; width: 96px;
height: 32px; height: 32px;
background: #055fe7; background: #055fe7;
border-radius: 4px; border-radius: 4px;
text-align: center;
line-height: 32px;
} }
} }
.main { .main {
...@@ -104,12 +107,10 @@ div { ...@@ -104,12 +107,10 @@ div {
flex-direction: row; flex-direction: row;
.main-left { .main-left {
border: 1px firebrick solid;
width: 352px; width: 352px;
//border: none; //border: none;
} }
.main-middle { .main-middle {
border: 1px #0da9b6 solid;
width: 1120px; width: 1120px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
...@@ -118,7 +119,6 @@ div { ...@@ -118,7 +119,6 @@ div {
.main-right { .main-right {
margin-left: 16px; margin-left: 16px;
width: 360px; width: 360px;
border: 1px #5f1753 solid;
} }
} }
</style> </style>
src/views/cxyrd/modules/TLCandidate.vue
<template> </template> <template>
<div class="tl-candidate">
<div class="tl-search">
<div class="label">手纹</div>
<el-input
class="input"
v-model="input3"
placeholder="请输入条码号/指位"
></el-input>
<div class="btn">筛选</div>
<br />
<div class="checked">
<el-checkbox v-model="checked">显示已比中候选</el-checkbox>
</div>
</div>
<el-table
highlight-current-row
@current-change="handleCurrentChange"
class="lt_candidate_table"
:data="tableData"
:row-class-name="tableRowClassName"
>
<el-table-column label="排名" type="index" width="50"> </el-table-column>
<el-table-column prop="score" label="得分" width="50"></el-table-column>
<el-table-column label="序号" width="50"></el-table-column>
<el-table-column
prop="destbarcode"
label="目标条码号"
width="190"
></el-table-column>
</el-table>
</div>
</template>
<script> <script>
export default { export default {
name: "TLCandidate" name: "TLCandidate",
data() {
return {
input3: "",
tableData: ""
};
},
methods: {
handleCurrentChange(val, old) {
console.info(val, old);
},
tableRowClassName(val, old) {
console.info(val, old);
}
}
}; };
</script> </script>
<style scoped></style> <style lang="scss">
.tl-candidate {
width: 100%;
height: 100%;
background: #f6f8fa;
border-radius: 8px;
div {
display: inline-block;
}
.tl-search {
width: 352px;
height: 60px;
background: #ffffff;
.label {
width: 32px;
height: 24px;
font-size: 16px;
font-family: MicrosoftYaHei;
color: #1a1a1a;
line-height: 24px;
}
.input {
width: 260px;
height: 32px;
background: #ffffff;
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
border: 1px solid #e6e6e8;
margin-left: 10px;
}
.btn {
width: 44px;
height: 32px;
background: #006aff;
border-radius: 0px 4px 4px 0px;
line-height: 32px;
color: #ffffff;
text-align: center;
}
.checked {
display: flex;
justify-content: flex-end;
}
}
}
.el-input__inner {
width: 260px;
height: 32px;
background: #ffffff;
//border: #0e0eff 1px solid;
}
</style>
src/views/cxyrd/modules/TLSrc.vue
<template> <template>
<div class="lt-src"> <div class="tl-src">
<div class="top"> <div class="top">
<label>任务号:</label> <label>任务号:</label>
<el-checkbox v-model="checked">显示已认定完成查询ID</el-checkbox> <el-checkbox v-model="checked">显示已认定完成查询ID</el-checkbox>
...@@ -59,18 +59,18 @@ ...@@ -59,18 +59,18 @@
<!-- style="width: 106px;height: 106px;"--> <!-- style="width: 106px;height: 106px;"-->
<!-- />--> <!-- />-->
</div> </div>
<div class="finger"> <!-- <div class="finger">-->
<div class="num">食</div> <!-- <div class="num">食</div>-->
</div> <!-- </div>-->
<div class="finger"> <!-- <div class="finger">-->
<div class="num">中</div> <!-- <div class="num">中</div>-->
</div> <!-- </div>-->
<div class="finger"> <!-- <div class="finger">-->
<div class="num">环</div> <!-- <div class="num">环</div>-->
</div> <!-- </div>-->
<div class="finger"> <!-- <div class="finger">-->
<div class="num">小</div> <!-- <div class="num">小</div>-->
</div> <!-- </div>-->
</div> </div>
<br /><br /> <br /><br />
<div class="outside"> <div class="outside">
...@@ -78,18 +78,18 @@ ...@@ -78,18 +78,18 @@
<div class="finger"> <div class="finger">
<div class="num">拇</div> <div class="num">拇</div>
</div> </div>
<div class="finger"> <!-- <div class="finger">-->
<div class="num">食</div> <!-- <div class="num">食</div>-->
</div> <!-- </div>-->
<div class="finger"> <!-- <div class="finger">-->
<div class="num">中</div> <!-- <div class="num">中</div>-->
</div> <!-- </div>-->
<div class="finger"> <!-- <div class="finger">-->
<div class="num">环</div> <!-- <div class="num">环</div>-->
</div> <!-- </div>-->
<div class="finger"> <!-- <div class="finger">-->
<div class="num">小</div> <!-- <div class="num">小</div>-->
</div> <!-- </div>-->
</div> </div>
</div> </div>
<div class="bottom"> <div class="bottom">
...@@ -165,7 +165,7 @@ export default { ...@@ -165,7 +165,7 @@ export default {
div { div {
display: inline-block; display: inline-block;
} }
.lt-src { .tl-src {
width: 100%; width: 100%;
height: 100%; height: 100%;
.top { .top {
...@@ -177,6 +177,9 @@ div { ...@@ -177,6 +177,9 @@ div {
height: 100%; height: 100%;
background: #ffffff; background: #ffffff;
border-radius: 8px; border-radius: 8px;
.data {
width: 100%;
}
} }
} }
.finger-print { .finger-print {
...@@ -186,7 +189,6 @@ div { ...@@ -186,7 +189,6 @@ div {
.btns { .btns {
width: 260px; width: 260px;
height: 32px; height: 32px;
border: 1px solid cornflowerblue;
margin: 12px 0 12px 46px; margin: 12px 0 12px 46px;
.btn { .btn {
width: 129px; width: 129px;
...@@ -206,11 +208,11 @@ div { ...@@ -206,11 +208,11 @@ div {
margin-top: 0px; margin-top: 0px;
overflow-y: auto; overflow-y: auto;
width: 100%; width: 100%;
height: 520px; height: 500px;
.outside { .outside {
border: 1px crimson solid;
bottom: 6px; bottom: 6px;
height: 200px; height: 230px;
margin: 0;
.label { .label {
width: 28px; width: 28px;
height: 22px; height: 22px;
......
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