Skip to content

F
founder_vue
Commit 7459482b by 张超军
Options

历史记录

parent f989f890
Showing with 404 additions and 69 deletions
src/components/ImageEd.scss
......@@ -336,7 +336,7 @@ div {
}
}
.historyOptions {
padding: 14px 24px;
// padding: 14px 24px;
z-index: 1;
position: absolute;
top: 35px;
......@@ -348,6 +348,34 @@ div {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06);
border-radius: 4px;
border: 1px solid #e6e6e8;
/* 设置滚动条的样式 */
&::-webkit-scrollbar {
width : 6px; /*高宽分别对应横竖滚动条的尺寸*/
height: 1px;
}
/* 滚动槽 */
&::-webkit-scrollbar-track {
height: 65px;
-webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.3);
border-radius: 10px;
}
/* 滚动条滑块 */
&::-webkit-scrollbar-thumb {
border-radius: 10px;
height: 65px;
background: #DADDE0;
}
.history_item {
cursor: pointer;
width: 100%;
&:hover {
background-color: #f5f5f7;
}
.item_left {
padding-left: 8px;
width: 31.7px;
}
}
}
}
.clearConfirm {
......@@ -1022,7 +1050,7 @@ div {
width: 520px;
height: 520px;
// background: rgba(0, 0, 0, 0.8);
margin-left: 14px;
// margin-left: 14px;
margin-top: 60px;
.body-container {
width: 520px;
......
src/components/ImageEd.vue
<!--
* @Author: your name
* @Date: 2021-09-09 09:28:46
* @LastEditTime: 2021-10-02 19:03:20
* @LastEditTime: 2021-10-09 11:12:31
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue
......@@ -11,12 +11,12 @@
<div class="lt_header">
<div class="center">
<el-tooltip class="item" effect="dark" content="撤销">
<div class="icon back disabled" id="btn-undo">
<div class="icon back disabled disabled2" id="btn-undo">
<img src="../assets/img/zcedit/back.png" alt="">
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="恢复">
<div class="icon go disabled" id="btn-redo">
<div class="icon go disabled disabled2" id="btn-redo">
<img src="../assets/img/zcedit/go.png" alt="">
</div>
</el-tooltip>
......@@ -231,11 +231,21 @@
<img class="history" v-else src="../assets/img/zcedit/history_a.png" alt="">
</div>
<div class="historyOptions" v-show="isHistoryOptions">
<div class="history_item" v-for="(item, index) in historys" :key="index">
<div class="item_left">
<div class="look">√</div>
<div v-if="type == 'source'">
<div class="history_item" v-for="(item, index) in historys" :key="index" @click="goHistory(index)">
<div class="item_left">
<div v-show="index===preIndex" class="look">√</div>
</div>
<div class="item_right">{{item}}</div>
</div>
</div>
<div v-else>
<div class="history_item" v-for="(item, index) in historys2" :key="index" @click="goHistory(index)">
<div class="item_left">
<div class="look">√</div>
</div>
<div class="item_right">{{item}}</div>
</div>
<div class="item_right">{{item}}</div>
</div>
</div>
</div>
......@@ -368,7 +378,7 @@ import zoom from '../utils/autosize';
// import LTCandidate from "./modules/LTCandidate.vue";
export default {
// 正查 倒查 查重
name: "LT",
name: "ImageEd",
data () {
return {
mouseEnlarge: false,
......@@ -489,6 +499,7 @@ export default {
type: 'source',
imgFile: require('../assets/img/img.png'),
historys: [],
historys2: [],
// 是否展示历史下拉框
isHistoryOptions: false,
// 是否点击了历史
......@@ -512,7 +523,10 @@ export default {
// 同步-source
sourceTong: false,
// 同步-target
targetTong: false
targetTong: false,
// 记录之前的点击历史记录
preIndex: null,
preIndex2: null
};
},
components: {
......@@ -600,8 +614,6 @@ export default {
imageEditor.clearUndoStack();
});
console.log(imageEditor.ui);
imageEditor2 = new tui.ImageEditor('.tui-image-editor2', {
cssMaxWidth: 520,
cssMaxHeight: 520,
......@@ -897,6 +909,7 @@ export default {
// 撤回
$btnUndo.on('click', function () {
self.initStatus()
console.log('撤销');
if (self.type == 'source') {
if (!$(this).hasClass('disabled')) {
......@@ -970,6 +983,7 @@ export default {
})
.then(objectProps => {
console.log(objectProps.id);
self.historys.push('标记点')
});
} else if (self.sizeX_source) {
// 小
......@@ -986,6 +1000,7 @@ export default {
})
.then(objectProps => {
console.log(objectProps.id);
self.historys.push('标记点')
});
} else if (self.sizeZ_source) {
// 中
......@@ -1002,6 +1017,7 @@ export default {
})
.then(objectProps => {
console.log(objectProps.id);
self.historys.push('标记点')
});
} else if (self.sizeD_source) {
// 大
......@@ -1018,6 +1034,7 @@ export default {
})
.then(objectProps => {
console.log(objectProps.id);
self.historys.push('标记点')
});
}
// 放大
......@@ -1097,6 +1114,7 @@ export default {
})
.then(objectProps => {
console.log(objectProps.id);
self.historys2.push('标记点')
});
} else if (self.sizeX_target) {
// 小
......@@ -1113,6 +1131,7 @@ export default {
})
.then(objectProps => {
console.log(objectProps.id);
self.historys2.push('标记点')
});
} else if (self.sizeZ_target) {
// 中
......@@ -1129,6 +1148,7 @@ export default {
})
.then(objectProps => {
console.log(objectProps.id);
self.historys2.push('标记点')
});
} else if (self.sizeD_target) {
// 大
......@@ -1145,6 +1165,7 @@ export default {
})
.then(objectProps => {
console.log(objectProps.id);
self.historys2.push('标记点')
});
}
// 放大
......@@ -1315,10 +1336,12 @@ export default {
self.isLeftRotate = true
self.isRightRotate = false
imageEditor.rotate(30);
self.historys.push('旋转')
} else {
self.isLeftRotate = true
self.isRightRotate = false
imageEditor2.rotate(30);
self.historys2.push('旋转')
}
});
// 向右旋转30°
......@@ -1327,10 +1350,12 @@ export default {
self.isLeftRotate = false
self.isRightRotate = true
imageEditor.rotate(-30);
self.historys.push('旋转')
} else {
self.isLeftRotate = false
self.isRightRotate = true
imageEditor2.rotate(-30);
self.historys2.push('旋转')
}
});
// 滑动旋转事件
......@@ -1355,9 +1380,11 @@ export default {
if (self.type == 'source') {
self.inputRotationRange = parseInt($inputRotationRange.val(), 10)
imageEditor.setAngle(parseInt($inputRotationRange.val(), 10))['catch'](function () { });
self.historys.push('旋转')
} else {
self.inputRotationRange = parseInt($inputRotationRange.val(), 10)
imageEditor2.setAngle(parseInt($inputRotationRange.val(), 10))['catch'](function () { });
self.historys2.push('旋转')
}
});
......@@ -1399,8 +1426,10 @@ export default {
imageEditor.stopDrawingMode();
if (mode === 'freeDrawing') {
imageEditor.startDrawingMode('FREE_DRAWING', settings);
self.historys.push('辅助线')
} else {
imageEditor.startDrawingMode('LINE_DRAWING', settings);
self.historys.push('辅助线')
}
if (!self.isLineOptions) {
imageEditor.stopDrawingMode();
......@@ -1409,8 +1438,10 @@ export default {
imageEditor2.stopDrawingMode();
if (mode === 'freeDrawing') {
imageEditor2.startDrawingMode('FREE_DRAWING', settings);
self.historys2.push('辅助线')
} else {
imageEditor2.startDrawingMode('LINE_DRAWING', settings);
self.historys2.push('辅助线')
}
if (!self.isLineOptions) {
imageEditor2.stopDrawingMode();
......@@ -1558,16 +1589,53 @@ export default {
},
methods: {
/**
* @description: 切换历史记录
* @param {*} index
* @return {*}
*/
goHistory (index) {
if (this.type === 'source') {
if(this.preIndex==null) {
this.preIndex = this.historys.length-1
}
let count = Math.abs(this.preIndex - index)
if (this.preIndex >= index) {
console.log(count);
this.imageEditor.undo(count)
} else {
console.log(count);
this.imageEditor.redo(count)
}
this.preIndex = index
} else {
if(this.preIndex==null) {
this.preIndex = this.historys.length-1
}
let count = Math.abs(this.preIndex - index)
if(this.preIndex2 >= index) {
this.imageEditor2.undo(count)
} else {
this.imageEditor2.redo(count)
}
this.preIndex2 = index
}
},
/**
* @description: 历史记录
* @param {*}
* @return {*}
*/
historyChange () {
this.initStatus()
this.imageEditor._initHistory()
console.log(this.imageEditor);
console.log(this.historys);
this.imageEditor.undo(this.historys.length)
// this.initStatus()
this.isHistoryOptions = !this.isHistoryOptions
// this.imageEditor._initHistory()
// console.log(this.historys);
// this.imageEditor.undo(this.historys.length)
if (this.type === 'source') {
console.log(this.historys);
} else {
console.log(this.historys2);
}
},
/**
* @description: 亮度
......@@ -1575,6 +1643,20 @@ export default {
* @return {*}
*/
changeBrightness () {
// 是否展示旋转的下拉框
this.isRotateOptions = false
// 是否展示园标记弹出框
this.isCircleOptions = false
// 是否展示去白下拉框
this.optionsRemoveWhite = false
// 滤色器选项框
this.optionsColorFilter = false
// 是否展示正片叠底框
this.optionsMultiply = false
// 是否展示差异化下拉框
this.optionsBlend = false
// 是否展示亮度弹窗
this.optionsBrightness = false
let self = this
this.isBrightnessActive = !this.isBrightnessActive
if (this.isBrightnessActive) {
......@@ -1585,19 +1667,25 @@ export default {
}).then(function (result) {
console.log(result);
});
self.historys.push('亮度')
} else {
this.imageEditor2.applyFilter('brightness', {
brightness: parseInt(self.inputBrightnessRange2, 10) / 255,
}).then(function (result) {
console.log(result);
});
self.historys2.push('亮度')
}
} else {
this.optionsBrightness = false
if (self.type == 'source') {
this.imageEditor.removeFilter('brightness');
let index = self.historys.indexOf('亮度')
self.historys.splice(index, 1)
} else {
this.imageEditor2.removeFilter('brightness');
let index = self.historys2.indexOf('亮度')
self.historys2.splice(index, 1)
}
}
},
......@@ -1607,6 +1695,20 @@ export default {
* @return {*}
*/
changeBlend () {
// 是否展示旋转的下拉框
this.isRotateOptions = false
// 是否展示园标记弹出框
this.isCircleOptions = false
// 是否展示去白下拉框
this.optionsRemoveWhite = false
// 滤色器选项框
this.optionsColorFilter = false
// 是否展示正片叠底框
this.optionsMultiply = false
// 是否展示差异化下拉框
this.optionsBlend = false
// 是否展示亮度弹窗
this.optionsBrightness = false
let self = this
this.isBlendActive = !this.isBlendActive
if (this.isBlendActive) {
......@@ -1618,6 +1720,7 @@ export default {
}).then(function (result) {
console.log(result);
});
self.historys.push('差异化')
} else {
this.imageEditor2.applyFilter('blendColor', {
mode: 'diff',
......@@ -1625,13 +1728,18 @@ export default {
}).then(function (result) {
console.log(result);
});
self.historys2.push('差异化')
}
} else {
this.optionsBlend = false
if (self.type == 'source') {
this.imageEditor.removeFilter('blendColor');
let index = self.historys.indexOf('差异化')
self.historys.splice(index, 1)
} else {
this.imageEditor2.removeFilter('blendColor');
let index = self.historys2.indexOf('差异化')
self.historys2.splice(index, 1)
}
}
},
......@@ -1641,6 +1749,20 @@ export default {
* @return {*}
*/
changeMultiply () {
// 是否展示旋转的下拉框
this.isRotateOptions = false
// 是否展示园标记弹出框
this.isCircleOptions = false
// 是否展示去白下拉框
this.optionsRemoveWhite = false
// 滤色器选项框
this.optionsColorFilter = false
// 是否展示正片叠底框
this.optionsMultiply = false
// 是否展示差异化下拉框
this.optionsBlend = false
// 是否展示亮度弹窗
this.optionsBrightness = false
let self = this
this.isMultiplyActive = !this.isMultiplyActive
if (this.isMultiplyActive) {
......@@ -1651,19 +1773,25 @@ export default {
}).then(function (result) {
console.log(result);
});
self.historys.push('正片叠底')
} else {
this.imageEditor2.applyFilter('blendColor', {
color: self.multiplyColorpicker.getColor(),
}).then(function (result) {
console.log(result);
});
self.historys2.push('正片叠底')
}
} else {
this.optionsMultiply = false
if (self.type == 'source') {
this.imageEditor.removeFilter('blendColor');
let index = self.historys.indexOf('正片叠底')
self.historys.splice(index, 1)
} else {
this.imageEditor2.removeFilter('blendColor');
let index = self.historys2.indexOf('正片叠底')
self.historys2.splice(index, 1)
}
}
},
......@@ -1673,6 +1801,20 @@ export default {
* @return {*}
*/
changeColorFilter () {
// 是否展示旋转的下拉框
this.isRotateOptions = false
// 是否展示园标记弹出框
this.isCircleOptions = false
// 是否展示去白下拉框
this.optionsRemoveWhite = false
// 滤色器选项框
this.optionsColorFilter = false
// 是否展示正片叠底框
this.optionsMultiply = false
// 是否展示差异化下拉框
this.optionsBlend = false
// 是否展示亮度弹窗
this.optionsBrightness = false
let self = this
this.isColorFilterActive = !this.isColorFilterActive
if (this.isColorFilterActive) {
......@@ -1684,6 +1826,7 @@ export default {
}).then(function (result) {
console.log(result);
});
self.historys.push('滤色器')
} else {
this.imageEditor2.applyFilter('removeColor', {
color: '#FFFFFF',
......@@ -1691,13 +1834,18 @@ export default {
}).then(function (result) {
console.log(result);
});
self.historys2.push('滤色器')
}
} else {
this.optionsColorFilter = false
if (self.type == 'source') {
this.imageEditor.removeFilter('removeColor');
let index = self.historys.indexOf('滤色器')
self.historys.splice(index, 1)
} else {
this.imageEditor2.removeFilter('removeColor');
let index = self.historys2.indexOf('滤色器')
self.historys2.splice(index, 1)
}
}
},
......@@ -1707,6 +1855,20 @@ export default {
* @return {*}
*/
changeRemoveWhite () {
// 是否展示旋转的下拉框
this.isRotateOptions = false
// 是否展示园标记弹出框
this.isCircleOptions = false
// 是否展示去白下拉框
this.optionsRemoveWhite = false
// 滤色器选项框
this.optionsColorFilter = false
// 是否展示正片叠底框
this.optionsMultiply = false
// 是否展示差异化下拉框
this.optionsBlend = false
// 是否展示亮度弹窗
this.optionsBrightness = false
let self = this
this.isRemoveWhiteActive = !this.isRemoveWhiteActive
if (this.isRemoveWhiteActive) {
......@@ -1719,6 +1881,7 @@ export default {
}).then(function (result) {
console.log(result);
});
self.historys.push('去白')
} else {
this.imageEditor2.applyFilter('removeColor', {
color: '#FFFFFF',
......@@ -1727,38 +1890,64 @@ export default {
}).then(function (result) {
console.log(result);
});
self.historys2.push('去白')
}
} else {
this.optionsRemoveWhite = false
if (self.type == 'source') {
this.imageEditor.removeFilter('removeColor');
let index = self.historys.indexOf('去白')
self.historys.splice(index, 1)
} else {
this.imageEditor2.removeFilter('removeColor');
let index = self.historys2.indexOf('去白')
self.historys2.splice(index, 1)
}
}
},
/**
* @description: 反向
* @description: 反相
* @param {*}
* @return {*}
*/
changeInvert () {
// 是否展示旋转的下拉框
this.isRotateOptions = false
// 是否展示园标记弹出框
this.isCircleOptions = false
// 是否展示去白下拉框
this.optionsRemoveWhite = false
// 滤色器选项框
this.optionsColorFilter = false
// 是否展示正片叠底框
this.optionsMultiply = false
// 是否展示差异化下拉框
this.optionsBlend = false
// 是否展示亮度弹窗
this.optionsBrightness = false
let self = this
this.isInvertActive = !this.isInvertActive
if (this.isInvertActive) {
if (this.type == 'source') {
this.imageEditor.applyFilter('Invert', null).then(function (result) {
console.log(result);
});
self.historys.push('反相')
} else {
this.imageEditor2.applyFilter('Invert', null).then(function (result) {
console.log(result);
});
self.historys2.push('反相')
}
} else {
if (this.type == 'source') {
this.imageEditor.removeFilter('Invert');
let index = self.historys.indexOf('反相')
self.historys.splice(index, 1)
} else {
this.imageEditor2.removeFilter('Invert');
let index = self.historys2.indexOf('反相')
self.historys2.splice(index, 1)
}
}
......@@ -1769,22 +1958,43 @@ export default {
* @return {*}
*/
changeEmboss () {
// 是否展示旋转的下拉框
this.isRotateOptions = false
// 是否展示园标记弹出框
this.isCircleOptions = false
// 是否展示去白下拉框
this.optionsRemoveWhite = false
// 滤色器选项框
this.optionsColorFilter = false
// 是否展示正片叠底框
this.optionsMultiply = false
// 是否展示差异化下拉框
this.optionsBlend = false
// 是否展示亮度弹窗
this.optionsBrightness = false
let self = this
this.isEmbossActive = !this.isEmbossActive
if (this.isEmbossActive) {
if (this.type == 'source') {
this.imageEditor.applyFilter('Emboss', null).then(function (result) {
console.log(result);
});
self.historys.push('浮雕')
} else {
this.imageEditor2.applyFilter('Emboss', null).then(function (result) {
console.log(result);
});
self.historys2.push('浮雕')
}
} else {
if (this.type == 'source') {
this.imageEditor.removeFilter('Emboss');
let index = self.historys.indexOf('浮雕')
self.historys.splice(index, 1)
} else {
this.imageEditor2.removeFilter('Emboss');
let index = self.historys2.indexOf('浮雕')
self.historys2.splice(index, 1)
}
}
},
......@@ -1794,22 +2004,43 @@ export default {
* @return {*}
*/
changeSharpen () {
// 是否展示旋转的下拉框
this.isRotateOptions = false
// 是否展示园标记弹出框
this.isCircleOptions = false
// 是否展示去白下拉框
this.optionsRemoveWhite = false
// 滤色器选项框
this.optionsColorFilter = false
// 是否展示正片叠底框
this.optionsMultiply = false
// 是否展示差异化下拉框
this.optionsBlend = false
// 是否展示亮度弹窗
this.optionsBrightness = false
let self = this
this.isSharpenActive = !this.isSharpenActive
if (this.isSharpenActive) {
if (this.type == 'source') {
this.imageEditor.applyFilter('Sharpen', null).then(function (result) {
console.log(result);
});
self.historys.push('锐化')
} else {
this.imageEditor2.applyFilter('Sharpen', null).then(function (result) {
console.log(result);
});
self.historys2.push('锐化')
}
} else {
if (this.type == 'source') {
this.imageEditor.removeFilter('Sharpen');
let index = self.historys.indexOf('锐化')
self.historys.splice(index, 1)
} else {
this.imageEditor2.removeFilter('Sharpen');
let index = self.historys2.indexOf('锐化')
self.historys2.splice(index, 1)
}
}
},
......@@ -1819,6 +2050,20 @@ export default {
* @return {*}
*/
changeEqualization () {
// 是否展示旋转的下拉框
this.isRotateOptions = false
// 是否展示园标记弹出框
this.isCircleOptions = false
// 是否展示去白下拉框
this.optionsRemoveWhite = false
// 滤色器选项框
this.optionsColorFilter = false
// 是否展示正片叠底框
this.optionsMultiply = false
// 是否展示差异化下拉框
this.optionsBlend = false
// 是否展示亮度弹窗
this.optionsBrightness = false
this.isEqualizationActive = !this.isEqualizationActive
},
/**
......@@ -1827,6 +2072,20 @@ export default {
* @return {*}
*/
changeHorseshoeMirror () {
// 是否展示旋转的下拉框
this.isRotateOptions = false
// 是否展示园标记弹出框
this.isCircleOptions = false
// 是否展示去白下拉框
this.optionsRemoveWhite = false
// 滤色器选项框
this.optionsColorFilter = false
// 是否展示正片叠底框
this.optionsMultiply = false
// 是否展示差异化下拉框
this.optionsBlend = false
// 是否展示亮度弹窗
this.optionsBrightness = false
this.isHorseshoeMirrorActive = !this.isHorseshoeMirrorActive
// if (this.isHorseshoeMirrorActive) {
// this.imageEditor.applyFilter('vintage', null).then(function (result) {
......@@ -1842,6 +2101,20 @@ export default {
* @return {*}
*/
changeVintage () {
// 是否展示旋转的下拉框
this.isRotateOptions = false
// 是否展示园标记弹出框
this.isCircleOptions = false
// 是否展示去白下拉框
this.optionsRemoveWhite = false
// 滤色器选项框
this.optionsColorFilter = false
// 是否展示正片叠底框
this.optionsMultiply = false
// 是否展示差异化下拉框
this.optionsBlend = false
// 是否展示亮度弹窗
this.optionsBrightness = false
let self = this
this.isVintageActive = !this.isVintageActive
if (this.isVintageActive) {
......@@ -1849,16 +2122,22 @@ export default {
this.imageEditor.applyFilter('vintage', null).then(function (result) {
console.log(result);
});
self.historys.push('棕褐色')
} else {
this.imageEditor2.applyFilter('vintage', null).then(function (result) {
console.log(result);
});
self.historys2.push('棕褐色')
}
} else {
if (self.type == 'source') {
this.imageEditor.removeFilter('vintage');
let index = self.historys.indexOf('棕褐色')
self.historys.splice(index, 1)
} else {
this.imageEditor2.removeFilter('vintage');
let index = self.historys2.indexOf('棕褐色')
self.historys2.splice(index, 1)
}
}
},
......@@ -1868,6 +2147,21 @@ export default {
* @return {*}
*/
changeGray () {
// 是否展示旋转的下拉框
this.isRotateOptions = false
// 是否展示园标记弹出框
this.isCircleOptions = false
// 是否展示去白下拉框
this.optionsRemoveWhite = false
// 滤色器选项框
this.optionsColorFilter = false
// 是否展示正片叠底框
this.optionsMultiply = false
// 是否展示差异化下拉框
this.optionsBlend = false
// 是否展示亮度弹窗
this.optionsBrightness = false
let self = this
this.isGrayActive = !this.isGrayActive
if (this.isGrayActive) {
......@@ -1875,16 +2169,22 @@ export default {
this.imageEditor.applyFilter('Grayscale', null).then(function (result) {
console.log(result);
});
self.historys.push('灰度')
} else {
this.imageEditor2.applyFilter('Grayscale', null).then(function (result) {
console.log(result);
});
self.historys2.push('灰度')
}
} else {
if (self.type == 'source') {
this.imageEditor.removeFilter('Grayscale');
let index = self.historys.indexOf('灰度')
self.historys.splice(index, 1)
} else {
this.imageEditor2.removeFilter('Grayscale');
let index = self.historys2.indexOf('灰度')
self.historys2.splice(index, 1)
}
}
},
......@@ -1911,8 +2211,10 @@ export default {
this.isShowClearDialog = false
if (this.type == 'source') {
this.imageEditor.clearObjects();
self.historys.push('清空')
} else {
this.imageEditor2.clearObjects();
self.historys2.push('清空')
}
this.$message.success('删除成功！')
},
......
src/views/cxyrd/TL.vue
......@@ -301,19 +301,22 @@ div {
width: 360px;
}
}
/deep/.el-dialog {
width: 800px;
}
.bz-dialog {
.tl {
width: 763px;
width: 100%;
height: 634px;
.type {
display: flex;
width: 763px;
width: 100%;
height: 160px;
background: rgba(230, 0, 18, 0.04);
}
.other {
display: flex;
width: 763px;
width: 100%;
height: 160px;
//background: rgba(230, 0, 18, 0.04);
}
......
src/views/cxyrd/modules/LTCandidate.vue
......@@ -20,7 +20,7 @@
v-model="input3"
placeholder="请输入条码号/指位"
></el-input>
<div class="btn">筛选</div>
<div class="btn" @click="search">筛选</div>
<div class="checked">
<el-checkbox v-model="checked">显示已比中候选</el-checkbox>
</div>
......@@ -50,50 +50,50 @@
<!-- <el-table-column label="排名" width="50"></el-table-column>-->
<el-table-column prop="score" label="得分" width="50"></el-table-column>
<el-table-column
prop="destid"
prop="destseqno"
label="指位"
width="70"
:render-header="icons"
>
<template slot-scope="scope">
{{
scope.row.destid == "1"
scope.row.destseqno == "1"
? "拇指"
: scope.row.destid == "2"
: scope.row.destseqno == "2"
? "食指"
: scope.row.destid == "3"
: scope.row.destseqno == "3"
? "中指"
: scope.row.destid == "4"
: scope.row.destseqno == "4"
? "环指"
: scope.row.destid == "5"
: scope.row.destseqno == "5"
? "小指"
: scope.row.destid == "6"
: scope.row.destseqno == "6"
? "拇指"
: scope.row.destid == "7"
: scope.row.destseqno == "7"
? "食指"
: scope.row.destid == "8"
: scope.row.destseqno == "8"
? "中指"
: scope.row.destid == "9"
: scope.row.destseqno == "9"
? "环指"
: scope.row.destid == "10"
: scope.row.destseqno == "10"
? "小指"
: scope.row.destid == "11"
: scope.row.destseqno == "11"
? "拇指"
: scope.row.destid == "12"
: scope.row.destseqno == "12"
? "食指"
: scope.row.destid == "13"
: scope.row.destseqno == "13"
? "中指"
: scope.row.destid == "14"
: scope.row.destseqno == "14"
? "环指"
: scope.row.destid == "15"
: scope.row.destseqno == "15"
? "小指"
: scope.row.destid == "16"
: scope.row.destseqno == "16"
? "拇指"
: scope.row.destid == "17"
: scope.row.destseqno == "17"
? "食指"
: scope.row.destid == "18"
: scope.row.destseqno == "18"
? "中指"
: scope.row.destid == "19"
: scope.row.destseqno == "19"
? "环指"
: "小指"
}}
......@@ -288,6 +288,9 @@ export default {
*/
switchOptions() {
this.isShowOptions = !this.isShowOptions;
// if(!this.isShowOptions) {
// this.tableData = this.sourceTableData
// }
},
/**
* @description: 筛选指位为右手平面小指
......@@ -296,7 +299,7 @@ export default {
*/
changeRightPX() {
this.tableData = this.sourceTableData.filter(item => {
return item.destid == 15;
return item.destseqno == 15;
});
// 对勾
this.rightRoll = false;
......@@ -333,7 +336,7 @@ export default {
*/
changeRightPH() {
this.tableData = this.sourceTableData.filter(item => {
return item.destid == 14;
return item.destseqno == 14;
});
// 对勾
this.rightRoll = false;
......@@ -370,7 +373,7 @@ export default {
*/
changeRightPZ() {
this.tableData = this.sourceTableData.filter(item => {
return item.destid == 13;
return item.destseqno == 13;
});
// 对勾
this.rightRoll = false;
......@@ -407,7 +410,7 @@ export default {
*/
changeRightPS() {
this.tableData = this.sourceTableData.filter(item => {
return item.destid == 12;
return item.destseqno == 12;
});
// 对勾
this.rightRoll = false;
......@@ -444,7 +447,7 @@ export default {
*/
changeRightPM() {
this.tableData = this.sourceTableData.filter(item => {
return item.destid == 11;
return item.destseqno == 11;
});
// 对勾
this.rightRoll = false;
......@@ -481,7 +484,7 @@ export default {
*/
changeRightRX() {
this.tableData = this.sourceTableData.filter(item => {
return item.destid == 5;
return item.destseqno == 5;
});
// 对勾
this.rightRoll = true;
......@@ -518,7 +521,7 @@ export default {
*/
changeRightRH() {
this.tableData = this.sourceTableData.filter(item => {
return item.destid == 4;
return item.destseqno == 4;
});
// 对勾
this.rightRoll = true;
......@@ -555,7 +558,7 @@ export default {
*/
changeRightRZ() {
this.tableData = this.sourceTableData.filter(item => {
return item.destid == 3;
return item.destseqno == 3;
});
// 对勾
this.rightRoll = true;
......@@ -592,7 +595,7 @@ export default {
*/
changeRightRS() {
this.tableData = this.sourceTableData.filter(item => {
return item.destid == 2;
return item.destseqno == 2;
});
// 对勾
this.rightRoll = true;
......@@ -629,7 +632,7 @@ export default {
*/
changeRightRM() {
this.tableData = this.sourceTableData.filter(item => {
return item.destid == 1;
return item.destseqno == 1;
});
// 对勾
this.rightRoll = true;
......@@ -666,7 +669,7 @@ export default {
*/
changeLeftPX() {
this.tableData = this.sourceTableData.filter(item => {
return item.destid == 20;
return item.destseqno == 20;
});
// 对勾
this.rightRoll = false;
......@@ -703,7 +706,7 @@ export default {
*/
changeLeftPH() {
this.tableData = this.sourceTableData.filter(item => {
return item.destid == 19;
return item.destseqno == 19;
});
// 对勾
this.rightRoll = false;
......@@ -740,7 +743,7 @@ export default {
*/
changeLeftPZ() {
this.tableData = this.sourceTableData.filter(item => {
return item.destid == 18;
return item.destseqno == 18;
});
// 对勾
this.rightRoll = false;
......@@ -777,7 +780,7 @@ export default {
*/
changeLeftPS() {
this.tableData = this.sourceTableData.filter(item => {
return item.destid == 17;
return item.destseqno == 17;
});
// 对勾
this.rightRoll = false;
......@@ -814,7 +817,7 @@ export default {
*/
changeLeftPM() {
this.tableData = this.sourceTableData.filter(item => {
return item.destid == 16;
return item.destseqno == 16;
});
// 对勾
this.rightRoll = false;
......@@ -851,7 +854,7 @@ export default {
*/
changeLeftRX() {
this.tableData = this.sourceTableData.filter(item => {
return item.destid == 10;
return item.destseqno == 10;
});
// 对勾
this.rightRoll = false;
......@@ -888,7 +891,7 @@ export default {
*/
changeLeftRH() {
this.tableData = this.sourceTableData.filter(item => {
return item.destid == 9;
return item.destseqno == 9;
});
// 对勾
this.rightRoll = false;
......@@ -925,7 +928,7 @@ export default {
*/
changeLeftRZ() {
this.tableData = this.sourceTableData.filter(item => {
return item.destid == 8;
return item.destseqno == 8;
});
// 对勾
this.rightRoll = false;
......@@ -962,7 +965,7 @@ export default {
*/
changeLeftRS() {
this.tableData = this.sourceTableData.filter(item => {
return item.destid == 7;
return item.destseqno == 7;
});
// 对勾
this.rightRoll = false;
......@@ -999,7 +1002,7 @@ export default {
*/
changeLeftRM() {
this.tableData = this.sourceTableData.filter(item => {
return item.destid == 6;
return item.destseqno == 6;
});
// 对勾
this.rightRoll = false;
......@@ -1076,10 +1079,10 @@ export default {
// 存储目标条码号
sessionStorage.setItem("destbarcode", val.destbarcode);
// 存储目的数据序号
sessionStorage.setItem("destseqno", val.destid);
sessionStorage.setItem("destseqno", val.destseqno);
// this.$axios.get(`/api/api/org/plainByBarcode/R1100002487002018050034/1/`)
this.$axios
.get(`/api/org/plainByBarcode/${val.destbarcode}/${val.destid}/`)
.get(`/api/org/plainByBarcode/${val.destbarcode}/${val.destseqno}/`)
.then(response => {
console.log(response);
self.$bus.emit("changImageEditTarget", response.data.ret.image);
......@@ -1206,9 +1209,7 @@ const candidates = [
.selectFinger {
z-index: 10;
position: absolute;
// top: 187px;
// right: 60px;
top: 220px;
top: 178px;
right: 60px;
width: 236px;
height: 194px;
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-09-28 18:48:48
* @LastEditTime: 2021-10-09 14:00:02
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -74,6 +74,7 @@ module.exports = {
},
productionSourceMap: false, //关闭生产映射
devServer: {
port: 8081,
overlay: {
warnings: false,
errors: false
......
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