Bladeren bron

Merge branch 'dev' of http://39.106.8.246:3003/web/ibms into dev

haojianlong 4 jaren geleden
bovenliggende
commit
38b9a83684

+ 5 - 4
src/components/data_admin/buildTask/draw/drawModel.vue

@@ -50,7 +50,8 @@ export default {
       type: Boolean,
       default: false
     },
-    CurrentModelId: String
+    CurrentModelId: String,
+    modelName: String, //模型文件夹和模型文件名称
   },
   computed: {
     ...mapGetters("layout", ["projectId","projects"]),
@@ -167,14 +168,14 @@ export default {
     },
     // 保存为png
     savePng() {
-      this.view.saveImage(`${this.floor}.png`, 'png');
+      this.view.saveImage(`${this.projectName}-${this.modelName}.png`, 'png');
     },
     // 保存为svg
     saveSvg() {
-      this.view.saveSceneSvg(`${this.floor}.svg`, 6400, 4800);
+      this.view.saveSceneSvg(`${this.projectName}-${this.modelName}.svg`, 6400, 4800);
     },
     saveJson() {
-      this.view.saveFloorJson(`${this.floor}.json`)
+      this.view.saveFloorJson(`${this.projectName}-${this.modelName}.json`)
     },
     // 缩放
     scale(val) {

+ 16 - 3
src/components/ledger/lib/cenoteGraphy.vue

@@ -24,7 +24,11 @@ import { FloorView } from "@saga-web/cad-engine/lib/FloorView";
 import { colorArr } from '@/utils/spaceColor';
 import { getFloorMsgByFloorID, shaftSpaceQuery, shaftZoneLinkReplace, zoneQueryOutline } from '@/api/scan/request';
 import { resolve, reject } from 'q';
+import { mapGetters } from "vuex";
 export default {
+  props: {
+    buildFloorName: String, //建筑楼层名称
+  },
   data() {
     return {
       canvasLoading: false,//加载canvas
@@ -54,6 +58,15 @@ export default {
   components: {
     canvasFun
   },
+  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() {
     Opt.sceneMarkColor = new SColor('#ffffff');
   },
@@ -271,11 +284,11 @@ export default {
     },
     // 保存为png
     savePng() {
-      this.view.saveImage(`${this.buildingData[1]}.png`, 'png');
+      this.view.saveImage(`${this.projectName}-${this.buildFloorName}.png`, 'png');
     },
     // 保存为svg
     saveSvg() {
-      this.view.saveSceneSvg(`${this.buildingData[1]}.svg`, 6400, 4800);
+      this.view.saveSceneSvg(`${this.projectName}-${this.buildFloorName}.svg`, 6400, 4800);
     },
     // 框选
     groupSelect() {
@@ -283,7 +296,7 @@ export default {
     },
     // 保存json
     saveJson() {
-      this.view.saveFloorJson(`${this.buildingData[1]}.json`)
+      this.view.saveFloorJson(`${this.projectName}-${this.buildFloorName}.json`)
     },
   },
   watch: {

+ 5 - 2
src/views/data_admin/buildTask/addTask/addModelTask.vue

@@ -19,7 +19,7 @@
         </div>
       </div>
       <div class="r-model">
-        <draw-model ref="drawModel" :id="1" :CurrentModelId="CurrentModelId" :isLight="isLight" @changeButtonContent="changeButtonContent"></draw-model>
+        <draw-model ref="drawModel" :id="1" :CurrentModelId="CurrentModelId" :modelName="modelName" :isLight="isLight" @changeButtonContent="changeButtonContent"></draw-model>
       </div>
     </el-row>
     <modelTask-dialog :dialogVisible.sync="dialogVisible" :params="params" :newTaskTypes="newTaskTypes"></modelTask-dialog>
@@ -68,7 +68,10 @@ export default {
         spaceList: this.spaceList,
         isVerification: this.query.isVerification
       }
-    }
+    },
+    modelName () {
+      return `${this.modelFolderName}-${this.modelFileName}`
+    },
   },
   created() { 
     this.query = this.$route.query

+ 11 - 7
src/views/ledger/cenotelist/relatedSpace.vue

@@ -42,14 +42,14 @@
                 <div class="floor" style="height:100%;text-align:center;">
                   <span class="floor-item" style="border-bottom:1px solid #e4e4e4;">楼 层</span>
                   <div v-if="building" v-loading="buildingLoading">
-                    <span class="floor-item" @click="changeFloor(item.FloorID)" :class="{floorItemChoose:(item.FloorID == floor)}"
+                    <span class="floor-item" @click="changeFloor(item)" :class="{floorItemChoose:(item.FloorID == floor)}"
                       v-for="item in buildingObj.Floor" :key="item.FloorID">{{ item.FloorLocalName }}</span>
                   </div>
                 </div>
               </el-scrollbar>
             </el-col>
             <el-col :span="20" style="height:100%;position:relative;">
-              <cenote-graphy ref="cenotegraphy"></cenote-graphy>
+              <cenote-graphy ref="cenotegraphy" :buildFloorName="buildFloorName"></cenote-graphy>
             </el-col>
           </el-row>
           <div class="elevation-box">
@@ -95,6 +95,7 @@ export default {
       // showSpaceDot: false,//空间提示红点
       // showBuildDot: false,//楼层提示红点
       isAI: true,//是否打开AI
+      buildFloorName: '', //建筑楼层名称
     }
   },
   computed: {
@@ -256,7 +257,7 @@ export default {
       this.floor = '';
       this.buildingList = [];
       this.building = '';
-      this.changeFloor('');
+      this.changeFloor({FloorID: ''});
       this.loadBuildingData();
     },
     //更换建筑
@@ -268,15 +269,18 @@ export default {
           this.buildingObj = item;
           if (item.Floor && item.Floor.length) {
             // this.floor = item.Floor[0].FloorID
-            this.changeFloor(item.Floor[0].FloorID);
+            this.changeFloor(item.Floor[0]);
           }
         }
       })
     },
     //更换楼层
-    changeFloor(fid) {
-      this.floor = fid;
-      let buildfloor = [this.building, fid]
+    changeFloor(floorObj) {
+      this.buildFloorName = `${this.buildingObj.BuildLocalName?this.buildingObj.BuildLocalName:
+                              this.buildingObj.BuildName?this.buildingObj.BuildName:""}-${floorObj.FloorLocalName?
+                              floorObj.FloorLocalName:floorObj.FloorName?floorObj.FloorName:""}`
+      this.floor = floorObj.FloorID;
+      let buildfloor = [this.building, floorObj.FloorID]
       this.$refs.cenotegraphy.getFloorMap(buildfloor, this.ObjectType)
     },
     //平面图选中空间,立面图对应选中

+ 19 - 5
src/views/ledger/rentlist/manageTenantZone.vue

@@ -81,7 +81,7 @@
 </template>
 <script>
 import canvasFun from "@/components/business_space/newGraphy/canvasFun";
-import { mapGetters, mapActions } from "vuex";
+import { mapGetters } from "vuex";
 import { SColor, SPoint } from "@saga-web/draw/lib";
 import { DivideFloorScene, SpaceItem, ZoneItem, FloorView, Opt } from "@saga-web/cad-engine/lib";
 import { colorArr } from "@/utils/spaceColor"
@@ -120,7 +120,21 @@ export default {
     canvasFun
   },
   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
+    },
+    buildFloorName() {
+      let buildObj = this.allBuilding[this.buildSelect],
+          floorObj = this.floorList[this.activeFloor];
+          console.log(buildObj,floorObj)
+      return `${buildObj.BuildLocalName?buildObj.BuildLocalName:
+              buildObj.BuildName?buildObj.BuildName:""}-${floorObj.FloorLocalID?
+              floorObj.FloorLocalID:floorObj.FloorLocalName?floorObj.FloorLocalName:FloorName}`
+    },
   },
   created() {
     this.onlyRead = this.$route.query.onlyRead;
@@ -157,15 +171,15 @@ export default {
     },
     // 保存为png
     savePng() {
-      this.view.saveImage(`${this.floorList[this.activeFloor].FloorID}.png`, 'png');
+      this.view.saveImage(`${this.projectName}-${this.buildFloorName}.png`, 'png');
     },
     // 保存为svg
     saveSvg() {
-      this.view.saveSceneSvg(`${this.floorList[this.activeFloor].FloorID}.svg`, 6400, 4800);
+      this.view.saveSceneSvg(`${this.projectName}-${this.buildFloorName}.svg`, 6400, 4800);
     },
     // 保存json
     saveJson() {
-      this.view.saveFloorJson(`${this.floorList[this.activeFloor].FloorID}.json`)
+      this.view.saveFloorJson(`${this.projectName}-${this.buildFloorName}.json`)
     },
     // 框选
     groupSelect() {