Skip to content

F
founder_vue
Commit 6f71c728 by liyuhang19990520
Options

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

parents 55bc17ed 6fc03f7f
Showing with 143 additions and 31 deletions
dist.zip
No preview for this file type
src/assets/img/rybj/yxhz.svg 0 → 100644
<?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
src/components/ImageEd.vue
<!--
* @Author: your name
* @Date: 2021-09-09 09:28:46
* @LastEditTime: 2021-11-29 16:20:06
* @LastEditTime: 2021-11-30 11:44:22
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue
......@@ -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) {
......
src/views/AllPersonnelBase/qbalk.vue
......@@ -769,6 +769,7 @@ export default {
*/
handleClick (row) {
console.log(row);
this.$store.commit('ajdaxx/setAjInfo', row)
this.$router.push('/ajzwbj/' + row.id + '/' + row.ysxtAsjbh)
},
/**
......
src/views/Editor/modules/ajzwbjLeft.vue
<!--
* @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>
......
src/views/Editor/modules/imageEd.scss
......@@ -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;
......
src/views/Editor/modules/imageEdAJ.scss
......@@ -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;
......
src/views/Editor/modules/ryzwbjLeft.vue
<!--
* @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 == '掌纹') {
......
src/views/Home.vue
......@@ -435,6 +435,10 @@ export default {
//console.log(key, keyPath);
},
},
beforeDestroy () {
//组件销毁前需要解绑事件。否则会出现重复触发事件的问题
},
watch: {
menuActive (newValue, oldValue) {
console.log(newValue);
......
src/views/cxyrd/LT.vue
......@@ -480,7 +480,7 @@ export default {
},
beforeDestroy() {
//组件销毁前需要解绑事件。否则会出现重复触发事件的问题
this.$bus.$off("updateFinderSource");
this.$bus.off("updateFinderSource");
}
};
</script>
......
src/views/cxyrd/modules/LTCandidate.vue
......@@ -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>
......
src/views/cxyrd/modules/LTSrc.vue
......@@ -468,7 +468,7 @@ export default {
},
beforeDestroy() {
//组件销毁前需要解绑事件。否则会出现重复触发事件的问题
this.$bus.$off("updateFinderSource");
this.$bus.off("updateFinderSource");
}
};
// 某任务下查询的所有信息
......
src/views/cxyrd/modules/TLCandidate.vue
......@@ -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">
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-30 21:26:24
* @LastEditTime: 2021-12-01 09:52:46
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......
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