Bläddra i källkod

Merge branch 'dev' of http://39.106.8.246:3003/yunxing/wanda-bm-guide-h5 into dev

yunxing 4 år sedan
förälder
incheckning
2dce548972
3 ändrade filer med 23 tillägg och 12 borttagningar
  1. 5 1
      src/App.vue
  2. 15 3
      src/views/FloorFunc.vue
  3. 3 8
      src/views/overview/MapView.vue

+ 5 - 1
src/App.vue

@@ -127,7 +127,11 @@ export default {
         // 路由更改
         changeTabbar(active) {
             console.log(active)
-            this.$router.push({ name: this.routeDict[active] })
+            if (active == 1) {
+                this.$router.push({ path: 'floorFunc', query: { categoryId: 'LCGN' } })
+            } else {
+                this.$router.push({ name: this.routeDict[active] })
+            }
             store.commit('SETAPPTITLE', this.titleDict[active])
         },
         /**

+ 15 - 3
src/views/FloorFunc.vue

@@ -42,6 +42,10 @@
             </td>
           </tr>
         </table>
+        <h2 class="floor-additional-data" v-if="$route.query.categoryId == 'XFXT' || $route.query.categoryId == 'RDXT'">
+          <i class="iconfont wanda-otherData"></i> 
+          查看附加数据
+        </h2>
       </div>
     </div>
   </div>
@@ -619,7 +623,7 @@ export default {
   mounted() { },
   methods: {
     goToMapView() {
-      this.$router.push({ name: 'MapView' })
+      this.$router.push({ name: 'MapView', params: {categoryId: this.$route.query.categoryId} })
     },
   },
 }
@@ -633,7 +637,7 @@ export default {
   box-sizing: border-box;
   overflow-y: auto;
   .floor-item {
-    margin-bottom: 20px;
+    margin-bottom: 12px;
     .floor-item-title {
       padding: 0 10px;
       height: 44px;
@@ -655,7 +659,7 @@ export default {
       }
     }
     .floor-item-table {
-      padding: 12px 16px;
+      padding: 12px 16px 0;
       .table-box {
         width: 100%;
         table-layout: fixed;
@@ -715,6 +719,14 @@ export default {
         }
       }
     }
+    .floor-additional-data {
+      font-size: 14px;
+      color: #025BAA;
+      margin-top: 10px;
+      i {
+        vertical-align: bottom;
+      }
+    }
   }
 }
 </style>

+ 3 - 8
src/views/overview/MapView.vue

@@ -57,12 +57,7 @@ export default {
       fParser: null, // 底图解析器
     }
   },
-  props: {
-    categoryId: {
-      default: 'LCGN',
-      type: String,
-    }
-  },
+  props: { },
   beforeMount() { },
   mounted() {
     this.$nextTick(() => {
@@ -341,7 +336,7 @@ export default {
       const data = {
         BuildingID: '1',
         FloorID: this.floorid,
-        categoryId: this.categoryId,
+        categoryId: this.$route.params.categoryId,
         projectId: this.plazaId,
         Pub: true,
       }
@@ -349,7 +344,7 @@ export default {
     },
     // 获取图最大最小值
     getGraphDetail() {
-      const categoryId = this.categoryId
+      const categoryId = this.$route.params.categoryId
       const data = {
         Filters: `categoryId='${categoryId}';projectId='${this.plazaId}';BuildingID='1';FloorID='${this.floorid}';isPub=true`,
       }