Commit f7a8b2fb by 米嘉伟

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

parents 3d8b9b23 c4e6ae09
No preview for this file type
<?xml version="1.0" encoding="UTF-8"?>
<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 64 (93537) - https://sketch.com -->
<title>编组 145</title>
<desc>Created with Sketch.</desc>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="编组-145" transform="translate(-1.000000, -1.000000)">
<g id="编组-142备份" fill="#FFFFFF" fill-opacity="0">
<rect id="矩形" x="0" y="0" width="26" height="26"></rect>
</g>
<circle id="椭圆形" stroke="#E50011" stroke-width="2" cx="13" cy="13" r="11"></circle>
<circle id="椭圆形备份-33" fill="#055FE7" cx="13" cy="13" r="2"></circle>
<path d="M20.6754018,17.8794035 C19.8469747,17.8794035 19.0969747,18.2151899 18.5540814,18.7580832 C18.0111882,19.3009764 17.6754018,20.0509764 17.6754018,20.8794035 C17.6754018,21.7078306 18.0111882,22.4578306 18.5540814,23.0007239 C19.0969747,23.5436171 19.8469747,23.8794035 20.6754018,23.8794035 C21.5038289,23.8794035 22.2538289,23.5436171 22.7967221,23.0007239 C23.3396153,22.4578306 23.6754018,21.7078306 23.6754018,20.8794035 C23.6754018,20.0509764 23.3396153,19.3009764 22.7967221,18.7580832 C22.2538289,18.2151899 21.5038289,17.8794035 20.6754018,17.8794035 Z" id="椭圆形备份-34" stroke="#FFFFFF" fill="#055FE7"></path>
</g>
</g>
</svg>
\ No newline at end of file
<!--
* @Author: your name
* @Date: 2021-09-09 09:28:46
* @LastEditTime: 2021-11-29 16:20:06
* @LastEditTime: 2021-12-01 14:12:43
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue
......@@ -810,7 +810,7 @@ export default {
});
this.imageEditor = imageEditor;
imageEditor.loadImageFromURL("img/finger.bmp", "SampleImage").then(function(sizeValue) {
imageEditor.loadImageFromURL("img/xxx.bmp", "SampleImage").then(function(sizeValue) {
//console.log(sizeValue);
imageEditor.clearUndoStack();
});
......@@ -824,7 +824,7 @@ export default {
}
});
this.imageEditor2 = imageEditor2;
imageEditor2.loadImageFromURL("img/finger.bmp", "SampleImage").then(function(sizeValue) {
imageEditor2.loadImageFromURL("img/xxx.bmp", "SampleImage").then(function(sizeValue) {
//console.log(sizeValue);
imageEditor2.clearUndoStack();
});
......@@ -5013,6 +5013,12 @@ export default {
this.targetTong = false;
}
},
beforeDestroy () {
//组件销毁前需要解绑事件。否则会出现重复触发事件的问题
this.$bus.off('changImageEdit');
this.$bus.off('changImageEditTarget')
this.$bus.off('deleteMessage')
},
watch: {
isActive(val) {
if (val == false) {
......
......@@ -790,6 +790,7 @@ export default {
*/
handleClick (row) {
console.log(row);
this.$store.commit('ajdaxx/setAjInfo', row)
this.$router.push('/ajzwbj/' + row.id + '/' + row.ysxtAsjbh)
},
/**
......
<!--
* @Author: your name
* @Date: 2021-10-22 09:42:07
* @LastEditTime: 2021-11-27 17:04:54
* @LastEditTime: 2021-11-30 18:15:14
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
......@@ -23,9 +23,9 @@
</div>
<div class="left-right-hand" v-if="zwSelect==='指纹'">
<div class="lr-hand" v-if="fingers.length>0">
<div class="fingerDom" v-for="(item,index) in fingers" :key="index" @click="FingersChange(index, item)">
<div class="fingerPic" :class="{fingerPicActive: activeFinger===index}">
<div class="finger-number">{{(index+1) &lt; 10 ? ('0'+(index+1)) : (index+1)}}</div>
<div class="fingerDom" v-for="(item,index) in fingers" :key="index" @click="FingersChange(item.code, item)">
<div class="fingerPic" :class="{fingerPicActive: activeFinger==item.code}">
<div class="finger-number">{{(item.code) &lt; 10 ? ('0'+(item.code)) : (item.code)}}</div>
<div class="finger-pic">
<!-- <img src="../../../assets/img/finger.png" /> -->
<img :src="'data:image/jpeg;base64,'+item.image" alt="">
......@@ -45,9 +45,9 @@
</div>
<div class="left-right-hand" v-else-if="zwSelect==='掌纹'">
<div class="lr-hand" v-if="hands.length>0">
<div class="fingerDom" v-for="(item,index) in hands" :key="index" @click="HandChange(index)">
<div class="fingerDom" v-for="(item,index) in hands" :key="index" @click="HandChange(item.code)">
<div class="fingerPic" :class="{fingerPicActive: activeHand===index}">
<div class="finger-number">{{(index+1) &lt; 10 ? ('0'+(index+1)) : (index+1)}}</div>
<div class="finger-number">{{(item.code) &lt; 10 ? ('0'+(item.code)) : (item.code)}}</div>
<div class="finger-pic">
<!-- <img src="../../../assets/img/zhangwen.png" /> -->
<img :src="'data:image/jpeg;base64,'+item.image" alt="">
......@@ -169,6 +169,11 @@ export default {
// this.changeCaseFingerPNG()
}
// 更新图片列表
self.$bus.on('updateList', () => {
this.getCaseFinger()
})
},
methods: {
/**
......@@ -257,8 +262,8 @@ export default {
// //console.log(self.fingers);
// 自动获取第一个
if (self.fingers.length > 0) {
this.activeFinger = 0
self.FingersChange(0, self.fingers[0])
this.activeFinger = '01'
self.FingersChange(1, self.fingers[0])
}
} else {
self.$message.error(res.data.message)
......@@ -339,6 +344,15 @@ export default {
this.$bus.emit('zwType', this.zwSelect)
},
},
beforeDestroy () {
//组件销毁前需要解绑事件。否则会出现重复触发事件的问题
this.$bus.off('ajzwbjImage');
this.$bus.off('ajzwbjType');
this.$bus.off('ajzwbjTDZ');
this.$bus.off('zwType');
this.$bus.off('openAjDaxx');
this.$bus.off('updateList');
}
}
</script>
......
......@@ -909,15 +909,14 @@ $transOrigin: var(--transOrigin, 0px, 0px);
position: relative;
.greendirection {
position: absolute;
left: 390px;
left: 440px;
bottom: 100px;
width: 114px;
height: 114px;
transform: rotate($directionRotate);
transform-origin: center bottom;
transform-origin: left center;
cursor: all-scroll;
display: flex;
flex-direction: column;
align-items: center;
.stringht {
width: 5px;
......@@ -1570,17 +1569,23 @@ $transOrigin: var(--transOrigin, 0px, 0px);
-4px -4px 4px 0px #ffffff;
color: #ffffff;
}
.blend,
.multiply {
.blend {
z-index: 100;
background: #ffffff;
position: absolute;
top: 128px;
right: 47px;
top: 110px;
right: 30px;
}
.multiply {
z-index: 10000;
background: #ffffff;
position: absolute;
top: 120px;
left: 90px;
}
.remove-white {
position: absolute;
top: 184px;
top: 160px;
left: 16px;
display: flex;
align-items: center;
......@@ -1606,6 +1611,20 @@ $transOrigin: var(--transOrigin, 0px, 0px);
height: 20px;
}
}
.disabled {
width: 64px;
height: 32px;
background: #ECEDF1;
border-radius: 4px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #AEAFB4;
display: flex;
justify-content: center;
align-items: center;
margin-right: 12px;
margin-bottom: 16px;
}
/deep/ .el-slider__runway {
width: 190px;
height: 3px;
......
......@@ -9,6 +9,10 @@ $BJDcolor: var(--BJDcolor, #e60012); // #e60012
// 方向旋转角度
$directionRotate: var(--directionRotate, 0deg);
// canvas的宽度
$canvasHeight: var(--canvasHeight, 640px);
$canvasWidth: var(--canvasWidth, 640px);
.imageBox {
display: flex;
......@@ -873,8 +877,8 @@ $directionRotate: var(--directionRotate, 0deg);
height: 180px;
}
img {
width: auto;
height: 180px;
width: $canvasWidth;
height: $canvasHeight;
}
.blc_small {
......@@ -947,8 +951,10 @@ $directionRotate: var(--directionRotate, 0deg);
/deep/ .upper-canvas {
max-height: 640px !important;
max-width: 640px !important;
height: 100%;
width: auto !important;
height: $canvasHeight !important;
width: $canvasWidth !important;
// height: auto !important;
// width: auto !important;
// display: flex !important;
// justify-content: center !important;
// align-items: center !important;
......@@ -2510,11 +2516,27 @@ $directionRotate: var(--directionRotate, 0deg);
align-items: center;
justify-content: center;
.yxhz-left {
cursor: pointer;
width: 40px;
height: 40px;
display: flex;
align-items: center;
justify-content: center;
}
.yxhz-right {
cursor: pointer;
width: 23px;
height: 40px;
display: flex;
align-items: center;
justify-content: center;
}
.zyhz-left {
cursor: pointer;
width: 25px;
height: 25px;
margin-right: 10px;
}
.zyhz-right {
......@@ -3189,14 +3211,35 @@ $directionRotate: var(--directionRotate, 0deg);
color: #ffffff;
}
.blend,
.multiply {
.blend {
z-index: 10000;
background: #ffffff;
position: absolute;
top: 100px;
right: 35px;
}
.multiply {
z-index: 10000;
background: #ffffff;
position: absolute;
top: 100px;
right: 85px;
}
.disabled {
width: 64px;
height: 32px;
background: #ECEDF1;
border-radius: 4px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #AEAFB4;
display: flex;
justify-content: center;
align-items: center;
margin-right: 16px;
margin-bottom: 16px;
}
/deep/ .el-slider__runway {
width: 142px;
......@@ -3351,8 +3394,9 @@ $directionRotate: var(--directionRotate, 0deg);
}
.color-filter {
z-index: 10000;
position: absolute;
top: 180px;
top: 170px;
left: 0;
background-color: #fff;
padding: 5px 10px;
......
<!--
* @Author: your name
* @Date: 2021-10-22 09:42:07
* @LastEditTime: 2021-11-27 17:05:04
* @LastEditTime: 2021-11-30 13:43:02
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
......@@ -571,6 +571,13 @@ export default {
// //console.log(tab, event);
},
},
beforeDestroy () {
//组件销毁前需要解绑事件。否则会出现重复触发事件的问题
this.$bus.off('ryzwbjImage');
this.$bus.off('ryzwbjType');
this.$bus.off('ryzwbjTDZ');
this.$bus.off('zwType');
},
watch: {
zwSelect (newValue, oldValue) {
if (newValue == '掌纹') {
......
......@@ -435,6 +435,10 @@ export default {
//console.log(key, keyPath);
},
},
beforeDestroy () {
//组件销毁前需要解绑事件。否则会出现重复触发事件的问题
},
watch: {
menuActive (newValue, oldValue) {
console.log(newValue);
......
......@@ -585,13 +585,25 @@
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop="status"
label="启用状态"
show-overflow-tooltip
>
<el-table-column prop="status" label="启用状态" width="auto">
<template slot-scope="scope">
<div v-if="scope.row.status === 0" class="circle-red"></div>
<div v-if="scope.row.status === 1" class="circle-blue"></div>
{{
scope.row.status === 0
? "停用"
: scope.row.status === 1
? "启用"
: "无状态"
}}
</template>
</el-table-column>
<el-table-column prop="unitname" label="操作">
<template slot-scope="scope">
</template>
</el-table-column>
<el-table-column prop="unitname" label="操作"> </el-table-column>
</el-table>
</div>
</div>
......
.circle-red {
display: inline-block;
width: 8px;
height: 8px;
background-color: #fe0000;
border-radius: 50%;
-moz-border-radius: 50%;
-webkit-border-radius: 50%;
}
.circle-blue {
display: inline-block;
width: 8px;
height: 8px;
background-color: #00b47a;
border-radius: 50%;
-moz-border-radius: 50%;
-webkit-border-radius: 50%;
}
.tooTipBtn {
padding: 10px;
max-height: 317px;
......@@ -184,6 +203,7 @@
}
}
.table-data {
height: 580px;
width: 100%;
......
......@@ -480,7 +480,7 @@ export default {
},
beforeDestroy() {
//组件销毁前需要解绑事件。否则会出现重复触发事件的问题
this.$bus.$off("updateFinderSource");
this.$bus.off("updateFinderSource");
}
};
</script>
......
......@@ -828,7 +828,6 @@ export default {
//进入页面
enterInto(row) {
if (row.children && row.children.length > 0) {
debugger;
if (row.children[0].querytype === "0") {
let routeUrl = this.$router.resolve({
path: "/confirm/TT",
......
......@@ -33,7 +33,7 @@
</div>
</transition>
</div>
<el-input class="input" v-model="input3" placeholder="请输入条码号/指位"></el-input>
<el-input class="input" v-model="input3" placeholder="请输入条码号/指位" @keydown.enter="search"></el-input>
<div class="btn" @click="search">筛选</div>
<div class="checked">
<el-checkbox v-model="checked">显示已比中候选</el-checkbox>
......@@ -1213,6 +1213,8 @@ export default {
sessionStorage.setItem("destbarcode", val.destbarcode);
// 存储目的数据序号
sessionStorage.setItem("destseqno", val.destseqno);
this.$bus.emit("changImageEditTarget", 'xxx');
return;
} else {
//console.log(val);
......@@ -1258,6 +1260,8 @@ export default {
// //console.log(response);
// self.$bus.emit("changImageEditTarget", response.data.ret.image);
// });
} else {
this.$bus.emit("changImageEditTarget", 'xxx');
}
}
},
......
......@@ -310,11 +310,13 @@ export default {
barcode: barcode,
qqid: self.qqid
}).then(response => {
//console.log(response);
// console.log(response);
if(response.data.code === 0) {
self.enumerate = response.data.ret;
self.fingerTotal = response.data.ret.length;
// 默认选中第一个指纹预览图片
self.changeStyle(0, self.enumerate[0]);
}
});
self.isActive = "";
}
......@@ -385,7 +387,7 @@ export default {
},
// 指纹部分 增加边框
changeStyle(index, imageInfo) {
//console.log(imageInfo);
console.log(imageInfo);
let self = this;
this.isActive = index;
//console.log(this.isActive);
......@@ -396,6 +398,12 @@ export default {
sessionStorage.setItem("srcseqno", imageInfo.seq);
sessionStorage.setItem("zcseq", imageInfo.seq);
this.$bus.emit("changImageEdit", imageInfo.image);
debugger
// 没有被删除
self.$bus.emit('deleteMessage', {
msg: null,
delTime: null
})
// 发送请求
self.$store.commit('loading/setLoading', true)
this.$axios.post(`/api/query/matchcand/dest/${self.qqid}/${imageInfo.seq}`, { srcbarcode: sessionStorage.getItem("srcbarcode") })
......@@ -407,6 +415,9 @@ export default {
self.timer = setTimeout(() => {
self.$store.commit('loading/setLoading', false)
}, 500);
} else {
this.$bus.emit("changImageEdit", 'xxx');
this.$bus.emit("changImageEditTarget", 'xxx');
}
},
/**
......@@ -468,7 +479,7 @@ export default {
},
beforeDestroy() {
//组件销毁前需要解绑事件。否则会出现重复触发事件的问题
this.$bus.$off("updateFinderSource");
this.$bus.off("updateFinderSource");
}
};
// 某任务下查询的所有信息
......
......@@ -2,7 +2,7 @@
<div class="tl-candidate">
<div class="tl-search">
<div class="label">手纹</div>
<el-input class="input" v-model="input3" placeholder="请输入条码号/指位"></el-input>
<el-input class="input" v-model="input3" placeholder="请输入条码号/指位" @keydown.enter="search"></el-input>
<div class="btn" @click="search">筛选</div>
</div>
<div class="checked">
......@@ -137,6 +137,7 @@ export default {
qqid: val.qqid
}, { loading: false, cancelToken: source.token }).then(response => {
//console.log(response);
if(response.data.code === 0) {
self.$bus.emit("changImageEditTarget", response.data.ret[0].image);
if (!self.isFirstMounted) {
clearTimeout(self.timer)
......@@ -144,6 +145,9 @@ export default {
self.$store.commit('loading/setLoading', false)
}, 500);
}
} else {
self.$bus.emit("changImageEditTarget", 'xxx');
}
});
// this.$axios
// .get(`/api/org/plainByBarcode/${val.destbarcode}/${val.destid}`)
......@@ -151,6 +155,8 @@ export default {
// //console.log(response);
// self.$bus.emit("changImageEditTarget", response.data.ret.image);
// });
} else {
self.$bus.emit("changImageEditTarget", 'xxx');
}
},
tableRowClassName({ row, column, rowIndex, columnIndex }) {
......
......@@ -474,6 +474,9 @@ export default {
msg: '该条数据已删除!',
delTime: self.$moment(val.removeTime).format('lll')
})
self.$bus.emit("changImageEdit", 'xxx');
// 清空目标table表
self.$bus.emit("initTLCandidate", []);
// 保存qqid和qid
......@@ -860,6 +863,7 @@ export default {
})
.then(response => {
//console.log(response);
if(response.data.code === 0) {
self.sourceDataList = response.data.ret;
self.dataList = self.sourceDataList;
self.total = self.dataList.length;
......@@ -868,6 +872,10 @@ export default {
self.$nextTick(() => {
self.$refs.singleTable.setCurrentRow(self.dataList[0]);
});
} else {
self.$bus.emit("changImageEdit", 'xxx');
self.$bus.emit("changImageEditTarget", 'xxx');
}
});
} else {
await this.$axios
......@@ -876,6 +884,7 @@ export default {
})
.then(response => {
//console.log(response);
if(response.data.code === 0) {
self.sourceDataList = response.data.ret;
self.dataList = self.sourceDataList;
self.total = self.dataList.length;
......@@ -884,6 +893,10 @@ export default {
self.$nextTick(() => {
self.$refs.singleTable.setCurrentRow(self.dataList[0]);
});
} else {
self.$bus.emit("changImageEdit", 'xxx');
self.$bus.emit("changImageEditTarget", 'xxx');
}
});
}
NProgress.done();
......@@ -1023,6 +1036,11 @@ export default {
if (imageInfo.code && !self.isDelete) {
this.$bus.emit("changImageEdit", imageInfo.image);
// 没有被删除
self.$bus.emit('deleteMessage', {
msg: null,
delTime: null
})
}
NProgress.start();
if (!this.isFirstMounted) {
......@@ -1057,6 +1075,9 @@ export default {
}
self.isFirstMounted = false
} else {
self.$bus.emit("changImageEdit", 'xxx');
self.$bus.emit("changImageEditTarget", 'xxx');
}
},
/**
......@@ -1080,6 +1101,11 @@ export default {
sessionStorage.setItem("dcseq", imageInfo.code);
if (imageInfo.code && !self.isDelete) {
this.$bus.emit("changImageEdit", imageInfo.image);
// 没有被删除
self.$bus.emit('deleteMessage', {
msg: null,
delTime: null
})
}
NProgress.start();
if (!this.isFirstMounted) {
......@@ -1109,6 +1135,9 @@ export default {
}
self.isFirstMounted = false
} else {
self.$bus.emit("changImageEdit", 'xxx');
self.$bus.emit("changImageEditTarget", 'xxx');
}
},
/**
......@@ -1120,7 +1149,6 @@ export default {
changeStyleLeftL(index, imageInfo) {
const CancelToken = axios.CancelToken;
const source = CancelToken.source();
//console.log(imageInfo);
let self = this;
if (imageInfo.image) {
// 改变数据为点击状态
......@@ -1132,6 +1160,11 @@ export default {
sessionStorage.setItem("dcseq", imageInfo.code);
if (imageInfo.code && !self.isDelete) {
this.$bus.emit("changImageEdit", imageInfo.image);
// 没有被删除
self.$bus.emit('deleteMessage', {
msg: null,
delTime: null
})
}
NProgress.start();
if(!this.isFirstMounted) {
......@@ -1161,6 +1194,9 @@ export default {
}
self.isFirstMounted = false
} else {
self.$bus.emit("changImageEdit", 'xxx');
self.$bus.emit("changImageEditTarget", 'xxx');
}
},
/**
......@@ -1184,6 +1220,11 @@ export default {
sessionStorage.setItem("dcseq", imageInfo.code);
if (imageInfo.code && !self.isDelete) {
this.$bus.emit("changImageEdit", imageInfo.image);
// 没有被删除
self.$bus.emit('deleteMessage', {
msg: null,
delTime: null
})
}
NProgress.start();
if(!this.isFirstMounted) {
......@@ -1214,6 +1255,9 @@ export default {
}
self.isFirstMounted = false
} else {
self.$bus.emit("changImageEdit", 'xxx');
self.$bus.emit("changImageEditTarget", 'xxx');
}
},
},
......@@ -1264,6 +1308,7 @@ label {
.lt_candidate_table {
// height: 13.75rem;
width: 100%;
overflow: auto;
}
.tl-src {
......
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-30 21:26:24
* @LastEditTime: 2021-12-01 09:55:26
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -91,14 +91,14 @@ module.exports = {
"/api": {
// target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
// target: "http://172.18.108.2:8099/", // 张 认定
target: "http://192.168.128.108:8099", // 湖南-张
// target: "http://192.168.128.108:8099", // 湖南-张
// target: "http://192.168.128.114:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王
// target: "http://192.168.128.118:8764", // 湖南-张呈光
// 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://www.meetfood.cn:2390", // 湖南-线上
ws: true,
changeOrigin: true,
......@@ -126,8 +126,8 @@ module.exports = {
"/security": {
//target: "http://192.168.128.106:8765", // 湖南-王
target: "http://192.168.128.108:8764", // 湖南-张
// target: "http://www.meetfood.cn:2390", // 湖南-王
// target: "http://192.168.128.108:8764", // 湖南-张
target: "http://www.meetfood.cn:2390", // 湖南-王
ws: true,
changeOrigin: true,
pathRewrite: {
......
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