From 3114376a8a061ae86762155a7da0b3d5afef1ceb Mon Sep 17 00:00:00 2001 From: lyfO_o <764716047@qq.com> Date: 星期四, 07 四月 2022 14:31:48 +0800 Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/shf' into master --- src/views/safetyproduction/new.vue | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/views/safetyproduction/new.vue b/src/views/safetyproduction/new.vue index 1b9717b..bbf960a 100644 --- a/src/views/safetyproduction/new.vue +++ b/src/views/safetyproduction/new.vue @@ -69,7 +69,9 @@ type="expand" > <template slot-scope="scope"> - <el-table :data="scope.row.deductionList" :cell-style="{background:'#fff',color:'#606266'}"> + <el-table border :data="scope.row.deductionList" + :header-cell-style="{background:'#eef1f6',color:'#606266'}" :cell-style="{background:'#fff',color:'#606266'}" + > <el-table-column prop="name" align="center" @@ -231,6 +233,8 @@ safetySelfInspectionId: "", safetyInspectionItemId: "", } + arr[i].child[j].deductionList= arr[i].child[j].selfDeductionList + console.log(arr[i].child[j]) capB.safetySelfInspectionId=arr[i].child[j].safetySelfInspectionId capB.safetyInspectionItemId=arr[i].child[j].safetyInspectionItemId cser.push(capB) @@ -441,7 +445,7 @@ } .box-left { width: 20%; - min-height: 800px; + min-height: 850px; background-color: white; border-radius: 5px; } @@ -453,6 +457,8 @@ width: 79%; background-color: white; border-radius: 5px; + height: 850px; + overflow-y:overlay; } .title { font-size: 16px; @@ -474,4 +480,7 @@ background-color: #034ea2; border: 1px solid #034ea2; } +.box-right /deep/ .el-table__expanded-cell{ + background-color: #fff !important; +} </style> -- Gitblit v1.9.2