diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue index ab260fc29..d3f70cdd8 100644 --- a/jero-web/src/views/externalReports/index.vue +++ b/jero-web/src/views/externalReports/index.vue @@ -1085,7 +1085,7 @@ export default { /deep/.ant-table td{ white-space: nowrap; } -.ant-calendar-range-picker-input{ +/deep/.ant-calendar-range-picker-input{ width: 46% !important; } .title-text { diff --git a/jero-web/src/views/regulationsKanban/components/addModel.vue b/jero-web/src/views/regulationsKanban/components/addModel.vue index 24ebea27a..a77965814 100644 --- a/jero-web/src/views/regulationsKanban/components/addModel.vue +++ b/jero-web/src/views/regulationsKanban/components/addModel.vue @@ -70,8 +70,7 @@ :dataSource='areaTable' :pagination='false' :loading='loading' - :scroll='{x: 600}' - + :scroll="{x: '100%',y:370}" @change='handleTableChange'> {{ text }} @@ -282,6 +281,8 @@ export default { dutyTerritory:this.formData.dutyTerritory?this.formData.dutyTerritory:'', projectName:this.formData.projectName?this.formData.projectName:'', projectNameId:this.formData.projectNameId?this.formData.projectNameId:'', + // pageNo: this.pageNo, + // pageSize: this.pageSize, } this.loading = true getAction('project/lawsComplianceBoard/queryComplianceResultList', params).then((res) => { @@ -289,6 +290,7 @@ export default { this.areaTable = res.result.complianceResultList this.opinionGather = res.result.opinionGather this.technologyEvaluation = res.result.technologyEvaluation + // this.total = res.result.total this.loading = false }else{ this.loading = false @@ -304,10 +306,12 @@ export default { downloadFile('/project/lawsComplianceBoard/exportComplianceResultDetail', this.item.serialNumber +'.xls', query, this.Deselect) }, searchQuery() { + this.pageNo = 1 this.loadData() }, searchReset() { this.formData = {} + this.pageNo = 1 this.loadData() }, handleCancel() {