Skip to content

F
founder_vue
Commit 43dba356 by li_hongchao
Options

Merge remote-tracking branch 'origin/dev_zwpt' into dev_zwpt

parents 1c8a8fe6 0f7d5f9f
Showing with 216 additions and 39 deletions
.env.development
VUE_APP_AUTO_WRITE = dev
VUE_APP_BB_IP = http://192.168.128.102:8075/
\ No newline at end of file
VUE_APP_BB_IP = http://192.168.128.103:8075/
\ No newline at end of file
src/components/ImageEd.scss
......@@ -1402,7 +1402,7 @@ div {
box-sizing: border-box;
position: absolute;
top: -64px;
right: 59px;
right: 140px;
width: 240px;
height: 82px;
background: #ffffff;
......@@ -1453,7 +1453,7 @@ div {
height: 64px;
padding: 0;
top: -40px;
right: 290px !important;
right: 370px !important;
/deep/.tui-colorpicker-container {
width: 137px;
height: 64px;
......@@ -1478,7 +1478,7 @@ div {
height: 64px;
padding: 0;
top: -40px;
right: 200px !important;
right: 280px !important;
/deep/.tui-colorpicker-container {
width: 137px;
height: 64px;
......@@ -1512,7 +1512,7 @@ div {
top: -120px;
}
.color-filter {
right: 315px;
right: 400px;
}
.brightness {
right: 0;
......
src/views/AllPersonnelBase/modules/dcfptxAj.vue
......@@ -175,11 +175,10 @@ export default {
barcode.push(this.rowData[i].followCase.barcode)
}
}
let reqParam = {
barcode: '', //条码号
seqNo: [],// 指纹序号
palmNo: [], // 掌纹序号
imageType: '',// 数据类型（原图）
baseMsg: null, // 基本信息 1导出 0不导出
featureFlag: null, // 导出特征 1导出 0不导出
......@@ -188,9 +187,22 @@ export default {
reqParam.barcode = barcode
if (barcode.length > 1) {
reqParam.seqNo = []
reqParam.seqNo = null
reqParam.palmNo = null
} else {
reqParam.seqNo = this.checkedTargets
let self = this
console.log(this.checkedTargets, ' this.checkedTargets')
self.checkedTargets.map(item => {
console.log(item)
if (item <= 99) {
reqParam.seqNo.push(item)
} else {
reqParam.palmNo.push(item)
}
})
// reqParam.seqNo = this.checkedTargets
}
reqParam.imageType = this.sjlx
reqParam.baseMsg = this.wzChecked == true ? 1 : 0;
......
src/views/Editor/modules/ajzwbjLeft.vue
<!--
* @Author: your name
* @Date: 2021-10-22 09:42:07
* @LastEditTime: 2022-01-19 14:48:31
* @LastEditTime: 2022-02-14 15:02:30
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
......@@ -174,7 +174,8 @@ export default {
// 如果请求过就不再请求
if (self.isHandRequest) {
if (self.hands.length > 0) {
this.$bus.emit('ajzwbjImage', { finger_image: self.hands[0].image, finger_dealFlag: self.hands[0].dealFlag, finger_position: self.hands[0].finger_position })
// this.$bus.emit('ajzwbjImage', { finger_image: self.hands[0].image, finger_dealFlag: self.hands[0].dealFlag, finger_position: self.hands[0].finger_position })
self.HandChange(self.hands[0])
} else {
self.$bus.emit('ajzwbjImage', 'xxx')
}
......@@ -360,12 +361,13 @@ export default {
// 请求掌纹数据
this.getHandsData()
if (this.hands && this.hands.length > 0) {
this.activeHand = this.hands[0].seq
// this.activeHand = this.hands[0].seq
this.HandChange(this.hands[0])
}
this.$bus.emit('ajzwbjType', '掌纹')
this.$bus.emit('ajzwbjTDZ')
} else {
this.$bus.emit('ajzwbjType', '指纹')
this.$bus.emit('ajzwbjTDZ')
if (this.fingers.length > 0) {
this.FingersChange(0, this.fingers[0])
}
......
src/views/Editor/modules/imageEdAJ.vue
<!--
* @Author: your name
* @Date: 2021-10-22 11:36:10
* @LastEditTime: 2022-02-11 17:29:15
* @LastEditTime: 2022-02-14 14:47:12
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
......@@ -1853,7 +1853,7 @@ export default {
).then(res => { }).catch(err => { })
return
}
// console.log(self.seq);
console.log(self.seq);
// console.log(sessionStorage.getItem(self.seq));
// console.log(ajzwbjImage);
let sourceImage = ajzwbjImage.finger_image
......
src/views/bzxxgl/fhxxLT.vue
<!--
* @Author: your name
* @Date: 2021-12-03 15:35:26
* @LastEditTime: 2022-01-18 16:49:16
* @LastEditTime: 2022-02-14 15:36:41
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue
......@@ -609,6 +609,8 @@ export default {
sessionStorage.setItem('srcbarcode', this.allData.ysxtAsjbh)
sessionStorage.setItem('destseqno', this.allData.bzxxZwXh)
sessionStorage.setItem('destbarcode', this.allData.ysxtAsjxgrybh)
// 传递目标数据 -- 目标条码号，目标指位号
self.$bus.emit('target_info', {barcode_source: this.allData.ysxtAsjbh, seq_source: this.allData.bzxxXh, barcode_target: this.allData.ysxtAsjxgrybh, seq_target: this.allData.bzxxZwXh})
}
}).catch(err => {
console.log(err)
......
src/views/bzxxgl/fhxxTT.vue
<!--
* @Author: your name
* @Date: 2021-12-03 15:35:26
* @LastEditTime: 2022-01-18 16:53:29
* @LastEditTime: 2022-02-14 16:33:24
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue
......@@ -1347,7 +1347,7 @@ export default {
this.loadingIndex++
// 平面 目标
this.$axios
.post('/api/png/plain/barcode', {
.post('/api/png/roll/barcode', {
barcode: this.destbarcode,
})
.then(function (response) {
......@@ -1369,6 +1369,7 @@ export default {
}
})
})
console.log(self.destFingersRightR);
// 去掉加载状态
self.fingerLoading = false
} else if (response.data.code == 4) {
......@@ -1386,7 +1387,7 @@ export default {
this.loadingIndex++
// 滚动 目标数据
this.$axios
.post('/api/png/roll/barcode', {barcode: this.destbarcode})
.post('/api/png/plain/barcode', {barcode: this.destbarcode})
.then(function (response) {
self.loadingIndex--
if (response.data.code == 0) {
......
src/views/cxyrd/modules/LLCandidate.vue
......@@ -154,7 +154,11 @@ export default {
//目标表格点击
targetBh: "",
// 表格的索引
tableIndex: null
tableIndex: null,
// 源条码号
barcode_source: '',
// 源指位号
seq_source: ''
};
},
created () {
......@@ -188,6 +192,8 @@ export default {
msg: null,
delTime: null,
});
// 传递目标数据 -- 目标条码号，目标指位号
self.$bus.emit('target_info', {barcode_source: self.barcode_source, seq_source: self.seq_source, barcode_target: '', seq_target: ''})
return;
}
// 默认选中第一条数据
......@@ -199,8 +205,16 @@ export default {
});
},
mounted () {
let self = this
// 监听键盘事件
this.keyDown()
// 获取传递过来的 源条码号，源指位号
this.$bus.on('source_info', (source_info) => {
console.log(source_info);
self.barcode_source = source_info.barcode_source
self.seq_source = source_info.seq_source
})
},
methods: {
/**
......@@ -1094,6 +1108,8 @@ export default {
this.$emit("targetObj", val);
this.targetBh = val.destbarcode;
let self = this;
// 传递目标数据 -- 目标条码号，目标指位号
self.$bus.emit('target_info', {barcode_source: self.barcode_source, seq_source: self.seq_source, barcode_target: val.destbarcode, seq_target: val.destseqno})
if (val.removeFlag == "1") {
// 存储目标条码号
sessionStorage.setItem("destbarcode", val.destbarcode);
......@@ -1208,6 +1224,12 @@ export default {
//console.info(val);
},
},
beforeDestroy () {
this.$bus.off("changImageEditTarget");
this.$bus.off("targetDeleteMessage");
this.$bus.off('target_info')
this.$bus.off('bzJudgeTL')
},
watch: {
checked (newValue, oldValue) {
if (newValue) {
......
src/views/cxyrd/modules/LLSrc.vue
......@@ -416,6 +416,7 @@ export default {
let barcode = val.barcode;
// 存储原条码号
sessionStorage.setItem("srcbarcode", barcode);
self.barcode = barcode
//console.log(barcode);
self.$axios
.post("/api/org/case/barcode", {
......@@ -542,6 +543,8 @@ export default {
self.timer = setTimeout(() => {
self.$store.commit("loading/setLoading", false);
}, 500);
// 传递源数据 -- 源条码号，源指位号
self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.seq})
} else {
this.$bus.emit("changImageEdit", "xxx");
this.$bus.emit("changImageEditTarget", "xxx");
......@@ -626,6 +629,7 @@ export default {
beforeDestroy() {
//组件销毁前需要解绑事件。否则会出现重复触发事件的问题
this.$bus.off("updateFinderSource");
this.$bus.off('source_info')
},
};
// 某任务下查询的所有信息
......
src/views/cxyrd/modules/LTCandidate.vue
......@@ -326,7 +326,11 @@ export default {
isDelete: false,
// 搜索类型
searchType: '指纹',
tableIndex: null
tableIndex: null,
// 源条码号
barcode_source: '',
// 源指位号
seq_source: ''
};
},
mounted () {
......@@ -339,6 +343,13 @@ export default {
self.isShowOptions = false
})
this.keyDown()
// 获取传递过来的 源条码号，源指位号
this.$bus.on('source_info', (source_info) => {
console.log(source_info);
self.barcode_source = source_info.barcode_source
self.seq_source = source_info.seq_source
})
},
created () {
let self = this;
......@@ -374,12 +385,15 @@ export default {
} else {
self.$bus.emit("bzJudge", null);
this.$bus.emit("changImageEditTarget", "xxx");
// 传递目标数据 -- 目标条码号，目标指位号
self.$bus.emit('target_info', {barcode_source: self.barcode_source, seq_source: self.seq_source, barcode_target: '', seq_target: ''})
}
});
},
beforeDestroy () {
this.$bus.off("deleteMessage");
this.$bus.off("initCandidate");
this.$bus.off('target_info')
},
methods: {
/**
......@@ -1323,6 +1337,9 @@ export default {
// 传递当前行的数据，判断是否被比中，如比中就不会弹窗比中
this.$bus.emit("bzJudge", val);
if (val != null) {
// 传递目标数据 -- 目标条码号，目标指位号
self.$bus.emit('target_info', {barcode_source: self.barcode_source, seq_source: self.seq_source, barcode_target: val.destbarcode, seq_target: val.destseqno})
if (val.removeFlag == 1) {
self.$bus.emit("targetDeleteMessage", {
msg: "该条数据已删除！",
......
src/views/cxyrd/modules/LTSrc.vue
......@@ -497,7 +497,7 @@ export default {
let self = this;
// this.isActive = index;
this.isActive = imageInfo.seq;
//console.log(this.isActive);
// console.log(this.isActive);
// 存储源数据序号
if (imageInfo) {
// 改变数据为点击状态
......@@ -524,6 +524,8 @@ export default {
self.$bus.emit("initCandidate", []);
}
});
// 传递源数据 -- 源条码号，源指位号
self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.seq})
} else {
this.$bus.emit("changImageEdit", "xxx");
this.$bus.emit("changImageEditTarget", "xxx");
......@@ -607,6 +609,7 @@ export default {
beforeDestroy () {
//组件销毁前需要解绑事件。否则会出现重复触发事件的问题
this.$bus.off("updateFinderSource");
this.$bus.off('source_info')
},
};
// 某任务下查询的所有信息
......
src/views/cxyrd/modules/TLCandidate.vue
......@@ -75,7 +75,11 @@ export default {
isDelete: false,
searchType: '指纹',
// 表格的索引
tableIndex: null
tableIndex: null,
// 源条码号
barcode_source: '',
// 源指位号
seq_source: ''
};
},
created () {
......@@ -114,6 +118,8 @@ export default {
}
});
} else {
// 传递目标数据 -- 目标条码号，目标指位号
self.$bus.emit('target_info', {barcode_source: self.barcode_source, seq_source: self.seq_source, barcode_target: '', seq_target: ''})
self.tableIndex = null
self.$bus.emit('bzJudgeTL', null)
if (self.isDelete) {
......@@ -130,6 +136,16 @@ export default {
});
// 监听键盘事件
this.keyDown()
// 获取传递过来的 源条码号，源指位号
this.$bus.on('source_info', (source_info) => {
console.log(source_info);
self.barcode_source = source_info.barcode_source
self.seq_source = source_info.seq_source
if(!source_info.barcode_source) {
self.$bus.emit('target_info', {barcode_source: '', seq_source: '', barcode_target: '', seq_target: ''})
}
})
},
methods: {
/**
......@@ -220,6 +236,8 @@ export default {
let self = this;
console.log(val);
if (val != null) {
// 传递目标数据 -- 目标条码号，目标指位号
self.$bus.emit('target_info', {barcode_source: self.barcode_source, seq_source: self.seq_source, barcode_target: val.destbarcode, seq_target: val.destseqno})
if (val.removeFlag == 1) {
self.$bus.emit('targetDeleteMessage', {
msg: '该条数据已删除！',
......@@ -370,6 +388,7 @@ export default {
this.$bus.off('initTLCandidate')
this.$bus.off('deleteMessage')
this.$bus.off('updateTLSourceData')
this.$bus.off('target_info')
},
};
</script>
......
src/views/cxyrd/modules/TLSrc.vue
......@@ -524,7 +524,10 @@ export default {
if (this.hand) {
this.changeStyleHand(0, this.hand)
} else {
// 传递源数据 -- 源条码号，源指位号
self.$bus.emit('source_info', {barcode_source: '', seq_source: ''})
this.$bus.emit('changImageEdit', 'xxx')
this.$bus.emit('changImageEditTarget', 'xxx')
}
},
/**
......@@ -603,6 +606,7 @@ export default {
async handleCurrentChange (val, old) {
let self = this;
if (val != null) {
self.barcode = val.barcode
// 发送请求
// self.$store.commit('loading/setLoadingSd', true)
// 被删除
......@@ -1326,6 +1330,8 @@ export default {
changeStyleHand (index, imageInfo) {
let self = this
if (imageInfo.image) {
// 传递源数据 -- 源条码号，源指位号
self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.code})
// 改变数据为点击状态
self.$set(imageInfo, "clickLog", "1");
this.isActive = imageInfo.code;
......@@ -1375,6 +1381,8 @@ export default {
let self = this;
// 如果图片存在
if (imageInfo.image) {
// 传递源数据 -- 源条码号，源指位号
self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.code})
// 改变数据为点击状态
self.$set(imageInfo, "clickLog", "1");
this.isActive = imageInfo.code;
......@@ -1443,6 +1451,8 @@ export default {
let self = this;
if (imageInfo.image) {
// 传递源数据 -- 源条码号，源指位号
self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.code})
// 改变数据为点击状态
self.$set(imageInfo, "clickLog", "1");
this.isActive = imageInfo.code;
......@@ -1504,6 +1514,8 @@ export default {
const source = CancelToken.source();
let self = this;
if (imageInfo.image) {
// 传递源数据 -- 源条码号，源指位号
self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.code})
// 改变数据为点击状态
self.$set(imageInfo, "clickLog", "1");
this.isActive = imageInfo.code;
......@@ -1565,6 +1577,8 @@ export default {
//console.log(imageInfo);
let self = this;
if (imageInfo.image) {
// 传递源数据 -- 源条码号，源指位号
self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.code})
// 改变数据为点击状态
self.$set(imageInfo, "clickLog", "1");
this.isActive = imageInfo.code;
......
src/views/cxyrd/modules/TTFace.vue
......@@ -247,6 +247,9 @@ export default {
scouceCode(val) {
// var val = "Rmmmmmmmmmmmmmmmmmmmmmm";
let self = this;
for(let key in self.souceGets) {
self.souceGets[key] = ''
}
this.loadingIndex++;
this.$emit("loadingIndex", true);
this.$axios
......@@ -275,6 +278,9 @@ export default {
let self = this;
this.loadingIndex++;
this.$emit("loadingIndex", true);
for(let key in self.targetGets) {
self.targetGets[key] = ''
}
this.$axios
.post("/api/org/face/barcode", { barcode: val })
.then((res) => {
......
src/views/rgrd/modules/LLCandidate.vue
......@@ -118,7 +118,11 @@ export default {
//目标表格点击
targetBh: "",
// 表格的索引
tableIndex: null
tableIndex: null,
// 源条码号
barcode_source: '',
// 源指位号
seq_source: ''
};
},
created() {
......@@ -152,6 +156,8 @@ export default {
msg: null,
delTime: null,
});
// 传递目标数据 -- 目标条码号，目标指位号
self.$bus.emit('target_info', {barcode_source: self.barcode_source, seq_source: self.seq_source, barcode_target: '', seq_target: ''})
return;
}
// 默认选中第一条数据
......@@ -163,8 +169,16 @@ export default {
});
},
mounted () {
let self = this
// 监听键盘事件
this.keyDown()
// 获取传递过来的 源条码号，源指位号
this.$bus.on('source_info', (source_info) => {
console.log(source_info);
self.barcode_source = source_info.barcode_source
self.seq_source = source_info.seq_source
})
},
methods: {
/**
......@@ -1053,11 +1067,13 @@ export default {
* @return {*}
*/
handleCurrentChange(val, old) {
let self = this
if (!val) return;
if (this.isDelete) return;
this.$emit("targetObj", val);
this.targetBh = val.destbarcode;
let self = this;
// 传递目标数据 -- 目标条码号，目标指位号
self.$bus.emit('target_info', {barcode_source: self.barcode_source, seq_source: self.seq_source, barcode_target: val.destbarcode, seq_target: val.destseqno})
if (val.removeFlag == "1") {
// 存储目标条码号
sessionStorage.setItem("destbarcode", val.destbarcode);
......@@ -1163,6 +1179,12 @@ export default {
//console.info(val);
},
},
beforeDestroy () {
this.$bus.off("changImageEditTarget");
this.$bus.off("targetDeleteMessage");
this.$bus.off('target_info')
this.$bus.off('bzJudgeTL')
},
watch: {
checked(newValue, oldValue) {
if (newValue) {
......
src/views/rgrd/modules/LLSrc.vue
......@@ -399,6 +399,7 @@ export default {
sessionStorage.setItem("qqid", self.qqid);
sessionStorage.setItem("qid", self.qid);
let barcode = val.barcode;
self.barcode = barcode
// 存储原条码号
sessionStorage.setItem("srcbarcode", barcode);
//console.log(barcode);
......@@ -529,6 +530,8 @@ export default {
self.timer = setTimeout(() => {
self.$store.commit("loading/setLoading", false);
}, 500);
// 传递源数据 -- 源条码号，源指位号
self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.seq})
} else {
this.$bus.emit("changImageEdit", "xxx");
this.$bus.emit("changImageEditTarget", "xxx");
......@@ -599,6 +602,7 @@ export default {
beforeDestroy() {
//组件销毁前需要解绑事件。否则会出现重复触发事件的问题
this.$bus.off("updateFinderSource");
this.$bus.off('source_info')
},
};
// 某任务下查询的所有信息
......
src/views/rgrd/modules/LTCandidate.vue
......@@ -281,7 +281,11 @@ export default {
isDelete: false,
// 搜索类型
searchType: "指纹",
tableIndex: null
tableIndex: null,
// 源条码号
barcode_source: '',
// 源指位号
seq_source: ''
};
},
mounted () {
......@@ -291,6 +295,12 @@ export default {
self.searchType = type;
});
this.keyDown()
// 获取传递过来的 源条码号，源指位号
this.$bus.on('source_info', (source_info) => {
console.log(source_info);
self.barcode_source = source_info.barcode_source
self.seq_source = source_info.seq_source
})
},
created () {
let self = this;
......@@ -326,12 +336,15 @@ export default {
} else {
self.$bus.emit("bzJudge", null);
this.$bus.emit("changImageEditTarget", "xxx");
// 传递目标数据 -- 目标条码号，目标指位号
self.$bus.emit('target_info', {barcode_source: self.barcode_source, seq_source: self.seq_source, barcode_target: '', seq_target: ''})
}
});
},
beforeDestroy () {
this.$bus.off("deleteMessage");
this.$bus.off("initCandidate");
this.$bus.off('target_info')
},
methods: {
/**
......@@ -1189,6 +1202,8 @@ export default {
// 传递当前行的数据，判断是否被比中，如比中就不会弹窗比中
this.$bus.emit("bzJudge", val);
if (val != null) {
// 传递目标数据 -- 目标条码号，目标指位号
self.$bus.emit('target_info', {barcode_source: self.barcode_source, seq_source: self.seq_source, barcode_target: val.destbarcode, seq_target: val.destseqno})
if (val.removeFlag == 1) {
self.$bus.emit("targetDeleteMessage", {
msg: "该条数据已删除！",
......
src/views/rgrd/modules/LTSrc.vue
......@@ -540,6 +540,8 @@ export default {
self.$bus.emit("initCandidate", []);
}
});
// 传递源数据 -- 源条码号，源指位号
self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.seq})
} else {
this.$bus.emit("changImageEdit", "xxx");
this.$bus.emit("changImageEditTarget", "xxx");
......@@ -621,6 +623,7 @@ export default {
beforeDestroy() {
//组件销毁前需要解绑事件。否则会出现重复触发事件的问题
this.$bus.off("updateFinderSource");
this.$bus.off('source_info')
},
};
// 某任务下查询的所有信息
......
src/views/rgrd/modules/TLCandidate.vue
......@@ -62,7 +62,11 @@ export default {
isDelete: false,
searchType: "指纹",
// 表格的索引
tableIndex: null
tableIndex: null,
// 源条码号
barcode_source: '',
// 源指位号
seq_source: ''
};
},
created () {
......@@ -101,6 +105,8 @@ export default {
}
});
} else {
// 传递目标数据 -- 目标条码号，目标指位号
self.$bus.emit('target_info', { barcode_source: self.barcode_source, seq_source: self.seq_source, barcode_target: '', seq_target: '' })
self.$bus.emit("bzJudgeTL", null);
if (self.isDelete) {
// self.$bus.emit('changImageEditTarget', 'xxx')
......@@ -116,6 +122,16 @@ export default {
});
// 监听键盘事件
this.keyDown()
// 获取传递过来的 源条码号，源指位号
this.$bus.on('source_info', (source_info) => {
console.log(source_info);
self.barcode_source = source_info.barcode_source
self.seq_source = source_info.seq_source
if (!source_info.barcode_source) {
self.$bus.emit('target_info', { barcode_source: '', seq_source: '', barcode_target: '', seq_target: '' })
}
})
},
methods: {
/**
......@@ -182,6 +198,8 @@ export default {
let self = this;
console.log(val);
if (!val) return;
// 传递目标数据 -- 目标条码号，目标指位号
self.$bus.emit('target_info', { barcode_source: self.barcode_source, seq_source: self.seq_source, barcode_target: val.destbarcode, seq_target: val.destseqno })
if (val.removeFlag == 1) {
self.$bus.emit("targetDeleteMessage", {
msg: "该条数据已删除！",
......@@ -352,6 +370,7 @@ export default {
this.$bus.off("initTLCandidate");
this.$bus.off("deleteMessage");
this.$bus.off("updateTLSourceData");
this.$bus.off('target_info')
},
};
</script>
......
src/views/rgrd/modules/TLSrc.vue
......@@ -713,7 +713,10 @@ export default {
if (this.hand) {
this.changeStyleHand(0, this.hand);
} else {
// 传递源数据 -- 源条码号，源指位号
self.$bus.emit('source_info', {barcode_source: '', seq_source: ''})
this.$bus.emit("changImageEdit", "xxx");
this.$bus.emit('changImageEditTarget', 'xxx')
}
},
/**
......@@ -1504,6 +1507,8 @@ export default {
changeStyleHand(index, imageInfo) {
let self = this;
if (imageInfo.image) {
// 传递源数据 -- 源条码号，源指位号
self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.code})
// 改变数据为点击状态
self.$set(imageInfo, "clickLog", "1");
this.isActive = imageInfo.code;
......@@ -1550,6 +1555,8 @@ export default {
let self = this;
// 如果图片存在
if (imageInfo.image) {
// 传递源数据 -- 源条码号，源指位号
self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.code})
// 改变数据为点击状态
self.$set(imageInfo, "clickLog", "1");
this.isActive = imageInfo.code;
......@@ -1616,6 +1623,8 @@ export default {
let self = this;
if (imageInfo.image) {
// 传递源数据 -- 源条码号，源指位号
self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.code})
// 改变数据为点击状态
self.$set(imageInfo, "clickLog", "1");
this.isActive = imageInfo.code;
......@@ -1680,6 +1689,8 @@ export default {
const source = CancelToken.source();
let self = this;
if (imageInfo.image) {
// 传递源数据 -- 源条码号，源指位号
self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.code})
// 改变数据为点击状态
self.$set(imageInfo, "clickLog", "1");
this.isActive = imageInfo.code;
......@@ -1744,6 +1755,8 @@ export default {
//console.log(imageInfo);
let self = this;
if (imageInfo.image) {
// 传递源数据 -- 源条码号，源指位号
self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.code})
// 改变数据为点击状态
self.$set(imageInfo, "clickLog", "1");
this.isActive = imageInfo.code;
......
src/views/zzwlr/xzry.vue
<!--
* @Author: your name
* @Date: 2021-09-07 10:31:34
* @LastEditTime: 2022-02-08 10:44:40
* @LastEditTime: 2022-02-13 21:42:29
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\zzwlr\Index.vue
......@@ -255,7 +255,7 @@
jzrybh: "", // 警综人员编号
asjxgrybh: "", // 案事件相关人员编号号
zzhwkbh: "", // 现场掌指纹卡编号
cjxxyydm: "", // 采集信息原因
cjxxyydm: [], // 采集信息原因
xm: "", // 姓名
bmch: "", // 别名
......@@ -392,7 +392,6 @@
this.$set(this.rules.zjhm[1], "pattern", /^[0-9a-zA-Z]+$/)
}
},
},
methods: {
isRight() {
......
src/views/zzwlr/xzryedit.vue
<!--
* @Author: your name
* @Date: 2021-09-07 10:31:34
* @LastEditTime: 2022-02-08 16:03:36
* @LastEditTime: 2022-02-13 21:43:46
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\zzwlr\Index.vue
......@@ -250,7 +250,7 @@
jzrybh: "", // 警综人员编号
asjxgrybh: "", // 案事件相关人员编号号
zzhwkbh: "", // 现场掌指纹卡编号
cjxxyydm: "", // 采集信息原因
cjxxyydm: [], // 采集信息原因
xm: "", // 姓名
bmch: "", // 别名
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2022-02-12 14:54:31
* @LastEditTime: 2022-02-14 16:50:09
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -113,13 +113,13 @@ module.exports = {
// target: "http://192.168.128.108:8099/", // 张 认定
// target: "http://192.168.128.101:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王
// target: "http://192.168.128.111:8099", // 湖南-张呈光
// target: "http://192.168.128.108:8099", // 湖南-张呈光
// target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
// target: "http://127.0.0.1:8099",
// target: "http://47.92.225.109:5602",
// target: "http://www.meetfood.cn:2390", // 湖南-线上
target: "http://zwpt.xzclub.top:9333/",
// target: "http://192.168.128.103:8099", // 江
// target: "http://zwpt.xzclub.top:9333/",
target: "http://192.168.128.103:8099", // 江
ws: true,
changeOrigin: true,
pathRewrite: {
......@@ -129,9 +129,9 @@ module.exports = {
"/security": {
// target: "http://192.168.128.106:8765", // 湖南-王
// target: "http://192.168.128.111:8765/", // 张 认定
target: "http://192.168.128.108:8765/", // 张 认定
// target: "http://www.meetfood.cn:2390", // 湖南-王
target: "http://zwpt.xzclub.top:9333/",
// target: "http://zwpt.xzclub.top:9333/",
// target: "http://192.168.128.109:8765",
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