Bläddra i källkod

项目ID获取方式修改

yangjunjing 5 år sedan
förälder
incheckning
10662d92b6
1 ändrade filer med 11 tillägg och 7 borttagningar
  1. 11 7
      src/views/screen/splitscreen/spaceledger/index.vue

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

@@ -21,10 +21,12 @@
                   v-if="spaceDetails.RoomQRCode">
               </div>
             </div>
-            <div v-show="spaceDetails.Outline && spaceDetails.Outline[0] && spaceDetails.Outline[0].length" id="graphy" ref="graphy"
-              style="width:400px;height:400px;" v-loading="canvasLoading">
+            <div>
               <p><b>位置图片:</b></p>
-              <canvas id="floorCanvas" :width="canvasWidth" :height="canvasHeight" ref="canvas" tabindex="0"></canvas>
+              <div v-show="spaceDetails.Outline && spaceDetails.Outline[0] && spaceDetails.Outline[0].length" id="graphy" ref="graphy"
+                style="width:400px;height:400px;" v-loading="canvasLoading">
+                <canvas id="floorCanvas" :width="canvasWidth" :height="canvasHeight" ref="canvas" tabindex="0"></canvas>
+              </div>
             </div>
             <div v-show="spaceDetails.Outline && !spaceDetails.Outline[0] || !spaceDetails.Outline"
               style="height: 400px;transform: translateY(50%);textAlign:center;">
@@ -33,10 +35,12 @@
             </div>
             <div class="space-img" v-if="spaceDetails.Pic">
               <div class="img-box" v-for="(item) in spaceDetails.Pic" :key='`${item.Id}+${item.key}`'>
+                <p><b>空间照片:</b></p>
                 <img :src="`/image-service/common/image_get?systemId=dataPlatform&key=${item.key}`" alt="空间图片">
               </div>
             </div>
             <div class="space-img" v-if="!spaceDetails.Pic">
+              <p><b>空间照片:</b></p>
               <div class="img-box">
                 <img src="https://hbimg.huabanimg.com/2787ad434fc2bc819a5d7deda3855d897a99d528ab4a-e3HRgR_fw658" alt="空间图片">
               </div>
@@ -163,9 +167,7 @@ export default {
     }
   },
   updated() { },
-  computed: {
-    ...mapGetters('layout', ['userId', 'projectId'])
-  },
+  computed: { },
   methods: {
     getData() {
       this.params = this.$route.query;
@@ -242,6 +244,7 @@ export default {
       this.view = new FloorView('floorCanvas')
     },
     getInFormationPoitnName() {// 获取动态数据
+      let proId = localStorage.getItem('projectId');
       let secret = localStorage.getItem('secret');
       let params = {
         data: {
@@ -254,7 +257,7 @@ export default {
       }
       let param = {
         secret: secret,
-        ProjId: this.projectId,
+        ProjId: proId,
         data: {
           criterias: []
         }
@@ -305,6 +308,7 @@ export default {
 .el-header {
   padding: 0;
   height: 30px !important;
+  margin-top: -10px;
   .boxName {
     color: #fff;
     font-size: 16px;