fix: 修复detections tab列表样式及请求传参问题

This commit is contained in:
@changcode
2022-03-30 11:46:17 +08:00
parent 95d1a307b4
commit 1ede2ba779
4 changed files with 12 additions and 11 deletions

View File

@@ -182,6 +182,9 @@
.cn-detection__header { .cn-detection__header {
margin-bottom: 8px; margin-bottom: 8px;
} }
.cn-detection-table {
overflow: auto;
}
.cn-detection__case-severity { .cn-detection__case-severity {
display: flex; display: flex;
width: 38px; width: 38px;

View File

@@ -189,7 +189,7 @@ export default {
pageSize: 9 pageSize: 9
} }
} }
if ((isDetectionService && JSON.stringify(extraParams) === '{}') || (isDetectionSecurity && JSON.stringify(extraParams) === '{}')) { if (isDetectionService || isDetectionSecurity) {
extraParams = { extraParams = {
pageNo: 1, pageNo: 1,
pageSize: 6 pageSize: 6

View File

@@ -10,12 +10,12 @@
:index="index" :index="index"
></chart-detections-table> ></chart-detections-table>
</div> </div>
<div class="cn-detection__footer" v-show="pageObj.total > 0"> <div class="cn-detection__footer">
<chart-detection-pagination <chart-detection-pagination
ref="pagination" ref="pagination"
:page-obj="pageObj" :page-obj="pageObj"
@pageJump="pageJump" @pageJump="pageJump"
:pageSizeForAlarm="pageSizeForAlarm" :pageSizeForAlarm="pageObj.pageSize"
></chart-detection-pagination> ></chart-detection-pagination>
</div> </div>
</div> </div>
@@ -48,8 +48,7 @@ export default {
pageSize: 6, pageSize: 6,
total: 0, total: 0,
resetPageNo: true resetPageNo: true
}, }
pageSizeForAlarm: 6
} }
}, },
methods: { methods: {
@@ -63,7 +62,7 @@ export default {
this.pageObj.pageNo = val this.pageObj.pageNo = val
const extraParams = { const extraParams = {
pageNo: val, pageNo: val,
pageSize: this.pageSizeForAlarm pageSize: this.pageSize
} }
this.$emit('getDetectionData', this.chartInfo.params.url, extraParams, false, { this.$emit('getDetectionData', this.chartInfo.params.url, extraParams, false, {
startTime: this.queryParams.startTime, startTime: this.queryParams.startTime,

View File

@@ -10,12 +10,12 @@
:index="index" :index="index"
></chart-detections-table> ></chart-detections-table>
</div> </div>
<div class="cn-chart__footer" v-show="pageObj.total > 0"> <div class="cn-detection__footer">
<chart-detection-pagination <chart-detection-pagination
ref="pagination" ref="pagination"
:page-obj="pageObj" :page-obj="pageObj"
@pageJump="pageJump" @pageJump="pageJump"
:pageSizeForAlarm="pageSizeForAlarm" :pageSizeForAlarm="pageObj.pageSize"
></chart-detection-pagination> ></chart-detection-pagination>
</div> </div>
</div> </div>
@@ -46,8 +46,7 @@ export default {
pageSize: 6, pageSize: 6,
total: 0, total: 0,
resetPageNo: true resetPageNo: true
}, }
pageSizeForAlarm: 6
} }
}, },
methods: { methods: {
@@ -61,7 +60,7 @@ export default {
this.pageObj.pageNo = val this.pageObj.pageNo = val
const extraParams = { const extraParams = {
pageNo: val, pageNo: val,
pageSize: this.pageSizeForAlarm pageSize: this.pageSize
} }
this.$emit('getDetectionData', this.chartInfo.params.url, extraParams, false, { this.$emit('getDetectionData', this.chartInfo.params.url, extraParams, false, {
startTime: this.queryParams.startTime, startTime: this.queryParams.startTime,