Commit ab996b9d by 张超军

1.优化认定详情候选加载动画。2.解决列表展开收缩样式位置错乱。

parent b75b6ed3
...@@ -12991,7 +12991,9 @@ ...@@ -12991,7 +12991,9 @@
* @override * @override
*/ */
initialize: function initialize() { initialize: function initialize() {
this.matrix = [4, 4, 4, 4, 0.7, -4, -4, -4, -4]; this.matrix = [4, 4, 4,
4, 0.7, -4,
-4, -4, -4];
// this.matrix = [1, 1, 1, 1, 0.7, -1, -1, -1, -1]; // this.matrix = [1, 1, 1, 1, 0.7, -1, -1, -1, -1];
// this.matrix = [0, -1, 0, -1, 5, -1, 0, -1, 0]; // this.matrix = [0, -1, 0, -1, 5, -1, 0, -1, 0];
// this.matrix = [1/9, 1/9, 1/9, 1/9, 1/9, 1/9, 1/9, 1/9, 1/9]; // this.matrix = [1/9, 1/9, 1/9, 1/9, 1/9, 1/9, 1/9, 1/9, 1/9];
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:58:13 * @Date: 2021-09-07 09:58:13
* @LastEditTime: 2022-03-25 17:27:15 * @LastEditTime: 2022-04-17 00:36:57
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\App.vue * @FilePath: \指纹系统\founder_vue\src\App.vue
...@@ -78,6 +78,7 @@ export default { ...@@ -78,6 +78,7 @@ export default {
.el-message { .el-message {
z-index: 999999 !important; z-index: 999999 !important;
justify-content: flex-start !important;
} }
// 滚动条的滑块 // 滚动条的滑块
...@@ -141,10 +142,6 @@ export default { ...@@ -141,10 +142,6 @@ export default {
} }
} }
/deep/ .el-message {
justify-content: flex-start !important;
}
.el-message-box__message { .el-message-box__message {
margin: 23px 24px 17px 24px; margin: 23px 24px 17px 24px;
font-size: 14px; font-size: 14px;
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-09-09 09:28:46 * @Date: 2021-09-09 09:28:46
* @LastEditTime: 2022-04-16 10:50:45 * @LastEditTime: 2022-04-17 00:41:00
* @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
--> -->
...@@ -2643,6 +2643,11 @@ export default { ...@@ -2643,6 +2643,11 @@ export default {
this.$bus.on('deleteMessage', (obj) => { this.$bus.on('deleteMessage', (obj) => {
if (obj.delTime != null) { if (obj.delTime != null) {
// 移除源特征点
self.bdjqData_source = []
// 移除目标特征点
self.bdjqData_target = []
self.targetImage = "xxx"; self.targetImage = "xxx";
self.sourceImage = "xxx"; self.sourceImage = "xxx";
self.zwtp_target = false self.zwtp_target = false
...@@ -2673,6 +2678,15 @@ export default { ...@@ -2673,6 +2678,15 @@ export default {
this.$bus.on('targetDeleteMessage', (obj) => { this.$bus.on('targetDeleteMessage', (obj) => {
if (obj.delTime != null) { if (obj.delTime != null) {
self.$bus.on('target_info', (target_info) => {
self.target_info = target_info
// 移除源特征点
self.bdjqData_source = []
// 移除目标特征点
self.bdjqData_target = []
self.getBdjqData(self.target_info.barcode_source, self.target_info.seq_source, self.target_info.barcode_target, self.target_info.seq_target, self.target_info.type)
})
self.targetImage = "xxx"; self.targetImage = "xxx";
self.zwtp_target = false self.zwtp_target = false
self.zwtp_source = false self.zwtp_source = false
......
/* /*
* @Author: your name * @Author: your name
* @Date: 2022-01-07 17:40:44 * @Date: 2022-01-07 17:40:44
* @LastEditTime: 2022-02-14 17:02:06 * @LastEditTime: 2022-04-20 10:20:51
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\netmgr\cxyrd\cxyrd.js * @FilePath: \指纹系统\founder_vue\src\netmgr\cxyrd\cxyrd.js
...@@ -24,22 +24,22 @@ const _path = { ...@@ -24,22 +24,22 @@ const _path = {
export default { export default {
// 获取案件指纹 // 获取案件指纹
ajfinger(_parameter) { ajfinger(_parameter) {
return fHttp.postJson(_path.ajfinger, _parameter, HttpConfigUtil.closeLoadAndTip()) return fHttp.postJson(_path.ajfinger, _parameter)
}, },
// 获取案件掌纹 // 获取案件掌纹
ajhand(_parameter) { ajhand(_parameter) {
return fHttp.postJson(_path.ajhand, _parameter, HttpConfigUtil.closeLoadAndTip()) return fHttp.postJson(_path.ajhand, _parameter)
}, },
// 获取人员平面指纹 // 获取人员平面指纹
ryfingerPain(_parameter) { ryfingerPain(_parameter) {
return fHttp.postJson(_path.ryfingerPain, _parameter, HttpConfigUtil.closeLoadAndTip()) return fHttp.postJson(_path.ryfingerPain, _parameter)
}, },
// 获取人员滚动指纹 // 获取人员滚动指纹
ryfingerRoll(_parameter) { ryfingerRoll(_parameter) {
return fHttp.postJson(_path.ryfingerRoll, _parameter, HttpConfigUtil.closeLoadAndTip()) return fHttp.postJson(_path.ryfingerRoll, _parameter)
}, },
// 获取人员掌纹 // 获取人员掌纹
ryhand(_parameter) { ryhand(_parameter) {
return fHttp.postJson(_path.ryhand, _parameter, HttpConfigUtil.closeLoadAndTip()) return fHttp.postJson(_path.ryhand, _parameter)
}, },
} }
/* /*
* @Author: zhangchaojun * @Author: zhangchaojun
* @Date: 2022-02-15 15:58:41 * @Date: 2022-02-15 15:58:41
* @LastEditTime: 2022-04-12 19:33:25 * @LastEditTime: 2022-04-20 10:21:16
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\netmgr\imageEd\imageEd.js * @FilePath: \指纹系统\founder_vue\src\netmgr\imageEd\imageEd.js
...@@ -21,15 +21,15 @@ const _path = { ...@@ -21,15 +21,15 @@ const _path = {
export default { export default {
// 获取图片特征 // 获取图片特征
fingerTZD(_parameter) { fingerTZD(_parameter) {
return fHttp.postJson(_path.fingerTZD, _parameter, HttpConfigUtil.closeLoadAndTip()) return fHttp.postJson(_path.fingerTZD, _parameter)
}, },
fingerTZD_LL(_parameter) { fingerTZD_LL(_parameter) {
return fHttp.postJson(_path.fingerTZD_LL, _parameter, HttpConfigUtil.closeLoadAndTip()) return fHttp.postJson(_path.fingerTZD_LL, _parameter)
}, },
handTZD(_parameter) { handTZD(_parameter) {
return fHttp.postJson(_path.handTZD, _parameter, HttpConfigUtil.closeLoadAndTip()) return fHttp.postJson(_path.handTZD, _parameter)
}, },
handTZD_LL(_parameter) { handTZD_LL(_parameter) {
return fHttp.postJson(_path.handTZD_LL, _parameter, HttpConfigUtil.closeLoadAndTip()) return fHttp.postJson(_path.handTZD_LL, _parameter)
}, },
} }
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
<el-table-column <el-table-column
prop="taskNumber" prop="taskNumber"
:label="$t('FptxDr.task_number')" :label="$t('FptxDr.task_number')"
:width="width1" :width="width_rwh"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<svg-icon <svg-icon
...@@ -324,7 +324,7 @@ ...@@ -324,7 +324,7 @@
<el-table-column <el-table-column
prop="taskNumber" prop="taskNumber"
:label="$t('FptxDr.task_number')" :label="$t('FptxDr.task_number')"
:width="width1" :width="width_rwh"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<svg-icon <svg-icon
...@@ -439,6 +439,7 @@ export default { ...@@ -439,6 +439,7 @@ export default {
name: "gzlb", name: "gzlb",
data () { data () {
return { return {
width_rwh: 240,
width5: 50, width5: 50,
width3: 100, width3: 100,
width2: 240, width2: 240,
...@@ -479,7 +480,8 @@ export default { ...@@ -479,7 +480,8 @@ export default {
this.width2 = (this.width2 * w2) / w1; this.width2 = (this.width2 * w2) / w1;
this.width3 = (this.width3 * w2) / w1; this.width3 = (this.width3 * w2) / w1;
this.width4 = (this.width4 * w2) / w1; this.width4 = (this.width4 * w2) / w1;
this.width5 = (this.width5 * w2) / w1 this.width5 = (this.width5 * w2) / w1;
this.width_rwh = (this.width_rwh * w2) / w1;
}, },
watch: { watch: {
// showType (newNum, oldNum) { // showType (newNum, oldNum) {
...@@ -1240,15 +1242,15 @@ export default { ...@@ -1240,15 +1242,15 @@ export default {
} }
@import "@/assets/css/globalBase.scss"; @import "@/assets/css/globalBase.scss";
</style> </style>
<style lang="scss" > <style lang="scss" scoped>
.el-table__expand-icon { /deep/.el-table__expand-icon {
position: absolute; position: absolute;
right: 45px; right: 45px;
cursor: pointer; cursor: pointer;
color: #b51f1f; color: #b51f1f;
transition: transform 0.2s ease-in-out; transition: transform 0.2s ease-in-out;
width: 11px; width: 11px;
height: 11px; //height: 11px;
/* border: black 1px solid; */ /* border: black 1px solid; */
margin: 0; margin: 0;
background-image: url("../../assets/img/confirm/expend.png"); background-image: url("../../assets/img/confirm/expend.png");
...@@ -1256,14 +1258,19 @@ export default { ...@@ -1256,14 +1258,19 @@ export default {
background-size: 11px; background-size: 11px;
background-repeat: no-repeat; background-repeat: no-repeat;
} }
.el-table__expand-icon.el-table__expand-icon--expanded { /deep/.el-table__expand-icon.el-table__expand-icon--expanded {
position: absolute;
//right: 45px;
cursor: pointer;
width: 11px; width: 11px;
height: 11px; //height: 11px;
background-image: url("../../assets/img/confirm/shrink.png"); background-image: url("../../assets/img/confirm/shrink.png");
background-position: center; background-position: center;
background-size: 11px; background-size: 11px;
background-repeat: no-repeat; background-repeat: no-repeat;
transform-origin: center;
transform: rotate(180deg) !important; transform: rotate(180deg) !important;
transition: transform 0.2s ease-in-out;
} }
.el-checkbox__input.is-checked .el-checkbox__inner { .el-checkbox__input.is-checked .el-checkbox__inner {
background-color: #006aff; background-color: #006aff;
......
...@@ -2246,7 +2246,7 @@ b { ...@@ -2246,7 +2246,7 @@ b {
cursor: pointer; cursor: pointer;
} }
</style> </style>
<style lang="scss"> <style lang="scss" scoped>
.el-tag-box { .el-tag-box {
// width: 930px; // width: 930px;
display: flex !important; display: flex !important;
...@@ -2279,7 +2279,7 @@ b { ...@@ -2279,7 +2279,7 @@ b {
background: #dadde0; background: #dadde0;
} }
.el-table__expand-icon { /deep/.el-table__expand-icon {
.el-icon-arrow-right { .el-icon-arrow-right {
cursor: pointer !important; cursor: pointer !important;
} }
...@@ -2291,7 +2291,7 @@ b { ...@@ -2291,7 +2291,7 @@ b {
color: #b51f1f; color: #b51f1f;
transition: transform 0.2s ease-in-out; transition: transform 0.2s ease-in-out;
width: 11px; width: 11px;
height: 11px; // height: 11px;
/* border: black 1px solid; */ /* border: black 1px solid; */
margin: 0; margin: 0;
background-image: url("../../assets/img/confirm/expend.png"); background-image: url("../../assets/img/confirm/expend.png");
...@@ -2300,9 +2300,9 @@ b { ...@@ -2300,9 +2300,9 @@ b {
background-repeat: no-repeat; background-repeat: no-repeat;
} }
.el-table__expand-icon.el-table__expand-icon--expanded { /deep/.el-table__expand-icon.el-table__expand-icon--expanded {
width: 11px; width: 11px;
height: 11px; // height: 11px;
background-image: url("../../assets/img/confirm/shrink.png"); background-image: url("../../assets/img/confirm/shrink.png");
background-position: center; background-position: center;
background-size: 11px; background-size: 11px;
......
...@@ -480,6 +480,7 @@ ...@@ -480,6 +480,7 @@
<el-progress <el-progress
type="circle" type="circle"
:percentage="UploadPercent" :percentage="UploadPercent"
color="#006AFF"
></el-progress> ></el-progress>
<div <div
v-show="UploadPercent<100" v-show="UploadPercent<100"
...@@ -1198,7 +1199,6 @@ export default { ...@@ -1198,7 +1199,6 @@ export default {
// TODO 导入日志记录 // TODO 导入日志记录
// this.sendLog('导入') // this.sendLog('导入')
} else { } else {
debugger
this.$message.error(res.data.message) this.$message.error(res.data.message)
this.dialogVisible = false// 进度条弹窗 this.dialogVisible = false// 进度条弹窗
this.$bus.emit('isBlur', false) this.$bus.emit('isBlur', false)
...@@ -1442,8 +1442,8 @@ export default { ...@@ -1442,8 +1442,8 @@ export default {
cursor: pointer; cursor: pointer;
} }
</style> </style>
<style lang="scss"> <style lang="scss" scoped>
.el-table__expand-icon { /deep/.el-table__expand-icon {
.el-icon-arrow-right { .el-icon-arrow-right {
cursor: pointer !important; cursor: pointer !important;
} }
...@@ -1455,7 +1455,7 @@ export default { ...@@ -1455,7 +1455,7 @@ export default {
color: #b51f1f; color: #b51f1f;
transition: transform 0.2s ease-in-out; transition: transform 0.2s ease-in-out;
width: 11px; width: 11px;
height: 11px; // height: 11px;
/* border: black 1px solid; */ /* border: black 1px solid; */
margin: 0; margin: 0;
background-image: url("../../assets/img/confirm/expend.png"); background-image: url("../../assets/img/confirm/expend.png");
...@@ -1464,9 +1464,9 @@ export default { ...@@ -1464,9 +1464,9 @@ export default {
background-repeat: no-repeat; background-repeat: no-repeat;
} }
.el-table__expand-icon.el-table__expand-icon--expanded { /deep/.el-table__expand-icon.el-table__expand-icon--expanded {
width: 11px; width: 11px;
height: 11px; // height: 11px;
background-image: url("../../assets/img/confirm/shrink.png"); background-image: url("../../assets/img/confirm/shrink.png");
background-position: center; background-position: center;
background-size: 11px; background-size: 11px;
......
...@@ -2221,8 +2221,8 @@ export default { ...@@ -2221,8 +2221,8 @@ export default {
cursor: pointer; cursor: pointer;
} }
</style> </style>
<style lang="scss"> <style lang="scss" scoped>
.el-table__expand-icon { /deep/.el-table__expand-icon {
.el-icon-arrow-right { .el-icon-arrow-right {
right: 0 !important; right: 0 !important;
cursor: pointer !important; cursor: pointer !important;
...@@ -2233,7 +2233,7 @@ export default { ...@@ -2233,7 +2233,7 @@ export default {
color: #b51f1f; color: #b51f1f;
transition: transform 0.2s ease-in-out; transition: transform 0.2s ease-in-out;
width: 11px; width: 11px;
height: 11px; // height: 11px;
/* border: black 1px solid; */ /* border: black 1px solid; */
margin: 0; margin: 0;
background-image: url("../../assets/img/confirm/expend.png"); background-image: url("../../assets/img/confirm/expend.png");
...@@ -2241,9 +2241,9 @@ export default { ...@@ -2241,9 +2241,9 @@ export default {
background-size: 11px; background-size: 11px;
background-repeat: no-repeat; background-repeat: no-repeat;
} }
.el-table__expand-icon.el-table__expand-icon--expanded { /deep/.el-table__expand-icon.el-table__expand-icon--expanded {
width: 11px; width: 11px;
height: 11px; // height: 11px;
background-image: url("../../assets/img/confirm/shrink.png"); background-image: url("../../assets/img/confirm/shrink.png");
background-position: center; background-position: center;
background-size: 11px; background-size: 11px;
...@@ -2251,15 +2251,15 @@ export default { ...@@ -2251,15 +2251,15 @@ export default {
transform: rotate(180deg) !important; transform: rotate(180deg) !important;
} }
</style> </style>
<style scoped lang="scss" > <style scoped lang="scss">
.el-table__expand-icon { /deep/.el-table__expand-icon {
position: absolute; position: absolute;
right: 45px; right: 45px;
cursor: pointer; cursor: pointer;
color: #b51f1f; color: #b51f1f;
transition: transform 0.2s ease-in-out; transition: transform 0.2s ease-in-out;
width: 11px; width: 11px;
height: 11px; // height: 11px;
/* border: black 1px solid; */ /* border: black 1px solid; */
margin: 0; margin: 0;
background-image: url("../../assets/img/confirm/expend.png"); background-image: url("../../assets/img/confirm/expend.png");
...@@ -2267,9 +2267,9 @@ export default { ...@@ -2267,9 +2267,9 @@ export default {
background-size: 11px; background-size: 11px;
background-repeat: no-repeat; background-repeat: no-repeat;
} }
.el-table__expand-icon.el-table__expand-icon--expanded { /deep/.el-table__expand-icon.el-table__expand-icon--expanded {
width: 11px; width: 11px;
height: 11px; // height: 11px;
background-image: url("../../assets/img/confirm/shrink.png"); background-image: url("../../assets/img/confirm/shrink.png");
background-position: center; background-position: center;
background-size: 11px; background-size: 11px;
......
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:57:48 * @Date: 2021-09-07 09:57:48
* @LastEditTime: 2022-04-15 17:46:08 * @LastEditTime: 2022-04-20 16:38:45
* @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
...@@ -104,11 +104,11 @@ module.exports = { ...@@ -104,11 +104,11 @@ module.exports = {
// 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.104:8099", // 江 // target: "http://192.168.128.104:8099", // 江
// target: "http://172.20.0.149:8099", // 北京 张 // target: "http://172.20.0.149:8099", // 北京 张
// target: "http://192.168.43.24:8099", // 西藏 张 // target: "http://192.168.0.109:8099", // 西藏 张
// target: "http://192.168.0.108:8099", // 西藏 马 target: "http://192.168.0.134:8099", // 西藏 马
ws: true, ws: true,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
......
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