YaolongHan 4 gadi atpakaļ
vecāks
revīzija
b74375cf7d

+ 3 - 2
src/components/Legend/src/legend.vue

@@ -128,7 +128,7 @@ export default {
     props: {
         floors: {
             default: () => {
-                ;[]
+                []
             },
             type: Array
         },
@@ -167,7 +167,6 @@ export default {
                 BuildingID: '1',
                 FloorID: this.$cookie.get('floorNow')
             }
-
             let data = {}
             queryRead({ data, postParams }).then(res => {
                 if (res.data.Data && res.data.Data[0].Note) {
@@ -222,6 +221,8 @@ export default {
                 { editerUrl } = conf
             let floorName = this.floorName ? this.floorName : this.$cookie.get('floorNow')
             let data = `categoryId=${categoryId}&projectId=${this.plazaId}&BuildingID=1&FloorID=${FloorID}&FloorName=${floorName}&fmapID=${this.fmapID}`
+            console.log('data',data);
+            console.log('this.categoryId',this.categoryId,this.$cookie.get('categoryId'))
             let url = editerUrl + 'editer?' + encodeURIComponent(data)
             window.open(url, true)
         },

+ 3 - 2
src/views/equipment/index.vue

@@ -25,9 +25,9 @@
                     </div>
                     <div class='eq-content'>
                         <div class='legend-boxs'>
-                            <Legend :systemName='systemName' :categoryId='categoryId' :floors='floorsArr' type='1'></Legend>
+                            <Legend :systemName='systemName'  :floors='floorsArr' type='1'></Legend>
                         </div>
-                        <floorMap ref='floorMap' :id='"equip"' :loadName='loadName' :categoryId='categoryId' :type='"system"'></floorMap>
+                        <floorMap ref='floorMap' :id='"equip"' :loadName='loadName'  :type='"system"'></floorMap>
                         <div class='additional-box' v-if='fqPic.length>0'>
                             <div class='additional' @click='additionalColl'>
                                 <img src='../../assets/imgs/bg.png' alt />
@@ -87,6 +87,7 @@ export default {
             this.systemName = item.name
             this.smsxt = item.smsxt
             this.$cookie.set('categoryId', item.categoryId, 3)
+            this.$refs.floorMap.init(this.floorInfo.gname)
             if (this.smsxt == '1003' || this.smsxt == '1004') {
                 this.Index()
             }