zhangyu 4 gadi atpakaļ
vecāks
revīzija
b985b9dcd6
3 mainītis faili ar 32 papildinājumiem un 569 dzēšanām
  1. 5 0
      src/api/public.js
  2. 26 569
      src/views/FloorFunc.vue
  3. 1 0
      src/views/overview/MapView.vue

+ 5 - 0
src/api/public.js

@@ -19,4 +19,9 @@ export function setFloor(data, postParams) {
 // 查询图
 export function graphQuery(params) {
     return httputils.postJson(`/serve/topology-wanda/graph/query`, params)
+}
+
+// app查询图例统计信息
+export function appGraphElementQuery(params) {
+    return httputils.postJson(`/serve/topology-wanda/graphElement/statistic/appQuery`, params)
 }

+ 26 - 569
src/views/FloorFunc.vue

@@ -2,13 +2,13 @@
   <div class='floor-function'>
     <div class="floor-item" v-for="floor in floorData" :key="floor.FloorId">
       <div class="floor-item-title">
-        <span class="floor-item-text"><i class="iconfont wanda-louceng1"></i> {{floor.FloorId}}</span>
+        <span class="floor-item-text"><i class="iconfont wanda-louceng1"></i> {{floor.FloorName}}</span>
         <p class="floor-item-goMap" @click='goToMapView(floor)'>
           <span>查看平面图 </span>
           <van-icon class='floor-item-arrow' name='arrow' />
         </p>
       </div>
-      <div class="floor-item-table">
+      <div v-if="floor.Statistics.length" class="floor-item-table">
         <table class="table-box">
           <tr>
             <th><div class="cell">项目</div></th>
@@ -34,9 +34,7 @@
               <div class="cell">
                 <div class="table-note">
                   <span>注:</span>
-                  <div class="table-note-content">
-                    {{floor.Note}}
-                  </div>
+                  <div class="table-note-content" v-html="floor.Note"></div>
                 </div>
               </div>
             </td>
@@ -54,583 +52,42 @@
 import Vue from 'vue';
 import { Toast } from 'vant';
 Vue.use(Toast);
+import { appGraphElementQuery } from '@/api/public'
 import { mapGetters } from 'vuex'
 export default {
   name: 'FloorFunc',
   props: {},
   data() {
     return {
-      floorData: [
-        {
-          "FloorId": "f1",
-          "FloorName": "F1",
-          "Note": "1111111111",
-          "Statistics": [
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100138",
-              "GraphId": "94a1ec0e51ed41308e5798df693626ac",
-              "IsModify": true,
-              "Name": "机动车位",
-              "Num": null,
-              "OrderId": 1,
-              "ProjectId": "1000423",
-              "RealNum": null,
-              "Type": "None",
-              "Unit": "个",
-              "Url": ""
-            },
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100139",
-              "GraphId": "94a1ec0e51ed41308e5798df693626ac",
-              "IsModify": true,
-              "Name": "建筑面积",
-              "Num": null,
-              "OrderId": 2,
-              "ProjectId": "1000423",
-              "RealNum": null,
-              "Type": "None",
-              "Unit": "m²",
-              "Url": ""
-            },
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100142",
-              "GraphId": "94a1ec0e51ed41308e5798df693626ac",
-              "IsModify": true,
-              "Name": "主出入口",
-              "Num": null,
-              "OrderId": 3,
-              "ProjectId": "1000423",
-              "RealNum": null,
-              "Type": "None",
-              "Unit": "个",
-              "Url": ""
-            },
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100140",
-              "GraphId": "94a1ec0e51ed41308e5798df693626ac",
-              "IsModify": true,
-              "Name": "租赁面积",
-              "Num": null,
-              "OrderId": 4,
-              "ProjectId": "1000423",
-              "RealNum": null,
-              "Type": "None",
-              "Unit": "m²",
-              "Url": ""
-            },
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100115",
-              "GraphId": "94a1ec0e51ed41308e5798df693626ac",
-              "IsModify": true,
-              "Name": "主要设备房",
-              "Num": 1,
-              "OrderId": 5,
-              "ProjectId": "1000423",
-              "RealNum": 1,
-              "Type": "Zone",
-              "Unit": "处",
-              "Url": "dda0d8aa015e4225918de2a139963c08"
-            },
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100131",
-              "GraphId": "94a1ec0e51ed41308e5798df693626ac",
-              "IsModify": true,
-              "Name": "防火分区",
-              "Num": 3,
-              "OrderId": 6,
-              "ProjectId": "1000423",
-              "RealNum": 3,
-              "Type": "Zone",
-              "Unit": "个",
-              "Url": "02f0190e10504c3888b6a554c21690e8"
-            },
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100112",
-              "GraphId": "94a1ec0e51ed41308e5798df693626ac",
-              "IsModify": true,
-              "Name": "商管办公室",
-              "Num": 0,
-              "OrderId": 7,
-              "ProjectId": "1000423",
-              "RealNum": null,
-              "Type": "Zone",
-              "Unit": "处",
-              "Url": "c34abd809bb24329b19505094c366623"
-            },
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100067",
-              "GraphId": "94a1ec0e51ed41308e5798df693626ac",
-              "IsModify": true,
-              "Name": "观光电梯",
-              "Num": null,
-              "OrderId": 8,
-              "ProjectId": "1000423",
-              "RealNum": null,
-              "Type": "Image",
-              "Unit": "部",
-              "Url": "b85f9646e4f543fb9f70bc02296d661d"
-            },
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100064",
-              "GraphId": "94a1ec0e51ed41308e5798df693626ac",
-              "IsModify": true,
-              "Name": "货梯",
-              "Num": null,
-              "OrderId": 9,
-              "ProjectId": "1000423",
-              "RealNum": null,
-              "Type": "Image",
-              "Unit": "部",
-              "Url": "7d1893ec48744d42887d10469f1461ff"
-            },
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100063",
-              "GraphId": "94a1ec0e51ed41308e5798df693626ac",
-              "IsModify": true,
-              "Name": "客梯",
-              "Num": 11,
-              "OrderId": 10,
-              "ProjectId": "1000423",
-              "RealNum": 11,
-              "Type": "Image",
-              "Unit": "部",
-              "Url": "d59bbe68cf1e4c07bf06e40686ef13be"
-            },
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100066",
-              "GraphId": "94a1ec0e51ed41308e5798df693626ac",
-              "IsModify": true,
-              "Name": "人行步道",
-              "Num": null,
-              "OrderId": 11,
-              "ProjectId": "1000423",
-              "RealNum": null,
-              "Type": "Image",
-              "Unit": "处",
-              "Url": "15a35100d7f548f083d82343db6c5f83"
-            },
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100065",
-              "GraphId": "94a1ec0e51ed41308e5798df693626ac",
-              "IsModify": true,
-              "Name": "自动扶梯",
-              "Num": 23,
-              "OrderId": 12,
-              "ProjectId": "1000423",
-              "RealNum": 23,
-              "Type": "Image",
-              "Unit": "部",
-              "Url": "82ac7def995543ff9f129581585630a2"
-            },
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100039",
-              "GraphId": "94a1ec0e51ed41308e5798df693626ac",
-              "IsModify": true,
-              "Name": "卫生间",
-              "Num": 4,
-              "OrderId": 13,
-              "ProjectId": "1000423",
-              "RealNum": 4,
-              "Type": "Image",
-              "Unit": "处",
-              "Url": "00fcc43e72024baa93398efd112ec254"
-            },
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100076",
-              "GraphId": "94a1ec0e51ed41308e5798df693626ac",
-              "IsModify": true,
-              "Name": "冷却塔",
-              "Num": null,
-              "OrderId": 14,
-              "ProjectId": "1000423",
-              "RealNum": null,
-              "Type": "Image",
-              "Unit": "间",
-              "Url": "d104a4dc6b0243209c5a6b7d5a7f6030"
-            },
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100059",
-              "GraphId": "94a1ec0e51ed41308e5798df693626ac",
-              "IsModify": true,
-              "Name": "安全出口",
-              "Num": null,
-              "OrderId": 15,
-              "ProjectId": "1000423",
-              "RealNum": null,
-              "Type": "Image",
-              "Unit": "个",
-              "Url": "d711aeceeda848b0b9eda45a2009310b"
-            },
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100062",
-              "GraphId": "94a1ec0e51ed41308e5798df693626ac",
-              "IsModify": true,
-              "Name": "连通口",
-              "Num": null,
-              "OrderId": 16,
-              "ProjectId": "1000423",
-              "RealNum": null,
-              "Type": "Image",
-              "Unit": "处",
-              "Url": "02b7816d35f846798e08beb7bff33a82"
-            },
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100135",
-              "GraphId": "94a1ec0e51ed41308e5798df693626ac",
-              "IsModify": true,
-              "Name": "母婴室",
-              "Num": null,
-              "OrderId": 17,
-              "ProjectId": "1000423",
-              "RealNum": null,
-              "Type": "Image",
-              "Unit": "处",
-              "Url": "60448b41ed5342909b8d4e287b278372"
-            },
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100060",
-              "GraphId": "94a1ec0e51ed41308e5798df693626ac",
-              "IsModify": true,
-              "Name": "疏散通道",
-              "Num": null,
-              "OrderId": 18,
-              "ProjectId": "1000423",
-              "RealNum": null,
-              "Type": "Image",
-              "Unit": "处",
-              "Url": "25f85951dabb455da4d39426d8b4744f"
-            },
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100041",
-              "GraphId": "94a1ec0e51ed41308e5798df693626ac",
-              "IsModify": true,
-              "Name": "吸烟室",
-              "Num": null,
-              "OrderId": 19,
-              "ProjectId": "1000423",
-              "RealNum": null,
-              "Type": "Image",
-              "Unit": "处",
-              "Url": "f5696ac97a174323a03ade2d24f998c2"
-            }
-          ]
-        },
-        {
-          "FloorId": "f2",
-          "FloorName": "F2",
-          "Note": "",
-          "Statistics": [
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100138",
-              "GraphId": "09e8d9ca964242ddb1fc936510ae9ed1",
-              "IsModify": true,
-              "Name": "机动车位",
-              "Num": null,
-              "OrderId": 1,
-              "ProjectId": "1000423",
-              "RealNum": null,
-              "Type": "None",
-              "Unit": "个",
-              "Url": ""
-            },
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100139",
-              "GraphId": "09e8d9ca964242ddb1fc936510ae9ed1",
-              "IsModify": true,
-              "Name": "建筑面积",
-              "Num": null,
-              "OrderId": 2,
-              "ProjectId": "1000423",
-              "RealNum": null,
-              "Type": "None",
-              "Unit": "m²",
-              "Url": ""
-            },
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100142",
-              "GraphId": "09e8d9ca964242ddb1fc936510ae9ed1",
-              "IsModify": true,
-              "Name": "主出入口",
-              "Num": null,
-              "OrderId": 3,
-              "ProjectId": "1000423",
-              "RealNum": null,
-              "Type": "None",
-              "Unit": "个",
-              "Url": ""
-            },
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100140",
-              "GraphId": "09e8d9ca964242ddb1fc936510ae9ed1",
-              "IsModify": true,
-              "Name": "租赁面积",
-              "Num": null,
-              "OrderId": 4,
-              "ProjectId": "1000423",
-              "RealNum": null,
-              "Type": "None",
-              "Unit": "m²",
-              "Url": ""
-            },
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100115",
-              "GraphId": "09e8d9ca964242ddb1fc936510ae9ed1",
-              "IsModify": true,
-              "Name": "主要设备房",
-              "Num": null,
-              "OrderId": 5,
-              "ProjectId": "1000423",
-              "RealNum": null,
-              "Type": "Zone",
-              "Unit": "处",
-              "Url": "dda0d8aa015e4225918de2a139963c08"
-            },
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100131",
-              "GraphId": "09e8d9ca964242ddb1fc936510ae9ed1",
-              "IsModify": true,
-              "Name": "防火分区",
-              "Num": null,
-              "OrderId": 6,
-              "ProjectId": "1000423",
-              "RealNum": null,
-              "Type": "Zone",
-              "Unit": "个",
-              "Url": "02f0190e10504c3888b6a554c21690e8"
-            },
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100112",
-              "GraphId": "09e8d9ca964242ddb1fc936510ae9ed1",
-              "IsModify": true,
-              "Name": "商管办公室",
-              "Num": 1,
-              "OrderId": 7,
-              "ProjectId": "1000423",
-              "RealNum": 1,
-              "Type": "Zone",
-              "Unit": "处",
-              "Url": "c34abd809bb24329b19505094c366623"
-            },
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100067",
-              "GraphId": "09e8d9ca964242ddb1fc936510ae9ed1",
-              "IsModify": true,
-              "Name": "观光电梯",
-              "Num": 2,
-              "OrderId": 8,
-              "ProjectId": "1000423",
-              "RealNum": 2,
-              "Type": "Image",
-              "Unit": "部",
-              "Url": "b85f9646e4f543fb9f70bc02296d661d"
-            },
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100064",
-              "GraphId": "09e8d9ca964242ddb1fc936510ae9ed1",
-              "IsModify": true,
-              "Name": "货梯",
-              "Num": null,
-              "OrderId": 9,
-              "ProjectId": "1000423",
-              "RealNum": null,
-              "Type": "Image",
-              "Unit": "部",
-              "Url": "7d1893ec48744d42887d10469f1461ff"
-            },
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100063",
-              "GraphId": "09e8d9ca964242ddb1fc936510ae9ed1",
-              "IsModify": true,
-              "Name": "客梯",
-              "Num": null,
-              "OrderId": 10,
-              "ProjectId": "1000423",
-              "RealNum": null,
-              "Type": "Image",
-              "Unit": "部",
-              "Url": "d59bbe68cf1e4c07bf06e40686ef13be"
-            },
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100066",
-              "GraphId": "09e8d9ca964242ddb1fc936510ae9ed1",
-              "IsModify": true,
-              "Name": "人行步道",
-              "Num": null,
-              "OrderId": 11,
-              "ProjectId": "1000423",
-              "RealNum": null,
-              "Type": "Image",
-              "Unit": "处",
-              "Url": "15a35100d7f548f083d82343db6c5f83"
-            },
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100065",
-              "GraphId": "09e8d9ca964242ddb1fc936510ae9ed1",
-              "IsModify": true,
-              "Name": "自动扶梯",
-              "Num": null,
-              "OrderId": 12,
-              "ProjectId": "1000423",
-              "RealNum": null,
-              "Type": "Image",
-              "Unit": "部",
-              "Url": "82ac7def995543ff9f129581585630a2"
-            },
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100039",
-              "GraphId": "09e8d9ca964242ddb1fc936510ae9ed1",
-              "IsModify": true,
-              "Name": "卫生间",
-              "Num": null,
-              "OrderId": 13,
-              "ProjectId": "1000423",
-              "RealNum": null,
-              "Type": "Image",
-              "Unit": "处",
-              "Url": "00fcc43e72024baa93398efd112ec254"
-            },
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100076",
-              "GraphId": "09e8d9ca964242ddb1fc936510ae9ed1",
-              "IsModify": true,
-              "Name": "冷却塔",
-              "Num": null,
-              "OrderId": 14,
-              "ProjectId": "1000423",
-              "RealNum": null,
-              "Type": "Image",
-              "Unit": "间",
-              "Url": "d104a4dc6b0243209c5a6b7d5a7f6030"
-            },
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100059",
-              "GraphId": "09e8d9ca964242ddb1fc936510ae9ed1",
-              "IsModify": true,
-              "Name": "安全出口",
-              "Num": null,
-              "OrderId": 15,
-              "ProjectId": "1000423",
-              "RealNum": null,
-              "Type": "Image",
-              "Unit": "个",
-              "Url": "d711aeceeda848b0b9eda45a2009310b"
-            },
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100062",
-              "GraphId": "09e8d9ca964242ddb1fc936510ae9ed1",
-              "IsModify": true,
-              "Name": "连通口",
-              "Num": null,
-              "OrderId": 16,
-              "ProjectId": "1000423",
-              "RealNum": null,
-              "Type": "Image",
-              "Unit": "处",
-              "Url": "02b7816d35f846798e08beb7bff33a82"
-            },
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100135",
-              "GraphId": "09e8d9ca964242ddb1fc936510ae9ed1",
-              "IsModify": true,
-              "Name": "母婴室",
-              "Num": null,
-              "OrderId": 17,
-              "ProjectId": "1000423",
-              "RealNum": null,
-              "Type": "Image",
-              "Unit": "处",
-              "Url": "60448b41ed5342909b8d4e287b278372"
-            },
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100060",
-              "GraphId": "09e8d9ca964242ddb1fc936510ae9ed1",
-              "IsModify": true,
-              "Name": "疏散通道",
-              "Num": null,
-              "OrderId": 18,
-              "ProjectId": "1000423",
-              "RealNum": null,
-              "Type": "Image",
-              "Unit": "处",
-              "Url": "25f85951dabb455da4d39426d8b4744f"
-            },
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100041",
-              "GraphId": "09e8d9ca964242ddb1fc936510ae9ed1",
-              "IsModify": true,
-              "Name": "吸烟室",
-              "Num": null,
-              "OrderId": 19,
-              "ProjectId": "1000423",
-              "RealNum": null,
-              "Type": "Image",
-              "Unit": "处",
-              "Url": "f5696ac97a174323a03ade2d24f998c2"
-            },
-            {
-              "GraphCategoryId": "LCGN",
-              "GraphElementId": "100055",
-              "GraphId": "09e8d9ca964242ddb1fc936510ae9ed1",
-              "IsModify": null,
-              "Name": "强电井",
-              "Num": 1,
-              "OrderId": null,
-              "ProjectId": "1000423",
-              "RealNum": 1,
-              "Type": "Image",
-              "Unit": "处",
-              "Url": "6497312ffbbe496ab0cfacc8d66624f2"
-            }
-          ]
-        }
-      ]
+      floorData: [ ]
     }
   },
   computed: {
-    ...mapGetters(['categoryId']),
+    ...mapGetters(['plazaId', 'floorsArr', 'categoryId']),
   },
   components: {},
   beforeMount() { },
-  mounted() { },
+  created() {
+    this.getGraphElement();
+  },
   methods: {
+    // 请求图例信息
+    getGraphElement() {
+      let params = {
+        BuildingID: '1',
+        CategoryID: this.categoryId,
+        ProjectID: this.plazaId,
+        Floors: this.floorsArr.map(item => {
+          return {
+            FloorId: item.gcname,
+            FloorName: item.code
+          }
+        })
+      }
+      appGraphElementQuery(params).then(res => {
+        this.floorData = res.Data;
+      })
+    },
     goToMapView(floor) {
       if (floor.FloorId && floor.FloorName) {
         let floorObj = {

+ 1 - 0
src/views/overview/MapView.vue

@@ -203,6 +203,7 @@ export default {
         .then((data) => {
           if (data.Result == 'failure') {
             this.$store.commit('SETISMESSAGE', false)
+            this.view.fitSceneToView()
             this.view.minScale = this.view.scale
             if (this.$refs.canvasFun) {
               this.$refs.canvasFun.everyScale = this.view.scale