Commit 5b5a2925 by 张超军

1.新增人员活体采集。2.截屏(正/倒查)3.案件512图片比例尺。4.点击滤镜图片旋转。

parent eb4afb7d
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
background-color: #ffffff; background-color: #ffffff;
border: none; border: none;
// border-bottom: 1px #f6f8fa solid; // border-bottom: 1px #f6f8fa solid;
border-top: 1px #f6f8fa solid; border-top: 1px #EEEEEE solid;
} }
// 去除table表格最底部边框 // 去除table表格最底部边框
.el-table__row > td { .el-table__row > td {
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-09-09 09:28:46 * @Date: 2021-09-09 09:28:46
* @LastEditTime: 2022-01-14 16:03:42 * @LastEditTime: 2022-01-16 17:19:03
* @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
--> -->
...@@ -3337,7 +3337,7 @@ export default { ...@@ -3337,7 +3337,7 @@ export default {
// 是否展示旋转的下拉框 // 是否展示旋转的下拉框
this.isRotateOptions = false; this.isRotateOptions = false;
// 旋转的度数 // 旋转的度数
this.inputRotationRange = 0; // this.inputRotationRange = 0;
// 旋转的度数--target // 旋转的度数--target
// this.inputRotationRange2 = 0 // this.inputRotationRange2 = 0
// 是否是X轴翻转 // 是否是X轴翻转
...@@ -4804,7 +4804,7 @@ export default { ...@@ -4804,7 +4804,7 @@ export default {
}); });
} else if (this.$route.name == "TL" || this.$route.name == 'rgTL') { } else if (this.$route.name == "TL" || this.$route.name == 'rgTL') {
// 倒查页面 // 倒查页面
$(".top").css('opacity', '0') $(".el-checkbox").css('opacity', '0')
$(".main-left").css('box-shadow', 'none') $(".main-left").css('box-shadow', 'none')
$(".main-right").css('box-shadow', 'none') $(".main-right").css('box-shadow', 'none')
$(".header").css("opacity", "0"); $(".header").css("opacity", "0");
...@@ -4838,7 +4838,7 @@ export default { ...@@ -4838,7 +4838,7 @@ export default {
a.click(); a.click();
// 恢复界面 // 恢复界面
$(".top").css('opacity', '1') $(".el-checkbox").css('opacity', '1')
$(".main-left").css('box-shadow', '0px 4px 10px 0px rgba(5, 95, 231, 0.3)') $(".main-left").css('box-shadow', '0px 4px 10px 0px rgba(5, 95, 231, 0.3)')
$(".main-right").css('box-shadow', '0px 4px 10px 0px rgba(5, 95, 231, 0.3)') $(".main-right").css('box-shadow', '0px 4px 10px 0px rgba(5, 95, 231, 0.3)')
$(".header").css("opacity", "1"); $(".header").css("opacity", "1");
...@@ -6071,7 +6071,7 @@ export default { ...@@ -6071,7 +6071,7 @@ export default {
// 是否展示旋转的下拉框 // 是否展示旋转的下拉框
this.isRotateOptions = false; this.isRotateOptions = false;
// 旋转的度数 // 旋转的度数
this.inputRotationRange = 0; // this.inputRotationRange = 0;
// 旋转的度数--target // 旋转的度数--target
// this.inputRotationRange2 = 0 // this.inputRotationRange2 = 0
// 是否是X轴翻转 // 是否是X轴翻转
...@@ -6175,7 +6175,7 @@ export default { ...@@ -6175,7 +6175,7 @@ export default {
// 是否展示旋转的下拉框 // 是否展示旋转的下拉框
this.isRotateOptions = false; this.isRotateOptions = false;
// 旋转的度数 // 旋转的度数
this.inputRotationRange = 0; // this.inputRotationRange = 0;
// 旋转的度数--target // 旋转的度数--target
// this.inputRotationRange2 = 0 // this.inputRotationRange2 = 0
// 是否是X轴翻转 // 是否是X轴翻转
...@@ -6336,6 +6336,7 @@ export default { ...@@ -6336,6 +6336,7 @@ export default {
if (!deg) deg = 0; if (!deg) deg = 0;
this.imageEditor2.rotate(deg); this.imageEditor2.rotate(deg);
this.startPlaceTarget = newValue; this.startPlaceTarget = newValue;
console.log("newValue:", newValue);
this.historys2.unshift('旋转') this.historys2.unshift('旋转')
// this.imageEditor2.setAngle(newValue)['catch'](function () { }); // this.imageEditor2.setAngle(newValue)['catch'](function () { });
} }
......
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:58:13 * @Date: 2021-09-07 09:58:13
* @LastEditTime: 2022-01-15 11:49:06 * @LastEditTime: 2022-01-15 14:58:21
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \founder_vue\src\router\modules\index.js * @FilePath: \founder_vue\src\router\modules\index.js
...@@ -55,7 +55,7 @@ export default [ ...@@ -55,7 +55,7 @@ export default [
parentId: 'zzwlr', parentId: 'zzwlr',
title: '修改人员', title: '修改人员',
}, },
component: () => import('@/views/zzwlr/xzry.vue') component: () => import('@/views/zzwlr/xzryedit.vue')
}, },
{ {
path: '/zzwlr', path: '/zzwlr',
......
...@@ -1488,7 +1488,7 @@ export default { ...@@ -1488,7 +1488,7 @@ export default {
background-color: #ffffff; background-color: #ffffff;
border: none; border: none;
// border-bottom: 1px #f6f8fa solid; // border-bottom: 1px #f6f8fa solid;
border-top: 1px #f6f8fa solid; border-top: 1px #EEEEEE solid;
} }
// 去除table表格最底部边框 // 去除table表格最底部边框
.el-table__row > td { .el-table__row > td {
...@@ -1605,7 +1605,7 @@ export default { ...@@ -1605,7 +1605,7 @@ export default {
// 表格高度 -- 展示下面的border // 表格高度 -- 展示下面的border
.split-line { .split-line {
height: 650px; height: 650px;
border-bottom: 1px solid #eee; border-bottom: 1px solid #EEEEEE;
} }
// 复选框 // 复选框
......
...@@ -1357,7 +1357,7 @@ const datas1 = [ ...@@ -1357,7 +1357,7 @@ const datas1 = [
background-color: #ffffff; background-color: #ffffff;
border: none; border: none;
// border-bottom: 1px #f6f8fa solid; // border-bottom: 1px #f6f8fa solid;
border-top: 1px #f6f8fa solid; border-top: 1px #EEEEEE solid;
} }
// 去除table表格最底部边框 // 去除table表格最底部边框
.el-table__row > td { .el-table__row > td {
......
...@@ -1457,11 +1457,12 @@ export default { ...@@ -1457,11 +1457,12 @@ export default {
}, },
watch: { watch: {
checked (newValue, oldValue) { checked (newValue, oldValue) {
console.log(this.sourceTableData);
if (newValue) { if (newValue) {
this.tableData = this.sourceTableData; this.tableData = this.sourceTableData;
} else { } else {
this.tableData = this.sourceTableData.filter((item) => { this.tableData = this.sourceTableData.filter((item) => {
return item.affirmstatus != 1 && item.affirmstatus != 3; return item.affirmstatus != 2 && item.affirmstatus != 3;
}); });
//console.log(this.tableData); //console.log(this.tableData);
} }
......
...@@ -636,7 +636,7 @@ const datas = [ ...@@ -636,7 +636,7 @@ const datas = [
.lt_src { .lt_src {
width: 100%; width: 100%;
height: 100%; height: 100%;
background: #ffffff; background: transparent;
div { div {
display: inline-block; display: inline-block;
...@@ -659,6 +659,7 @@ const datas = [ ...@@ -659,6 +659,7 @@ const datas = [
width: 100%; width: 100%;
border-radius: 0px 20px 0px 0px; border-radius: 0px 20px 0px 0px;
background: linear-gradient(270deg, #3eb2ff 0%, #055fe7 100%); background: linear-gradient(270deg, #3eb2ff 0%, #055fe7 100%);
// background-color: #000000;
display: flex; display: flex;
align-items: center; align-items: center;
box-sizing: border-box; box-sizing: border-box;
...@@ -684,7 +685,8 @@ const datas = [ ...@@ -684,7 +685,8 @@ const datas = [
.lt_middle { .lt_middle {
width: 100%; width: 100%;
// height: 100%; // height: 100%;
background: #ffffff; // background: #ffffff;
background: transparent;
border-radius: 8px; border-radius: 8px;
} }
...@@ -718,7 +720,8 @@ const datas = [ ...@@ -718,7 +720,8 @@ const datas = [
} }
.lt_middle_finger_print { .lt_middle_finger_print {
background-color: #ffffff; // background-color: #ffffff;
background-color: transparent;
width: 100%; width: 100%;
.btns-switch { .btns-switch {
......
...@@ -355,7 +355,7 @@ export default { ...@@ -355,7 +355,7 @@ export default {
this.tableData = this.sourceTableData; this.tableData = this.sourceTableData;
} else { } else {
this.tableData = this.sourceTableData.filter(item => { this.tableData = this.sourceTableData.filter(item => {
return item.affirmstatus != 1 && item.affirmstatus != 3; return item.affirmstatus != 2 && item.affirmstatus != 3;
}); });
} }
this.total = this.tableData.length; this.total = this.tableData.length;
......
...@@ -1674,7 +1674,7 @@ label { ...@@ -1674,7 +1674,7 @@ label {
.main { .main {
width: 100%; width: 100%;
height: 100%; height: 100%;
background: #ffffff; // background: #ffffff;
border-radius: 8px; border-radius: 8px;
.data { .data {
...@@ -1741,18 +1741,19 @@ label { ...@@ -1741,18 +1741,19 @@ label {
} }
.finger-print { .finger-print {
width: 352px; width: 100%;
height: 700px; height: 700px;
margin-left: 10px; // padding-left: 10px;
background: #fff; // background: #fff;
.btns { .btns {
width: 300px; width: 100%;
height: 32px; height: 32px;
margin: 12px 0 12px 40px; padding: 12px 40px;
background-color: #FFFFFF; background-color: #FFFFFF;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-around;
.btn { .btn {
cursor: pointer; cursor: pointer;
...@@ -1765,7 +1766,7 @@ label { ...@@ -1765,7 +1766,7 @@ label {
border-radius: 4px; border-radius: 4px;
border: 1px solid #055FE7; border: 1px solid #055FE7;
color: #055FE7; color: #055FE7;
margin-right: 10px; // margin-right: 10px;
&:active { &:active {
background: #055fe7; background: #055fe7;
...@@ -1795,7 +1796,7 @@ label { ...@@ -1795,7 +1796,7 @@ label {
overflow-y: auto; overflow-y: auto;
width: 100%; width: 100%;
height: 500px; height: 500px;
padding-left: 8px; padding-left: 18px;
.outside { .outside {
bottom: 6px; bottom: 6px;
...@@ -2255,12 +2256,15 @@ label { ...@@ -2255,12 +2256,15 @@ label {
.bottom { .bottom {
text-align: center; text-align: center;
background: #fff; background: #fff;
//height: 40px;
width: 100%; width: 100%;
font-size: 12px; font-size: 12px;
font-family: HarmonyOS_Sans_SC; font-family: HarmonyOS_Sans_SC;
color: #999999; color: #999999;
margin-top: 0; margin-top: 18px;
height: 40px;
display: flex;
justify-content: center;
align-items: center;
.expend { .expend {
font-size: 12px; font-size: 12px;
......
...@@ -1315,7 +1315,7 @@ export default { ...@@ -1315,7 +1315,7 @@ export default {
this.tableData = this.sourceTableData; this.tableData = this.sourceTableData;
} else { } else {
this.tableData = this.sourceTableData.filter((item) => { this.tableData = this.sourceTableData.filter((item) => {
return item.affirmstatus != 1 && item.affirmstatus != 3; return item.affirmstatus != 2 && item.affirmstatus != 3;
}); });
//console.log(this.tableData); //console.log(this.tableData);
} }
......
...@@ -686,7 +686,7 @@ const datas = [ ...@@ -686,7 +686,7 @@ const datas = [
.lt_middle { .lt_middle {
width: 100%; width: 100%;
// height: 100%; // height: 100%;
background: #ffffff; // background: #ffffff;
border-radius: 8px; border-radius: 8px;
} }
.el-table { .el-table {
...@@ -737,7 +737,7 @@ const datas = [ ...@@ -737,7 +737,7 @@ const datas = [
} }
.lt_middle_finger_print { .lt_middle_finger_print {
background-color: #ffffff; // background-color: #ffffff;
width: 100%; width: 100%;
height: 100%; height: 100%;
box-sizing: border-box; box-sizing: border-box;
...@@ -747,7 +747,7 @@ const datas = [ ...@@ -747,7 +747,7 @@ const datas = [
align-items: center; align-items: center;
margin-top: 13px; margin-top: 13px;
justify-content: center; justify-content: center;
background-color: #f6f8fa; background-color: #ffffff;
.btn { .btn {
cursor: pointer; cursor: pointer;
width: 129px; width: 129px;
......
...@@ -324,7 +324,7 @@ export default { ...@@ -324,7 +324,7 @@ export default {
this.tableData = this.sourceTableData; this.tableData = this.sourceTableData;
} else { } else {
this.tableData = this.sourceTableData.filter((item) => { this.tableData = this.sourceTableData.filter((item) => {
return item.affirmstatus != 1 && item.affirmstatus != 3; return item.affirmstatus != 2 && item.affirmstatus != 3;
}); });
} }
this.total = this.tableData.length; this.total = this.tableData.length;
......
...@@ -427,7 +427,7 @@ ...@@ -427,7 +427,7 @@
background-color: #ffffff; background-color: #ffffff;
border: none; border: none;
// border-bottom: 1px #f6f8fa solid; // border-bottom: 1px #f6f8fa solid;
border-top: 1px #f6f8fa solid; border-top: 1px #EEEEEE solid;
} }
// 去除table表格最底部边框 // 去除table表格最底部边框
.el-table__row > td { .el-table__row > td {
......
...@@ -360,13 +360,15 @@ export default { ...@@ -360,13 +360,15 @@ export default {
}, },
handleClick(row) { handleClick(row) {
// console.log(row); // console.log(row);
// this.$store.commit("layout/delcachePageName", "xzry"); this.$store.commit("layout/delcachePageName", "xzry");
this.$store.commit('layout/delcachePageName', 'xzryedit')
this.$router.push({ this.$router.push({
path: "/xzry/edit/"+row.barcode path: "/xzry/edit/"+row.barcode
}); });
}, },
toAdd() { toAdd() {
this.$store.commit("layout/delcachePageName", "xzry"); this.$store.commit("layout/delcachePageName", "xzry");
this.$store.commit('layout/delcachePageName', 'xzryedit')
this.$router.push("/xzry"); this.$router.push("/xzry");
}, },
clear() { clear() {
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-09-07 10:31:34 * @Date: 2021-09-07 10:31:34
* @LastEditTime: 2022-01-15 11:49:43 * @LastEditTime: 2022-01-15 15:09:06
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\zzwlr\Index.vue * @FilePath: \founder_vue\src\views\zzwlr\Index.vue
...@@ -406,12 +406,13 @@ ...@@ -406,12 +406,13 @@
// 清除全部案件库缓存 // 清除全部案件库缓存
self.$store.commit('layout/delcachePageName', 'htcj') self.$store.commit('layout/delcachePageName', 'htcj')
this.$store.commit('layout/delcachePageName', 'xzry') this.$store.commit('layout/delcachePageName', 'xzry')
this.$store.commit('layout/delcachePageName', 'xzryedit')
// this.$refs[formName].resetFields(); // this.$refs[formName].resetFields();
this.$set(this.ruleForm, 'ysxtAsjxgrybh', this.ruleForm.ysxtAsjxgrybh.substring(1, 23)) this.$set(this.ruleForm, 'ysxtAsjxgrybh', this.ruleForm.ysxtAsjxgrybh.substring(1, 23))
this.$router.pushToTab({ this.$router.push({
path: `/fingerprintIndex/${reqParam.personDo.ysxtAsjxgrybh}/${this.ruleForm.xm}`, path: `/fingerprintIndex/R${reqParam.personDo.ysxtAsjxgrybh}/${this.ruleForm.xm}`,
query: { query: {
type: 0, type: 1
}, },
}); });
} else { } else {
...@@ -458,10 +459,10 @@ ...@@ -458,10 +459,10 @@
console.log(response); console.log(response);
if (response.data.code === 0) { if (response.data.code === 0) {
this.$message.success("新增成功"); this.$message.success("新增成功");
this.$router.pushToTab({ this.$router.push({
path: `/fingerprintIndex/${reqParam.personDo.ysxtAsjxgrybh}/${this.ruleForm.xm}`, path: `/fingerprintIndex/R${reqParam.personDo.ysxtAsjxgrybh}/${this.ruleForm.xm}`,
query: { query: {
type: 1 type: 0
} }
}) })
this.$store.commit('layout/delcachePageName', 'htcj') this.$store.commit('layout/delcachePageName', 'htcj')
...@@ -500,7 +501,7 @@ ...@@ -500,7 +501,7 @@
} else { } else {
this.$message.error("新增失败"); this.$message.error("新增失败");
this.$set(this.ruleForm, "cjxxyydm", []); this.$set(this.ruleForm, "cjxxyydm", []);
// this.$set(this.ruleForm, 'ysxtAsjxgrybh', this.ruleForm.ysxtAsjxgrybh.substring(1, 23)) this.$set(this.ruleForm, 'ysxtAsjxgrybh', this.ruleForm.ysxtAsjxgrybh.substring(1, 23))
} }
}); });
} }
......
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