mt-fe-group/mt-yd-ui
13
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

下片更新

Browse Source
This commit is contained in:
范志钦
2023-09-22 17:20:53 +05:30
parent 101eac890c
commit 755ad9df30
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/views/modules/monitoring/downloadLog.vue
View File

@@ -45,7 +45,7 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<!-- <el-button class="buttonColor" @click="currentChangeHandle(1)">{{ $t('query') }}</el-button> --> <!-- <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-button v-if="$hasPermission('monitoring:equipmentgroup:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button> -->
</el-form-item> </el-form-item>
</el-form> </el-form>
@@ -64,7 +64,7 @@
:page-sizes="[10, 20, 50, 100]" :page-sizes="[10, 20, 50, 100]"
:page-size="pageSize" :page-size="pageSize"
:total="totalPage" :total="totalPage"
layout="total" layout="total, sizes, prev, pager, next, jumper"
> >
</el-pagination> </el-pagination>
<!-- 弹窗, 新增 / 修改 --> <!-- 弹窗, 新增 / 修改 -->
@@ -135,7 +135,7 @@ export default {
eqList: [], eqList: [],
lineList: [], lineList: [],
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 20,
totalPage: 0, totalPage: 0,
dataListLoading: false, dataListLoading: false,
dataListSelections: [], dataListSelections: [],
@@ -228,8 +228,8 @@ export default {
url: this.$http.adornUrl('/monitoring/downloadLog/getTimeCount'), url: this.$http.adornUrl('/monitoring/downloadLog/getTimeCount'),
method: 'POST', method: 'POST',
data: { data: {
// page: this.pageIndex, page: this.pageIndex,
// limit: this.pageSize, limit: this.pageSize,
// lineId: this.dataForm.lineId, // lineId: this.dataForm.lineId,
'startTime': this.startTime, 'startTime': this.startTime,
'endTime': this.endTime 'endTime': this.endTime

21
src/views/modules/monitoring/unloadDetail.vue
View File

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