Commit 8153e0db by maxiaohan

Merge remote-tracking branch 'origin/dev_zwpt' into dev_zwpt

parents aa4c3516 afbde7f9
......@@ -14140,6 +14140,7 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, /** @lends fabric.Stati
* @type Boolean
* @default
*/
// 禁止拖动
selectable: false,
/**
......
<!--
* @Author: your name
* @Date: 2021-09-07 09:58:13
* @LastEditTime: 2021-11-09 19:19:32
* @LastEditTime: 2021-11-11 16:53:12
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\App.vue
-->
<template>
<div id="app">
<router-view v-wechat-title="$route.meta.title"></router-view>
<router-view v-wechat-title="$route.meta.title"></router-view>
</div>
</template>
<script>
import zoom from './utils/autosize'
import zoom from "./utils/autosize";
export default {
created () {
console.log(window.innerHeight);
console.log(window.innerWidth);
},
mounted () {
console.log(this.$route);
// zoom('app')
// window.addEventListener('resize', function () {
// zoom('app')
// })
},
};
</script>
......@@ -41,12 +28,12 @@ export default {
box-sizing: border-box;
}
@font-face {
font-family: 'MicrosoftYaHei-Bold';
src: url('../src/assets/font/MSYHBD.ttf') format('truetype');
font-family: "MicrosoftYaHei-Bold";
src: url("../src/assets/font/MSYHBD.ttf") format("truetype");
}
@font-face {
font-family: 'MicrosoftYaHei';
src: url('../src/assets/font/MSYH.ttf') format('truetype');
font-family: "MicrosoftYaHei";
src: url("../src/assets/font/MSYH.ttf") format("truetype");
}
// 滚动条的宽度
/deep/ .el-table__body-wrapper::-webkit-scrollbar {
......@@ -64,7 +51,7 @@ export default {
th {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #282F3C;
color: #282f3c;
font-weight: normal;
}
}
......
......@@ -1126,14 +1126,18 @@ div {
display: flex;
align-items: center;
padding: 0 24px;
color: #666666;
.btn {
cursor: pointer;
background: #f6f8fa;
box-shadow: 4px 4px 4px 0px rgba(193, 216, 251, 0.8),
-4px -4px 4px 0px #ffffff;
border-radius: 4px;
padding: 9px 12px;
// padding: 9px 12px;
width: 64px;
padding: 9px 0;
margin-right: 16px;
text-align: center;
&:last-child {
margin-right: 0;
}
......@@ -1144,6 +1148,10 @@ div {
color: #ffffff;
}
}
.light_dbd {
width: 128px;
height: 40px;
}
.line {
width: 1px;
height: 40px;
......
<!--
* @Author: your name
* @Date: 2021-09-09 09:28:46
* @LastEditTime: 2021-11-08 20:01:12
* @LastEditTime: 2021-11-09 21:14:34
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue
......@@ -401,7 +401,7 @@
<div class="btn" :class="{blendActive: isBlendActive}" @click="changeBlend">差异化</div>
<div class="btn" :class="{multiplyActive: isMultiplyActive}" @click="changeMultiply">正片叠底</div>
<div class="btn" :class="{removeWhiteActive: isRemoveWhiteActive}" @click="changeRemoveWhite">去白</div>
<div class="btn" :class="{brightnessActive: isBrightnessActive}" @click="changeBrightness">亮度/对比度</div>
<div class="btn light_dbd" :class="{brightnessActive: isBrightnessActive}" @click="changeBrightness">亮度/对比度</div>
<!-- 去白弹框 -->
<div class="remove-white" v-show="optionsRemoveWhite">
<div class="title">去白</div>
......
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-05 11:09:01
* @LastEditTime: 2021-11-11 16:58:07
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\router\index.js
......@@ -67,7 +67,7 @@ const router = new VueRouter({
router.beforeEach((to, from, next) => {
console.log(from);
if(from.name === 'ryzwbj') {
if(from.name === 'ryzwbj' || from.name === 'ajzwbj') {
// 清空session
sessionStorage.clear()
}
......
/*
* @Author: your name
* @Date: 2021-09-07 09:58:13
* @LastEditTime: 2021-11-04 09:26:19
* @LastEditTime: 2021-11-11 16:58:44
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\router\modules\index.js
*/
import leftMenu from './leftMenu'
export default [
{
path: "/",
......@@ -29,278 +30,7 @@ export default [
auth: "5"
},
component: () => import("@/views/Home.vue"),
children: [
{
path: "htzwcj",
name: "htzwcj",
hidden: true,
meta: {
title: "活体指纹采集",
auth: "5"
},
component: () => import("@/views/htzwcj.vue")
},
{
path: "/zzwcj",
name: "zzwcj",
hidden: false,
icon_d: "/img/zzwcj_d.png",
icon_a: "/img/zzwcj_a.png",
meta: {
title: "指掌纹采集",
auth: "5"
},
component: () => import("@/views/zzwcj/Index.vue")
},
{
path: "/zzwlr",
name: "zzwlr",
hidden: false,
icon_d: "/img/zzwlr_d.png",
icon_a: "/img/zzwlr_a.png",
meta: {
title: "指掌纹录入",
auth: "5"
},
component: () => import("@/views/zzwlr/Index.vue"),
children: [
{
path: "/drFPTX",
name: "drFPTX",
hidden: false,
meta: {
title: "FPTX导入",
auth: "5"
},
component: () => import("@/views/drFPTX/Index.vue")
},
{
path: "/RAList",
name: "RAList",
hidden: false,
meta: {
title: "FPTX导入任务",
auth: "5"
},
component: () => import("@/views/drFPTX/RAList.vue")
},
{
path: "/BDList",
name: "BDList",
hidden: true,
meta: {
title: "FPTX导入",
auth: "5"
},
component: () => import("@/views/drFPTX/BDList.vue")
}
]
},
{
path: "/zwbj",
name: "zwbj",
hidden: true,
icon_d: "/img/zwbj_d.png",
icon_a: "/img/zwbj_a.png",
meta: {
title: "指纹编辑",
auth: "5"
},
component: () => import("@/views/Editor/Index.vue"),
children: [
{
path: "/zwbj/ryzwbj/:id/:barcode",
name: "ryzwbj",
hidden: true,
meta: {
title: "人员指纹编辑",
auth: "5"
},
component: () => import("@/views/Editor/ryzwbj.vue")
},
{
path: "/zwbj/ajzwbj/:id",
name: "ajzwbj",
hidden: true,
meta: {
title: "案件指纹导入及编辑",
auth: "5"
},
component: () => import("@/views/Editor/ajzwbj.vue")
}
]
},
{
path: "/cxyrd",
name: "cxyrd",
hidden: false,
icon_d: "/img/cxyrd_d.png",
icon_a: "/img/cxyrd_a.png",
meta: {
title: "查询与认定",
auth: "5"
},
component: () => import("@/views/cxyrd/QueryConfirm.vue")
},
{
path: "/zljc",
name: "zljc",
hidden: false,
icon_d: "/img/zljc_d.png",
icon_a: "/img/zljc_a.png",
meta: {
title: "质量检查",
auth: "5"
},
component: () => import("@/views/zljc/Index.vue")
},
{
path: "/daxx",
name: "daxx",
hidden: false,
icon_d: "/img/daxx_d.png",
icon_a: "/img/daxx_a.png",
meta: {
title: "档案信息",
auth: "5"
},
component: () => import("@/views/daxx/Index.vue")
},
{
path: "/AllPersonnelBaseIndex",
name: "AllPersonnelBaseIndex",
hidden: false,
icon_d: "/img/sszygl_d.png",
icon_a: "/img/sszygl_a.png",
meta: {
title: "数据资源管理",
auth: "5"
},
component: () => import("@/views/AllPersonnelBase/Index.vue"),
children: [
{
path: "/",
name: "AllPersonnelBase",
hidden: false,
meta: {
title: "全部人员库",
auth: "5"
},
component: () =>
import("@/views/AllPersonnelBase/AllPersonnelBase.vue")
},
{
path: "/qbalk",
name: "qbalk",
hidden: false,
meta: {
title: "全部案件库",
auth: "5"
},
component: () => import("@/views/AllPersonnelBase/qbalk.vue")
}
]
},
{
path: "/SystemManage",
name: "SystemManage",
icon_d: "/img/manage_d.png",
icon_a: "/img/manage_a.png",
hidden: false,
meta: {
title: "系统管理",
auth: "5"
},
component: () => import("@/views/SystemManage/Index.vue"),
children: [
{
path: "/",
name: "UserManage",
hidden: false,
meta: {
title: "用户管理",
auth: "5"
},
component: () => import("@/views/SystemManage/UserManage.vue")
},
{
path: "GroupManage",
name: "GroupManage",
hidden: false,
meta: {
title: "用户组管理",
auth: "5"
},
component: () => import("@/views/SystemManage/GroupManage.vue")
},
{
path: "RoleManage",
name: "RoleManage",
hidden: false,
meta: {
title: "角色管理",
auth: "5"
},
component: () => import("@/views/SystemManage/RoleManage.vue")
},
{
path: "PermissionManage",
name: "PermissionManage",
hidden: false,
meta: {
title: "权限管理",
auth: "5"
},
component: () =>
import("@/views/SystemManage/PermissionManage.vue"),
children: [
// {
// path: "/UserPermission",
// name: "UserPermission",
// hidden: true,
// meta: {
// title: "编辑用户权限",
// auth: "5"
// },
// component: () =>
// import("@/views/SystemManage/UserPermission.vue")
// },
// {
// path: "/GroupPermission",
// name: "GroupPermission",
// hidden: true,
// meta: {
// title: "编辑用户权限",
// auth: "5"
// },
// component: () =>
// import("@/views/SystemManage/GroupPermission.vue")
// }
]
}
]
},
{
path: "/UserPermission",
name: "UserPermission",
hidden: true,
meta: {
title: "编辑用户权限",
auth: "5"
},
component: () => import("@/views/SystemManage/UserPermission.vue")
},
{
path: "/GroupPermission",
name: "GroupPermission",
hidden: true,
meta: {
title: "编辑用户组权限",
auth: "5"
},
component: () => import("@/views/SystemManage/GroupPermission.vue")
}
]
children: leftMenu
},
{
path: "/Login1",
......
/*
* @Author: your name
* @Date: 2021-09-07 09:58:13
* @LastEditTime: 2021-11-11 16:37:15
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\router\modules\index.js
*/
export default [
{
path: "/htzwcj",
name: "htzwcj",
hidden: true,
meta: {
title: "活体指纹采集",
auth: "5"
},
component: () => import("@/views/htzwcj.vue")
},
{
path: "/zzwcj",
name: "zzwcj",
hidden: false,
icon_d: "/img/zzwcj_d.png",
icon_a: "/img/zzwcj_a.png",
meta: {
title: "指掌纹采集",
auth: "5"
},
component: () => import("@/views/zzwcj/Index.vue")
},
{
path: "/zzwlr",
name: "zzwlr",
hidden: false,
icon_d: "/img/zzwlr_d.png",
icon_a: "/img/zzwlr_a.png",
meta: {
title: "指掌纹录入",
auth: "5"
},
component: () => import("@/views/zzwlr/Index.vue"),
},
{
path: "/drFPTX",
name: "drFPTX",
hidden: false,
meta: {
title: "FPTX导入",
auth: "5"
},
component: () => import("@/views/drFPTX/Index.vue")
},
{
path: "/RAList",
name: "RAList",
hidden: false,
meta: {
title: "FPTX导入任务",
auth: "5"
},
component: () => import("@/views/drFPTX/RAList.vue")
},
{
path: "/BDList",
name: "BDList",
hidden: true,
meta: {
title: "FPTX导入",
auth: "5"
},
component: () => import("@/views/drFPTX/BDList.vue")
},
{
path: "/zwbj",
name: "zwbj",
hidden: true,
icon_d: "/img/zwbj_d.png",
icon_a: "/img/zwbj_a.png",
meta: {
title: "指纹编辑",
auth: "5"
},
component: () => import("@/views/Editor/Index.vue")
},
{
path: "/ryzwbj/:id/:barcode",
name: "ryzwbj",
hidden: true,
meta: {
title: "人员指纹编辑",
auth: "5"
},
component: () => import("@/views/Editor/ryzwbj.vue")
},
{
path: "/ajzwbj/:id",
name: "ajzwbj",
hidden: true,
meta: {
title: "案件指纹导入及编辑",
auth: "5"
},
component: () => import("@/views/Editor/ajzwbj.vue")
},
{
path: "/cxyrd",
name: "cxyrd",
hidden: false,
icon_d: "/img/cxyrd_d.png",
icon_a: "/img/cxyrd_a.png",
meta: {
title: "查询与认定",
auth: "5"
},
component: () => import("@/views/cxyrd/QueryConfirm.vue")
},
{
path: "/zljc",
name: "zljc",
hidden: false,
icon_d: "/img/zljc_d.png",
icon_a: "/img/zljc_a.png",
meta: {
title: "质量检查",
auth: "5"
},
component: () => import("@/views/zljc/Index.vue")
},
{
path: "/daxx",
name: "daxx",
hidden: false,
icon_d: "/img/daxx_d.png",
icon_a: "/img/daxx_a.png",
meta: {
title: "档案信息",
auth: "5"
},
component: () => import("@/views/daxx/Index.vue")
},
{
path: "/AllPersonnelBaseIndex",
name: "AllPersonnelBaseIndex",
hidden: false,
icon_d: "/img/sszygl_d.png",
icon_a: "/img/sszygl_a.png",
meta: {
title: "数据资源管理",
auth: "5"
},
component: () => import("@/views/AllPersonnelBase/Index.vue")
},
{
path: "/AllPersonnelBase",
name: "AllPersonnelBase",
hidden: false,
meta: {
title: "全部人员库",
auth: "5"
},
component: () =>
import("@/views/AllPersonnelBase/AllPersonnelBase.vue")
},
{
path: "/qbalk",
name: "qbalk",
hidden: false,
meta: {
title: "全部案件库",
auth: "5"
},
component: () => import("@/views/AllPersonnelBase/qbalk.vue")
},
{
path: "/SystemManage",
name: "SystemManage",
icon_d: "/img/manage_d.png",
icon_a: "/img/manage_a.png",
hidden: false,
meta: {
title: "系统管理",
auth: "5"
},
component: () => import("@/views/SystemManage/Index.vue")
},
{
path: "/UserManage",
name: "UserManage",
hidden: false,
meta: {
title: "用户管理",
auth: "5",
},
component: () => import("@/views/SystemManage/UserManage.vue")
},
{
path: "/GroupManage",
name: "GroupManage",
hidden: false,
meta: {
title: "用户组管理",
auth: "5",
},
component: () => import("@/views/SystemManage/GroupManage.vue")
},
{
path: "/RoleManage",
name: "RoleManage",
hidden: false,
meta: {
title: "角色管理",
auth: "5"
},
component: () => import("@/views/SystemManage/RoleManage.vue")
},
{
path: "/PermissionManage",
name: "PermissionManage",
hidden: false,
meta: {
title: "权限管理",
auth: "5"
},
component: () =>
import("@/views/SystemManage/PermissionManage.vue"),
// children: [
// {
// path: "/UserPermission",
// name: "UserPermission",
// hidden: true,
// meta: {
// title: "编辑用户权限",
// auth: "5"
// },
// component: () =>
// import("@/views/SystemManage/UserPermission.vue")
// },
// {
// path: "/GroupPermission",
// name: "GroupPermission",
// hidden: true,
// meta: {
// title: "编辑用户权限",
// auth: "5"
// },
// component: () =>
// import("@/views/SystemManage/GroupPermission.vue")
// }
// ]
},
{
path: "/UserPermission",
name: "UserPermission",
hidden: true,
meta: {
title: "编辑用户权限",
auth: "5"
},
component: () => import("@/views/SystemManage/UserPermission.vue")
},
{
path: "/GroupPermission",
name: "GroupPermission",
hidden: true,
meta: {
title: "编辑用户组权限",
auth: "5"
},
component: () => import("@/views/SystemManage/GroupPermission.vue")
}
]
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-04 11:13:48
* @LastEditors: your name
* @LastEditTime: 2021-11-11 15:47:50
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\store\index.js
*/
......@@ -12,13 +12,15 @@ import getters from "./getters";
import createPersistedState from "vuex-persistedstate";
import user from "./modules/user";
import zwbj from "./modules/zwbj"
import layout from "./modules/layout"
Vue.use(Vuex);
const store = new Vuex.Store({
modules: {
user,
zwbj
zwbj,
layout
},
getters,
plugins: [
......
/*
* @Author: your name
* @Date: 2021-11-02 15:41:31
* @LastEditTime: 2021-11-11 16:27:53
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\store\modules\user.js
*/
const state = {
cachePageName: '',
leftMenu: [
{
path: "htzwcj",
name: "htzwcj",
hidden: true,
meta: {
title: "活体指纹采集",
auth: "5"
},
},
{
path: "/zzwcj",
name: "zzwcj",
hidden: false,
icon_d: "/img/zzwcj_d.png",
icon_a: "/img/zzwcj_a.png",
meta: {
title: "指掌纹采集",
auth: "5"
},
},
{
path: "/zzwlr",
name: "zzwlr",
hidden: false,
icon_d: "/img/zzwlr_d.png",
icon_a: "/img/zzwlr_a.png",
meta: {
title: "指掌纹录入",
auth: "5"
},
children: [
{
path: "/drFPTX",
name: "drFPTX",
hidden: false,
meta: {
title: "FPTX导入",
auth: "5"
},
},
{
path: "/RAList",
name: "RAList",
hidden: false,
meta: {
title: "FPTX导入任务",
auth: "5"
},
},
{
path: "/BDList",
name: "BDList",
hidden: true,
meta: {
title: "FPTX导入",
auth: "5"
},
}
]
},
{
path: "/zwbj",
name: "zwbj",
hidden: true,
icon_d: "/img/zwbj_d.png",
icon_a: "/img/zwbj_a.png",
meta: {
title: "指纹编辑",
auth: "5"
},
children: [
{
path: "/zwbj/ryzwbj/:id/:barcode",
name: "ryzwbj",
hidden: true,
meta: {
title: "人员指纹编辑",
auth: "5"
},
},
{
path: "/zwbj/ajzwbj/:id",
name: "ajzwbj",
hidden: true,
meta: {
title: "案件指纹导入及编辑",
auth: "5"
},
}
]
},
{
path: "/cxyrd",
name: "cxyrd",
hidden: false,
icon_d: "/img/cxyrd_d.png",
icon_a: "/img/cxyrd_a.png",
meta: {
title: "查询与认定",
auth: "5"
},
},
{
path: "/zljc",
name: "zljc",
hidden: false,
icon_d: "/img/zljc_d.png",
icon_a: "/img/zljc_a.png",
meta: {
title: "质量检查",
auth: "5"
},
},
{
path: "/daxx",
name: "daxx",
hidden: false,
icon_d: "/img/daxx_d.png",
icon_a: "/img/daxx_a.png",
meta: {
title: "档案信息",
auth: "5"
},
},
{
path: "/AllPersonnelBaseIndex",
name: "AllPersonnelBaseIndex",
hidden: false,
icon_d: "/img/sszygl_d.png",
icon_a: "/img/sszygl_a.png",
meta: {
title: "数据资源管理",
auth: "5"
},
children: [
{
path: "/AllPersonnelBase",
name: "AllPersonnelBase",
hidden: false,
meta: {
title: "全部人员库",
auth: "5"
},
},
{
path: "/qbalk",
name: "qbalk",
hidden: false,
meta: {
title: "全部案件库",
auth: "5"
},
}
]
},
{
path: "/SystemManage",
name: "SystemManage",
icon_d: "/img/manage_d.png",
icon_a: "/img/manage_a.png",
hidden: false,
meta: {
title: "系统管理",
auth: "5"
},
children: [
{
path: "/UserManage",
name: "UserManage",
hidden: false,
meta: {
title: "用户管理",
auth: "5",
},
},
{
path: "/GroupManage",
name: "GroupManage",
hidden: false,
meta: {
title: "用户组管理",
auth: "5",
},
},
{
path: "/RoleManage",
name: "RoleManage",
hidden: false,
meta: {
title: "角色管理",
auth: "5"
},
},
{
path: "/PermissionManage",
name: "PermissionManage",
hidden: false,
meta: {
title: "权限管理",
auth: "5"
},
children: [
]
}
]
},
{
path: "/UserPermission",
name: "UserPermission",
hidden: true,
meta: {
title: "编辑用户权限",
auth: "5"
},
},
{
path: "/GroupPermission",
name: "GroupPermission",
hidden: true,
meta: {
title: "编辑用户组权限",
auth: "5"
},
}
],
};
const mutations = {
//直接修改缓存组件名称
resetcachePageName(state, res) {
state.cachePageName = res;
},
//添加缓存组件名称
addcachePageName(state, res) {
if (state.cachePageName == '') {
state.cachePageName = res;
} else {
let arr = state.cachePageName.split(',');
if (res && typeof res === 'string') {
let i = arr.indexOf(res);
if (i <= -1) {
state.cachePageName = state.cachePageName + ',' + res;
}
}
}
},
//删除缓存组件名称
delcachePageName(state, res) {
let arr = state.cachePageName.split(',');
if (res && typeof res === 'string') {
let i = arr.indexOf(res);
if (i > -1) {
arr.splice(i, 1);
state.cachePageName = arr.join();
}
}
}
};
export default {
namespaced: true,
state,
mutations,
};
/*
* @Author: your name
* @Date: 2021-11-02 15:41:31
* @LastEditTime: 2021-11-11 11:33:10
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\store\modules\user.js
*/
import { getToken, removeToken, setToken } from "@/utils/auth";
import { login } from "@/api/home";
......@@ -10,7 +18,7 @@ const state = {
// request: ""
// }
logs: [],
userAuth: ""
userAuth: "",
};
const mutations = {
......@@ -23,7 +31,7 @@ const mutations = {
},
SET_Auth: (state, content) => {
state.userAuth = content;
}
},
};
const actions = {
......
<!--
* @Author: your name
* @Date: 2021-09-07 10:21:30
* @LastEditTime: 2021-09-07 10:21:30
* @LastEditTime: 2021-11-11 16:35:46
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\AllPersonnelBase\Index.vue
-->
<template>
<div>
<router-view></router-view>
</div>
<div>
</div>
</template>
<script>
export default {
}
export default {
name: 'AllPersonnelBaseIndex'
};
</script>
<style lang="scss" scoped>
</style>
\ No newline at end of file
......@@ -407,7 +407,7 @@ import ggrytm from "./modules/ggrytm.vue"// 更改人员条码弹窗
import fcx from "./modules/fcx.vue" // 发查询弹窗
import xzaj from "./modules/xzaj.vue"// 新增案件
export default {
name: "AllPersonnelBase",
name: "qbalk",
components: {
tjddl,
dcfptxAj,
......@@ -734,12 +734,7 @@ export default {
*/
handleClick (row) {
console.log(row);
this.$router.push({
path: '/zwbj/ajzwbj/' + row.id,
query: {
barcode: row.barcode
}
})
this.$router.push('/zwbj/ajzwbj/' + row.id + '/' + row.ysxtAsjbh)
},
/**
* @description: 单选事件
......
<!--
* @Author: your name
* @Date: 2021-09-08 13:03:22
* @LastEditTime: 2021-10-22 09:58:38
* @LastEditTime: 2021-11-11 16:33:53
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\Editor\Index.vue
-->
<template>
<div class="ryzwbj-index">
<router-view></router-view>
</div>
<div class="ryzwbj-index">
</div>
</template>
<script>
export default {
}
export default {
name: 'zwbj'
};
</script>
<style lang="scss" scoped>
.ryzwbj-index {
width: 100%;
height: calc(100% - 47px);
width: 100%;
height: calc(100% - 47px);
}
</style>
\ No newline at end of file
<!--
* @Author: your name
* @Date: 2021-09-08 13:01:23
* @LastEditTime: 2021-10-23 11:50:35
* @LastEditTime: 2021-11-11 16:34:29
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\Editor\ajzwbj.vue
......@@ -17,6 +17,7 @@
import ajzwbjLeft from './modules/ajzwbjLeft.vue';
import imageEDAJ from './modules/imageEdAJ.vue';
export default {
name: 'ajzwbj',
components: {
ajzwbjLeft,
imageEDAJ
......
<!--
* @Author: your name
* @Date: 2021-10-22 09:42:07
* @LastEditTime: 2021-11-01 20:35:57
* @LastEditTime: 2021-11-10 16:05:35
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
......@@ -23,11 +23,12 @@
</div>
<div class="left-right-hand" v-if="zwSelect==='指纹'">
<div class="lr-hand" v-if="fingers.length>0">
<div class="fingerDom" v-for="(item,index) in fingers" :key="index" @click="FingersChange(index)">
<div class="fingerDom" v-for="(item,index) in fingers" :key="index" @click="FingersChange(index, item)">
<div class="fingerPic" :class="{fingerPicActive: activeFinger===index}">
<div class="finger-number">{{(index+1) &lt; 10 ? ('0'+(index+1)) : (index+1)}}</div>
<div class="finger-pic">
<img src="../../../assets/img/finger.png" />
<!-- <img src="../../../assets/img/finger.png" /> -->
<img :src="'data:image/jpeg;base64,'+item.image" alt="">
</div>
</div>
</div>
......@@ -39,7 +40,7 @@
</div>
</div>
<div class="finger-total">
共计<span>4</span>指纹
共计<span>{{fingers.length}}</span>指纹
</div>
</div>
<div class="left-right-hand" v-else-if="zwSelect==='掌纹'">
......@@ -48,7 +49,8 @@
<div class="fingerPic" :class="{fingerPicActive: activeHand===index}">
<div class="finger-number">{{(index+1) &lt; 10 ? ('0'+(index+1)) : (index+1)}}</div>
<div class="finger-pic">
<img src="../../../assets/img/zhangwen.png" />
<!-- <img src="../../../assets/img/zhangwen.png" /> -->
<img :src="'data:image/jpeg;base64,'+item.image" alt="">
</div>
</div>
</div>
......@@ -69,9 +71,12 @@
</template>
<script>
import { mapState } from 'vuex';
export default {
data () {
return {
// 上一次的指纹序号
preSeq: '',
// 案事件编号
barcode: '',
id: '',
......@@ -131,28 +136,116 @@ export default {
],
}
},
computed: {
...mapState({
seq: state => state.zwbj.seq,
preTzdArr: state => state.zwbj.pretzdall,
autopretzdall: state => state.zwbj.autopretzdall,
})
},
mounted () {
let self = this
console.log(this.$route);
this.barcode = this.$route.query.barcode
this.barcode = this.$route.params.barcode
this.id = this.$route.params.id
self.preSeq = this.activerollFinger
// 获取案件指纹
this.getCaseFinger()
},
methods: {
/**
* @description: 切换掌纹
* @param {*} handIndex
* @return {*}
* 获取案件指纹原图
*/
FingersChange (handIndex) {
this.activeHand = handIndex
getCaseOrigin (seq) {
this.$store.commit('zwbj/setSeq', seq)
let self = this
this.$axios({
method: 'get',
url: `/api/org/case/${self.id}/${seq}?mnt=1`,
loading: false
}).then(res => {
console.log(res);
if (res.data.code === 0) {
for (const key in res.data.ret) {
if (Object.hasOwnProperty.call(res.data.ret, key)) {
const element = res.data.ret[key];
// 指纹编辑区域发送指纹数据,替换指纹图片
self.$bus.emit('ajzwbjImage', element.image)
self.$bus.emit('ajzwbjTDZ')
}
}
}
})
},
/**
* 获取案件指纹
*/
getCaseFinger () {
let self = this
this.$axios({
method: 'get',
url: '/api/org/case/' + self.id + '?mnt=1'
}).then(res => {
// console.log(res);
if (res.data.code === 0) {
// self.fingers = res.data.ret
self.fingers = []
for (const key in res.data.ret) {
if (Object.hasOwnProperty.call(res.data.ret, key)) {
const element = res.data.ret[key];
self.fingers.push({
code: element.seq,
image: element.image
})
}
}
// console.log(self.fingers);
// 自动获取第一个
if (self.fingers.length > 0) {
this.activeFinger = 0
self.FingersChange(0, self.fingers[0])
}
} else {
self.$message.error(res.data.message)
}
}).catch(err => {
console.log(err);
})
},
// /**
// * @description: 切换掌纹
// * @param {*} handIndex
// * @return {*}
// */
// FingersChange (handIndex) {
// this.activeHand = handIndex
// },
/**
* @description: 切换指纹
* @param {*} finger
* @return {*}
*/
FingersChange (fingerIndex) {
FingersChange (fingerIndex, finger) {
console.log(fingerIndex);
this.activeFinger = fingerIndex
let self = this
if (this.preSeq) {
// 保存当前的指位特征点信息
// 直接覆盖之前的数据
console.log(self.preTzdArr);
if (self.preTzdArr && self.preTzdArr.length >= 0) {
sessionStorage.setItem(this.preSeq, JSON.stringify(self.preTzdArr))
sessionStorage.setItem(`auto_tzdDom${this.preSeq}`, JSON.stringify(self.autopretzdall))
}
self.$store.commit('zwbj/setTzdall', null)
self.$store.commit('zwbj/setAutoTzdall', null)
}
this.preSeq = finger.code
// 调取获取原图接口
this.getCaseOrigin(finger.code)
},
/**
* @description: 滚动指纹-平面指纹-掌纹切换
......
......@@ -944,6 +944,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
background: transparent;
overflow: hidden;
transform-origin: 320px 320px;
z-index: 9999;
// transform-origin: $transOrigin;
// background-color: #999;
}
......
......@@ -844,6 +844,7 @@ $directionRotate: var(--directionRotate, 0deg);
background: transparent;
overflow: hidden;
transform-origin: 320px 320px;
z-index: 9999;
// transform-origin: $transOrigin;
// background-color: #999;
}
......@@ -1114,6 +1115,7 @@ $directionRotate: var(--directionRotate, 0deg);
display: flex;
align-items: center;
padding: 0 16px;
position: relative;
.blcbtn {
cursor: pointer;
width: 40px;
......@@ -1131,6 +1133,35 @@ $directionRotate: var(--directionRotate, 0deg);
height: 26px;
}
}
.blcbtn-options {
z-index: 100;
position: absolute;
top: 50px;
left: 16px;
width: 286px;
height: 285px;
background: #ffffff;
box-shadow: 0px 14px 30px 0px rgba(0, 21, 51, 0.25);
border-radius: 6px;
.blcbtn-head {
display: flex;
align-items: center;
justify-content: space-between;
border-bottom: 1px solid #e6e6e8;
height: 50px;
padding: 0 24px;
.head-title {
font-size: 16px;
font-family: MicrosoftYaHei;
color: #282f3c;
}
.head-close {
cursor: pointer;
color: #b1b6c2;
font-size: 20px;
}
}
}
.txblyz {
cursor: pointer;
margin-right: 28px;
......
<!--
* @Author: your name
* @Date: 2021-09-08 13:00:08
* @LastEditTime: 2021-10-28 20:47:54
* @LastEditTime: 2021-11-11 16:34:11
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\Editor\ryzwbj.vue
......@@ -17,6 +17,7 @@
import ryzwbjLeft from './modules/ryzwbjLeft.vue';
import imageEd from './modules/imageEd.vue';
export default {
name: 'ryzwbj',
components: {
ryzwbjLeft,
imageEd
......
......@@ -106,48 +106,23 @@
<el-main class="main">
<div class="contain">
<el-tabs
closable
:closable="paths.length > 1"
v-model="routePath"
@tab-click="handleClick"
@tab-remove="tabRemove"
>
<el-tab-pane
label="活体指纹采集"
name="/Home/htzwcj"
></el-tab-pane>
<el-tab-pane
:label="item.name"
:name="item.path"
v-for="(item, i) in paths"
:key="i"
:class="{ active: $route.path == item.path }"
v-for="item in paths"
:key="item.routeName"
></el-tab-pane>
</el-tabs>
<div class="breadcrumb">
<!-- <div
@click="goManager"
ref="path"
class="home-path path"
:class="{ active: $route.path == '/Home/htzwcj' }"
>
活体指纹采集
</div>
<div
class="path"
ref="path"
@click="changeRouter(item)"
v-for="(item, i) in paths"
:key="i"
:class="{ active: $route.path == item.path }"
>
<span>{{ item.name }}</span>
<div class="closeIcon" @click.stop="closePaths(item.name)">
×
</div>
</div> -->
</div>
<div class="breadcrumb"></div>
<!-- 路由出口 -->
<router-view></router-view>
<keep-alive :include="cachePageName">
<router-view></router-view>
</keep-alive>
</div>
</el-main>
</el-container>
......@@ -172,7 +147,7 @@ export default {
data() {
return {
searchTxt: "",
routes: indexRoutes[2].children,
routes: this.$store.state.layout.leftMenu,
isCollapse: false,
leftImg: require("../assets/img/Home/left.png"),
rightImg: require("../assets/img/Home/right.png"),
......@@ -184,6 +159,9 @@ export default {
},
mounted() {
this.menuActive = this.$route.name;
setTimeout(() => {
console.log(this.$store.state.layout.leftMenu, 9999);
}, 200);
// console.log(this.$route);
// zoom('home')
// window.addEventListener('resize', function () {
......@@ -195,6 +173,9 @@ export default {
},
computed: {
...mapGetters(["defaultGoodsImage", "userAuth"]),
cachePageName() {
return this.$store.state.layout.cachePageName;
},
},
methods: {
/**
......@@ -250,11 +231,25 @@ export default {
this.paths = res;
console.log(pathName == this.$route.meta.title);
if (pathName == this.$route.meta.title) {
this.$router.push("/Home/htzwcj");
this.$refs.menu.activeIndex = "";
if (this.paths.length > 0) {
this.$router.push(this.paths[0].path);
this.routePath = this.paths[0].path;
}
}
}
sessionStorage.setItem("crumbs", JSON.stringify(this.paths));
this.setKeepAlive();
},
setKeepAlive() {
let cachePageName;
if (JSON.parse(sessionStorage.getItem("crumbs")).length > 0) {
cachePageName = JSON.parse(sessionStorage.getItem("crumbs"))
.map((i) => i.routeName)
.join();
} else {
cachePageName = "";
}
this.$store.commit("layout/resetcachePageName", cachePageName);
},
/**
* @description: 调回任务管理
......@@ -341,14 +336,12 @@ export default {
}
}
sessionStorage.setItem("crumbs", JSON.stringify(this.paths));
this.setKeepAlive();
}, 0);
},
immediate: true,
},
},
mounted() {
console.log(this.$refs.path);
},
created() {
this.paths = sessionStorage.getItem("crumbs")
? JSON.parse(sessionStorage.getItem("crumbs"))
......@@ -504,16 +497,16 @@ export default {
position: relative;
padding-right: 35px !important;
padding-left: 35px !important;
&:not(:nth-of-type(2)) {
&:hover {
.el-icon-close {
display: inline-block;
}
&:hover {
.el-icon-close {
display: inline-block;
}
}
.el-icon-close {
&::before{
transform: scale(1.1)
&::before {
transform: scale(1.1);
}
display: none;
position: absolute;
......
<!--
* @Author: your name
* @Date: 2021-11-02 15:41:31
* @LastEditTime: 2021-11-11 16:36:26
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\views\SystemManage\Index.vue
-->
<template>
<div>
<router-view></router-view>
</div>
</template>
<script>
export default {
name: "Index.vue"
name: 'SystemManage'
};
</script>
......
......@@ -359,7 +359,7 @@
import "@/icons/group-item.svg";
export default {
name: "AuthManage",
name: "PermissionManage",
created() {
let w1 = 1920;
let w2 = window.innerWidth;
......
......@@ -432,7 +432,7 @@ import SvgIcon from "../../components/SvgIcon/index.vue";
import "@/icons/tree_f.svg";
import "@/icons/tree_c.svg";
export default {
name: "QueryConfirm",
name: "cxyrd",
components: { SvgIcon },
data() {
return {
......
<!--
* @Author: your name
* @Date: 2021-09-07 10:46:50
* @LastEditTime: 2021-09-07 10:46:50
* @LastEditTime: 2021-11-11 16:35:23
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\daxx\Index.vue
......@@ -14,7 +14,7 @@
<script>
export default {
name: 'daxx'
}
</script>
......
......@@ -248,7 +248,7 @@ import SvgIcon from "../../components/SvgIcon/index.vue";
import "@/icons/tree_f.svg";
import "@/icons/tree_c.svg";
export default {
name: "QueryConfirm",
name: "BDList",
components: { SvgIcon },
data () {
return {
......
......@@ -425,7 +425,7 @@
const targetOptions_ry = ['基本人员库', '高危人员库', '非法人员库', '在逃人员库', '布控人员库', '前科人员库', '协查人员库'];
const targetOptions_aj = ['本地案件库', '比中案件库', '已破案件库', '重大案件库', 'B类案件库', 'C类案件库', '勘查案件库', '协查案件库'];
export default {
name: 'drFTPX',
name: 'drFPTX',
components: {
},
mounted () {
......
<!--
* @Author: your name
* @Date: 2021-09-07 11:08:38
* @LastEditTime: 2021-09-07 11:08:38
* @LastEditTime: 2021-11-11 16:31:18
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\htzwcj.vue
......@@ -14,6 +14,7 @@
<script>
export default {
name: 'htzwcj'
}
</script>
......
<!--
* @Author: your name
* @Date: 2021-09-07 10:36:02
* @LastEditTime: 2021-09-07 10:36:03
* @LastEditTime: 2021-11-11 16:35:09
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\zljc\Index.vue
......@@ -14,7 +14,7 @@
<script>
export default {
name: 'zljc'
}
</script>
......
<!--
* @Author: your name
* @Date: 2021-09-07 10:28:38
* @LastEditTime: 2021-10-28 10:36:24
* @LastEditTime: 2021-11-11 16:31:31
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\zzwcj\Index.vue
-->
<template>
<div id="zzwcl">
指掌纹采集
</div>
<div id="zzwcl">指掌纹采集</div>
</template>
<script>
export default {
mounted () {
zoom('zzwcl')
window.addEventListener('resize', function () {
zoom('zzwcl')
})
name: "zzwcj",
mounted() {
zoom("zzwcl");
window.addEventListener("resize", function () {
zoom("zzwcl");
});
},
}
};
</script>
<style lang="scss" scoped>
</style>
\ No newline at end of file
<!--
* @Author: your name
* @Date: 2021-09-07 10:31:34
* @LastEditTime: 2021-10-28 20:20:08
* @LastEditTime: 2021-11-11 16:31:53
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\zzwlr\Index.vue
-->
<template>
<div id="zzwlr">
<router-view></router-view>
</div>
<div id="zzwlr"></div>
</template>
<script>
import zoom from '@/utils/autosize';
import zoom from "@/utils/autosize";
export default {
mounted () {
// zoom('zzwlr')
// window.addEventListener('resize', function () {
// zoom('zzwlr')
// })
},
}
name: 'zzwlr'
};
</script>
<style lang="scss" scoped>
......
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-08 20:01:14
* @LastEditTime: 2021-11-10 09:47:04
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -92,13 +92,12 @@ module.exports = {
// target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
// target: "http://172.18.108.2:8099/", // 张 认定
// target: "http://192.168.128.112:8099", // 湖南-张
// target: "http://192.168.128.114:8099", // 湖南-马
target: "http://192.168.128.114:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王
// target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
// target: "http://127.0.0.1:8099",
// target: "http://47.92.225.109:5602",
// target: "http://192.168.128.109:8765", // 湖南-王
target: "http://www.meetfood.cn:2390/", // 湖南-线上
// target: "http://www.meetfood.cn:2390/", // 湖南-线上
ws: 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