明树Git Lab

Commit b9a9a8aa authored by zhanghan's avatar zhanghan

1

parent 646e62af
Pipeline #109158 passed with stage
in 21 seconds
......@@ -294,7 +294,7 @@ const timeColumnGroups = computed(() => {
// 如果有 subGroup,在一级分组下创建二级分组
if (subGroup && subGroup.length > 0) {
let subGroupItem = groupMap[headerGroup].children.find(
(child) => child.label === subGroup
(child) => child.label === subGroup,
);
if (!subGroupItem) {
subGroupItem = {
......@@ -427,7 +427,7 @@ const handleTableData = (sourceIndicatorList, sourceTableData) => {
noTotal,
total: 0,
...originRow,
})
}),
);
initRowTimeField(rowData);
rowData.total = calculateRowTotal(rowData);
......@@ -456,11 +456,11 @@ watch(
await nextTick();
const newTableData = handleTableData(
newVal.indicatorList,
newVal.tableData
newVal.tableData,
);
tableDataRef.value = newTableData;
},
{ deep: true, immediate: true }
{ deep: true, immediate: true },
);
// 数字行输入回调
......
......@@ -169,10 +169,16 @@
}
.add-project-content .tab-content .el-table tbody .el-table__cell {
padding: 0;
border-bottom: 1px solid rgba(0, 0, 0, 0.15) !important;
border-right: 1px solid rgba(0, 0, 0, 0.15) !important;
}
.add-project-content .tab-content .el-table thead {
color: #000;
}
.add-project-content .tab-content .el-table thead .el-table__cell {
border-bottom: 1px solid rgba(0, 0, 0, 0.15) !important;
border-right: 1px solid rgba(0, 0, 0, 0.15) !important;
}
.add-project-content .tab-content .el-table thead th {
background: #e4e8f1;
}
......
......@@ -6,13 +6,13 @@
box-sizing: border-box;
}
.is-horizontal {
display: block !important;
}
.el-scrollbar__thumb{
background:#467bad !important;
opacity: 0.9 !important;
}
.is-horizontal {
display: block !important;
}
.el-scrollbar__thumb {
background: #467bad !important;
opacity: 0.9 !important;
}
.system-manage-header {
background: rgba(255, 255, 255, 0.9);
border-radius: 8px;
......@@ -180,11 +180,17 @@
}
.el-table__cell {
padding: 0;
border-bottom: 1px solid rgba(0, 0, 0, 0.15) !important;
border-right: 1px solid rgba(0, 0, 0, 0.15) !important;
}
}
thead {
color: #000;
.el-table__cell {
border-bottom: 1px solid rgba(0, 0, 0, 0.15) !important;
border-right: 1px solid rgba(0, 0, 0, 0.15) !important;
}
th {
background: #e4e8f1;
.cell {
......@@ -340,7 +346,7 @@
height: 32px;
display: flex;
align-items: center;
text-align: justify !important;
text-align: justify !important;
justify-content: center;
line-height: 1.2;
}
......
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