Browse Source

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

shaun-sheep 5 years ago
parent
commit
206bbf25f5

+ 5 - 10
src/components/business_space/newGraphy/graphy.vue

@@ -9,7 +9,7 @@
     <div class="canvas-box" v-show="FloorMap" v-loading="canvasLoading">
       <canvas id="floorCanvas" :width="canvasWidth" :height="canvasHeight" ref="canvas" tabindex="0"></canvas>
       <!-- 初始两个按钮 -->
-      <el-row class="buttons-box" v-if="hidden">
+      <el-row class="buttons-box">
         <div>
           <el-autocomplete popper-class="my-autocomplete" v-model="search" :fetch-suggestions="querySearch" placeholder="输入平面图中已有的业务空间名称进行查找"
             width="180px" @select="handleSelect">
@@ -22,7 +22,7 @@
             </template>
           </el-autocomplete>
         </div>
-        <div class="button-group" v-if="hidden">
+        <div class="button-group">
           <!-- 默认操作模式 -->
           <div v-show="type==1">
             <el-dropdown split-button type="primary" @click="editGraphy" @command="handleCommand">
@@ -56,12 +56,12 @@
             <el-button plain @click="cancelGraphy">取 消</el-button>
           </div>
         </div>
-        <div style="position: absolute;right: 0;" v-if="hidden">
+        <div style="position: absolute;right: 0;">
           <el-button type="text" @click="lookUnrelatBSpace(false)">未关联平面图的业务空间 {{num}} 条</el-button>
         </div>
       </el-row>
       <!-- 底部操作按钮 -->
-      <el-row class="canvas-actions-box" v-if="hidden">
+      <el-row class="canvas-actions-box">
         <canvasFun @fit="fit" @savePng="savePng" @saveSvg="saveSvg" @divide="divide" @clearDivide="clearDivide" @undo="undo" @redo="redo"
           @changeAbsorb="changeAbsorb" @scale="scale" @groupSelect="groupSelect" :config="config" ref="canvasFun" @saveJson="saveJson"></canvasFun>
       </el-row>
@@ -146,18 +146,13 @@ export default {
       zoneList: [], // 业务空间-canvas图中
       groupCreateDialogVis: false, //批量创建业务空间弹窗
       groupCreateType: 1, //批量创建方式
-      hidden: true,
       zoneDisable: true, // 重新划分是否禁用
     }
   },
   computed: {
     ...mapGetters('layout', ['projectId'])
   },
-  created() {
-    if(this.$route.name == "spaceLedger"){
-      this.hidden = false;
-    }
-  },
+  created() {},
   mounted() {
     this.canvasWidth = this.$refs.graphy.offsetWidth;
     this.canvasHeight = this.$refs.graphy.offsetHeight;

+ 11 - 1
src/router/system.js

@@ -118,6 +118,16 @@ export default [{
             { path: 'index2', component: dataUtil2 }
         ]
     },
+    // 辅助屏
+    {
+        path: '/splitScreen',
+        name: 'splitScreen',
+        component: splitScreen,
+        children: [
+            { path: 'spaceledger', name: 'spaceLedger', component: spaceLedger },
+            { path: 'integrateresults', name: 'integrateResults', component: integrateResults }
+        ]
+    },
     // 平台管理
     {
         path: '/platform',
@@ -574,4 +584,4 @@ export default [{
             { path: 'own', name: 'Dasboard', component: OwnerManage }
         ]
     }
-]
+]

+ 0 - 6
src/views/ledger/cenotelist/relatedSpace.vue

@@ -197,12 +197,6 @@ export default {
           this.showBuildDot = true;
         }
         this.changeBuilding(this.buildingList[0].BuildID);
-        // this.building = this.buildingList[0].BuildID;
-        // this.buildingObj = this.buildingList[0];
-        // if (this.buildingObj.Floor && this.buildingObj.Floor.length) {
-        //   this.floor = this.buildingObj.Floor[0].FloorID;
-        // }
-
       }
       else {
         this.buildingList = [];

+ 0 - 41
src/views/ledger/cenotelist/relatedSpaceList.vue

@@ -186,47 +186,6 @@ export default {
     spaceType: Object,
     floorType: Object
   },
-  // computed: {
-  //   buildingData() {
-  //     if (!this.buildingList || !this.buildingList.length) {
-  //       return [];
-  //     }
-  //     let bL = this.buildingList.concat();
-  //     bL.map(item => {
-  //       item.value = item.BuildID;
-  //       item.label = item.BuildLocalName;
-  //       item.children = [];
-  //       if (item.Floor instanceof Array) {
-  //         item.children = item.Floor.map(fitem => {
-  //           fitem.value = fitem.FloorID
-  //           fitem.label = fitem.FloorLocalName
-  //           return fitem
-  //         })
-  //       }
-  //       if (!this.$route.query.onlyRead) {
-  //         item.children.unshift({
-  //           value: "noKnow",
-  //           label: "未明确建筑"
-  //         })
-  //       }
-  //       item.children.unshift({
-  //         value: "all",
-  //         label: "全部"
-  //       })
-  //     });
-  //     if (!this.$route.query.onlyRead) {
-  //       bL.unshift({
-  //         value: "all",
-  //         label: "全部"
-  //       }, {
-  //         value: "noKnow",
-  //         label: "未明确建筑"
-  //       });
-  //     }
-  //     console.log("这是", bL)
-  //     return bL;
-  //   }
-  // },
   watch: {
     space: {
       handler() {

+ 7 - 9
src/views/screen/splitscreen/spaceledger/index.vue

@@ -39,7 +39,7 @@
                 <img :src="`/image-service/common/image_get?systemId=dataPlatform&key=${item.key}`" alt="空间图片">
               </div>
             </div>
-            <div class="space-img" v-if="!spaceDetails.Pic">
+            <!-- <div class="space-img" v-if="!spaceDetails.Pic">
               <div class="img-box">
                 <img src="https://hbimg.huabanimg.com/2787ad434fc2bc819a5d7deda3855d897a99d528ab4a-e3HRgR_fw658" alt="空间图片">
               </div>
@@ -52,7 +52,7 @@
               <div class="img-box">
                 <img src="https://hbimg.huabanimg.com/2ea712954c75ff1b1e13329e7e4209f0691b88945c73-JCmkXX_fw658" alt="空间图片">
               </div>
-            </div>
+            </div> -->
           </el-scrollbar>
         </el-aside>
         <el-main style="height:100%">
@@ -164,7 +164,6 @@ export default {
     if (this.$route.name === "spaceLedger" && this.$route.query.RoomID && this.$route.query.zone) {
       this.getData();
     }
-    this.getInFormationPoitnName();
   },
   updated() { },
   computed: {
@@ -182,7 +181,6 @@ export default {
       }
       queryZone(params, res => {
         this.spaceDetails = res.Content[0];
-        console.log(this.spaceDetails,333)
         if (this.spaceDetails.Outline && this.spaceDetails.Outline[0] && this.spaceDetails.Outline[0].length) {
           this.getSpaceFloor();
         }
@@ -378,9 +376,9 @@ export default {
   margin: -10px;
   padding-bottom: 0;
   overflow: hidden;
-  width: 100%
+  width: 100%;
 }
-.el-tabs.el-tabs--card.el-tabs--top{
+.el-tabs.el-tabs--card.el-tabs--top {
   height: 100% !important;
   width: 100%;
 }
@@ -397,10 +395,10 @@ export default {
     height: 100% !important;
   }
 }
-#pane-dynamicData{
+#pane-dynamicData {
   height: calc(100% - 10px);
 }
-.el-tab-pane{
+.el-tab-pane {
   height: 100%;
 }
 #pane-staticData {
@@ -422,7 +420,7 @@ export default {
   overflow-x: hidden !important;
   overflow-y: auto !important;
 }
-.el-tabs__content{
+.el-tabs__content {
   height: calc(100% - 47px) !important;
 }
 </style>