|
@@ -60,6 +60,7 @@ export default {
|
|
|
return {
|
|
|
title: "版本文件信息",
|
|
|
loading: true,
|
|
|
+ logData: [],
|
|
|
versionData: {
|
|
|
userName: '',
|
|
|
acceptTime: '',
|
|
@@ -81,9 +82,13 @@ export default {
|
|
|
this.versionData.userName = this.modelFile.UserName;
|
|
|
this.versionData.acceptTime = this.modelFile.AcceptTime;
|
|
|
let promise1 = new Promise((resolve, reject) => {
|
|
|
- querySyncLogCount({Filters: `ModelId='${this.modelFile.CurrentModelId?this.modelFile.CurrentModelId:this.modelFile.Id}'`}, res => {
|
|
|
- resolve(res)
|
|
|
- })
|
|
|
+ querySyncLogCount({
|
|
|
+ Filters: `ModelId='${this.modelFile.CurrentModelId?this.modelFile.CurrentModelId:this.modelFile.Id}'`,
|
|
|
+ PageNumber: 1,
|
|
|
+ PageSize: 1000,
|
|
|
+ }, res => {
|
|
|
+ resolve(res)
|
|
|
+ })
|
|
|
})
|
|
|
let promise2 = new Promise((resolve, reject) => {
|
|
|
getAllEqPaType({}, res => {
|
|
@@ -91,32 +96,37 @@ export default {
|
|
|
})
|
|
|
})
|
|
|
Promise.all([promise1, promise2]).then(values => {
|
|
|
- let versionData = values[0].Content, typeList = values[1].Content;
|
|
|
+ let typeList = values[1].Content;
|
|
|
+ this.logData = values[0].Content;
|
|
|
typeList.forEach(item => {
|
|
|
this.mapType[item.Code] = item.Name;
|
|
|
});
|
|
|
- console.log(this.mapType)
|
|
|
- versionData.forEach(item => {
|
|
|
- if(item.Operation){
|
|
|
- if(this.versionData.createData[item.Type]){
|
|
|
- this.versionData.createData[item.Type].push(item);
|
|
|
- } else {
|
|
|
- this.versionData.createData[item.Type] = [];
|
|
|
- this.versionData.createData[item.Type].push(item);
|
|
|
- }
|
|
|
- } else {
|
|
|
- if(this.versionData.deleteData[item.Type]){
|
|
|
- this.versionData.deleteData[item.Type].push(item);
|
|
|
+ console.log(this.mapType);
|
|
|
+ if (values[0].Total / (values[0].PageSize * values[0].PageNumber) > 1) {
|
|
|
+ this.queryLogData(values[0].PageNumber + 1)
|
|
|
+ } else {
|
|
|
+ this.logData.forEach(item => {
|
|
|
+ if(item.Operation){
|
|
|
+ if(this.versionData.createData[item.Type]){
|
|
|
+ this.versionData.createData[item.Type].push(item);
|
|
|
+ } else {
|
|
|
+ this.versionData.createData[item.Type] = [];
|
|
|
+ this.versionData.createData[item.Type].push(item);
|
|
|
+ }
|
|
|
} else {
|
|
|
- this.versionData.deleteData[item.Type] = [];
|
|
|
- this.versionData.deleteData[item.Type].push(item);
|
|
|
+ if(this.versionData.deleteData[item.Type]){
|
|
|
+ this.versionData.deleteData[item.Type].push(item);
|
|
|
+ } else {
|
|
|
+ this.versionData.deleteData[item.Type] = [];
|
|
|
+ this.versionData.deleteData[item.Type].push(item);
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
- });
|
|
|
- this.loading = false;
|
|
|
- this.$forceUpdate();
|
|
|
+ });
|
|
|
+ this.loading = false;
|
|
|
+ this.$forceUpdate();
|
|
|
+ console.log(this.versionData);
|
|
|
+ }
|
|
|
})
|
|
|
- console.log(this.versionData)
|
|
|
}
|
|
|
},
|
|
|
// 获取版本信息
|
|
@@ -124,8 +134,47 @@ export default {
|
|
|
if(this.modelFile.Id || this.modelFile.CurrentModelId){
|
|
|
this.versionData.userName = this.modelFile.UserName;
|
|
|
this.versionData.acceptTime = this.modelFile.AcceptTime;
|
|
|
- querySyncLogCount({Filters: `ModelId='${this.modelFile.CurrentModelId?this.modelFile.CurrentModelId:this.modelFile.Id}'`}, res => {
|
|
|
- res.Content.forEach(item => {
|
|
|
+ this.queryLogData();
|
|
|
+ // querySyncLogCount({
|
|
|
+ // Filters: `ModelId='${this.modelFile.CurrentModelId?this.modelFile.CurrentModelId:this.modelFile.Id}'`,
|
|
|
+ // PageNumber: 1,
|
|
|
+ // PageSize: 1000,
|
|
|
+ // }, res => {
|
|
|
+ // res.Content.forEach(item => {
|
|
|
+ // if(item.Operation){
|
|
|
+ // if(this.versionData.createData[item.Type]){
|
|
|
+ // this.versionData.createData[item.Type].push(item);
|
|
|
+ // } else {
|
|
|
+ // this.versionData.createData[item.Type] = [];
|
|
|
+ // this.versionData.createData[item.Type].push(item);
|
|
|
+ // }
|
|
|
+ // } else {
|
|
|
+ // if(this.versionData.deleteData[item.Type]){
|
|
|
+ // this.versionData.deleteData[item.Type].push(item);
|
|
|
+ // } else {
|
|
|
+ // this.versionData.deleteData[item.Type] = [];
|
|
|
+ // this.versionData.deleteData[item.Type].push(item);
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // });
|
|
|
+ // this.loading = false;
|
|
|
+ // this.$forceUpdate();
|
|
|
+ // })
|
|
|
+ }
|
|
|
+ },
|
|
|
+ queryLogData(pageNum) {
|
|
|
+ pageNum = pageNum ? pageNum : 1
|
|
|
+ let params = {
|
|
|
+ Filters: `ModelId='${this.modelFile.CurrentModelId?this.modelFile.CurrentModelId:this.modelFile.Id}'`,
|
|
|
+ PageNumber: pageNum,
|
|
|
+ PageSize: 1000,
|
|
|
+ }
|
|
|
+ querySyncLogCount(params, res =>{
|
|
|
+ this.logData = this.logData.concat(res.Content);//拼接数据
|
|
|
+ if (res.Total / (res.PageSize * res.PageNumber) > 1) {
|
|
|
+ this.queryLogData(res.PageNumber + 1)
|
|
|
+ } else {
|
|
|
+ this.logData.forEach(item => {
|
|
|
if(item.Operation){
|
|
|
if(this.versionData.createData[item.Type]){
|
|
|
this.versionData.createData[item.Type].push(item);
|
|
@@ -144,9 +193,9 @@ export default {
|
|
|
});
|
|
|
this.loading = false;
|
|
|
this.$forceUpdate();
|
|
|
- })
|
|
|
- console.log(this.versionData)
|
|
|
- }
|
|
|
+ console.log(this.versionData)
|
|
|
+ }
|
|
|
+ })
|
|
|
},
|
|
|
},
|
|
|
watch: {
|
|
@@ -154,6 +203,7 @@ export default {
|
|
|
handler() {
|
|
|
if (this.dialogVisible) {
|
|
|
this.loading = true;
|
|
|
+ this.logData = [];
|
|
|
this.versionData = {
|
|
|
userName: '',
|
|
|
acceptTime: '',
|