Browse Source

'平面图下载添加项目-建筑-楼层名称'

zhangyu 4 years ago
parent
commit
0abaddb625

+ 0 - 1
src/components/business_space/newGraphy/canvasFun.vue

@@ -72,7 +72,6 @@ export default {
     }
   },
   computed: {
-
   },
   methods: {
     // 移动画布

+ 15 - 9
src/components/business_space/newGraphy/graphy.vue

@@ -183,11 +183,17 @@ export default {
       options: [], //其他分区类型
       OtherValue: '',
       showOtherFlag: false, //是否显示其他分区类型添加
-      fileName: '', // 下载文件名称
+      buildFloorName: "", //建筑楼层名称
     }
   },
   computed: {
-    ...mapGetters('layout', ['projectId'])
+    ...mapGetters("layout", ["projectId","projects"]),
+    projectName() {
+      let projectObj = this.projects.find(item => {
+        return item.id == this.projectId
+      })
+      return projectObj?projectObj.name?projectObj.name:projectObj.id:this.projectId
+    }
   },
   created() {
     Opt.sceneMarkColor = new SColor('#ffffff');
@@ -222,7 +228,7 @@ export default {
       this.config = {
         isEdit: false,
         divide: true,
-        groupSelect: true
+        groupSelect: true,
       }
       // 获取当前楼层的元空间
       this.getFloorISpace();
@@ -283,16 +289,16 @@ export default {
       this.view.fitSelectedToView();
     },
     // 父组件调用
-    getData(buildFloor, FloorObj, tab, name) {
+    getData(buildFloor, FloorObj, tab) {
       let initType = 1;
       if (FloorObj.FloorID == this.FloorObj.FloorID) {
         initType = 2;
       }
       this.buildFloor = buildFloor;
       this.FloorObj = FloorObj;
-      this.FloorMap = FloorObj.StructureInfo ? FloorObj.StructureInfo.FloorMap : ''
-      this.fileName = name
+      this.FloorMap = FloorObj.StructureInfo ? FloorObj.StructureInfo.FloorMap : '';
       this.tab = tab;
+      this.buildFloorName = `${FloorObj.buildName}-${FloorObj.label}`;
       console.log(arguments);
       if (tab.code == "OtherZone") {
         // 其他分区
@@ -1124,15 +1130,15 @@ export default {
     },
     // 保存为png
     savePng() {
-      this.view.saveImage(`${this.fileName}.png`, 'png');
+      this.view.saveImage(`${this.projectName}-${this.buildFloorName}.png`, 'png');
     },
     // 保存为svg
     saveSvg() {
-      this.view.saveSceneSvg(`${this.fileName}.svg`, 6400, 4800);
+      this.view.saveSceneSvg(`${this.projectName}-${this.buildFloorName}.svg`, 6400, 4800);
     },
     // 保存json
     saveJson() {
-      this.view.saveFloorJson(`${this.fileName}.json`)
+      this.view.saveFloorJson(`${this.projectName}-${this.buildFloorName}.json`)
     },
     // 切割划分
     divide() {

+ 10 - 0
src/components/data_admin/buildTask/draw/drawModel.vue

@@ -12,6 +12,7 @@ import { DivideFloorScene, FloorView } from "@saga-web/cad-engine/lib"
 import { SColor, SPoint } from "@saga-web/draw/lib";
 import canvasFun from "@/components/business_space/newGraphy/canvasFun"
 import { queryEquip } from "@/api/scan/request";
+import { mapGetters } from "vuex";
 export default {
   components: {
     canvasFun
@@ -51,6 +52,15 @@ export default {
     },
     CurrentModelId: String
   },
+  computed: {
+    ...mapGetters("layout", ["projectId","projects"]),
+    projectName() {
+      let projectObj = this.projects.find(item => {
+        return item.id == this.projectId
+      })
+      return projectObj?projectObj.name?projectObj.name:projectObj.id:this.projectId
+    }
+  },
   created() { },
   mounted() {
     this.cadWidth = document.getElementById(`drawFloor${this.id}`).offsetWidth;

+ 3 - 2
src/views/ledger/spacelist/index.vue

@@ -160,7 +160,8 @@ export default {
           if (t.Floor) {
             t.children = t.Floor.map(item => {
               item.value = item.FloorID;
-              item.label = item.FloorLocalName;
+              item.label = item.FloorLocalName || item.FloorName;
+              item.buildName = t.BuildLocalName || t.BuildName;
               this.floorToMap[item.FloorID] = item;
               if (item.Count > 0) {
                 t.Count++;
@@ -296,7 +297,7 @@ export default {
         this.initMessage();
       } else {
         this.getInfected(this.buildFloorSelectd[1]);
-        this.$refs.graphy.getData(this.buildFloorSelectd, this.FloorMap, this.activeTabType, this.$refs.cascaderAddr.inputValue);
+        this.$refs.graphy.getData(this.buildFloorSelectd, this.FloorMap, this.activeTabType);
         this.childBackParam = {}
       }
     },