Skip to content

F
founder_vue
Commit 6b9ae5dc by 张超军
Options

墨奇增加手动采集功能

parent 60381e4b
Showing with 188 additions and 169 deletions
package-lock.json
This source diff could not be displayed because it is too large. You can view the blob instead.
src/utils/sample-code2.js
import {
CaptureState, EmptyRequest, FingerIndex, ImageType, PreviewState, AudioFile, AudioMute, AudioVolume, AutoCaptureRequest, AutoCaptureState, CameraState,
Bozorth3Request
CaptureState,
EmptyRequest,
FingerIndex,
ImageType,
PreviewState,
AudioFile,
AudioMute,
AudioVolume,
AutoCaptureRequest,
AutoCaptureState,
CameraState,
Bozorth3Request,
} from './camera_pb';
import { CameraServiceClient } from './camera_pb_service';
// 指位枚举量
export var FingerprintIndexEnum;
(function (FingerprintIndexEnum) {
FingerprintIndexEnum[FingerprintIndexEnum["Idx1"] = 1] = "Idx1";
FingerprintIndexEnum[FingerprintIndexEnum["Idx2"] = 2] = "Idx2";
FingerprintIndexEnum[FingerprintIndexEnum["Idx3"] = 3] = "Idx3";
FingerprintIndexEnum[FingerprintIndexEnum["Idx4"] = 4] = "Idx4";
FingerprintIndexEnum[FingerprintIndexEnum["Idx5"] = 5] = "Idx5";
FingerprintIndexEnum[FingerprintIndexEnum["Idx6"] = 6] = "Idx6";
FingerprintIndexEnum[FingerprintIndexEnum["Idx7"] = 7] = "Idx7";
FingerprintIndexEnum[FingerprintIndexEnum["Idx8"] = 8] = "Idx8";
FingerprintIndexEnum[FingerprintIndexEnum["Idx9"] = 9] = "Idx9";
FingerprintIndexEnum[FingerprintIndexEnum["Idx10"] = 10] = "Idx10";
(function(FingerprintIndexEnum) {
FingerprintIndexEnum[(FingerprintIndexEnum['Idx1'] = 1)] = 'Idx1';
FingerprintIndexEnum[(FingerprintIndexEnum['Idx2'] = 2)] = 'Idx2';
FingerprintIndexEnum[(FingerprintIndexEnum['Idx3'] = 3)] = 'Idx3';
FingerprintIndexEnum[(FingerprintIndexEnum['Idx4'] = 4)] = 'Idx4';
FingerprintIndexEnum[(FingerprintIndexEnum['Idx5'] = 5)] = 'Idx5';
FingerprintIndexEnum[(FingerprintIndexEnum['Idx6'] = 6)] = 'Idx6';
FingerprintIndexEnum[(FingerprintIndexEnum['Idx7'] = 7)] = 'Idx7';
FingerprintIndexEnum[(FingerprintIndexEnum['Idx8'] = 8)] = 'Idx8';
FingerprintIndexEnum[(FingerprintIndexEnum['Idx9'] = 9)] = 'Idx9';
FingerprintIndexEnum[(FingerprintIndexEnum['Idx10'] = 10)] = 'Idx10';
})(FingerprintIndexEnum || (FingerprintIndexEnum = {}));
export class GrpcCameraService {
constructor(url, sessionID) {
......@@ -32,40 +42,39 @@ export class GrpcCameraService {
this.client = new CameraServiceClient(this.baseUrl, null);
}
// 启用相机
async getCameraState2 () {
async getCameraState2() {
const req = new EmptyRequest();
req.setRequestId(this.sessionID);
let state;
let res = await new Promise((resolve, reject) => {
this.client.getCameraState(req, async (err, message) => {
if (err) {
console.log(err);
// console.log(err);
// return err
reject(err)
reject(err);
} else {
// 相机的状态
state = await message.getState();
if (state === CameraState.CAMERA_OK) {
// 相机打开之后
console.log("相机状态:" + state);
resolve(state)
// console.log('相机状态:' + state);
resolve(state);
// return state
}
if (state === CameraState.CAMERA_DISCONNECTED) {
// 相机状态为 DISCONNECTED
// return false
reject()
reject();
}
}
})
})
return res
});
});
return res;
}
// 自动采集
async getAutoGatherVideoStream2 (finger, fingerInfo, handObj, cb) {
async getAutoGatherVideoStream2(finger, fingerInfo, handObj, cb) {
console.log('获取视频流 + 采集');
// 构造并发送请求
const req = new AutoCaptureRequest();
......@@ -80,15 +89,15 @@ export class GrpcCameraService {
this.autoVideoStream.on('data', (response) => {
if (response) {
if (response.getState() === AutoCaptureState.PREVIEW) {
if ((fingerInfo.statusR == 4) || (fingerInfo.statusL == 4)) {
console.log('设置了缺指');
resolve('缺指了')
if (fingerInfo.statusR == 4 || fingerInfo.statusL == 4) {
// console.log('设置了缺指');
resolve('缺指了');
this.stopVideoStream();
}
if (handObj.isHand) {
console.log('手动采集');
resolve('手动采集')
this.stopVideoStream()
// console.log('手动采集');
resolve('手动采集');
this.stopVideoStream();
}
// 预览状态
const previewState = response.getPreviewImage().getState();
......@@ -99,7 +108,10 @@ export class GrpcCameraService {
// return false;
} else {
// 预览成功，获取图片
const imageUrlList = response.getPreviewImage().getFrameList_asB64().map(img => this.imagePrefix + img);
const imageUrlList = response
.getPreviewImage()
.getFrameList_asB64()
.map((img) => this.imagePrefix + img);
// 请重新采集
if (previewState == '98') {
this.audioPlay('/video/gathering.mp3');
......@@ -110,16 +122,16 @@ export class GrpcCameraService {
cb(imageUrlList, previewState);
}
} else {
console.log(222222);
// console.log(222222);
// 采集状态
const captureImage = response.getCaptureImage();
const captureState = captureImage.getState();
console.log(captureImage);
console.log(captureState);
// console.log(captureImage);
// console.log(captureState);
if (captureState != CaptureState.CAPTURE_OK) {
// 在这里处理采集图片质量不合格
this.audioPlay('/video/gather_error_regather.mp3');//采集失败，请重采
resolve({ result: '采集失败' })
this.audioPlay('/video/gather_error_regather.mp3'); //采集失败，请重采
resolve({ result: '采集失败' });
this.stopVideoStream();
} else {
// 采集成功
......@@ -127,28 +139,27 @@ export class GrpcCameraService {
// captureImage,
// captureState
// }
resolve(captureImage, captureState)
resolve(captureImage, captureState);
}
}
} else {
console.log(333333);
reject()
// console.log(333333);
reject();
// return false
}
})
});
this.autoVideoStream.on('status', (status) => {
// 在这里处理 on status 状态弹窗
if (status.code == '0') {
this.audioPlay('/video/success.mp3');
} else if (status.code == '6') {
console.log("正在处理视频流，请稍候重试");
console.log('正在处理视频流，请稍候重试');
} else if (status.code == '7' || status.code == '16') {
console.log("会话过期，请重新启动相机驱动");
console.log('会话过期，请重新启动相机驱动');
} else if (status.code == '14') {
console.log("USB中断，请重新连接指纹采集设备");
resolve({ msg: 'USB中断，请重新连接指纹采集设备', status: 'disconnection' })
console.log('USB中断，请重新连接指纹采集设备');
resolve({ msg: 'USB中断，请重新连接指纹采集设备', status: 'disconnection' });
// 刷新页面
// location.reload();
}
......@@ -156,53 +167,53 @@ export class GrpcCameraService {
this.autoVideoStream.on('end', (status) => {
// 在这里处理 on end 错误
console.log(status);
resolve({ msg: '视频流终端', status: 'disconnection' })
// console.log(status);
resolve({ msg: '视频流终端', status: 'disconnection' });
// 刷新页面
// location.reload();
});
})
});
return result
return result;
}
async getCameraVersion () {
async getCameraVersion() {
const req = new EmptyRequest();
req.setRequestId(this.sessionID);
let state;
let res = await new Promise((resolve, reject) => {
this.client.getCameraState(req, async (err, message) => {
if (err) {
reject(err)
reject(err);
} else {
// 相机的状态
state = await message.getState();
if (state === CameraState.CAMERA_OK) {
// 相机打开之后
console.log(message);
console.log("设备版本:" + message.getMachineVersion());
console.log("sdk 版本:" + message.getSdkVersion());
console.log("设备的 sn 编号:" + message.getDeviceSn());
console.log("是否支持 nfiq:" + message.getSupportNfiq2());
console.log("是否支持 nbis 重复指位检测:" + message.getSupportNbis());
// console.log(message);
// console.log('设备版本:' + message.getMachineVersion());
// console.log('sdk 版本:' + message.getSdkVersion());
// console.log('设备的 sn 编号:' + message.getDeviceSn());
// console.log('是否支持 nfiq:' + message.getSupportNfiq2());
// console.log('是否支持 nbis 重复指位检测:' + message.getSupportNbis());
resolve({
MachineVersion: message.getMachineVersion(),
SdkVersion: message.getSdkVersion(),
DeviceSn: message.getDeviceSn(),
SupportNfiq2: message.getSupportNfiq2(),
SupportNbis: message.getSupportNbis()
})
SupportNbis: message.getSupportNbis(),
});
}
if (state === CameraState.CAMERA_DISCONNECTED) {
reject()
reject();
}
}
})
})
return res
});
});
return res;
}
getCameraState (finger, cb, captureCb, file) {
getCameraState(finger, cb, captureCb, file) {
const req = new EmptyRequest();
req.setRequestId(this.sessionID);
this.client.getCameraState(req, (err, message) => {
......@@ -235,8 +246,8 @@ export class GrpcCameraService {
}
//自动采集指纹图像（获取视频流 + 采集）
getAutoGatherVideoStream (finger, cb, captureCb) {
console.log('获取视频流 + 采集');
getAutoGatherVideoStream(finger, cb, captureCb) {
// console.log('获取视频流 + 采集');
// 构造并发送请求
const req = new AutoCaptureRequest();
req.setRequestId(this.sessionID);
......@@ -258,7 +269,7 @@ export class GrpcCameraService {
const imageUrlList = response
.getPreviewImage()
.getFrameList_asB64()
.map(img => this.imagePrefix + img);
.map((img) => this.imagePrefix + img);
// 不要在这里 console.log，会占用内存
if (previewState == '98') {
this.audioPlay('/video/gathering.mp3');
......@@ -286,25 +297,25 @@ export class GrpcCameraService {
if (status.code == '0') {
this.audioPlay('/video/success.mp3');
} else if (status.code == '6') {
console.log("正在处理视频流，请稍候重试");
console.log('正在处理视频流，请稍候重试');
} else if (status.code == '7' || status.code == '16') {
console.log("会话过期，请重新启动相机驱动");
console.log('会话过期，请重新启动相机驱动');
} else if (status.code == '14') {
console.log("USB中断，请重新连接指纹采集设备");
console.log('USB中断，请重新连接指纹采集设备');
}
});
this.autoVideoStream.on('end', (status) => {
// 在这里处理 on end 错误
console.log(status);
// console.log(status);
});
}
stopCaptureImage () {
stopCaptureImage() {
if (this.captureImageStream) {
this.captureImageStream.cancel();
this.captureImageStream = null;
}
}
stopVideoStream () {
stopVideoStream() {
if (this.autoVideoStream) {
this.autoVideoStream.cancel();
this.autoVideoStream = null;
......@@ -315,8 +326,8 @@ export class GrpcCameraService {
}
}
//手动采集时获取视频流方法
getVideoStream (finger, cb) {
console.log("在这里需要获取每一侦的视频流");
getVideoStream(finger, cb) {
// console.log('在这里需要获取每一侦的视频流');
// 请求要包含指位信息
const req = new FingerIndex();
req.setFinger(finger);
......@@ -332,29 +343,29 @@ export class GrpcCameraService {
// 在这里处理 VideoStream on data 的 错误
if (status === PreviewState.PREVIEW_ERROR) {
this.stopVideoStream();
}
else {
const imageUrlList = response.getFrameList_asB64().map(img => this.imagePrefix + img);
} else {
const imageUrlList = response.getFrameList_asB64().map((img) => this.imagePrefix + img);
// 不要在这里 console.log，会占用内存
// 回调用于处理结果
cb(imageUrlList, status);
// todo 修改手动采集
cb(imageUrlList, status, this);
if (status == 0) {
this.audioPlay('/video/gathering.mp3');
this.stopVideoStream();
// this.audioPlay('/video/gathering.mp3');
// this.stopVideoStream();
}
}
}
});
this.videoStream.on('status', (status) => {
// 在这里处理 VideoStream on status 错误
console.log("status===" + status);
// console.log('status===' + status);
});
this.videoStream.on('end', (status) => {
// 在这里处理 VideoStream on end 错误
console.log(status);
// console.log(status);
});
}
captureImage2 (finger, cb) {
captureImage2(finger, cb) {
const req = new FingerIndex();
req.setFinger(finger);
req.setRequestId(this.sessionID);
......@@ -379,31 +390,30 @@ export class GrpcCameraService {
// image = response;
captureImage = response;
this.stopVideoStream();
resolve(captureImage)
resolve(captureImage);
}
// cb(progress, captureImage, status);
}
}
});
})
});
this.captureImageStream.on('status', (status) => {
// 在这里处理 on status 错误
console.log("status===" + status);
// console.log('status===' + status);
// this.stopVideoStream();
});
this.captureImageStream.on('end', (status) => {
// 在这里处理 on end 错误
console.log("end了", status);
// console.log('end了', status);
if (status.code == '0') {
this.audioPlay('/video/success.mp3');
}
this.stopCaptureImage();
this.stopVideoStream();
});
return result
return result;
}
captureImage (finger, cb) {
captureImage(finger, cb) {
const req = new FingerIndex();
req.setFinger(finger);
req.setRequestId(this.sessionID);
......@@ -422,6 +432,7 @@ export class GrpcCameraService {
} else {
const progress = responseObject.progress;
let captureImage = null;
captureImage = response;
if (progress === 100) {
// eslint-disable-next-line no-undef
// image = response;
......@@ -434,34 +445,33 @@ export class GrpcCameraService {
});
this.captureImageStream.on('status', (status) => {
// 在这里处理 on status 错误
console.log("status===" + status);
// console.log('status===' + status);
});
this.captureImageStream.on('end', (status) => {
// 在这里处理 on end 错误
console.log("end了", status);
// console.log('end了', status);
this.stopCaptureImage();
});
}
deleteImage (fingerIndex) {
deleteImage(fingerIndex) {
const req = new FingerIndex();
req.setFinger(fingerIndex);
req.setRequestId(this.sessionID);
this.client.deleteGrpcServerImage(req, null, err => {
this.client.deleteGrpcServerImage(req, null, (err) => {
if (err) {
// 在这里处理错误
}
});
}
setAudioVolumeAndMayTryPlay (volume, callback) {
setAudioVolumeAndMayTryPlay(volume, callback) {
const setAudioVolumeAndPlay = () => {
const req = new AudioVolume();
req.setVolume(volume);
req.setRequestId(this.sessionID);
this.client.audioSetVolume(req, err => {
this.client.audioSetVolume(req, (err) => {
if (err) {
// 失败，处理错误
}
else {
} else {
// 成功，如果有回调函数，执行回调
this.audioInitialized = true;
if (callback) {
......@@ -475,58 +485,55 @@ export class GrpcCameraService {
const req = new AudioMute();
req.setMute(false);
req.setRequestId(this.sessionID);
this.client.audioSetMute(req, null, err => {
this.client.audioSetMute(req, null, (err) => {
if (err) {
// 在这里处理错误
} else {
setAudioVolumeAndPlay();
}
});
}
else {
} else {
setAudioVolumeAndPlay();
}
}
audioPlay (file) {
audioPlay(file) {
// 若音频尚未初始化，要先关闭静音，并设置音量
if (!this.audioInitialized) {
this.setAudioVolumeAndMayTryPlay(this.audioVolume, () => {
this.callAudioPlay(file);
});
}
else {
} else {
this.callAudioPlay(file);
}
}
audioPlay2 (file) {
audioPlay2(file) {
// 若音频尚未初始化，要先关闭静音，并设置音量
let result = new Promise((resolve, reject) => {
if (!this.audioInitialized) {
this.setAudioVolumeAndMayTryPlay(this.audioVolume, () => {
this.callAudioPlay(file);
});
}
else {
} else {
this.callAudioPlay(file);
}
resolve(true)
})
return result
resolve(true);
});
return result;
}
callAudioPlay (file) {
callAudioPlay(file) {
const xmlRequest = new XMLHttpRequest();
xmlRequest.open('GET', file, true);
xmlRequest.responseType = 'arraybuffer';
xmlRequest.onload = () => {
console.log(xmlRequest.response);
// console.log(xmlRequest.response);
const bytes = new Uint8Array(xmlRequest.response);
const req = new AudioFile();
req.setFile(bytes);
req.setRequestId(this.sessionID);
this.client.audioPlay(req, null, err => {
this.client.audioPlay(req, null, (err) => {
if (err) {
// 在这里处理错误
console.log("语音文件读取错误：" + err.code);
console.log('语音文件读取错误：' + err.code);
}
});
};
......@@ -535,11 +542,11 @@ export class GrpcCameraService {
// probe 和 targets 是 captureImage 中返回的 plainMinutiae 和 rolledMinutiae, indices 传入指位
// 每次采集完成之后，把 rolledMinutiae push进一个 targets 数组中，rolledMinutiae push进去indices一个数组中
checkRepeatFinger (probe, targets, indices, cb) {
console.log("能进入重复指位验证吗？");
console.log("probe==" + probe);
console.log("targets==" + targets);
console.log("indices==" + indices);
checkRepeatFinger(probe, targets, indices, cb) {
// console.log('能进入重复指位验证吗？');
// console.log('probe==' + probe);
// console.log('targets==' + targets);
// console.log('indices==' + indices);
// 跳过第一个
// if (!targets || !targets.length) {
// debugger
......@@ -548,29 +555,28 @@ export class GrpcCameraService {
// return;
// }
if (!targets || !targets.length) {
console.log("77777");
// console.log('77777');
cb(false, -1);
return;
}
console.log("00000");
console.log('00000');
const req = new Bozorth3Request();
req.setProbe(probe);
req.setTargetsList(targets);
req.setRequestId(this.sessionID);
console.log(req);
this.client.bozorth3(req, null, function (err, message) {
this.client.bozorth3(req, null, function(err, message) {
if (err) {
// 在这里处理错误
}
else {
} else {
var scores = message.getScoresList();
console.log("scores==" + scores);
// console.log('scores==' + scores);
var higestIndex_1 = -1;
// var highestScore_1 = this.bozorth3ScoreThreshold; // 40
var highestScore_1 = 40; // 40
console.log("highestScore_1==" + highestScore_1);
console.log("scores==" + scores);
scores.forEach(function (s, i) {
var highestScore_1 = 40; // 40
// console.log('highestScore_1==' + highestScore_1);
// console.log('scores==' + scores);
scores.forEach(function(s, i) {
if (s > highestScore_1) {
highestScore_1 = s;
higestIndex_1 = indices[i];
......@@ -581,8 +587,8 @@ export class GrpcCameraService {
});
}
async checkRepeatFinger2 (probe, targets, indices) {
console.log("能进入重复指位验证吗？");
async checkRepeatFinger2(probe, targets, indices) {
// console.log('能进入重复指位验证吗？');
// console.log("probe=="+probe);
// console.log("targets=="+targets);
// console.log("indices=="+indices);
......@@ -590,41 +596,40 @@ export class GrpcCameraService {
// 跳过第一个
if (!targets || !targets.length) {
// debugger
console.log("77777");
// console.log('77777');
// cb(false, -1);
// return;
resolve(false)
resolve(false);
return;
}
console.log("00000");
// console.log('00000');
const req = new Bozorth3Request();
req.setProbe(probe);
req.setTargetsList(targets);
req.setRequestId(this.sessionID);
console.log(req);
this.client.bozorth3(req, null, function (err, message) {
// console.log(req);
this.client.bozorth3(req, null, function(err, message) {
if (err) {
// 在这里处理错误
}
else {
} else {
var scores = message.getScoresList();
console.log("scores==" + scores);
console.log(scores);
// console.log('scores==' + scores);
// console.log(scores);
var higestIndex_1 = -1;
// var highestScore_1 = this.bozorth3ScoreThreshold; // 40
var highestScore_1 = 40; // 40
console.log("highestScore_1==" + highestScore_1);
scores.forEach(function (s, i) {
var highestScore_1 = 40; // 40
// console.log('highestScore_1==' + highestScore_1);
scores.forEach(function(s, i) {
if (s > highestScore_1) {
highestScore_1 = s;
higestIndex_1 = indices[i];
}
});
// cb(higestIndex_1 > -1, higestIndex_1);
resolve(higestIndex_1 > -1, higestIndex_1)
resolve(higestIndex_1 > -1, higestIndex_1);
}
});
})
return result
});
return result;
}
}
src/views/zwxt/fingerprint6.vue
......@@ -1214,6 +1214,7 @@ export default {
*/
let self = this
self.handcaiflag = true
/*********************** */
// 监听刷新，清除session
window.onbeforeunload = function (e) {
......@@ -1367,7 +1368,7 @@ export default {
//console.log(error);
}
}
// canvas
if (this.iBversion.deviceSN) {
this.canvas = document.getElementById("frameImage");
......@@ -1737,27 +1738,40 @@ export default {
*/
async handcai (code, index, type) {
let self = this
this.GrpcCameraService.getVideoStream(code, (imageUrlList, status) => {
// //console.log(imageUrlList);
this.GrpcCameraService.getVideoStream(code, (imageUrlList, status, that) => {
self.fingerImg = [imageUrlList]
// //console.log(status);
// console.log(status);
// 采集结束，变化采集预览图片
if (status == 0) {
self.loading = true
// self.loading = true
// setTimeout(() => {
// self.fingerImg = ''
// }, 6000);
}
// todo 修改手动采集
document.addEventListener('keyup', async (e) => {
e.preventDefault()
if (e.code === 'Space') {
if(self.handcaiflag) {
setTimeout(()=>{
self.loading = true
that.audioPlay('/video/gathering.mp3');
that.stopVideoStream()
self.handcaiflag = true;
},200);
}
self.handcaiflag = false;
}
})
})
let captureImage = await this.GrpcCameraService.captureImage2(code)
// //console.log(captureImage)
let captureImage = await self.GrpcCameraService.captureImage2(code)
if (captureImage) {
// 右手
if (type == 'r') {
// 交叉验证
let result = null
if (this.version.SupportNbis && self.checkList.indexOf('指纹交叉验证') != -1) {
result = await this.GrpcCameraService.checkRepeatFinger2(captureImage.getPlainMinutiae(), self.targets, self.indices)
if (self.version.SupportNbis && self.checkList.indexOf('指纹交叉验证') != -1) {
result = await self.GrpcCameraService.checkRepeatFinger2(captureImage.getPlainMinutiae(), self.targets, self.indices)
if (result) {
self.GrpcCameraService.stopVideoStream()
self.GrpcCameraService.audioPlay(`/video/please_not_repeat.mp3`)
......@@ -1771,8 +1785,8 @@ export default {
}
// TODO
// 先md5校验，然后调用接口传入图片数据和md5校验
let rollMd5 = this.checkMd5(captureImage.getRolledFrame_asB64())
let plainMd5 = this.checkMd5(captureImage.getPlainFrame_asB64())
let rollMd5 = self.checkMd5(captureImage.getRolledFrame_asB64())
let plainMd5 = self.checkMd5(captureImage.getPlainFrame_asB64())
let paramsR = new URLSearchParams()
paramsR.append('rybh', self.rybh);
......@@ -1786,7 +1800,7 @@ export default {
data: paramsR
}).then(resR => {
if (resR.status == 200) {
this.$message.success(resR.data)
self.$message.success(resR.data)
}
})
......@@ -1802,7 +1816,7 @@ export default {
data: paramsL
}).then(resL => {
if (resL.status == 200) {
this.$message.success(resL.data)
self.$message.success(resL.data)
}
})
......@@ -1938,8 +1952,8 @@ export default {
// 左手
// 交叉验证
let result = null
if (this.version.SupportNbis && self.checkList.indexOf('指纹交叉验证') != -1) {
result = await this.GrpcCameraService.checkRepeatFinger2(captureImage.getPlainMinutiae(), self.targets, self.indices)
if (self.version.SupportNbis && self.checkList.indexOf('指纹交叉验证') != -1) {
result = await self.GrpcCameraService.checkRepeatFinger2(captureImage.getPlainMinutiae(), self.targets, self.indices)
if (result) {
self.GrpcCameraService.stopVideoStream()
// await self.GrpcCameraService.audioPlay2(`/video/please_not_repeat.mp3`)
......@@ -1953,8 +1967,8 @@ export default {
}
}
// 先md5校验，然后调用接口传入图片数据和md5校验
let rollMd5 = this.checkMd5(captureImage.getRolledFrame_asB64())
let plainMd5 = this.checkMd5(captureImage.getPlainFrame_asB64())
let rollMd5 = self.checkMd5(captureImage.getRolledFrame_asB64())
let plainMd5 = self.checkMd5(captureImage.getPlainFrame_asB64())
let paramsR = new URLSearchParams()
paramsR.append('rybh', self.rybh);
......@@ -1968,7 +1982,7 @@ export default {
data: paramsR
}).then(resR => {
if (resR.status == 200) {
this.$message.success(resR.data)
self.$message.success(resR.data)
}
})
......@@ -1984,7 +1998,7 @@ export default {
data: paramsL
}).then(resL => {
if (resL.status == 200) {
this.$message.success(resL.data)
self.$message.success(resL.data)
}
})
......@@ -8342,7 +8356,7 @@ export default {
/**
* @description: 关闭采集失败弹窗
* @return {*}
*/
*/
closeUploadingError() {
// 开始上传
this.percentage = 0
......
vue.config.js
......@@ -127,8 +127,8 @@ module.exports = {
"/apiDelImg": {
// target: "http://47.92.226.24:8091/", //统一的请求头部每次修改都要重启才会生效
// target: "http://192.168.128.105:8091", //新系统
target: "http://172.18.109.63:8091", //新系统
// target: "http://127.0.0.1:8091", //新系统
// target: "http://172.18.109.63:8091", //新系统
target: "http://127.0.0.1:8091", //新系统
ws: true,
changeOrigin: true,
pathRewrite: {
......
yarn.lock
This source diff could not be displayed because it is too large. You can view the blob instead.
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