Skip to content

F
founder_vue
Commit cecae7d3 by 张超军
Options

优化活体采集，FPTX导入，PFTX导入任务按钮，鼠标样式。 解决用户管理列表、发查询权限列表，列宽无限增大的问题。… 

优化活体采集，FPTX导入，PFTX导入任务按钮，鼠标样式。 	解决用户管理列表、发查询权限列表，列宽无限增大的问题。 	修改home页的退回门户和退出登录图标。 	解决角色管理，修改完毕后，失去焦点后，值恢复的问题。 	解决日志出现乱码的问题。 	角色管理中保存按钮，不可保存时去掉按钮，修改按钮颜色逻辑。
parent 620c52a9
Showing with 155 additions and 68 deletions
public/iconfont/demo_index.html
......@@ -55,6 +55,18 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont">&#xe600;</span>
<div class="name">关闭</div>
<div class="code-name">&amp;#xe600;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe669;</span>
<div class="name">首页</div>
<div class="code-name">&amp;#xe669;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe653;</span>
<div class="name">L</div>
<div class="code-name">&amp;#xe653;</div>
......@@ -115,12 +127,6 @@
</li>
<li class="dib">
<span class="icon iconfont">&#xe614;</span>
<div class="name">指纹采集标记</div>
<div class="code-name">&amp;#xe614;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe64b;</span>
<div class="name">采集logo</div>
<div class="code-name">&amp;#xe64b;</div>
......@@ -492,9 +498,9 @@
<pre><code class="language-css"
>@font-face {
font-family: 'iconfont';
src: url('iconfont.woff2?t=1644844730117') format('woff2'),
url('iconfont.woff?t=1644844730117') format('woff'),
url('iconfont.ttf?t=1644844730117') format('truetype');
src: url('iconfont.woff2?t=1654508777262') format('woff2'),
url('iconfont.woff?t=1654508777262') format('woff'),
url('iconfont.ttf?t=1654508777262') format('truetype');
}
</code></pre>
<h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
......@@ -521,6 +527,24 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont icon-guanbi"></span>
<div class="name">
关闭
</div>
<div class="code-name">.icon-guanbi
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-shouye"></span>
<div class="name">
首页
</div>
<div class="code-name">.icon-shouye
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-L"></span>
<div class="name">
L
......@@ -611,15 +635,6 @@
</li>
<li class="dib">
<span class="icon iconfont icon-zhiwencaijibiaoji"></span>
<div class="name">
指纹采集标记
</div>
<div class="code-name">.icon-zhiwencaijibiaoji
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-xingzhuang1"></span>
<div class="name">
采集logo
......@@ -1179,6 +1194,22 @@
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-guanbi"></use>
</svg>
<div class="name">关闭</div>
<div class="code-name">#icon-guanbi</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-shouye"></use>
</svg>
<div class="name">首页</div>
<div class="code-name">#icon-shouye</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-L"></use>
</svg>
<div class="name">L</div>
......@@ -1259,14 +1290,6 @@
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-zhiwencaijibiaoji"></use>
</svg>
<div class="name">指纹采集标记</div>
<div class="code-name">#icon-zhiwencaijibiaoji</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-xingzhuang1"></use>
</svg>
<div class="name">采集logo</div>
......
public/iconfont/iconfont.css
@font-face {
font-family: "iconfont"; /* Project id 2961960 */
src: url('iconfont.woff2?t=1644844730117') format('woff2'),
url('iconfont.woff?t=1644844730117') format('woff'),
url('iconfont.ttf?t=1644844730117') format('truetype');
src: url('iconfont.woff2?t=1654508777262') format('woff2'),
url('iconfont.woff?t=1654508777262') format('woff'),
url('iconfont.ttf?t=1654508777262') format('truetype');
}
.iconfont {
......@@ -13,6 +13,14 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-guanbi:before {
content: "\e600";
}
.icon-shouye:before {
content: "\e669";
}
.icon-L:before {
content: "\e653";
}
......@@ -53,10 +61,6 @@
content: "\e613";
}
.icon-zhiwencaijibiaoji:before {
content: "\e614";
}
.icon-xingzhuang1:before {
content: "\e64b";
}
......
public/iconfont/iconfont.js
This source diff could not be displayed because it is too large. You can view the blob instead.
public/iconfont/iconfont.json
......@@ -6,6 +6,20 @@
"description": "",
"glyphs": [
{
"icon_id": "9303783",
"name": "关闭",
"font_class": "guanbi",
"unicode": "e600",
"unicode_decimal": 58880
},
{
"icon_id": "12331675",
"name": "首页",
"font_class": "shouye",
"unicode": "e669",
"unicode_decimal": 58985
},
{
"icon_id": "27325533",
"name": "L",
"font_class": "L",
......@@ -76,13 +90,6 @@
"unicode_decimal": 58899
},
{
"icon_id": "27193723",
"name": "指纹采集标记",
"font_class": "zhiwencaijibiaoji",
"unicode": "e614",
"unicode_decimal": 58900
},
{
"icon_id": "27193537",
"name": "采集logo",
"font_class": "xingzhuang1",
......
src/assets/img/Home/back_a.png
src/assets/img/Home/back_a.png

610 Bytes | W: | H:

src/assets/img/Home/back_a.png

4.93 KB | W: | H:

src/assets/img/Home/back_a.png
src/assets/img/Home/back_a.png
src/assets/img/Home/back_a.png
src/assets/img/Home/back_a.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/img/Home/back_d.png
src/assets/img/Home/back_d.png

615 Bytes | W: | H:

src/assets/img/Home/back_d.png

6.08 KB | W: | H:

src/assets/img/Home/back_d.png
src/assets/img/Home/back_d.png
src/assets/img/Home/back_d.png
src/assets/img/Home/back_d.png
  • 2-up
  • Swipe
  • Onion skin
src/utils/UserUtil.js
/*
* @Author: error: git config user.name && git config user.email & please set dead value or install git
* @Date: 2022-04-03 19:40:04
* @LastEditors: error: git config user.name && git config user.email & please set dead value or install git
* @LastEditTime: 2022-06-06 17:02:38
* @FilePath: \founder_vue\src\utils\UserUtil.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
/**
* Description: 用于管理用户信息
* @author: li_hongchao
......@@ -53,7 +61,8 @@ export default {
logTime: Utils.getCurrentDate()
}
// logger.info('reqParam', reqParam)
return Base64.encode(JSON.stringify(reqParam))
// return Base64.encode(JSON.stringify(reqParam))
return window.btoa(unescape(encodeURIComponent(JSON.stringify(reqParam))))
}
}
......
src/views/Home.vue
......@@ -59,11 +59,13 @@
<!-- <div class="message">-->
<!-- <div class="circle"></div>-->
<!-- </div>-->
<div class="quit" @click="$router.push('/index')"></div>
<div class="logout" @click="logout">
<!-- <div class="quit" @click="$router.push('/index')"></div> -->
<div class="iconfont icon-shouye quit" @click="$router.push('/index')"></div>
<div class="iconfont icon-guanbi quit" @click="logout"></div>
<!-- <div class="logout" @click="logout">
<svg-icon v-show="!isHoverLogout" icon-class="logout_d" class="icon" @mouseover="isHoverLogout = true" @mouseleave="isHoverLogout = false" />
<svg-icon v-show="isHoverLogout" icon-class="logout_a" class="icon" />
</div>
</div> -->
</div>
</el-header>
<el-main class="main">
......@@ -1296,15 +1298,18 @@ export default {
.quit {
cursor: pointer;
width: 14px;
height: 12px;
height: 14px;
font-size: 14px;
display: flex;
background-image: url("../assets/img/Home/back_d.png");
background-size: 14px 12px;
background-position: center;
background-repeat: no-repeat;
color: #595959;
// background-image: url("../assets/img/Home/back_d.png");
// background-size: 14px 14px;
// background-position: center;
// background-repeat: no-repeat;
&:hover {
background-image: url("../assets/img/Home/back_a.png");
color: #000000;
// background-image: url("../assets/img/Home/back_a.png");
}
margin-left: 25px;
......
src/views/SystemManage/QueryPermission.vue
<!--
* @Author: your name
* @Date: 2021-12-24 09:50:39
* @LastEditTime: 2022-03-25 18:23:45
* @LastEditors: Please set LastEditors
* @LastEditTime: 2022-06-06 17:04:48
* @LastEditors: error: git config user.name && git config user.email & please set dead value or install git
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\views\SystemManage\QueryPermission.vue
-->
......@@ -823,6 +823,7 @@ export default {
}
.tables {
width: 688px;
flex: 1;
margin: 24px 24px 0 0;
......
src/views/SystemManage/RoleManage.vue
......@@ -410,6 +410,8 @@ export default {
permissionDataList: [],
// 自定义的角色组
diyRoleList: [],
// 自定义的角色组 -- 原始的（用于修改后失去焦点恢复原态）
diyRoleListOrigin: [],
//正在选择的角色框样式
diyRoleItemIndex: 1,
//现在点击的按钮是默认人员还是自加人员
......@@ -565,6 +567,7 @@ export default {
this.diyRoleItemIndex = id
//加列表
this.diyRoleList.push(roleitem)
this.diyRoleListOrigin.push(roleitem)
this.curDiyRoleIndex = this.diyRoleList.length - 1
//加添加的人员
this.customAddUser.push(roleitem)
......@@ -590,7 +593,6 @@ export default {
let userObj = this.diyRoleList.find(
(i) => i.id == this.diyRoleItemIndex
)
debugger;
//修改
let obj = {
id: this.diyRoleItemIndex,
......@@ -616,6 +618,7 @@ export default {
}
})
this.$set(this.diyRoleList[index], 'permissions', diyRolePermissions)
this.$set(this.diyRoleListOrigin[index], 'permissions', diyRolePermissions)
}
this.$axios({
method: 'post',
......@@ -628,6 +631,7 @@ export default {
if (res.data.code == 201) {
let result = res.data.detail
this.$set(self.diyRoleList[index], 'id', result.id)
this.$set(self.diyRoleListOrigin[index], 'id', result.id)
self.diyRoleItemIndex = result.id
self.customAddUser = []
self.resetEdit()
......@@ -722,6 +726,13 @@ export default {
return i.defaultFlag == 0
}
)
this.diyRoleListOrigin = JSON.parse(JSON.stringify(result)).filter(
(i) => {
i.value = i.name
i.name = '请输入名称'
return i.defaultFlag == 0
}
)
//console.log(1111111, this.diyRoleList);
let arr = [...this.diyRoleList, ...this.defaultRoleBtns]
let obj = arr.find((i) => i.id == this.diyRoleItemIndex)
......@@ -809,6 +820,7 @@ export default {
}, 20)
this.diyRoleItemIndex = id
this.diyRoleList.push(roleitem)
this.diyRoleListOrigin.push(roleitem)
this.curDiyRoleIndex = this.diyRoleList.length - 1
//给正在操作的对象数组添加
this.customAddUser.push(roleitem)
......@@ -856,6 +868,8 @@ export default {
}
})
this.$set(this.diyRoleList[index], 'permissions', arr)
this.$set(this.diyRoleListOrigin[index], 'permissions', arr)
this.$set(this.diyRoleListOrigin[index], 'value', this.diyRoleList[index].value)
setTimeout(() => {
this.$message.success('更新成功')
}, 500)
......@@ -899,7 +913,10 @@ export default {
let index = this.diyRoleList.findIndex((i) => i.id == item.id)
if (!edit && typeof edit != Boolean) edit = false
edit = !edit
console.log(this.diyRoleList[index]);
console.log(this.diyRoleListOrigin[index]);
this.$set(this.diyRoleList[index], 'edit', edit)
this.$set(this.diyRoleListOrigin[index], 'edit', edit)
if (edit) {
setTimeout(() => {
this.$refs['edit_input']?.[0]?.focus()
......@@ -916,13 +933,18 @@ export default {
//重置编辑状态
resetEdit(type) {
if (type == 'screen') {
let length = this.diyRoleList.length
for (let index = 0; index < length; index++) {
this.$set(this.diyRoleList[index], 'value', this.diyRoleListOrigin[index].value)
this.$set(this.diyRoleList[index], 'edit', false)
}
} else {
let newArr = this.diyRoleList.map((i) => {
i.edit = false
return i
})
this.diyRoleList = newArr
}
let newArr = this.diyRoleList.map((i) => {
i.edit = false
return i
})
this.diyRoleList = newArr
},
/**
*
......
src/views/SystemManage/UserManage.vue
......@@ -1529,6 +1529,7 @@ export default {
// 表格高度 -- 展示下面的border
.split-line {
width: 100%;
height: 650px;
border-bottom: 1px solid #eee;
}
......
src/views/SystemManage/scss/role.scss
......@@ -240,6 +240,7 @@
.save {
.btn {
cursor: pointer;
width: 72px;
height: 32px;
background: #055fe7;
......@@ -247,9 +248,17 @@
line-height: 32px;
color: #ffffff;
text-align: center;
&:hover {
background: #377fec;
}
&:active {
background: #044cb9;
}
}
.btn[disabled],btn:disabled,btn.disabled{
background: #90055fe7 !important;
// background: #90055fe7 !important;
cursor: auto;
opacity: 0;
}
}
}
......
src/views/drFPTX/Index.vue
......@@ -35,6 +35,7 @@
<div class="right">
<div class='center'>
<el-input
readonly
:placeholder="$t('FptxDr.select_file_path')+ ltSize +'M）'"
v-model="fileName"
></el-input>
......
src/views/drFPTX/RAList.vue
......@@ -164,7 +164,7 @@
>
</el-input>
</div>
<div class="search ljfk">
<div class="search ljfk search-type">
<div class="item">{{$t('FptxDr.search_type')}}：</div>
<el-select
@keyup.enter.native="search()"
......@@ -1981,6 +1981,11 @@ export default {
height: 32px;
}
}
.search-type {
/deep/.el-input--suffix .el-input__inner {
cursor: pointer;
}
}
.ljfk {
margin-left: 24px;
.item {
......
src/views/login/modules/AccountsLogin.vue
<template>
<!-- <div class="login_account width70 middle" v-show="isShow">
<div class="login_account width70 middle" v-show="isShow">
<el-input class="width100 margin_top25_bottom10" type="text" :placeholder="$t('Login.username_placeholder')" @keydown.enter.native="login(userInfo)" v-model="userInfo.username">
<i slot="prefix" style="display: flex; align-items: center">
<img style="
......@@ -20,12 +20,12 @@
</el-input>
<el-button class="login_button width100 margin_top25_bottom10" type="primary" ref="userLogin" @click="login(userInfo)" :loading="btnLoading">{{$t('Login.login_btn')}}
</el-button>
</div> -->
</div>
<!-- 对接线上 -->
<div class="AccountsLogin">
<!-- <div class="AccountsLogin">
<div class="el-icon-loading"></div>
<span>正在加载中...</span>
</div>
</div> -->
</template>
<script>
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2022-05-24 17:23:34
* @LastEditTime: 2022-06-06 17:56:32
* @LastEditors: error: git config user.name && git config user.email & please set dead value or install git
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -98,10 +98,10 @@ module.exports = {
// target: "http://127.0.0.1:8099",
// target: "http://47.92.225.109:5602",
// target: "http://www.meetfood.cn:2390", // 湖南-线上
// target: "http://zwpt.xzclub.top:9333/",
target: "http://zwpt.xzclub.top:9333/",
// target: "http://192.168.128.104:8099", // 江
// target: "http://172.20.0.149:8099", // 北京 张
target: "http://192.168.0.109:8099", // 西藏 张
// target: "http://192.168.0.109:8099", // 西藏 张
// target: "http://192.168.0.143:8099", // 西藏 马
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