guoxiaohuan 4 éve
szülő
commit
135fe49892

BIN
src/assets/imgs/bg2.png


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

@@ -55,7 +55,7 @@
                 </p>
             </el-tooltip>
             <!-- 新增分布图 -->
-            <el-tooltip effect='dark' content='新增分布图' placement='left' v-if='floorSelect.length!=floors.length'>
+            <el-tooltip effect='dark' content='新增分布图' placement='left' v-if='floorSelect.length!=floors.length && !isMessage && type==0'>
                 <p class='tltk' style='margin-left: -5px;' @click='addFloor'>
                     <img src='@/assets/imgs/bjj.png' alt />
                 </p>
@@ -286,7 +286,8 @@ export default {
             const { conf } = window.__systemConf,
                 { 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}`
+            let seq = this.$cookie.get('currentFloorId')
+            let data = `categoryId=${categoryId}&projectId=${this.plazaId}&BuildingID=1&FloorID=${FloorID}&FloorName=${floorName}&fmapID=${this.fmapID}&seq=${seq}`
             let url = editerUrl + 'editer?' + encodeURIComponent(data)
             window.open(url, true)
         },

+ 8 - 4
src/components/floorMap/index.vue

@@ -199,9 +199,13 @@ export default {
             this.view = new FloorView(`canvas${this.id}`)
         },
         listChange(item, ev) {
-            let name = ev[0][0].data.Name
-            if (name.slice(name.length - 2, name.length) == '机房') {
-                this.$refs.boxRoom.open({ name: name, type: this.type })
+            let name = ev[0][0].data.Name,
+                location = ev[0][0].data.AttachObjectIds[0] ? ev[0][0].data.AttachObjectIds[0].id : ''
+            if (!location) {
+                this.$message('未添加位置类型')
+            }
+            if (name.slice(name.length - 2, name.length) == '机房' && location) {
+                this.$refs.boxRoom.open({ name: name, type: this.type, location: location })
             }
         },
         // 适配底图到窗口
@@ -338,4 +342,4 @@ export default {
         width: 100%;
     }
 }
-</style>
+</style>

+ 14 - 4
src/views/equipment/index.vue

@@ -30,9 +30,12 @@
                         <floorMap ref='floorMap' :id='"equip"' :loadName='loadName' :type='"system"'></floorMap>
                         <!--  -->
                         <div class='additional-box' v-if='fqPic.length>0'>
-                            <div class='additional' @click='additionalColl'>
+                            <div class='additional' @click='additionalColl' v-if='!show'>
                                 <img src='../../assets/imgs/bg.png' alt />
                             </div>
+                            <div class='additional2' @click='additionalColl' v-else>
+                                <img src='../../assets/imgs/bg2.png' alt />
+                            </div>
                             <el-collapse-transition>
                                 <div v-if='show' class='add-img'>
                                     <img :src='fqPic[0].url' alt />
@@ -271,11 +274,10 @@ export default {
                     }
                     .additional-box {
                         position: relative;
-                        .additional {
+                        .additional,
+                        .additional2 {
                             width: 44px;
                             height: 44px;
-                            background: rgba(255, 255, 255, 1);
-                            box-shadow: 0px 2px 15px 0px rgba(31, 36, 41, 0.08);
                             border-radius: 2px;
                             position: fixed;
                             right: 32px;
@@ -290,6 +292,14 @@ export default {
                                 height: 20px;
                             }
                         }
+                        .additional {
+                            background: rgba(255, 255, 255, 1);
+                            box-shadow: 0px 2px 15px 0px rgba(31, 36, 41, 0.08);
+                        }
+                        .additional2 {
+                            background: linear-gradient(180deg, rgba(54, 156, 247, 1) 0%, rgba(2, 91, 170, 1) 100%);
+                            box-shadow: 0px 2px 15px 0px rgba(31, 36, 41, 0.08);
+                        }
                         .add-img {
                             width: 560px;
                             height: 360px;

+ 8 - 6
src/views/room/index.vue

@@ -419,6 +419,7 @@ export default {
         return {
             content: '',
             activeName: '1',
+            location: '',
             visible: false,
             dialogFormVisible: false,
             systemName: '',
@@ -528,7 +529,7 @@ export default {
             this.picFloor = this.$cookie.get('floorNow')
             let getParams = {
                 typename: '位置布置图',
-                location: '1809',
+                location: this.location,
                 module: '1002',
                 // system: system,
                 plazaId: this.plazaId
@@ -554,7 +555,7 @@ export default {
         // 明细表
         Index1() {
             let getParams = {
-                location: '1890',
+                location: this.location,
                 plazaId: this.plazaId,
                 page: this.page1,
                 size: this.size1
@@ -605,7 +606,7 @@ export default {
         Index2() {
             let postParams = {}
             let data = {
-                location: '1890',
+                location: this.location,
                 plazaId: this.plazaId,
                 page: this.page2,
                 size: this.size2
@@ -659,7 +660,7 @@ export default {
         // 机房维修记录
         Index3() {
             let getParams = {
-                location: '1890',
+                location: this.location,
                 plazaId: this.plazaId,
                 page: this.page3,
                 size: this.size3,
@@ -707,7 +708,7 @@ export default {
         Index4() {
             let postParams = {}
             let data = {
-                location: '1890',
+                location: this.location,
                 plazaId: this.plazaId,
                 page: this.page4,
                 size: this.size4,
@@ -828,7 +829,7 @@ export default {
             this.smsxtArr = []
             let params = {
                 getParams: {
-                    locationid: '1890',
+                    locationid: this.location,
                     plazaId: this.plazaId
                 }
             }
@@ -842,6 +843,7 @@ export default {
         open(name) {
             this.visible = true
             this.systemName = name.name
+            this.location = name.location
             if (name.type == 'floor') {
                 this.init()
             } else if (name.type == 'system') {