Skip to content

F
founder_vue
Commit 04d4be30 by 米嘉伟
Options

展开面板

parent 6f0f51d1
Showing with 80 additions and 46 deletions
src/views/AllPersonnelBase/AllPersonnelBase.vue
......@@ -616,7 +616,9 @@ export default {
},
isShowFcxBtn1 (val) {
console.log('单行人员发查询数据', val)
this.rowData = val
let rowVal = [];
rowVal.push(val)
this.rowData = rowVal
this.isShowFcx = true;
},
closeFcx (val) {
......
src/views/AllPersonnelBase/modules/fcx.vue
......@@ -43,10 +43,10 @@
>
<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>{{this.rowData.length}}</span>条</span>
</div>
<div v-else>
<div class="point"></div>源条码号 <span>{{this.rowData.barcode}}</span> <span>已选择 <span>1</span>枚</span>
<div class="point"></div>源条码号 <span>{{this.rowData[0].barcode}}</span> <span>已选择 <span>1</span>枚</span>
<div class='chose'>
</div>
......@@ -148,16 +148,16 @@
<el-checkbox
:indeterminate="isIndeterminate_mbljk"
v-model="checkAll_mbljk"
@change="handleCheckAllChange"
@change="handleCheckAllChange_ry"
>全选</el-checkbox>
<el-checkbox-group
v-model="checkedTargets"
@change="handleCheckedTargetsChange"
@change="handleCheckedTargetsChange_ry"
>
<el-checkbox
v-for="target in targets_ry"
:label="target"
:key="target"
v-for="(target,key) in targets_ry"
:label="key+1"
:key="key"
>{{target}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
......@@ -301,16 +301,16 @@
<el-checkbox
:indeterminate="isIndeterminate_mbljk"
v-model="checkAll_mbljk"
@change="handleCheckAllChange"
@change="handleCheckAllChange_aj"
>全选</el-checkbox>
<el-checkbox-group
v-model="checkedTargets"
@change="handleCheckedTargetsChange"
@change="handleCheckedTargetsChange_aj"
>
<el-checkbox
v-for="target in targets_aj"
:label="target"
:key="target"
v-for="(target,key) in targets_aj"
:label="key+1"
:key="key"
>{{target}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
......@@ -479,7 +479,6 @@ export default {
this.type == 'ry' ? this.title = '人员发查询' : this.title = '案件发查询'
},
created () {
},
watch: {
isShowFcx (newVal, oldVal) {
......@@ -545,21 +544,23 @@ export default {
}
},
// 目标逻辑库全选(人员)
handleCheckAllChange (val) {
handleCheckAllChange_ry (val) {
this.checkedTargets = val ? targetOptions_ry : [];
this.isIndeterminate_mbljk = false;
},
handleCheckedTargetsChange (value) {
handleCheckedTargetsChange_ry (value) {
let checkedCount = value.length;
this.checkAll_mbljk = checkedCount === this.targets_ry.length;
this.isIndeterminate_mbljk = checkedCount > 0 && checkedCount < this.targets_ry.length;
},
// 目标逻辑库全选（案件）
handleCheckAllChange (val) {
handleCheckAllChange_aj (val) {
this.checkedTargets = val ? targetOptions_aj : [];
this.isIndeterminate_mbljk = false;
},
handleCheckedTargetsChange (value) {
handleCheckedTargetsChange_aj (value, key) {
console.log(2222222222, value, key)
console.log('选定目标逻辑库', this.checkedTargets)
let checkedCount = value.length;
this.checkAll_mbljk = checkedCount === this.targets_aj.length;
this.isIndeterminate_mbljk = checkedCount > 0 && checkedCount < this.targets_aj.length;
......@@ -574,18 +575,11 @@ export default {
},
//发查询
search () {
console.log('hahahahahhahaha', this.rowData.length)
console.log('11111111111', this.rowData[0])
let reqUrl = '';
if (this.type == 'ry') {
reqUrl = '/api/query'
let SrcQueryData = {
id: '', // 人员pid
barcode: '', // 条码号
selectedSeqnos: '' // 指位
}; //发查询源数据
let selectedSeqnos = [1, 2];// 指位
SrcQueryData.id = this.rowData.pid
SrcQueryData.barcode = this.rowData.barcode
SrcQueryData.selectedSeqnos = selectedSeqnos;
let queryRequest = {
userid: '1234',
querytype: '', // 查询类型
......@@ -593,31 +587,52 @@ export default {
matchCount: '', // 候选个数
srcDataType: [1],// 源数据类型1,2,3,7
// queryRequest: [{ id: '5' }],// 本地资源库 远程资源库
destPsnDataType: [],// 目标人员类型1,2,3，7 destPsnDataType
srcQueryDataList: [],
destPsnDataType: [],// 目标数据类型1,2,3，7 destPsnDataType
srcQueryDataList: [], // 源数据数组
targetSourceId: [5], // 目标资源库
repeat: 1 // 1、已比中时不重复比对，0、已比中时重复比对
// barcodeFilter: [], // 定向查询
targetPsnLogic: [], // 目标逻辑库
repeat: 1, // 1、已比中时不重复比对，0、已比中时重复比对
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)
queryRequest.targetPsnLogic = this.checkedTargets
queryRequest.barcodeFilter = this.dxcx.barcodeFilter
// 一条源数据，用户选择指位；多条源数据，用户不选择
if (this.rowData.length == 1) {
let SrcQueryData = {
id: '', // 人员pid
barcode: '', // 条码号
selectedSeqnos: null // 指位(选择)(页面获取)
}; //发查询源数据
let selectedSeqnos = [3, 4];// 指位
for (let i = 0; i < this.rowData.length; i++) {
SrcQueryData.id = this.rowData[i].pid
SrcQueryData.barcode = this.rowData[i].barcode
SrcQueryData.selectedSeqnos = selectedSeqnos;
queryRequest.srcQueryDataList.push(SrcQueryData)
}
} else {
for (let i = 0; i < this.rowData.length; i++) {
let SrcQueryData = {//发查询源数据
id: '', // 人员pid
barcode: '', // 条码号
seqnoList: '' // 指位
};
SrcQueryData.id = this.rowData[i].pid
SrcQueryData.barcode = this.rowData[i].barcode
const seqnoList = []
SrcQueryData.seqnoList = seqnoList;
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',
userid: '1234', // 用户ID
querytype: '', // 查询类型
queryClass: '', // 优先级
matchCount: '', // 候选个数
......@@ -626,12 +641,27 @@ export default {
destPsnDataType: [1],// 目标类型 destPsnDataType
srcQueryDataList: [],
targetSourceId: [5], // 目标资源库
// barcodeFilter: [], // 定向查询
targetCaseLogic: [], // 目标逻辑库
barcodeFilter: [], // 定向查询
}
queryRequest.querytype = this.ruleForm.cxlx.querytype
queryRequest.matchCount = this.ruleForm.matchCount
queryRequest.queryClass = this.ruleForm.queryClass
queryRequest.srcQueryDataList.push(SrcQueryData)
queryRequest.targetCaseLogic = this.checkedTargets
queryRequest.barcodeFilter = this.dxcx.barcodeFilter
let selectedSeqnos = [1, 2];// 现场指纹序号
for (let i = 0; i < this.rowData.length; i++) {
let SrcQueryData = { // 案件源数据
id: '', // 案件cid
barcode: '', // 条码号
selectedSeqnos: '' // 现场指纹序号
}; //发查询源数据
SrcQueryData.id = this.rowData[i].cid
SrcQueryData.barcode = this.rowData[i].barcode
SrcQueryData.selectedSeqnos = selectedSeqnos
queryRequest.srcQueryDataList.push(SrcQueryData)
}
this.reqParam = queryRequest
}
......
src/views/AllPersonnelBase/qbalk.vue
......@@ -569,7 +569,9 @@ export default {
},
isShowFcxBtn1 (val) {
console.log('单行案件发查询数据', val)
this.rowData = val
let rowVal = [];
rowVal.push(val)
this.rowData = rowVal
this.isShowFcx = true;
},
closeFcx (val) {
......
vue.config.js
......@@ -82,7 +82,7 @@ module.exports = {
proxy: {
"/api": {
// target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
target: "http://172.18.108.213:8099/", // 张 认定
target: "http://192.168.128.108:8099/", // 张 认定
// target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
ws: true,
changeOrigin: true,
......
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