Skip to content

F
founder_vue
Commit 60c3488e by liyuhang19990520
Options

11

parents 8e8bc563 b075637b
Showing with 160 additions and 91 deletions
src/components/ImageEd.scss
...@@ -182,7 +182,6 @@ div { ...@@ -182,7 +182,6 @@ div {
box-sizing: border-box; box-sizing: border-box;
width: 30px; width: 30px;
height: 16px; height: 16px;
} }
} }
.line_right { .line_right {
...@@ -516,7 +515,6 @@ div { ...@@ -516,7 +515,6 @@ div {
box-sizing: border-box; box-sizing: border-box;
width: 30px; width: 30px;
height: 16px; height: 16px;
} }
} }
.circle_right { .circle_right {
...@@ -1328,15 +1326,19 @@ div { ...@@ -1328,15 +1326,19 @@ div {
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
/deep/.tui-image-editor-canvas-container {
max-height: 520px !important;
max-width: 520px !important;
}
/deep/.lower-canvas, /deep/.lower-canvas,
/deep/.upper-canvas { /deep/.upper-canvas {
max-height: 520px !important; max-height: 520px !important;
max-width: 520px !important; max-width: 520px !important;
height: 100%; height: 100%;
width: auto !important; width: auto !important;
display: flex !important; // display: flex !important;
justify-content: center !important; // justify-content: center !important;
align-items: center !important; // align-items: center !important;
} }
} }
} }
...@@ -1419,6 +1421,20 @@ div { ...@@ -1419,6 +1421,20 @@ div {
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
/deep/.tui-image-editor-canvas-container {
max-height: 520px !important;
max-width: 520px !important;
}
/deep/.lower-canvas,
/deep/.upper-canvas {
max-height: 520px !important;
max-width: 520px !important;
height: 100%;
width: auto !important;
// display: flex !important;
// justify-content: center !important;
// align-items: center !important;
}
} }
} }
} }
...@@ -1490,29 +1506,29 @@ div { ...@@ -1490,29 +1506,29 @@ div {
// left: 10px; // left: 10px;
// background: #edc; // background: #edc;
// } // }
.circleOptions /deep/{ .circleOptions /deep/ {
.circle_size{ .circle_size {
margin-top: 16px!important; margin-top: 16px !important;
} }
.circle_color{ .circle_color {
margin-top: 16px!important; margin-top: 16px !important;
margin-bottom: 16px!important; margin-bottom: 16px !important;
} }
.mr_size_active{ .mr_size_active {
.item_top{ .item_top {
border: 1px solid #055FE7!important; border: 1px solid #055fe7 !important;
} }
} }
} }
.el-switch /deep/{ .el-switch /deep/ {
width: 40px!important; width: 40px !important;
.el-switch__core{ .el-switch__core {
width: 100%!important; width: 100% !important;
border-radius: 5px!important; border-radius: 5px !important;
&::after{ &::after {
border-radius: 4px!important; border-radius: 4px !important;
width: 16px; width: 16px;
background-color: #DCDFE9; background-color: #dcdfe9;
border-left: 7px; border-left: 7px;
border-right: 7px; border-right: 7px;
box-sizing: border-box; box-sizing: border-box;
......
src/components/ImageEd.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-09-09 09:28:46 * @Date: 2021-09-09 09:28:46
* @LastEditTime: 2021-11-13 13:05:18 * @LastEditTime: 2021-11-15 10:07:43
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue * @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue
...@@ -471,6 +471,8 @@ export default { ...@@ -471,6 +471,8 @@ export default {
name: "ImageEd", name: "ImageEd",
data () { data () {
return { return {
canvasWidth: 520,
canvasHeight: 520,
sourceImage: null, sourceImage: null,
targetImage: null, targetImage: null,
mouseEnlarge: false, mouseEnlarge: false,
...@@ -666,6 +668,12 @@ export default { ...@@ -666,6 +668,12 @@ export default {
// LTSrc, // LTSrc,
// LTCandidate, // LTCandidate,
}, },
created () {
let w1 = 1920
let w2 = window.innerWidth
this.canvasWidth = this.canvasWidth * w2 / w1
this.canvasHeight = this.canvasHeight * w2 / w1
},
mounted () { mounted () {
// console.log($('#targetImage')) // console.log($('#targetImage'))
// console.log($('#targetImage').attr('src')); // console.log($('#targetImage').attr('src'));
...@@ -735,8 +743,8 @@ export default { ...@@ -735,8 +743,8 @@ export default {
// }); // });
imageEditor = new tui.ImageEditor('.tui-image-editor', { imageEditor = new tui.ImageEditor('.tui-image-editor', {
cssMaxWidth: 520, cssMaxWidth: self.canvasWidth,
cssMaxHeight: 520, cssMaxHeight: self.canvasHeight,
selectionStyle: { selectionStyle: {
cornerSize: 20, cornerSize: 20,
rotatingPointOffset: 70, rotatingPointOffset: 70,
...@@ -750,8 +758,8 @@ export default { ...@@ -750,8 +758,8 @@ export default {
}); });
imageEditor2 = new tui.ImageEditor('.tui-image-editor2', { imageEditor2 = new tui.ImageEditor('.tui-image-editor2', {
cssMaxWidth: 520, cssMaxWidth: self.canvasWidth,
cssMaxHeight: 520, cssMaxHeight: self.canvasHeight,
selectionStyle: { selectionStyle: {
cornerSize: 20, cornerSize: 20,
rotatingPointOffset: 70, rotatingPointOffset: 70,
...@@ -934,7 +942,7 @@ export default { ...@@ -934,7 +942,7 @@ export default {
if (objectProps.type == 'line') { if (objectProps.type == 'line') {
self.lines.push(objectProps) self.lines.push(objectProps)
self.historys.push('直线') self.historys.push('直线')
}else if(objectProps.type == 'path'){ } else if (objectProps.type == 'path') {
self.path.push(objectProps) self.path.push(objectProps)
self.historys.push('曲线') self.historys.push('曲线')
} }
...@@ -1015,7 +1023,7 @@ export default { ...@@ -1015,7 +1023,7 @@ export default {
if (objectProps.type == 'line') { if (objectProps.type == 'line') {
self.lines2.push(objectProps) self.lines2.push(objectProps)
self.historys2.push('直线') self.historys2.push('直线')
}else if(objectProps.type == 'path'){ } else if (objectProps.type == 'path') {
self.path2.push(objectProps) self.path2.push(objectProps)
self.historys2.push('曲线') self.historys2.push('曲线')
} }
...@@ -1086,7 +1094,7 @@ export default { ...@@ -1086,7 +1094,7 @@ export default {
if (self.type == 'source' && !imageEditor.isEmptyUndoStack()) { if (self.type == 'source' && !imageEditor.isEmptyUndoStack()) {
imageEditor.discardSelection(); imageEditor.discardSelection();
imageEditor.undo(); imageEditor.undo();
} else if(!imageEditor2.isEmptyUndoStack()){ } else if (!imageEditor2.isEmptyUndoStack()) {
imageEditor2.discardSelection(); imageEditor2.discardSelection();
imageEditor2.undo(); imageEditor2.undo();
} }
...@@ -1097,7 +1105,7 @@ export default { ...@@ -1097,7 +1105,7 @@ export default {
if (self.type == 'source' && !imageEditor.isEmptyRedoStack()) { if (self.type == 'source' && !imageEditor.isEmptyRedoStack()) {
imageEditor.discardSelection(); imageEditor.discardSelection();
imageEditor.redo(); imageEditor.redo();
} else if(!imageEditor2.isEmptyRedoStack()){ } else if (!imageEditor2.isEmptyRedoStack()) {
imageEditor2.discardSelection(); imageEditor2.discardSelection();
imageEditor2.redo(); imageEditor2.redo();
} }
...@@ -1835,7 +1843,7 @@ export default { ...@@ -1835,7 +1843,7 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
xpcChange() { xpcChange () {
console.log(this.imageEditor._graphics) console.log(this.imageEditor._graphics)
// const canvas = new fabric.Canvas('c'); // const canvas = new fabric.Canvas('c');
// console.log(canvas) // console.log(canvas)
...@@ -1978,6 +1986,7 @@ export default { ...@@ -1978,6 +1986,7 @@ export default {
console.log(result); console.log(result);
}); });
self.historys.push('亮度') self.historys.push('亮度')
self.historys.push('对比度')
} else { } else {
this.imageEditor2.applyFilter('brightness', { this.imageEditor2.applyFilter('brightness', {
brightness: parseInt(self.inputBrightnessRange2, 10) / 255, brightness: parseInt(self.inputBrightnessRange2, 10) / 255,
...@@ -1985,6 +1994,7 @@ export default { ...@@ -1985,6 +1994,7 @@ export default {
console.log(result); console.log(result);
}); });
self.historys2.push('亮度') self.historys2.push('亮度')
self.historys2.push('对比度')
} }
} else { } else {
this.optionsBrightness = false this.optionsBrightness = false
...@@ -1992,10 +2002,16 @@ export default { ...@@ -1992,10 +2002,16 @@ export default {
this.imageEditor.removeFilter('brightness'); this.imageEditor.removeFilter('brightness');
let index = self.historys.indexOf('亮度') let index = self.historys.indexOf('亮度')
self.historys.splice(index, 1) self.historys.splice(index, 1)
this.imageEditor.removeFilter('contrast');
let index2 = self.historys.indexOf('对比度')
self.historys.splice(index2, 1)
} else { } else {
this.imageEditor2.removeFilter('brightness'); this.imageEditor2.removeFilter('brightness');
let index = self.historys2.indexOf('亮度') let index = self.historys2.indexOf('亮度')
self.historys2.splice(index, 1) self.historys2.splice(index, 1)
this.imageEditor2.removeFilter('contrast');
let index2 = self.historys2.indexOf('对比度')
self.historys2.splice(index2, 1)
} }
} }
}, },
...@@ -4800,8 +4816,8 @@ export default { ...@@ -4800,8 +4816,8 @@ export default {
} }
}, },
watch: { watch: {
isActive(val){ isActive (val) {
if(val == false){ if (val == false) {
this.isShowSizeSynchro = false; this.isShowSizeSynchro = false;
} }
}, },
...@@ -5042,11 +5058,19 @@ export default { ...@@ -5042,11 +5058,19 @@ export default {
}, },
// 对比度 // 对比度
inputContrastRange (newValue, oldValue) { inputContrastRange (newValue, oldValue) {
if (this.type === 'source') {
this.imageEditor.applyFilter('Contrast', { this.imageEditor.applyFilter('Contrast', {
contrast: parseInt(newValue, 10) / 255, contrast: parseInt(newValue, 10) / 255,
}).then(function (result) { }).then(function (result) {
console.log(result); console.log(result);
}); });
} else {
this.imageEditor2.applyFilter('Contrast', {
contrast: parseInt(newValue, 10) / 255,
}).then(function (result) {
console.log(result);
});
}
}, },
isHideMarkPoint (newValue, oldValue) { isHideMarkPoint (newValue, oldValue) {
let self = this let self = this
......
src/views/AllPersonnelBase/modules/fcx.vue
...@@ -716,6 +716,8 @@ export default { ...@@ -716,6 +716,8 @@ export default {
let arr = response.data.ret let arr = response.data.ret
for (let i = 0; i < arr.length; i++) { for (let i = 0; i < arr.length; i++) {
cityOptions.push(arr[i].hpseqno) cityOptions.push(arr[i].hpseqno)
this.checkedCities = cityOptions
this.checkAll = true
} }
console.info("指位返回列表===>", arr); console.info("指位返回列表===>", arr);
} else { } else {
...@@ -781,6 +783,7 @@ export default { ...@@ -781,6 +783,7 @@ export default {
}, },
// 指位单选 // 指位单选
handleCheckAllChange (val) { handleCheckAllChange (val) {
console.log(val, 11111)
this.checkedCities = val ? cityOptions : []; this.checkedCities = val ? cityOptions : [];
this.isIndeterminate = false; this.isIndeterminate = false;
}, },
......
src/views/Editor/modules/imageEd.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-10-22 11:36:10 * @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-11-13 15:01:29 * @LastEditTime: 2021-11-14 23:27:33
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
...@@ -303,6 +303,8 @@ import "@/icons/direction.svg"; ...@@ -303,6 +303,8 @@ import "@/icons/direction.svg";
export default { export default {
data () { data () {
return { return {
tzdDrawing_left: 0,
tzdDrawing_top: 0,
zwType: '指纹', zwType: '指纹',
xsType: 'yuantu', xsType: 'yuantu',
canvasWidth: 640, canvasWidth: 640,
...@@ -1035,7 +1037,7 @@ export default { ...@@ -1035,7 +1037,7 @@ export default {
imageEditor.rotate(30); imageEditor.rotate(30);
self.historys.push('旋转') self.historys.push('旋转')
let canvasImage = imageEditor._graphics.getCanvasImage() let canvasImage = imageEditor._graphics.getCanvasImage()
$('.tzdDrawing').css('transform', `rotate(${canvasImage.angle}deg)`); $('.tzdDrawing').css('transform', `translate(${Number(self.tzdDrawing_left)}px,${Number(self.tzdDrawing_top)}px) rotate(${canvasImage.angle}deg) scale(${self.zoomLevel})`);
// 每次旋转时，位置都会改变，需要重新定位 // 每次旋转时，位置都会改变，需要重新定位
if (self.move_left && self.move_top) { if (self.move_left && self.move_top) {
...@@ -1054,7 +1056,7 @@ export default { ...@@ -1054,7 +1056,7 @@ export default {
self.isRightRotate = true self.isRightRotate = true
imageEditor.rotate(-30); imageEditor.rotate(-30);
let canvasImage = imageEditor._graphics.getCanvasImage() let canvasImage = imageEditor._graphics.getCanvasImage()
$('.tzdDrawing').css('transform', `rotate(${canvasImage.angle}deg)`) $('.tzdDrawing').css('transform', `translate(${Number(self.tzdDrawing_left)}px,${Number(self.tzdDrawing_top)}px) rotate(${canvasImage.angle}deg) scale(${self.zoomLevel})`)
self.historys.push('旋转') self.historys.push('旋转')
// 每次旋转时，位置都会改变，需要重新定位 // 每次旋转时，位置都会改变，需要重新定位
...@@ -1075,7 +1077,7 @@ export default { ...@@ -1075,7 +1077,7 @@ export default {
self.startPlace = self.inputRotationRange; self.startPlace = self.inputRotationRange;
// 特征点的图层也要跟着转 // 特征点的图层也要跟着转
$('.tzdDrawing').css("transform", `rotate(${self.inputRotationRange}deg)`) $('.tzdDrawing').css("transform", `translate(${Number(self.tzdDrawing_left)}px,${Number(self.tzdDrawing_top)}px) rotate(${self.inputRotationRange}deg) scale(${self.zoomLevel})`)
}; };
$(document).on('mousemove', changeAngle); $(document).on('mousemove', changeAngle);
...@@ -1091,7 +1093,7 @@ export default { ...@@ -1091,7 +1093,7 @@ export default {
self.startPlace = self.inputRotationRange; self.startPlace = self.inputRotationRange;
self.historys.push('旋转') self.historys.push('旋转')
// 特征点的图层也要跟着转 // 特征点的图层也要跟着转
$('.tzdDrawing').css("transform", `rotate(${self.inputRotationRange}deg)`) $('.tzdDrawing').css("transform", `rotate(${self.inputRotationRange}deg) scale(${self.zoomLevel})`)
}); });
// 划线事件 // 划线事件
...@@ -1502,13 +1504,18 @@ export default { ...@@ -1502,13 +1504,18 @@ export default {
}, true) }, true)
// console.log(imageEditor._graphics.getImageProperties()); // console.log(imageEditor._graphics.getImageProperties());
// console.log(imageEditor._graphics.getCanvasImage()); // console.log(imageEditor._graphics.getCanvasImage());
let canvasImage = imageEditor._graphics.getCanvasImage()
// $('.tzdDrawing').css('left', `${originleft + (x2 - x1)}px`) // $('.tzdDrawing').css('left', `${originleft + (x2 - x1)}px`)
// $('.tzdDrawing').css('top', `${origintop + (y2 - y1)}px`) // $('.tzdDrawing').css('top', `${origintop + (y2 - y1)}px`)
// $('.tzdDrawing').css('transform', `translate(${x2 - x1}px,${y2 - y1}px)`) // $('.tzdDrawing').css('transform', `translate(${x2 - x1}px,${y2 - y1}px)`)
// TODO
$('.tzdDrawing').css('transform', `translate(${Number(self.tzdDrawingLeft) + (x2 - x1)}px,${Number(self.tzdDrawingTop) + (y2 - y1)}px) scale(${self.zoomLevel})`) $('.tzdDrawing').css('transform', `translate(${Number(self.tzdDrawingLeft) + (x2 - x1)}px,${Number(self.tzdDrawingTop) + (y2 - y1)}px) scale(${self.zoomLevel})`)
self.tzdDrawing_top = Number(self.tzdDrawingTop) + (y2 - y1)
self.tzdDrawing_left = Number(self.tzdDrawingLeft) + (x2 - x1)
$('.tzdDrawing_2').css('transform', `translate(${Number(self.tzdDrawingLeft) + (x2 - x1)}px,${Number(self.tzdDrawingTop) + (y2 - y1)}px) scale(${self.zoomLevel})`) $('.tzdDrawing_2').css('transform', `translate(${Number(self.tzdDrawingLeft) + (x2 - x1)}px,${Number(self.tzdDrawingTop) + (y2 - y1)}px) scale(${self.zoomLevel})`)
self.move_left = originleft + ((x2 - x1) * self.newWidth / self.canvasWidth / self.zoomLevel) self.move_left = originleft + ((x2 - x1) * self.newWidth / self.canvasWidth / self.zoomLevel)
...@@ -1530,7 +1537,8 @@ export default { ...@@ -1530,7 +1537,8 @@ export default {
zoomLevel: self.zoomLevel zoomLevel: self.zoomLevel
}) })
// document.querySelector('.tzdDrawing').style.transformOrigin = `${originPointer.x}px ${originPointer.y}px`; // document.querySelector('.tzdDrawing').style.transformOrigin = `${originPointer.x}px ${originPointer.y}px`;
$('.tzdDrawing').css('transform', `scale(${self.zoomLevel})`) let canvasImage = self.imageEditor._graphics.getCanvasImage();
$('.tzdDrawing').css('transform', `rotate(${canvasImage.angle}deg) translate(${Number(self.tzdDrawing_left)}px,${Number(self.tzdDrawing_top)}px) scale(${self.zoomLevel})`)
$(".tzdDrawing_2").css("transform", `scale(${self.zoomLevel})`); $(".tzdDrawing_2").css("transform", `scale(${self.zoomLevel})`);
// document.querySelector('.tzdDrawing').style.transformOrigin = "260px 260px"; // document.querySelector('.tzdDrawing').style.transformOrigin = "260px 260px";
// console.log(`${originPointer.y}px,${originPointer.x}px`); // console.log(`${originPointer.y}px,${originPointer.x}px`);
...@@ -1550,7 +1558,8 @@ export default { ...@@ -1550,7 +1558,8 @@ export default {
// $('.tzdDom').css('z-index', `9999`) // $('.tzdDom').css('z-index', `9999`)
// $('.tzdDrawing').css('transform-origin', `${originPointer.y}px,${originPointer.x}px`) // $('.tzdDrawing').css('transform-origin', `${originPointer.y}px,${originPointer.x}px`)
// document.querySelector('.tzdDrawing').style.transformOrigin = `${originPointer.x}px ${originPointer.y}px`; // document.querySelector('.tzdDrawing').style.transformOrigin = `${originPointer.x}px ${originPointer.y}px`;
$('.tzdDrawing').css('transform', `scale(${self.zoomLevel})`) let canvasImage = self.imageEditor._graphics.getCanvasImage();
$('.tzdDrawing').css('transform', `rotate(${canvasImage.angle}deg) translate(${Number(self.tzdDrawing_left)}px,${Number(self.tzdDrawing_top)}px) scale(${self.zoomLevel})`)
$(".tzdDrawing_2").css("transform", `scale(${self.zoomLevel})`); $(".tzdDrawing_2").css("transform", `scale(${self.zoomLevel})`);
// document.querySelector('.tzdDrawing').style.transformOrigin = "260px 260px"; // document.querySelector('.tzdDrawing').style.transformOrigin = "260px 260px";
...@@ -1621,6 +1630,7 @@ export default { ...@@ -1621,6 +1630,7 @@ export default {
self.tzdDrawingLeft = $('.tzdDrawing').css("transform").replace(/[^0-9\-,]/g, '').split(',')[4] self.tzdDrawingLeft = $('.tzdDrawing').css("transform").replace(/[^0-9\-,]/g, '').split(',')[4]
self.tzdDrawingTop = $('.tzdDrawing').css("transform").replace(/[^0-9\-,]/g, '').split(',')[5] self.tzdDrawingTop = $('.tzdDrawing').css("transform").replace(/[^0-9\-,]/g, '').split(',')[5]
} }
// $('.tzdDrawing').css('transform', `rotate(${canvasImage.angle}deg) translate(${Number(self.tzdDrawing_left)}px,${Number(self.tzdDrawing_top)}px) scale(${self.zoomLevel})`)
self.startHand = false self.startHand = false
self.mouseEnlarge = false self.mouseEnlarge = false
// console.log(e); // console.log(e);
...@@ -2089,6 +2099,8 @@ export default { ...@@ -2089,6 +2099,8 @@ export default {
//重置位置变量 //重置位置变量
self.move_left = 0; self.move_left = 0;
self.move_top = 0; self.move_top = 0;
self.tzdDrawing_left = 0
self.tzdDrawing_top = 0
self.zoomLevel = 1; self.zoomLevel = 1;
self.imageEditor.resetFlip().then(function (status) { self.imageEditor.resetFlip().then(function (status) {
console.log('flipX: ', status.flipX); console.log('flipX: ', status.flipX);
...@@ -3507,9 +3519,7 @@ export default { ...@@ -3507,9 +3519,7 @@ export default {
this.imageEditor.rotate(deg) this.imageEditor.rotate(deg)
let canvasImage = this.imageEditor._graphics.getCanvasImage() let canvasImage = this.imageEditor._graphics.getCanvasImage()
this.startPlace = newValue; this.startPlace = newValue;
$('.tzdDrawing').css('transform', `rotate(${canvasImage.angle}deg)`) $('.tzdDrawing').css('transform', `rotate(${canvasImage.angle}deg) scale(${self.zoomLevel})`)
// 特征点的图层也要跟着转
$('.tzdDrawing').css("transform", `rotate(${newValue}deg)`)
}, },
inputRemoveWhiteRange (newValue, oldValue) { inputRemoveWhiteRange (newValue, oldValue) {
this.imageEditor.applyFilter('removeColor', { this.imageEditor.applyFilter('removeColor', {
......
src/views/Editor/modules/ryzwbjLeft.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-10-22 09:42:07 * @Date: 2021-10-22 09:42:07
* @LastEditTime: 2021-11-13 11:21:36 * @LastEditTime: 2021-11-15 10:37:25
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
</div> </div>
<div class="left-right-hand" v-if="zwSelect==='滚动指纹'"> <div class="left-right-hand" v-if="zwSelect==='滚动指纹'">
<el-tabs v-model="activeRollHand" @tab-click="handleRollClick"> <el-tabs v-model="activeRollHand" @tab-click="handleRollClick">
<el-tab-pane label="左手" name="left" class="left-hand"> <el-tab-pane label="右手" name="right" class="left-hand">
<div class="fingerDom" v-for="(item) in rollFingersLeft" :key="item.code" @click="rollFingersLeftChange(item)"> <div class="fingerDom" v-for="(item) in rollFingersRight" :key="item.code" @click="rollFingersLeftChange(item)">
<div v-if="item.image" class="fingerPic" :class="{fingerPicActive: activerollFinger===item.code}"> <div v-if="item.image" class="fingerPic" :class="{fingerPicActive: activerollFinger===item.code}">
<div class="finger-number">{{item.code>9?item.code:'0'+item.code}}</div> <div class="finger-number">{{item.code>9?item.code:'0'+item.code}}</div>
<img class="finger-pic" :src="'data:image/jpeg;base64,'+item.image" /> <img class="finger-pic" :src="'data:image/jpeg;base64,'+item.image" />
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
<div class="finger-name">{{item.name}}</div> <div class="finger-name">{{item.name}}</div>
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="右手" name="right" class="left-hand"> <el-tab-pane label="左手" name="left" class="left-hand">
<div class="fingerDom" v-for="(item) in rollFingersRight" :key="item.code" @click="rollFingersLeftChange(item)"> <div class="fingerDom" v-for="(item) in rollFingersLeft" :key="item.code" @click="rollFingersLeftChange(item)">
<div v-if="item.image" class="fingerPic" :class="{fingerPicActive: activerollFinger===item.code}"> <div v-if="item.image" class="fingerPic" :class="{fingerPicActive: activerollFinger===item.code}">
<div class="finger-number">{{item.code>9?item.code:'0'+item.code}}</div> <div class="finger-number">{{item.code>9?item.code:'0'+item.code}}</div>
<img class="finger-pic" :src="'data:image/jpeg;base64,'+item.image" /> <img class="finger-pic" :src="'data:image/jpeg;base64,'+item.image" />
...@@ -52,8 +52,8 @@ ...@@ -52,8 +52,8 @@
</div> </div>
<div class="left-right-hand" v-else-if="zwSelect==='平面指纹'"> <div class="left-right-hand" v-else-if="zwSelect==='平面指纹'">
<el-tabs v-model="activePainHand" @tab-click="handlePainClick"> <el-tabs v-model="activePainHand" @tab-click="handlePainClick">
<el-tab-pane label="左手" name="left" class="left-hand"> <el-tab-pane label="右手" name="right" class="left-hand">
<div class="fingerDom" v-for="(item) in painFingersLeft" :key="item.code" @click="rollFingersLeftChange(item)"> <div class="fingerDom" v-for="(item) in painFingersRight" :key="item.code" @click="rollFingersLeftChange(item)">
<div v-if="item.image" class="fingerPic" :class="{fingerPicActive: activerollFinger===item.code}"> <div v-if="item.image" class="fingerPic" :class="{fingerPicActive: activerollFinger===item.code}">
<div class="finger-number">{{item.code}}</div> <div class="finger-number">{{item.code}}</div>
<img class="finger-pic" :src="'data:image/jpeg;base64,'+item.image" /> <img class="finger-pic" :src="'data:image/jpeg;base64,'+item.image" />
...@@ -66,8 +66,8 @@ ...@@ -66,8 +66,8 @@
<div class="finger-name">{{item.name}}</div> <div class="finger-name">{{item.name}}</div>
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="右手" name="right" class="left-hand"> <el-tab-pane label="左手" name="left" class="left-hand">
<div class="fingerDom" v-for="(item) in painFingersRight" :key="item.code" @click="rollFingersLeftChange(item)"> <div class="fingerDom" v-for="(item) in painFingersLeft" :key="item.code" @click="rollFingersLeftChange(item)">
<div v-if="item.image" class="fingerPic" :class="{fingerPicActive: activerollFinger===item.code}"> <div v-if="item.image" class="fingerPic" :class="{fingerPicActive: activerollFinger===item.code}">
<div class="finger-number">{{item.code}}</div> <div class="finger-number">{{item.code}}</div>
<img class="finger-pic" :src="'data:image/jpeg;base64,'+item.image" /> <img class="finger-pic" :src="'data:image/jpeg;base64,'+item.image" />
...@@ -102,8 +102,8 @@ export default { ...@@ -102,8 +102,8 @@ export default {
// 人员编号 // 人员编号
id: '', id: '',
zwSelect: '滚动指纹', zwSelect: '滚动指纹',
activeRollHand: 'left', activeRollHand: 'right',
activePainHand: 'left', activePainHand: 'right',
activerollFinger: '6', activerollFinger: '6',
rollFingersLeft: [ rollFingersLeft: [
{ {
...@@ -231,6 +231,7 @@ export default { ...@@ -231,6 +231,7 @@ export default {
await this.getPainFingers() await this.getPainFingers()
await this.getRollFingers() await this.getRollFingers()
await this.findFinger() await this.findFinger()
if (self.finger && self.finger.code) {
this.activerollFinger = self.finger.code this.activerollFinger = self.finger.code
self.preSeq = this.activerollFinger self.preSeq = this.activerollFinger
// 默认选中第一个出现的指纹 // 默认选中第一个出现的指纹
...@@ -241,6 +242,7 @@ export default { ...@@ -241,6 +242,7 @@ export default {
// 滚动 // 滚动
self.getRollFingerOrigin(self.finger.code) self.getRollFingerOrigin(self.finger.code)
} }
}
// setTimeout(() => { // setTimeout(() => {
// console.log(this.finger); // console.log(this.finger);
...@@ -403,6 +405,7 @@ export default { ...@@ -403,6 +405,7 @@ export default {
} }
self.PainFingerFlag = true self.PainFingerFlag = true
} else { } else {
debugger
// 没有平面指纹，不能切换tabl栏 // 没有平面指纹，不能切换tabl栏
self.PainFingerFlag = false self.PainFingerFlag = false
} }
......
src/views/cxyrd/TT.vue
...@@ -851,9 +851,7 @@ export default { ...@@ -851,9 +851,7 @@ export default {
this.currentQqid = this.sourcedatas[i - 1].qqid; this.currentQqid = this.sourcedatas[i - 1].qqid;
this.sourcebarcode = this.sourcedatas[i - 1].barcode; this.sourcebarcode = this.sourcedatas[i - 1].barcode;
this.activeIndex3 -= 1; this.activeIndex3 -= 1;
} else {
this.$message.error("已经是第一条数据了");
}
this.fingerLoading = true; this.fingerLoading = true;
// 指纹图清空 // 指纹图清空
this.clearsource(); this.clearsource();
...@@ -864,7 +862,9 @@ export default { ...@@ -864,7 +862,9 @@ export default {
this.getSourcePlainFingerPrintDetail(this.sourcebarcode); this.getSourcePlainFingerPrintDetail(this.sourcebarcode);
// 获取候选列表 // 获取候选列表
this.getMatchcandList(); this.getMatchcandList();
} else {
this.$message.error("已经是第一条数据了");
}
console.info(this.currentQqid); console.info(this.currentQqid);
console.info(this.sourcebarcode); console.info(this.sourcebarcode);
}, },
...@@ -875,9 +875,7 @@ export default { ...@@ -875,9 +875,7 @@ export default {
this.currentQqid = this.sourcedatas[i + 1].qqid; this.currentQqid = this.sourcedatas[i + 1].qqid;
this.sourcebarcode = this.sourcedatas[i + 1].barcode; this.sourcebarcode = this.sourcedatas[i + 1].barcode;
this.activeIndex3 += 1; this.activeIndex3 += 1;
} else {
this.$message.error("已经是最后一条数据了");
}
this.fingerLoading = true; this.fingerLoading = true;
// 指纹图清空 // 指纹图清空
this.clearsource(); this.clearsource();
...@@ -888,6 +886,9 @@ export default { ...@@ -888,6 +886,9 @@ export default {
this.getSourcePlainFingerPrintDetail(this.sourcebarcode); this.getSourcePlainFingerPrintDetail(this.sourcebarcode);
// 获取候选列表 // 获取候选列表
this.getMatchcandList(); this.getMatchcandList();
} else {
this.$message.error("已经是最后一条数据了");
}
console.info(this.currentQqid); console.info(this.currentQqid);
console.info(this.sourcebarcode); console.info(this.sourcebarcode);
}, },
......
src/views/cxyrd/modules/TLSrc.vue
...@@ -24,22 +24,21 @@ ...@@ -24,22 +24,21 @@
<div class="finger-print" v-show="isShowPrint"> <div class="finger-print" v-show="isShowPrint">
<div class="btns"> <div class="btns">
<div class="btn" @click="switchRoll" :class="{active: fingerShowType == 'roll'}">滚动</div> <div class="btn" @click="switchRoll" :class="{active: fingerShowType == 'roll'}">滚动</div>
<div class="btn" @click="switchPain" :class="{active: fingerShowType == 'pain'}">平面</div> <div class="btn" @click="switchPain" :class="{active: fingerShowType == 'pain', isHasData: !painFlag}">平面</div>
</div> </div>
<!-- 滚动 --> <!-- 滚动 -->
<div class="fingers" v-if="fingerShowType=='roll'"> <div class="fingers" v-if="fingerShowType=='roll'">
<div class="outside"> <div class="outside">
<label>左手</label> <label>右手</label><br />
<br />
<div class="fingersImg"> <div class="fingersImg">
<div class="finger" v-for="(item, index) in fingersLeftR" :key="index" :class="{noFinger: !item.image, fingerLoading: !item.image && fingerLoading, fingerLook: item.clickLog==1, fingerRD: item.affirmstatus==1, fingerBZ:item.affirmstatus==2, fingerRB:item.affirmstatus==3, finger_print_active: item.code === isActive}" @click="changeStyleLeftR(index, item)"> <div class="finger" v-for="(item, index) in fingersRightR" :key="index" :class="{noFinger: !item.image, fingerLoading: !item.image && fingerLoading, fingerLook: item.clickLog==1, fingerRD: item.affirmstatus==1, fingerBZ:item.affirmstatus==2, fingerRB:item.affirmstatus==3, finger_print_active: item.code === isActive}" @click="changeStyleRightR(index, item)">
<!-- <svg-icon v-if="fingerLoading" icon-class="loading" class="icon" /> --> <!-- <svg-icon v-if="fingerLoading" icon-class="loading" class="icon" /> -->
<img v-if="fingerLoading" src="@/assets/img/smallfinger.gif" alt="" class="icon"> <img v-if="fingerLoading" src="@/assets/img/smallfinger.gif" alt="" class="icon">
<div v-else> <div v-else>
<div class="num" :class="{noFinger: !item.image}">{{item.name}}</div> <div class="num" :class="{noFinger: !item.image}">{{item.name}}</div>
<!-- 有指纹图片 --> <!-- 有指纹图片 -->
<div v-if="item.image"> <div v-if="item.image">
<img :src="'data:image/jpeg;base64,' + item.image" style="width: 100px;height: 100px;" /> <img :src="'data:image/jpeg;base64,' + item.image" style="width: 100%;height: 100%;" />
<div class="finger-tips"> <div class="finger-tips">
<!-- 认定完成 --> <!-- 认定完成 -->
<div class="affirmstatus1" v-if="item.affirmstatus==1"> <div class="affirmstatus1" v-if="item.affirmstatus==1">
...@@ -83,16 +82,17 @@ ...@@ -83,16 +82,17 @@
</div> </div>
<br /><br /> <br /><br />
<div class="outside"> <div class="outside">
<label>右手</label><br /> <label>左手</label>
<br />
<div class="fingersImg"> <div class="fingersImg">
<div class="finger" v-for="(item, index) in fingersRightR" :key="index" :class="{noFinger: !item.image, fingerLoading: !item.image && fingerLoading, fingerLook: item.clickLog==1, fingerRD: item.affirmstatus==1, fingerBZ:item.affirmstatus==2, fingerRB:item.affirmstatus==3, finger_print_active: item.code === isActive}" @click="changeStyleRightR(index, item)"> <div class="finger" v-for="(item, index) in fingersLeftR" :key="index" :class="{noFinger: !item.image, fingerLoading: !item.image && fingerLoading, fingerLook: item.clickLog==1, fingerRD: item.affirmstatus==1, fingerBZ:item.affirmstatus==2, fingerRB:item.affirmstatus==3, finger_print_active: item.code === isActive}" @click="changeStyleLeftR(index, item)">
<!-- <svg-icon v-if="fingerLoading" icon-class="loading" class="icon" /> --> <!-- <svg-icon v-if="fingerLoading" icon-class="loading" class="icon" /> -->
<img v-if="fingerLoading" src="@/assets/img/smallfinger.gif" alt="" class="icon"> <img v-if="fingerLoading" src="@/assets/img/smallfinger.gif" alt="" class="icon">
<div v-else> <div v-else>
<div class="num" :class="{noFinger: !item.image}">{{item.name}}</div> <div class="num" :class="{noFinger: !item.image}">{{item.name}}</div>
<!-- 有指纹图片 --> <!-- 有指纹图片 -->
<div v-if="item.image"> <div v-if="item.image">
<img :src="'data:image/jpeg;base64,' + item.image" style="width: 100px;height: 100px;" /> <img :src="'data:image/jpeg;base64,' + item.image" style="width: 100%;height: 100%;" />
<div class="finger-tips"> <div class="finger-tips">
<!-- 认定完成 --> <!-- 认定完成 -->
<div class="affirmstatus1" v-if="item.affirmstatus==1"> <div class="affirmstatus1" v-if="item.affirmstatus==1">
...@@ -138,17 +138,16 @@ ...@@ -138,17 +138,16 @@
<!-- 平面 --> <!-- 平面 -->
<div class="fingers" v-else> <div class="fingers" v-else>
<div class="outside"> <div class="outside">
<label>左手</label> <label>右手</label><br />
<br />
<div class="fingersImg"> <div class="fingersImg">
<div class="finger" v-for="(item, index) in fingersLeftL" :key="index" :class="{noFinger: !item.image, fingerLoading: !item.image && fingerLoading, fingerLook: item.clickLog==1, fingerRD: item.affirmstatus==1, fingerBZ:item.affirmstatus==2, fingerRB:item.affirmstatus==3, finger_print_active: item.code === isActive}" @click="changeStyleLeftL(index, item)"> <div class="finger" v-for="(item, index) in fingersRightL" :key="index" :class="{noFinger: !item.image, fingerLoading: !item.image && fingerLoading, fingerLook: item.clickLog==1, fingerRD: item.affirmstatus==1, fingerBZ:item.affirmstatus==2, fingerRB:item.affirmstatus==3, finger_print_active: item.code === isActive}" @click="changeStyleRightL(index, item)">
<!-- <svg-icon v-if="fingerLoading" icon-class="loading" class="icon" /> --> <!-- <svg-icon v-if="fingerLoading" icon-class="loading" class="icon" /> -->
<img v-if="fingerLoading" src="@/assets/img/smallfinger.gif" alt="" class="icon"> <img v-if="fingerLoading" src="@/assets/img/smallfinger.gif" alt="" class="icon">
<div v-else> <div v-else>
<div class="num" :class="{noFinger: !item.image}">{{item.name}}</div> <div class="num" :class="{noFinger: !item.image}">{{item.name}}</div>
<!-- 有指纹图片 --> <!-- 有指纹图片 -->
<div v-if="item.image"> <div v-if="item.image">
<img :src="'data:image/jpeg;base64,' + item.image" style="width: 100px;height: 100px;" /> <img :src="'data:image/jpeg;base64,' + item.image" style="width: 100%;height: 100%;" />
<div class="finger-tips"> <div class="finger-tips">
<!-- 认定完成 --> <!-- 认定完成 -->
<div class="affirmstatus1" v-if="item.affirmstatus==1"> <div class="affirmstatus1" v-if="item.affirmstatus==1">
...@@ -175,7 +174,7 @@ ...@@ -175,7 +174,7 @@
</div> </div>
</div> --> </div> -->
<!-- 浏览过 --> <!-- 浏览过 -->
<div class="clickLog" v-if="item.affirmstatus==='' && item.clickLog==1"> <div class="clickLog" v-if="item.affirmstatus=='' && item.clickLog==1">
<div class="clickLogbg"></div> <div class="clickLogbg"></div>
<div class="dot"></div> <div class="dot"></div>
<span class="txt">已查看</span> <span class="txt">已查看</span>
...@@ -192,16 +191,17 @@ ...@@ -192,16 +191,17 @@
</div> </div>
<br /><br /> <br /><br />
<div class="outside"> <div class="outside">
<label>右手</label><br /> <label>左手</label>
<br />
<div class="fingersImg"> <div class="fingersImg">
<div class="finger" v-for="(item, index) in fingersRightL" :key="index" :class="{noFinger: !item.image, fingerLoading: !item.image && fingerLoading, fingerLook: item.clickLog==1, fingerRD: item.affirmstatus==1, fingerBZ:item.affirmstatus==2, fingerRB:item.affirmstatus==3, finger_print_active: item.code === isActive}" @click="changeStyleRightL(index, item)"> <div class="finger" v-for="(item, index) in fingersLeftL" :key="index" :class="{noFinger: !item.image, fingerLoading: !item.image && fingerLoading, fingerLook: item.clickLog==1, fingerRD: item.affirmstatus==1, fingerBZ:item.affirmstatus==2, fingerRB:item.affirmstatus==3, finger_print_active: item.code === isActive}" @click="changeStyleLeftL(index, item)">
<!-- <svg-icon v-if="fingerLoading" icon-class="loading" class="icon" /> --> <!-- <svg-icon v-if="fingerLoading" icon-class="loading" class="icon" /> -->
<img v-if="fingerLoading" src="@/assets/img/smallfinger.gif" alt="" class="icon"> <img v-if="fingerLoading" src="@/assets/img/smallfinger.gif" alt="" class="icon">
<div v-else> <div v-else>
<div class="num" :class="{noFinger: !item.image}">{{item.name}}</div> <div class="num" :class="{noFinger: !item.image}">{{item.name}}</div>
<!-- 有指纹图片 --> <!-- 有指纹图片 -->
<div v-if="item.image"> <div v-if="item.image">
<img :src="'data:image/jpeg;base64,' + item.image" style="width: 100px;height: 100px;" /> <img :src="'data:image/jpeg;base64,' + item.image" style="width: 100%;height: 100%;" />
<div class="finger-tips"> <div class="finger-tips">
<!-- 认定完成 --> <!-- 认定完成 -->
<div class="affirmstatus1" v-if="item.affirmstatus==1"> <div class="affirmstatus1" v-if="item.affirmstatus==1">
...@@ -228,7 +228,7 @@ ...@@ -228,7 +228,7 @@
</div> </div>
</div> --> </div> -->
<!-- 浏览过 --> <!-- 浏览过 -->
<div class="clickLog" v-if="item.affirmstatus=='' && item.clickLog==1"> <div class="clickLog" v-if="item.affirmstatus==='' && item.clickLog==1">
<div class="clickLogbg"></div> <div class="clickLogbg"></div>
<div class="dot"></div> <div class="dot"></div>
<span class="txt">已查看</span> <span class="txt">已查看</span>
...@@ -243,6 +243,7 @@ ...@@ -243,6 +243,7 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="bottom"> <div class="bottom">
<span>该查询ID共计<b>{{ fingerTotal }}</b>枚指纹</span> <span>该查询ID共计<b>{{ fingerTotal }}</b>枚指纹</span>
...@@ -324,7 +325,9 @@ export default { ...@@ -324,7 +325,9 @@ export default {
{ name: '小', code: 15, image: null }, { name: '小', code: 15, image: null },
], ],
// 指纹图片加载 // 指纹图片加载
fingerLoading: true fingerLoading: true,
// 平面的tab栏是否可以点击
painFlag: true
}; };
}, },
mounted () { mounted () {
...@@ -373,6 +376,7 @@ export default { ...@@ -373,6 +376,7 @@ export default {
* @return {*} * @return {*}
*/ */
switchPain () { switchPain () {
if(!this.painFlag) return;
this.fingerShowType = 'pain' this.fingerShowType = 'pain'
}, },
/** /**
...@@ -464,6 +468,7 @@ export default { ...@@ -464,6 +468,7 @@ export default {
self.fingerTotalPain = fingerPain.data.ret.length self.fingerTotalPain = fingerPain.data.ret.length
}); });
} else { } else {
// 平面没有指纹
self.fingersLeftL.forEach(itemL => { self.fingersLeftL.forEach(itemL => {
// itemL.img = null // itemL.img = null
self.$set(itemL, 'image', null) self.$set(itemL, 'image', null)
...@@ -476,6 +481,8 @@ export default { ...@@ -476,6 +481,8 @@ export default {
self.$set(itemL, 'clickLog', '') self.$set(itemL, 'clickLog', '')
self.$set(itemL, 'affirmstatus', '') self.$set(itemL, 'affirmstatus', '')
}) })
// 平面不可点击
self.painFlag = false
} }
...@@ -608,8 +615,7 @@ export default { ...@@ -608,8 +615,7 @@ export default {
async findFinger () { async findFinger () {
let self = this let self = this
self.finger = null self.finger = null
console.log(self.fingersLeftR); self.fingersRightR.some((item, index) => {
self.fingersLeftR.some((item, index) => {
if (item.image != null) { if (item.image != null) {
self.finger = item self.finger = item
return true return true
...@@ -617,7 +623,8 @@ export default { ...@@ -617,7 +623,8 @@ export default {
}) })
console.log(self.finger); console.log(self.finger);
if (self.finger) return self.finger if (self.finger) return self.finger
self.fingersRightR.some((item, index) => { console.log(self.fingersLeftR);
self.fingersLeftR.some((item, index) => {
if (item.image != null) { if (item.image != null) {
self.finger = item self.finger = item
return true return true
...@@ -625,7 +632,8 @@ export default { ...@@ -625,7 +632,8 @@ export default {
}) })
console.log(self.finger); console.log(self.finger);
if (self.finger) return self.finger if (self.finger) return self.finger
self.fingersLeftL.some((item, index) => { if (self.finger) return self.finger
self.fingersRightL.some((item, index) => {
if (item.image != null) { if (item.image != null) {
self.finger = item self.finger = item
return true return true
...@@ -633,14 +641,14 @@ export default { ...@@ -633,14 +641,14 @@ export default {
}) })
console.log(self.finger); console.log(self.finger);
if (self.finger) return self.finger if (self.finger) return self.finger
self.fingersRightL.some((item, index) => { self.fingersLeftL.some((item, index) => {
if (item.image != null) { if (item.image != null) {
self.finger = item self.finger = item
return true return true
} }
}) })
console.log(self.finger); console.log(self.finger);
if (self.finger) return self.finger
return self.finger return self.finger
}, },
// 获取选择的任务详情 // 获取选择的任务详情
...@@ -914,6 +922,10 @@ label { ...@@ -914,6 +922,10 @@ label {
color: #ffffff; color: #ffffff;
} }
} }
.isHasData {
background-color: #ECEDF1;
color: #AEAFB4;
}
} }
.fingers { .fingers {
background: #f6f8fa; background: #f6f8fa;
...@@ -974,7 +986,7 @@ label { ...@@ -974,7 +986,7 @@ label {
width: 100%; width: 100%;
height: 100%; height: 100%;
position: absolute; position: absolute;
background: linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, #000000 100%); background: linear-gradient(180deg, rgba(255, 255, 255, 0) -35%, #000000 100%);
opacity: 0.66; opacity: 0.66;
} }
.dot { .dot {
...@@ -1010,7 +1022,7 @@ label { ...@@ -1010,7 +1022,7 @@ label {
width: 100%; width: 100%;
height: 100%; height: 100%;
position: absolute; position: absolute;
background: linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, #000000 100%); background: linear-gradient(180deg, rgba(255, 255, 255, 0) -35%, #000000 100%);
opacity: 0.66; opacity: 0.66;
} }
.icon { .icon {
...@@ -1037,7 +1049,7 @@ label { ...@@ -1037,7 +1049,7 @@ label {
width: 100%; width: 100%;
height: 100%; height: 100%;
position: absolute; position: absolute;
background: linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, #000000 100%); background: linear-gradient(180deg, rgba(255, 255, 255, 0) -35%, #000000 100%);
opacity: 0.66; opacity: 0.66;
} }
.dot { .dot {
......
vue.config.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:57:48 * @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-15 10:49:44 * @LastEditTime: 2021-11-15 13:38:00
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js * @FilePath: \指纹系统\founder_vue\vue.config.js
...@@ -92,7 +92,7 @@ module.exports = { ...@@ -92,7 +92,7 @@ module.exports = {
// target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ // target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
// target: "http://172.18.108.2:8099/", // 张 认定 // target: "http://172.18.108.2:8099/", // 张 认定
// target: "http://192.168.128.110:8099", // 湖南-张 // target: "http://192.168.128.110:8099", // 湖南-张
// target: "http://192.168.128.114:8099", // 湖南-马 target: "http://192.168.128.114:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王 // target: "http://192.168.128.116:8099", // 湖南-王
// target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma // target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
// target: "http://127.0.0.1:8099", // target: "http://127.0.0.1:8099",
......
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