guoxiaohuan 4 tahun lalu
induk
melakukan
129b30900c

+ 6 - 2
src/assets/css/rotation.css

@@ -67,6 +67,9 @@
   margin-bottom: 10px;
   position: relative;
 }
+.overview .view-box .view-left .lb-left img {
+  width: 100%;
+}
 .overview .view-box .view-left .lb-left .lb-icon {
   z-index: 99;
   position: absolute;
@@ -186,7 +189,7 @@
   flex-direction: column;
 }
 .overview .view-box .view-right .view-right-box .lb-right {
-  height: 38%;
+  flex: 1;
   margin-top: 12px;
   margin-bottom: 10px;
   position: relative;
@@ -210,9 +213,10 @@
   right: 10px;
 }
 .overview .view-box .view-right .view-right-box .lb-right-bottom {
-  flex: 1;
+  height: 53%;
   background: #ffffff;
   padding: 12px 16px;
+  overflow: hidden;
 }
 .overview .view-box .view-right .view-right-box .lb-right-bottom nav {
   width: 161px;

+ 7 - 2
src/assets/css/rotation.less

@@ -63,6 +63,10 @@
                 margin-top: 12px;
                 margin-bottom: 10px;
                 position: relative;
+                img {
+                    width: 100%;
+                    // height: 100%;
+                }
                 .lb-icon {
                     z-index: 99;
                     position: absolute;
@@ -182,7 +186,7 @@
                 display: flex;
                 flex-direction: column;
                 .lb-right {
-                    height: 38%;
+                    flex: 1;
                     margin-top: 12px;
                     margin-bottom: 10px;
                     position: relative;
@@ -206,9 +210,10 @@
                     }
                 }
                 .lb-right-bottom {
-                    flex: 1;
+                    height: 53%;
                     background: #ffffff;
                     padding: 12px 16px;
+                    overflow: hidden;
                     nav {
                         width: 161px;
                         height: 32px;

+ 49 - 92
src/components/Legend/src/legend.vue

@@ -37,32 +37,28 @@
                 </div>
             </el-collapse-transition>
         </div>
-        <div class='edit_map' v-if='systemName != "土建系统"'>
-            <div class='divHover'>
-                <div class='hover-div'>
-                    <!-- 备注编辑器 -->
-                    <el-tooltip class='item' effect='dark' content='编辑备注' placement='left'>
-                        <span class='bj' @click='legendClik'>备注</span>
-                    </el-tooltip>
-                    <!-- 编辑图例 -->
-                    <el-tooltip class='item' effect='dark' content='编辑图例' placement='left'>
-                        <p @click='editTl'>
-                            <img src='@/assets/imgs/bjtl.png' alt />
-                        </p>
-                    </el-tooltip>
-                </div>
-                <!-- 编辑平面图 -->
-                <el-tooltip v-if='editPmt' @click='goToEditer' class='bjpmt' effect='dark' content='编辑平面图' placement='left'>
-                    <span class='edit-icon'>
-                        <i class='el-icon-edit'></i>
-                    </span>
-                </el-tooltip>
-                <span v-else @click='goToEditer' class='edit-icon2'>
-                    <a-icon type='edit' style='color:#fff' />
+        <div class='edit_map'>
+            <!-- 备注编辑器 -->
+            <el-tooltip effect='dark' content='编辑备注' placement='left'>
+                <span v-if='systemName != "土建系统"' class='bjtk' @click='legendClik'>备注</span>
+            </el-tooltip>
+            <!-- 编辑图例 -->
+            <el-tooltip effect='dark' content='编辑图例' placement='left'>
+                <p v-if='systemName != "土建系统"' @click='editTl' class='tltk'>
+                    <img src='@/assets/imgs/bjtl.png' alt />
+                </p>
+            </el-tooltip>
+            <!-- 编辑平面图 -->
+            <el-tooltip v-if='editPmt' class='bjpmt' effect='dark' content='编辑平面图' placement='left'>
+                <span class='edit-icon' @click='goToEditer'>
+                    <i class='el-icon-edit' style='color:#fff;font-size:16px;'></i>
                 </span>
-            </div>
-            <legend-remarks @queryMarks='queryMarks' ref='EditdMarks'></legend-remarks>
+            </el-tooltip>
+            <span v-else class='edit-icon2'>
+                <i class='el-icon-edit' style='color:#fff;font-size:16px;'></i>
+            </span>
         </div>
+        <legend-remarks @queryMarks='queryMarks' ref='EditdMarks'></legend-remarks>
     </div>
 </template>
 <script>
@@ -92,8 +88,7 @@ export default {
             multipleSelection: [],
             editText: '',
             editSwitch: false,
-            editPmt: false,
-            graphId: ''
+            editPmt: true //是否有跳转道图例库的权限
         }
     },
     computed: {
@@ -128,21 +123,11 @@ export default {
                     } else {
                         this.remarksText = `${this.text1}${this.text2}${note}`
                     }
-                    // if (note.search(this.text2) != -1) {
-                    //     this.remarksText = `${note}`
-                    // } else {
-                    //     this.remarksText = `${this.text2}${note}`
-                    // }
                 } else {
                     this.remarksText = `${this.text1}${this.text2}`
                 }
-                console.log(this.remarksText)
             })
         },
-        dump() {},
-        editChange(val) {
-            this.editText = val
-        },
         // 点击展示图例框
         showTl() {
             this.show = !this.show
@@ -154,6 +139,7 @@ export default {
         cance() {
             this.show2 = false
         },
+        // 编辑图例
         editTl() {
             this.show = false
             this.show2 = true
@@ -203,13 +189,12 @@ export default {
             })
             this.queryMarks()
         },
-        //   this.$cookie.get('graphId')
         // 查询编辑状态图例
         queryEditNum(flag) {
             let postParams = {}
             let data = {
-                graphId: '1',
-                projectId: '1',
+                graphId: this.$cookie.get('graphId'),
+                projectId: this.$store.state.plazaId,
                 flag: flag
             }
             queryStatis({ data, postParams }).then(res => {
@@ -313,62 +298,34 @@ export default {
     .edit-icon {
         cursor: pointer;
     }
-    .divHover {
-        .hover-div {
-            position: absolute;
-            bottom: 58px;
-            // display: none;
-            .bj {
-                width: 40px;
-                height: 40px;
-                display: inline-block;
-                text-align: center;
-                background: rgba(255, 255, 255, 1);
-                box-shadow: 0px 2px 15px 0px rgba(31, 36, 41, 0.08);
-                border-radius: 90px;
-                line-height: 40px;
-                font-size: 12px;
-                margin: 0 auto;
-                cursor: pointer;
-                border: 1px solid #ccc;
-                margin-left: 4px;
-                margin-bottom: 8px;
-            }
-            // .icon1 {
-            //     width: 40px;
-            //     height: 40px;
-            //     background: rgba(255, 255, 255, 1);
-            //     box-shadow: 0px 2px 4px 0px rgba(31, 36, 41, 0.06);
-            //     border: 1px solid rgba(31, 36, 41, 0.2);
-            //     font-size: 16px;
-            //     display: inline-block;
-            //     color: #646c73;
-            //     border-radius: 50%;
-            //     text-align: center;
-            //     line-height: 40px;
-            //     cursor: pointer;
-            // }
-            // .icon2 {
-            //     width: 40px;
-            //     height: 40px;
-            //     background: rgba(255, 255, 255, 1);
-            //     box-shadow: 0px 2px 4px 0px rgba(31, 36, 41, 0.06);
-            //     border: 1px solid rgba(31, 36, 41, 0.2);
-            //     font-size: 16px;
-            //     display: inline-block;
-            //     color: #646c73;
-            //     border-radius: 50%;
-            //     text-align: center;
-            //     line-height: 40px;
-            //     margin-top: 15px;
-            //     cursor: pointer;
-            // }
-        }
+    .bjtk {
+        width: 40px;
+        height: 40px;
+        display: inline-block;
+        text-align: center;
+        background: rgba(255, 255, 255, 1);
+        box-shadow: 0px 2px 15px 0px rgba(31, 36, 41, 0.08);
+        border-radius: 90px;
+        line-height: 40px;
+        font-size: 12px;
+        margin: 0 auto;
+        cursor: pointer;
+        border: 1px solid #ccc;
+        margin-left: 4px;
+        margin-bottom: 8px;
+        margin-top: 10px;
+        display: none;
     }
-    .bjpmt {
+    .tltk {
+        margin-bottom: 10px;
+        display: none;
+        cursor: pointer;
     }
 }
-.edit_map:hover .hover-div {
+.edit_map:hover .tltk {
+    display: block;
+}
+.edit_map:hover .bjtk {
     display: block;
 }
 </style>

+ 26 - 18
src/components/PicLarge/src/picLarge.vue

@@ -4,23 +4,25 @@
 *@info:大图预览
 */
 <template>
-    <el-dialog title='图片预览' width='90%' :visible.sync='dialogVisible' :close-on-click-modal='false' append-to-body>
-        <div class='pic-list'>
-            <div class='pic-left'>
-                <ul v-for='(item,index) in imgUrl' :key='index'>
-                    <li @click='getIndex(item.url)'>
-                        <img :src='item.url' />
-                    </li>
-                    <span>{{item.name}}</span>
-                </ul>
-            </div>
-            <div class='pic-right'>
-                <div class='pic-right-img'>
-                    <img :src='ImgUrl' />
+    <div class='tpyl'>
+        <el-dialog title='图片预览' width='90%' :visible.sync='dialogVisible' :close-on-click-modal='false' append-to-body>
+            <div class='pic-list'>
+                <div class='pic-left'>
+                    <ul v-for='(item,index) in imgUrl' :key='index'>
+                        <li @click='getIndex(item.url)'>
+                            <img :src='item.url' />
+                        </li>
+                        <!-- <span>{{item.name}}</span> -->
+                    </ul>
+                </div>
+                <div class='pic-right'>
+                    <div class='pic-right-img'>
+                        <img :src='ImgUrl' />
+                    </div>
                 </div>
             </div>
-        </div>
-    </el-dialog>
+        </el-dialog>
+    </div>
 </template>
 <script>
 export default {
@@ -58,7 +60,7 @@ export default {
 <style lang="less" scoped>
 .pic-list {
     width: 100%;
-    height: 700px;
+    // height: 700px;
     display: flex;
     justify-content: space-between;
     .pic-left {
@@ -115,7 +117,13 @@ export default {
 }
 </style>
 <style lang="less">
-.el-dialog__body {
-    padding: 0;
+.tpyl {
+    .el-dialog {
+        height: 80%;
+        margin-top: 5vh !important;
+    }
+    .el-dialog__body {
+        padding: 0;
+    }
 }
 </style>

+ 8 - 3
src/components/Rotation/src/rotation.vue

@@ -6,7 +6,10 @@
 <template>
     <div class='rotation'>
         <div v-if='rotationImg.length==1' height='100%'>
-            <img src='../../../assets/imgs/survey_pop1.png' alt />
+            <!-- <img
+                src='https://ss0.bdstatic.com/94oJfD_bAAcT8t7mm9GUKT-xh_/timg?image&quality=100&size=b4000_4000&sec=1592807833&di=5adf17cda9f46c37696da5b1d0aec9dc&src=http://a3.att.hudong.com/14/75/01300000164186121366756803686.jpg'
+                alt
+            />-->
         </div>
         <el-carousel v-else trigger='click' style='height:100%' :interval='5000' arrow='always'>
             <el-carousel-item v-for='(item,index) in rotationImg' :key='index'>
@@ -14,13 +17,15 @@
             </el-carousel-item>
         </el-carousel>
     </div>
-</template>
+</template>s
 <script>
 export default {
     name: 'Rotation',
     props: ['rotationImg'],
     data() {
-        return {}
+        return {
+            rotationImgs: [{ url: require('@/assets/images/login_back.png') }]
+        }
     },
     mounted() {
         console.log(this.rotationImg)

+ 20 - 11
src/components/editLengend.vue

@@ -7,7 +7,7 @@
     <div class='view'>
         <div class='legend-tab2'>
             <div class='legend-table2-box'>
-                <div class='legend-table2' v-if='editTable.length>0'>
+                <div class='legend-table2' v-if='editTable.length>=0'>
                     <el-table
                         v-loading='loading'
                         :header-cell-style='{background:"rgba(2,91,170,0.1)",fontFamily:"PingFangSC-Medium,PingFang SC;",color:"rgba(0,0,0,0.85);",fontSize:"12px"}'
@@ -22,20 +22,29 @@
                         </el-table-column>
                         <el-table-column prop label='数量'>
                             <template slot-scope='{row}'>
-                                <div style='width:50px' v-if='row.Num==0'>
-                                    <el-input @change='changeTable(row)' v-model='row.Num' size='mini'></el-input>
-                                </div>
-                                <div v-else-if='row.Num==1' class='nullData'>
-                                    <el-input @change='changeTable(row)' v-model='row.Num' size='mini'></el-input>
-                                </div>
-                                <div v-else-if='row.Num==2' class='redData'>
-                                    <el-tooltip class='item' effect='dark' :content='`当前图例 ${row.Num} 与平面图中的不一致,平面图中为xx`' placement='top'>
+                                <div v-if='row.IsModify'>
+                                    <div v-if='row.Num!=row.RealNum ' class='redData'>
+                                        <el-tooltip class='item' effect='dark' :content='`当前图例 ${row.Num} 与平面图中的不一致,平面图中为xx`' placement='top'>
+                                            <el-input @change='changeTable(row)' v-model='row.Num' size='mini'></el-input>
+                                        </el-tooltip>
+                                    </div>
+                                    <div v-else-if='!row.Num' class='nullData'>
                                         <el-input @change='changeTable(row)' v-model='row.Num' size='mini'></el-input>
-                                    </el-tooltip>
+                                    </div>
+                                    <div v-else style='width:50px'>
+                                        <el-input @change='changeTable(row)' v-model='row.Num' size='mini'></el-input>
+                                    </div>
                                 </div>
+
                                 <!-- 第二部分数据 -->
                                 <div v-else>
-                                    <el-tooltip class='item' effect='dark' :content='`当前图例 ${row.Num},从平面图中直接获取,如需编辑请修改平面图`' placement='top'>
+                                    <el-tooltip
+                                        v-if='!row.IsModify'
+                                        class='item'
+                                        effect='dark'
+                                        :content='`当前图例 ${row.Num},从平面图中直接获取,如需编辑请修改平面图`'
+                                        placement='top'
+                                    >
                                         <div class='dataTwo'>{{row.Num}}</div>
                                     </el-tooltip>
                                 </div>

+ 30 - 18
src/components/floorList.vue

@@ -45,7 +45,7 @@ export default {
         }
     },
     mounted() {
-        this.removeBottom(-5)
+        this.removeBottom(-1)
         this.tabFloor()
     },
     computed: {
@@ -53,9 +53,13 @@ export default {
     },
     methods: {
         tabFloor(item = this.floor, index) {
-            console.log(item)
-            this.showT = true
-            this.showB = true
+            console.log(this.num)
+            if (this.num <= -1) {
+                this.showT = true
+            }
+            if (this.num > -1) {
+                this.showB = true
+            }
             this.$cookie.set('floorNow', item.code, 3)
             this.$cookie.set('floorMapId', item.gname, 3)
             this.floorId = this.$cookie.get('floorNow') || item.code
@@ -63,7 +67,12 @@ export default {
             this.$emit('emitFloor', item)
         },
         removeTop(num) {
-            this.num = num
+            console.log(num)
+            if (num == -1) {
+                this.num = num
+                this.showT = false
+                this.showB = true
+            }
             var inner = document.querySelectorAll('.floor-item')
             var innerbox = document.querySelector('.floor-center')
             if (this.num < 0) {
@@ -73,12 +82,17 @@ export default {
                 this.showT = false
             }
             if (this.num <= 0) {
-                animate(innerbox, { marginTop: 28 * this.num }, 500, function() {})
+                animate(innerbox, { marginTop: 32 * this.num }, 500, function() {})
             }
         },
         removeBottom(num) {
             console.log(num)
-            this.num = num
+            // let num = 0
+            if (num == -2) {
+                this.num = num
+                this.showB = false
+                this.showT = true
+            }
             var inner = document.querySelectorAll('.floor-item')
             var innerbox = document.querySelector('.floor-center')
             if (this.num > -(inner.length - 4)) {
@@ -88,7 +102,7 @@ export default {
                 this.showB = false
             }
             if (this.num > -(inner.length - 4)) {
-                animate(innerbox, { marginTop: 28 * this.num }, 500, function() {})
+                animate(innerbox, { marginTop: 32 * this.num }, 500, function() {})
             }
         }
     }
@@ -112,17 +126,16 @@ export default {
         .floor-out {
             height: 160px;
             overflow: hidden;
-            overflow-y: auto;
+            // overflow-y: auto;
             position: relative;
-            &::-webkit-scrollbar {
-                display: none;
-            }
+            // &::-webkit-scrollbar {
+            //     display: none;
+            // }
 
             .floor-center {
                 .floor-item {
                     width: 36px;
-                    height: 28px;
-                    margin: 3px 0;
+                    height: 32px;
                     cursor: pointer;
                 }
             }
@@ -139,7 +152,7 @@ export default {
             right: 0;
             width: 100%;
             cursor: pointer;
-            margin-top: 5px;
+            line-height: 26px;
         }
         .icon-bottom {
             text-align: center;
@@ -151,15 +164,14 @@ export default {
             bottom: 0;
             right: 0;
             width: 100%;
-            margin-bottom: 5px;
             cursor: pointer;
-            line-height: 28px;
+            line-height: 26px;
         }
         .isActive {
             border-radius: 4px;
             color: #025baa;
             background: #e1f2ff;
-            line-height: 28px;
+            line-height: 32px;
         }
     }
 }

+ 12 - 10
src/components/floorMap/index.vue

@@ -1,7 +1,7 @@
 <!-- 底图 -->
 <template>
     <div id='floor_base' v-loading='loading' ref='graphy'>
-        <div :id='`fengMap${id}`' class="fengMap"></div>
+        <div :id='`fengMap${id}`' class='fengMap'></div>
         <canvas :id='`canvas${id}`' :width='canvasWidth' :height='canvasHeight' tabindex='0'></canvas>
         <!-- 地图底部操作按钮 -->
         <div class='strip-bottom'>
@@ -32,18 +32,19 @@ export default {
             mapServerURL: `/wdfn`,
             canvasWidth: 1100,
             canvasHeight: 800,
-            loading: false,// 限制重复查询
+            loading: false, // 限制重复查询
             view: null,
             urlMsg: {},
             canvasID: 'canvas'
-            // fmapID:'1001012_42'
+            // fmapID:'1001012_42',
         }
     },
-    props:{
-        id:{
+    props: {
+        id: {
             default: '1',
             type: String
-        }
+        },
+        loadName: ''
     },
     components: { RoomBox, canvasFun },
     computed: {
@@ -70,7 +71,7 @@ export default {
             this.clearGraphy()
             this.scene = new FloorScene()
             this.scene.selectContainer.connect('listChange', this, this.listChange)
-            if (!fengmap || this.canvasID!=`canvas${this.id}`) {
+            if (!fengmap || this.canvasID != `canvas${this.id}`) {
                 this.canvasID = `canvas${this.id}`
                 fengmap = new SFengParser(`fengMap${this.id}`, `${this.mapServerURL}/fmap/${this.fmapID}`, this.key, this.appName, null)
                 fengmap.loadMap(this.fmapID, () => {
@@ -175,15 +176,16 @@ export default {
         },
         // 保存为png
         savePng() {
-            this.view.saveImage(`1.png`, 'png')
+            this.view.saveImage(`${this.loadName}.png`, 'png')
+            console.log(`${this.loadName}.png`)
         },
         // 保存为svg
         saveSvg() {
-            this.view.saveSceneSvg(`1.svg`, 6400, 4800)
+            this.view.saveSceneSvg(`${this.loadName}.svg`, 6400, 4800)
         },
         // 保存为json
         saveJson() {
-            this.view.saveFloorJson(`1.json`)
+            this.view.saveFloorJson(`${this.loadName}.json`)
         },
         // 缩放
         scale(val) {

+ 2 - 2
src/components/legendremarks.vue

@@ -49,8 +49,8 @@ export default {
         markUpdate(val) {
             let params = {
                 postParams: {
-                    graphId: '1',
-                    projectId: '1',
+                    graphId: this.$cookie.get('graphId'),
+                    projectId: this.$store.state.plazaId,
                     Note: val
                 }
             }

+ 5 - 2
src/views/equipment/eqDialog.vue

@@ -15,7 +15,7 @@
             <!-- 没有tab的页面 -->
             <div v-if='Object.keys(dialogInfo).length>0 && dialogInfo.children.length==0' style='margin:16px 24px 0 24px'>
                 <!-- 原理图 -->
-                <div v-if='dialogInfo.id.slice(2,4)=="YL"' style='width:100%;height:600px;overflow:hidden'>
+                <div v-if='dialogInfo.id.slice(2,4)=="YL"' style='width:100%;height:90vh;overflow:hidden'>
                     <rotation :rotationImg='rotationImg'></rotation>
                 </div>
                 <!-- 土建系统主要材料清单 -->
@@ -179,7 +179,7 @@ export default {
                 case '消防系统':
                     getParams.system = '1003'
                     break
-                case '弱系统':
+                case '弱系统':
                     getParams.system = '1004'
                     break
                 case '电梯系统':
@@ -188,6 +188,9 @@ export default {
                 case '燃气系统':
                     getParams.system = '1007'
                     break
+                case '土建系统':
+                    getParams.system = '1008'
+                    break
             }
             if (this.systemName == '给排水系统') {
                 getParams.system = '1005'

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

@@ -34,7 +34,7 @@
                         <div class='legend-boxs'>
                             <Legend :systemName='systemName'></Legend>
                         </div>
-                        <floorMap ref='floorMap' :id="'equip'"></floorMap>
+                        <floorMap ref='floorMap' :id='"equip"' :loadName='loadName'></floorMap>
                         <div class='additional-box' v-if='fqPic.length>0'>
                             <div class='additional' @click='additionalColl'>
                                 <img src='../../assets/imgs/bg.png' alt />
@@ -78,7 +78,8 @@ export default {
             brand: [], //品牌
             manufacturer: [],
             show: false,
-            fqPic: []
+            fqPic: [],
+            loadName: ''
         }
     },
     components: { floorList, eqDialog, floorMap, editList },
@@ -94,11 +95,13 @@ export default {
             if (this.smsxt == '1003' || this.smsxt == '1004') {
                 this.Index()
             }
+            this.init()
         },
         emitFloor(item) {
             console.log('item', item)
             this.floorInfo = item
             this.$refs.floorMap.init(this.floorInfo.gname)
+            this.init()
         },
         dialogVisible(eve) {
             console.log(eve)
@@ -121,11 +124,15 @@ export default {
                 console.log('分区图', res)
                 this.fqPic = res.data
             })
+        },
+        init() {
+            this.loadName = `设备设施-${this.systemName}-${this.floorInfo.code}`
         }
     },
     mounted() {
         this.everySystem = this.system[0].children
-        // this.$refs.floorMap.init(this.floorInfo.gname)
+        this.init()
+        this.$refs.floorMap.init(this.floorInfo.gname)
     }
 }
 </script>

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

@@ -7,7 +7,7 @@
         <div class='legend-boxs'>
             <Legend></Legend>
         </div>
-        <floor-list @emitFloor='emitFloor' :id="'floor'"></floor-list>
+        <floor-list @emitFloor='emitFloor' :id='"floor"'></floor-list>
         <!-- <div class='additional-box'>
             <div class='additional' @click='additionalColl'>
                 <img src='../../assets/imgs/bg.png' alt />
@@ -16,7 +16,7 @@
                 <div v-if='show' class='add-img'>我是放附加数据图片哒。。。</div>
             </el-collapse-transition>
         </div>-->
-        <floorMap ref='floorMap'></floorMap>
+        <floorMap ref='floorMap' :loadName='loadName'></floorMap>
     </div>
 </template>
 <script>
@@ -31,20 +31,26 @@ export default {
             floorInfo: {
                 gname: 'f1',
                 code: 'F1'
-            }
+            },
+            loadName: ''
         }
     },
     methods: {
         emitFloor(item) {
             this.floorInfo = item
             this.$refs.floorMap.init(this.floorInfo.gname)
+            this.init()
         },
         additionalColl() {
             this.show = !this.show
+        },
+        init() {
+            this.loadName = `楼层功能-${this.floorInfo.code}`
         }
     },
     mounted() {
-        // this.$refs.floorMap.init(this.floorInfo.gname)
+        this.init()
+        this.$refs.floorMap.init(this.floorInfo.gname)
     }
 }
 </script>

+ 28 - 13
src/views/overview/picModal.vue

@@ -1,8 +1,14 @@
 <template>
-    <el-dialog :visible.sync='dialogVisible' width='90%' :close-on-click-modal='false' :show-close='false'>
-        <rotation v-if='rotationImg.length>0' :rotationImg='rotationImg' style='height:600px;'></rotation>
-        <span class='close' @click='close'>X</span>
-    </el-dialog>
+    <div class='picDia'>
+        <el-dialog :visible.sync='dialogVisible' width='90%' :close-on-click-modal='false' :show-close='false'>
+            <!-- <img
+                src='https://ss0.bdstatic.com/94oJfD_bAAcT8t7mm9GUKT-xh_/timg?image&quality=100&size=b4000_4000&sec=1592807833&di=5adf17cda9f46c37696da5b1d0aec9dc&src=http://a3.att.hudong.com/14/75/01300000164186121366756803686.jpg'
+                alt
+            />-->
+            <rotation v-if='rotationImg.length>0' :rotationImg='rotationImg' style='height:700px;'></rotation>
+            <span class='close' @click='close'>X</span>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
@@ -27,26 +33,35 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.picDia {
+    img {
+        width: 100%;
+        height: 100%;
+    }
+}
 .close {
     display: block;
     position: absolute;
     right: -40px;
     font-size: 20px;
     color: #fff;
-    top: -100px;
+    top: -30px;
     z-index: 10;
     cursor: pointer;
 }
 </style>
 <style lang='less'>
-.el-dialog {
-    height: 600px;
-    position: relative;
-    .el-dialog__header {
-        padding: 0;
-    }
-    .el-dialog__body {
-        padding: 0;
+.picDia {
+    .el-dialog {
+        height: 90%;
+        margin-top: 5vh !important;
+        position: relative;
+        .el-dialog__header {
+            padding: 0;
+        }
+        .el-dialog__body {
+            padding: 0;
+        }
     }
 }
 </style>

+ 14 - 3
src/views/room/index.vue

@@ -7,7 +7,7 @@
     <div class='compute-box'>
         <el-dialog :title='`${systemName}`||"机房"' :visible.sync='visible' :fullscreen='true'>
             <div class='compute-span'></div>
-            <div class='compute-zf'></div>
+            <div class='compute-zf' @click='jumpFloor'></div>
             <div class='compute-tab'>
                 <el-tabs v-model='activeName' @tab-click='handleClick'>
                     <el-tab-pane label='机房布置图' name='1'>
@@ -474,7 +474,8 @@ export default {
             rwksrq: '',
             rwwcrq: '',
             ycgdtbsj: '',
-            ycgdyssj: ''
+            ycgdyssj: '',
+            smsxtArr: []
         }
     },
     components: {
@@ -807,6 +808,7 @@ export default {
             })
         },
         init() {
+            this.smsxtArr = []
             let params = {
                 getParams: {
                     locationid: '5209',
@@ -814,12 +816,20 @@ export default {
                 }
             }
             querySystem(params).then(res => {
-                console.log('系统', res)
+                console.log('系统', res.data[0])
+                this.smsxtArr = res.data[0]
             })
         },
         open(name) {
             this.visible = true
             this.systemName = name
+        },
+        jumpFloor() {
+            if (location.pathname.split('/')[3] == 'equipment') {
+                this.$router.push({ path: '/home/floorFunc' })
+            } else {
+                this.$router.push({ path: '/home/equipment' })
+            }
         }
     },
     mounted() {
@@ -926,6 +936,7 @@ export default {
 .compute-box {
     .el-dialog {
         padding: 16px 20px 20px;
+        overflow: hidden;
         .el-dialog__header {
             padding: 0;
             font-size: 16px;

+ 8 - 11
src/views/room/room1.vue

@@ -1,8 +1,6 @@
 <template>
-    <div class='jf-box'>
-        <div class='jf-inner'>
-            <rotation :rotationImg='tableImg'></rotation>
-        </div>
+    <div class='jf-inner' style='width:100%;height:85vh;overflow:hidden'>
+        <rotation :rotationImg='tableImg'></rotation>
     </div>
 </template>
 <script>
@@ -18,13 +16,12 @@ export default {
 }
 </script>
 <style lang="less" scoped>
-.jf-box {
-    .jf-inner {
-        width: 1076px;
-        height: 566px;
-        margin: 0 auto;
-        margin-top: 8px;
-    }
+.jf-inner {
+    width: 100%;
+    height: 700px;
+    overflow: hidden;
+    margin: 0 auto;
+    margin-top: 8px;
 }
 </style>
 <style lang="less">