|
@@ -1,5 +1,5 @@
|
|
|
<template>
|
|
|
- <div style="height: calc(100% - 44.5px);padding: 0px 10px 10px;box-sizing: border-box;">
|
|
|
+ <div style="height: calc(100% - 44.5px);padding: 0px 10px 10px;box-sizing: border-box;" v-loading="loading">
|
|
|
<div class="hanson-bar">
|
|
|
<div style="float:right;overflow:hidden;">
|
|
|
<!-- <span style="width:20px;float:left;display:block;height:20px;cursor: pointer;" @click="changeAssetsFalg">
|
|
@@ -83,9 +83,9 @@
|
|
|
</p>
|
|
|
</div>
|
|
|
|
|
|
- <div v-show="mess.deviceId && tableData && tableData.length" v-loading="loading" id="handsontable" ref="handsontable"></div>
|
|
|
+ <div v-show="mess.deviceId && tableData && tableData.length" id="handsontable" ref="handsontable"></div>
|
|
|
<div v-show="mess.deviceId && tableData && tableData.length" class="right">
|
|
|
- <my-pagination @change="getTableData" :page="page"></my-pagination>
|
|
|
+ <my-pagination @change="getTableData" :page="page" :key="pageKey"></my-pagination>
|
|
|
</div>
|
|
|
<details-dialog :iframeSrc="iframeSrc" v-if="myDialog.details" :dialog="myDialog"></details-dialog>
|
|
|
<!-- 关联的系统 -->
|
|
@@ -233,6 +233,7 @@ export default {
|
|
|
total: 0,
|
|
|
currentPage: 1
|
|
|
},
|
|
|
+ pageKey: new Date().getTime(),
|
|
|
batchPage: {
|
|
|
size: 50,
|
|
|
sizes: [10, 30, 50, 100, 150, 200],
|
|
@@ -342,7 +343,18 @@ export default {
|
|
|
methods: {
|
|
|
//获取表头
|
|
|
getHeaderData(code) {
|
|
|
- this.page.currentPage = 1
|
|
|
+ let tempParams = this.$route.params;
|
|
|
+ if (!tempParams.used && tempParams.pageSize) {
|
|
|
+ console.log(22222222222)
|
|
|
+ console.log(tempParams)
|
|
|
+ this.page.currentPage = tempParams.pageNo;
|
|
|
+ this.page.size = tempParams.pageSize;
|
|
|
+ this.onlyRead = tempParams.readOnly;
|
|
|
+ tempParams.used = true;
|
|
|
+ } else {
|
|
|
+ this.page.currentPage = 1
|
|
|
+ }
|
|
|
+ this.pageKey = new Date().getTime();
|
|
|
this.mess = code
|
|
|
this.changeCader()
|
|
|
if (this.mess.deviceId) {
|
|
@@ -1036,14 +1048,14 @@ export default {
|
|
|
return false
|
|
|
//包含的部件字段
|
|
|
case 'Count':
|
|
|
- if (this.onlyRead) {
|
|
|
- this.$router.push({path: '/ledger/parts', query: {deviceId: infos.EquipID}});
|
|
|
- } else {
|
|
|
- this.$router.push({
|
|
|
- path: '/ledger/partsmanage',
|
|
|
- query: {deviceId: infos.EquipID, typeId: this.mess.deviceId}
|
|
|
- });
|
|
|
- }
|
|
|
+ console.log(this.page)
|
|
|
+ let countUrl = this.onlyRead ? '/ledger/parts' : '/ledger/partsmanage';
|
|
|
+ this.$router.push({path: countUrl, query: {
|
|
|
+ deviceId: infos.EquipID,
|
|
|
+ typeId: this.mess.deviceId,
|
|
|
+ pageNo: this.page.currentPage,
|
|
|
+ pageSize: this.page.size
|
|
|
+ }});
|
|
|
return false
|
|
|
default:
|
|
|
break;
|