|
@@ -6,22 +6,53 @@
|
|
|
<span style="marginLeft:30px;">上传时间:{{versionData.acceptTime}}</span>
|
|
|
<p style="marginTop:15px;">更新内容:</p>
|
|
|
<div v-if="Object.keys(versionData.createData).length || Object.keys(versionData.deleteData).length">
|
|
|
+ <!-- 新增设备概要内容 -->
|
|
|
<el-divider v-if="Object.keys(versionData.createData).length">新增设备概要内容</el-divider>
|
|
|
<p v-if="Object.keys(versionData.createData).length" style="marginBottom:10px;">于【{{versionData.acceptTime}}】上传模型文件,新增设备实例如下:</p>
|
|
|
<p v-for="(item, key) in versionData.createData" :key="'C'+key">【{{mapType[key]}}】:【{{item.length}}】个</p>
|
|
|
- <el-divider v-if="Object.keys(versionData.deleteData).length">[{{Object.keys(versionData.deleteData).length}}]删除设备概要内容</el-divider>
|
|
|
+ <!-- 删除设备概要内容 -->
|
|
|
+ <el-divider v-if="Object.keys(versionData.deleteData).length">删除设备概要内容</el-divider>
|
|
|
<p v-if="Object.keys(versionData.deleteData).length" style="marginBottom:10px;">于【{{versionData.acceptTime}}】上传模型文件,删除设备实例如下:</p>
|
|
|
<p v-for="(item, key) in versionData.deleteData" :key="'D'+key">【{{mapType[key]}}】:【{{item.length}}】个</p>
|
|
|
+ <!-- 土建设备概要内容 -->
|
|
|
+ <el-divider v-if="versionData.buildList.length">土建设备概要内容</el-divider>
|
|
|
+ <p v-if="versionData.buildList.length" style="marginBottom:10px;">于【{{versionData.acceptTime}}】上传模型文件,增删土建设备实例如下:</p>
|
|
|
+ <p v-if="versionData.createWall.length">【新增实体墙】:【{{versionData.createWall.length}}】个</p>
|
|
|
+ <p v-if="versionData.deleteWall.length">【删除实体墙】:【{{versionData.deleteWall.length}}】个</p>
|
|
|
+ <p v-if="versionData.createVirtualWall.length">【新增虚拟墙】:【{{versionData.createVirtualWall.length}}】个</p>
|
|
|
+ <p v-if="versionData.deleteVirtualWall.length">【删除虚拟墙】:【{{versionData.deleteVirtualWall.length}}】个</p>
|
|
|
+ <p v-if="versionData.createColumn.length">【新增柱体】:【{{versionData.createColumn.length}}】个</p>
|
|
|
+ <p v-if="versionData.deleteColumn.length">【删除柱体】:【{{versionData.deleteColumn.length}}】个</p>
|
|
|
+ <!-- 新增设备 -->
|
|
|
<el-divider v-if="Object.keys(versionData.createData).length">新增设备</el-divider>
|
|
|
<div v-for="(item, key) in versionData.createData" :key="'CL'+key">
|
|
|
<p>【{{mapType[key]}}】</p>
|
|
|
<p v-for="(obj, i) in item" :key="obj.Id">【{{i+1}}】、建筑:【{{obj.BuildingName || "无"}}】;楼层:【{{obj.FloorName || "无"}}】;设备全局id:【{{obj.ObjId || "无"}}】;BIMID:【{{obj.BimId || "无"}}】;设备本地编码:【{{obj.LocalId || "无"}}】;设备本地名称:【{{obj.LocalName || "无"}}】;CADID:【{{obj.CadId || "无"}}】;</p>
|
|
|
</div>
|
|
|
+ <!-- 删除设备 -->
|
|
|
<el-divider v-if="Object.keys(versionData.deleteData).length">删除设备</el-divider>
|
|
|
<div v-for="(item, key) in versionData.deleteData" :key="'DL'+key">
|
|
|
<p>【{{mapType[key]}}】</p>
|
|
|
<p v-for="(obj, i) in item" :key="obj.Id">【{{i+1}}】、建筑:【{{obj.BuildingName || "无"}}】;楼层:【{{obj.FloorName || "无"}}】;设备全局id:【{{obj.ObjId || "无"}}】;BIMID:【{{obj.BimId || "无"}}】;设备本地编码:【{{obj.LocalId || "无"}}】;设备本地名称:【{{obj.LocalName || "无"}}】;CADID:【{{obj.CadId || "无"}}】;</p>
|
|
|
</div>
|
|
|
+ <!-- 新增实体墙 -->
|
|
|
+ <el-divider v-if="versionData.createWall.length">新增实体墙</el-divider>
|
|
|
+ <p v-for="(obj, i) in versionData.createWall" :key="obj.Id">【{{i+1}}】、建筑:【{{obj.BuildingName || "无"}}】;楼层:【{{obj.FloorName || "无"}}】;Id:【{{obj.ObjId || "无"}}】;</p>
|
|
|
+ <!-- 删除实体墙 -->
|
|
|
+ <el-divider v-if="versionData.deleteWall.length">删除实体墙</el-divider>
|
|
|
+ <p v-for="(obj, i) in versionData.deleteWall" :key="obj.Id">【{{i+1}}】、建筑:【{{obj.BuildingName || "无"}}】;楼层:【{{obj.FloorName || "无"}}】;Id:【{{obj.ObjId || "无"}}】;</p>
|
|
|
+ <!-- 新增虚拟墙 -->
|
|
|
+ <el-divider v-if="versionData.createVirtualWall.length">新增虚拟墙</el-divider>
|
|
|
+ <p v-for="(obj, i) in versionData.createVirtualWall" :key="obj.Id">【{{i+1}}】、建筑:【{{obj.BuildingName || "无"}}】;楼层:【{{obj.FloorName || "无"}}】;Id:【{{obj.ObjId || "无"}}】;</p>
|
|
|
+ <!-- 删除虚拟墙 -->
|
|
|
+ <el-divider v-if="versionData.deleteVirtualWall.length">删除虚拟墙</el-divider>
|
|
|
+ <p v-for="(obj, i) in versionData.deleteVirtualWall" :key="obj.Id">【{{i+1}}】、建筑:【{{obj.BuildingName || "无"}}】;楼层:【{{obj.FloorName || "无"}}】;Id:【{{obj.ObjId || "无"}}】;</p>
|
|
|
+ <!-- 新增柱体 -->
|
|
|
+ <el-divider v-if="versionData.createColumn.length">新增柱体</el-divider>
|
|
|
+ <p v-for="(obj, i) in versionData.createColumn" :key="obj.Id">【{{i+1}}】、建筑:【{{obj.BuildingName || "无"}}】;楼层:【{{obj.FloorName || "无"}}】;Id:【{{obj.ObjId || "无"}}】;</p>
|
|
|
+ <!-- 删除柱体 -->
|
|
|
+ <el-divider v-if="versionData.deleteColumn.length">删除柱体</el-divider>
|
|
|
+ <p v-for="(obj, i) in versionData.deleteColumn" :key="obj.Id">【{{i+1}}】、建筑:【{{obj.BuildingName || "无"}}】;楼层:【{{obj.FloorName || "无"}}】;Id:【{{obj.ObjId || "无"}}】;</p>
|
|
|
</div>
|
|
|
<div v-else>
|
|
|
<div style="height: 60%;transform: translateY(50%);font-weight: normal;font-size: 12px;text-align: center;color: #909399;">
|
|
@@ -65,9 +96,20 @@ export default {
|
|
|
userName: '',
|
|
|
acceptTime: '',
|
|
|
createData: {},
|
|
|
- deleteData:{}
|
|
|
+ deleteData: {},
|
|
|
+ buildList: [],
|
|
|
+ createWall: [],
|
|
|
+ deleteWall: [],
|
|
|
+ createVirtualWall: [],
|
|
|
+ deleteVirtualWall: [],
|
|
|
+ createColumn: [],
|
|
|
+ deleteColumn: [],
|
|
|
+ },
|
|
|
+ mapType: {
|
|
|
+ 'Wall': '实体墙',
|
|
|
+ 'VirtualWall': '虚拟墙',
|
|
|
+ 'Column': '柱体',
|
|
|
},
|
|
|
- mapType: { },
|
|
|
}
|
|
|
},
|
|
|
mounted() { },
|
|
@@ -105,23 +147,7 @@ export default {
|
|
|
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 {
|
|
|
- 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.formatData();
|
|
|
this.loading = false;
|
|
|
this.$forceUpdate();
|
|
|
console.log(this.versionData);
|
|
@@ -129,37 +155,55 @@ export default {
|
|
|
})
|
|
|
}
|
|
|
},
|
|
|
+ // 格式化数据
|
|
|
+ formatData () {
|
|
|
+ this.logData.forEach(item => {
|
|
|
+ if (item.Type == 'Wall' || item.Type == 'VirtualWall' || item.Type == 'Column') {
|
|
|
+ this.versionData.buildList.push(item);
|
|
|
+ if (item.Type == 'Wall') {
|
|
|
+ if(item.Operation){//创建
|
|
|
+ this.versionData.createWall.push(item);
|
|
|
+ } else {//删除
|
|
|
+ this.versionData.deleteWall.push(item);
|
|
|
+ }
|
|
|
+ } else if (item.Type == 'VirtualWall') {
|
|
|
+ if(item.Operation){//创建
|
|
|
+ this.versionData.createVirtualWall.push(item);
|
|
|
+ } else {//删除
|
|
|
+ this.versionData.deleteVirtualWall.push(item);
|
|
|
+ }
|
|
|
+ } else if (item.Type == 'Column') {
|
|
|
+ if(item.Operation){//创建
|
|
|
+ this.versionData.createColumn.push(item);
|
|
|
+ } else {//删除
|
|
|
+ this.versionData.deleteColumn.push(item);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ 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);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
+ },
|
|
|
// 获取版本信息
|
|
|
getVersionData() {
|
|
|
if(this.modelFile.Id || this.modelFile.CurrentModelId){
|
|
|
this.versionData.userName = this.modelFile.UserName;
|
|
|
this.versionData.acceptTime = this.modelFile.AcceptTime;
|
|
|
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) {
|
|
@@ -174,23 +218,7 @@ export default {
|
|
|
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);
|
|
|
- } 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.formatData();
|
|
|
this.loading = false;
|
|
|
this.$forceUpdate();
|
|
|
console.log(this.versionData)
|
|
@@ -208,9 +236,16 @@ export default {
|
|
|
userName: '',
|
|
|
acceptTime: '',
|
|
|
createData: {},
|
|
|
- deleteData:{}
|
|
|
+ deleteData: {},
|
|
|
+ buildList: [],
|
|
|
+ createWall: [],
|
|
|
+ deleteWall: [],
|
|
|
+ createVirtualWall: [],
|
|
|
+ deleteVirtualWall: [],
|
|
|
+ createColumn: [],
|
|
|
+ deleteColumn: [],
|
|
|
};
|
|
|
- if(Object.keys(this.mapType).length) {
|
|
|
+ if(Object.keys(this.mapType).length > 3) {
|
|
|
this.getVersionData();
|
|
|
} else {
|
|
|
this.getData();
|