Skip to content

F
founder_vue
Commit 7870cdde by 米嘉伟
Options

Merge branch 'dev_zwpt' of http://39.99.224.27:9022/changchao/founder_vue into dev_zwpt

parents 2a7ff34c ad40fe2f
Showing with 213 additions and 90 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.94 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.13 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/components/Cascader.vue
<!--
* @Author: your name
* @Date: 2021-11-15 14:15:58
* @LastEditTime: 2022-04-15 18:09:29
* @LastEditors: Please set LastEditors
* @LastEditTime: 2022-05-27 18:15:43
* @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\components\confrim.vue
-->
......@@ -64,7 +64,7 @@ export default {
},
immediate: true,
deep: true,
},
}
},
props: {
props: {
......@@ -203,7 +203,6 @@ export default {
}
console.log(this.form[this.id]);
},
};
</script>
......
src/i18n/zh-cn.js
/*
* @Author: your name
* @Date: 2022-03-25 16:36:01
* @LastEditTime: 2022-05-26 16:54:08
* @LastEditTime: 2022-06-07 14:00:56
* @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: \uuuz\founder_vue\src\i18n\zh-cn.js
......@@ -524,7 +524,8 @@ export default {
loss_value: '损失价值（元）',
extraction_unit: '提取单位名称',
extraction_time: '提取时间',
extraction_work: '提取单位'
extraction_work: '提取单位',
numbers: '数量'
},
// 关注列表
Gzlb: {
......
src/utils/UserUtil.js
/*
* @Author: error: git config user.name && git config user.email & please set dead value or install git
* @Date: 2022-01-19 10:02:54
* @LastEditors: error: git config user.name && git config user.email & please set dead value or install git
* @LastEditTime: 2022-06-06 15:36:35
* @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/AllPersonnelBase/AllPersonnelBase.vue
......@@ -34,6 +34,7 @@
<el-date-picker
v-model="reqParam.personStoreCustomSearch.createTime"
type="daterange"
unlink-panels
range-separator="~"
:start-placeholder="$t('Common.start_time2')"
:end-placeholder="$t('Common.end_time2')"
......
src/views/AllPersonnelBase/modules/ajxxk.vue
......@@ -262,6 +262,8 @@ export default {
this.ysajjbxx.ysxtAsjbh = val.ysxtAsjbh;
this.ysajjbxx.xckybh = val.xckybh;
this.ysajjbxx.id = val.id;
this.CaseImgNum = val.fingerprintCount;
this.CasePlamNum = val.palmCount;
// debugger
// if (this.drawer == true) {
// console.log('打开信息卡')
......@@ -278,10 +280,10 @@ export default {
},
CaseImgNum (val) {
// 去掉加载状态
this.caseLoading = false;
// this.caseLoading = false;
},
CasePlamNum (val) {
this.casePlamLoading = false;
// this.casePlamLoading = false;
},
radio1 (val) {
if (val == 2) {
......@@ -298,9 +300,12 @@ export default {
let self = this;
if (self.Palmcount > 0) return;
self.Palmcount++
self.casePlamLoading = true;
NetUtil.ajxxk.getCasePalmBybarcode({ barcode: this.ysajjbxx.ysxtAsjbh },).then(response => {
if (response.code == 0) { //请求成功 代码为0
self.CasePlamNum = response.ret.length;
// 去掉加载状态
self.casePlamLoading = false;
// self.CasePlamNum = response.ret.length;
if (self.CasePlamNum > 0) {
for (let i = 0; i <= response.ret.length; i++) {
let arr = {
......@@ -314,14 +319,14 @@ export default {
// self.$forceUpdate()
console.log(self.CasePlamImg, "CasePlamImg");
}
// 去掉加载状态
self.casePlamLoading = false;
self.bs++
} else if (response.code == 4) {
// 去掉加载状态
self.CasePlamNum = 0
self.casePlamLoading = false;
self.bs++
console.log(self.casePlamLoading);
console.log(self.CasePlamNum);
}
}).catch(function (error) {
//console.log(error);
......@@ -369,10 +374,13 @@ export default {
getCaseBybarcode () {
// 案件原图
let self = this;
self.caseLoading = true;
NetUtil.ajxxk.getCaseBybarcode({ barcode: this.ysajjbxx.ysxtAsjbh }).then(response => {
console.log(response.ret, 'gaigaigai')
if (response.code == 0) { //请求成功 代码为0
self.CaseImgNum = response.ret.length;
// 去掉加载状态
self.caseLoading = false;
// self.CaseImgNum = response.ret.length;
if (self.CaseImgNum > 0) {
for (let i = 0; i <= response.ret.length; i++) {
let arr = {
......@@ -383,11 +391,8 @@ export default {
arr.img = response.ret[i].image;
self.CaseImg.push(arr);
}
// self.$forceUpdate()
console.log(self.CaseImg, "CaseImg");
}
// 去掉加载状态
self.caseLoading = false;
} else if (response.code == 4) {
// 去掉加载状态
self.CaseImgNum = 0
......
src/views/AllPersonnelBase/qbalk.vue
......@@ -209,7 +209,13 @@
<el-table-column
prop="ssjzrmby"
:label="$t('Allcase.loss_value')"
:width="width2"
:width="width5"
>
</el-table-column>
<el-table-column
prop="totalCount"
:label="$t('Allcase.numbers')"
:width="width3"
>
</el-table-column>
<el-table-column
......@@ -222,7 +228,7 @@
<el-table-column
prop="tqdwGajgmc"
:label="$t('Allcase.extraction_unit')"
:width="width5"
:width="width4"
show-overflow-tooltip
>
</el-table-column>
......@@ -528,8 +534,8 @@ export default {
},
data () {
return {
width5: 180,
width4: 130,
width5: 120,
width4: 150,
width3: 100,
width2: 150,
width1: 220,
......
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">
......@@ -1297,15 +1299,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/PermissionManage.vue
......@@ -116,12 +116,21 @@
</el-table-column>
<el-table-column prop="active" :label="$t('Common.option')" :width="userWidths.width1">
<template slot-scope="scope">
<img style="
width: 1.125rem;
height: 1.125rem;
margin-right: 1.125rem;
cursor: pointer;
" src="../../assets/img/qbryk/bj.png" @click="userEdit(scope.row.id)" />
<div style="width: 1.125rem;height: 1.125rem;">
<el-tooltip
class="item"
effect="dark"
:content="$t('Common.compile')"
placement="top"
:open-delay="500"
>
<img style="
height: 1.12rem;
margin-right: 1.125rem;
cursor: pointer;
" src="../../assets/img/qbryk/bj.png" @click="userEdit(scope.row.id)" />
</el-tooltip>
</div>
<!-- <img-->
<!-- style="width: 1.125rem;height: 1.125rem;cursor: pointer"-->
<!-- src="../../assets/img/qbryk/del.png"-->
......
src/views/SystemManage/QueryPermission.vue
<!--
* @Author: your name
* @Date: 2021-12-24 09:50:39
* @LastEditTime: 2022-04-14 19:28:06
* @LastEditors: Please set LastEditors
* @LastEditTime: 2022-06-06 16:26:31
* @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()
......@@ -723,6 +727,13 @@ export default {
return i.defaultFlag == 0
}
)
this.diyRoleListOrigin = JSON.parse(JSON.stringify(result)).filter(
(i) => {
i.value = i.name
i.name = self.$t('RoleManage.please_input_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)
......@@ -810,6 +821,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)
......@@ -857,6 +869,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(this.$t('RoleManage.update_success'))
}, 500)
......@@ -901,6 +915,7 @@ export default {
if (!edit && typeof edit != Boolean) edit = false
edit = !edit
this.$set(this.diyRoleList[index], 'edit', edit)
this.$set(this.diyRoleListOrigin[index], 'edit', edit)
if (edit) {
setTimeout(() => {
this.$refs['edit_input']?.[0]?.focus()
......@@ -917,13 +932,19 @@ 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
// this.diyRoleListOrigin = 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;
cursor: auto;
opacity: 0;
}
}
}
......
src/views/bzxxgl/bzxxfh.vue
<!--
* @Author: your name
* @Date: 2021-12-01 15:25:22
* @LastEditTime: 2022-04-11 11:48:58
* @LastEditors: Please set LastEditors
* @LastEditTime: 2022-05-27 18:23:43
* @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\AllPersonnelBase\bzxxfh.vue
-->
......
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()"
......@@ -1980,6 +1980,11 @@ export default {
height: 32px;
}
}
.search-type {
/deep/.el-input--suffix .el-input__inner {
cursor: pointer;
}
}
.ljfk {
margin-left: 24px;
.item {
......@@ -2025,6 +2030,7 @@ export default {
height: 32px;
}
/deep/.el-input--suffix .el-input__inner {
cursor: pointer;
height: 32px;
}
}
......@@ -2045,6 +2051,9 @@ export default {
/deep/.el-date-editor .el-range__icon {
line-height: 20px;
}
/deep/.el-range-separator {
line-height: 24px;
}
}
}
.buttons {
......@@ -2298,7 +2307,7 @@ export default {
background-size: 16px;
}
/deep/.el-table--enable-row-hover .el-table__body tr:hover {
cursor: pointer;
// cursor: pointer;
}
</style>
<style lang="scss" scoped>
......@@ -2574,5 +2583,15 @@ export default {
.el-select-dropdown__item {
padding-left: 10px !important;
}
.f-primary-button {
cursor: pointer;
background: #055fe7 !important;
&:hover {
background: #377fec !important;
}
&:active {
background: #044cb9 !important;
}
}
</style>
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2022-04-25 23:11:49
* @LastEditors: Please set LastEditors
* @LastEditTime: 2022-06-07 15:06:30
* @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
*/
......@@ -110,6 +110,7 @@ module.exports = {
// target: "http://192.168.0.109:8099", // 西藏 张
// target: "http://192.168.0.143:8099", // 西藏 马
// target: "http://192.168.0.130:8099", // 西藏 刘
// target: "http://172.18.109.63:8099", // 北京 张
ws: true,
changeOrigin: true,
pathRewrite: {
......@@ -125,6 +126,7 @@ module.exports = {
// target: "http://172.18.109.63:8765", // 北京 张
// target: "http://192.168.0.165:8765", // 西藏 马
// target: "http://192.168.0.107:8765", // 西藏 张
// target: "http://172.18.109.63:8765", // 北京 张
ws: true,
changeOrigin: true,
pathRewrite: {
......
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