Skip to content

F
founder_vue
Commit 86860d4b by 米嘉伟
Options

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

parents 1a91dd2b 2fa280da
Showing with 168 additions and 97 deletions
src/assets/css/globalBase.scss
/deep/ .el-input__inner {
background: #ffffff;
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.03);
border-radius: 4px;
border: none;
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) !important;
border-color: none !important;
color: #055FE7;
// 输入框选中样式
/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) !important;
border-color: none !important;
color: #055fe7;
}
// :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) !important;
border-color: none !important;
color: #055FE7;
.el-range-input {
color: #055FE7;
}
/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) !important;
border-color: none !important;
color: #055fe7;
.el-range-input {
color: #055fe7;
}
}
/deep/.el-table td,
.el-table th.is-leaf {
background-color: #ffffff;
border: none;
// border-bottom: 1px #f6f8fa solid;
border-top: 1px #f6f8fa solid;
}
// 去除table表格最底部边框
.el-table__row > td {
border: none;
}
// 去除table表格最底部边框
.el-table::before {
height: 0px;
}
/deep/.el-table .el-table__header-wrapper tr th{
background-color: #ECF1F7!important;
/deep/.el-table .el-table__header-wrapper tr th {
background-color: #ecf1f7 !important;
font-size: 14px !important;
font-family: HarmonyOS_Sans_SC_Medium !important;
color: #282F3C !important;
height: 48px !important;
padding: 0 !important;
font-family: HarmonyOS_Sans_SC_Medium !important;
color: #282f3c !important;
height: 48px !important;
padding: 0 !important;
}
/deep/.el-table .el-table__body tr.current-row > td {
background-color: #F2F7FE !important;
background-color: #f2f7fe !important;
}
/deep/.el-table .el-table__body tr:hover > td {
background-color: #F2F7FE !important;
background-color: #f2f7fe !important;
}
/deep/.el-table__row {
height: 48px !important;
height: 48px !important;
}
/deep/.el-table__row--level-1 {
.el-table__cell {
background-color: #F5F6F7 !important;
}
.el-table__cell {
background-color: #f5f6f7 !important;
}
}
/deep/.el-table .el-table__cell {
padding: 0 !important;
}
/deep/.el-table__body {
width: 100% !important;
}
/deep/.btn-prev {
cursor: pointer;
i {
cursor: pointer;
}
}
/deep/.btn-next {
cursor: pointer;
i {
cursor: pointer;
}
}
// 分页
/deep/.el-pager {
.number {
background-color: transparent !important;
}
.number.active {
background-color: #055fe7 !important;
box-shadow: 0px 12px 16px 1px rgba(0, 21, 51, 0.03);
border-radius: 6px;
}
.el-icon.more.btn-quicknext.el-icon-more,
.el-icon.more.btn-quickprev.el-icon-more {
background-color: transparent !important;
}
}
/deep/ .btn-prev,
/deep/.btn-next {
background-color: transparent !important;
}
/deep/ .el-pagination__sizes {
position: absolute;
right: 0;
}
// 修改下拉框样式
......@@ -49,45 +111,51 @@
padding-left: 10px !important;
}
/deep/.el-input__inner:hover {
cursor: text;
}
// 日期选择器
/deep/.el-date-editor {
display: flex;
align-items: center;
display: flex;
align-items: center;
}
/deep/.el-date-editor .el-range-separator {
line-height: 26px;
line-height: 26px;
}
/deep/.el-input__icon {
height: 32px;
/deep/.el-date-editor {
/deep/.el-range__close-icon {
height: 32px !important;
}
}
/deep/ .el-input__icon.el-range__icon.el-icon-date {
position: absolute;
right: 6px;
position: absolute;
right: 6px;
}
.f-primary-button {
cursor: pointer;
background: #055FE7 !important;
&:hover {
background: #377FEC !important;
}
&:active {
background: #044CB9 !important;
}
cursor: pointer;
background: #055fe7 !important;
&:hover {
background: #377fec !important;
}
&:active {
background: #044cb9 !important;
}
}
.f-default-button {
border-radius: 6px;
border: 1px solid #AEB5C2 !important;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #2E3846 !important;
&:hover {
border: 1px solid #055FE7 !important;
color: #055FE7 !important;
}
&:active {
border: 1px solid #044CB9 !important;
color: #044CB9 !important;
}
}
\ No newline at end of file
border-radius: 6px;
border: 1px solid #aeb5c2 !important;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #2e3846 !important;
&:hover {
border: 1px solid #055fe7 !important;
color: #055fe7 !important;
}
&:active {
border: 1px solid #044cb9 !important;
color: #044cb9 !important;
}
}
src/router/modules/leftMenu.js
/*
* @Author: your name
* @Date: 2021-09-07 09:58:13
* @LastEditTime: 2022-01-10 12:00:05
* @LastEditTime: 2022-01-12 11:27:48
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\router\modules\index.js
......@@ -41,7 +41,6 @@ export default [
meta: {
parentId: 'zzwlr',
title: '新增人员',
// auth: 'A'
},
component: () => import('@/views/zzwlr/xzry.vue')
},
......@@ -55,7 +54,6 @@ export default [
meta: {
parentId: 'zzwlr',
title: '新增人员',
// auth: 'A'
},
component: () => import('@/views/zzwlr/xzry.vue')
},
......@@ -128,18 +126,6 @@ export default [
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: 'C'
},
component: () => import('@/views/cxyrd/QueryConfirm.vue')
},
{
path: '/zljc',
name: 'zljc',
hidden: false,
......@@ -176,6 +162,18 @@ export default [
component: () => import('@/views/daxx/Index.vue')
},
{
path: '/cxyrd',
name: 'cxyrd',
hidden: false,
icon_d: '/img/cxyrd_d.png',
icon_a: '/img/cxyrd_a.png',
meta: {
title: '查询与认定',
auth: 'C'
},
component: () => import('@/views/cxyrd/QueryConfirm.vue')
},
{
path: '/AllPersonnelBaseIndex',
name: 'AllPersonnelBaseIndex',
redirect: '/AllPersonnelBase',
......@@ -318,7 +316,7 @@ export default [
hidden: false,
meta: {
title: '发查询权限',
auth: 'H-4',
auth: 'H-5',
parentId: 'SystemManage'
},
component: () =>
......@@ -380,7 +378,7 @@ export default [
hidden: false,
meta: {
title: '系统分库管理',
auth: 'H-4',
auth: 'H-6',
parentId: 'SystemManage'
},
component: () =>
......
src/views/AllPersonnelBase/AllPersonnelBase.vue
......@@ -222,7 +222,6 @@
>
</el-table-column>
<el-table-column
fixed="right"
label="操作"
width="auto"
>
......@@ -1032,7 +1031,7 @@ export default {
* @return {*}
*/
Tpage () {
return Math.floor(this.reqParam.page.total / this.reqParam.page.pageSize);
return Math.round(this.reqParam.page.total / this.reqParam.page.pageSize);
}
},
mounted () {
......
src/views/Home.vue
......@@ -892,10 +892,10 @@ export default {
.el-tabs /deep/ {
font-family: HarmonyOS_Sans_SC;
width: 1235px;
height: 60px;
height: 56px;
.el-tabs__header {
margin: 0;
height: 60px;
height: 56px;
.el-tabs__nav-wrap.is-top {
height: 100%;
}
......@@ -1220,7 +1220,7 @@ export default {
.main {
// padding: 24px;
width: 100%;
height: calc(100% - 60px);
height: calc(100% - 56px);
.contain {
position: relative;
......
src/views/cxyrd/QueryConfirm.vue
......@@ -8,7 +8,7 @@
<div class="display_style">
<span class="labelFont">条码号：</span>
<el-input
class="el_input"
class="el_input tmh"
v-model="reqParam.contrastCustomSearchReq.barcode"
placeholder="请输入条码号"
></el-input>
......@@ -247,8 +247,8 @@
v-show="isShowTip"
>
<i
class="el-icon-info"
style="color: #055fe7; font-size: 0.9375rem"
class="iconfont icon-tanhao1"
style="color: #055fe7; font-size: 1rem; margin: 0 0.625rem;"
></i>
已选择
<span style="color: #055fe7">{{ selectionData.length }}</span> 项​
......@@ -1489,14 +1489,14 @@ b {
font-size: 12px;
}
.el-button {
width: 96px;
width: 72px;
height: 32px;
border-radius: 4px;
margin: 0;
padding: 0;
}
.el-button__inner {
width: 56px;
width: 72px;
height: 16px;
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
......@@ -1510,6 +1510,7 @@ b {
padding: 0 8px !important;
background: #ddebff;
border-radius: 4px;
font-size: 0.75rem;
}
.confirm-page {
......@@ -1608,6 +1609,9 @@ b {
border-radius: 4px;
// border: 1px solid #e6e6e8;
}
.tmh {
width: 232px;
}
/deep/.el-input__inner {
height: 32px !important;
}
......@@ -1690,7 +1694,7 @@ b {
}
.el-button--primary {
width: 96px;
width: 72px;
height: 32px;
line-height: 22px;
padding: 0;
......@@ -1795,7 +1799,9 @@ b {
}
.confirm_main {
width: 100%;
height: 60px;
// height: 60px;
height: 620px;
border-bottom: 1px solid #eeeeee;
}
.confirm_main_table {
margin: 6px 0 15px 0;
......
src/views/drFPTX/Index.vue
......@@ -89,6 +89,7 @@
FPTX的条码号
</div>
<el-table
:border="false"
height="33rem"
:data="datas"
@selection-change="checkAll1"
......
src/views/zzwlr/xzry.scss
......@@ -84,16 +84,16 @@
padding: 0 245px;
}
}
.inputBh {
/deep/.el-input-group__prepend {
width: 40px;
text-align: center;
padding: 0;
}
/deep/.el-input__inner {
width: 224px;
}
}
// .inputBh {
// /deep/.el-input-group__prepend {
// width: 40px;
// text-align: center;
// padding: 0;
// }
// /deep/.el-input__inner {
// width: 224px;
// }
// }
// 滚动条的宽度
/deep/ .el-form::-webkit-scrollbar {
width: 6px; // 横向滚动条
......
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