Skip to content

F
founder_vue
Commit f9d55cae by 米嘉伟
Options

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

parents 7e44020c 46542d7a
Showing with 551 additions and 46 deletions
src/router/modules/leftMenu.js
/*
* @Author: your name
* @Date: 2021-09-07 09:58:13
* @LastEditTime: 2021-12-01 20:50:56
* @LastEditTime: 2021-12-02 22:44:12
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\router\modules\index.js
......@@ -192,6 +192,16 @@ export default [
component: () => import("@/views/AllPersonnelBase/dclb.vue")
},
{
path: "/bzxxgl",
name: "bzxxgl",
icon_d: "/img/bzxxgl_d.png",
icon_a: "/img/bzxxgl_a.png",
meta: {
title: "比中信息管理",
auth: "5",
},
},
{
path: "/SystemManage",
name: "SystemManage",
icon_d: "/img/manage_d.png",
......@@ -293,16 +303,6 @@ export default [
component: () => import("@/views/SystemManage/GroupPermission.vue")
},
{
path: "/bzxxgl",
name: "bzxxgl",
icon_d: "/img/bzxxgl_d.png",
icon_a: "/img/bzxxgl_a.png",
meta: {
title: "比中信息管理",
auth: "5",
},
},
{
path: "/bzxxfh",
name: "bzxxfh",
meta: {
......
src/store/index.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-22 16:09:08
* @LastEditTime: 2021-12-02 20:35:41
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\store\index.js
......@@ -17,6 +17,7 @@ import publicData from "./modules/publicData"
import rydaxx from "./modules/rydaxx";
import ajdaxx from "./modules/ajdaxx";
import loading from "./modules/loading";
import ryzwbj from "./modules/ryzwbj";
Vue.use(Vuex);
......@@ -28,7 +29,8 @@ const store = new Vuex.Store({
publicData,
rydaxx,
ajdaxx,
loading
loading,
ryzwbj
},
getters,
plugins: [
......
src/store/modules/mutations-types.js
/*
* @Author: your name
* @Date: 2021-11-04 13:14:49
* @LastEditTime: 2021-11-29 18:02:42
* @LastEditTime: 2021-12-02 21:14:19
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\store\modules\mutations-types.js
......@@ -31,3 +31,8 @@ export const SET_PREROUTE = 'setPreRoute'
export const SET_WILLROUTE = 'setWillRoute'
export const SET_SMALLLOADING = 'setSmallLoading'
// 人像信息
export const SET_RXINFO = 'setRxInfo'
// 是否放大人像
export const SET_ENLARGEFACE = 'setEnlargeFace'
src/store/modules/ryzwbj.js 0 → 100644
/*
* @Author: your name
* @Date: 2021-11-04 11:12:33
* @LastEditTime: 2021-12-02 21:14:25
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\store\modules\zwbj.js
*/
import { SET_RXINFO, SET_ENLARGEFACE } from "./mutations-types";
const state = {
// 人像信息
rxInfo: [],
// 是否放大人像
enLargeFace: false
};
const mutations = {
[SET_RXINFO] (state, content) {
state.rxInfo = content
},
[SET_ENLARGEFACE] (state, content) {
state.enLargeFace = content
},
};
const actions = {
};
export default {
namespaced: true,
state,
mutations,
actions
};
src/views/Editor/modules/getElementStyle.js 0 → 100644
/*
* @Author: your name
* @Date: 2021-12-03 01:49:42
* @LastEditTime: 2021-12-03 01:52:48
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\getElementStyle.js
*/
function cssTransform (element, attr, val) {
//下面分为取值和赋值阶段，如果val不存在说明是取值的，如果val存在，说明是赋值阶段
//取值阶段
if (!element.transform) {
element.transform = {};
}
if (typeof val === "undefined") {
//取值阶段，又要分为，该值已经有了，和初始化该值阶段
if (typeof element.transform[attr] === "undefined") {
switch (attr) {
case "scale":
case "scaleX":
case "scaleY":
case "scaleZ":
element.transform[attr] = 100;
break;
default:
element.transform[attr] = 0;
}
}
//取值完毕，返回该值
return element.transform[attr];
} else {
//下面为赋值阶段
element.transform[attr] = val;
var transformVal = "";
//因为transform对象中可能不止一个属性，所以要对其进行遍历
for (var s in element.transform) {
switch (s) {
case "scale":
case "scaleX":
case "scaleY":
case "scaleZ":
transformVal += " " + s + "(" + (element.transform[s] / 100) + ")";
break;
case "rotate":
case "rotateX":
case "rotateY":
case "rotateZ":
case "skewX":
case "skewY":
transformVal += " " + s + "(" + element.transform[s] + "deg)";
break;
default:
transformVal += " " + s + "(" + element.transform[s] + "px)";
}
}
element.style.WebkitTransform = element.style.transform = transformVal;
}
}
export default cssTransform;
\ No newline at end of file
src/views/Editor/modules/imageEd.scss
......@@ -970,6 +970,58 @@ $transOrigin: var(--transOrigin, 0px, 0px);
justify-content: center !important;
align-items: center !important;
}
.face-content {
display: flex;
align-items: center;
justify-content: center;
flex-wrap: wrap;
.face-item {
width: 203.2px;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
margin-right: 42px;
margin-bottom: 26px;
&:nth-child(3) {
margin-bottom: 0;
}
&:nth-child(4) {
margin-bottom: 0;
}
.face-image {
width: 203.2px;
height: 270.4px;
border-radius: 4px;
border: 1px solid #cccccc;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
&:hover {
border: 1px solid #055FE7;
box-shadow: 0px 10px 30px 2px rgba(0, 0, 0, 0.16);
}
img {
width: 100%;
height: auto;
}
.zwtx {
font-size: 12px;
color: #999999;
}
.idCard {
height: 119px;
width: 100%;
}
}
.face-name {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #666666;
}
}
}
}
.tzdDrawing {
width: 640px;
......@@ -1038,7 +1090,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
position: relative;
width: 336px;
height: 184px;
background: #F6F8FA;
background: #f6f8fa;
box-shadow: 0px -1px 2px 0px rgba(5, 95, 231, 0.25);
border-radius: 4px;
.top-title {
......@@ -1130,6 +1182,18 @@ $transOrigin: var(--transOrigin, 0px, 0px);
}
}
}
.mask {
position: absolute;
z-index: 99;
opacity: 0.5;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: #f6f8fa;
box-shadow: 0px -1px 2px 0px rgba(5, 95, 231, 0.25);
border-radius: 4px;
}
}
.options-line {
width: 336px;
......@@ -1193,8 +1257,9 @@ $transOrigin: var(--transOrigin, 0px, 0px);
cursor: pointer;
width: 40px;
height: 40px;
background: #FFFFFF;
box-shadow: 0px 2px 4px 0px rgba(5, 95, 231, 0.3), 0px 0px 4px 0px rgba(5, 95, 231, 0.15);
background: #ffffff;
box-shadow: 0px 2px 4px 0px rgba(5, 95, 231, 0.3),
0px 0px 4px 0px rgba(5, 95, 231, 0.15);
border-radius: 4px;
display: flex;
justify-content: center;
......@@ -1218,7 +1283,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
color: #ffffff;
}
}
// .tzd-d {
// position: relative;
// cursor: pointer;
......@@ -1251,17 +1316,17 @@ $transOrigin: var(--transOrigin, 0px, 0px);
.featuresActive {
width: 40px;
height: 40px;
background: #E9F3FD;
background: #e9f3fd;
box-shadow: 1px 1px 3px 0px rgba(5, 95, 231, 0.5) inset;
border-radius: 4px;
}
.dp{
.dp {
cursor: pointer;
margin-left: 20px;
width: 40px;
height: 40px;
background: #E9F3FD;
background: #e9f3fd;
box-shadow: 1px 1px 3px 0px rgba(5, 95, 231, 0.5) inset;
border-radius: 4px;
display: flex;
......@@ -1278,7 +1343,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
height: 40px;
background: #ffffff;
box-shadow: 0px 2px 4px 0px rgba(5, 95, 231, 0.3),
0px 0px 4px 0px rgba(5, 95, 231, 0.15);
0px 0px 4px 0px rgba(5, 95, 231, 0.15);
border-radius: 4px;
display: flex;
align-items: center;
......@@ -1420,12 +1485,13 @@ $transOrigin: var(--transOrigin, 0px, 0px);
font-family: MicrosoftYaHei;
color: #999999;
}
.dqzwtz,.qbzwtz {
.dqzwtz,
.qbzwtz {
width: 32px;
height: 32px;
background: #FFFFFF;
background: #ffffff;
border-radius: 4px;
border: 1px solid #AEB5C2;
border: 1px solid #aeb5c2;
display: flex;
align-items: center;
justify-content: center;
......@@ -1436,14 +1502,14 @@ $transOrigin: var(--transOrigin, 0px, 0px);
width: auto;
}
&:hover {
border: 1px solid #055FE7;
border: 1px solid #055fe7;
}
}
.qbzwtz {
margin-left: 9px;
}
.active {
border: 1px solid #055FE7;
border: 1px solid #055fe7;
}
.save-type {
......@@ -1505,10 +1571,11 @@ $transOrigin: var(--transOrigin, 0px, 0px);
}
}
.options-bottom {
position: relative;
margin-top: 16px;
width: 336px;
height: 488px;
background: #F6F8FA;
background: #f6f8fa;
box-shadow: 0px -1px 2px 0px rgba(5, 95, 231, 0.25);
border-radius: 4px;
font-size: 15px;
......@@ -1614,11 +1681,11 @@ $transOrigin: var(--transOrigin, 0px, 0px);
.disabled {
width: 64px;
height: 32px;
background: #ECEDF1;
background: #ecedf1;
border-radius: 4px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #AEAFB4;
color: #aeafb4;
display: flex;
justify-content: center;
align-items: center;
......@@ -1705,6 +1772,18 @@ $transOrigin: var(--transOrigin, 0px, 0px);
.contrast-ratio {
margin-top: 10px;
}
.mask {
position: absolute;
z-index: 9999;
opacity: 0.5;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: #f6f8fa;
box-shadow: 0px -1px 2px 0px rgba(5, 95, 231, 0.25);
border-radius: 4px;
}
}
}
}
......
src/views/Editor/modules/ryzwbjLeft.scss
......@@ -178,11 +178,38 @@
color: #666666;
}
}
.handDom {
overflow: hidden;
.fingerPic {
width: 258px;
height: 258px;
background: #ffffff;
border-radius: 2px;
border: 1px solid #cccccc;
overflow: hidden;
}
.absence {
overflow: hidden;
position: relative;
width: 258px;
height: 258px;
background: #ffffff;
border-radius: 2px;
border: 1px solid #cccccc;
display: flex;
justify-content: center;
align-items: center;
img {
width: 80%;
height: 80%;
}
}
}
}
}
.isHasData {
background: #ECEDF1;
color: #AEAFB4;
background: #ecedf1;
color: #aeafb4;
}
.finger-total {
margin-top: 100px;
......@@ -203,6 +230,55 @@
padding: 0 4px;
}
}
.hand-total {
margin-top: 2px;
}
.face-total {
margin-top: 220px;
}
}
// 人像样式
.face {
display: flex;
align-items: center;
flex-wrap: wrap;
.face-item {
margin-right: 16px;
display: flex;
flex-direction: column;
align-items: center;
margin-bottom: 6px;
&:nth-child(2n) {
margin-right: 0;
}
.face-image {
width: 120px;
height: 161px;
border-radius: 4px;
border: 1px solid #cccccc;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
img {
width: 100%;
height: auto;
}
.zwtx {
font-size: 12px;
color: #999999;
}
.idCard {
height: 119px;
width: 100%;
}
}
.face-name {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #666666;
}
}
}
}
}
src/views/Home.vue
......@@ -107,6 +107,11 @@
<img src="../assets/img/loadingtxt.gif" alt="" />
</div>
</div>
<!-- 人像 -->
<div class="face-big" v-show="enLargeFace">
<img src="@/assets/img/下载.jpg" alt="">
</div>
</div>
</template>
......@@ -153,6 +158,14 @@ export default {
});
console.log(this.smallLoading);
document.querySelector('.shadow').addEventListener('click', function(e) {
// 如果图像是处于放大状态
if(self.enLargeFace) {
self.isCropper = false
self.$store.commit('ryzwbj/setEnlargeFace', false)
}
})
},
updated () {
this.menuActive = this.$route.name;
......@@ -165,6 +178,7 @@ export default {
willRoute: (state) => state.loading.willRoute,
jumproute: (state) => state.loading.jumproute,
smallLoading: (state) => state.loading.smallLoading,
enLargeFace: (state) => state.loading.enLargeFace,
}),
cachePageName () {
return this.$store.state.layout.cachePageName;
......@@ -493,6 +507,18 @@ export default {
};
</script>
<style scoped lang="scss">
// 人像
.face-big {
position: absolute;
top: 0;
left: 0;
width: 543px;
height: 722px;
box-shadow: 0px 14px 30px 2px rgba(0, 21, 51, 0.16);
border-radius: 8px;
border: 1px solid #CCCCCC;
}
/deep/.dialog-footer {
margin-top: 26px;
width: 100%;
......
src/views/bzxxgl/bzxxfh.vue
<!--
* @Author: your name
* @Date: 2021-12-01 15:25:22
* @LastEditTime: 2021-12-01 21:38:10
* @LastEditTime: 2021-12-02 23:06:47
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\AllPersonnelBase\bzxxfh.vue
......@@ -121,11 +121,7 @@
<el-table-column prop="nydwGajgmc" label="操作" width="auto">
<template slot-scope="scope">
<div v-show="scope.row.nydwGajgmc==='待复核'" :class="{dfh: scope.row.nydwGajgmc==='待复核'}">{{scope.row.nydwGajgmc}}</div>
<!-- <div @click="cxfhChange(scope.row)" v-show="scope.row.nydwGajgmc==='撤销复核'" :class="{cxfh: scope.row.nydwGajgmc==='撤销复核'}">{{scope.row.nydwGajgmc}}</div> -->
<el-popover @click="cxfhChange(scope.row)" v-show="scope.row.nydwGajgmc==='撤销复核'" :class="{cxfh: scope.row.nydwGajgmc==='撤销复核'}" placement="left" title="标题" width="200" trigger="click">
<div slot="reference" class="cursor: pointer;">撤销复核</div>
</el-popover>
<div @click="cxfhChange($event,scope.row)" v-show="scope.row.nydwGajgmc==='撤销复核'" :class="{cxfh: scope.row.nydwGajgmc==='撤销复核'}">{{scope.row.nydwGajgmc}}</div>
</template>
</el-table-column>
</el-table>
......@@ -138,6 +134,21 @@
</div>
</div>
</div>
<div class="cxfh-dialog" v-show="cxfhVisiable">
<div class="cxfh-header">
<div class="header-left">撤销复核</div>
<div class="iconfont icon-danchuangguanbianniu" @click="closeCxfh"></div>
</div>
<div class="cxfh-line"></div>
<div class="cxfh-content">
<el-input type="textarea" :rows="6" placeholder="请输入内容" v-model="textarea">
</el-input>
</div>
<div class="cxfh-footer">
<div class="confirm-btn" @click="confirmCxfh">确认</div>
<div class="cancel-btn" @click="closeCxfh">取消</div>
</div>
</div>
</div>
</template>
......@@ -209,6 +220,97 @@ export default {
ifidcard: "复核无效",
nydwGajgmc: "撤销复核",
},
{
ysxtAsjxgrybh: "A1231231231231231231232",
xm: "R1231231231231231231232",
zjhm: "滚动-右环",
csrq: "平面-右中",
xbdm: "湖南省长沙市",
rollcount: "闪电",
plancount: "2021-02-13",
plamcount: "张三李四",
piccount: "2021-02-13",
ifidcard: "复核无效",
nydwGajgmc: "撤销复核",
},
{
ysxtAsjxgrybh: "A1231231231231231231232",
xm: "R1231231231231231231232",
zjhm: "滚动-右环",
csrq: "平面-右中",
xbdm: "湖南省长沙市",
rollcount: "闪电",
plancount: "2021-02-13",
plamcount: "张三李四",
piccount: "2021-02-13",
ifidcard: "复核无效",
nydwGajgmc: "撤销复核",
},
{
ysxtAsjxgrybh: "A1231231231231231231232",
xm: "R1231231231231231231232",
zjhm: "滚动-右环",
csrq: "平面-右中",
xbdm: "湖南省长沙市",
rollcount: "闪电",
plancount: "2021-02-13",
plamcount: "张三李四",
piccount: "2021-02-13",
ifidcard: "复核无效",
nydwGajgmc: "撤销复核",
},
{
ysxtAsjxgrybh: "A1231231231231231231232",
xm: "R1231231231231231231232",
zjhm: "滚动-右环",
csrq: "平面-右中",
xbdm: "湖南省长沙市",
rollcount: "闪电",
plancount: "2021-02-13",
plamcount: "张三李四",
piccount: "2021-02-13",
ifidcard: "复核无效",
nydwGajgmc: "撤销复核",
},
{
ysxtAsjxgrybh: "A1231231231231231231232",
xm: "R1231231231231231231232",
zjhm: "滚动-右环",
csrq: "平面-右中",
xbdm: "湖南省长沙市",
rollcount: "闪电",
plancount: "2021-02-13",
plamcount: "张三李四",
piccount: "2021-02-13",
ifidcard: "复核无效",
nydwGajgmc: "撤销复核",
},
{
ysxtAsjxgrybh: "A1231231231231231231232",
xm: "R1231231231231231231232",
zjhm: "滚动-右环",
csrq: "平面-右中",
xbdm: "湖南省长沙市",
rollcount: "闪电",
plancount: "2021-02-13",
plamcount: "张三李四",
piccount: "2021-02-13",
ifidcard: "复核无效",
nydwGajgmc: "撤销复核",
},
{
ysxtAsjxgrybh: "A1231231231231231231232",
xm: "R1231231231231231231232",
zjhm: "滚动-右环",
csrq: "平面-右中",
xbdm: "湖南省长沙市",
rollcount: "闪电",
plancount: "2021-02-13",
plamcount: "张三李四",
piccount: "2021-02-13",
ifidcard: "复核无效",
nydwGajgmc: "撤销复核",
},
],
isShowTip: false, //批量操作提示
multipleSelection: [], // 表单选择项目
......@@ -218,7 +320,11 @@ export default {
// 当前页的数据条数
currentPageSize: 10,
// 数据总条数
total: 100
total: 100,
// 撤销复核原因
textarea: '',
// 撤销复核弹窗显示/隐藏
cxfhVisiable: false
}
},
components: {
......@@ -237,10 +343,33 @@ export default {
},
methods: {
/**
* 确认撤销复核
*/
confirmCxfh() {
this.cxfhVisiable = false
// 置空
this.textarea = ''
},
/**
* 关闭撤销复核弹窗
*/
closeCxfh() {
this.cxfhVisiable = false
// 置空
this.textarea = ''
},
/**
* 撤销复核
*/
cxfhChange (data) {
cxfhChange (event, data) {
console.log(data);
let dialog = document.querySelector('.cxfh-dialog')
if((event.y/16) < 46.25) {
dialog.style.top = (event.y-163-60-25)/16 + 'rem'
} else {
dialog.style.top = '30.6875rem';
}
this.cxfhVisiable = true
},
/**
* @description: pageSize 改变时会触发
......
src/views/bzxxgl/scss/bzxxfh.scss
......@@ -296,7 +296,7 @@ $tableHeight: var(--tableHeight, 450px);
margin-right: 6px;
}
.el-tag {
margin-bottom: 16px;
margin-bottom: 16px;
width: 100%;
height: 40px;
background: #ddebff;
......@@ -316,7 +316,7 @@ $tableHeight: var(--tableHeight, 450px);
}
}
.bzxxfh-content-content-footer {
margin-top: 16px;
margin-top: 16px;
width: 100%;
display: flex;
align-items: center;
......@@ -371,6 +371,97 @@ $tableHeight: var(--tableHeight, 450px);
.delSelection /deep/ .el-table-column--selection .cell {
display: none;
}
.cxfh-dialog {
z-index: 99;
position: absolute;
right: 175px;
top: 280px;
width: 400px;
height: 326px;
background: #ffffff;
box-shadow: 0px 14px 30px 0px rgba(0, 0, 0, 0.25);
border-radius: 4px;
.cxfh-header {
display: flex;
align-items: center;
justify-content: space-between;
height: 50px;
width: 100%;
padding: 0 24px;
.header-left {
font-size: 16px;
font-family: MicrosoftYaHei;
color: #282F3C;
}
.icon-danchuangguanbianniu {
cursor: pointer;
font-size: 13px;
color: #B1B6C2;
}
}
.cxfh-line {
width: 100%;
height: 1px;
background-color: #eeeeee;
}
.cxfh-content {
padding: 24px;
/deep/.el-textarea__inner {
width: 352px;
height: 152px;
background: #F6F8FA;
box-shadow: 0px 1px 2px 0px rgba(5, 95, 231, 0.18);
border-radius: 4px;
}
}
.cxfh-footer {
width: 100%;
display: flex;
align-items: center;
justify-content: center;
.confirm-btn {
cursor: pointer;
display: flex;
align-items: center;
justify-content: center;
width: 72px;
height: 40px;
background: #ffffff;
border-radius: 4px;
border: 1px solid #aeb5c2;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #2e3846;
margin-right: 24px;
&:hover {
border: 1px solid #377FEC;
color: #377FEC;
}
&:active {
border: 1px solid #044CB9;
color: #044CB9;
}
}
.cancel-btn {
cursor: pointer;
display: flex;
align-items: center;
justify-content: center;
width: 72px;
height: 40px;
background: #055fe7;
border-radius: 4px;
border: 1px solid #aeb5c2;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #ffffff;
&:hover {
background: #377FEC;
}
&:active {
background: #044CB9;
}
}
}
}
}
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-02 11:55:08
* @LastEditTime: 2021-12-02 16:18:28
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......
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