YaolongHan il y a 5 ans
Parent
commit
d8f6e1ac87

+ 18 - 16
src/router/system.js

@@ -16,6 +16,7 @@ import roleAdm from '@/views/platfrom/role'
 import buildFloor from '@/views/ready/buildfloor'
 import collectsetting from '@/views/ready/collectsetting'
 import buildUser from '@/views/ready/appuser'
+import repetitionGraphy from '@/views/ready/buildfloor/repetitionGraphy'
 
 /**模型管理 */
 import modelFile from '@/views/model/file'
@@ -69,7 +70,7 @@ import supplier from '@/views/manufactor/supplier'
 
 /**市场及商务 */
 const OwnerManage = () =>
-    import ('@/views/market/owner/manage')
+    import('@/views/market/owner/manage')
 
 export default [
     { path: '/', name: '', component: LayoutMain, children: [{ path: '', name: 'blank', component: Dasboard }] },
@@ -82,10 +83,10 @@ export default [
         name: 'LayoutMain',
         component: LayoutMain,
         children: [
-            { path: 'project', name: 'projectAdm', component: projectAdm, meta: { keepAlive: false, breadcrumbs: [{ label: '项目管理' }] }},
-            { path: 'user', name: 'userAdm', component: userAdm, meta: { keepAlive: false, breadcrumbs: [{ label: '人员管理' }] }},
-            { path: 'role', name: 'roleAdm', component: roleAdm, meta: { keepAlive: false, breadcrumbs: [{ label: '角色管理' }] }}
-        ] 
+            { path: 'project', name: 'projectAdm', component: projectAdm, meta: { keepAlive: false, breadcrumbs: [{ label: '项目管理' }] } },
+            { path: 'user', name: 'userAdm', component: userAdm, meta: { keepAlive: false, breadcrumbs: [{ label: '人员管理' }] } },
+            { path: 'role', name: 'roleAdm', component: roleAdm, meta: { keepAlive: false, breadcrumbs: [{ label: '角色管理' }] } }
+        ]
     },
     // 前期准备
     {
@@ -93,10 +94,11 @@ export default [
         name: 'LayoutMain',
         component: LayoutMain,
         children: [
-            { path: 'buildfloor', name: 'buildFloor', component: buildFloor, meta: { keepAlive: false, breadcrumbs: [{ label: '建筑楼层管理' }] }},
-            { path: 'collectsetting', name: 'collectsetting', component: collectsetting, meta: { keepAlive: false, breadcrumbs: [{ label: '需采集的信息点' }] }},
-            { path: 'appuser', name: 'buildUser', component: buildUser, meta: { keepAlive: false, breadcrumbs: [{ label: '扫楼App用户管理' }] }}
-        ] 
+            { path: 'buildfloor', name: 'buildFloor', component: buildFloor, meta: { keepAlive: false, breadcrumbs: [{ label: '建筑楼层管理' }] } },
+            { path: 'collectsetting', name: 'collectsetting', component: collectsetting, meta: { keepAlive: false, breadcrumbs: [{ label: '需采集的信息点' }] } },
+            { path: 'appuser', name: 'buildUser', component: buildUser, meta: { keepAlive: false, breadcrumbs: [{ label: '扫楼App用户管理' }] } },
+            { path: 'buildfloor/repetitionGraphy', name: 'repetitionGraphy', component: repetitionGraphy, meta: { keepAlive: false, breadcrumbs: [{ label:'前期准备 / 建筑楼层管理 / 平面图维护' }] }}
+        ]
     },
     //模型管理
     {
@@ -144,25 +146,25 @@ export default [
                 path: 'equipRela',
                 name: 'equipRela',
                 component: equipRela,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '系统集成', path: '/point/pointsetting' }, { label: '配置动参从点位取值', path: '/point/dynamicdata' }, { label: '处理未对应实例对象标识'}] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '系统集成', path: '/point/pointsetting' }, { label: '配置动参从点位取值', path: '/point/dynamicdata' }, { label: '处理未对应实例对象标识' }] }
             },
             {
                 path: 'partsRela',
                 name: 'partsRela',
                 component: partsRela,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '系统集成', path: '/point/pointsetting' }, { label: '配置动参从点位取值', path: '/point/dynamicdata' }, { label: '处理未对应实例对象标识'}] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '系统集成', path: '/point/pointsetting' }, { label: '配置动参从点位取值', path: '/point/dynamicdata' }, { label: '处理未对应实例对象标识' }] }
             },
             {
                 path: 'systemRela',
                 name: 'systemRela',
                 component: systemRela,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '系统集成', path: '/point/pointsetting' }, { label: '配置动参从点位取值', path: '/point/dynamicdata' }, { label: '处理未对应实例对象标识'}] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '系统集成', path: '/point/pointsetting' }, { label: '配置动参从点位取值', path: '/point/dynamicdata' }, { label: '处理未对应实例对象标识' }] }
             },
             {
                 path: 'spaceRela',
                 name: 'spaceRela',
                 component: spaceRela,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '系统集成', path: '/point/pointsetting' }, { label: '配置动参从点位取值', path: '/point/dynamicdata' }, { label: '处理未对应实例对象标识'}] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '系统集成', path: '/point/pointsetting' }, { label: '配置动参从点位取值', path: '/point/dynamicdata' }, { label: '处理未对应实例对象标识' }] }
             },
             {
                 path: 'objectdata',
@@ -329,9 +331,9 @@ export default [
         name: 'LayoutMain',
         component: LayoutMain,
         children: [
-            { path: 'maintain', name: 'maintain', component: maintain, meta: { keepAlive: false, breadcrumbs: [{ label: '关系维护' }] }},
-            { path: 'overview', name: 'overView', component: overView, meta: { keepAlive: false, breadcrumbs: [{ label: '全部关系总览' }] }}
-        ] 
+            { path: 'maintain', name: 'maintain', component: maintain, meta: { keepAlive: false, breadcrumbs: [{ label: '关系维护' }] } },
+            { path: 'overview', name: 'overView', component: overView, meta: { keepAlive: false, breadcrumbs: [{ label: '全部关系总览' }] } }
+        ]
     },
     /******************** 通用字典 ***************************/
     //厂家库

+ 15 - 4
src/views/ready/buildfloor/drawGraphy/drawFloor.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="drawFloor">
-    <canvas id="canvas" :width="cadWidth" :height="cadHeight"></canvas>
+    <canvas :id="'canvas'+indexs" :width="cadWidth" :height="cadHeight"></canvas>
   </div>
 </template>
 
@@ -76,6 +76,11 @@ export default {
       default: false,
       required: false
     },
+    indexs:{ //是否放大缩小
+      type: Number|String,
+      default: '',
+      required: false
+    },
   },
   data() {
     return {
@@ -107,7 +112,7 @@ export default {
       }
       this.drawMainScene = null;
       // 初始化view类
-      let view = new SGraphyView("canvas");
+      let view = new SGraphyView("canvas"+this.indexs);
       this.drawMainScene = new mainScene(null);
       this.drawMainScene
         .urlGetData(
@@ -151,9 +156,15 @@ export default {
   }
 };
 </script>
-<style scoped>
+<style scoped lang="less">
 #drawFloor {
   width: 100%;
-  height: 100%;
+  position: relative;
+  height: auto;
+  canvas{
+    position: absolute;
+    left: 50%;
+    transform: translateX(-50%)
+  }
 }
 </style>

+ 4 - 16
src/views/ready/buildfloor/index.vue

@@ -134,8 +134,6 @@
     <addConnectivity ref="addConnectivity" @refresh="refresh"></addConnectivity>
     <!-- 查看图片弹窗 -->
     <checkGraphy :checkGraphyVisible="checkGraphyVisible"  @handleCloseCGraphy="checkGraphyVisible=false"></checkGraphy>
-    <!-- 替换楼层 -->
-    <repetitionGraphy :repetitionGraphyVisible="repetitionGraphyVisible" @closeRepeatVisible="repetitionGraphyVisible=false"></repetitionGraphy>
   </div>
 </template>
 
@@ -144,9 +142,7 @@ import addFloor from "@/views/ready/buildfloor/addFloor/index";
 import addBuild from "@/components/ready/buildfloor/addBuild";
 import { mapGetters, mapActions } from "vuex";
 import addConnectivity from "@/components/ready/buildfloor/addConnectivity";
-
 import checkGraphy from "./drawGraphy/checkGraphy"; //查看图片
-import repetitionGraphy from "./drawGraphy/repetitionGraphy"; //重复图片
 import {
   buildingQuery,
   floorQuery,
@@ -157,8 +153,7 @@ export default {
     addFloor,
     addBuild,
     addConnectivity,
-    checkGraphy,
-    repetitionGraphy
+    checkGraphy
   },
   data() {
     return {
@@ -297,20 +292,13 @@ export default {
     },
     // 查看平面图
     checfDrawImg(item,index) {
-      console.log(item)
       if (1 == index) {
         // 查看
         this.checkGraphyVisible = true;
         this.repetitionGraphyVisible = false;
-      } else if (2 == index) {
-        // 重复
-        this.checkGraphyVisible = false;
-        this.repetitionGraphyVisible = true;
-      } else {
-        //暂无
-        this.checkGraphyVisible = false;
-        this.repetitionGraphyVisible = true;
-      }
+      } else{
+         this.$router.push({ name: 'repetitionGraphy', query:{item}})
+      } 
     }
   },
   watch: {

+ 103 - 0
src/views/ready/buildfloor/repetitionGraphy.vue

@@ -0,0 +1,103 @@
+<template>
+  <div id="repetitionGraphy">
+    <div class="buttons">
+      <el-button icon="el-icon-back" size="mini" @click="backRouter"></el-button>
+      <el-button size="mini" @click="changeGraphy">替换平面图</el-button>
+      <el-button size="mini">编辑平面图</el-button>
+    </div>
+    <!-- 展示图片 -->
+    <div class="drawImg">
+      <drawFloor
+        ref="drawFloor"
+        :findGraphyItemId="findGraphyItemId"
+        :dataKey="dataKey"
+        :point="point"
+        :pointWidth="pointWidth"
+        :cadWidth="1500"
+        :cadHeight="800"
+        :isScale="false"
+        indexs="repetion"
+      ></drawFloor>
+    </div>
+    <!-- 查看图片弹窗 -->
+    <checkGraphy
+      :checkGraphyVisible="checkGraphyVisible"
+      @handleCloseCGraphy="checkGraphyVisible=false"
+    ></checkGraphy>
+    <!-- 操作列表 -->
+    <div class="operateList">
+      <el-button-group>
+        <el-button icon="el-icon-rank"></el-button>
+        <el-button icon="el-icon-download"></el-button>
+      </el-button-group>
+      <div class="slider">
+        <el-button size="mini" icon="el-icon-circle-plus-outline"></el-button>
+        <el-slider class="slider-item" size="mini" v-model="slidervalue"></el-slider>
+        <el-button size="mini" icon="el-icon-remove-outline"></el-button>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import drawFloor from "./drawGraphy/drawFloor";
+import checkGraphy from "./drawGraphy/checkGraphy"; //查看图片
+export default {
+  components: {
+    drawFloor,
+    checkGraphy
+  },
+  props: {
+    repetitionGraphyVisible: Boolean
+  },
+  data() {
+    return {
+      checkGraphyVisible: false, //查看平面图弹窗
+      dataKey:
+        "/image-service/common/file_get/Fl4201050001c72ff970d2ba11e8a57543fa3e79672520181120041440bim.jsonz?systemId=revit", // key
+      point: [40703.54760591985, 42678.14510522981], //坐标
+      pointWidth: 2000,
+      findGraphyItemId: "", //高亮的id
+      slidervalue: 0
+    };
+  },
+  methods: {
+    handleClose() {
+      this.$emit("closeRepeatVisible");
+    },
+    // 返回路由
+    backRouter() {
+      this.$router.go(-1);
+    },
+    changeGraphy() {
+      this.checkGraphyVisible = true;
+    }
+  }
+};
+</script>
+<style lang="less">
+#repetitionGraphy {
+  width: 100%;
+  margin: 0 auto;
+  height: auto;
+  background: #fff;
+  position: relative;
+  .drawImg {
+    width: 100%;
+    margin: 0 auto;
+  }
+  .operateList {
+    display: flex;
+    .slider {
+      width: 200px;
+      height: 31px;
+      padding-top: -2px;
+      border: 1px solid #dcdfe6;
+      border-left: none;
+      border-radius: 2px;
+      .slider-item {
+        margin-top: -2px;
+      }
+    }
+  }
+}
+</style>