位置标签整理更新

src/views/data_admin/buildGraphy/createPointZone.vue

@@ -57,9 +57,8 @@
 </template>
 
 <script>
-import spaceSelect from "@/components/ledger/lib/spaceSelect";
 import locationPointMsg from '@/views/data_admin/buildGraphy/locationPointMsg'
-import { queryDictionaryHead, buildingQuery, shaftSpaceTypeQuery, shaftSpaceBuildingQuery } from '@/api/scan/request';
+import { queryDictionaryHead } from '@/api/scan/request';
 import { mapGetters } from 'vuex'
 export default {
   data() {
@@ -85,7 +84,6 @@ export default {
 
   },
   components: {
-    spaceSelect,
     locationPointMsg
   },
   created() {

src/views/data_admin/buildGraphy/graphyCanvas.vue

@@ -85,9 +85,13 @@ export default {
       that.clearGraphy()
       that.scene = new LocationPointScene();
       that.canvasLoading = true;
-      that.scene.loadUrl(`/image-service/common/file_get?systemId=revit&key=${jsonId}`).then(() => {
-      // that.scene.loadUrl(`/image-service/common/file_get?systemId=revit&key=base/49920191010164105bim.jsonz`).then(() => {
+      that.scene.loadUrl(`/image-service/common/file_get?systemId=revit&key=${jsonId}`).then(res => {
         that.canvasLoading = false;
+        if (res == 'error') {
+          this.floorMap = '';
+          this.$message.warning('数据解析异常');
+          return;
+        }
         that.view.scene = that.scene;
         that.scene.isSpaceSelectable = false;
         //添加标签显示

src/views/data_admin/buildGraphy/graphyTabs.vue

@@ -259,7 +259,7 @@ export default {
       }).then(() => {
         this.$router.push({
           name: 'updatePointZone',
-          params: { item: item }
+          params: { item: item,floorData:this.floorOption,nowBuildFloor:this.buildingData }
         })
       }).catch(action => {
         if (action === 'cancel') {
@@ -347,7 +347,7 @@ export default {
           console.log(res)
           // res.data.PointList.splice(0, 1);
           this.pointData = res.Content;
-          // this.$emit("getPointList", res.Content);
+          this.$emit("getPointList", res.Content);
           // if (this.index == "1") {
           //     this.pointNoData = res.data.PointList;
           // } else {

src/views/data_admin/buildGraphy/index.vue

@@ -141,13 +141,14 @@ export default {
       this.pointParam.FloorId = data.code;
       this.pointParam.fllorName = data.name;
       this.pointParam.buildingData = data.buildingData
-      this.$refs.tabs.reset(this.pointParam, data.map);
+      
       if (this.map != data.map) {
         this.map = data.map;
         this.$refs.canvas.getData(data);
       } else {
-        return;
+        // return;
       }
+      this.$refs.tabs.reset(this.pointParam, data.map);
     },
     //获取到点位标签坐标
     sendPointList(list) {

src/views/data_admin/buildGraphy/updatePointZone.vue

@@ -3,11 +3,17 @@
     <div class="condition">
       <div class="header">
         <el-button style="float:left;" size="small" type="default" icon="el-icon-back" @click="goBack"></el-button>
-        <el-button size="small" style="float:right" @click="dialogVisible = true">更新</el-button>
+        <el-button size="small" style="float:right" @click="createZone">更新</el-button>
       </div>
       <el-scrollbar style="height:calc(100% - 43px)">
-        <div>
-          this is
+        <div class="item">
+          <span>将位置标签图片批量补充到业务空间:</span>
+          <div>
+          </div>
+        </div>
+        <div class="item">
+          <p>位置标签图片信息:</p>
+          <locationPointMsg :pointObj="$route.params.item"></locationPointMsg>
         </div>
       </el-scrollbar>
     </div>
@@ -15,13 +21,24 @@
 </template>
 
 <script>
-
-import { queryDictionaryHead, buildingQuery, shaftSpaceTypeQuery, shaftSpaceBuildingQuery } from '@/api/scan/request';
+import locationPointMsg from '@/views/data_admin/buildGraphy/locationPointMsg'
+import { queryDictionaryHead } from '@/api/scan/request';
 import { mapGetters } from 'vuex'
 export default {
   data() {
     return {
-
+      floorProps: {
+        value: 'BuildID',
+        label: 'BuildLocalName',
+        children: 'Floor'
+      },
+      options: [],//建筑楼层
+      spaceList: [],//空间列表
+      space: '',//当前空间
+      buildFloor: [],//建筑楼层信息
+      zoneName: '',//业务空间名称
+      zoneLocalId: '',//业务空间编码
+      showEx: 'el-icon-arrow-down',//下拉菜单
     }
   },
   computed: {
@@ -31,22 +48,45 @@ export default {
 
   },
   components: {
-
+    locationPointMsg
   },
   created() {
+    this.options = this.$route.params.floorData
+    this.getSpaceList();
     console.log(this.$route.params.item)
+    console.log(this.$route.params.floorData)
   },
   methods: {
+    //创建
+    createZone(){
+      let param = {
+
+      }
+    },
+    //获取空间列表
+    getSpaceList() {
+      let pa = {
+        Filters: `parentId='Space'`
+      }
+      queryDictionaryHead(pa, res => {
+        this.spaceList = res.Content.filter((item => { return item.Name != '元空间' }));
+      });
+    },
+    //选择楼层
+    changeFloor(val) {
+
+    },
     //返回
     goBack() {
       this.$router.push({
-        path:'/floor/plan'
+        name: "buildGraphy",
+        params:{nowBuildFloor: this.$route.params.nowBuildFloor}
       })
     }
   },
   watch: {
-    projectId:{
-      handler(val){
+    projectId: {
+      handler(val) {
         this.goBack();
       }
     }
@@ -74,9 +114,20 @@ export default {
       line-height: 32px;
     }
   }
-  
 }
 /deep/ .el-scrollbar__wrap {
   overflow-x: hidden;
 }
+.item {
+  padding: 10px 10px;
+  label {
+    display: inline-block;
+    padding: 5px 10px;
+    width:100px;
+  }
+}
+.suppMsg{
+  display:inline-block;
+  position:relative;
+}
 </style>