guoxiaohuan %!s(int64=4) %!d(string=hai) anos
pai
achega
cca8f79193

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

@@ -164,10 +164,8 @@ export default {
          * @description t跳转editer编辑器
          */
         goToEditer() {
-            console.log(1111)
             let FloorID = this.$cookie.get('floorMapId') || 'f1'
-            let categoryId = this.$cookie.get('categoryId') || 'LCGN'
-            console.log(this.fmapID)
+            let categoryId = this.$cookie.get('categoryId')
             const { conf } = window.__systemConf,
                 { editerUrl } = conf
             let data = `categoryId=${categoryId}&projectId=${this.plazaId}&BuildingID=1&FloorID=${FloorID}&fmapID=${this.fmapID}`
@@ -190,7 +188,7 @@ export default {
             let postParams = {}
             // this.graphId = this.$cookie.get('graphId')
             let data = {
-                graphId: '5956ef5cf6e34bd0980a18797d221026',
+                graphId: '0af035fbf7e6401cbccba6dbe2d3c802',
                 // graphId: this.graphId,
                 projectId: this.$store.state.plazaId,
                 flag: flag

+ 2 - 2
src/components/floorMap/index.vue

@@ -192,7 +192,7 @@ export default {
         readGroup() {
             const data = {
                 // categoryId: this.urlMsg.categoryId,
-                categoryId: 'XFXT',
+                categoryId: this.$cookie.get('categoryId'),
                 projectId: this.urlMsg.ProjectID
             }
             return readGroup(data)
@@ -216,7 +216,7 @@ export default {
     created() {
         this.urlMsg = {
             // categoryId: this.$cookie.get('categoryId') || 'LCGN',
-            categoryId: 'XFXT',
+            categoryId: this.$cookie.get('categoryId'),
             ProjectID: this.plazaId,
             BuildingID: '1',
             FloorID: this.$cookie.get('floorMapId') || 'f1',

+ 5 - 0
src/components/menuList.vue

@@ -100,6 +100,11 @@ export default {
         },
         clickEventAcitve(item) {
             console.log(item)
+            if (item.name == '楼层功能') {
+                this.$cookie.set('categoryId', 'LCGN', 3)
+            } else {
+                this.$cookie.set('categoryId', 'GDXT', 3)
+            }
             this.list.forEach(ele => {
                 ele.state = false
             })

+ 1 - 1
src/utils/plugins/components.js

@@ -557,7 +557,7 @@ var system = [
         {
             name: '燃气系统',
             smsxt: '1007',
-            categoryId: 'LCFB',
+            categoryId: 'RQXT',
             id: 7,
             icon: require('@/assets/imgs/cdrq.png'),
             icon1: require('@/assets/imgs/cdrq2.png'),

+ 1 - 0
src/views/equipment/index.vue

@@ -134,6 +134,7 @@ export default {
     background: rgba(242, 245, 247, 1);
     display: flex;
     flex: 1;
+    overflow: hidden;
     .eq-top {
         margin-left: 260px;
         padding-top: 24px;

+ 5 - 1
src/views/room/room3.vue

@@ -41,7 +41,7 @@
                 @current-change='pageChanged'
             ></el-pagination>
         </div>
-        <el-dialog width='1200px' style='height:100%' title='设备清单' :visible.sync='innerVisible' append-to-body>
+        <el-dialog width='90%' title='设备清单' :visible.sync='innerVisible' append-to-body>
             <detail v-if='type_code' :type_code='type_code'></detail>
         </el-dialog>
     </div>
@@ -86,5 +86,9 @@ export default {
         justify-content: flex-end;
         margin-top: 28px;
     }
+    .el-dialog {
+        height: 90% !important;
+        margin-top: 50px;
+    }
 }
 </style>