Skip to content

F
founder_vue
Commit e6efd8a9 by 张超军
Options

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

parents 91aa8430 6f0f51d1
Showing with 171 additions and 67 deletions
src/views/cxyrd/QueryConfirm.vue
......@@ -209,6 +209,7 @@
</div>
</div>
<div class="confirm_main_table">
<!-- todo 树形结构点击收缩回显-->
<el-table
class="mineral-table"
border
......
src/views/cxyrd/TT.vue
<template>
<div class="tt">
<div class="header">
<div class="label">
查重
</div>
<div class="label">查重</div>
<div class="btns">
<div class="bz-btn">比中</div>
<div class="rd-btn">认定完成</div>
......@@ -127,7 +125,7 @@ div {
flex-direction: column;
}
.header {
height: 32px;
height: 42px;
display: flex;
flex-direction: row;
justify-content: space-between;
......
src/views/cxyrd/modules/TTFingerPrint.vue
<template>
<div class="tt_finger">
<div class="middle">
<div class="middle menu">
<el-menu
:default-active="activeIndex"
mode="horizontal"
......@@ -10,77 +10,153 @@
<el-menu-item index="2">平面</el-menu-item>
</el-menu>
</div>
<div class="outside">
<div class="slabel">
<div class="slabel_font">源数据</div>
</div>
<div class="finger_prints">
<div class="finger_print_div">
<div class="finger_print">
指纹图1
</div>
<div class="finger_pring_label">拇</div>
</div>
<div class="finger_print_div">
<div class="finger_print">
指纹图2
</div>
<div class="finger_pring_label">食</div>
<div class="fingers_outside">
<div class="labels">
<div class="slabel">
<div class="slabel_font">源数据</div>
</div>
<div class="finger_print_div">
<div class="finger_print">
指纹图3
</div>
<div class="finger_pring_label">中</div>
</div>
<div class="finger_print_div">
<div class="finger_print">
指纹图4
</div>
<div class="finger_pring_label">环</div>
<div class="dlabel">
<div class="dlabel_font">目标数据</div>
</div>
<div class="finger_print_div">
<div class="finger_print">
指纹图5
</div>
<div class="finger_pring_label">小</div>
</div>
</div>
</div>
<div class="outside">
<div class="dlabel">
<div class="dlabel_font">目标数据</div>
</div>
<div class="finger_prints">
<div class="finger_print_div">
<div class="finger_print">
指纹图1
</div>
<div class="finger_pring_label">拇</div>
</div>
<div class="finger_print_div">
<div class="finger_print">
指纹图2
<div class="fingers">
<div class="middle label-font">左手</div>
<div class="outside">
<div class="finger_prints">
<div class="finger_print_div">
<div class="finger_print">
指纹图1
</div>
<div class="finger_pring_label">拇</div>
</div>
<div class="finger_print_div">
<div class="finger_print">
指纹图2
</div>
<div class="finger_pring_label">食</div>
</div>
<div class="finger_print_div">
<div class="finger_print">
指纹图3
</div>
<div class="finger_pring_label">中</div>
</div>
<div class="finger_print_div">
<div class="finger_print">
指纹图4
</div>
<div class="finger_pring_label">环</div>
</div>
<div class="finger_print_div">
<div class="finger_print">
指纹图5
</div>
<div class="finger_pring_label">小</div>
</div>
</div>
<div class="finger_pring_label">食</div>
</div>
<div class="finger_print_div">
<div class="finger_print">
指纹图3
<div class="outside">
<div class="finger_prints">
<div class="finger_print_div">
<div class="finger_print">
指纹图1
</div>
<div class="finger_pring_label">拇</div>
</div>
<div class="finger_print_div">
<div class="finger_print">
指纹图2
</div>
<div class="finger_pring_label">食</div>
</div>
<div class="finger_print_div">
<div class="finger_print">
指纹图3
</div>
<div class="finger_pring_label">中</div>
</div>
<div class="finger_print_div">
<div class="finger_print">
指纹图4
</div>
<div class="finger_pring_label">环</div>
</div>
<div class="finger_print_div">
<div class="finger_print">
指纹图5
</div>
<div class="finger_pring_label">小</div>
</div>
</div>
<div class="finger_pring_label">中</div>
</div>
<div class="finger_print_div">
<div class="finger_print">
指纹图4
<div class="middle label-font">右手</div>
<div class="outside">
<div class="finger_prints">
<div class="finger_print_div">
<div class="finger_print">
指纹图1
</div>
<div class="finger_pring_label">拇</div>
</div>
<div class="finger_print_div">
<div class="finger_print">
指纹图2
</div>
<div class="finger_pring_label">食</div>
</div>
<div class="finger_print_div">
<div class="finger_print">
指纹图3
</div>
<div class="finger_pring_label">中</div>
</div>
<div class="finger_print_div">
<div class="finger_print">
指纹图4
</div>
<div class="finger_pring_label">环</div>
</div>
<div class="finger_print_div">
<div class="finger_print">
指纹图5
</div>
<div class="finger_pring_label">小</div>
</div>
</div>
<div class="finger_pring_label">环</div>
</div>
<div class="finger_print_div">
<div class="finger_print">
指纹图5
<div class="outside">
<div class="finger_prints">
<div class="finger_print_div">
<div class="finger_print">
指纹图1
</div>
<div class="finger_pring_label">拇</div>
</div>
<div class="finger_print_div">
<div class="finger_print">
指纹图2
</div>
<div class="finger_pring_label">食</div>
</div>
<div class="finger_print_div">
<div class="finger_print">
指纹图3
</div>
<div class="finger_pring_label">中</div>
</div>
<div class="finger_print_div">
<div class="finger_print">
指纹图4
</div>
<div class="finger_pring_label">环</div>
</div>
<div class="finger_print_div">
<div class="finger_print">
指纹图5
</div>
<div class="finger_pring_label">小</div>
</div>
</div>
<div class="finger_pring_label">小</div>
</div>
</div>
</div>
......@@ -124,6 +200,30 @@ div {
height: 800px;
width: 100%;
}
.fingers_outside {
height: 750px;
width: 100%;
display: flex;
flex-direction: row;
}
.fingers {
width: 100%;
height: 780px;
overflow: scroll;
padding-top: 10px;
}
.labels {
height: 780px;
}
.label-font {
width: 40px;
height: 28px;
font-size: 20px;
font-family: MicrosoftYaHei;
color: #333333;
line-height: 28px;
margin-bottom: 4px;
}
/*外层*/
.outside {
height: 390px;
......@@ -137,6 +237,7 @@ div {
height: 340px;
background: #f6f8fa;
border-radius: 8px 0px 0px 8px;
margin-top: 40px;
display: flex;
flex-direction: column;
justify-content: center;
......@@ -159,6 +260,7 @@ div {
height: 340px;
background: #f6f8fa;
border-radius: 8px 0px 0px 8px;
margin-top: 50px;
display: flex;
flex-direction: column;
justify-content: center;
......@@ -176,7 +278,7 @@ div {
.finger_prints {
width: 100%;
padding: 0 8px 0 8px;
margin-left: -70px;
margin-left: -50px;
}
.finger_print_div {
width: 340px;
......@@ -195,4 +297,7 @@ div {
width: 100%;
text-align: center;
}
.menu {
margin-top: -30px;
}
</style>
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