Skip to content

F
founder_vue
Commit 41a0d536 by 米嘉伟
Options

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

parents 8d6dea51 a3fe02bd
Showing with 349 additions and 214 deletions
src/views/cxyrd/LT.vue
...@@ -62,7 +62,8 @@ export default { ...@@ -62,7 +62,8 @@ export default {
let destbarcode = sessionStorage.getItem('destbarcode') || '' let destbarcode = sessionStorage.getItem('destbarcode') || ''
let qqid = sessionStorage.getItem('qqid') || '' let qqid = sessionStorage.getItem('qqid') || ''
let qid = sessionStorage.getItem('qid') || '' let qid = sessionStorage.getItem('qid') || ''
let querytype = 1 // 2：正查
let querytype = 2
this.$axios({ this.$axios({
method: 'post', method: 'post',
url: '/api/matchcand/affirm/hit', url: '/api/matchcand/affirm/hit',
...@@ -88,8 +89,35 @@ export default { ...@@ -88,8 +89,35 @@ export default {
* @return {*} * @return {*}
*/ */
Rdwc () { Rdwc () {
let self = this
console.log('认定完成'); console.log('认定完成');
let affirmState = 1
let srcseqno = sessionStorage.getItem('srcseqno') || ''
let destseqno = sessionStorage.getItem('destseqno') || ''
let srcbarcode = sessionStorage.getItem('srcbarcode') || ''
let destbarcode = sessionStorage.getItem('destbarcode') || ''
let qqid = sessionStorage.getItem('qqid') || ''
let qid = sessionStorage.getItem('qid') || ''
// 2：正查
let querytype = 2
this.$axios({
method: 'post',
url: '/api/matchcand/affirm/finish',
data: {
affirmState,
srcseqno,
destseqno,
srcbarcode,
destbarcode,
qqid,
qid,
querytype
}
}).then(response => {
// 跟新列表数据
self.$bus.emit('updateFinderSource')
console.log(response);
})
} }
}, },
}; };
......
src/views/cxyrd/QueryConfirm.vue
...@@ -657,7 +657,7 @@ export default { ...@@ -657,7 +657,7 @@ export default {
// 打开新页面 // 打开新页面
let routeUrl = this.$router.resolve({ let routeUrl = this.$router.resolve({
path: "/confirm/LT", path: "/confirm/LT",
query: { rowData: row } query: { rowData: row.qid }
}); });
window.open(routeUrl.href, "_blank"); window.open(routeUrl.href, "_blank");
} }
......
src/views/cxyrd/modules/LTCandidate.vue
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<el-checkbox v-model="checked">显示已比中候选</el-checkbox> <el-checkbox v-model="checked">显示已比中候选</el-checkbox>
</div> </div>
<div class="lt_candidate_number"> <div class="lt_candidate_number">
<el-table highlight-current-row @current-change="handleCurrentChange" class="lt_candidate_table" height="800" :data="tableData"> <el-table highlight-current-row @current-change="handleCurrentChange" class="lt_candidate_table" height="800" :data="tableData" :row-class-name="tableRowClassName">
<el-table-column label="排名" type="index" width="50"> <el-table-column label="排名" type="index" width="50">
</el-table-column> </el-table-column>
<!-- <el-table-column label="排名" width="50"></el-table-column>--> <!-- <el-table-column label="排名" width="50"></el-table-column>-->
...@@ -127,6 +127,7 @@ export default { ...@@ -127,6 +127,7 @@ export default {
created () { created () {
let self = this let self = this
self.$bus.on('initCandidate', (tableData) => { self.$bus.on('initCandidate', (tableData) => {
console.log(tableData);
self.tableData = tableData self.tableData = tableData
self.total = self.tableData.length self.total = self.tableData.length
self.sourceTableData = tableData self.sourceTableData = tableData
...@@ -135,6 +136,26 @@ export default { ...@@ -135,6 +136,26 @@ export default {
}, },
methods: { methods: {
/** /**
* @description: 比中与认定完成添加样式
* @param {*} row
* @param {*} column
* @param {*} rowIndex
* @param {*} columnIndex
* @return {*}
*/
tableRowClassName ({ row, column, rowIndex, columnIndex }) {
console.log(row);
// 比中的行
if (row.affirmStatus == 2) {
console.log(row);
return "Bizhong"
} else if (row.affirmStatus == 1) {
// 认定完成的行
console.log(row);
return "Identification"
}
},
/**
* @description: 切换指位选择 * @description: 切换指位选择
* @param {*} * @param {*}
* @return {*} * @return {*}
...@@ -927,18 +948,33 @@ export default { ...@@ -927,18 +948,33 @@ export default {
handleCurrentChange (val, old) { handleCurrentChange (val, old) {
let self = this let self = this
console.log(val); console.log(val);
// 存储目标条码号 if (val != null) {
sessionStorage.setItem('destbarcode', val.destbarcode) // 存储目标条码号
// 存储目的数据序号 sessionStorage.setItem('destbarcode', val.destbarcode)
sessionStorage.setItem('destseqno', val.destid) // 存储目的数据序号
// this.$axios.get(`/api/api/org/plainByBarcode/R1100002487002018050034/1/`) sessionStorage.setItem('destseqno', val.destid)
this.$axios.get(`/api/org/plainByBarcode/${val.destbarcode}/${val.destid}/`) // this.$axios.get(`/api/api/org/plainByBarcode/R1100002487002018050034/1/`)
.then(response => { this.$axios.get(`/api/org/plainByBarcode/${val.destbarcode}/${val.destid}/`)
console.log(response); .then(response => {
self.$bus.emit('changImageEditTarget', response.data.ret.image) console.log(response);
self.$bus.emit('changImageEditTarget', response.data.ret.image)
})
}
}
},
watch: {
checked (newValue, oldValue) {
console.log();
if (newValue) {
this.tableData = this.sourceTableData
} else {
this.tableData = this.sourceTableData.filter(item => {
return item.affirmStatus != 2
}) })
console.log(this.tableData);
}
} }
} },
}; };
const candidates = [ const candidates = [
{ {
...@@ -974,99 +1010,117 @@ const candidates = [ ...@@ -974,99 +1010,117 @@ const candidates = [
]; ];
</script> </script>
<style scoped lang="scss"> <style lang="scss">
div {
display: inline-block;
}
.lt_candidate { .lt_candidate {
width: 100%; width: 100%;
height: 100%; height: 100%;
background: #f6f8fa; background: #f6f8fa;
border-radius: 8px; border-radius: 8px;
} div {
.lt_candidate .lt_cnadidate_search { display: inline-block;
width: 100%;
height: 48px;
}
.lt_candidate .lt_cnadidate_checked {
width: 100%;
height: 31px;
display: flex;
justify-content: flex-end;
}
.lt_candidate .lt_candidate_number {
width: 100%;
}
.lt_candidate .lt_candidate_bottom {
text-align: center;
height: 40px;
width: 100%;
}
.el-select .el-input {
width: 130px;
}
.input-with-select .el-input-group__prepend {
background-color: #fff;
}
.selectFinger {
z-index: 10;
position: absolute;
top: 187px;
right: 60px;
width: 236px;
height: 194px;
background: #FFFFFF;
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06);
border-radius: 4px;
border: 1px solid #E6E6E8;
padding: 8px 0;
box-sizing: border-box;
display: flex;
flex-direction: column;
.left-title, .right-title {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #666666;
padding-left: 16px;
} }
.right-title { .lt_cnadidate_search {
margin-top: 7px; width: 100%;
height: 48px;
} }
.line { .lt_cnadidate_checked {
cursor: pointer; width: 100%;
box-sizing: border-box; height: 31px;
padding-left: 8px;
display: flex; display: flex;
align-items: center; justify-content: flex-end;
width: 234px; }
height: 32px; .lt_candidate_number {
.selected { width: 100%;
width: 14px; }
height: 14px; .lt_candidate_bottom {
margin-right: 10px; text-align: center;
box-sizing: border-box; height: 40px;
display: flex; width: 100%;
}
.el-select {
.el-input {
width: 130px;
} }
.selected-type { }
font-size: 14px; .input-with-select {
font-family: MicrosoftYaHei; .el-input-group__prepend {
color: #333333; background-color: #fff;
margin-right: 24px;
} }
.item { }
.selectFinger {
z-index: 10;
position: absolute;
// top: 187px;
// right: 60px;
top: 220px;
right: 60px;
width: 236px;
height: 194px;
background: #FFFFFF;
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06);
border-radius: 4px;
border: 1px solid #E6E6E8;
padding: 8px 0;
box-sizing: border-box;
display: flex;
flex-direction: column;
.left-title, .right-title {
font-size: 14px; font-size: 14px;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
color: #999999; color: #666666;
margin-right: 16px; padding-left: 16px;
}
.right-title {
margin-top: 7px;
}
.line {
cursor: pointer;
box-sizing: border-box;
padding-left: 8px;
display: flex;
align-items: center;
width: 234px;
height: 32px;
.selected {
width: 14px;
height: 14px;
margin-right: 10px;
box-sizing: border-box;
display: flex;
}
.selected-type {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
margin-right: 24px;
}
.item {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #999999;
margin-right: 16px;
&.active {
color: #006AFF;
}
}
&.active { &.active {
color: #006AFF; background: #F5F5F7;
} }
} }
&.active { }
background: #F5F5F7; .Bizhong {
.cell {
color: #FF0039;
}
}
.Identification {
.cell {
color: #055FE7;
} }
} }
} }
</style> </style>
src/views/cxyrd/modules/LTSrc.vue
<template> <template>
<div class="lt_src"> <div class="lt_src">
<div class="lt_top"> <div class="lt_top">
<label>任务号：{{ tableData.qid }}</label> <!-- <label>任务号：{{ tableData.qid }}</label> -->
<label>任务号：{{ rwh }}</label>
<el-checkbox v-model="checked">显示已认定完成查询ID</el-checkbox> <el-checkbox v-model="checked">显示已认定完成查询ID</el-checkbox>
</div> </div>
<div class="lt_middle"> <div class="lt_middle">
<!-- 源数据区 --> <!-- 源数据区 -->
<div class="lt_middle_src_data"> <div class="lt_middle_src_data">
<el-table ref="singleTable" highlight-current-row @current-change="handleCurrentChange" :data="dataList" class="lt_candidate_table border_radius" :height="tableHeight" @row-click="getFirgerPrintDetail"> <el-table ref="singleTable" highlight-current-row @current-change="handleCurrentChange" :data="dataList" class="lt_candidate_table border_radius" :height="tableHeight" @row-click="getFirgerPrintDetail" :row-class-name="tableRowClassName">
<el-table-column prop="qqid" label="查询ID" width="80"></el-table-column> <el-table-column prop="qqid" label="查询ID" width="80"></el-table-column>
<el-table-column prop="barcode" label="源条码号" width="190"></el-table-column> <el-table-column prop="barcode" label="源条码号" width="190"></el-table-column>
<el-table-column prop="maxcandidatecnt" label="枚数" width="80"></el-table-column> <el-table-column prop="maxcandidatecnt" label="枚数" width="80"></el-table-column>
...@@ -42,17 +43,18 @@ ...@@ -42,17 +43,18 @@
export default { export default {
name: "LTSrc", name: "LTSrc",
props: ["srcData"], props: ["srcData"],
watch: { // watch: {
srcData: { // srcData: {
immediate: true, // immediate: true,
handler (val) { // handler (val) {
console.info("源数据传入组件的值为===>", val); // console.info("源数据传入组件的值为===>", val);
this.tableData = val; // this.tableData = val;
} // }
} // }
}, // },
data () { data () {
return { return {
rwh: null,
checked: true, checked: true,
enumerate: null, enumerate: null,
tableData: null, tableData: null,
...@@ -60,6 +62,7 @@ export default { ...@@ -60,6 +62,7 @@ export default {
fingerSrc: require("../../../assets/img/img.png"), fingerSrc: require("../../../assets/img/img.png"),
isShowPrint: true, isShowPrint: true,
tableHeight: 368, tableHeight: 368,
sourceDataList: [],
dataList: [], dataList: [],
total: 0, total: 0,
fingerTotal: 0, fingerTotal: 0,
...@@ -70,11 +73,30 @@ export default { ...@@ -70,11 +73,30 @@ export default {
}, },
methods: { methods: {
/** /**
* @description: 比中与认定完成添加样式
* @param {*} row
* @param {*} column
* @param {*} rowIndex
* @param {*} columnIndex
* @return {*}
*/
tableRowClassName ({ row, column, rowIndex, columnIndex }) {
// 比中的行
if (row.affirmStatus == 2 || row.affirmStatus == 3) {
console.log(row);
return "Bizhong"
} else if (row.affirmStatus == 1) {
// 认定完成的行
console.log(row);
return "Identification"
}
},
/**
* @description: 选择切换 * @description: 选择切换
* @param {*} val * @param {*} val
* @param {*} old * @param {*} old
* @return {*} * @return {*}
*/ */
handleCurrentChange (val, old) { handleCurrentChange (val, old) {
this.currentRow = val; this.currentRow = val;
console.log(val); console.log(val);
...@@ -110,7 +132,8 @@ export default { ...@@ -110,7 +132,8 @@ export default {
.post("/api/queryque/standardAll", {}) .post("/api/queryque/standardAll", {})
.then(response => { .then(response => {
console.log(response); console.log(response);
self.dataList = response.data.ret self.sourceDataList = response.data.ret
self.dataList = self.sourceDataList
self.total = response.data.ret.length self.total = response.data.ret.length
console.log(self.dataList); console.log(self.dataList);
// 默认选中第一行 // 默认选中第一行
...@@ -135,6 +158,7 @@ export default { ...@@ -135,6 +158,7 @@ export default {
}, },
// 指纹部分 增加边框 // 指纹部分 增加边框
changeStyle (index, imageInfo) { changeStyle (index, imageInfo) {
console.log(imageInfo);
let self = this let self = this
this.isActive = index; this.isActive = index;
console.log(this.isActive); console.log(this.isActive);
...@@ -142,16 +166,16 @@ export default { ...@@ -142,16 +166,16 @@ export default {
sessionStorage.setItem('srcseqno', imageInfo.seq) sessionStorage.setItem('srcseqno', imageInfo.seq)
this.$bus.emit('changImageEdit', imageInfo.image) this.$bus.emit('changImageEdit', imageInfo.image)
this.$axios.post(`/api/query/matchcand/dest/${self.qqid}/${imageInfo.seq}`, {}) this.$axios.post(`/api/query/matchcand/dest/${self.qqid}/${imageInfo.seq}`, {})
.then(response => { .then(response => {
console.log(response); console.log(response);
self.$bus.emit('initCandidate', response.data.ret) self.$bus.emit('initCandidate', response.data.ret)
}) })
}, },
/** /**
* @description: 展开收缩切换 * @description: 展开收缩切换
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
changeTableHeight () { changeTableHeight () {
this.isShowPrint = !this.isShowPrint this.isShowPrint = !this.isShowPrint
if (!this.isShowPrint) { if (!this.isShowPrint) {
...@@ -163,7 +187,28 @@ export default { ...@@ -163,7 +187,28 @@ export default {
} }
} }
}, },
watch: {
/**
* @description: 过滤显示已认定完成查询ID
* @param {*} newValue
* @param {*} oldValue
* @return {*}
*/
checked(newValue, oldValue) {
console.log(newValue);
if(newValue) {
this.dataList = this.sourceDataList
} else {
this.dataList = this.sourceDataList.filter(item => {
return item.affirmStatus != 1
})
console.log(this.dataList);
}
}
},
mounted () { mounted () {
console.log(this.$route.query.rowData);
this.rwh = this.$route.query.rowData
let self = this let self = this
// 初始状态下 展示当前任务的第一条指纹信息（指纹个数） // 初始状态下 展示当前任务的第一条指纹信息（指纹个数）
// this.enumerate = datas[0].enumerate; // this.enumerate = datas[0].enumerate;
...@@ -197,116 +242,124 @@ const datas = [ ...@@ -197,116 +242,124 @@ const datas = [
]; ];
</script> </script>
<style scoped lang="scss"> <style lang="scss">
div {
display: inline-block;
}
label {
margin-right: 67px;
}
.el-button {
margin-left: 32px;
width: 24px;
height: 16px;
font-size: 12px;
font-family: MicrosoftYaHei;
color: #055fe7;
line-height: 16px;
font-weight: 350;
}
.lt_src { .lt_src {
width: 100%; width: 100%;
height: 100%; height: 100%;
} div {
.lt_src .lt_top { display: inline-block;
width: 100%;
margin: 0 0 10px 0;
}
.lt_src .lt_middle {
width: 100%;
height: 100%;
background: #ffffff;
border-radius: 8px;
}
.lt_middle_src_data {
border-radius: 8px;
width: 100%;
height: 416px;
}
.lt_middle_src_data .finger_print_number {
width: 100%;
height: 40px;
}
.lt_middle_finger_print {
width: 100%;
}
/* 指纹部分 */
.lt_middle_finger_print .lt_middle_finger_prints {
background: #f6f8fa;
margin-top: 12px;
overflow-y: auto;
width: 100%;
height: 400px;
}
/*底部的统计数据*/
.lt_middle_bottom {
text-align: center;
background: #f6f8fa;
height: 40px;
width: 100%;
font-size: 12px;
font-family: MicrosoftYaHei;
color: #999999;
}
/* 单个指纹*/
.finger_print {
position: relative;
width: 106px;
height: 106px;
background: #ffffff;
border-radius: 2px;
border: 1px solid #cccccc;
margin: 8px 4px 8px 4px;
img {
position: absolute;
top: 0;
left: 0;
} }
} label {
.finger_print_active { margin-right: 67px;
position: relative; }
width: 106px; .el-button {
height: 106px; margin-left: 32px;
background: #ffffff; width: 24px;
border-radius: 2px; height: 16px;
border: 1px solid #055fe7;
.finger_print_number {
color: #ffffff;
font-size: 12px; font-size: 12px;
font-family: MicrosoftYaHei;
color: #055fe7;
line-height: 16px;
font-weight: 350;
}
.lt_top {
width: 100%;
margin: 0 0 10px 0;
}
.lt_middle {
width: 100%;
height: 100%;
background: #ffffff;
border-radius: 8px;
}
.lt_middle_src_data {
border-radius: 8px;
width: 100%;
height: 416px;
.Bizhong {
.cell {
color: #FF0039;
}
}
.Identification {
.cell {
color: #055FE7;
}
}
.finger_print_number {
width: 100%;
height: 40px;
}
}
.lt_middle_finger_print {
width: 100%;
.lt_middle_finger_prints {
background: #f6f8fa;
margin-top: 12px;
overflow-y: auto;
width: 100%;
height: 400px;
}
}
/*底部的统计数据*/
.lt_middle_bottom {
text-align: center;
background: #f6f8fa;
height: 40px;
width: 100%;
font-size: 12px;
font-family: MicrosoftYaHei;
color: #999999;
}
/* 单个指纹*/
.finger_print {
position: relative;
width: 106px;
height: 106px;
background: #ffffff;
border-radius: 2px;
border: 1px solid #cccccc;
margin: 8px 4px 8px 4px;
img {
position: absolute;
top: 0;
left: 0;
}
.finger_print_number {
font-size: 12px;
width: 24px;
height: 24px;
background: #ddebff;
border-radius: 0px 0px 7px 0px;
z-index: 20;
position: absolute;
top: 0;
left: 0;
display: flex;
justify-content: center;
align-items: center;
}
.finger_print_number_active {
position: absolute;
top: 0;
left: 0;
width: 24px;
height: 24px;
background: #055fe7;
border-radius: 0px 0px 7px 0px;
}
}
.finger_print_active {
position: relative;
width: 106px;
height: 106px;
background: #ffffff;
border-radius: 2px;
border: 1px solid #055fe7;
.finger_print_number {
color: #ffffff;
font-size: 12px;
}
} }
}
/* 单个指纹 左上角的序号*/
.finger_print .finger_print_number {
font-size: 12px;
width: 24px;
height: 24px;
background: #ddebff;
border-radius: 0px 0px 7px 0px;
z-index: 20;
position: absolute;
top: 0;
left: 0;
display: flex;
justify-content: center;
align-items: center;
}
.finger_print .finger_print_number_active {
position: absolute;
top: 0;
left: 0;
width: 24px;
height: 24px;
background: #055fe7;
border-radius: 0px 0px 7px 0px;
} }
</style> </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