明树Git Lab

Commit c1b0a015 authored by zhanghan's avatar zhanghan

重新决策开发

parent bc1354b0
Pipeline #108830 passed with stage
in 20 seconds
...@@ -157,11 +157,17 @@ ...@@ -157,11 +157,17 @@
.add-project-content .tab-content .el-table { .add-project-content .tab-content .el-table {
margin-bottom: 10px; margin-bottom: 10px;
} }
.add-project-content .tab-content .el-table tbody tr {
height: 46px;
}
.add-project-content .tab-content .el-table tbody .el-table__cell {
padding: 0;
}
.add-project-content .tab-content .el-table thead { .add-project-content .tab-content .el-table thead {
color: #000; color: #000;
} }
.add-project-content .tab-content .el-table thead th { .add-project-content .tab-content .el-table thead th {
background: #f5f7fa; background: #e4e8f1;
} }
.add-project-content .tab-content .el-table thead th .cell { .add-project-content .tab-content .el-table thead th .cell {
text-align: center; text-align: center;
...@@ -205,6 +211,7 @@ ...@@ -205,6 +211,7 @@
.add-project-content .tab-content .text-border { .add-project-content .tab-content .text-border {
width: 100%; width: 100%;
padding: 0 10px; padding: 0 10px;
font-weight: 600;
border: 1px solid #dcdfe6; border: 1px solid #dcdfe6;
border-radius: 4px; border-radius: 4px;
background-color: #f5f7fa; background-color: #f5f7fa;
...@@ -321,7 +328,8 @@ ...@@ -321,7 +328,8 @@
background-color: #f5f7fa; background-color: #f5f7fa;
padding: 0 24px; padding: 0 24px;
margin: 0; margin: 0;
font-size: 14px;
margin-bottom: 16px; margin-bottom: 16px;
border-radius: 4px; border-radius: 4px;
font-weight: 600;
font-size: 14px;
} }
...@@ -166,10 +166,20 @@ ...@@ -166,10 +166,20 @@
} }
.el-table { .el-table {
margin-bottom: 10px; margin-bottom: 10px;
tbody {
tr {
height: 46px;
}
.el-table__cell {
padding: 0;
}
}
thead { thead {
color: #000; color: #000;
th { th {
background: #f5f7fa; background: #e4e8f1;
.cell { .cell {
text-align: center; text-align: center;
} }
...@@ -217,6 +227,7 @@ ...@@ -217,6 +227,7 @@
.text-border { .text-border {
width: 100%; width: 100%;
padding: 0 10px; padding: 0 10px;
font-weight: 600;
border: 1px solid #dcdfe6; border: 1px solid #dcdfe6;
border-radius: 4px; border-radius: 4px;
background-color: #f5f7fa; background-color: #f5f7fa;
...@@ -353,6 +364,8 @@ ...@@ -353,6 +364,8 @@
font-size: 14px; font-size: 14px;
margin-bottom: 16px; margin-bottom: 16px;
border-radius: 4px; border-radius: 4px;
font-weight: 600;
font-size: 14px;
} }
} }
// ==========================设置定制化样式 end ========================== // ==========================设置定制化样式 end ==========================
...@@ -965,48 +965,8 @@ const getRcCgqyglDetail = () => { ...@@ -965,48 +965,8 @@ const getRcCgqyglDetail = () => {
console.log(data.jzymljsh, "jzymljsh详情数据"); console.log(data.jzymljsh, "jzymljsh详情数据");
console.log(data.lastyeartzhs, "lastyeartzhs"); console.log(data.lastyeartzhs, "lastyeartzhs");
// 先初始化表格结构(确保 indicatorList 和 dynamicTimeList 存在)
initTableData();
// 然后合并数据(保留结构配置,只更新 tableData)
if (data.jzymljys && data.jzymljys.tableData) {
formData.jzymljys.tableData = data.jzymljys.tableData;
}
if (data.jzymljsh && data.jzymljsh.tableData) {
formData.jzymljsh.tableData = data.jzymljsh.tableData;
}
if (data.tzhsjc && data.tzhsjc.tableData) {
formData.tzhsjc.tableData = data.tzhsjc.tableData;
}
if (data.tzhsjh && data.tzhsjh.tableData) {
formData.tzhsjh.tableData = data.tzhsjh.tableData;
}
if (data.tzhswcqkndgx && data.tzhswcqkndgx.tableData) {
formData.tzhswcqkndgx.tableData = data.tzhswcqkndgx.tableData;
}
if (data.tzhswcqkydgx && data.tzhswcqkydgx.tableData) {
formData.tzhswcqkydgx.tableData = data.tzhswcqkydgx.tableData;
}
if (data.lastyeartzhs) {
formData.lastyeartzhs = data.lastyeartzhs;
}
// 合并其他非表格字段 // 合并其他非表格字段
Object.assign(formData, { Object.assign(formData, data);
nd: data.nd || new Date().getFullYear().toString(),
projectId: data.projectId,
sshy: data.sshy,
xmgsmc: data.xmgsmc,
sbdw: data.sbdw,
ssejqy: data.ssejqy,
xmjd: data.xmjd,
xmlx: data.xmlx,
tzms: data.tzms,
tzhsfs: data.tzhsfs,
xnxmjd: data.xnxmjd,
cwbblx: data.cwbblx,
projectGdxxs: data.projectGdxxs || [],
});
}, },
}); });
}; };
...@@ -1033,6 +993,7 @@ const saveClick = () => { ...@@ -1033,6 +993,7 @@ const saveClick = () => {
const submitData = { const submitData = {
...formData, ...formData,
projectId: formData.projectId + "", projectId: formData.projectId + "",
id: route.query.id || null,
}; };
proxy.$post({ proxy.$post({
......
...@@ -150,7 +150,7 @@ const handleCurrentPageChange = (page) => { ...@@ -150,7 +150,7 @@ const handleCurrentPageChange = (page) => {
}; };
const previewProject = (item) => { const previewProject = (item) => {
router.push({ router.push({
name: "addProject", name: "decisionAdd",
query: { query: {
isPreview: true, isPreview: true,
projectId: item.id, projectId: item.id,
......
This source diff could not be displayed because it is too large. You can view the blob instead.
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