浏览代码

Merge branch 'screen' into dev

haojianlong 5 年之前
父节点
当前提交
e94ecde812
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      src/views/screen/splitscreen/equipledger/index.vue

+ 2 - 2
src/views/screen/splitscreen/equipledger/index.vue

@@ -7,7 +7,7 @@
     </div>
     <div class="page-content" id="page-content">
       <div v-show="showCanvas">
-        <p>{{file.FolderName}}{{file.FloorName}}</p>
+        <p>{{file.FolderName}} - {{file.FloorName}}</p>
         <canvas :height="cadHeight" :width="cadWidth" id="floorCanvas" :k="refreshCanvas"></canvas>
       </div>
       <div class="no-data" v-show="!showCanvas">
@@ -39,7 +39,7 @@ export default {
   mounted() {
     this.cadWidth = document.getElementById('page-content').offsetWidth;
     this.cadHeight = document.getElementById('page-content').offsetHeight;
-    this.equip = this.$route.query.equip;
+    this.equip = this.$route.query.equip || {};
     this.init();
   },
   methods: {