Commit 75d6ae05233410760c13e97db7d856cc8be6f60c
1 parent
c89819f7
物业相关功能基本测试完成
Showing
2 changed files
with
5 additions
and
4 deletions
src/views/inspection/inspectionTaskDetailsList.vue
| @@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
| 3 | <el-card class="box-card"> | 3 | <el-card class="box-card"> |
| 4 | <div slot="header" class="flex justify-between"> | 4 | <div slot="header" class="flex justify-between"> |
| 5 | <div>{{ $t('inspectionTaskDetails.searchCondition') }}</div> | 5 | <div>{{ $t('inspectionTaskDetails.searchCondition') }}</div> |
| 6 | - <div class="" > | 6 | + <div class=""> |
| 7 | <el-button type="text" @click="toggleMoreCondition"> | 7 | <el-button type="text" @click="toggleMoreCondition"> |
| 8 | {{ inspectionTaskDetailManageInfo.moreCondition ? $t('inspectionTaskDetails.hide') : | 8 | {{ inspectionTaskDetailManageInfo.moreCondition ? $t('inspectionTaskDetails.hide') : |
| 9 | $t('inspectionTaskDetails.more') }} | 9 | $t('inspectionTaskDetails.more') }} |
| @@ -122,7 +122,7 @@ | @@ -122,7 +122,7 @@ | ||
| 122 | </el-button> | 122 | </el-button> |
| 123 | </div> | 123 | </div> |
| 124 | </div> | 124 | </div> |
| 125 | - <div class="ibox-content"> | 125 | + <div class=""> |
| 126 | <el-table :data="inspectionTaskDetailManageInfo.inspectionTasks" border style="width: 100%" v-loading="loading"> | 126 | <el-table :data="inspectionTaskDetailManageInfo.inspectionTasks" border style="width: 100%" v-loading="loading"> |
| 127 | <el-table-column prop="taskDetailId" :label="$t('inspectionTaskDetails.taskDetailId')" | 127 | <el-table-column prop="taskDetailId" :label="$t('inspectionTaskDetails.taskDetailId')" |
| 128 | align="center"></el-table-column> | 128 | align="center"></el-table-column> |
| @@ -145,7 +145,8 @@ | @@ -145,7 +145,8 @@ | ||
| 145 | </template> | 145 | </template> |
| 146 | </el-table-column> | 146 | </el-table-column> |
| 147 | 147 | ||
| 148 | - <el-table-column prop="inspectionTime" :label="$t('inspectionTaskDetails.actualInspectionTime')" align="center"> | 148 | + <el-table-column prop="inspectionTime" :label="$t('inspectionTaskDetails.actualInspectionTime')" |
| 149 | + align="center"> | ||
| 149 | <template slot-scope="scope"> | 150 | <template slot-scope="scope"> |
| 150 | {{ scope.row.inspectionTime || '-' }} | 151 | {{ scope.row.inspectionTime || '-' }} |
| 151 | </template> | 152 | </template> |
src/views/report/dataReportList.vue
| @@ -269,7 +269,7 @@ export default { | @@ -269,7 +269,7 @@ export default { | ||
| 269 | } | 269 | } |
| 270 | 270 | ||
| 271 | .data-report-card { | 271 | .data-report-card { |
| 272 | - width: 25%; | 272 | + width: 24%; |
| 273 | margin: 5px; | 273 | margin: 5px; |
| 274 | padding: 10px; | 274 | padding: 10px; |
| 275 | border: 1px solid #4297E5; | 275 | border: 1px solid #4297E5; |