guoxiaohuan 4 éve
szülő
commit
ac452088a8

+ 1 - 0
src/components/floorMap/canvasFun.vue

@@ -143,6 +143,7 @@ export default {
         margin-top: 10px;
         border-left: 1px solid #e4e5e7;
         border-right: 1px solid #e4e5e7;
+        z-index: 1;
     }
 }
 </style>

+ 2 - 3
src/views/room/detail.vue

@@ -44,8 +44,7 @@
                 prefix-icon='el-icon-search'
                 v-model='ssppbh'
             ></el-input>
-
-            <Select
+            <!-- <Select
                 width='146'
                 style='margin-right:12px'
                 tipPlace='top'
@@ -54,7 +53,7 @@
                 @change='changeFloorStr'
                 v-model='floorStr'
                 :selectdata='floorSelect'
-            ></Select>
+            ></Select>-->
         </div>
         <div class='dialog-none'>
             <div class='input-dialog'>

+ 10 - 4
src/views/room/index.vue

@@ -21,7 +21,7 @@
                     <el-tab-pane label='机房布置图' name='1' v-if='tableImg.length>0'>
                         <room-table1 v-if='tableImg.length>=0' :tableImg='tableImg'></room-table1>
                     </el-tab-pane>
-                    <el-tab-pane label='配电室低压柜及出线明细表' name='2' v-if='systemName=="配电室机房"'>
+                    <el-tab-pane label='配电室低压柜及出线明细表' name='2' v-if='showLocationflid'>
                         <div class='compute-center'>
                             <Select
                                 width='200'
@@ -455,6 +455,7 @@ export default {
             table3: [],
             table4: [],
             table5: [],
+            showLocationflid: false,
             //
             total: 0,
             page: 1,
@@ -571,7 +572,7 @@ export default {
                 //判断有没有图片,有图片默认显示按钮是第一个tab,没有图片显示的是第二个tab
                 if (this.tableImg.length > 0) {
                     this.activeName = '1'
-                } else if (this.systemName == '配电室机房') {
+                } else if (this.showLocationflid) {
                     this.activeName = '2'
                     this.Index1()
                 } else {
@@ -872,8 +873,13 @@ export default {
             }
             querySystem(params).then(res => {
                 this.smsxtArr = res.data ? res.data[0] : {}
-                console.log(this.smsxtArr)
-
+                // 5201 设备间   5204设备间  5209设备间
+                if (this.smsxtArr.length > 0) {
+                    let locationflid = this.smsxtArr.locationflid
+                    if (locationflid == '5201' || locationflid == '5204' || locationflid == '5209') {
+                        this.showLocationflid = false
+                    }
+                }
                 this.Index(this.smsxtArr.smsxt)
                 this.content = `查看${this.$cookie.get('floorNow')}层${this.smsxtArr.smsxtname}分布图`
             })