Skip to content

F
founder_vue
Commit 88f946b7 by 张超军
Options

Merge branch 'dev_zwxt' of http://39.99.224.27:9022/changchao/founder_vue into dev_zwxt

parents 85dd277e 3d9521cd
Showing with 684 additions and 349 deletions
src/api/base.js
/*
* @Author: your name
* @Date: 2022-02-18 14:48:35
* @LastEditTime: 2022-04-13 11:12:49
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\api\base.js
*/
var relUrlIp = window.location.host.substring(
0,
window.location.host.length - 5
......@@ -5,22 +13,23 @@ var relUrlIp = window.location.host.substring(
let base = {
BaseURL:'',
};
if (relUrlIp == "133.8.5.1"||
relUrlIp == "68.174.69.46" ||
relUrlIp == "68.175.7.118" ||
relUrlIp == "65.65.100.205" ||
relUrlIp == "68.175.7.150" ||
relUrlIp == "68.175.7.95" ||
relUrlIp == "68.174.25.98" ||
relUrlIp == "26.8.175.240" ||
relUrlIp == "133.8.5.67" ||
relUrlIp == "26.3.13.120") {
//------------------------------刑侦字典服务路径**公安网**--------------------------------
base.BaseURL="/apiZwxtGaw"
} else{
//------------------------------刑侦字典服务路径**阿里云**--------------------------------
base.BaseURL="/apiZwxt"
}
// if (relUrlIp == "133.8.5.1"||
// relUrlIp == "68.174.69.46" ||
// relUrlIp == "68.175.7.118" ||
// relUrlIp == "65.65.100.205" ||
// relUrlIp == "68.175.7.150" ||
// relUrlIp == "68.175.7.95" ||
// relUrlIp == "68.174.25.98" ||
// relUrlIp == "26.8.175.240" ||
// relUrlIp == "133.8.5.67" ||
// relUrlIp == "26.3.13.120") {
// //------------------------------刑侦字典服务路径**公安网**--------------------------------
// base.BaseURL="/apiZwxtGaw"
// } else{
// //------------------------------刑侦字典服务路径**阿里云**--------------------------------
// // base.BaseURL="/apiZwxt"
// base.BaseURL = 'http://localhost:8080'
// }
base.BaseURL = 'http://localhost:8080'
export default base;
src/main.js
/*
* @Author: your name
* @Date: 2021-06-15 15:12:19
* @LastEditTime: 2021-09-27 10:33:28
* @LastEditors: Please set LastEditors
* @LastEditTime: 2022-06-15 18:24:14
* @LastEditors: error: git config user.name && git config user.email & please set dead value or install git
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\main.js
*/
......@@ -28,7 +28,28 @@ import axios from 'axios'
axios.defaults.retry = 9;
axios.defaults.retryDelay = 1000;
axios.interceptors.response.use(undefined, function axiosRetryInterceptor (err) {
axios.interceptors.request.use(
function (config) {
if (config.url == '/apiDelImg/dealImgStr') {
sessionStorage.setItem('dealImgStr', 1)
}
console.log(1);
return config;
},
function (error) {
// NProgress.start();
// Do something with request error
return Promise.reject(error);
}
);
axios.interceptors.response.use(function(response) {
if (response.config.url == '/apiDelImg/dealImgStr') {
sessionStorage.setItem('dealImgStr', 0)
console.log(0);
}
return response;
}, function axiosRetryInterceptor (err) {
var config = err.config;
// If config does not exist or the retry option is not set, reject
if (!config || !config.retry) return Promise.reject(err);
......
src/router/modules/index.js
export default[
{
path: "/",
redirect: "/fingerprintIndex6/R430yyuiury562016095020/张三"
redirect: "/fingerprintIndex6/R4301234567562016111111/张三"
},
{
path: "/fingerprintIndex",
......
src/views/zwxt/fingerprint6.vue
......@@ -41,7 +41,7 @@
</el-checkbox-group>
</div>
<!-- 音量 -->
<div class="light">
<div class="light" v-show="version.DeviceSn">
<div class="light-text">
音量：<span>{{ lightvalue }}</span>
</div>
......@@ -52,14 +52,14 @@
<!-- 对比度 -->
<div class="light contrast">
<div class="light-text">
对比度：<span>{{ contrastvalue }}</span>
对比度：<span>{{ contrastvalue == -1 ? '自动' : contrastvalue }}</span>
</div>
<div class="block">
<el-slider v-model="contrastvalue" :show-tooltip="false" :max="34"></el-slider>
<el-slider v-model="contrastvalue" :show-tooltip="false" :min="-1" :max="34"></el-slider>
</div>
</div>
<!-- 视频 -->
<div class="movie" @click="playFn" style="opacity: 0;">
<div class="movie" @click="playFn" :style="{opacity: playFnOpacity}">
<span class="iconfont icon-bofang" v-show="!isPlay"></span>
<video v-show="isPlay" ref="video" :src="videoSrc" controls muted></video>
</div>
......@@ -445,8 +445,8 @@
</div>
<div class="block second">
<span class="light">对比度：</span>
<el-slider class="line" v-model="contrastvalue" :show-tooltip="false" :max="34"></el-slider>
<span>{{ contrastvalue }}</span>
<el-slider class="line" v-model="contrastvalue" :show-tooltip="false" :min="-1" :max="34"></el-slider>
<span>{{ contrastvalue == -1 ? '自动' : contrastvalue }}</span>
</div>
</div>
</div>
......@@ -473,9 +473,9 @@
</div>
<div class="block second">
<span class="light">对比度：</span>
<el-slider class="line" v-model="contrastvalue" :max="34" :show-tooltip="false">
<el-slider class="line" v-model="contrastvalue" :min="-1" :max="34" :show-tooltip="false">
</el-slider>
<span>{{ contrastvalue }}</span>
<span>{{ contrastvalue == -1 ? '自动' : contrastvalue }}</span>
</div>
<el-checkbox-group class="checks" v-model="pictureType">
<el-checkbox label="图像翻转" class="flip"></el-checkbox>
......@@ -603,7 +603,7 @@
<div class="uploading-error" v-show="uploadingClose == 'uploadingError'">
<img src="../../assets/img/zw/uploading-error.png" alt="">
<div class="uploading-error-title">指纹上传失败</div>
<div class="uploading-error-tip">页面将在3秒后自动关闭</div>
<div class="uploading-error-tip">弹窗将在3秒后自动关闭</div>
</div>
</div>
......@@ -756,8 +756,8 @@ export default {
}],
value: '干燥指纹',
checkList: ['指纹交叉验证', '随时中止采集'],
lightvalue: 10,
contrastvalue: 20,
lightvalue: 80,
contrastvalue: -1,
// 是否显示视频播放
isPlay: false,
// 视频路径
......@@ -965,7 +965,7 @@ export default {
// 判断是否采集成功的标志
flag: true,
// 默认分数
defaultScore: 0,
defaultScore: 60,
// 最后保存的图片数据
fingerPic: [],
// 设置弹窗
......@@ -991,13 +991,13 @@ export default {
// 图片后缀名
suffix: '.bmp',
settingData: [{
score: 0
score: 60
},
{
lightvalue: 0
},
{
contrastvalue: 0
contrastvalue: -1
},
],
// 采集状态
......@@ -1047,87 +1047,87 @@ export default {
// 文件参数
packageHeader: {
version: 'FPT0500',
createTime: '20210812100029',
createTime: '',
originSystem: 'AFIS',
fsdw_gajgjgdm: '122222222222',
fsdw_gajgjgdm: '',
fsdw_gajgmc: '方正',
fsdw_xtlx: '2900',
fsr_xm: '张三',
fsr_gmsfhm: '130148888222115551',
fsr_lxdh: '17703263321'
fsr_xm: '',
fsr_gmsfhm: '',
fsr_lxdh: ''
},
collectInfoMsg: {
zwbdxtlxms: '2900',
nydw_gajgjgdm: '140926000000',
nydw_gajgmc: '静乐县公安局',
nyry_xm: '李志宏',
nyry_gmsfhm: '140123197510240014',
nyry_lxdh: '13363514840',
nysj: '20210318000000'
zwbdxtlxms: '',
nydw_gajgjgdm: '',
nydw_gajgmc: '',
nyry_xm: '',
nyry_gmsfhm: '',
nyry_lxdh: '',
nysj: ''
},
descriptiveMsg: {
ysxt_asjxgrybh: this.$route.params.rybh,
jzrybh: '',
asjxgrybh: this.$route.params.rybh,
zzhwkbh: this.$route.params.rybh,
hjdz_xzqhdm: '1',
hjdz_dzmc: '1',
xzz_xzqhdm: '1',
xzz_dzmc: '1',
xm: 'qq',
bmch: '1',
xbdm: '1',
csrq: '20210812100029',
gjdm: '1',
hjdz_xzqhdm: '',
hjdz_dzmc: '',
xzz_xzqhdm: '',
xzz_dzmc: '',
xm: '',
bmch: '',
xbdm: '',
csrq: '',
gjdm: '',
mzdm: '',
cyzjdm: '',
zjhm: '130481199801123225',
zjhm: '',
bz: '',
cjxxyydm: ''
},
fingerMsg: {
zzhwtztqfsdm: 'A',
zzhwqsqkdm: '0',
zwwxzfl_zwwxdm: '9',
zwwxffl_zwwxdm: '9',
zwfx_tzfx: '9',
zwfx_tzfxfw: '9',
zwzxd_tzxzb: '9',
zwzxd_tzyzb: '9',
zwzxd_tzzbfw: '9',
zwzxd_tzfx: '9',
zwzxd_tzfxfw: '9',
zwzxd_tzkkd: '9',
zwfzx_tzxzb: '9',
zwfzx_tzyzb: '9',
zwfzx_tzzbfw: '9',
zwfzx_tzfx: '9',
zwfzx_tzfxfw: '9',
zwfzx_tzkkd: '9',
zwzsj_tzxzb: '9',
zwzsj_tzyzb: '9',
zwzsj_tzzbfw: '9',
zwzsj_tzfx: '9',
zwzsj_tzfxfw: '9',
zwzsj_tzkkd: '9',
zwysj_tzxzb: '9',
zwysj_tzyzb: '9',
zwysj_tzzbfw: '9',
zwysj_tzfx: '9',
zwysj_tzfxfw: '9',
zwysj_tzkkd: '9',
zzhwtztqfsdm: '',
zzhwqsqkdm: '',
zwwxzfl_zwwxdm: '',
zwwxffl_zwwxdm: '',
zwfx_tzfx: '',
zwfx_tzfxfw: '',
zwzxd_tzxzb: '',
zwzxd_tzyzb: '',
zwzxd_tzzbfw: '',
zwzxd_tzfx: '',
zwzxd_tzfxfw: '',
zwzxd_tzkkd: '',
zwfzx_tzxzb: '',
zwfzx_tzyzb: '',
zwfzx_tzzbfw: '',
zwfzx_tzfx: '',
zwfzx_tzfxfw: '',
zwfzx_tzkkd: '',
zwzsj_tzxzb: '',
zwzsj_tzyzb: '',
zwzsj_tzzbfw: '',
zwzsj_tzfx: '',
zwzsj_tzfxfw: '',
zwzsj_tzkkd: '',
zwysj_tzxzb: '',
zwysj_tzyzb: '',
zwysj_tzzbfw: '',
zwysj_tzfx: '',
zwysj_tzfxfw: '',
zwysj_tzkkd: '',
minutiaSet: '',
zw_zdyxx: '9',
zw_zdyxx: '',
zw_txspfxcd: '640',
zw_txczfxcd: '640',
zw_txfbl: '500',
zw_txysffms: '0000',
zw_txysffms: '',
// 图片打分
// zw_txzl: '9',
zwtzd_tzxzb: '9',
zwtzd_tzyzb: '640',
zwtzd_tzfx: '9',
zwtzd_tzzl: '9'
zwtzd_tzxzb: '',
zwtzd_tzyzb: '',
zwtzd_tzfx: '',
zwtzd_tzzl: ''
},
// 人员编号
rybh: this.$route.params.rybh,
......@@ -1156,7 +1156,9 @@ export default {
SupportNbis: false,
SupportNfiq2: false,
// 设备，调节音量需要使用
GrpcCameraService: null
GrpcCameraService: null,
// 视频透明度
playFnOpacity: 0
}
},
components: {
......@@ -1213,6 +1215,11 @@ export default {
let self = this
/*********************** */
// 监听刷新，清除session
window.onbeforeunload = function (e) {
//清除sessionStorage值
sessionStorage.clear()
}
function getIPs (callback) {
var ip_dups = {};
//compatibility for firefox and chrome
......@@ -1379,30 +1386,32 @@ export default {
// ip
this.deviceModel = 'MQ - A1'
this.deviceSn = this.version.DeviceSn.split('_')[1]
this.playFnOpacity = 1
this.pop = true
this.isAlter = true
this.errTitle = 'IP校验'
this.errDescription = '正在校验IP中。。。'
let machineRes = await axios({
url: '/apiMachine/checkClientVp',
method: 'post',
params: {
ip: self.ip,
sbbh: self.deviceSn,
sblx: 1
}
})
// let machineRes = await axios({
// url: '/apiMachine/checkClientVp',
// method: 'post',
// params: {
// ip: self.ip,
// sbbh: self.deviceSn,
// sblx: 1
// }
// })
// //console.log(machineRes);
if (machineRes.data.success) {
// if (true) {
// if (machineRes.data.success) {
if (true) {
this.pop = false
this.isAlter = false
this.errTitle = ''
this.errDescription = ''
// 发送服务器成功
NProgress.done();
// this.getPersonInfo()
} else {
this.pop = true
this.isAlter = true
......@@ -1412,6 +1421,7 @@ export default {
}
} else if (this.iBversion.deviceSN) {
// iB
this.playFnOpacity = 0
this.pop = false
this.isAlter = false
// 获取到SN序列号，ip地址，发送到服务器
......@@ -1439,6 +1449,7 @@ export default {
this.errDescription = ''
// 发送服务器成功
NProgress.done();
// this.getPersonInfo()
} else {
this.pop = true
this.isAlter = true
......@@ -1455,7 +1466,7 @@ export default {
this.errDescription = '无法获取到设备信息'
NProgress.done();
}
this.getPersonInfo()
// this.getPersonInfo()
},
methods: {
/**
......@@ -1570,7 +1581,7 @@ export default {
cyzjdm: '111',
bz: '',
cjxxyydm: '02'
},
},
*/
let time = null
......@@ -1616,7 +1627,7 @@ export default {
// //console.log(self.fingersLeft);
}
}).catch(err => {
})
},
/**
......@@ -1721,7 +1732,7 @@ export default {
if (type == 'r') {
// 交叉验证
let result = null
if (this.version.SupportNbis && this.checkList[0] == '指纹交叉验证') {
if (this.version.SupportNbis && this.checkList.indexOf('指纹交叉验证') != -1) {
result = await this.GrpcCameraService.checkRepeatFinger2(captureImage.getPlainMinutiae(), self.targets, self.indices)
if (result) {
self.GrpcCameraService.stopVideoStream()
......@@ -1903,7 +1914,7 @@ export default {
// 左手
// 交叉验证
let result = null
if (this.version.SupportNbis && this.checkList[0] == '指纹交叉验证') {
if (this.version.SupportNbis && this.checkList.indexOf('指纹交叉验证') != -1) {
result = await this.GrpcCameraService.checkRepeatFinger2(captureImage.getPlainMinutiae(), self.targets, self.indices)
if (result) {
self.GrpcCameraService.stopVideoStream()
......@@ -2169,7 +2180,18 @@ export default {
self.clickTimes = 0; // 单击清零
// 触发单击事件...
// alert(1)
self.lookFinger(finger, index, type)
// 滚动
if (type == 'r') {
if (finger.imgSrcR) {
self.lookFinger(finger, index, type)
}
} else {
// 平面
if (finger.imgSrcL) {
self.lookFinger(finger, index, type)
}
}
// self.lookFinger(finger, index, type)
}
}, 300)
if (self.clickTimes === 2) { //当点击次数为2
......@@ -2843,7 +2865,7 @@ export default {
}
// 交叉验证
let result = null
if (this.version.SupportNbis && this.checkList[0] == '指纹交叉验证' && finger.getPlainMinutiae) {
if (this.version.SupportNbis && this.checkList.indexOf('指纹交叉验证') != -1 && finger.getPlainMinutiae) {
result = await this.GrpcCameraService.checkRepeatFinger2(finger.getPlainMinutiae(), self.targets, self.indices)
if (result) {
self.GrpcCameraService.stopVideoStream()
......@@ -3150,7 +3172,7 @@ export default {
}
// 交叉验证
let result = null
if (this.version.SupportNbis && this.checkList[0] == '指纹交叉验证' && finger.getPlainMinutiae) {
if (this.version.SupportNbis && this.checkList.indexOf('指纹交叉验证') != -1 && finger.getPlainMinutiae) {
result = await this.GrpcCameraService.checkRepeatFinger2(finger.getPlainMinutiae(), self.targets, self.indices)
if (result) {
self.GrpcCameraService.stopVideoStream()
......@@ -3476,7 +3498,7 @@ export default {
}
// 交叉验证
let result = null
if (this.version.SupportNbis && this.checkList[0] == '指纹交叉验证' && finger.getPlainMinutiae) {
if (this.version.SupportNbis && this.checkList.indexOf('指纹交叉验证') != -1 && finger.getPlainMinutiae) {
result = await this.GrpcCameraService.checkRepeatFinger2(finger.getPlainMinutiae(), self.targets, self.indices)
if (result) {
self.GrpcCameraService.stopVideoStream()
......@@ -3787,7 +3809,7 @@ export default {
}
// 交叉验证
let result = null
if (this.version.SupportNbis && this.checkList[0] == '指纹交叉验证' && finger.getPlainMinutiae) {
if (this.version.SupportNbis && this.checkList.indexOf('指纹交叉验证') != -1 && finger.getPlainMinutiae) {
result = await this.GrpcCameraService.checkRepeatFinger2(finger.getPlainMinutiae(), self.targets, self.indices)
if (result) {
self.GrpcCameraService.stopVideoStream()
......@@ -4066,7 +4088,7 @@ export default {
//console.log(this.getStatus);
//console.log(this.preIndex);
//console.log(this.preStatusL);
if (!this.getStatus && this.preStatusL != 4 && this.preStatusR != 4 && this.preStatusL != 3 && this.preStatusR != 3 && this.preStatusL != 2 && this.preStatusR != 2) {
if (!this.getStatus && this.preStatusL != 4 && this.preStatusR != 4 && this.preStatusL != 3 && this.preStatusR != 3 && this.preStatusL != 2 && this.preStatusR != 2 && this.preStatusL != 1 && this.preStatusR != 1) {
// 关闭设备
if (this.GrpcCameraService) {
this.GrpcCameraService.stopVideoStream()
......@@ -5488,90 +5510,178 @@ export default {
//console.log("success");
//console.log(data);
if (data.hasOwnProperty("singleFlatFinger")) {
// 与滚动指位重复
if (data.singleFlatFinger.isDuplicated) {
if (data.singleFlatFinger.duplicatedFingerIndex != rightList[index].code) {
// 与滚动指位对应不上
// self.$notify({
// title: '警告',
// // message: `与滚动指位不对应！`,
// message: '当前指位重复',
// type: 'warning'
// });
self.$set(rightList[index], 'scoreL', data.singleFlatFinger.nfiq2Score[0])
// 大于及格分
if (rightList[index].scoreL > self.defaultScore) {
self.$refs.rightFinger.children[index].setAttribute('src', self.fingerArr[index])
self.$set(rightList[index], 'statusL', 3)
document.getElementsByTagName('body')[0].style.setProperty('--finger', '#17D010');
self.preStatusL = 3
self.tipType = 'success'
self.showTip()
} else {
// 小于及格分的情况
self.$set(rightList[index], 'statusL', 2)
self.$refs.rightFinger.children[index].setAttribute('src', self.fingerArr[index + 10])
document.getElementsByTagName('body')[0].style.setProperty('--finger', '#ffc005'); // #17D010 #ffc005
self.preStatusL = 2
self.tipType = 'warning'
self.showTip()
}
// TODO
// 先md5校验，然后调用接口传入图片数据和md5校验
let plainMd5 = self.checkMd5(data.singleFlatFinger.saveImage[0])
let paramsL = new URLSearchParams()
paramsL.append('rybh', self.rybh);
paramsL.append('md5str', plainMd5);
paramsL.append('filename', "" + (index + 1) + ".bmp," + (index + 10 + 1) + ".bmp");
paramsL.append('rollimgstr', null);//这里可为null
paramsL.append('plaimimgstr', data.singleFlatFinger.saveImage[0]);//这里可为null
axios({
url: '/apiDelImg/saveFingerImg',
method: 'post',
data: paramsL
}).then(resL => {
if (resL.status == 200) {
// self.$message.success(resL.data)
if (self.checkList.indexOf('指纹交叉验证') != -1) {
// 与滚动指位重复
if (data.singleFlatFinger.isDuplicated) {
if (data.singleFlatFinger.duplicatedFingerIndex != rightList[index].code) {
// 与滚动指位对应不上
// self.$notify({
// title: '警告',
// // message: `与滚动指位不对应！`,
// message: '当前指位重复',
// type: 'warning'
// });
self.$set(rightList[index], 'scoreL', data.singleFlatFinger.nfiq2Score[0])
// 大于及格分
if (rightList[index].scoreL > self.defaultScore) {
self.$refs.rightFinger.children[index].setAttribute('src', self.fingerArr[index])
self.$set(rightList[index], 'statusL', 3)
document.getElementsByTagName('body')[0].style.setProperty('--finger', '#17D010');
self.preStatusL = 3
self.tipType = 'success'
self.showTip()
} else {
// 小于及格分的情况
self.$set(rightList[index], 'statusL', 2)
self.$refs.rightFinger.children[index].setAttribute('src', self.fingerArr[index + 10])
document.getElementsByTagName('body')[0].style.setProperty('--finger', '#ffc005'); // #17D010 #ffc005
self.preStatusL = 2
self.tipType = 'warning'
self.showTip()
}
})
self.$set(rightList[index], 'imgSrcL', 'data:image/bmp;base64,' + data.singleFlatFinger.saveImage[0])
// 获取图片处理的结果
let img = rightList[index].imgSrcL.replace(/^data:image\/\w+;base64,/, "");
// let img = item.imgSrcL
let md5str = self.checkMd5(img)
let params = new URLSearchParams();
params.append('rollimgstr', img);
params.append('md5str', md5str);
axios({
method: 'post',
url: '/apiDelImg/dealImgStr',
headers: {
'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8'
},
data: params
}).then(res => {
let cf = self.findCF(Number(rightList[index].code) + 10)
if (cf != null) {
self.fingerPic[cf] = {
zwzwdm: Number(rightList[index].code) + 10,
zw_txsj: res.data,
zw_txzl: rightList[index].scoreL
// TODO
// 先md5校验，然后调用接口传入图片数据和md5校验
let plainMd5 = self.checkMd5(data.singleFlatFinger.saveImage[0])
let paramsL = new URLSearchParams()
paramsL.append('rybh', self.rybh);
paramsL.append('md5str', plainMd5);
paramsL.append('filename', "" + (index + 1) + ".bmp," + (index + 10 + 1) + ".bmp");
paramsL.append('rollimgstr', null);//这里可为null
paramsL.append('plaimimgstr', data.singleFlatFinger.saveImage[0]);//这里可为null
axios({
url: '/apiDelImg/saveFingerImg',
method: 'post',
data: paramsL
}).then(resL => {
if (resL.status == 200) {
// self.$message.success(resL.data)
}
})
self.$set(rightList[index], 'imgSrcL', 'data:image/bmp;base64,' + data.singleFlatFinger.saveImage[0])
// 获取图片处理的结果
let img = rightList[index].imgSrcL.replace(/^data:image\/\w+;base64,/, "");
// let img = item.imgSrcL
let md5str = self.checkMd5(img)
let params = new URLSearchParams();
params.append('rollimgstr', img);
params.append('md5str', md5str);
axios({
method: 'post',
url: '/apiDelImg/dealImgStr',
headers: {
'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8'
},
data: params
}).then(res => {
let cf = self.findCF(Number(rightList[index].code) + 10)
if (cf != null) {
self.fingerPic[cf] = {
zwzwdm: Number(rightList[index].code) + 10,
zw_txsj: res.data,
zw_txzl: rightList[index].scoreL
}
} else {
self.fingerPic.push({ zwzwdm: Number(rightList[index].code) + 10, zw_txsj: res.data, zw_txzl: rightList[index].scoreL })
}
})
setTimeout(() => {
self.fingerImg = ''
self.frameImage = false
resolve({ status: 'repeat' })
}, 500);
} else {
self.$set(rightList[index], 'scoreL', data.singleFlatFinger.nfiq2Score[0])
// 大于及格分
if (rightList[index].scoreL > self.defaultScore) {
self.$refs.rightFinger.children[index].setAttribute('src', self.fingerArr[index])
self.$set(rightList[index], 'statusL', 3)
document.getElementsByTagName('body')[0].style.setProperty('--finger', '#17D010');
self.preStatusL = 3
self.tipType = 'success'
self.showTip()
} else {
self.fingerPic.push({ zwzwdm: Number(rightList[index].code) + 10, zw_txsj: res.data, zw_txzl: rightList[index].scoreL })
// 小于及格分的情况
self.$set(rightList[index], 'statusL', 2)
self.$refs.rightFinger.children[index].setAttribute('src', self.fingerArr[index + 10])
document.getElementsByTagName('body')[0].style.setProperty('--finger', '#ffc005'); // #17D010 #ffc005
self.preStatusL = 2
self.tipType = 'warning'
self.showTip()
}
})
setTimeout(() => {
self.fingerImg = ''
self.frameImage = false
resolve({ status: 'repeat' })
}, 500);
// TODO
// 先md5校验，然后调用接口传入图片数据和md5校验
let plainMd5 = self.checkMd5(data.singleFlatFinger.saveImage[0])
let paramsL = new URLSearchParams()
paramsL.append('rybh', self.rybh);
paramsL.append('md5str', plainMd5);
paramsL.append('filename', "" + (index + 1) + ".bmp," + (index + 10 + 1) + ".bmp");
paramsL.append('rollimgstr', null);//这里可为null
paramsL.append('plaimimgstr', data.singleFlatFinger.saveImage[0]);//这里可为null
axios({
url: '/apiDelImg/saveFingerImg',
method: 'post',
data: paramsL
}).then(resL => {
if (resL.status == 200) {
// self.$message.success(resL.data)
}
})
self.$set(rightList[index], 'imgSrcL', 'data:image/bmp;base64,' + data.singleFlatFinger.saveImage[0])
// 获取图片处理的结果
let img = rightList[index].imgSrcL.replace(/^data:image\/\w+;base64,/, "");
// let img = item.imgSrcL
let md5str = self.checkMd5(img)
let params = new URLSearchParams();
params.append('rollimgstr', img);
params.append('md5str', md5str);
axios({
method: 'post',
url: '/apiDelImg/dealImgStr',
headers: {
'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8'
},
data: params
}).then(res => {
let cf = self.findCF(Number(rightList[index].code) + 10)
if (cf != null) {
self.fingerPic[cf] = {
zwzwdm: Number(rightList[index].code) + 10,
zw_txsj: res.data,
zw_txzl: rightList[index].scoreL
}
} else {
self.fingerPic.push({ zwzwdm: Number(rightList[index].code) + 10, zw_txsj: res.data, zw_txzl: rightList[index].scoreL })
}
})
setTimeout(() => {
self.fingerImg = ''
self.frameImage = false
resolve({ status: 'ok' })
}, 500);
}
// self.$notify({
// title: '重复',
// message: `重复指位${data.singleFlatFinger.duplicatedFingerIndex}`,
// type: 'warning'
// });
} else {
// 没有与之对应的滚动指位
// self.$notify({
// title: '警告',
// // message: `没有重复的滚动指位，请先采集滚动指位！`,
// message: '当前指位重复',
// type: 'warning'
// });
self.$set(rightList[index], 'scoreL', data.singleFlatFinger.nfiq2Score[0])
// 大于及格分
if (rightList[index].scoreL > self.defaultScore) {
......@@ -5643,22 +5753,10 @@ export default {
setTimeout(() => {
self.fingerImg = ''
self.frameImage = false
resolve({ status: 'ok' })
resolve({ status: 'repeat' })
}, 500);
}
// self.$notify({
// title: '重复',
// message: `重复指位${data.singleFlatFinger.duplicatedFingerIndex}`,
// type: 'warning'
// });
} else {
// 没有与之对应的滚动指位
// self.$notify({
// title: '警告',
// // message: `没有重复的滚动指位，请先采集滚动指位！`,
// message: '当前指位重复',
// type: 'warning'
// });
self.$set(rightList[index], 'scoreL', data.singleFlatFinger.nfiq2Score[0])
// 大于及格分
if (rightList[index].scoreL > self.defaultScore) {
......@@ -5730,9 +5828,10 @@ export default {
setTimeout(() => {
self.fingerImg = ''
self.frameImage = false
resolve({ status: 'repeat' })
resolve({ status: 'ok' })
}, 500);
}
}
}
......@@ -5837,90 +5936,178 @@ export default {
}
if (data.phase == "Succeeded") {
if (data.hasOwnProperty("singleFlatFinger")) {
// 与滚动指位重复
if (data.singleFlatFinger.isDuplicated) {
if (data.singleFlatFinger.duplicatedFingerIndex != leftList[index - 5].code) {
// 与滚动指位对应不上
// self.$notify({
// title: '警告',
// // message: `与滚动指位不对应！`,
// message: '当前指位重复',
// type: 'warning'
// });
self.$set(leftList[index - 5], 'scoreL', data.singleFlatFinger.nfiq2Score[0])
// 大于及格分
if (leftList[index - 5].scoreL > self.defaultScore) {
self.$refs.leftFinger.children[index - 5].setAttribute('src', self.fingerArr[index])
self.$set(leftList[index - 5], 'statusL', 3)
document.getElementsByTagName('body')[0].style.setProperty('--finger', '#17D010');
self.preStatusL = 3
self.tipType = 'success'
self.showTip()
} else {
// 小于及格分的情况
self.$set(leftList[index - 5], 'statusL', 2)
self.$refs.leftFinger.children[index - 5].setAttribute('src', self.fingerArr[index + 10])
document.getElementsByTagName('body')[0].style.setProperty('--finger', '#ffc005'); // #17D010 #ffc005
self.preStatusL = 2
self.tipType = 'warning'
self.showTip()
}
// TODO
// 先md5校验，然后调用接口传入图片数据和md5校验
let plainMd5 = self.checkMd5(data.singleFlatFinger.saveImage[0])
let paramsL = new URLSearchParams()
paramsL.append('rybh', self.rybh);
paramsL.append('md5str', plainMd5);
paramsL.append('filename', "" + (index + 1) + ".bmp," + (index + 10 + 1) + ".bmp");
paramsL.append('rollimgstr', null);//这里可为null
paramsL.append('plaimimgstr', data.singleFlatFinger.saveImage[0]);//这里可为null
axios({
url: '/apiDelImg/saveFingerImg',
method: 'post',
data: paramsL
}).then(resL => {
if (resL.status == 200) {
// self.$message.success(resL.data)
if (self.checkList.indexOf('指纹交叉验证') != -1) {
// 与滚动指位重复
if (data.singleFlatFinger.isDuplicated) {
if (data.singleFlatFinger.duplicatedFingerIndex != leftList[index - 5].code) {
// 与滚动指位对应不上
// self.$notify({
// title: '警告',
// // message: `与滚动指位不对应！`,
// message: '当前指位重复',
// type: 'warning'
// });
self.$set(leftList[index - 5], 'scoreL', data.singleFlatFinger.nfiq2Score[0])
// 大于及格分
if (leftList[index - 5].scoreL > self.defaultScore) {
self.$refs.leftFinger.children[index - 5].setAttribute('src', self.fingerArr[index])
self.$set(leftList[index - 5], 'statusL', 3)
document.getElementsByTagName('body')[0].style.setProperty('--finger', '#17D010');
self.preStatusL = 3
self.tipType = 'success'
self.showTip()
} else {
// 小于及格分的情况
self.$set(leftList[index - 5], 'statusL', 2)
self.$refs.leftFinger.children[index - 5].setAttribute('src', self.fingerArr[index + 10])
document.getElementsByTagName('body')[0].style.setProperty('--finger', '#ffc005'); // #17D010 #ffc005
self.preStatusL = 2
self.tipType = 'warning'
self.showTip()
}
})
self.$set(leftList[index - 5], 'imgSrcL', 'data:image/bmp;base64,' + data.singleFlatFinger.saveImage[0])
// 获取图片处理的结果
let img = leftList[index - 5].imgSrcL.replace(/^data:image\/\w+;base64,/, "");
// let img = item.imgSrcL
let md5str = self.checkMd5(img)
let params = new URLSearchParams();
params.append('rollimgstr', img);
params.append('md5str', md5str);
axios({
method: 'post',
url: '/apiDelImg/dealImgStr',
headers: {
'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8'
},
data: params
}).then(res => {
let cf = self.findCF(Number(leftList[index - 5].code) + 10)
if (cf != null) {
self.fingerPic[cf] = {
zwzwdm: Number(leftList[index - 5].code) + 10,
zw_txsj: res.data,
zw_txzl: leftList[index - 5].scoreL
// TODO
// 先md5校验，然后调用接口传入图片数据和md5校验
let plainMd5 = self.checkMd5(data.singleFlatFinger.saveImage[0])
let paramsL = new URLSearchParams()
paramsL.append('rybh', self.rybh);
paramsL.append('md5str', plainMd5);
paramsL.append('filename', "" + (index + 1) + ".bmp," + (index + 10 + 1) + ".bmp");
paramsL.append('rollimgstr', null);//这里可为null
paramsL.append('plaimimgstr', data.singleFlatFinger.saveImage[0]);//这里可为null
axios({
url: '/apiDelImg/saveFingerImg',
method: 'post',
data: paramsL
}).then(resL => {
if (resL.status == 200) {
// self.$message.success(resL.data)
}
})
self.$set(leftList[index - 5], 'imgSrcL', 'data:image/bmp;base64,' + data.singleFlatFinger.saveImage[0])
// 获取图片处理的结果
let img = leftList[index - 5].imgSrcL.replace(/^data:image\/\w+;base64,/, "");
// let img = item.imgSrcL
let md5str = self.checkMd5(img)
let params = new URLSearchParams();
params.append('rollimgstr', img);
params.append('md5str', md5str);
axios({
method: 'post',
url: '/apiDelImg/dealImgStr',
headers: {
'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8'
},
data: params
}).then(res => {
let cf = self.findCF(Number(leftList[index - 5].code) + 10)
if (cf != null) {
self.fingerPic[cf] = {
zwzwdm: Number(leftList[index - 5].code) + 10,
zw_txsj: res.data,
zw_txzl: leftList[index - 5].scoreL
}
} else {
self.fingerPic.push({ zwzwdm: Number(leftList[index - 5].code) + 10, zw_txsj: res.data, zw_txzl: leftList[index - 5].scoreL })
}
})
setTimeout(() => {
self.fingerImg = ''
self.frameImage = false
resolve({ status: 'repeat' })
}, 500);
} else {
self.$set(leftList[index - 5], 'scoreL', data.singleFlatFinger.nfiq2Score[0])
// 大于及格分
if (leftList[index - 5].scoreL > self.defaultScore) {
self.$refs.leftFinger.children[index - 5].setAttribute('src', self.fingerArr[index])
self.$set(leftList[index - 5], 'statusL', 3)
document.getElementsByTagName('body')[0].style.setProperty('--finger', '#17D010');
self.preStatusL = 3
self.tipType = 'success'
self.showTip()
} else {
self.fingerPic.push({ zwzwdm: Number(leftList[index - 5].code) + 10, zw_txsj: res.data, zw_txzl: leftList[index - 5].scoreL })
// 小于及格分的情况
self.$set(leftList[index - 5], 'statusL', 2)
self.$refs.leftFinger.children[index - 5].setAttribute('src', self.fingerArr[index + 10])
document.getElementsByTagName('body')[0].style.setProperty('--finger', '#ffc005'); // #17D010 #ffc005
self.preStatusL = 2
self.tipType = 'warning'
self.showTip()
}
})
setTimeout(() => {
self.fingerImg = ''
self.frameImage = false
resolve({ status: 'repeat' })
}, 500);
// TODO
// 先md5校验，然后调用接口传入图片数据和md5校验
let plainMd5 = self.checkMd5(data.singleFlatFinger.saveImage[0])
let paramsL = new URLSearchParams()
paramsL.append('rybh', self.rybh);
paramsL.append('md5str', plainMd5);
paramsL.append('filename', "" + (index + 1) + ".bmp," + (index + 10 + 1) + ".bmp");
paramsL.append('rollimgstr', null);//这里可为null
paramsL.append('plaimimgstr', data.singleFlatFinger.saveImage[0]);//这里可为null
axios({
url: '/apiDelImg/saveFingerImg',
method: 'post',
data: paramsL
}).then(resL => {
if (resL.status == 200) {
// self.$message.success(resL.data)
}
})
self.$set(leftList[index - 5], 'imgSrcL', 'data:image/bmp;base64,' + data.singleFlatFinger.saveImage[0])
// 获取图片处理的结果
let img = leftList[index - 5].imgSrcL.replace(/^data:image\/\w+;base64,/, "");
// let img = item.imgSrcL
let md5str = self.checkMd5(img)
let params = new URLSearchParams();
params.append('rollimgstr', img);
params.append('md5str', md5str);
axios({
method: 'post',
url: '/apiDelImg/dealImgStr',
headers: {
'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8'
},
data: params
}).then(res => {
let cf = self.findCF(Number(leftList[index - 5].code) + 10)
if (cf != null) {
self.fingerPic[cf] = {
zwzwdm: Number(leftList[index - 5].code) + 10,
zw_txsj: res.data,
zw_txzl: leftList[index - 5].scoreL
}
} else {
self.fingerPic.push({ zwzwdm: Number(leftList[index - 5].code) + 10, zw_txsj: res.data, zw_txzl: leftList[index - 5].scoreL })
}
})
setTimeout(() => {
self.fingerImg = ''
self.frameImage = false
resolve({ status: 'ok' })
}, 500);
}
// self.$notify({
// title: '重复',
// message: `重复指位${data.singleFlatFinger.duplicatedFingerIndex}`,
// type: 'warning'
// });
} else {
// 没有与之对应的滚动指位
// self.$notify({
// title: '警告',
// // message: `没有重复的滚动指位，请先采集滚动指位！`,
// message: '当前指位重复',
// type: 'warning'
// });
self.$set(leftList[index - 5], 'scoreL', data.singleFlatFinger.nfiq2Score[0])
// 大于及格分
if (leftList[index - 5].scoreL > self.defaultScore) {
......@@ -5987,27 +6174,16 @@ export default {
} else {
self.fingerPic.push({ zwzwdm: Number(leftList[index - 5].code) + 10, zw_txsj: res.data, zw_txzl: leftList[index - 5].scoreL })
}
})
setTimeout(() => {
self.fingerImg = ''
self.frameImage = false
resolve({ status: 'ok' })
resolve({ status: 'repeat' })
}, 500);
}
// self.$notify({
// title: '重复',
// message: `重复指位${data.singleFlatFinger.duplicatedFingerIndex}`,
// type: 'warning'
// });
} else {
// 没有与之对应的滚动指位
// self.$notify({
// title: '警告',
// // message: `没有重复的滚动指位，请先采集滚动指位！`,
// message: '当前指位重复',
// type: 'warning'
// });
self.$set(leftList[index - 5], 'scoreL', data.singleFlatFinger.nfiq2Score[0])
// 大于及格分
if (leftList[index - 5].scoreL > self.defaultScore) {
......@@ -6074,18 +6250,16 @@ export default {
} else {
self.fingerPic.push({ zwzwdm: Number(leftList[index - 5].code) + 10, zw_txsj: res.data, zw_txzl: leftList[index - 5].scoreL })
}
})
setTimeout(() => {
self.fingerImg = ''
self.frameImage = false
resolve({ status: 'repeat' })
resolve({ status: 'ok' })
}, 500);
}
}
}
// 设备状态 Succeeded Running
if (data.hasOwnProperty("phase")) {
// //console.log(data.phase);
......@@ -6735,7 +6909,7 @@ export default {
if (data.hasOwnProperty("singleRolledFinger")) {
//console.log(data);
// 指位重复
if (data.singleRolledFinger.isDuplicated) {
if (data.singleRolledFinger.isDuplicated && self.checkList.indexOf('指纹交叉验证') != -1) {
//console.log(data);
// self.$notify({
// title: '重复',
......@@ -6994,7 +7168,7 @@ export default {
//console.log(data);
// 重复指位处理
if (data.singleRolledFinger.isDuplicated) {
if (data.singleRolledFinger.isDuplicated && self.checkList.indexOf('指纹交叉验证') != -1) {
// self.$notify({
// title: '重复',
// // message: `重复指位${data.singleRolledFinger.duplicatedFingerIndex}`,
......@@ -8092,6 +8266,10 @@ export default {
if (this.fingerPic.length == 0) {
return;
}
if (sessionStorage.getItem('dealImgStr') == 1) {
this.$message.warning('数据正在处理，请稍后再试！')
return;
}
this.fingersLeftNo = []
this.fingersRightNo = []
if (this.rGdzw.length > 0 || this.rPmzw.length > 0) {
......@@ -8212,6 +8390,7 @@ export default {
}*/
//console.log(this.fingerPic);
// 指纹数据
self.str = '' // 先清空指纹数据
this.fingerPic.map((item) => {
// //console.log(item);
if (item.zwzwdm) {
......@@ -8309,6 +8488,19 @@ export default {
}
// 开始上传
this.percentage = 0
self.isUploadingError = false
self.isShowUploadingTxt = true
self.uploadingClose = 'uploading'
// 指纹上传时的小提示
self.uploadingTip = '上传期间请勿关闭此页面'
// 指纹上传时的标题
self.uploadingTitle = '指纹上传中…'
self.uploadingColor = '#FFFFFF'
// self.uploadingTitle = '指纹上传失败'
this.uploadingStart = true
let timePercentage = setInterval(() => {
this.percentage++
......@@ -8323,6 +8515,10 @@ export default {
}
}, 1000);
// 导出文件到本地
let filenameexport = self.$route.params.rybh
self.exportRaw(`${filenameexport}.fptx`, self.xmlStr)
var params = new URLSearchParams();
params.append('rybh', self.rybh);
params.append('username', self.username);
......@@ -8340,20 +8536,25 @@ export default {
self.uploadingColor = '#E82510'
self.isUploadingError = true
self.isShowUploadingTxt = false
self.uploadingTitle = '指纹上传失败'
self.uploadingTip = '页面将在3秒后自动关闭'
// self.uploadingTitle = '指纹上传失败'
self.uploadingTitle = fingerRes.data
self.uploadingTip = '弹窗将在3秒后自动关闭'
setTimeout(() => {
self.uploadingClose = 'uploadingError'
setTimeout(() => {
if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
window.location.href = "about:blank";
window.close();
} else {
window.opener = null;
window.open("", "_self");
window.close();
}
self.uploadingStart = false
}, 3000);
// setTimeout(() => {
// if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
// window.location.href = "about:blank";
// window.close();
// } else {
// window.opener = null;
// window.open("", "_self");
// window.close();
// }
// }, 3000);
}, 1500);
} else {
// 上传成功！
......@@ -8411,7 +8612,29 @@ export default {
}
zwfkxx = zwfkxx.concat(this.zwfkxxFingerR).concat(this.zwfkxxFingerL).concat('D0E00').concat(this.zwfkxxFace1).concat(this.zwfkxxFace2).concat(this.zwfkxxFace4)
//console.log(zwfkxx);
self.isUploadingFinish = true
self.isShowUploadingTxt = false
self.uploadingTitle = '指纹上传完成'
self.uploadingTip = '页面将在3秒后自动关闭'
setTimeout(() => {
document.getElementsByTagName('body')[0].style.setProperty('--uploadingBorder', '2px');
}, 300);
setTimeout(() => {
self.uploadingClose = 'uploadingFinish'
setTimeout(() => {
if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
window.location.href = "about:blank";
window.close();
} else {
window.opener = null;
window.open("", "_self");
window.close();
}
}, 3000);
}, 1500);
/*
// TODO 湖南协同系统接口
axios({
method: 'post',
......@@ -8424,9 +8647,6 @@ export default {
username: self.username
}
}).then(res => {
// 导出文件到本地
let filenameexport = self.$route.params.rybh
self.exportRaw(`${filenameexport}.fptx`, self.xmlStr)
// console.log(res);
// 上传完成
// self.percentage = 100
......@@ -8456,21 +8676,26 @@ export default {
self.isUploadingError = true
self.isShowUploadingTxt = false
self.uploadingTitle = '指纹上传失败'
self.uploadingTip = '页面将在3秒后自动关闭'
self.uploadingTip = '弹窗将在3秒后自动关闭'
setTimeout(() => {
self.uploadingClose = 'uploadingError'
setTimeout(() => {
if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
window.location.href = "about:blank";
window.close();
} else {
window.opener = null;
window.open("", "_self");
window.close();
}
self.uploadingStart = false
}, 3000);
// setTimeout(() => {
// if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
// window.location.href = "about:blank";
// window.close();
// } else {
// window.opener = null;
// window.open("", "_self");
// window.close();
// }
// }, 3000);
}, 1500);
})
*/
}
......@@ -8766,6 +8991,82 @@ export default {
this.suffix = '.jpg'
}
this.defaultScore = this.settingData.score
// 存在在最后采集完毕设置分数后，最后一个指纹的状态没有同步过来
// 之前的指纹的下标
// preIndex: null,
// preIndexR: null,
// preIndexL: null,
console.log(this.preIndexR);
console.log(this.preIndexL);
if (this.preIndexR) {
// 右手滚动
if (this.preIndexR >=0 && this.preIndexR <=4) {
if (this.fingersRight[this.preIndexR].scoreR >= this.defaultScore) {
this.preStatusR = 3
} else {
this.preStatusR = 2
}
}
// 左手滚动
if (this.preIndexR >=5 && this.preIndexR <=9) {
if (this.fingersLeft[this.preIndexR-5].scoreR >= this.defaultScore) {
this.preStatusR = 3
} else {
this.preStatusR = 2
}
}
}
if (this.preIndexL) {
// 右手平面
if (this.preIndexL >=0 && this.preIndexL <=4) {
if (this.fingersRight[this.preIndexL].scoreL >= this.defaultScore) {
this.preStatusL = 3
} else {
this.preStatusL = 2
}
}
// 左手平面
if (this.preIndexL >=5 && this.preIndexL <=9) {
if (this.fingersLeft[this.preIndexL-5].scoreL >= this.defaultScore) {
this.preStatusL = 3
} else {
this.preStatusL = 2
}
}
}
if (this.preIndex) {
// 右手
if (this.preIndex >= 0 && this.preIndex <= 4) {
if (this.fingersRight[this.preIndex].scoreL >= this.defaultScore) {
this.preStatusL = 3
} else {
this.preStatusL = 2
}
if (this.fingersRight[this.preIndex].scoreR >= this.defaultScore) {
this.preStatusR = 3
} else {
this.preStatusR = 2
}
}
// 左手
if (this.preIndex >= 5 && this.preIndex <= 9) {
if (this.fingersLeft[this.preIndex-5].scoreL >= this.defaultScore) {
this.preStatusL = 3
} else {
this.preStatusL = 2
}
if (this.fingersLeft[this.preIndex-5].scoreR >= this.defaultScore) {
this.preStatusR = 3
} else {
this.preStatusR = 2
}
}
}
// 指纹状态重新渲染
this.fingersRight.forEach((item, index) => {
if (item.scoreL != '') {
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-06-15 15:12:19
* @LastEditTime: 2022-02-18 16:14:26
* @LastEditors: Please set LastEditors
* @LastEditTime: 2022-06-16 18:13:29
* @LastEditors: error: git config user.name && git config user.email & please set dead value or install git
* @Description: In User Settings Edit
* @FilePath: \founder_vue\vue.config.js
*/
......@@ -85,7 +85,8 @@ module.exports = {
//******公安網絡 */
// "/apiDelImg": {
// target: "http://65.26.10.99:8091/", //统一的请求头部每次修改都要重启才会生效
// // target: "http://65.26.10.99:8091/", //统一的请求头部每次修改都要重启才会生效
// target: "http://10.184.14.133/", // 海南
// // target: "http://192.168.128.118:9201/", //统一的请求头部每次修改都要重启才会生效
// ws: true,
// changeOrigin: true,
......@@ -94,7 +95,8 @@ module.exports = {
// }
// },
// "/apiMachine": {
// target: "http://65.26.10.121/", //统一的请求头部每次修改都要重启才会生效
// // target: "http://65.26.10.121/", //统一的请求头部每次修改都要重启才会生效
// target: "http://10.184.14.133/", // 海南
// // target: "http://192.168.128.118:9201/", //统一的请求头部每次修改都要重启才会生效
// ws: true,
// changeOrigin: true,
......@@ -103,7 +105,8 @@ module.exports = {
// }
// },
// "/apiInfo": {
// target: "http://65.26.10.121/", // 统一的请求头部每次修改都要重启才会生效
// // target: "http://65.26.10.121/", // 统一的请求头部每次修改都要重启才会生效
// target: "http://10.184.14.133/", // 海南
// // target: "http://192.168.128.118:9201/", //统一的请求头部每次修改都要重启才会生效
// ws: true,
// changeOrigin: true,
......@@ -114,7 +117,8 @@ module.exports = {
// 新系统
"/apiInfo": {
target: "http://47.92.226.24:9080/", //统一的请求头部每次修改都要重启才会生效
// target: "http://47.92.226.24:9080/", //统一的请求头部每次修改都要重启才会生效
target: "http://127.0.0.1:9080/", //统一的请求头部每次修改都要重启才会生效
// target: "http://192.168.128.105:8091", // 新系统
// target: "http://39.103.132.86:9200", // 新系统
ws: true,
......@@ -125,7 +129,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", //新系统
ws: true,
changeOrigin: true,
pathRewrite: {
......@@ -167,24 +172,23 @@ module.exports = {
// '^/apiZwxt': '/'
// }
// },
"/apiZwxt": {
target: "http://localhost:8080/", //统一的请求头部每次修改都要重启才会生效
// target: "http://172.18.108.206:8080/",
ws: true,
changeOrigin: true,
pathRewrite: {
'^/apiZwxt': '/'
}
},
"/apiZwxtGaw": {
target: "http://26.13.5.1:8001/", //公安网案件侦办地址
ws: true,
changeOrigin: true,
pathRewrite: {
'^/api': '/'
}
}
// "/apiZwxt": {
// target: "http://localhost:8080/", //统一的请求头部每次修改都要重启才会生效
// // target: "http://172.18.108.206:8080/",
// ws: true,
// changeOrigin: true,
// pathRewrite: {
// '^/apiZwxt': '/'
// }
// },
// "/apiZwxtGaw": {
// target: "http://26.13.5.1:8001/", //公安网案件侦办地址
// ws: true,
// changeOrigin: true,
// pathRewrite: {
// '^/api': '/'
// }
// }
},
},
css: {
......
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