Merge branch 'master' of https://gitee.com/ZhangYunTianXia/fourcal
Conflicts: src/main/resources/templates/admin/project_approve.ftlmaster
OathK1per
commit
5a3e9eaa4d
|
|
@ -410,4 +410,121 @@ option{
|
|||
}
|
||||
div{
|
||||
font-size: 1.48vh !important;
|
||||
}
|
||||
}
|
||||
|
||||
/* 全局样式 */
|
||||
/* 切换组件tabs start */
|
||||
.palm-tabs {
|
||||
height: calc(100% - 60px);
|
||||
margin: 0 1.6rem;
|
||||
}
|
||||
.palm-tabs .palm-tabs-nav {
|
||||
height: 35px;
|
||||
line-height: 35px;
|
||||
}
|
||||
.palm-tabs .palm-tabs-bd {
|
||||
height: calc(100% - 35px);
|
||||
overflow: hidden;
|
||||
}
|
||||
.palm-tabs .palm-tabs-bd .am-tab-panel {
|
||||
height: 100%;
|
||||
overflow: auto;
|
||||
}
|
||||
/* 切换组件tabs end */
|
||||
/* 固定表头的table样式 start */
|
||||
.fixed-section {
|
||||
height: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
overflow: hidden;
|
||||
}
|
||||
.fixed-section .am-modal-bd {
|
||||
flex: 1 1 auto;
|
||||
height: 10px;
|
||||
overflow: hidden;
|
||||
}
|
||||
/* 顶部操作行样式 */
|
||||
.fixed-section .fixed-actions {
|
||||
height: 45px;
|
||||
}
|
||||
/* table主体样式 */
|
||||
.fixed-section .fixed-table {
|
||||
height: calc(100% - 26px);
|
||||
}
|
||||
.fixed-section .fixed-table.has-actions {
|
||||
height: calc(100% - 71px);
|
||||
}
|
||||
/* 按钮行样式 */
|
||||
.fixed-section .fixed-btns-row {
|
||||
margin-top: 5px;
|
||||
height: 26px;
|
||||
}
|
||||
/* 底部样式 */
|
||||
.fixed-section .am-modal-footer {
|
||||
flex: 0 0 44px;
|
||||
}
|
||||
/* 滚动条宽度 */
|
||||
.fixed-table tbody::-webkit-scrollbar {
|
||||
width: 8px;
|
||||
background-color: transparent;
|
||||
}
|
||||
/* 滚动条颜色 */
|
||||
.fixed-table tbody::-webkit-scrollbar-thumb {
|
||||
background-color: #c1c1c1;
|
||||
}
|
||||
.fixed-table table {
|
||||
display: block;
|
||||
width: 100%;
|
||||
max-height: 100%;
|
||||
border-spacing: 0px;
|
||||
border-collapse: collapse;
|
||||
border: none;
|
||||
overflow-y: hidden;
|
||||
overflow-x: auto;
|
||||
margin: 0;
|
||||
}
|
||||
.fixed-table.is-vertical-scroll table tbody {
|
||||
max-height: calc(100% - 71px);
|
||||
}
|
||||
.fixed-table table>thead>tr>th {
|
||||
height: 40px;
|
||||
text-align: center;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.fixed-table table td {
|
||||
height: 55px;
|
||||
text-align: center;
|
||||
}
|
||||
.fixed-table table tbody {
|
||||
display: block;
|
||||
width: 100%;
|
||||
max-height: calc(100% - 45px);
|
||||
overflow-y: scroll;
|
||||
overflow-x: hidden;
|
||||
-webkit-overflow-scrolling: touch;
|
||||
}
|
||||
.fixed-table table tbody tr:last-child {
|
||||
border-bottom: 1px solid #ddd;
|
||||
}
|
||||
.fixed-table table tr {
|
||||
table-layout: fixed;
|
||||
display: table;
|
||||
border-right: 1px solid #ddd;
|
||||
border-left: 1px solid #ddd;
|
||||
}
|
||||
.fixed-table table thead tr {
|
||||
width: calc(100% - 8px);
|
||||
border-top: 1px solid #ddd;
|
||||
border-bottom: none;
|
||||
}
|
||||
.fixed-table table tbody tr {
|
||||
width: 100%;
|
||||
}
|
||||
.fixed-table table tbody tr:first-child>td {
|
||||
border-top: none;
|
||||
}
|
||||
.fixed-table table tbody tr:last-child {
|
||||
border-bottom: 1px solid #ddd;
|
||||
}
|
||||
|
||||
/* 固定表头的table样式 end */
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -44,122 +44,7 @@
|
|||
height: calc(100% - 60px);
|
||||
overflow: hidden;
|
||||
}
|
||||
/* 全局样式 */
|
||||
/* 切换组件tabs start */
|
||||
.palm-tabs {
|
||||
height: calc(100% - 60px);
|
||||
margin: 0 1.6rem;
|
||||
}
|
||||
.palm-tabs .palm-tabs-nav {
|
||||
height: 35px;
|
||||
line-height: 35px;
|
||||
}
|
||||
.palm-tabs .palm-tabs-bd {
|
||||
height: calc(100% - 35px);
|
||||
overflow: hidden;
|
||||
}
|
||||
.palm-tabs .palm-tabs-bd .am-tab-panel {
|
||||
height: 100%;
|
||||
overflow: auto;
|
||||
}
|
||||
/* 切换组件tabs end */
|
||||
/* 固定表头的table样式 start */
|
||||
.fixed-section {
|
||||
height: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
overflow: hidden;
|
||||
}
|
||||
.fixed-section .am-modal-bd {
|
||||
flex: 1 1 auto;
|
||||
height: 10px;
|
||||
overflow: hidden;
|
||||
}
|
||||
/* 顶部操作行样式 */
|
||||
.fixed-section .fixed-actions {
|
||||
height: 45px;
|
||||
}
|
||||
/* table主体样式 */
|
||||
.fixed-section .fixed-table {
|
||||
height: calc(100% - 26px);
|
||||
}
|
||||
.fixed-section .fixed-table.has-actions {
|
||||
height: calc(100% - 71px);
|
||||
}
|
||||
/* 按钮行样式 */
|
||||
.fixed-section .fixed-btns-row {
|
||||
margin-top: 5px;
|
||||
height: 26px;
|
||||
}
|
||||
/* 底部样式 */
|
||||
.fixed-section .am-modal-footer {
|
||||
flex: 0 0 44px;
|
||||
}
|
||||
/* 滚动条宽度 */
|
||||
::-webkit-scrollbar {
|
||||
width: 8px;
|
||||
background-color: transparent;
|
||||
}
|
||||
/* 滚动条颜色 */
|
||||
::-webkit-scrollbar-thumb {
|
||||
background-color: #c1c1c1;
|
||||
}
|
||||
.fixed-table table {
|
||||
display: block;
|
||||
width: 100%;
|
||||
max-height: 100%;
|
||||
border-spacing: 0px;
|
||||
border-collapse: collapse;
|
||||
border: none;
|
||||
overflow-y: hidden;
|
||||
overflow-x: auto;
|
||||
margin: 0;
|
||||
}
|
||||
.fixed-table.is-vertical-scroll table tbody {
|
||||
max-height: calc(100% - 71px);
|
||||
}
|
||||
.fixed-table table>thead>tr>th {
|
||||
height: 40px;
|
||||
text-align: center;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.fixed-table table td {
|
||||
height: 55px;
|
||||
text-align: center;
|
||||
}
|
||||
.fixed-table table tbody {
|
||||
display: block;
|
||||
width: 100%;
|
||||
max-height: calc(100% - 45px);
|
||||
overflow-y: scroll;
|
||||
overflow-x: hidden;
|
||||
-webkit-overflow-scrolling: touch;
|
||||
}
|
||||
.fixed-table table tbody tr:last-child {
|
||||
border-bottom: 1px solid #ddd;
|
||||
}
|
||||
.fixed-table table tr {
|
||||
table-layout: fixed;
|
||||
display: table;
|
||||
border-right: 1px solid #ddd;
|
||||
border-left: 1px solid #ddd;
|
||||
}
|
||||
.fixed-table table thead tr {
|
||||
width: calc(100% - 8px);
|
||||
border-top: 1px solid #ddd;
|
||||
border-bottom: none;
|
||||
}
|
||||
.fixed-table table tbody tr {
|
||||
width: 100%;
|
||||
}
|
||||
.fixed-table table tbody tr:first-child>td {
|
||||
border-top: none;
|
||||
}
|
||||
.fixed-table table tbody tr:last-child {
|
||||
border-bottom: 1px solid #ddd;
|
||||
}
|
||||
|
||||
/* 固定表头的table样式 end */
|
||||
.table-title{
|
||||
text-align: left;
|
||||
}
|
||||
|
|
@ -207,7 +92,7 @@
|
|||
<li><a href="#tab7">项目预算信息</a></li>
|
||||
</ul>
|
||||
<div class="am-tabs-bd palm-tabs-bd">
|
||||
<div class="am-tab-panel am-fade am-in am-active palm-tab-panel" id="tab1">
|
||||
<div class="am-tab-panel am-fade am-in am-active" id="tab1">
|
||||
<input name="id" id="id" type="hidden" value="${project.id}" />
|
||||
<input name="projectContributionProfitRateThreshold" id="projectContributionProfitRateThreshold" type="hidden" value="${Utils.format(project.projectContributionProfitRateThreshold)}" />
|
||||
<!--验证表单元素（validate) begin-->
|
||||
|
|
|
|||
Loading…
Reference in New Issue