Skip to content

D
dsk-operate-sys-cscec
Commit 245b267b authored by tianhongyang's avatar tianhongyang
Browse files
Options

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys... 

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司
parents 103b8e9d 1204af95
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 34 deletions
dsk-operate-ui/src/assets/styles/index.scss
View file @ 245b267b
......@@ -360,7 +360,7 @@ li {
}
.is-scrolling-left + .el-table__fixed,
.is-scrolling-middle + .el-table__fixed,
.is-scrolling-right + .el-table__fixed {
.is-scrolling-right + .el-table__fixed,.el-table__fixed-right {
box-shadow: 2px 0 8px -7px #202020;
height: auto !important;
bottom: 16px !important;
......@@ -374,14 +374,14 @@ li {
.el-table__body-wrapper {
&::-webkit-scrollbar {
width: 16px; //竖轴宽度
height: 16px; //横轴宽度
height: 6px; //横轴宽度
}
&::-webkit-scrollbar-track {
background-color: #f3f4f5;
border-radius: 0;
}
&::-webkit-scrollbar-thumb {
background-color: rgba(98, 110, 126, 0.2);
background: rgba(0,0,0,.2);
border: 4px solid #f3f4f5;
border-radius: 10px;
}
......@@ -431,21 +431,21 @@ li {
border-radius: 8px;
height: 8px;
margin: 0 4px;
background: rgba(98, 110, 126, 0.2);
background: rgba(0,0,0,.2);
border: 4px solid #f3f4f5;
&:hover {
background: #566380;
background: #7d7d7d;
}
}
.el-scrollbar {
height: 16px;
height: 6px;
.el-scrollbar__bar.is-horizontal {
height: 8px;
}
.el-scrollbar__thumb {
background: rgba(98, 110, 126, 0.4);
background: rgba(0,0,0,.2);
&:hover {
background: #566380;
background: #7d7d7d;
}
}
}
......@@ -529,7 +529,7 @@ li {
border-radius: 0;
}
&::-webkit-scrollbar-thumb {
background-color: rgba(98, 110, 126, 0.2);
background: rgba(0,0,0,.2);
border: 4px solid #f3f4f5;
border-radius: 10px;
}
......@@ -579,10 +579,10 @@ li {
border-radius: 8px;
height: 8px;
margin: 0 4px;
background: rgba(98, 110, 126, 0.2);
background: rgba(0,0,0,.2);
border: 4px solid #f3f4f5;
&:hover {
background: #566380;
background: #7d7d7d;
}
}
.el-scrollbar {
......@@ -591,7 +591,7 @@ li {
height: 8px;
}
.el-scrollbar__thumb {
background: rgba(98, 110, 126, 0.4);
background: rgba(0,0,0,.2);
&:hover {
background: #566380;
}
......@@ -687,7 +687,7 @@ li {
border-radius: 0;
}
&::-webkit-scrollbar-thumb {
background-color: rgba(98, 110, 126, 0.2);
background: rgba(0,0,0,.2);
border: 4px solid #f3f4f5;
border-radius: 10px;
}
......
dsk-operate-ui/src/assets/styles/project.scss
View file @ 245b267b
......@@ -1234,7 +1234,7 @@
border-radius: 0;
}
&::-webkit-scrollbar-thumb {
background-color: rgba(98, 110, 126, 0.2);
background: rgba(0,0,0,.2);
border: 4px solid #f3f4f5;
border-radius: 10px;
}
......@@ -1261,7 +1261,7 @@
border-radius: 8px;
height: 8px;
margin: 0 4px;
background: rgba(98, 110, 126, 0.2);
background: rgba(0,0,0,.2);
border: 4px solid #f3f4f5;
&:hover {
background: #566380;
......
dsk-operate-ui/src/assets/styles/sidebar.scss
View file @ 245b267b
......@@ -68,7 +68,7 @@
.el-scrollbar {
.scrollbar-wrapper {
padding-top: 20px;
padding-top: 16px;
box-sizing: border-box;
}
}
......@@ -141,8 +141,8 @@
.el-submenu__title {
display: flex;
align-items: center;
height: 38px;
line-height: 38px;
height: 36px;
line-height: 36px;
border: 1px solid #141b2f;
border-radius: 4px;
color: #fff;
......@@ -361,8 +361,8 @@
& > .el-menu--inline {
.secondary-menu-item-sub {
.el-menu-item {
font-size: 12px;
padding-left: 40px !important;
font-size: 14px;
padding-left: 56px !important;
}
}
}
......
dsk-operate-ui/src/permission.js
View file @ 245b267b
......@@ -51,7 +51,8 @@ router.beforeEach(async (to, from, next) => {
// 在免登录白名单，直接进入
next();
} else {
next(`/login?redirect=${to.fullPath}`); // 否则全部重定向到登录页
// next(`/login?redirect=${to.fullPath}`); // 否则全部重定向到登录页
next(`/login?redirect=/index/gys`); // 否则全部重定向到登录页
NProgress.done();
}
}
......
dsk-operate-ui/src/views/detail/party-a/component/Sidebar.vue
View file @ 245b267b
......@@ -639,7 +639,7 @@ export default {
.second-level-menu-no-children,
.second-level-menu-has-children .el-submenu__title {
font-size: 14px;
height: 38px;
height: 36px;
color: #232323;
font-weight: 400;
display: flex;
......
dsk-operate-ui/src/views/projectCostLedger/detail/components/DirectCost/index.vue
View file @ 245b267b
......@@ -19,7 +19,7 @@
</div>
<div class="right-table" ref="rightTable">
<skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
<div class="table-item">
<div class="table-item">
<el-table
v-if="!isSkeleton"
element-loading-text="Loading"
......@@ -32,7 +32,7 @@
border
highlight-current-row
>
<el-table-column label="序号" width="60" align="left" prop="index"></el-table-column>
<el-table-column label="序号" width="60" align="left" prop="index" fixed="left"></el-table-column>
<el-table-column label="编码" width="130" prop="code"></el-table-column>
<el-table-column label="名称" width="230" prop="expenseName"></el-table-column>
<el-table-column label="清单" width="110" prop="expenseCategoryTag"></el-table-column>
......@@ -361,10 +361,15 @@ export default {
.color2{
background: #FFFFFF;
}
th.gutter:last-of-type {
display: block!important;
width: 16px!important;
}
.el-table__fixed-right {
z-index: 9;
right: 16px !important;
bottom: 15px !important;
bottom: 16px !important;
height: calc(100% - 16px) !important;
.el-table__fixed-header-wrapper {
position: absolute;
}
......@@ -380,14 +385,56 @@ export default {
}
// 自动适配下 减去滚动条高度
.el-table__fixed {
height: calc(100% - 15px) !important;
}
.el-table__fixed-right {
height: calc(100% - 15px) !important;
height: calc(100% - 16px) !important;
}
.el-table__fixed-body-wrapper {
.el-table__body {
padding-bottom: 10px!important;
padding-bottom: 16px!important;
}
}
.el-table__body-wrapper {
&::-webkit-scrollbar {
width: 16px; //竖轴宽度
height: 16px; //横轴宽度
}
}
.el-table__fixed-body-wrapper .el-table__body {
padding-bottom: 16px; // 滚动条高度
}
::-webkit-scrollbar-track-piece {
//滚动条凹槽的颜色，还可以设置边框属性
background-color: #f3f4f5;
height: 16px;
padding: 0 4px;
}
//滚动条的宽度
::-webkit-scrollbar {
width: 16px;
height: 16px;
background-color: #f3f4f5;
border-radius: 6px;
}
//滚动条的滑块
::-webkit-scrollbar-thumb {
border-radius: 8px;
height: 8px;
margin: 0 4px;
background: rgba(0,0,0,.2);
border: 4px solid #f3f4f5;
&:hover {
background: #7d7d7d;
}
}
.el-scrollbar {
height: 16px;
.el-scrollbar__bar.is-horizontal {
height: 8px;
}
.el-scrollbar__thumb {
background: rgba(98, 110, 126, 0.4);
&:hover {
background: #566380;
}
}
}
}
......
dsk-operate-ui/src/views/supplier/disableManagement/affiliationRisk.vue
View file @ 245b267b
......@@ -53,10 +53,8 @@
<!--<div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">-->
<div class="table-item-jf table-item">
<el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"
v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '-15px'}" class="table-item1 fixed-table" border highlight-current-row
:header-row-class-name="setHeaderRow" :cell-class-name="setCellClass" :row-class-name="setRowClass" :header-cell-class-name="setCellClass"
ref="theOwnerListTable">
<el-table :data="tableData"
v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '-15px'}" class="fixed-table" border highlight-current-row>
<el-table-column type="index" label="序号" :fixed="tableColumnFixed" width="60" :resizable="false">
<template slot-scope="scope">
......
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