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 ...@@ -14140,6 +14140,7 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, /** @lends fabric.Stati
* @type Boolean * @type Boolean
* @default * @default
*/ */
// 禁止拖动
selectable: false, selectable: false,
/** /**
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:58:13 * @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 * @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
...@@ -13,21 +13,8 @@ ...@@ -13,21 +13,8 @@
</template> </template>
<script> <script>
import zoom from './utils/autosize' import zoom from "./utils/autosize";
export default { 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> </script>
...@@ -41,12 +28,12 @@ export default { ...@@ -41,12 +28,12 @@ export default {
box-sizing: border-box; box-sizing: border-box;
} }
@font-face { @font-face {
font-family: 'MicrosoftYaHei-Bold'; font-family: "MicrosoftYaHei-Bold";
src: url('../src/assets/font/MSYHBD.ttf') format('truetype'); src: url("../src/assets/font/MSYHBD.ttf") format("truetype");
} }
@font-face { @font-face {
font-family: 'MicrosoftYaHei'; font-family: "MicrosoftYaHei";
src: url('../src/assets/font/MSYH.ttf') format('truetype'); src: url("../src/assets/font/MSYH.ttf") format("truetype");
} }
// 滚动条的宽度 // 滚动条的宽度
/deep/ .el-table__body-wrapper::-webkit-scrollbar { /deep/ .el-table__body-wrapper::-webkit-scrollbar {
...@@ -64,7 +51,7 @@ export default { ...@@ -64,7 +51,7 @@ export default {
th { th {
font-size: 14px; font-size: 14px;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
color: #282F3C; color: #282f3c;
font-weight: normal; font-weight: normal;
} }
} }
......
...@@ -1126,14 +1126,18 @@ div { ...@@ -1126,14 +1126,18 @@ div {
display: flex; display: flex;
align-items: center; align-items: center;
padding: 0 24px; padding: 0 24px;
color: #666666;
.btn { .btn {
cursor: pointer; cursor: pointer;
background: #f6f8fa; background: #f6f8fa;
box-shadow: 4px 4px 4px 0px rgba(193, 216, 251, 0.8), box-shadow: 4px 4px 4px 0px rgba(193, 216, 251, 0.8),
-4px -4px 4px 0px #ffffff; -4px -4px 4px 0px #ffffff;
border-radius: 4px; border-radius: 4px;
padding: 9px 12px; // padding: 9px 12px;
width: 64px;
padding: 9px 0;
margin-right: 16px; margin-right: 16px;
text-align: center;
&:last-child { &:last-child {
margin-right: 0; margin-right: 0;
} }
...@@ -1144,6 +1148,10 @@ div { ...@@ -1144,6 +1148,10 @@ div {
color: #ffffff; color: #ffffff;
} }
} }
.light_dbd {
width: 128px;
height: 40px;
}
.line { .line {
width: 1px; width: 1px;
height: 40px; height: 40px;
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-09-09 09:28:46 * @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 * @LastEditors: Please set LastEditors
* @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
...@@ -401,7 +401,7 @@ ...@@ -401,7 +401,7 @@
<div class="btn" :class="{blendActive: isBlendActive}" @click="changeBlend">差异化</div> <div class="btn" :class="{blendActive: isBlendActive}" @click="changeBlend">差异化</div>
<div class="btn" :class="{multiplyActive: isMultiplyActive}" @click="changeMultiply">正片叠底</div> <div class="btn" :class="{multiplyActive: isMultiplyActive}" @click="changeMultiply">正片叠底</div>
<div class="btn" :class="{removeWhiteActive: isRemoveWhiteActive}" @click="changeRemoveWhite">去白</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="remove-white" v-show="optionsRemoveWhite">
<div class="title">去白</div> <div class="title">去白</div>
......
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:57:48 * @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 * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\router\index.js * @FilePath: \指纹系统\founder_vue\src\router\index.js
...@@ -67,7 +67,7 @@ const router = new VueRouter({ ...@@ -67,7 +67,7 @@ const router = new VueRouter({
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
console.log(from); console.log(from);
if(from.name === 'ryzwbj') { if(from.name === 'ryzwbj' || from.name === 'ajzwbj') {
// 清空session // 清空session
sessionStorage.clear() sessionStorage.clear()
} }
......
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:58:13 * @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 * @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
*/ */
import leftMenu from './leftMenu'
export default [ export default [
{ {
path: "/", path: "/",
...@@ -29,278 +30,7 @@ export default [ ...@@ -29,278 +30,7 @@ export default [
auth: "5" auth: "5"
}, },
component: () => import("@/views/Home.vue"), component: () => import("@/views/Home.vue"),
children: [ children: leftMenu
{
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")
}
]
}, },
{ {
path: "/Login1", 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 * @Author: your name
* @Date: 2021-09-07 09:57:48 * @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-04 11:13:48 * @LastEditTime: 2021-11-11 15:47:50
* @LastEditors: your name * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\store\index.js * @FilePath: \指纹系统\founder_vue\src\store\index.js
*/ */
...@@ -12,13 +12,15 @@ import getters from "./getters"; ...@@ -12,13 +12,15 @@ import getters from "./getters";
import createPersistedState from "vuex-persistedstate"; import createPersistedState from "vuex-persistedstate";
import user from "./modules/user"; import user from "./modules/user";
import zwbj from "./modules/zwbj" import zwbj from "./modules/zwbj"
import layout from "./modules/layout"
Vue.use(Vuex); Vue.use(Vuex);
const store = new Vuex.Store({ const store = new Vuex.Store({
modules: { modules: {
user, user,
zwbj zwbj,
layout
}, },
getters, getters,
plugins: [ 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 { getToken, removeToken, setToken } from "@/utils/auth";
import { login } from "@/api/home"; import { login } from "@/api/home";
...@@ -10,7 +18,7 @@ const state = { ...@@ -10,7 +18,7 @@ const state = {
// request: "" // request: ""
// } // }
logs: [], logs: [],
userAuth: "" userAuth: "",
}; };
const mutations = { const mutations = {
...@@ -23,7 +31,7 @@ const mutations = { ...@@ -23,7 +31,7 @@ const mutations = {
}, },
SET_Auth: (state, content) => { SET_Auth: (state, content) => {
state.userAuth = content; state.userAuth = content;
} },
}; };
const actions = { const actions = {
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-09-07 10:21:30 * @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 * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\AllPersonnelBase\Index.vue * @FilePath: \founder_vue\src\views\AllPersonnelBase\Index.vue
--> -->
<template> <template>
<div> <div>
<router-view></router-view>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: 'AllPersonnelBaseIndex'
} };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
</style> </style>
\ No newline at end of file
...@@ -407,7 +407,7 @@ import ggrytm from "./modules/ggrytm.vue"// 更改人员条码弹窗 ...@@ -407,7 +407,7 @@ import ggrytm from "./modules/ggrytm.vue"// 更改人员条码弹窗
import fcx from "./modules/fcx.vue" // 发查询弹窗 import fcx from "./modules/fcx.vue" // 发查询弹窗
import xzaj from "./modules/xzaj.vue"// 新增案件 import xzaj from "./modules/xzaj.vue"// 新增案件
export default { export default {
name: "AllPersonnelBase", name: "qbalk",
components: { components: {
tjddl, tjddl,
dcfptxAj, dcfptxAj,
...@@ -734,12 +734,7 @@ export default { ...@@ -734,12 +734,7 @@ export default {
*/ */
handleClick (row) { handleClick (row) {
console.log(row); console.log(row);
this.$router.push({ this.$router.push('/zwbj/ajzwbj/' + row.id + '/' + row.ysxtAsjbh)
path: '/zwbj/ajzwbj/' + row.id,
query: {
barcode: row.barcode
}
})
}, },
/** /**
* @description: 单选事件 * @description: 单选事件
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-09-08 13:03:22 * @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 * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\Editor\Index.vue * @FilePath: \founder_vue\src\views\Editor\Index.vue
--> -->
<template> <template>
<div class="ryzwbj-index"> <div class="ryzwbj-index">
<router-view></router-view>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: 'zwbj'
} };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-09-08 13:01:23 * @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 * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\Editor\ajzwbj.vue * @FilePath: \founder_vue\src\views\Editor\ajzwbj.vue
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
import ajzwbjLeft from './modules/ajzwbjLeft.vue'; import ajzwbjLeft from './modules/ajzwbjLeft.vue';
import imageEDAJ from './modules/imageEdAJ.vue'; import imageEDAJ from './modules/imageEdAJ.vue';
export default { export default {
name: 'ajzwbj',
components: { components: {
ajzwbjLeft, ajzwbjLeft,
imageEDAJ imageEDAJ
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-10-22 09:42:07 * @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 * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
...@@ -23,11 +23,12 @@ ...@@ -23,11 +23,12 @@
</div> </div>
<div class="left-right-hand" v-if="zwSelect==='指纹'"> <div class="left-right-hand" v-if="zwSelect==='指纹'">
<div class="lr-hand" v-if="fingers.length>0"> <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="fingerPic" :class="{fingerPicActive: activeFinger===index}">
<div class="finger-number">{{(index+1) &lt; 10 ? ('0'+(index+1)) : (index+1)}}</div> <div class="finger-number">{{(index+1) &lt; 10 ? ('0'+(index+1)) : (index+1)}}</div>
<div class="finger-pic"> <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> </div>
</div> </div>
...@@ -39,7 +40,7 @@ ...@@ -39,7 +40,7 @@
</div> </div>
</div> </div>
<div class="finger-total"> <div class="finger-total">
共计<span>4</span>指纹 共计<span>{{fingers.length}}</span>指纹
</div> </div>
</div> </div>
<div class="left-right-hand" v-else-if="zwSelect==='掌纹'"> <div class="left-right-hand" v-else-if="zwSelect==='掌纹'">
...@@ -48,7 +49,8 @@ ...@@ -48,7 +49,8 @@
<div class="fingerPic" :class="{fingerPicActive: activeHand===index}"> <div class="fingerPic" :class="{fingerPicActive: activeHand===index}">
<div class="finger-number">{{(index+1) &lt; 10 ? ('0'+(index+1)) : (index+1)}}</div> <div class="finger-number">{{(index+1) &lt; 10 ? ('0'+(index+1)) : (index+1)}}</div>
<div class="finger-pic"> <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> </div>
</div> </div>
...@@ -69,9 +71,12 @@ ...@@ -69,9 +71,12 @@
</template> </template>
<script> <script>
import { mapState } from 'vuex';
export default { export default {
data () { data () {
return { return {
// 上一次的指纹序号
preSeq: '',
// 案事件编号 // 案事件编号
barcode: '', barcode: '',
id: '', id: '',
...@@ -131,28 +136,116 @@ export default { ...@@ -131,28 +136,116 @@ export default {
], ],
} }
}, },
computed: {
...mapState({
seq: state => state.zwbj.seq,
preTzdArr: state => state.zwbj.pretzdall,
autopretzdall: state => state.zwbj.autopretzdall,
})
},
mounted () { mounted () {
let self = this
console.log(this.$route); console.log(this.$route);
this.barcode = this.$route.query.barcode this.barcode = this.$route.params.barcode
this.id = this.$route.params.id this.id = this.$route.params.id
self.preSeq = this.activerollFinger
// 获取案件指纹
this.getCaseFinger()
}, },
methods: { methods: {
/** /**
* @description: 切换掌纹 * 获取案件指纹原图
* @param {*} handIndex
* @return {*}
*/ */
FingersChange (handIndex) { getCaseOrigin (seq) {
this.activeHand = handIndex 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: 切换指纹 * @description: 切换指纹
* @param {*} finger * @param {*} finger
* @return {*} * @return {*}
*/ */
FingersChange (fingerIndex) { FingersChange (fingerIndex, finger) {
console.log(fingerIndex); console.log(fingerIndex);
this.activeFinger = 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: 滚动指纹-平面指纹-掌纹切换 * @description: 滚动指纹-平面指纹-掌纹切换
......
...@@ -944,6 +944,7 @@ $transOrigin: var(--transOrigin, 0px, 0px); ...@@ -944,6 +944,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
background: transparent; background: transparent;
overflow: hidden; overflow: hidden;
transform-origin: 320px 320px; transform-origin: 320px 320px;
z-index: 9999;
// transform-origin: $transOrigin; // transform-origin: $transOrigin;
// background-color: #999; // background-color: #999;
} }
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-10-22 11:36:10 * @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-11-09 20:02:20 * @LastEditTime: 2021-11-10 18:20:00
* @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
...@@ -619,7 +619,7 @@ export default { ...@@ -619,7 +619,7 @@ export default {
// 笔刷颜色选择器 // 笔刷颜色选择器
// var brushColorpicker = tui.colorPicker.create({ // var brushColorpicker = tui.colorPicker.create({
// container: $('#tui-brush-color-picker')[0], // container: $('#tui-brush-color-picker')[0],
// color: '#FFAA00', // color: '#FFFD0F',
// preset: ['#FF4041', '#FF6619', '#FFBB3B', '#08BD9E', '#1AE8F2', '#00AAFF', '#9E5FFF', '#055FE7'], // preset: ['#FF4041', '#FF6619', '#FFBB3B', '#08BD9E', '#1AE8F2', '#00AAFF', '#9E5FFF', '#055FE7'],
// usageStatistics: false // usageStatistics: false
// }); // });
...@@ -826,7 +826,7 @@ export default { ...@@ -826,7 +826,7 @@ export default {
// imageEditor.stopDrawingMode(); // imageEditor.stopDrawingMode();
// imageEditor.startDrawingMode('LINE_DRAWING', { // imageEditor.startDrawingMode('LINE_DRAWING', {
// width: 4, // width: 4,
// color: '#FFAA00', // color: '#FFFD0F',
// arrowType: { // arrowType: {
// head: 'triangle' // triangle // head: 'triangle' // triangle
// } // }
...@@ -834,7 +834,7 @@ export default { ...@@ -834,7 +834,7 @@ export default {
// imageEditor // imageEditor
// .addShape('circle', { // .addShape('circle', {
// fill: '#FFAA00', // fill: '#FFFD0F',
// stroke: 'blue', // stroke: 'blue',
// strokeWidth: 0, // strokeWidth: 0,
// rx: 4, // rx: 4,
...@@ -988,10 +988,10 @@ export default { ...@@ -988,10 +988,10 @@ export default {
self.isReset = true self.isReset = true
// 旋转角度同样恢复到0 // 旋转角度同样恢复到0
self.inputRotationRange = 0 self.inputRotationRange = 0
console.log(self.startPlace,222); console.log(self.startPlace, 222);
// 事件不能连续重复执行,需要缓存时间 // 事件不能连续重复执行,需要缓存时间
setTimeout(() => { setTimeout(() => {
console.log(11111,-self.startPlace) console.log(11111, -self.startPlace)
imageEditor.rotate(-parseInt(self.startPlace)) imageEditor.rotate(-parseInt(self.startPlace))
imageEditor.resetZoom(); imageEditor.resetZoom();
self.startPlace = 0; self.startPlace = 0;
...@@ -1225,11 +1225,11 @@ export default { ...@@ -1225,11 +1225,11 @@ export default {
$('.tzdDom .head').css('width', '8px') $('.tzdDom .head').css('width', '8px')
$('.tzdDom .head').css('height', '8px') $('.tzdDom .head').css('height', '8px')
$('.tzdDom .head').css('border-radius', '8px') $('.tzdDom .head').css('border-radius', '8px')
$('.tzdDom .head').css('background-color', '#ffaa00') $('.tzdDom .head').css('background-color', '#FFFD0F')
$('.tzdDom .direction').css('width', '20px') $('.tzdDom .direction').css('width', '20px')
$('.tzdDom .direction').css('height', '2px') $('.tzdDom .direction').css('height', '2px')
$('.tzdDom .direction').css('background-color', '#ffaa00') $('.tzdDom .direction').css('background-color', '#FFFD0F')
$(`#tzd${self.tzdId}`).css("left", (item.zwzxd_tzxzb - 4) / self.zoomLevel + "px"); $(`#tzd${self.tzdId}`).css("left", (item.zwzxd_tzxzb - 4) / self.zoomLevel + "px");
$(`#tzd${self.tzdId}`).css("top", (item.zwzxd_tzyzb - 4) / self.zoomLevel + "px"); $(`#tzd${self.tzdId}`).css("top", (item.zwzxd_tzyzb - 4) / self.zoomLevel + "px");
...@@ -1320,11 +1320,11 @@ export default { ...@@ -1320,11 +1320,11 @@ export default {
$('.tzdDom .head').css('width', '8px') $('.tzdDom .head').css('width', '8px')
$('.tzdDom .head').css('height', '8px') $('.tzdDom .head').css('height', '8px')
$('.tzdDom .head').css('border-radius', '8px') $('.tzdDom .head').css('border-radius', '8px')
$('.tzdDom .head').css('background-color', '#ffaa00') $('.tzdDom .head').css('background-color', '#FFFD0F')
$('.tzdDom .direction').css('width', '20px') $('.tzdDom .direction').css('width', '20px')
$('.tzdDom .direction').css('height', '2px') $('.tzdDom .direction').css('height', '2px')
$('.tzdDom .direction').css('background-color', '#ffaa00') $('.tzdDom .direction').css('background-color', '#FFFD0F')
// self.zoomLevel // self.zoomLevel
// $(`#tzd${self.tzdId}`).css("left", e.pageX - $('.tzdDrawing').offset().left - 4 + "px"); // $(`#tzd${self.tzdId}`).css("left", e.pageX - $('.tzdDrawing').offset().left - 4 + "px");
...@@ -1337,7 +1337,7 @@ export default { ...@@ -1337,7 +1337,7 @@ export default {
// 鼠标右击 // 鼠标右击
if (e.which === 3) { if (e.which === 3) {
console.log(e); console.log(e);
if (e.target.className == "head" || e.target.className == "direction") { if (e.target.className == "head" || e.target.className == "direction" || e.target.className == 'auto_tzdDom') {
// 删除该特征点 // 删除该特征点
let tdzindex = self.tzdArr.findIndex((item) => { let tdzindex = self.tzdArr.findIndex((item) => {
return item.id == e.target.parentNode.id.substring(3, e.target.parentNode.id.length); return item.id == e.target.parentNode.id.substring(3, e.target.parentNode.id.length);
...@@ -1353,9 +1353,35 @@ export default { ...@@ -1353,9 +1353,35 @@ export default {
} }
self.tzdnumber = self.tzdArr.length self.tzdnumber = self.tzdArr.length
// console.log(self.tzdArr); // console.log(self.tzdArr);
// 全部数据保存
var tzdall_shou = []
self.tzdArr.forEach(item => {
tzdall_shou.push({
id: item.id,
zwtzd_tzfx: item.angle,
zwzxd_tzxzb: item.x,
zwzxd_tzyzb: item.y
})
})
self.$store.commit('zwbj/setTzdall', tzdall_shou)
// 删除自动提取的特征点 // 删除自动提取的特征点
console.log(self.autoTzdArr); console.log(self.autoTzdArr);
if (e.target.className == 'auto_tzdDom') {
let auto_tzdindex = self.autoTzdArr.findIndex((item) => {
return item.id == e.target.parentNode.id;
})
console.log(auto_tzdindex);
if (auto_tzdindex != -1) {
self.autoTzdArr.splice(auto_tzdindex, 1)
$(e.target.parentNode).css('border', '2px solid red');
setTimeout(() => {
$(e.target.parentNode).remove();
}, 1000);
// 更新vuex数据
self.$store.commit('zwbj/setAutoTzdall', self.autoTzdArr)
}
} else {
let auto_tzdindex = self.autoTzdArr.findIndex((item) => { let auto_tzdindex = self.autoTzdArr.findIndex((item) => {
return item.id == e.target.parentNode.id; return item.id == e.target.parentNode.id;
}) })
...@@ -1369,6 +1395,7 @@ export default { ...@@ -1369,6 +1395,7 @@ export default {
// 更新vuex数据 // 更新vuex数据
self.$store.commit('zwbj/setAutoTzdall', self.autoTzdArr) self.$store.commit('zwbj/setAutoTzdall', self.autoTzdArr)
} }
}
// auto_tzdDom // auto_tzdDom
} }
} }
...@@ -1508,6 +1535,8 @@ export default { ...@@ -1508,6 +1535,8 @@ export default {
// self.$set(self.tzdArr[self.tzdId], 'angle', obj.deg) // self.$set(self.tzdArr[self.tzdId], 'angle', obj.deg)
self.tzdArr[objindex].angle = obj.deg self.tzdArr[objindex].angle = obj.deg
} else { } else {
console.log(self.tzdArr);
console.log(self.tzdId);
let objindex = self.tzdArr.findIndex((item) => { let objindex = self.tzdArr.findIndex((item) => {
return item.id == self.tzdId return item.id == self.tzdId
}) })
...@@ -1633,11 +1662,11 @@ export default { ...@@ -1633,11 +1662,11 @@ export default {
$('.auto_tzdDom .head').css('width', '8px') $('.auto_tzdDom .head').css('width', '8px')
$('.auto_tzdDom .head').css('height', '8px') $('.auto_tzdDom .head').css('height', '8px')
$('.auto_tzdDom .head').css('border-radius', '8px') $('.auto_tzdDom .head').css('border-radius', '8px')
$('.auto_tzdDom .head').css('background-color', '#ffaa00') $('.auto_tzdDom .head').css('background-color', '#FFFD0F')
$('.auto_tzdDom .direction').css('width', '20px') $('.auto_tzdDom .direction').css('width', '20px')
$('.auto_tzdDom .direction').css('height', '2px') $('.auto_tzdDom .direction').css('height', '2px')
$('.auto_tzdDom .direction').css('background-color', '#ffaa00') $('.auto_tzdDom .direction').css('background-color', '#FFFD0F')
$(`#tzd${self.tzdId}`).css("left", (item.zwzxd_tzxzb - 4) / self.zoomLevel + "px"); $(`#tzd${self.tzdId}`).css("left", (item.zwzxd_tzxzb - 4) / self.zoomLevel + "px");
$(`#tzd${self.tzdId}`).css("top", (item.zwzxd_tzyzb - 4) / self.zoomLevel + "px"); $(`#tzd${self.tzdId}`).css("top", (item.zwzxd_tzyzb - 4) / self.zoomLevel + "px");
...@@ -1655,7 +1684,7 @@ export default { ...@@ -1655,7 +1684,7 @@ export default {
self.autoTzdArr = JSON.parse(sessionStorage.getItem(`auto${this.seq}`)) self.autoTzdArr = JSON.parse(sessionStorage.getItem(`auto${this.seq}`))
self.autoTzdArr.forEach((item, index) => { self.autoTzdArr.forEach((item, index) => {
$( $(
`<div id="tzd${self.id}" class="auto_tzdDom"><div class="head"></div><div class="direction"></div></div>` `<div id="${item.id}" class="auto_tzdDom"><div class="head"></div><div class="direction"></div></div>`
).appendTo(".tzdDrawing"); ).appendTo(".tzdDrawing");
$('.auto_tzdDom').css('display', 'flex') $('.auto_tzdDom').css('display', 'flex')
$('.auto_tzdDom').css('align-items', 'center') $('.auto_tzdDom').css('align-items', 'center')
...@@ -1665,16 +1694,16 @@ export default { ...@@ -1665,16 +1694,16 @@ export default {
$('.auto_tzdDom .head').css('width', '8px') $('.auto_tzdDom .head').css('width', '8px')
$('.auto_tzdDom .head').css('height', '8px') $('.auto_tzdDom .head').css('height', '8px')
$('.auto_tzdDom .head').css('border-radius', '8px') $('.auto_tzdDom .head').css('border-radius', '8px')
$('.auto_tzdDom .head').css('background-color', '#ffaa00') $('.auto_tzdDom .head').css('background-color', '#FFFD0F')
$('.auto_tzdDom .direction').css('width', '20px') $('.auto_tzdDom .direction').css('width', '20px')
$('.auto_tzdDom .direction').css('height', '2px') $('.auto_tzdDom .direction').css('height', '2px')
$('.auto_tzdDom .direction').css('background-color', '#ffaa00') $('.auto_tzdDom .direction').css('background-color', '#FFFD0F')
$(`#tzd${self.id}`).css("left", (item.zwzxd_tzxzb - 4) / self.zoomLevel + "px"); $(`#${item.id}`).css("left", (item.zwzxd_tzxzb - 4) / self.zoomLevel + "px");
$(`#tzd${self.id}`).css("top", (item.zwzxd_tzyzb - 4) / self.zoomLevel + "px"); $(`#${item.id}`).css("top", (item.zwzxd_tzyzb - 4) / self.zoomLevel + "px");
$(`#tzd${self.id}`).css("box-sizing", "border-box"); $(`#${item.id}`).css("box-sizing", "border-box");
$("#tzd" + self.id).css("transform", `rotate(${item.zwtzd_tzfx}deg)`); $("#" + item.id).css("transform", `rotate(${item.zwtzd_tzfx}deg)`);
}) })
self.$store.commit('zwbj/setAutoTzdall', self.autoTzdArr) self.$store.commit('zwbj/setAutoTzdall', self.autoTzdArr)
// 将自动提取的特征点存入session中 // 将自动提取的特征点存入session中
...@@ -1880,7 +1909,7 @@ export default { ...@@ -1880,7 +1909,7 @@ export default {
// this.imageEditor.stopDrawingMode(); // this.imageEditor.stopDrawingMode();
// this.imageEditor.startDrawingMode('LINE_DRAWING', { // this.imageEditor.startDrawingMode('LINE_DRAWING', {
// width: 4, // width: 4,
// color: '#FFAA00', // color: '#FFFD0F',
// arrowType: { // arrowType: {
// head: 'triangle' // triangle // head: 'triangle' // triangle
// } // }
......
...@@ -844,6 +844,7 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -844,6 +844,7 @@ $directionRotate: var(--directionRotate, 0deg);
background: transparent; background: transparent;
overflow: hidden; overflow: hidden;
transform-origin: 320px 320px; transform-origin: 320px 320px;
z-index: 9999;
// transform-origin: $transOrigin; // transform-origin: $transOrigin;
// background-color: #999; // background-color: #999;
} }
...@@ -1114,6 +1115,7 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -1114,6 +1115,7 @@ $directionRotate: var(--directionRotate, 0deg);
display: flex; display: flex;
align-items: center; align-items: center;
padding: 0 16px; padding: 0 16px;
position: relative;
.blcbtn { .blcbtn {
cursor: pointer; cursor: pointer;
width: 40px; width: 40px;
...@@ -1131,6 +1133,35 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -1131,6 +1133,35 @@ $directionRotate: var(--directionRotate, 0deg);
height: 26px; 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 { .txblyz {
cursor: pointer; cursor: pointer;
margin-right: 28px; margin-right: 28px;
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-09-08 13:00:08 * @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 * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\Editor\ryzwbj.vue * @FilePath: \founder_vue\src\views\Editor\ryzwbj.vue
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
import ryzwbjLeft from './modules/ryzwbjLeft.vue'; import ryzwbjLeft from './modules/ryzwbjLeft.vue';
import imageEd from './modules/imageEd.vue'; import imageEd from './modules/imageEd.vue';
export default { export default {
name: 'ryzwbj',
components: { components: {
ryzwbjLeft, ryzwbjLeft,
imageEd imageEd
......
...@@ -106,48 +106,23 @@ ...@@ -106,48 +106,23 @@
<el-main class="main"> <el-main class="main">
<div class="contain"> <div class="contain">
<el-tabs <el-tabs
closable :closable="paths.length > 1"
v-model="routePath" v-model="routePath"
@tab-click="handleClick" @tab-click="handleClick"
@tab-remove="tabRemove" @tab-remove="tabRemove"
> >
<el-tab-pane <el-tab-pane
label="活体指纹采集"
name="/Home/htzwcj"
></el-tab-pane>
<el-tab-pane
:label="item.name" :label="item.name"
:name="item.path" :name="item.path"
v-for="(item, i) in paths" v-for="item in paths"
:key="i" :key="item.routeName"
:class="{ active: $route.path == item.path }"
></el-tab-pane> ></el-tab-pane>
</el-tabs> </el-tabs>
<div class="breadcrumb"> <div class="breadcrumb"></div>
<!-- <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>
<!-- 路由出口 --> <!-- 路由出口 -->
<keep-alive :include="cachePageName">
<router-view></router-view> <router-view></router-view>
</keep-alive>
</div> </div>
</el-main> </el-main>
</el-container> </el-container>
...@@ -172,7 +147,7 @@ export default { ...@@ -172,7 +147,7 @@ export default {
data() { data() {
return { return {
searchTxt: "", searchTxt: "",
routes: indexRoutes[2].children, routes: this.$store.state.layout.leftMenu,
isCollapse: false, isCollapse: false,
leftImg: require("../assets/img/Home/left.png"), leftImg: require("../assets/img/Home/left.png"),
rightImg: require("../assets/img/Home/right.png"), rightImg: require("../assets/img/Home/right.png"),
...@@ -184,6 +159,9 @@ export default { ...@@ -184,6 +159,9 @@ export default {
}, },
mounted() { mounted() {
this.menuActive = this.$route.name; this.menuActive = this.$route.name;
setTimeout(() => {
console.log(this.$store.state.layout.leftMenu, 9999);
}, 200);
// console.log(this.$route); // console.log(this.$route);
// zoom('home') // zoom('home')
// window.addEventListener('resize', function () { // window.addEventListener('resize', function () {
...@@ -195,6 +173,9 @@ export default { ...@@ -195,6 +173,9 @@ export default {
}, },
computed: { computed: {
...mapGetters(["defaultGoodsImage", "userAuth"]), ...mapGetters(["defaultGoodsImage", "userAuth"]),
cachePageName() {
return this.$store.state.layout.cachePageName;
},
}, },
methods: { methods: {
/** /**
...@@ -250,11 +231,25 @@ export default { ...@@ -250,11 +231,25 @@ export default {
this.paths = res; this.paths = res;
console.log(pathName == this.$route.meta.title); console.log(pathName == this.$route.meta.title);
if (pathName == this.$route.meta.title) { if (pathName == this.$route.meta.title) {
this.$router.push("/Home/htzwcj"); if (this.paths.length > 0) {
this.$refs.menu.activeIndex = ""; this.$router.push(this.paths[0].path);
this.routePath = this.paths[0].path;
}
} }
} }
sessionStorage.setItem("crumbs", JSON.stringify(this.paths)); 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: 调回任务管理 * @description: 调回任务管理
...@@ -341,14 +336,12 @@ export default { ...@@ -341,14 +336,12 @@ export default {
} }
} }
sessionStorage.setItem("crumbs", JSON.stringify(this.paths)); sessionStorage.setItem("crumbs", JSON.stringify(this.paths));
this.setKeepAlive();
}, 0); }, 0);
}, },
immediate: true, immediate: true,
}, },
}, },
mounted() {
console.log(this.$refs.path);
},
created() { created() {
this.paths = sessionStorage.getItem("crumbs") this.paths = sessionStorage.getItem("crumbs")
? JSON.parse(sessionStorage.getItem("crumbs")) ? JSON.parse(sessionStorage.getItem("crumbs"))
...@@ -504,16 +497,16 @@ export default { ...@@ -504,16 +497,16 @@ export default {
position: relative; position: relative;
padding-right: 35px !important; padding-right: 35px !important;
padding-left: 35px !important; padding-left: 35px !important;
&:not(:nth-of-type(2)) {
&:hover { &:hover {
.el-icon-close { .el-icon-close {
display: inline-block; display: inline-block;
} }
} }
}
.el-icon-close { .el-icon-close {
&::before{ &::before {
transform: scale(1.1) transform: scale(1.1);
} }
display: none; display: none;
position: absolute; 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> <template>
<div> <div>
<router-view></router-view>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: "Index.vue" name: 'SystemManage'
}; };
</script> </script>
......
...@@ -359,7 +359,7 @@ ...@@ -359,7 +359,7 @@
import "@/icons/group-item.svg"; import "@/icons/group-item.svg";
export default { export default {
name: "AuthManage", name: "PermissionManage",
created() { created() {
let w1 = 1920; let w1 = 1920;
let w2 = window.innerWidth; let w2 = window.innerWidth;
......
...@@ -432,7 +432,7 @@ import SvgIcon from "../../components/SvgIcon/index.vue"; ...@@ -432,7 +432,7 @@ import SvgIcon from "../../components/SvgIcon/index.vue";
import "@/icons/tree_f.svg"; import "@/icons/tree_f.svg";
import "@/icons/tree_c.svg"; import "@/icons/tree_c.svg";
export default { export default {
name: "QueryConfirm", name: "cxyrd",
components: { SvgIcon }, components: { SvgIcon },
data() { data() {
return { return {
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-09-07 10:46:50 * @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 * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\daxx\Index.vue * @FilePath: \founder_vue\src\views\daxx\Index.vue
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<script> <script>
export default { export default {
name: 'daxx'
} }
</script> </script>
......
...@@ -248,7 +248,7 @@ import SvgIcon from "../../components/SvgIcon/index.vue"; ...@@ -248,7 +248,7 @@ import SvgIcon from "../../components/SvgIcon/index.vue";
import "@/icons/tree_f.svg"; import "@/icons/tree_f.svg";
import "@/icons/tree_c.svg"; import "@/icons/tree_c.svg";
export default { export default {
name: "QueryConfirm", name: "BDList",
components: { SvgIcon }, components: { SvgIcon },
data () { data () {
return { return {
......
...@@ -425,7 +425,7 @@ ...@@ -425,7 +425,7 @@
const targetOptions_ry = ['基本人员库', '高危人员库', '非法人员库', '在逃人员库', '布控人员库', '前科人员库', '协查人员库']; const targetOptions_ry = ['基本人员库', '高危人员库', '非法人员库', '在逃人员库', '布控人员库', '前科人员库', '协查人员库'];
const targetOptions_aj = ['本地案件库', '比中案件库', '已破案件库', '重大案件库', 'B类案件库', 'C类案件库', '勘查案件库', '协查案件库']; const targetOptions_aj = ['本地案件库', '比中案件库', '已破案件库', '重大案件库', 'B类案件库', 'C类案件库', '勘查案件库', '协查案件库'];
export default { export default {
name: 'drFTPX', name: 'drFPTX',
components: { components: {
}, },
mounted () { mounted () {
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-09-07 11:08:38 * @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 * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\htzwcj.vue * @FilePath: \founder_vue\src\views\htzwcj.vue
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
<script> <script>
export default { export default {
name: 'htzwcj'
} }
</script> </script>
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-09-07 10:36:02 * @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 * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\zljc\Index.vue * @FilePath: \founder_vue\src\views\zljc\Index.vue
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<script> <script>
export default { export default {
name: 'zljc'
} }
</script> </script>
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-09-07 10:28:38 * @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 * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\zzwcj\Index.vue * @FilePath: \founder_vue\src\views\zzwcj\Index.vue
--> -->
<template> <template>
<div id="zzwcl"> <div id="zzwcl">指掌纹采集</div>
指掌纹采集
</div>
</template> </template>
<script> <script>
export default { export default {
mounted () { name: "zzwcj",
zoom('zzwcl') mounted() {
window.addEventListener('resize', function () { zoom("zzwcl");
zoom('zzwcl') window.addEventListener("resize", function () {
}) zoom("zzwcl");
});
}, },
} };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
</style> </style>
\ No newline at end of file
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-09-07 10:31:34 * @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 * @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
--> -->
<template> <template>
<div id="zzwlr"> <div id="zzwlr"></div>
<router-view></router-view>
</div>
</template> </template>
<script> <script>
import zoom from '@/utils/autosize'; import zoom from "@/utils/autosize";
export default { export default {
mounted () { name: 'zzwlr'
// zoom('zzwlr') };
// window.addEventListener('resize', function () {
// zoom('zzwlr')
// })
},
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
......
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:57:48 * @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 * @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
...@@ -92,13 +92,12 @@ module.exports = { ...@@ -92,13 +92,12 @@ module.exports = {
// target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ // target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
// target: "http://172.18.108.2:8099/", // 张 认定 // target: "http://172.18.108.2:8099/", // 张 认定
// target: "http://192.168.128.112: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://192.168.128.116: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://192.168.128.109:8765", // 湖南-王 // target: "http://www.meetfood.cn:2390/", // 湖南-线上
target: "http://www.meetfood.cn:2390/", // 湖南-线上
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