Skip to content

F
founder_vue
Commit 4e888dbf by 张超军
Options

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

parents 56a8627a df031702
Showing with 73 additions and 34 deletions
package-lock.json
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/AllPersonnelBase/AllPersonnelBase.vue
......@@ -448,7 +448,7 @@ export default {
if (response.data.code === 0) {
this.tableDate = response.data.ret.list;
this.reqParam.page.total = response.data.ret.total;
// console.info("查询结果===>", this.tableDate);
console.info("查询结果===>", this.tableDate);
// this.userInfo = this.getUserInfo(this.tableDate);
} else {
this.$message.error(response.data.message);
......
src/views/AllPersonnelBase/modules/fcx.vue
......@@ -39,9 +39,11 @@
</div>
<div v-else>
<div class="point"></div>源条码号 <span>{{this.rowData.barcode}}</span> <span>已选择 <span>1</span>枚</span>
<div class='chose'>
</div>
</div>
</div>
<el-form
:label-position='labelPosition'
......@@ -81,12 +83,12 @@
</el-form-item>
<el-form-item
label="数据类型"
prop="destdatatype"
prop="destPsnDataType"
>
<el-radio-group v-model="ruleForm.destdatatype">
<el-radio label="滚动指纹"></el-radio>
<el-radio label="平面指纹"></el-radio>
<el-radio label="掌纹"></el-radio>
<el-radio-group v-model="ruleForm.destPsnDataType">
<el-radio label="1">滚动指纹</el-radio>
<el-radio label="2">平面指纹</el-radio>
<el-radio label="3">掌纹</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item
......@@ -141,14 +143,14 @@
@change="handleCheckAllChange"
>全选</el-checkbox>
<el-checkbox-group
v-model="checkedCities"
@change="handleCheckedCitiesChange"
v-model="checkedTargets"
@change="handleCheckedTargetsChange"
>
<el-checkbox
v-for="city in cities"
:label="city"
:key="city"
>{{city}}</el-checkbox>
v-for="target in targets"
:label="target"
:key="target"
>{{target}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
<div class="tmd">
......@@ -296,14 +298,14 @@
@change="handleCheckAllChange"
>全选</el-checkbox>
<el-checkbox-group
v-model="checkedCities"
@change="handleCheckedCitiesChange"
v-model="checkedTargets"
@change="handleCheckedTargetsChange"
>
<el-checkbox
v-for="city in cities"
:label="city"
:key="city"
>{{city}}</el-checkbox>
v-for="target in targets"
:label="target"
:key="target"
>{{target}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
<div class="tmd">
......@@ -372,7 +374,7 @@
</template>
<script>
const cityOptions = ['基本人员库', '高危人员库', '非法人员库', '在逃人员库', '布控人员库', '前科人员库', '协查人员库'];
const targetOptions = ['基本人员库', '高危人员库', '非法人员库', '在逃人员库', '布控人员库', '前科人员库', '协查人员库'];
export default {
name: "fcx",
props: {
......@@ -394,8 +396,8 @@ export default {
sytsArr: '',// 剩余条数
syts: '300',
checkAll: false,
checkedCities: [],
cities: cityOptions,
checkedTargets: [],
targets: targetOptions,
isIndeterminate: true,
labelPosition: 'left', // 标签对齐方式
dialogVisible: false, // 弹窗状态
......@@ -406,6 +408,9 @@ export default {
domains: [
// {
// value: ''
// },
// {
// value: ''
// }
],
email: ''
......@@ -415,7 +420,7 @@ export default {
cxtype: ["无图像，不发送查询", "已比中，不发送查询"],
querytype: '', // 查询类型
},
destdatatype: '',// 目标数据类型
destPsnDataType: '',// 目标数据类型
queryClass: '3', // 优先级
matchCount: '10',// 候选个数
},
......@@ -423,7 +428,7 @@ export default {
cxlx: [
{ required: true, message: '请选择活动资源', trigger: 'change' }
],
destdatatype: [
destPsnDataType: [
{ required: true, message: '请选择数据类型', trigger: 'change' }
],
queryClass: [
......@@ -470,13 +475,13 @@ export default {
}
},
handleCheckAllChange (val) {
this.checkedCities = val ? cityOptions : [];
this.checkedTargets = val ? targetOptions : [];
this.isIndeterminate = false;
},
handleCheckedCitiesChange (value) {
handleCheckedTargetsChange (value) {
let checkedCount = value.length;
this.checkAll = checkedCount === this.cities.length;
this.isIndeterminate = checkedCount > 0 && checkedCount < this.cities.length;
this.checkAll = checkedCount === this.targets.length;
this.isIndeterminate = checkedCount > 0 && checkedCount < this.targets.length;
},
handleClose (done) {
this.$confirm('确认关闭？')
......@@ -488,8 +493,9 @@ export default {
},
//发查询
search () {
let reqUrl = '';
if (this.type == 'ry') {
reqUrl = '/api/query'
let SrcQueryData = {
id: '', // 人员pid
barcode: '', // 条码号
......@@ -506,26 +512,55 @@ export default {
matchCount: '', // 候选个数
srcDataType: [1],// 源数据类型1,2,3,7
// queryRequest: [{ id: '5' }],// 本地资源库 远程资源库
destPsnDataType: [2],// 目标数据类型
destPsnDataType: [],// 目标人员类型1,2,3，7 destPsnDataType
srcQueryDataList: [],
targetSourceId: [5] // 目标资源库
targetSourceId: [5], // 目标资源库
// barcodeFilter: [], // 排除查询
}
queryRequest.querytype = this.ruleForm.cxlx.querytype
queryRequest.matchCount = this.ruleForm.matchCount
queryRequest.destPsnDataType.push(Number(this.ruleForm.destPsnDataType))
queryRequest.queryClass = this.ruleForm.queryClass
queryRequest.srcQueryDataList.push(SrcQueryData)
this.reqParam = queryRequest
} else if (this.type == 'aj') {
reqUrl = '/api/query'
let SrcQueryData = {
id: '', // 案件cid
barcode: '', // 条码号
selectedSeqnos: '' // 现场指纹序号
}; //发查询源数据
let selectedSeqnos = [1, 2];// 现场指纹序号
SrcQueryData.id = this.rowData.cid
SrcQueryData.barcode = this.rowData.barcode
SrcQueryData.selectedSeqnos = selectedSeqnos;
let queryRequest = {
userid: '1234',
querytype: '', // 查询类型
queryClass: '', // 优先级
matchCount: '', // 候选个数
srcDataType: [7],// 源数据类型1,2,3,7
// queryRequest: [{ id: '5' }],// 本地资源库 远程资源库
destPsnDataType: [1],// 目标类型 destPsnDataType
srcQueryDataList: [],
targetSourceId: [5], // 目标资源库
// barcodeFilter: [], // 定向查询
}
queryRequest.querytype = this.ruleForm.cxlx.querytype
queryRequest.matchCount = this.ruleForm.matchCount
queryRequest.queryClass = this.ruleForm.queryClass
queryRequest.srcQueryDataList.push(SrcQueryData)
this.reqParam = queryRequest
}
console.log('发请求', this.reqParam)
this.$axios
.post("/api/query", this.reqParam)
.post(reqUrl, this.reqParam)
.then(response => {
if (response.data.code === 0) {
// console.info("发查询条数返回列表===>", this.byzsArr);
alert('成功')
} else {
this.$message.error(response.data.message);
}
......@@ -728,7 +763,7 @@ export default {
box-sizing: border-box;
.barCodeNum {
width: 827px;
height: 40px;
// height: 40px;
text-align: left;
line-height: 40px;
font-size: 16px;
......@@ -742,6 +777,10 @@ export default {
background: #055fe7;
margin-right: 10px;
}
.chose {
height: 100px;
background-color: #111;
}
span {
margin-left: 16px;
font-size: 14px;
......
src/views/AllPersonnelBase/qbalk.vue
......@@ -396,7 +396,7 @@ export default {
if (response.data.code === 0) {
this.tableDate = response.data.ret.list;
this.reqParam.page.total = response.data.ret.total;
// console.info("案件库返回列表===>", this.tableDate);
console.info("案件库返回列表===>", this.tableDate);
} else {
this.$message.error(response.data.message);
}
......
yarn.lock
This source diff could not be displayed because it is too large. You can view the blob instead.
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