|
|
@@ -36,7 +36,7 @@ |
|
|
|
</el-form-item> |
|
|
|
<el-form-item> |
|
|
|
<!-- <el-button class="buttonColor" @click="currentChangeHandle(1)">{{ $t('query') }}</el-button> --> |
|
|
|
<el-button class="buttonColor" @click="getDataList()">{{ $t('query') }}</el-button> |
|
|
|
<el-button class="buttonColor" @click="currentChangeHandle(1)">{{ $t('query') }}</el-button> |
|
|
|
<!-- <el-button v-if="$hasPermission('monitoring:equipmentgroup:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button> --> |
|
|
|
</el-form-item> |
|
|
|
<base-table |
|
|
@@ -54,7 +54,7 @@ |
|
|
|
:page-sizes="[10, 20, 50, 100]" |
|
|
|
:page-size="pageSize" |
|
|
|
:total="totalPage" |
|
|
|
layout="total" |
|
|
|
layout="total, sizes, prev, pager, next, jumper" |
|
|
|
> |
|
|
|
</el-pagination> |
|
|
|
</el-form> |
|
|
@@ -152,11 +152,11 @@ export default { |
|
|
|
this.dataListLoading = true |
|
|
|
this.$http({ |
|
|
|
// url: this.$http.adornUrl(`/monitoring/downloadLog/getTimeDet/${this.$route.params.id}`), |
|
|
|
url: this.$http.adornUrl('/monitoring/downloadLog/getTimeCount'), |
|
|
|
url: this.$http.adornUrl('/monitoring/downloadLog/getTimeDet'), |
|
|
|
method: 'POST', |
|
|
|
data: { |
|
|
|
// page: this.pageIndex, |
|
|
|
// limit: this.pageSize, |
|
|
|
page: this.pageIndex, |
|
|
|
limit: this.pageSize, |
|
|
|
// lineId: this.dataForm.lineId, |
|
|
|
equId: this.$route.params.id, |
|
|
|
'startTime': this.startTime, |
|
|
@@ -168,12 +168,13 @@ export default { |
|
|
|
// return t.lineId == this.dataForm.lineId |
|
|
|
// }) |
|
|
|
// this.dataList = fileterLineList |
|
|
|
this.dataList = data.data |
|
|
|
this.totalPage = this.dataList.length |
|
|
|
// console.log('this.totalPage',this.totalPage) |
|
|
|
this.dataList = data.data.list |
|
|
|
// this.totalPage = this.dataList.length |
|
|
|
this.totalPage = data.data.total |
|
|
|
console.log('data',data) |
|
|
|
} else if (this.dataForm.lineId == '') { |
|
|
|
this.dataList = data.data |
|
|
|
this.totalPage = data.data.length |
|
|
|
this.dataList = data.data.list |
|
|
|
this.totalPage = data.data.total |
|
|
|
// console.log('this.dataList',this.dataList); |
|
|
|
} |
|
|
|
else { |
|
|
|