Merge branch 'screen' into dev

src/views/screen/splitscreen/equipledger/index.vue

@@ -5,7 +5,7 @@
       <span>{{equip.EquipLocalName || equip.EquipName}}</span>
       <span>(位置图片)</span>
     </div>
-    <div class="page-content" id="page-content">
+    <div class="page-content" id="page-content" v-loading="canvasLoading">
       <div v-show="showCanvas">
         <p>{{file.FolderName}} - {{file.FloorName}}</p>
         <canvas :height="cadHeight" :width="cadWidth" id="floorCanvas" :k="refreshCanvas"></canvas>
@@ -33,7 +33,8 @@ export default {
       scene: {},
       cadWidth: 800,
       cadHeight: 800,
-      showCanvas: true
+      showCanvas: true,
+      canvasLoading: false,
     }
   },
   mounted() {
@@ -56,11 +57,13 @@ export default {
     getGraphy() {
       this.clearGraphy();
       this.scene = new LocationPointScene()
+      this.canvasLoading = true;
       this.scene.getFloorData('/modelapi/base-graph/query', { ModelId: this.equip.ModelId }).then(res => {
         this.getGraphtSuc(res)
       })
     },
     getGraphtSuc(res) {
+      this.canvasLoading = false;
       this.view.scene = this.scene;
       this.view.fitSceneToView();
       this.scene.isSpaceSelectable = false;