zhulizhen1111 4 years ago
parent
commit
3d4418b5dd

+ 7 - 5
src/components/PicLarge/src/picLarge.vue

@@ -73,7 +73,6 @@ export default {
             margin-bottom: 0;
             width: 180px;
             margin: 0 auto;
-
             li {
                 width: 180px;
                 height: 135px;
@@ -120,10 +119,13 @@ export default {
 </style>
 <style lang="less">
 .tpyl-1 {
-    height: 90% !important;
-    margin-top: 5vh !important;
-    .el-dialog__body {
-        padding: 0;
+    overflow: hidden;
+    .el-dialog {
+        height: 90vh !important;
+        margin-top: 5vh !important;
+        .el-dialog__body {
+            padding: 10px;
+        }
     }
 }
 </style>

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

@@ -99,7 +99,7 @@ export default {
         },
         emitFloor(item) {
             this.floorInfo = item
-            // this.$refs.floorMap.init(this.floorInfo.gname)
+            this.$refs.floorMap.init(this.floorInfo.gname)
             this.init()
         },
         dialogVisible(eve) {
@@ -134,9 +134,19 @@ export default {
     },
     mounted() {
         console.log('smsxtsmsxtsmsxt', this.$route.query.smsxt)
+        if (this.$route.query.smsxt) {
+            this.smsxt = this.$route.query.smsxt
+            this.system.forEach(el => {
+                if (el.smsxt == this.smsxt) {
+                    this.everySystem = el.children
+                    this.systemName = el.name
+                    this.systemId = el.id
+                }
+            })
+        }
         this.everySystem = this.system[0].children
         this.init()
-        // this.$refs.floorMap.init(this.floorInfo.gname)
+        this.$refs.floorMap.init(this.floorInfo.gname)
     },
     computed: {
         ...mapGetters(['floorsArr'])

+ 2 - 2
src/views/equipment/table/eqDetaileDialog.vue

@@ -71,7 +71,7 @@
                 <template slot-scope='{row}'>{{row.sbxh || '--'}}</template>
             </el-table-column>
             <el-table-column prop='floor' sortable label='楼层' width='100'>
-                <template slot-scope='{row}'>{{row.floor || '--'}}</template>
+                <template slot-scope='{row}'>{{row.floorcode || '--'}}</template>
             </el-table-column>
             <el-table-column prop='wzjc' label='安装位置' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.wzjc || '--'}}</template>
@@ -250,7 +250,7 @@ export default {
             }
             //下拉筛选
             if (this.floor) {
-                postParams.floor = this.floor
+                postParams.gname = this.floor
             }
             if (this.sbglgs) {
                 postParams.sbglgs = this.sbglgs