Commit e6efd8a9 by 张超军

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

parents 91aa8430 6f0f51d1
......@@ -19,7 +19,15 @@
</div>
<div class="right">
<div class="rightTop">
<div></div>
<div
class='bgc_A0E7DB'
:style="{width: bgc_A0E7DB + '%', height:'100%',background:'#A0E7DB'}"
>
<div
class='bgc_02C89A'
:style="{width: bgc_02C89A + '%', height:'100%',background:'#02C89A'}"
></div>
</div>
</div>
<div class="rightBottom">
<div class='msg1'><span class="colorspan"></span> 本次预估剩余 <span class="numbspan">85</span> </div>
......@@ -35,7 +43,7 @@
>
<div class='barCodeNum'>
<div v-if='this.rowData.length>1'>
<div class="point"></div>源条码号 <span>已选择 <span>3</span> </span>
<div class="point"></div>源条码号 <span>已选择 <span>3</span></span>
</div>
<div v-else>
<div class="point"></div>源条码号 <span>{{this.rowData.barcode}}</span> <span>已选择 <span>1</span></span>
......@@ -138,8 +146,8 @@
class="mbljk"
>
<el-checkbox
:indeterminate="isIndeterminate"
v-model="checkAll"
:indeterminate="isIndeterminate_mbljk"
v-model="checkAll_mbljk"
@change="handleCheckAllChange"
>全选</el-checkbox>
<el-checkbox-group
......@@ -147,7 +155,7 @@
@change="handleCheckedTargetsChange"
>
<el-checkbox
v-for="target in targets"
v-for="target in targets_ry"
:label="target"
:key="target"
>{{target}}</el-checkbox>
......@@ -157,41 +165,41 @@
<div class="tmdLeft">
<el-form-item label="条码段">
定向查询
<el-input v-model="dynamicValidateForm.email"></el-input>
<el-input v-model="dxcx.barcodeFilter"></el-input>
<i
class="el-icon-circle-plus-outline"
@click="addDomain"
@click="addDxcx"
></i>
<!-- <el-button @click="addDomain">新增</el-button> -->
</el-form-item>
<el-form-item
v-for="(domain) in dynamicValidateForm.domains"
v-for="(domain) in dxcx.domains"
:key="domain.key"
>
<el-input v-model="domain.value"></el-input>
<i
class="el-icon-remove-outline"
@click.prevent="removeDomain(domain)"
@click.prevent="removeDxcx(domain)"
></i>
</el-form-item>
</div>
<div class="tmdRight">
<el-form-item>
排除查询
<el-input v-model="dynamicValidateForm.email"></el-input>
<el-input v-model="pccx.barcodeFilter"></el-input>
<i
class="el-icon-circle-plus-outline"
@click="addDomain"
@click="addPccx"
></i>
</el-form-item>
<el-form-item
v-for="(domain) in dynamicValidateForm.domains"
v-for="(domain) in pccx.domains"
:key="domain.key"
>
<el-input v-model="domain.value"></el-input>
<i
class="el-icon-remove-outline"
@click.prevent="removeDomain(domain)"
@click.prevent="removePccx(domain)"
></i>
</el-form-item>
</div>
......@@ -283,8 +291,6 @@
<el-form
:label-position='labelPosition'
align="left"
:model="ruleForm"
ref="ruleForm"
label-width="100px"
class="demo-ruleForm"
>
......@@ -293,8 +299,8 @@
class="mbljk"
>
<el-checkbox
:indeterminate="isIndeterminate"
v-model="checkAll"
:indeterminate="isIndeterminate_mbljk"
v-model="checkAll_mbljk"
@change="handleCheckAllChange"
>全选</el-checkbox>
<el-checkbox-group
......@@ -302,7 +308,7 @@
@change="handleCheckedTargetsChange"
>
<el-checkbox
v-for="target in targets"
v-for="target in targets_aj"
:label="target"
:key="target"
>{{target}}</el-checkbox>
......@@ -312,41 +318,41 @@
<div class="tmdLeft">
<el-form-item label="条码段">
定向查询
<el-input v-model="dynamicValidateForm.email"></el-input>
<el-input v-model="dxcx.barcodeFilter"></el-input>
<i
class="el-icon-circle-plus-outline"
@click="addDomain"
@click="addDxcx"
></i>
<!-- <el-button @click="addDomain">新增</el-button> -->
</el-form-item>
<el-form-item
v-for="(domain) in dynamicValidateForm.domains"
v-for="(domain) in dxcx.domains"
:key="domain.key"
>
<el-input v-model="domain.value"></el-input>
<i
class="el-icon-remove-outline"
@click.prevent="removeDomain(domain)"
@click.prevent="removeDxcx(domain)"
></i>
</el-form-item>
</div>
<div class="tmdRight">
<el-form-item>
排除查询
<el-input v-model="dynamicValidateForm.email"></el-input>
<el-input v-model="pccx.barcodeFilter"></el-input>
<i
class="el-icon-circle-plus-outline"
@click="addDomain"
@click="addPccx"
></i>
</el-form-item>
<el-form-item
v-for="(domain) in dynamicValidateForm.domains"
v-for="(domain) in pccx.domains"
:key="domain.key"
>
<el-input v-model="domain.value"></el-input>
<i
class="el-icon-remove-outline"
@click.prevent="removeDomain(domain)"
@click.prevent="removePccx(domain)"
></i>
</el-form-item>
</div>
......@@ -374,7 +380,9 @@
</template>
<script>
const targetOptions = ['基本人员库', '高危人员库', '非法人员库', '在逃人员库', '布控人员库', '前科人员库', '协查人员库'];
const targetOptions_ry = ['基本人员库', '高危人员库', '非法人员库', '在逃人员库', '布控人员库', '前科人员库', '协查人员库'];
const targetOptions_aj = ['本地案件库', '比中案件库', '已破案件库', '重大案件库', 'B类案件库', 'C类案件库', '勘查案件库', '协查案件库'];
export default {
name: "fcx",
props: {
......@@ -391,14 +399,17 @@ export default {
},
data () {
return {
bgc_A0E7DB: 60,
bgc_02C89A: 40,
byzsArr: '', // 本月总数(5个等级数组)
byzs: '300',// 该类型下本月总数
sytsArr: '',// 剩余条数
syts: '300',
checkAll: false,
checkedTargets: [],
targets: targetOptions,
isIndeterminate: true,
checkAll_mbljk: false, // 目标逻辑库全选
checkedTargets: [], // 选定目标逻辑库
targets_ry: targetOptions_ry, // 目标逻辑库(人员)
targets_aj: targetOptions_aj, // 目标逻辑库(案件)
isIndeterminate_mbljk: false, // 目标逻辑库全选
labelPosition: 'left', // 标签对齐方式
dialogVisible: false, // 弹窗状态
title: '',
......@@ -413,7 +424,29 @@ export default {
// value: ''
// }
],
email: ''
barcodeFilter: ''
},
dxcx: { // 定向查询
domains: [
// {
// value: ''
// },
// {
// value: ''
// }
],
barcodeFilter: ''
},
pccx: { // 排除查询
domains: [
// {
// value: ''
// },
// {
// value: ''
// }
],
barcodeFilter: ''
},
ruleForm: {
cxlx: {
......@@ -462,6 +495,43 @@ export default {
}
},
methods: {
// 动态添加条码段(定向查询)
addDxcx () {
if (this.dxcx.domains.length > 0) {
this.$message.error("定向查询条件最多两条!");
} else {
this.dxcx.domains.push({
value: '',
key: Date.now()
});
}
},
removeDxcx (item) {
var index = this.dxcx.domains.indexOf(item)
if (index !== -1) {
this.dxcx.domains.splice(index, 1)
}
},
// 动态添加条码段(排除查询)
addPccx () {
if (this.pccx.domains.length > 0) {
this.$message.error("排除查询条件最多两条!");
} else {
this.pccx.domains.push({
value: '',
key: Date.now()
});
}
},
removePccx (item) {
var index = this.pccx.domains.indexOf(item)
if (index !== -1) {
this.pccx.domains.splice(index, 1)
}
},
// 动态添加条码段
addDomain () {
this.dynamicValidateForm.domains.push({
value: '',
......@@ -474,14 +544,25 @@ export default {
this.dynamicValidateForm.domains.splice(index, 1)
}
},
// 目标逻辑库全选(人员)
handleCheckAllChange (val) {
this.checkedTargets = val ? targetOptions : [];
this.isIndeterminate = false;
this.checkedTargets = val ? targetOptions_ry : [];
this.isIndeterminate_mbljk = false;
},
handleCheckedTargetsChange (value) {
let checkedCount = value.length;
this.checkAll = checkedCount === this.targets.length;
this.isIndeterminate = checkedCount > 0 && checkedCount < this.targets.length;
this.checkAll_mbljk = checkedCount === this.targets_ry.length;
this.isIndeterminate_mbljk = checkedCount > 0 && checkedCount < this.targets_ry.length;
},
// 目标逻辑库全选(案件)
handleCheckAllChange (val) {
this.checkedTargets = val ? targetOptions_aj : [];
this.isIndeterminate_mbljk = false;
},
handleCheckedTargetsChange (value) {
let checkedCount = value.length;
this.checkAll_mbljk = checkedCount === this.targets_aj.length;
this.isIndeterminate_mbljk = checkedCount > 0 && checkedCount < this.targets_aj.length;
},
handleClose (done) {
this.$confirm('确认关闭?')
......@@ -515,7 +596,8 @@ export default {
destPsnDataType: [],// 目标人员类型1,2,3,7 destPsnDataType
srcQueryDataList: [],
targetSourceId: [5], // 目标资源库
// barcodeFilter: [], // 排除查询
repeat: 1 // 1、已比中时不重复比对,0、已比中时重复比对
// barcodeFilter: [], // 定向查询
}
queryRequest.querytype = this.ruleForm.cxlx.querytype
queryRequest.matchCount = this.ruleForm.matchCount
......@@ -665,6 +747,7 @@ export default {
}
}
.right {
position: relative;
width: 650px;
height: 100%;
padding-left: 34px;
......@@ -672,12 +755,7 @@ export default {
.rightTop {
width: 610px;
height: 24px;
background-color: #02c89a;
div {
width: 20px;
height: 12px;
background-color: #111;
}
background-color: #eee;
}
.rightBottom {
display: flex;
......
......@@ -209,6 +209,7 @@
</div>
</div>
<div class="confirm_main_table">
<!-- todo 树形结构点击收缩回显-->
<el-table
class="mineral-table"
border
......
<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;
......
<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