Skip to content

F
founder_vue
Commit 0e213c87 by li_hongchao
Options

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

# Conflicts:
#	vue.config.js
parents 05474339 1d6446f9
Showing with 650 additions and 140 deletions
public/iconfont/demo_index.html
......@@ -55,6 +55,66 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont">&#xe651;</span>
<div class="name">叹号</div>
<div class="code-name">&amp;#xe651;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe650;</span>
<div class="name">PDF</div>
<div class="code-name">&amp;#xe650;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe64f;</span>
<div class="name">Word</div>
<div class="code-name">&amp;#xe64f;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe64e;</span>
<div class="name">Excel</div>
<div class="code-name">&amp;#xe64e;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe64d;</span>
<div class="name">可视化切换</div>
<div class="code-name">&amp;#xe64d;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe64c;</span>
<div class="name">报表</div>
<div class="code-name">&amp;#xe64c;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe615;</span>
<div class="name">暂停</div>
<div class="code-name">&amp;#xe615;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe613;</span>
<div class="name">预览</div>
<div class="code-name">&amp;#xe613;</div>
</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>
</li>
<li class="dib">
<span class="icon iconfont">&#xe649;</span>
<div class="name">提示</div>
<div class="code-name">&amp;#xe649;</div>
......@@ -420,9 +480,9 @@
<pre><code class="language-css"
>@font-face {
font-family: 'iconfont';
src: url('iconfont.woff2?t=1641955164800') format('woff2'),
url('iconfont.woff?t=1641955164800') format('woff'),
url('iconfont.ttf?t=1641955164800') format('truetype');
src: url('iconfont.woff2?t=1642564860670') format('woff2'),
url('iconfont.woff?t=1642564860670') format('woff'),
url('iconfont.ttf?t=1642564860670') format('truetype');
}
</code></pre>
<h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
......@@ -449,6 +509,96 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont icon-tanhao2"></span>
<div class="name">
叹号
</div>
<div class="code-name">.icon-tanhao2
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-PDF"></span>
<div class="name">
PDF
</div>
<div class="code-name">.icon-PDF
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-WORD"></span>
<div class="name">
Word
</div>
<div class="code-name">.icon-WORD
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-excel"></span>
<div class="name">
Excel
</div>
<div class="code-name">.icon-excel
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-keshihuaqiehuan"></span>
<div class="name">
可视化切换
</div>
<div class="code-name">.icon-keshihuaqiehuan
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-baobiao1"></span>
<div class="name">
报表
</div>
<div class="code-name">.icon-baobiao1
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-zanting"></span>
<div class="name">
暂停
</div>
<div class="code-name">.icon-zanting
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-yulan"></span>
<div class="name">
预览
</div>
<div class="code-name">.icon-yulan
</div>
</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
</div>
<div class="code-name">.icon-xingzhuang1
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-tishi"></span>
<div class="name">
提示
......@@ -999,6 +1149,86 @@
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-tanhao2"></use>
</svg>
<div class="name">叹号</div>
<div class="code-name">#icon-tanhao2</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-PDF"></use>
</svg>
<div class="name">PDF</div>
<div class="code-name">#icon-PDF</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-WORD"></use>
</svg>
<div class="name">Word</div>
<div class="code-name">#icon-WORD</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-excel"></use>
</svg>
<div class="name">Excel</div>
<div class="code-name">#icon-excel</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-keshihuaqiehuan"></use>
</svg>
<div class="name">可视化切换</div>
<div class="code-name">#icon-keshihuaqiehuan</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-baobiao1"></use>
</svg>
<div class="name">报表</div>
<div class="code-name">#icon-baobiao1</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-zanting"></use>
</svg>
<div class="name">暂停</div>
<div class="code-name">#icon-zanting</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-yulan"></use>
</svg>
<div class="name">预览</div>
<div class="code-name">#icon-yulan</div>
</li>
<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>
<div class="code-name">#icon-xingzhuang1</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-tishi"></use>
</svg>
<div class="name">提示</div>
......
public/iconfont/iconfont.css
@font-face {
font-family: "iconfont"; /* Project id 2961960 */
src: url('iconfont.woff2?t=1641955164800') format('woff2'),
url('iconfont.woff?t=1641955164800') format('woff'),
url('iconfont.ttf?t=1641955164800') format('truetype');
src: url('iconfont.woff2?t=1642564860670') format('woff2'),
url('iconfont.woff?t=1642564860670') format('woff'),
url('iconfont.ttf?t=1642564860670') format('truetype');
}
.iconfont {
......@@ -13,6 +13,46 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-tanhao2:before {
content: "\e651";
}
.icon-PDF:before {
content: "\e650";
}
.icon-WORD:before {
content: "\e64f";
}
.icon-excel:before {
content: "\e64e";
}
.icon-keshihuaqiehuan:before {
content: "\e64d";
}
.icon-baobiao1:before {
content: "\e64c";
}
.icon-zanting:before {
content: "\e615";
}
.icon-yulan:before {
content: "\e613";
}
.icon-zhiwencaijibiaoji:before {
content: "\e614";
}
.icon-xingzhuang1:before {
content: "\e64b";
}
.icon-tishi:before {
content: "\e649";
}
......
public/iconfont/iconfont.json
......@@ -6,6 +6,76 @@
"description": "",
"glyphs": [
{
"icon_id": "27311234",
"name": "叹号",
"font_class": "tanhao2",
"unicode": "e651",
"unicode_decimal": 58961
},
{
"icon_id": "27229233",
"name": "PDF",
"font_class": "PDF",
"unicode": "e650",
"unicode_decimal": 58960
},
{
"icon_id": "27229222",
"name": "Word",
"font_class": "WORD",
"unicode": "e64f",
"unicode_decimal": 58959
},
{
"icon_id": "27229195",
"name": "Excel",
"font_class": "excel",
"unicode": "e64e",
"unicode_decimal": 58958
},
{
"icon_id": "27227907",
"name": "可视化切换",
"font_class": "keshihuaqiehuan",
"unicode": "e64d",
"unicode_decimal": 58957
},
{
"icon_id": "27227902",
"name": "报表",
"font_class": "baobiao1",
"unicode": "e64c",
"unicode_decimal": 58956
},
{
"icon_id": "27193829",
"name": "暂停",
"font_class": "zanting",
"unicode": "e615",
"unicode_decimal": 58901
},
{
"icon_id": "27193722",
"name": "预览",
"font_class": "yulan",
"unicode": "e613",
"unicode_decimal": 58899
},
{
"icon_id": "27193723",
"name": "指纹采集标记",
"font_class": "zhiwencaijibiaoji",
"unicode": "e614",
"unicode_decimal": 58900
},
{
"icon_id": "27193537",
"name": "采集logo",
"font_class": "xingzhuang1",
"unicode": "e64b",
"unicode_decimal": 58955
},
{
"icon_id": "27150195",
"name": "提示",
"font_class": "tishi",
......
public/index.html
......@@ -31,13 +31,13 @@
* {
padding: 0;
margin: 0 auto;
/* -moz-user-select: none;
-moz-user-select: none;
-o-user-select: none;
-khtml-user-select: none;
-webkit-user-select: none;
-ms-user-select: none;
user-select: none; */
/* cursor: default; */
user-select: none;
/*cursor: default;*/
}
img {
-webkit-user-drag: none;
......@@ -99,4 +99,4 @@
<!-- <script src="<%= BASE_URL %>image-edit/js/service-basic.js"></script> -->
</body>
</html>
\ No newline at end of file
</html>
src/assets/css/globalBase.scss
......@@ -12,6 +12,7 @@
color: #055fe7;
}
/deep/.el-input.is-active .el-input__inner,
/deep/.el-input__inner:hover {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08) !important;
......@@ -40,7 +41,7 @@
background-color: #ffffff;
border: none;
// border-bottom: 1px #f6f8fa solid;
border-top: 1px #EEEEEE solid;
border-top: 1px #eeeeee solid;
}
// 去除table表格最底部边框
.el-table__row > td {
......@@ -75,7 +76,7 @@
}
/deep/.el-table th > .cell {
font-family: HarmonyOS_Sans_SC_Medium;
font-family: HarmonyOS_Sans_SC_Medium;
}
/deep/.el-table .el-table__cell {
......@@ -149,37 +150,37 @@
// 批量操作
.el-tag {
color: #055fe7 !important;
height: 32px;
box-sizing: border-box !important;
padding: 0 8px !important;
background: #ddebff;
border-radius: 4px;
font-size: 0.75rem;
margin-bottom: 16px;
display: flex;
align-items: center;
color: #055fe7 !important;
height: 32px;
box-sizing: border-box !important;
padding: 0 8px !important;
background: #ddebff;
border-radius: 4px;
font-size: 0.75rem;
margin-bottom: 16px;
display: flex;
align-items: center;
}
/deep/.el-link--inner {
color: rgb(5, 95, 231);
color: rgb(5, 95, 231);
}
.icon-tanhao1 {
display: flex;
justify-content: center;
align-items: center;
display: flex;
justify-content: center;
align-items: center;
}
// 表格高度 -- 展示下面的border
.split-line {
height: 650px;
border-bottom: 1px solid #eee;
height: 650px;
border-bottom: 1px solid #eee;
}
// 复选框
/deep/.el-checkbox__inner {
cursor: pointer;
cursor: pointer;
}
/deep/.el-checkbox__input {
line-height: 16px;
line-height: 16px;
}
// 分页
......@@ -266,16 +267,16 @@
.f-youling-button {
border-radius: 6px;
border: 1px solid #055FE7 !important;
border: 1px solid #055fe7 !important;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #055FE7 !important;
color: #055fe7 !important;
&:hover {
border: 1px solid #377FEC !important;
color: #377FEC !important;
border: 1px solid #377fec !important;
color: #377fec !important;
}
&:active {
border: 1px solid #044CB9 !important;
color: #044CB9 !important;
border: 1px solid #044cb9 !important;
color: #044cb9 !important;
}
}
src/views/Editor/modules/rydaxx.scss
......@@ -161,16 +161,16 @@
width: 16px;
height: 16px;
&::before {
content: " ";
width: 16px;
height: 16px;
background-image: url("../../../assets/img/inputerror.png");
background-repeat: no-repeat;
background-size: cover;
top: 12px;
right: 0;
position: absolute;
font-family: "iconfont";
content: "\e628";
//width: 16px;
//height: 16px;
//background-image: url("../../../assets/img/inputerror.png");
//background-repeat: no-repeat;
//background-size: cover;
//top: 12px;
//right: 0;
//position: absolute;
}
}
......@@ -495,4 +495,4 @@
}
/deep/.el-input--prefix .el-input__inner {
padding-left: 15px;
}
\ No newline at end of file
}
src/views/SystemManage/GroupManage.vue
......@@ -29,7 +29,12 @@
</div>
<div class="search-item">
<div class="label">用户所属单位名称：</div>
<Cascader :form="searchParams" id="dwCode" width="9.6875" :props="props"></Cascader>
<Cascader
:form="searchParams"
id="dwCode"
width="9.6875"
:props="props"
></Cascader>
</div>
<div class="search-item">
<div class="label">组角色：</div>
......@@ -59,7 +64,11 @@
<el-checkbox v-model="checked" style="margin-right: 10px"
>停用</el-checkbox
>
<div class="btn1 f-youling-button" @click="delMore()" v-if="roleArr.includes('H-2-1')">
<div
class="btn1 f-youling-button"
@click="delMore()"
v-if="roleArr.includes('H-2-1')"
>
删除
</div>
<div class="add f-youling-button" @click="open">
......@@ -81,7 +90,7 @@
>
<i
class="iconfont icon-tanhao1"
style="color: #055fe7; font-size: 1rem; margin: 0 0.625rem;"
style="color: #055fe7; font-size: 1rem; margin: 0 0.625rem"
></i>
已选择
<span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​
......@@ -100,7 +109,6 @@
<div class="table-data">
<el-table
:height="height"
highlight-current-row
ref="multipleTable"
:key="key"
:data="tableData"
......@@ -168,7 +176,11 @@
</el-table-column>
<el-table-column>
<template slot-scope="scope">
<div class="set-btn" :width="btnwidth" @click="setUser(scope.row)">
<div
class="set-btn"
:width="btnwidth"
@click="setUser(scope.row)"
>
用户设置
</div>
</template>
......@@ -601,16 +613,22 @@
<el-dropdown-menu slot="dropdown">
<el-checkbox-group v-model="userAddCheckList">
<div v-if="userAddArr.length > 0">
<el-dropdown-item v-for="item in userAddArr" :key="item.id"
><el-checkbox :label="item.id">{{
item.name
}}</el-checkbox></el-dropdown-item
>
<el-dropdown-item divided class="divided">
<el-button class="dropDownBtn" @click="dropdownSave"
>确定</el-button
<div class="itemUser">
<el-dropdown-item
v-for="item in userAddArr"
:key="item.id"
><el-checkbox :label="item.id">{{
item.name
}}</el-checkbox></el-dropdown-item
>
</el-dropdown-item>
</div>
<div class="itemUserBtn">
<el-dropdown-item divided class="divided">
<el-button class="dropDownBtn" @click="dropdownSave"
>确定</el-button
>
</el-dropdown-item>
</div>
</div>
<el-dropdown-item divided class="divided" v-else>
暂无可添加数据
......@@ -721,7 +739,7 @@
/**
* 用户组管理
* @module GroupManage
*
*
*/
import "@/icons/ic_add.svg";
import "@/icons/group-item.svg";
......@@ -1623,6 +1641,12 @@ export default {
},
};
</script>
<style lang="scss">
.el-tooltip__popper.is-dark {
background: rgba(51, 51, 51, 0.9);
box-shadow: 0px 2px 8px 2px rgba(0, 0, 0, 0.1);
}
</style>
<style lang="scss" scoped>
.el-table /deep/ {
.el-tooltip {
......@@ -1654,8 +1678,8 @@ export default {
margin-right: 25px;
border-radius: 4px;
margin-right: 25px;
margin-bottom: 5px;
margin-top: 7px;
margin-bottom: 10px;
margin-top: 4px;
}
.delSelection /deep/ .el-table-column--selection .cell {
display: none;
......@@ -1844,5 +1868,6 @@ export default {
}
@import "scss/group";
@import "./scss/dialog_table";
@import "./scss/boxShadow";
// @import "@/assets/css/globalBase.scss";
</style>
src/views/SystemManage/PermissionManage.vue
......@@ -1062,11 +1062,53 @@ export default {
font-size: 14px;
max-width: 50%;
}
.el-tooltip__popper.is-dark {
background: rgba(51, 51, 51, 0.9);
box-shadow: 0px 2px 8px 2px rgba(0, 0, 0, 0.1);
}
</style>
<style scoped lang="scss">
@import "scss/group";
@import "scss/permission";
@import "@/assets/css/globalBase.scss";
@import "./scss/boxShadow";
.search {
/deep/ .el-input__inner {
background: #ffffff;
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.03);
border-radius: 4px;
border: none;
}
// 输入框选中样式
/deep/.el-input.is-active .el-input__inner,
/deep/.el-input__inner:focus {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08);
border-color: none;
color: #055fe7;
}
/deep/.el-input.is-active .el-input__inner,
/deep/.el-input__inner:hover {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08);
border-color: none;
}
// :focus-within能非常方便处理获取焦点状态。当元素本身或其后代元素获得焦点时，:focus-within伪类的元素就会有效著作权归作者所有。
/deep/.el-input.is-active .el-input__inner,
/deep/.el-input__inner:focus-within {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08);
border-color: none;
color: #055fe7;
.el-range-input {
color: #055fe7;
}
}
/deep/.el-input.is-active .el-input__inner,
/deep/.el-input__inner:hover {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08);
border-color: none;
}
}
.groupTable {
// height: 550px !important;
}
......
src/views/SystemManage/UserManage.vue
......@@ -32,7 +32,12 @@
</div>
<div class="search-item">
<div class="label">单位：</div>
<Cascader :form="searchParams" id="unitCode" width="9.6875" :props="props"></Cascader>
<Cascader
:form="searchParams"
id="unitCode"
width="9.6875"
:props="props"
></Cascader>
</div>
<div class="search-item">
<div class="label">角色：</div>
......@@ -119,7 +124,6 @@
<el-table
:height="height"
style="width: 100%"
highlight-current-row
ref="multipleTable"
:data="tableData"
:key="key"
......@@ -148,6 +152,9 @@
:width="width2"
show-overflow-tooltip
>
<template slot-scope="scope">
{{ scope.row.policeNumber || "---" }}
</template>
</el-table-column>
<el-table-column
prop="userGroupNames"
......@@ -155,6 +162,9 @@
show-overflow-tooltip
:width="width3"
>
<template slot-scope="scope">
{{ scope.row.userGroupNames || "---" }}
</template>
</el-table-column>
<el-table-column
prop="unitName"
......@@ -165,7 +175,10 @@
</el-table-column>
<el-table-column prop="roleNames" label="角色" :width="newWidth">
<template slot-scope="scope">
<div class="tagsBox">
<div
class="tagsBox"
v-if="strArr(scope.row.roleNames).length > 0"
>
<div
class="tags"
v-for="item in strArr(scope.row.roleNames).arr"
......@@ -194,6 +207,7 @@
</div>
</el-tooltip>
</div>
<span v-else>---</span>
</template>
</el-table-column>
<el-table-column
......@@ -674,7 +688,7 @@ export default {
children: "childCodeDwXz",
checkStrictly: true,
emitPath: false,
},
},
// 新增对象
addFormParams: {
idCard: "",
......@@ -914,7 +928,14 @@ export default {
arr: newArr,
length: arr.length,
};
return obj;
if (obj.length == 1 && obj.arr[0] == "") {
return {
arr: [""],
length: 0,
};
} else {
return obj;
}
},
/**
* @function submitEditForm
......@@ -1277,6 +1298,10 @@ export default {
font-size: 14px;
max-width: 50%;
}
.el-tooltip__popper.is-dark {
background: rgba(51, 51, 51, 0.9);
box-shadow: 0px 2px 8px 2px rgba(0, 0, 0, 0.1);
}
</style>
<style scoped lang="scss">
.delSelection /deep/ .el-table-column--selection .cell {
......@@ -1463,5 +1488,5 @@ export default {
}
@import "scss/user";
@import "./scss/dialog_table";
// @import "@/assets/css/globalBase.scss";
@import "./scss/boxShadow";
</style>
src/views/SystemManage/scss/boxShadow.scss 0 → 100644
.search {
/deep/ .el-select {
.el-input__icon {
line-height: 32px !important;
}
}
/deep/ .el-select {
.el-select__tags {
&:hover {
+ .el-input {
.el-input__inner {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08) !important;
border-color: none !important;
color: #055fe7;
}
}
}
}
}
}
src/views/SystemManage/scss/dialog_table.scss
......@@ -66,6 +66,9 @@
transform: translateY(3px);
}
}
.el-input{
height: 100%!important;
}
.is-error {
.el-input {
&::after {
......@@ -79,6 +82,12 @@
transform: translateY(-50%);
background: url("~@/assets/img/warn.png") 100% 100% / cover;
}
.el-input__suffix{
right: 30px;
}
.el-input__inner{
padding-right: 65px!important;
}
}
.el-input__inner {
border-color: #e6e6e8 !important;
......
src/views/SystemManage/scss/group.scss
......@@ -38,7 +38,7 @@
}
.tooTipBtn {
padding: 10px;
padding: 6px;
max-height: 317px;
overflow: auto;
// 滚动条的宽度
......@@ -59,16 +59,19 @@
background: #595a5a;
}
> div {
width: 100px;
width: 120px;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
word-wrap: break-word;
height: 24px;
font-size: 12px;
font-family: HarmonyOS_Sans_SC;
color: #eeeeee;
background: #5e5e5e;
border-radius: 4px;
text-align: center;
margin-bottom: 15px;
margin-bottom: 10px;
line-height: 24px;
&:last-of-type {
margin-bottom: 0;
......@@ -140,7 +143,7 @@
padding: 12px;
height: 80px;
position: relative;
background: #F6F8FA;
background: #f6f8fa;
box-shadow: inset 0px 0px 3px 0px rgba(5, 95, 231, 0.2);
border-radius: 10px;
.search-item {
......@@ -179,7 +182,7 @@
}
/deep/.el-input__icon.el-icon-arrow-down.is-reverse {
line-height: 32px;
}
}
.btn {
right: 24px;
width: 72px;
......@@ -260,12 +263,12 @@
}
.tags {
flex-shrink: 0;
width: 140px;
width: 125px;
margin: 0 7px;
height: 24px;
background: #f0f3f6;
border-radius: 4px;
text-align: center;
margin-right: 3px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
......@@ -578,6 +581,24 @@
background: rgba($color: #fff, $alpha: 0.65);
filter: blur(2px);
}
.itemUser{
height: 200px;
overflow: auto;
@include scrollBar();
}
.itemUserBtn /deep/{
.el-dropdown-menu__item{
&:hover {
background-color: transparent;
}
&::before {
display: none;
}
padding-top: 16px!important;
padding-bottom: 16px!important;
text-align: center;
}
}
.userDialog {
box-sizing: border-box;
position: absolute;
......@@ -586,7 +607,6 @@
transform: translate(-40%, -50%);
z-index: 1000;
width: 890px;
height: 540px;
background: #ffffff;
box-shadow: 0px 14px 30px 0px rgba(0, 21, 51, 0.25);
border-radius: 6px;
......@@ -617,9 +637,9 @@
}
.info {
box-sizing: border-box;
height: calc(100% - 120px);
padding: 12px 24px 12px 24px;
.header {
margin-bottom: 15px;
display: flex;
align-items: center;
justify-content: space-between;
......@@ -643,7 +663,9 @@
//border: 1px solid darkblue;
position: absolute;
right: 24px;
.addBtn {
width: 120px!important;
border-color: #055fe7 !important;
color: #055fe7 !important;
}
......@@ -686,13 +708,12 @@
}
.user-table /deep/ {
width: 100%;
height: calc(100% - 82px);
// overflow: auto;
.el-table {
height: 100%;
}
.el-table__body-wrapper {
height: calc(100% - 50px);
height: 300px;
overflow: auto;
@include scrollBar();
}
......@@ -700,10 +721,8 @@
}
.addbtns {
width: 100%;
margin: 30px 0 20px 0;
text-align: center;
position: absolute;
bottom: 30px;
left: 0;
.btn1 {
width: 72px;
height: 40px;
......@@ -787,8 +806,9 @@
}
}
.info {
padding: 24px;
padding: 24px 0;
.header {
padding: 0 24px;
width: 100%;
display: flex;
flex-direction: row;
......@@ -815,10 +835,14 @@
}
//border: saddlebrown 1px solid;
.default-role-group {
width: 578px;
&:last-of-type {
background-color: #f7f9fb;
}
width: 100%;
box-sizing: border-box;
background: #fdfeff;
border-radius: 4px;
padding: 0 0 10px 0;
padding: 0 24px 10px 24px;
margin: 0;
display: flex;
flex-direction: row;
......@@ -838,12 +862,17 @@
display: flex;
flex-flow: column;
> div {
display: flex;
justify-content: flex-start;
align-items: center;
width: 100%;
.label {
display: inline-block;
color: #666666;
vertical-align: top;
margin-top: 10px;
height: 52px;
line-height: 52px;
align-self: flex-start;
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
padding: 0 10px;
......@@ -851,7 +880,7 @@
box-sizing: border-box;
}
.barlen {
padding-right: 20px !important;
padding-right: 5.3px !important;
}
.ziding {
.contentItem {
......@@ -866,9 +895,11 @@
}
}
.content {
display: inline-block;
display: flex;
flex-flow: row wrap;
align-items: center;
width: calc(100% - 105px);
max-height: 88px !important;
max-height: 104px !important;
box-sizing: border-box;
overflow: auto;
&::-webkit-scrollbar {
......@@ -897,12 +928,14 @@
position: relative;
text-align: center;
margin-right: 25px;
margin-bottom: 5px;
margin-top: 7px;
margin-bottom: 10px;
margin-top: 10px;
> p {
line-height: 32px;
width: 100%;
overflow: hidden;
font-size: 14px;
color: #333333;
text-overflow: ellipsis;
white-space: nowrap;
box-sizing: border-box;
......@@ -917,7 +950,6 @@
}
}
&:first-of-type {
margin-bottom: 10px;
}
}
}
......
src/views/SystemManage/scss/permission.scss
.tooTipBtn {
padding: 10px;
padding: 6px;
max-height: 317px;
overflow: auto;
// 滚动条的宽度
......@@ -20,16 +20,19 @@
background: #595a5a;
}
> div {
width: 100px;
width: 120px;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
word-wrap: break-word;
height: 24px;
font-size: 12px;
font-family: HarmonyOS_Sans_SC;
color: #eeeeee;
background: #5e5e5e;
border-radius: 4px;
text-align: center;
margin-bottom: 15px;
margin-bottom: 10px;
line-height: 24px;
&:last-of-type {
margin-bottom: 0;
......@@ -75,7 +78,7 @@
padding: 12px;
height: 80px;
position: relative;
background: #F6F8FA;
background: #f6f8fa;
box-shadow: inset 0px 0px 3px 0px rgba(5, 95, 231, 0.2);
border-radius: 10px;
display: flex;
......@@ -146,12 +149,12 @@
}
.tags {
flex-shrink: 0;
width: 140px;
width: 125px;
margin: 0 7px;
height: 24px;
background: #f0f3f6;
border-radius: 4px;
text-align: center;
margin-right: 3px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
......@@ -237,7 +240,7 @@
padding: 12px;
height: 80px;
position: relative;
background: #F6F8FA;
background: #f6f8fa;
box-shadow: inset 0px 0px 3px 0px rgba(5, 95, 231, 0.2);
border-radius: 10px;
display: flex;
......@@ -311,12 +314,12 @@
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
width: 140px;
width: 125px;
margin: 0 7px;
height: 24px;
background: #f0f3f6;
border-radius: 4px;
text-align: center;
margin-right: 3px;
}
.circle-red {
width: 8px;
......
src/views/SystemManage/scss/user.scss
.tooTipBtn {
padding: 10px;
padding: 6px;
max-height: 317px;
overflow: auto;
// 滚动条的宽度
......@@ -20,16 +20,19 @@
background: #595a5a;
}
> div {
width: 100px;
width: 120px;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
word-wrap: break-word;
height: 24px;
font-size: 12px;
font-family: HarmonyOS_Sans_SC;
color: #EEEEEE;
background: #5e5e5e;
border-radius: 4px;
text-align: center;
margin-bottom: 15px;
margin-bottom: 10px;
line-height: 24px;
&:last-of-type {
margin-bottom: 0;
......@@ -98,12 +101,12 @@
padding: 12px;
height: 80px;
position: relative;
background: #F6F8FA;
background: #f6f8fa;
box-shadow: inset 0px 0px 3px 0px rgba(5, 95, 231, 0.2);
border-radius: 10px;
// display: flex;
// align-items: center;
.search-item {
width: auto;
height: 32px;
......@@ -142,7 +145,7 @@
}
/deep/.el-input__icon.el-icon-arrow-down.is-reverse {
line-height: 32px;
}
}
.btn {
top: 110px;
right: 24px;
......@@ -223,7 +226,8 @@
}
.tags {
flex-shrink: 0;
width: 140px;
width: 125px;
margin: 0 7px;
height: 24px;
overflow: hidden;
text-overflow: ellipsis;
......@@ -231,7 +235,6 @@
background: #f0f3f6;
border-radius: 4px;
text-align: center;
margin-right: 3px;
}
.circle-red {
width: 8px;
......
src/views/zzwcj/fingerprint.scss
......@@ -255,7 +255,7 @@ $foundColor: var(--foundColor,#ffffff);//ffc005
.default:hover {
border: 1px solid #76828d;
}
.deep {
width: 112px;
height: 42px;
......@@ -1286,10 +1286,17 @@ $foundColor: var(--foundColor,#ffffff);//ffc005
img {
cursor: pointer;
}
span {
color: $picSelected;
}
}
.pic.select:hover {
cursor: pointer;
border: 2px solid $pichover;
//border: 2px solid $pichover;
border: 3px solid $picSelected;
span {
color: $picSelected;
}
}
.score.success {
position: absolute;
......@@ -1554,7 +1561,7 @@ $foundColor: var(--foundColor,#ffffff);//ffc005
.dialog-footer {
.el-button.el-button--default {
width: 88px;
height: 32px;
height: 32px;
border:1px solid $btndialogBorder;
border-radius: 18px;
background: $btndialogDefaultBg !important;
......@@ -1564,7 +1571,7 @@ $foundColor: var(--foundColor,#ffffff);//ffc005
font-weight: 400;
line-height: 20px;
color: $btndialogDefault;
}
}
.el-button.el-button--primary {
......@@ -1727,7 +1734,7 @@ $foundColor: var(--foundColor,#ffffff);//ffc005
/deep/.el-checkbox__input.is-disabled + span.el-checkbox__label {
color: $checkSelect !important;
}
/deep/ .el-checkbox__inner {
border: 1px solid $checkBorder !important;
background-color: $checkInner;
......@@ -1789,7 +1796,7 @@ $foundColor: var(--foundColor,#ffffff);//ffc005
/deep/.el-checkbox__input.is-disabled + span.el-checkbox__label {
color: $checkSelect !important;
}
/deep/ .el-checkbox__inner {
border: 1px solid $checkBorder !important;
background-color: $checkInner;
......@@ -2147,7 +2154,7 @@ $foundColor: var(--foundColor,#ffffff);//ffc005
/deep/.el-checkbox__input.is-disabled + span.el-checkbox__label {
color: $checkSelect !important;
}
/deep/ .el-checkbox__inner {
width: 12px;
height: 12px;
......@@ -2454,7 +2461,7 @@ $foundColor: var(--foundColor,#ffffff);//ffc005
box-sizing: border-box;
display: flex;
align-items: center;
.el-dialog__headerbtn {
display: none;
}
......@@ -2743,7 +2750,7 @@ $foundColor: var(--foundColor,#ffffff);//ffc005
padding: 0;
margin: 0;
box-sizing: border-box;
.el-dialog__headerbtn {
top: 14px;
right: 16px;
......@@ -2940,9 +2947,12 @@ $foundColor: var(--foundColor,#ffffff);//ffc005
background:$cirBackground;
font-size: 12px;
border-radius: 50%;
padding: 3px 8px;
//padding: 3px 8px;
// color: #fff;
color:$cirDuigou
color:$cirDuigou;
display: flex;
justify-content: center;
align-items: center;
}
span {
......
src/views/zzwcj/fingerprint.vue
......@@ -19,7 +19,7 @@
</div>
<div style="display: flex;margin-left: 12.75rem;">
<div class="fir">
<div class="cir">√</div>
<div class="cir iconfont icon-duihao"></div>
<span>人员信息 </span>
<div class="solid"></div>
</div>
......@@ -406,19 +406,17 @@
</div>
<div class="btns-dialog">
<!-- 采集成功弹窗 -->
<el-dialog title="提示" :visible.sync="finishVisible" width="30rem" :modal-append-to-body='false'>
<el-dialog title="提示" :visible.sync="finishVisible" width="30rem" :modal-append-to-body='false' :close-on-click-modal="false">
<span>当前页面所有指位均采集完成，是否确认上传？</span>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="uploadFinger">上传</el-button>
<el-button type="primary" @click="finishVisible = false">取消</el-button>
</span>
</el-dialog>
<!-- 采集不成功弹窗 -->
<el-dialog title="提示" :visible.sync="failVisible" width="30rem" :modal-append-to-body='false'>
<el-dialog title="提示" :visible.sync="failVisible" width="30rem" :modal-append-to-body='false' :close-on-click-modal="false">
<span>当前页面有未采集指位，确定要结束采集吗？<br>选择“是”，未采集指位将被置为缺指。</span>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="setFinger">是</el-button>
<el-button type="default" @click="failVisible = false">否</el-button>
</span>
......@@ -605,15 +603,14 @@
<div class="left">
<div class="icon">
<img v-if="themeType == '深色' || themeType == '浅色'" src="../../assets/img/zw/info.png" alt="">
<span v-if="themeType == '默认'" style="color: #005fe7;">
&#xe651;
<span v-if="themeType == '默认'" class="iconfont icon-tanhao2" style="color: #fff;">
</span>
</div>
<div class="title">{{errTitle}}</div>
</div>
<div class="close" @click="closeAlert">
<img v-if="themeType == '深色' || themeType == '浅色'" src="../../assets/img/zw/close.png" alt="">
<span v-if="themeType == '默认'" style="color: #005fe7;">
<span v-if="themeType == '默认'" class="iconfont" style="color: #fff;">
&#xe648;
</span>
</div>
......@@ -623,7 +620,7 @@
</div>
<!-- 重复采集弹窗 -->
<div class="repeatDialog">
<el-dialog title="提示" :visible.sync="repeatVisible" width="30rem" :modal-append-to-body='false'>
<el-dialog title="提示" :visible.sync="repeatVisible" width="30rem" :modal-append-to-body='false' @close="cancelRepeat" :close-on-click-modal="false">
<span>当前有重复指位采集，是否继续?</span>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="setRepeat">是</el-button>
......@@ -1382,8 +1379,10 @@ export default {
this.deviceModel = result.productName
this.deviceSn = result.serialNumber
this.iBversion.deviceSN = result.serialNumber
this.pop = false
this.isAlter = false
if(result.serialNumber) {
this.pop = false
this.isAlter = false
}
} catch (error) {
//console.log(error);
}
......@@ -2291,7 +2290,9 @@ export default {
self.clickTimes = 0; // 单击清零
// 触发单击事件...
// alert(1)
self.lookFinger(finger, index, type)
if(finger.imgSrcR && finger.imgSrcL) {
self.lookFinger(finger, index, type)
}
}
}, 300)
if (self.clickTimes === 2) { //当点击次数为2
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2022-01-19 16:20:00
* @LastEditTime: 2022-01-20 10:28:50
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -118,8 +118,8 @@ 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://192.168.128.106:8099", // 江
target: "http://zwpt.xzclub.top:9333/",
// target: "http://192.168.128.106:8099", // 江
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