|
@@ -7,18 +7,18 @@
|
|
|
<p style="marginTop:15px;">更新内容:</p>
|
|
|
<el-divider>新增设备概要内容</el-divider>
|
|
|
<p style="marginBottom:10px;">于【{{versionData.acceptTime}}】上传模型文件,新增设备实例如下:</p>
|
|
|
- <p v-for="(item, key) in versionData.createData" :key="key">【{{key}}设备类名称】:【{{item.length}}】个</p>
|
|
|
+ <p v-for="(item, key) in versionData.createData" :key="'C'+key">【{{mapType[key]}}】:【{{item.length}}】个</p>
|
|
|
<el-divider>删除设备概要内容</el-divider>
|
|
|
<p style="marginBottom:10px;">于【{{versionData.acceptTime}}】上传模型文件,删除设备实例如下:</p>
|
|
|
- <p v-for="(item, key) in versionData.deleteData" :key="key">【{{key}}设备类名称】:【{{item.length}}】个</p>
|
|
|
+ <p v-for="(item, key) in versionData.deleteData" :key="'D'+key">【{{mapType[key]}}】:【{{item.length}}】个</p>
|
|
|
<el-divider>新增设备</el-divider>
|
|
|
- <div v-for="(item, key) in versionData.createData" :key="key">
|
|
|
- <p>【{{key}}设备类名称】</p>
|
|
|
+ <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>删除设备</el-divider>
|
|
|
- <div v-for="(item, key) in versionData.deleteData" :key="key">
|
|
|
- <p>【{{key}}设备类名称】</p>
|
|
|
+ <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-scrollbar>
|
|
@@ -33,6 +33,7 @@
|
|
|
<script>
|
|
|
import { mapGetters } from "vuex";
|
|
|
import { querySyncLogCount } from "@/api/model/file.js";
|
|
|
+import { getAllEqPaType } from "@/api/scan/request";
|
|
|
export default {
|
|
|
components: {
|
|
|
|
|
@@ -56,6 +57,7 @@ export default {
|
|
|
createData: {},
|
|
|
deleteData:{}
|
|
|
},
|
|
|
+ mapType: { },
|
|
|
}
|
|
|
},
|
|
|
mounted() { },
|
|
@@ -65,6 +67,49 @@ export default {
|
|
|
this.$emit("update:dialogVisible", false);
|
|
|
},
|
|
|
// 获取版本信息
|
|
|
+ getData() {
|
|
|
+ if(this.modelFile.Id || this.modelFile.CurrentModelId){
|
|
|
+ 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)
|
|
|
+ })
|
|
|
+ })
|
|
|
+ let promise2 = new Promise((resolve, reject) => {
|
|
|
+ getAllEqPaType({}, res => {
|
|
|
+ resolve(res)
|
|
|
+ })
|
|
|
+ })
|
|
|
+ Promise.all([promise1, promise2]).then(values => {
|
|
|
+ let versionData = values[0].Content, typeList = values[1].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);
|
|
|
+ } else {
|
|
|
+ this.versionData.deleteData[item.Type] = [];
|
|
|
+ this.versionData.deleteData[item.Type].push(item);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
+ this.$forceUpdate();
|
|
|
+ })
|
|
|
+ console.log(this.versionData)
|
|
|
+ }
|
|
|
+ },
|
|
|
+ // 获取版本信息
|
|
|
getVersionData() {
|
|
|
if(this.modelFile.Id || this.modelFile.CurrentModelId){
|
|
|
this.versionData.userName = this.modelFile.UserName;
|
|
@@ -103,7 +148,11 @@ export default {
|
|
|
createData: {},
|
|
|
deleteData:{}
|
|
|
};
|
|
|
- this.getVersionData();
|
|
|
+ if(Object.keys(this.mapType).length) {
|
|
|
+ this.getVersionData();
|
|
|
+ } else {
|
|
|
+ this.getData();
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
immediate: true
|