Skip to content

F
founder_vue
Commit 37e87bfa by 米嘉伟
Options

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

parents 6c592ee4 e8c1abe3
Showing with 588 additions and 191 deletions
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: 2022-01-07 14:04:54 * @LastEditTime: 2022-01-08 10:46:56
* @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
--> -->
...@@ -2105,6 +2105,8 @@ export default { ...@@ -2105,6 +2105,8 @@ export default {
// 更新newHeight和newWidth // 更新newHeight和newWidth
self.newHeight_source = sizeValue.newHeight; self.newHeight_source = sizeValue.newHeight;
self.newWidth_source = sizeValue.newWidth; self.newWidth_source = sizeValue.newWidth;
// 更新图层存的角度值
document.querySelector('.tui-image-editor .upper-canvas').dataset.angle = 0
// 更改canvas图层的宽高样式适配 // 更改canvas图层的宽高样式适配
if (self.newHeight_source >= self.newWidth_source) { if (self.newHeight_source >= self.newWidth_source) {
...@@ -2179,6 +2181,8 @@ export default { ...@@ -2179,6 +2181,8 @@ export default {
// 更新newHeight和newWidth // 更新newHeight和newWidth
self.newWidth_target = sizeValue.newWidth self.newWidth_target = sizeValue.newWidth
self.newHeight_target = sizeValue.newHeight self.newHeight_target = sizeValue.newHeight
// 更新图层存的角度值
document.querySelector('.tui-image-editor2 .upper-canvas').dataset.angle = 0
// console.log(self.newWidth_target); // console.log(self.newWidth_target);
// console.log(self.newHeight_target); // console.log(self.newHeight_target);
...@@ -2340,10 +2344,10 @@ export default { ...@@ -2340,10 +2344,10 @@ export default {
if (this.routeName == 'fhxxTL' || this.routeName == 'fhxxLT' || this.routeName == 'fhxxLL') { if (this.routeName == 'fhxxTL' || this.routeName == 'fhxxLT' || this.routeName == 'fhxxLL') {
this.isFHxx = true this.isFHxx = true
document.getElementsByTagName('body')[0].style.setProperty('--tuiBrushColorPickerRight', '100px'); document.getElementsByTagName('body')[0].style.setProperty('--tuiBrushColorPickerRight', '6.25rem');
} else { } else {
this.isFHxx = false this.isFHxx = false
document.getElementsByTagName('body')[0].style.setProperty('--tuiBrushColorPickerRight', '472px'); document.getElementsByTagName('body')[0].style.setProperty('--tuiBrushColorPickerRight', '29.5rem');
} }
// 更换指掌纹 // 更换指掌纹
......
src/netmgr/NetUtil.js
/*
* @Author: your name
* @Date: 2021-12-24 17:21:54
* @LastEditTime: 2022-01-07 17:44:29
* @LastEditors: your name
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\netmgr\NetUtil.js
*/
import bzxxsh from '../netmgr/bzxxgl/bzxxsh' import bzxxsh from '../netmgr/bzxxgl/bzxxsh'
import drFptx from '../netmgr/drFptx/drFptx' import drFptx from '../netmgr/drFptx/drFptx'
import xtfkgl from '../netmgr/xtfkgl/xtfkgl' import xtfkgl from '../netmgr/xtfkgl/xtfkgl'
import cxyrd from '../netmgr/cxyrd/cxyrd'
export default { export default {
bzxxsh, bzxxsh,
drFptx, drFptx,
xtfkgl, xtfkgl,
cxyrd
} }
src/netmgr/cxyrd/cxyrd.js 0 → 100644
/*
* @Author: your name
* @Date: 2022-01-07 17:40:44
* @LastEditTime: 2022-01-08 10:21:42
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\netmgr\cxyrd\cxyrd.js
*/
import addrType from '../../netmgr/NetAddressType'
const _path = {
// 获取案件指纹
ajfinger: addrType.api + '/org/case/barcode/seqNo',
// 获取案件掌纹
ajhand: addrType.api + '/org/case/palm/barcode/seq',
// 获取人员平面指纹
ryfingerPain: addrType.api + '/png/plain/barcode/seq',
// 获取人员滚动指纹
ryfingerRoll: addrType.api + '/png/roll/barcode/seq',
// 获取人员掌纹
ryhand: addrType.api + '/png/palm/barcode/seq',
}
export default {
// 获取案件指纹
ajfinger(_parameter) {
return fHttp.postJson(_path.ajfinger, _parameter, fHttp.closeTip())
},
// 获取案件掌纹
ajhand(_parameter) {
return fHttp.postJson(_path.ajhand, _parameter, fHttp.closeTip())
},
// 获取人员平面指纹
ryfingerPain(_parameter) {
return fHttp.postJson(_path.ryfingerPain, _parameter, fHttp.closeTip())
},
// 获取人员滚动指纹
ryfingerRoll(_parameter) {
return fHttp.postJson(_path.ryfingerRoll, _parameter, fHttp.closeTip())
},
// 获取人员掌纹
ryhand(_parameter) {
return fHttp.postJson(_path.ryhand, _parameter, fHttp.closeTip())
},
}
src/netmgr/xtfkgl/xtfkgl.js
...@@ -35,7 +35,7 @@ export default { ...@@ -35,7 +35,7 @@ export default {
* @date: 2022/1/5 11:31 * @date: 2022/1/5 11:31
*/ */
yhList() { yhList() {
return fHttp.get(_path.ljkyh + 'getUserAndUserGroup', {}) return fHttp.get(_path.ljkyh + 'getUserAndUserGroup')
}, },
/** /**
......
src/request/http.js
...@@ -41,6 +41,8 @@ var down = axios.create({ // 文件下载 ...@@ -41,6 +41,8 @@ var down = axios.create({ // 文件下载
}, },
}) })
var _IS_SHOW_TIP = true
// 初始化参数 // 初始化参数
let initConfig = (config) => { let initConfig = (config) => {
if (config.url.indexOf('/login/myLoginForm') <= 0) { if (config.url.indexOf('/login/myLoginForm') <= 0) {
...@@ -60,12 +62,14 @@ let initConfig = (config) => { ...@@ -60,12 +62,14 @@ let initConfig = (config) => {
if (config[_HTTP_TYPE.LOADING] !== false) { if (config[_HTTP_TYPE.LOADING] !== false) {
showLoading(config[_HTTP_TYPE.LOADING_TARGET]) // 如果设置了targer,使用设置的target,比如el-table showLoading(config[_HTTP_TYPE.LOADING_TARGET]) // 如果设置了targer,使用设置的target,比如el-table
} }
_IS_SHOW_TIP = config[_HTTP_TYPE.TIP]
// console.log('initConfig', config) // console.log('initConfig', config)
return config return config
} }
let onError = (error) => { let onError = (error) => {
logger.info('error-config', error.config) // logger.info('error-config', error.config)
if (error) { if (error) {
hideLoading() hideLoading()
} }
...@@ -74,7 +78,7 @@ let onError = (error) => { ...@@ -74,7 +78,7 @@ let onError = (error) => {
let result = { let result = {
code: 999, code: 999,
message: '', message: '',
[_HTTP_TYPE.TIP]: error.config[_HTTP_TYPE.TIP] [_HTTP_TYPE.TIP]: _IS_SHOW_TIP
} }
if (error.toString().indexOf('400') >= 0) { if (error.toString().indexOf('400') >= 0) {
result.code = 400 result.code = 400
...@@ -111,7 +115,7 @@ let onResponse = (response) => { ...@@ -111,7 +115,7 @@ let onResponse = (response) => {
if (response.headers && response.headers.token) localStorage.setItem(ACCESS_TOKEN, response.headers.token) if (response.headers && response.headers.token) localStorage.setItem(ACCESS_TOKEN, response.headers.token)
if (response.config && response.config.loading !== false) hideLoading(response.config.loadingTarget) if (response.config && response.config.loading !== false) hideLoading(response.config.loadingTarget)
logger.info('response-config', response.config) // logger.info('response-config', response.config)
if (response.data && response.data.code >= 0) { if (response.data && response.data.code >= 0) {
let status = response.data.code let status = response.data.code
...@@ -212,7 +216,7 @@ export default { ...@@ -212,7 +216,7 @@ export default {
/** /**
* 封装get方法 * 封装get方法
*/ */
get(url, data) { get(url, data = {}) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
common common
.get(url, { .get(url, {
...@@ -231,7 +235,7 @@ export default { ...@@ -231,7 +235,7 @@ export default {
/** /**
* 封装post请求 * 封装post请求
*/ */
post(url, data, config) { post(url, data = {}, config = {}) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
common.post(url, qs.stringify(data), config) common.post(url, qs.stringify(data), config)
.then(response => { .then(response => {
...@@ -247,7 +251,7 @@ export default { ...@@ -247,7 +251,7 @@ export default {
/** /**
* 封装post请求 multipart/form-data * 封装post请求 multipart/form-data
*/ */
postform(url, data, config) { postform(url, data = {}, config = {}) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
instance.post(url, data, config).then(response => { instance.post(url, data, config).then(response => {
logger.net(data, url, response) logger.net(data, url, response)
...@@ -261,7 +265,7 @@ export default { ...@@ -261,7 +265,7 @@ export default {
/** /**
* 封装post请求 文件下载 * 封装post请求 文件下载
*/ */
postdown(url, data, config) { postdown(url, data = {}, config = {}) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
down.post(url, data, config).then(response => { down.post(url, data, config).then(response => {
logger.net(data, url, response) logger.net(data, url, response)
...@@ -276,7 +280,7 @@ export default { ...@@ -276,7 +280,7 @@ export default {
/** /**
* 封装post请求 json格式 * 封装post请求 json格式
*/ */
postJson(url, data, config) { postJson(url, data = {}, config = {}) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
json.post(url, data, config).then(response => { json.post(url, data, config).then(response => {
logger.net(data, url, response) logger.net(data, url, response)
......
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: 2022-01-04 11:51:02 * @LastEditTime: 2022-01-08 10:41:07
* @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
...@@ -1247,6 +1247,9 @@ export default { ...@@ -1247,6 +1247,9 @@ export default {
// 旋转下拉框 // 旋转下拉框
$(".rotateOptions").css("z-index", "99999"); $(".rotateOptions").css("z-index", "99999");
}, 1200); }, 1200);
// 更新tzd图层角度
document.querySelector('.tzdDrawing').dataset.angle = 0
console.log(document.querySelector('.tzdDrawing').dataset);
// 更新newHeight和newWidth // 更新newHeight和newWidth
self.newHeight = sizeValue.newHeight; self.newHeight = sizeValue.newHeight;
self.newWidth = sizeValue.newWidth; self.newWidth = sizeValue.newWidth;
...@@ -1402,9 +1405,26 @@ export default { ...@@ -1402,9 +1405,26 @@ export default {
self.isHandSpace = false; self.isHandSpace = false;
} }
}); });
/**
* @description: 获取角度的方法
* @param {*} event
* @return {*}
*/
function getDragAngle (event) {
var element = event.target;
var startAngle = parseFloat(element.dataset.angle) || 0;
var center = {
x: parseFloat(element.dataset.centerX) || 0,
y: parseFloat(element.dataset.centerY) || 0,
};
var angle = Math.atan2(center.y - event.clientY, center.x - event.clientX);
return angle - startAngle;
}
var ins = null; var ins = null;
var originPointer = {}; var originPointer = {};
// 旋转
var isMove = false;
document document
.querySelector(".tzdDrawing") .querySelector(".tzdDrawing")
.addEventListener("mousedown", function (e) { .addEventListener("mousedown", function (e) {
...@@ -1635,6 +1655,15 @@ export default { ...@@ -1635,6 +1655,15 @@ export default {
} }
} }
} }
// 旋转
if (self.isActive_rotate) {
const element = e.target;
const rect = element.getBoundingClientRect();
element.dataset.centerX = rect.left + rect.width / 2;
element.dataset.centerY = rect.top + rect.height / 2;
element.dataset.angle = getDragAngle(e);
isMove = true;
}
}); });
// 去掉鼠标默认事件 // 去掉鼠标默认事件
$(".tzdDrawing").bind("contextmenu", function (e) { $(".tzdDrawing").bind("contextmenu", function (e) {
...@@ -1835,6 +1864,15 @@ export default { ...@@ -1835,6 +1864,15 @@ export default {
} }
} }
} }
// 旋转
if (self.isActive_rotate) {
if (isMove) {
var angle = getDragAngle(e);
let deg = 180 / (Math.PI / angle)
// self.historys.push('旋转')
self.inputRotationRange = deg
}
}
}); });
document document
.querySelector(".tzdDrawing") .querySelector(".tzdDrawing")
...@@ -1899,6 +1937,11 @@ export default { ...@@ -1899,6 +1937,11 @@ export default {
//console.log("删除"); //console.log("删除");
ins.setEnd(); ins.setEnd();
} }
// 旋转
if (self.isActive_rotate) {
isMove = false;
e.target.dataset.angle = getDragAngle(e);
}
}); });
// 角度 // 角度
...@@ -1987,10 +2030,18 @@ export default { ...@@ -1987,10 +2030,18 @@ export default {
// 原尺寸显示下拉框 // 原尺寸显示下拉框
self.isActive = false; self.isActive = false;
$(".icon_size").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_size").css("background", "rgba(5, 95, 231, 0.05)");
// 旋转下拉框 // 证明是在图像上进行手动旋转
self.isRotateOptions = false; if (e.target.className == 'tzdDrawing' && self.isActive_rotate) {
self.isActive_rotate = false;
$(".icon_rotate").css("background", "rgba(5, 95, 231, 0.05)"); } else {
self.isRotateOptions = false
self.isActive_rotate = false
$(".icon_rotate").css("background", "rgba(5, 95, 231, 0.05)");
}
// // 旋转下拉框
// self.isRotateOptions = false;
// self.isActive_rotate = false;
// $(".icon_rotate").css("background", "rgba(5, 95, 231, 0.05)");
}); });
// 判断指纹类型 // 判断指纹类型
......
src/views/Editor/modules/imageEdAJ.scss
...@@ -128,11 +128,9 @@ $previewHeight: var(--previewHeight, 100%); ...@@ -128,11 +128,9 @@ $previewHeight: var(--previewHeight, 100%);
margin-right: 40px; margin-right: 40px;
} }
.disabled { .disabled-img {
.disabled-img { width: 64px;
width: 64px; height: 32px;
height: 32px;
}
} }
.size, .size,
......
src/views/cxyrd/modules/LTCandidate.vue
...@@ -361,18 +361,20 @@ export default { ...@@ -361,18 +361,20 @@ export default {
// 是否被删除 // 是否被删除
isDelete: false, isDelete: false,
// 搜索类型 // 搜索类型
searchType: "指纹", searchType: '指纹',
tableIndex: null
}; };
}, },
mounted() { mounted() {
let self = this; let self = this;
// 监听指掌纹类型 // 监听指掌纹类型
this.$bus.on("searchTypeLT", (type) => { this.$bus.on('searchTypeLT', (type) => {
self.searchType = type; self.searchType = type
}); })
document.body.addEventListener("click", (e) => { document.body.addEventListener('click', (e) => {
self.isShowOptions = false; self.isShowOptions = false
}); })
this.keyDown()
}, },
created() { created() {
let self = this; let self = this;
...@@ -401,6 +403,7 @@ export default { ...@@ -401,6 +403,7 @@ export default {
self.sourceTableData = tableData; self.sourceTableData = tableData;
// 默认选中第一条数据 // 默认选中第一条数据
if (self.tableData && self.tableData.length > 0) { if (self.tableData && self.tableData.length > 0) {
self.tableIndex = 0
self.$nextTick(() => { self.$nextTick(() => {
self.$refs.singleTable.setCurrentRow(self.tableData[0]); self.$refs.singleTable.setCurrentRow(self.tableData[0]);
}); });
...@@ -1290,6 +1293,61 @@ export default { ...@@ -1290,6 +1293,61 @@ export default {
}); });
}, },
/** /**
* @description: 监听键盘
* @param {*}
* @return {*}
*/
keyDown () {
let self = this
document.onkeydown = (e) => {
//事件对象兼容
let e1 = e || event || window.event || arguments.callee.caller.arguments[0]
if (e1 && e1.keyCode == 38) {
console.log('上');
if (self.tableData && self.tableData.length > 0) {
if (self.tableData.length == 1) {
return
} else {
self.tableIndex--
if (self.tableIndex < 0) {
self.tableIndex = self.total - 1
}
fHttp.cancel()
self.$refs.singleTable.setCurrentRow(this.tableData[self.tableIndex])
}
} else {
self.$bus.emit('bzJudge', null)
if (self.isDelete) {
// self.$bus.emit('changImageEditTarget', 'xxx')
} else {
self.$bus.emit('changImageEditTarget', 'xxx')
}
}
} else if (e1 && e1.keyCode == 40) {
console.log('下');
if (self.tableData && self.tableData.length > 0) {
if (self.tableData.length == 1) {
return
} else {
self.tableIndex++
if (self.tableIndex == self.total) {
self.tableIndex = 0
}
fHttp.cancel()
self.$refs.singleTable.setCurrentRow(this.tableData[self.tableIndex])
}
} else {
self.$bus.emit('bzJudge', null)
if (self.isDelete) {
// self.$bus.emit('changImageEditTarget', 'xxx')
} else {
self.$bus.emit('changImageEditTarget', 'xxx')
}
}
}
}
},
/**
* @description: 选中切换方法 * @description: 选中切换方法
* @param {*} val * @param {*} val
* @param {*} old * @param {*} old
...@@ -1342,46 +1400,82 @@ export default { ...@@ -1342,46 +1400,82 @@ export default {
// self.$store.commit('loading/setLoading', true) // self.$store.commit('loading/setLoading', true)
// 平面 --- 换压缩图 // 平面 --- 换压缩图
if (val.destseqno > 10 && val.destseqno <= 20) { if (val.destseqno > 10 && val.destseqno <= 20) {
this.$axios({ NetUtil.cxyrd.ryfingerPain({
method: "post", barcode: val.destbarcode,
url: "/api/png/plain/barcode/seq", seqno: val.destseqno,
data: { qqid: val.qqid
barcode: val.destbarcode, })
seqno: val.destseqno, .then(response => {
qqid: val.qqid, if (response.code === 0) {
}, self.$bus.emit("changImageEditTarget", response.ret.image || "xxx");
loading: false, } else {
}).then((response) => { self.$bus.emit("changImageEditTarget", 'xxx');
self.$bus.emit("changImageEditTarget", response.data.ret.image); }
}); })
// this.$axios({
// method: 'post',
// url: '/api/png/plain/barcode/seq',
// data: {
// barcode: val.destbarcode,
// seqno: val.destseqno,
// qqid: val.qqid
// },
// loading: false
// }).then(response => {
// self.$bus.emit("changImageEditTarget", response.data.ret.image);
// })
} else if (val.destseqno >= 1 && val.destseqno <= 10) { } else if (val.destseqno >= 1 && val.destseqno <= 10) {
// 滚动 --- 换压缩图 // 滚动 --- 换压缩图
this.$axios({ NetUtil.cxyrd.ryfingerRoll({
method: "post", barcode: val.destbarcode,
url: "/api/png/roll/barcode/seq", seqno: val.destseqno,
data: { qqid: val.qqid
barcode: val.destbarcode, })
seqno: val.destseqno, .then(response => {
qqid: val.qqid, if (response.code === 0) {
}, self.$bus.emit("changImageEditTarget", response.ret.image || "xxx");
loading: false, } else {
}).then((response) => { self.$bus.emit("changImageEditTarget", 'xxx');
self.$bus.emit("changImageEditTarget", response.data.ret.image); }
}); })
// this.$axios({
// method: 'post',
// url: '/api/png/roll/barcode/seq',
// data: {
// barcode: val.destbarcode,
// seqno: val.destseqno,
// qqid: val.qqid
// },
// loading: false
// }).then(response => {
// self.$bus.emit("changImageEditTarget", response.data.ret.image);
// })
} else { } else {
// 掌纹 // 掌纹
this.$axios({ NetUtil.cxyrd.ryhand({
method: "post", barcode: val.destbarcode,
url: "/api/png/palm/barcode/seq", hpseqno: val.destseqno,
data: { qqid: val.qqid
barcode: val.destbarcode, })
hpseqno: val.destseqno, .then(response => {
qqid: val.qqid, if (response.code === 0) {
}, self.$bus.emit("changImageEditTarget", response.ret.image || "xxx");
loading: true, } else {
}).then((response) => { self.$bus.emit("changImageEditTarget", 'xxx');
self.$bus.emit("changImageEditTarget", response.data.ret.image); }
}); })
// this.$axios({
// method: 'post',
// url: '/api/png/palm/barcode/seq',
// data: {
// barcode: val.destbarcode,
// hpseqno: val.destseqno,
// qqid: val.qqid
// },
// loading: true
// }).then(response => {
// self.$bus.emit("changImageEditTarget", response.data.ret.image);
// })
} }
} else { } else {
this.$bus.emit("changImageEditTarget", "xxx"); this.$bus.emit("changImageEditTarget", "xxx");
......
src/views/cxyrd/modules/TLCandidate.vue
...@@ -143,13 +143,14 @@ export default { ...@@ -143,13 +143,14 @@ export default {
if (e1 && e1.keyCode == 38) { if (e1 && e1.keyCode == 38) {
console.log('上'); console.log('上');
if (self.tableData && self.tableData.length > 0) { if (self.tableData && self.tableData.length > 0) {
if(self.tableData.length == 1) { if (self.tableData.length == 1) {
return return
} else { } else {
self.tableIndex-- self.tableIndex--
if(self.tableIndex < 0) { if (self.tableIndex < 0) {
self.tableIndex = self.total - 1 self.tableIndex = self.total - 1
} }
fHttp.cancel()
self.$refs.singleTable.setCurrentRow(this.tableData[self.tableIndex]) self.$refs.singleTable.setCurrentRow(this.tableData[self.tableIndex])
} }
} else { } else {
...@@ -163,13 +164,14 @@ export default { ...@@ -163,13 +164,14 @@ export default {
} else if (e1 && e1.keyCode == 40) { } else if (e1 && e1.keyCode == 40) {
console.log('下'); console.log('下');
if (self.tableData && self.tableData.length > 0) { if (self.tableData && self.tableData.length > 0) {
if(self.tableData.length == 1) { if (self.tableData.length == 1) {
return return
} else { } else {
self.tableIndex++ self.tableIndex++
if(self.tableIndex == self.total) { if (self.tableIndex == self.total) {
self.tableIndex = 0 self.tableIndex = 0
} }
fHttp.cancel()
self.$refs.singleTable.setCurrentRow(this.tableData[self.tableIndex]) self.$refs.singleTable.setCurrentRow(this.tableData[self.tableIndex])
} }
} else { } else {
...@@ -236,8 +238,6 @@ export default { ...@@ -236,8 +238,6 @@ export default {
this.$bus.emit('bzJudgeTL', null) this.$bus.emit('bzJudgeTL', null)
return return
} }
const CancelToken = axios.CancelToken;
const source = CancelToken.source();
if (val != null) { if (val != null) {
// 传递当前行的数据，判断是否被比中，如比中就不会弹窗比中 // 传递当前行的数据，判断是否被比中，如比中就不会弹窗比中
this.$bus.emit('bzJudgeTL', val) this.$bus.emit('bzJudgeTL', val)
...@@ -255,47 +255,71 @@ export default { ...@@ -255,47 +255,71 @@ export default {
} }
if (val.destseqno < 100) { if (val.destseqno < 100) {
// 获取案件指纹 // 获取案件指纹
this.$axios NetUtil.cxyrd.ajfinger({
.post("/api/org/case/barcode/seqNo", { barcode: val.destbarcode,
barcode: val.destbarcode, seqno: val.destseqno,
seqno: val.destseqno, qqid: val.qqid
qqid: val.qqid })
}, { loading: true, cancelToken: source.token }).then(response => { .then(response => {
//console.log(response); if (response.code === 0) {
if (response.data.code === 0) { self.$bus.emit("changImageEditTarget", response.ret.image || "xxx");
self.$bus.emit("changImageEditTarget", response.data.ret.image);
if (!self.isFirstMounted) {
clearTimeout(self.timer)
self.timer = setTimeout(() => {
// self.$store.commit('loading/setLoadingSd', false)
}, 500);
}
} else { } else {
self.$bus.emit("changImageEditTarget", 'xxx'); self.$bus.emit("changImageEditTarget", 'xxx');
} }
}); })
// this.$axios
// .post("/api/org/case/barcode/seqNo", {
// barcode: val.destbarcode,
// seqno: val.destseqno,
// qqid: val.qqid
// }, { loading: true, cancelToken: source.token }).then(response => {
// //console.log(response);
// if (response.data.code === 0) {
// self.$bus.emit("changImageEditTarget", response.data.ret.image);
// if (!self.isFirstMounted) {
// clearTimeout(self.timer)
// self.timer = setTimeout(() => {
// // self.$store.commit('loading/setLoadingSd', false)
// }, 500);
// }
// } else {
// self.$bus.emit("changImageEditTarget", 'xxx');
// }
// });
} else { } else {
// 获取案件掌纹 // 获取案件掌纹
// TODO // TODO
this.$axios NetUtil.cxyrd.ajhand({
.post("/api/org/case/palm/barcode/seq", { barcode: val.destbarcode,
barcode: val.destbarcode, hpseqno: val.destseqno,
hpseqno: val.destseqno, qqid: val.qqid
qqid: val.qqid })
}, { loading: true, cancelToken: source.token }).then(response => { .then(response => {
//console.log(response); if (response.code === 0) {
if (response.data.code === 0) { self.$bus.emit("changImageEditTarget", response.ret.image || "xxx");
self.$bus.emit("changImageEditTarget", response.data.ret.image);
if (!self.isFirstMounted) {
clearTimeout(self.timer)
self.timer = setTimeout(() => {
// self.$store.commit('loading/setLoadingSd', false)
}, 500);
}
} else { } else {
self.$bus.emit("changImageEditTarget", 'xxx'); self.$bus.emit("changImageEditTarget", 'xxx');
} }
}); })
// this.$axios
// .post("/api/org/case/palm/barcode/seq", {
// barcode: val.destbarcode,
// hpseqno: val.destseqno,
// qqid: val.qqid
// }, { loading: true, cancelToken: source.token }).then(response => {
// //console.log(response);
// if (response.data.code === 0) {
// self.$bus.emit("changImageEditTarget", response.data.ret.image);
// if (!self.isFirstMounted) {
// clearTimeout(self.timer)
// self.timer = setTimeout(() => {
// // self.$store.commit('loading/setLoadingSd', false)
// }, 500);
// }
// } else {
// self.$bus.emit("changImageEditTarget", 'xxx');
// }
// });
} }
} }
else { else {
......
src/views/rgrd/modules/LLCandidate.vue
...@@ -117,6 +117,8 @@ export default { ...@@ -117,6 +117,8 @@ export default {
isDelete: false, isDelete: false,
//目标表格点击 //目标表格点击
targetBh: "", targetBh: "",
// 表格的索引
tableIndex: null
}; };
}, },
created() { created() {
...@@ -154,13 +156,73 @@ export default { ...@@ -154,13 +156,73 @@ export default {
} }
// 默认选中第一条数据 // 默认选中第一条数据
if (self.tableData && self.tableData.length > 0) { if (self.tableData && self.tableData.length > 0) {
self.tableIndex = 0
self.$refs.singleTable.setCurrentRow(self.tableData[0]); self.$refs.singleTable.setCurrentRow(self.tableData[0]);
} }
// //console.log(tableData); // //console.log(tableData);
}); });
}, },
mounted () {
// 监听键盘事件
this.keyDown()
},
methods: { methods: {
/** /**
* @description: 监听键盘
* @param {*}
* @return {*}
*/
keyDown () {
let self = this
document.onkeydown = (e) => {
//事件对象兼容
let e1 = e || event || window.event || arguments.callee.caller.arguments[0]
if (e1 && e1.keyCode == 38) {
console.log('上');
if (self.tableData && self.tableData.length > 0) {
if (self.tableData.length == 1) {
return
} else {
self.tableIndex--
if (self.tableIndex < 0) {
self.tableIndex = self.total - 1
}
fHttp.cancel()
self.$refs.singleTable.setCurrentRow(this.tableData[self.tableIndex])
}
} else {
self.$bus.emit('bzJudgeTL', null)
if (self.isDelete) {
// self.$bus.emit('changImageEditTarget', 'xxx')
} else {
self.$bus.emit('changImageEditTarget', 'xxx')
}
}
} else if (e1 && e1.keyCode == 40) {
console.log('下');
if (self.tableData && self.tableData.length > 0) {
if (self.tableData.length == 1) {
return
} else {
self.tableIndex++
if (self.tableIndex == self.total) {
self.tableIndex = 0
}
fHttp.cancel()
self.$refs.singleTable.setCurrentRow(this.tableData[self.tableIndex])
}
} else {
self.$bus.emit('bzJudgeTL', null)
if (self.isDelete) {
// self.$bus.emit('changImageEditTarget', 'xxx')
} else {
self.$bus.emit('changImageEditTarget', 'xxx')
}
}
}
}
},
/**
* 选择指纹类型 * 选择指纹类型
* @param e * @param e
*/ */
...@@ -1033,40 +1095,64 @@ export default { ...@@ -1033,40 +1095,64 @@ export default {
/////////////////////////////// ///////////////////////////////
if (val.destseqno <= 99) { if (val.destseqno <= 99) {
//案件指纹 //案件指纹
this.$axios NetUtil.cxyrd.ajfinger({
.post("/api/org/case/barcode/seqNo", { barcode: val.destbarcode,
barcode: val.destbarcode, seqno: val.destseqno,
seqno: val.destseqno, qqid: val.qqid,
qqid: sessionStorage.getItem("qqid"), })
.then(response => {
if (response.code === 0) {
self.$bus.emit("changImageEditTarget", response.ret.image || "xxx");
} else {
self.$bus.emit("changImageEditTarget", 'xxx');
}
}) })
.then((response) => { // this.$axios
self.$bus.emit( // .post("/api/org/case/barcode/seqNo", {
"changImageEditTarget", // barcode: val.destbarcode,
response.data.ret.image || "xxx" // seqno: val.destseqno,
); // qqid: sessionStorage.getItem("qqid"),
}); // })
clearTimeout(self.timer); // .then((response) => {
self.timer = setTimeout(() => { // self.$bus.emit(
self.$store.commit("loading/setLoading", false); // "changImageEditTarget",
}, 500); // response.data.ret.image || "xxx"
// );
// });
// clearTimeout(self.timer);
// self.timer = setTimeout(() => {
// self.$store.commit("loading/setLoading", false);
// }, 500);
} else { } else {
//案件掌纹 //案件掌纹
this.$axios NetUtil.cxyrd.ajhand({
.post("/api/org/case/palm/barcode/seq", { barcode: val.destbarcode,
barcode: val.destbarcode, hpseqno: val.destseqno,
hpseqno: val.destseqno, qqid: val.qqid
})
.then(response => {
if (response.code === 0) {
self.$bus.emit("changImageEditTarget", response.ret.image || "xxx");
} else {
self.$bus.emit("changImageEditTarget", 'xxx');
}
}) })
// qqid: val.qqid, // this.$axios
.then((response) => { // .post("/api/org/case/palm/barcode/seq", {
self.$bus.emit( // barcode: val.destbarcode,
"changImageEditTarget", // hpseqno: val.destseqno,
response.data.ret.image || "xxx" // })
); // // qqid: val.qqid,
}); // .then((response) => {
clearTimeout(self.timer); // self.$bus.emit(
self.timer = setTimeout(() => { // "changImageEditTarget",
self.$store.commit("loading/setLoading", false); // response.data.ret.image || "xxx"
}, 500); // );
// });
// clearTimeout(self.timer);
// self.timer = setTimeout(() => {
// self.$store.commit("loading/setLoading", false);
// }, 500);
} }
} else { } else {
this.$bus.emit("changImageEditTarget", "xxx"); this.$bus.emit("changImageEditTarget", "xxx");
......
src/views/xtfkgl/GzlClass.js
/** /**
* Description: 工作流类 用于处理工作流数据逻辑 --- Gzlzz
* @author: li_hongchao
* @date: 2022/1/7 0:00
*/
/**
* Description: _DL_TYPES 队列类型 _CXDL_TYPES 队列中查询队列类型 * Description: _DL_TYPES 队列类型 _CXDL_TYPES 队列中查询队列类型
* <pre> * <pre>
* 1 处理队列 * 1 处理队列
...@@ -26,7 +33,7 @@ const _CXDL_TYPES = {// 案件：正查 串查 人员：倒查 查重 ...@@ -26,7 +33,7 @@ const _CXDL_TYPES = {// 案件：正查 串查 人员：倒查 查重
} }
/** /**
* Description: * Description: 队列所包含的所有队列
* 案件： 处理队列(不可选择) 编辑队列 查询队列（正查、串查）* * 案件： 处理队列(不可选择) 编辑队列 查询队列（正查、串查）*
* 人员: 处理队列(不可选择) 编辑队列 检查队列 查询队列（倒查、查重） * 人员: 处理队列(不可选择) 编辑队列 检查队列 查询队列（倒查、查重）
* @author: li_hongchao * @author: li_hongchao
...@@ -36,17 +43,27 @@ const _DLMC = function (isRy) { ...@@ -36,17 +43,27 @@ const _DLMC = function (isRy) {
return isRy ? ['1', '2', '3', '5', '7'] : ['1', '2', '4', '6'] return isRy ? ['1', '2', '3', '5', '7'] : ['1', '2', '4', '6']
} }
/**
* Description: 判断是不是属于查询队列
* @author: li_hongchao
* @date: 2022/1/8 11:58
*/
const isDlcxItem = function (val) { const isDlcxItem = function (val) {
return val > 3 return val > 3
} }
/** /**
* Description: 工作流类 用于处理工作流数据逻辑 * Description: 主类
* @author: li_hongchao * @author: li_hongchao
* @date: 2022/1/7 0:00 * @date: 2022/1/8 12:01
*/ */
class Gzlzz { class Gzlzz {
/**
* Description: Gzlzz 内部参数的 type ，方便外部使用
* @author: li_hongchao
* @date: 2022/1/8 11:57
*/
static _PARAMS_TYPE = { static _PARAMS_TYPE = {
GZDL: 'gzdlArr', GZDL: 'gzdlArr',
GZDL_CXDL: 'gzdlCxdlArr', GZDL_CXDL: 'gzdlCxdlArr',
...@@ -65,6 +82,11 @@ class Gzlzz { ...@@ -65,6 +82,11 @@ class Gzlzz {
_DL_COUNT = 0 _DL_COUNT = 0
isRy = false isRy = false
/**
* Description: 根据 type 获取队列
* @author: li_hongchao
* @date: 2022/1/8 11:57
*/
getDl(type) { getDl(type) {
switch (type) { switch (type) {
case '1': case '1':
...@@ -95,31 +117,30 @@ class Gzlzz { ...@@ -95,31 +117,30 @@ class Gzlzz {
* @author: li_hongchao * @author: li_hongchao
* @date: 2021/12/28 13:57 * @date: 2021/12/28 13:57
*/ */
init(isRy) { init(isRy) {
this.isRy = isRy this.isRy = isRy
this.clear() this.clear()
this.dlmcArr.push(_DL_TYPES.BJDL)
this.dlmcArr.push(_DL_TYPES.CXDL)
if (this.isRy) { if (this.isRy) {
this.dlmcArr.push(_DL_TYPES.BJDL)
this.dlmcArr.push(_DL_TYPES.JCDL) this.dlmcArr.push(_DL_TYPES.JCDL)
this.dlmcArr.push(_DL_TYPES.CXDL)
this.dlmcCxdlArr.push(_CXDL_TYPES.DaoC) this.dlmcCxdlArr.push(_CXDL_TYPES.DaoC)
this.dlmcCxdlArr.push(_CXDL_TYPES.ChaC) this.dlmcCxdlArr.push(_CXDL_TYPES.ChaC)
this.gzdlArr.push(_DL_TYPES.CLDL)
} else { } else {
this.dlmcArr.push(_DL_TYPES.BJDL)
this.dlmcArr.push(_DL_TYPES.CXDL)
this.dlmcCxdlArr.push(_CXDL_TYPES.ZhengC) this.dlmcCxdlArr.push(_CXDL_TYPES.ZhengC)
this.dlmcCxdlArr.push(_CXDL_TYPES.ChuanC) this.dlmcCxdlArr.push(_CXDL_TYPES.ChuanC)
this.gzdlArr.push(_DL_TYPES.CLDL)
} }
this.gzdlArr.push(_DL_TYPES.CLDL)
this._DL_COUNT = this.dlmcArr.length this._DL_COUNT = this.dlmcArr.length
} }
/**
* Description: 将 已知队列 val 解析成页面所需数据结构
* @author: li_hongchao
* @date: 2022/1/8 11:56
*/
initByVal(val) { initByVal(val) {
this.clear() this.clear()
let resDl = _DLMC(this.isRy) let resDl = _DLMC(this.isRy)
...@@ -159,7 +180,11 @@ class Gzlzz { ...@@ -159,7 +180,11 @@ class Gzlzz {
}) })
} }
/**
* Description: 生成工作队列的结果
* @author: li_hongchao
* @date: 2022/1/8 10:16
*/
result() { result() {
let result = '' let result = ''
if (this.gzdlArr && this.gzdlArr.length > 0) { if (this.gzdlArr && this.gzdlArr.length > 0) {
...@@ -186,7 +211,11 @@ class Gzlzz { ...@@ -186,7 +211,11 @@ class Gzlzz {
return result return result
} }
/**
* Description: 清空队列
* @author: li_hongchao
* @date: 2022/1/8 10:17
*/
clear() { clear() {
this.gzdlArr = [] this.gzdlArr = []
this.gzdlCxdlArr = [] this.gzdlCxdlArr = []
...@@ -194,55 +223,108 @@ class Gzlzz { ...@@ -194,55 +223,108 @@ class Gzlzz {
this.dlmcCxdlArr = [] this.dlmcCxdlArr = []
} }
/**
* Description: 获取当前处于删除状态的队列
* @author: li_hongchao
* @date: 2022/1/8 11:50
*/
getDeleteDl(isAdd) {
return isAdd === true ? this[Gzlzz._PARAMS_TYPE.DLMC] : this[Gzlzz._PARAMS_TYPE.GZDL]
}
updateCxdl(group, groupIndex, child, childIndex, isAdd = false) {// 点击查询队列子项处理逻辑 /**
if (isAdd) { * Description: 清空处于删除状态的查询队列子项
if (this.dlmcCxdlArr.length !== 2) { * @author: li_hongchao
this.dlmcArr.splice(groupIndex, 1) * @date: 2022/1/8 11:51
} */
this.dlmcCxdlArr.splice(childIndex, 1) clearDeleteDlCxdl(isAdd) {
if (isAdd === true) {
if (this.gzdlCxdlArr.length === 0) { this[Gzlzz._PARAMS_TYPE.DLMC_CXDL] = []
this.gzdlArr.push(group)
}
this.gzdlCxdlArr.push(child)
} else { } else {
if (this.gzdlCxdlArr.length !== 2) { this[Gzlzz._PARAMS_TYPE.GZDL_CXDL] = []
this.gzdlArr.splice(groupIndex, 1) }
} }
this.gzdlCxdlArr.splice(childIndex, 1)
if (this.dlmcCxdlArr.length === 0) { /**
this.dlmcArr.push(group) * Description: 获取当前处于删除状态查询队列子项
} * @author: li_hongchao
this.dlmcCxdlArr.push(child) * @date: 2022/1/8 11:52
*/
getDeleteDlCxdl(isAdd) {
return isAdd === true ? this[Gzlzz._PARAMS_TYPE.DLMC_CXDL] : this[Gzlzz._PARAMS_TYPE.GZDL_CXDL]
}
/**
* Description: 获取当前处于增加状态的队列
* @author: li_hongchao
* @date: 2022/1/8 11:52
*/
getAddDl(isAdd) {
return isAdd === true ? this[Gzlzz._PARAMS_TYPE.GZDL] : this[Gzlzz._PARAMS_TYPE.DLMC]
}
/**
* Description: 获取当前处于增加状态的查询队列的子项
* @author: li_hongchao
* @date: 2022/1/8 11:52
*/
getAddDlCxdl(isAdd) {
return isAdd === true ? this[Gzlzz._PARAMS_TYPE.GZDL_CXDL] : this[Gzlzz._PARAMS_TYPE.DLMC_CXDL]
}
/**
* Description: 将 队列 dls 添加到处于新增状态的查询队列的容器中
* @author: li_hongchao
* @date: 2022/1/8 11:53
*/
concatAddDlCxdl(isAdd, dls) {
if (isAdd === true) {
this[Gzlzz._PARAMS_TYPE.GZDL_CXDL] = this[Gzlzz._PARAMS_TYPE.GZDL_CXDL].concat(dls)
} else {
this[Gzlzz._PARAMS_TYPE.DLMC_CXDL] = this[Gzlzz._PARAMS_TYPE.DLMC_CXDL].concat(dls)
} }
} }
/**
* Description: 更新查询队列的子项处理逻辑
* @author: li_hongchao
* @date: 2022/1/8 10:17
*/
updateCxdl(group, groupIndex, child, childIndex, isAdd = false) {
if (this.getDeleteDlCxdl(isAdd).length !== 2) {
this.getDeleteDl(isAdd).splice(groupIndex, 1)
}
this.getDeleteDlCxdl(isAdd).splice(childIndex, 1)
if (this.getAddDlCxdl(isAdd).length === 0) {
this.getAddDl(isAdd).push(group)
}
this.getAddDlCxdl(isAdd).push(child)
}
/**
* Description: 更新队列名称与工作队列处理逻辑
* <pre>
* 说明：
* isAdd：添加、删除队标识
* 如果isAdd 为 true ，往工作队列里添加队列，相应删除队列名称的队列
* 如果isAdd 为 false ，往队列名称里添加队列，相应删除工作队列的队列
* clickItem：当前队列项
* index：所在队列的位置
* </pre>
* @author: li_hongchao
* @date: 2022/1/8 10:17
*/
updateGzdl(clickItem, index, isAdd = false) {// 处理队列添加、取消逻辑 updateGzdl(clickItem, index, isAdd = false) {// 处理队列添加、取消逻辑
if (isAdd) { this.getDeleteDl(isAdd).splice(index, 1)
this.dlmcArr.splice(index, 1) if (clickItem.type === _DL_TYPES.CXDL.type) {
if (clickItem.type === _DL_TYPES.CXDL.type) { if (this.getDeleteDlCxdl(isAdd).length === 2) {
if (this.dlmcCxdlArr.length === 2) { this.getAddDl(isAdd).push(_DL_TYPES.CXDL)
this.gzdlArr.push(_DL_TYPES.CXDL)
}
this.gzdlCxdlArr = this.gzdlCxdlArr.concat(this.dlmcCxdlArr)
this.dlmcCxdlArr = []
} else {
this.gzdlArr.push(clickItem)
} }
this.concatAddDlCxdl(isAdd, this.getDeleteDlCxdl(isAdd))
this.clearDeleteDlCxdl(isAdd)
} else { } else {
this.gzdlArr.splice(index, 1) this.getAddDl(isAdd).push(clickItem)
if (clickItem.type === _DL_TYPES.CXDL.type) {
if (this.gzdlCxdlArr.length === 2) {
this.dlmcArr.push(_DL_TYPES.CXDL)
}
this.dlmcCxdlArr = this.dlmcCxdlArr.concat(this.gzdlCxdlArr)
this.gzdlCxdlArr = []
} else {
this.dlmcArr.push(clickItem)
}
} }
} }
......
vue.config.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:57:48 * @Date: 2021-09-07 09:57:48
* @LastEditTime: 2022-01-07 15:51:35 * @LastEditTime: 2022-01-08 10:49:55
* @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
...@@ -113,12 +113,12 @@ module.exports = { ...@@ -113,12 +113,12 @@ module.exports = {
// target: "http://192.168.128.166:8099/", // 张 认定 // target: "http://192.168.128.166:8099/", // 张 认定
// target: "http://192.168.128.104:8099", // 湖南-马 // target: "http://192.168.128.104:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王 // target: "http://192.168.128.116:8099", // 湖南-王
// target: "http://192.168.128.119:8099", // 湖南-张呈光 target: "http://192.168.128.109: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",
// target: "http://47.92.225.109:5602", // target: "http://47.92.225.109:5602",
// target: "http://www.meetfood.cn:2390", // 湖南-线上 // target: "http://www.meetfood.cn:2390", // 湖南-线上
target: "http://zwpt.xzclub.top:9333/", // target: "http://zwpt.xzclub.top:9333/",
// target: "http://192.168.128.101:8099", // 江 // target: "http://192.168.128.101:8099", // 江
ws: true, ws: true,
changeOrigin: true, changeOrigin: true,
......
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