ソースを参照

Merge branch 'develop' of http://39.106.8.246:3003/web/wanda-bm-guide into develop

YaolongHan 4 年 前
コミット
c6dd605687

+ 32 - 0
src/components/Legend/src/legend.vue

@@ -173,6 +173,13 @@ export default {
         innerLeng: {
             type: Number,
             default: 0
+        },
+        // 弹窗组件内部传入的楼层信息
+        floorInfo: {
+            type: Object,
+            default() {
+                return {}
+            }
         }
     },
     components: { lengendView, legendRemarks, lengendEdit },
@@ -201,6 +208,19 @@ export default {
                 }
             },
             deep: true
+        },
+        // 弹窗组件内传入floorInfo,查询 getDraftNum
+        floorInfo: {
+            handler(newV,oldV) {
+                 if (newV !== oldV) {
+                    clearInterval(this.timer)
+                    this.getDraftNum()
+                    this.timer = setInterval(() => {
+                        this.getDraftNum()
+                    }, this.interval)
+                }
+            },
+            deep: true
         }
     },
     '$refs.viewLengend': {
@@ -217,6 +237,8 @@ export default {
             let res = null,
                 floorId = this.$store.state.currentFloor.gname || this.$cookie.get('floorMapId'),
                 categoryId = this.categoryId || this.$cookie.get('categoryId')
+            // 弹窗组件内传入floorInfo,使用其楼层id
+            this.floorInfo.gname && (floorId = this.floorInfo.gname)
             // 增加校验 floorId,防止上传 undefined
             if (!floorId) {
                 return true
@@ -325,6 +347,12 @@ export default {
             const editerUrl = conf[process.env.NODE_ENV + '_editerUrl']
             let floorName = this.floorName ? this.floorName : this.$cookie.get('floorNow')
             let seq = this.$cookie.get('currentFloorId')
+            // 弹窗组件内传入floorInfo,使用其楼层id
+            if (this.floorInfo.gname) {
+                FloorID = this.floorInfo.gname
+                floorName = this.floorInfo.code
+                seq = this.floorInfo.seq
+            }
             let data = `categoryId=${categoryId}&projectId=${this.plazaId}&BuildingID=1&FloorID=${FloorID}&FloorName=${floorName}&fmapID=${this.fmapID}&seq=${seq}&token=${this.ssoToken}`
             let url = editerUrl + 'editer?' + encodeURIComponent(data)
             window.open(url, true)
@@ -350,6 +378,8 @@ export default {
                 buildingId: '1',
                 floorId: this.$store.state.currentFloor.gname
             }
+            // 弹窗组件内传入floorInfo,使用其楼层id
+            this.floorInfo.gname && (data.floorId = this.floorInfo.gname)
             queryStatis({ data, postParams }).then(res => {
                 this.loading = false
                 let viewTable = []
@@ -402,6 +432,8 @@ export default {
                 buildingId: '1',
                 floorId: this.$store.state.currentFloor.gname
             }
+            // 弹窗组件内传入floorInfo,使用其楼层id
+            this.floorInfo.gname && (data.floorId = this.floorInfo.gname)
             queryStatis({ data, postParams }).then(res => {
                 this.loading1 = false
                 this.editTable = res.data.Data ? res.data.Data : []

+ 3 - 3
src/components/floorList.vue

@@ -6,12 +6,12 @@
 <template>
     <div class='floor-box'>
         <div class='floor-list'>
-            <div class='icon-top' v-if='floorsArr.length>showNumber'>
+            <div class='icon-top' v-if='floorsArr.length>8'>
                 <!-- @click='changeFloor(1,currIndex)' -->
                 <img v-show='parseInt(marginTop) !== 0' v-repeat-click='increase' src='@/assets/imgs/iconBlackTop.png' alt />
                 <img class='disabled' v-show='parseInt(marginTop) === 0' src='@/assets/imgs/iconLightTop.png' alt />
             </div>
-            <div class='floor-out' :style='{ maxHeight:conHeight + "px;" }'>
+            <div class='floor-out' :style='{ height:conHeight + "px" }'>
                 <!--  放开marginTop样式  -->
                 <div class='floor-center' :style='{ marginTop : marginTop }'>
                     <div
@@ -23,7 +23,7 @@
                     >{{item.code}}</div>
                 </div>
             </div>
-            <div class='icon-bottom' v-if='floorsArr.length>showNumber'>
+            <div class='icon-bottom' v-if='floorsArr.length>8'>
                 <!-- v-repeat-click='decrease' -->
                 <img v-show='parseInt(marginTop) !== marginTopMax' v-repeat-click='decrease' src='@/assets/imgs/iconBlackBottom.png' alt />
                 <img class='disabled' v-show='parseInt(marginTop) === marginTopMax' src='@/assets/imgs/iconLightBottom.png' alt />

+ 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>

+ 104 - 100
src/components/floorMap/index.vue

@@ -12,7 +12,7 @@
 </template>
 <script>
 import { SFengParser } from '@saga-web/feng-map'
-import { SFloorParser, ItemOrder } from '@saga-web/big'
+import { SFloorParser, ItemOrder, ItemColor } from '@saga-web/big'
 import { FloorView } from '@/lib/FloorView'
 import { FloorScene } from '@/lib/FloorScene'
 import RoomBox from '@/views/room/index'
@@ -22,6 +22,7 @@ import { queryShops } from '@/api/equipmentList.js'
 import { STopologyParser } from '@/lib/parsers/STopologyParser'
 import { mapGetters, mapActions } from 'vuex'
 import { SImageItem, SImageShowType } from '@saga-web/graph/lib'
+import { SColor } from '@saga-web/draw/lib'
 import bus from '@/utils/bus.js'
 
 // import { uuid } from "@/components/mapClass/until";
@@ -71,7 +72,7 @@ export default {
             this.loading = true
             this.floorid = floorid
             this.mapSize()
-            this.$refs.canvasFun.isShow = false;
+            this.$refs.canvasFun.isShow = false
             setTimeout(() => {
                 this.clearGraphy()
                 this.scene = new FloorScene()
@@ -81,11 +82,11 @@ export default {
                         this.canvasID = `canvas${this.id}`
                     }
                     this.parserData(floorid)
-                }else if(this.haveFengMap == 0){
-                   this.view.scene = this.scene;
-                   this.readGraph()
-                }else{
-                  this.loading = false
+                } else if (this.haveFengMap == 0) {
+                    this.view.scene = this.scene
+                    this.readGraph()
+                } else {
+                    this.loading = false
                 }
             }, 100)
         },
@@ -94,9 +95,9 @@ export default {
                 // 屋顶
                 if (window.fengmapData.frImg) {
                     let imgItem = new SImageItem(null, `${this.mapServerURL}/webtheme/${this.fmapID}/${window.fengmapData.frImg}`)
-                    imgItem.showType = SImageShowType.AutoFit;
-                    imgItem.connect('imgLoadOver',this,()=> {
-                        this.readGraph();
+                    imgItem.showType = SImageShowType.AutoFit
+                    imgItem.connect('imgLoadOver', this, () => {
+                        this.readGraph()
                     })
                     this.scene.addItem(imgItem)
                     this.view.scene = this.scene
@@ -114,7 +115,7 @@ export default {
                         this.fParser.spaceList.forEach(t => {
                             this.scene.addItem(t)
                             t.nameSize = 12
-                            t.nameColor = '#2a2a2a';
+                            t.nameColor = '#2a2a2a'
                             if (t.data.Name && this.bunkObj[t.data.Name]) {
                                 t.name = this.bunkObj[t.data.Name].brandname
                             } else {
@@ -136,105 +137,107 @@ export default {
                 }
             }
         },
-        readGraph(){
-            this.readGroup(this.floorid).then(data => {
-                if (data.Result == 'failure') {
-                    this.$store.commit('SETISMESSAGE', false)
-                    this.view.fitSceneToView()
-                    this.view.minScale = this.view.scale
-                    if (this.$refs.canvasFun) {
-                        this.$refs.canvasFun.everyScale = this.view.scale
-                    }
-                    this.loading = false;
-                    return
-                } else {
-                    if (
-                        data.Data[0].Elements.Nodes.length === 0 &&
-                        data.Data[0].Elements.Markers.length === 0 &&
-                        data.Data[0].Elements.Relations.length === 0
-                    ) {
+        readGraph() {
+            this.readGroup(this.floorid)
+                .then(data => {
+                    if (data.Result == 'failure') {
                         this.$store.commit('SETISMESSAGE', false)
+                        this.view.fitSceneToView()
+                        this.view.minScale = this.view.scale
+                        if (this.$refs.canvasFun) {
+                            this.$refs.canvasFun.everyScale = this.view.scale
+                        }
+                        this.loading = false
+                        return
                     } else {
-                        this.$store.commit('SETISMESSAGE', true)
+                        if (
+                            data.Data[0].Elements.Nodes.length === 0 &&
+                            data.Data[0].Elements.Markers.length === 0 &&
+                            data.Data[0].Elements.Relations.length === 0
+                        ) {
+                            this.$store.commit('SETISMESSAGE', false)
+                        } else {
+                            this.$store.commit('SETISMESSAGE', true)
+                        }
                     }
-                }
-                // 无返回Data处理
-                if (!(data.Data && data.Data.length)) {
+                    // 无返回Data处理
+                    if (!(data.Data && data.Data.length)) {
+                        this.view.fitSceneToView()
+                        this.view.minScale = this.view.scale
+                        if (this.$refs.canvasFun) {
+                            this.$refs.canvasFun.everyScale = this.view.scale
+                        }
+                        return false
+                    }
+                    // 请求回来的备注
+                    if (data.Data && data.Data[0].Note) {
+                        let note = data.Data[0].Note
+                        bus.$emit('queryRemarksMethods', note)
+                    } else {
+                        bus.$emit('queryRemarksMethods', '')
+                    }
+                    //土建装饰的图例展示
+                    if (this.$cookie.get('categoryId') == 'SCPZ') {
+                        let scpzTable = [],
+                            arr = []
+                        scpzTable = data.Data[0].Elements.Nodes || []
+                        console.log(scpzTable)
+                        if (scpzTable.length > 0) {
+                            scpzTable.forEach(e => {
+                                if (e.Properties.ItemExplain) {
+                                    let obj = e
+                                    arr.push(obj)
+                                }
+                            })
+                        }
+                        console.log(arr)
+                        this.$store.commit('SETSCPZTABLE', arr)
+                    }
+                    // 放到后边 $cookie graphId
+                    this.$cookie.set('graphId', data.Data[0].ID, 3)
+                    if (this.$cookie.get('graphId')) {
+                        // 得到graphId 就请求图例
+                        // 除土建装饰之外的图例展示 包括楼层功能
+                        bus.$emit('queryViewMethods')
+                    }
+                    this.topologyParser = new STopologyParser(null)
+                    this.topologyParser.parseData(data.Data[0].Elements)
+                    // 多边形
+                    this.topologyParser.zoneLegendList.forEach(t => {
+                        this.scene.addItem(t)
+                    })
+                    // 增加文字
+                    this.topologyParser.textMarkerList.forEach(t => {
+                        this.scene.addItem(t)
+                    })
+                    // 增加图片
+                    this.topologyParser.imageMarkerList.forEach(t => {
+                        this.scene.addItem(t)
+                    })
+                    // 增加直线
+                    this.topologyParser.lineMarkerList.forEach(t => {
+                        this.scene.addItem(t)
+                    })
+                    // 增加图标类图例
+                    this.topologyParser.imageLegendList.forEach(t => {
+                        this.scene.addItem(t)
+                    })
+                    // 增加管线类
+                    // 增加图标类图例
+                    this.topologyParser.relationList.forEach(t => {
+                        t.selectable = true
+                        this.scene.addItem(t)
+                    })
                     this.view.fitSceneToView()
                     this.view.minScale = this.view.scale
                     if (this.$refs.canvasFun) {
                         this.$refs.canvasFun.everyScale = this.view.scale
                     }
-                    return false
-                }
-                // 请求回来的备注
-                if (data.Data && data.Data[0].Note) {
-                    let note = data.Data[0].Note
-                    bus.$emit('queryRemarksMethods', note)
-                } else {
-                    bus.$emit('queryRemarksMethods', '')
-                }
-                //土建装饰的图例展示
-                if (this.$cookie.get('categoryId') == 'SCPZ') {
-                    let scpzTable = [],
-                        arr = []
-                    scpzTable = data.Data[0].Elements.Nodes || []
-                    console.log(scpzTable)
-                    if (scpzTable.length > 0) {
-                        scpzTable.forEach(e => {
-                            if (e.Properties.ItemExplain) {
-                                let obj = e
-                                arr.push(obj)
-                            }
-                        })
-                    }
-                    console.log(arr)
-                    this.$store.commit('SETSCPZTABLE', arr)
-                }
-                // 放到后边 $cookie graphId
-                this.$cookie.set('graphId', data.Data[0].ID, 3)
-                if (this.$cookie.get('graphId')) {
-                    // 得到graphId 就请求图例
-                    // 除土建装饰之外的图例展示 包括楼层功能
-                    bus.$emit('queryViewMethods')
-                }
-                this.topologyParser = new STopologyParser(null)
-                this.topologyParser.parseData(data.Data[0].Elements)
-                // 多边形
-                this.topologyParser.zoneLegendList.forEach(t => {
-                    this.scene.addItem(t)
-                })
-                // 增加文字
-                this.topologyParser.textMarkerList.forEach(t => {
-                    this.scene.addItem(t)
-                })
-                // 增加图片
-                this.topologyParser.imageMarkerList.forEach(t => {
-                    this.scene.addItem(t)
+                    this.loading = false
                 })
-                // 增加直线
-                this.topologyParser.lineMarkerList.forEach(t => {
-                    this.scene.addItem(t)
+                .catch(() => {
+                    this.loading = false
                 })
-                // 增加图标类图例
-                this.topologyParser.imageLegendList.forEach(t => {
-                    this.scene.addItem(t)
-                })
-                // 增加管线类
-                // 增加图标类图例
-                this.topologyParser.relationList.forEach(t => {
-                    t.selectable = true
-                    this.scene.addItem(t)
-                })
-                this.view.fitSceneToView()
-                this.view.minScale = this.view.scale
-                if (this.$refs.canvasFun) {
-                    this.$refs.canvasFun.everyScale = this.view.scale
-                }
-                this.loading = false;
-            }).catch(()=>{
-                this.loading = false
-            })
         },
         clearGraphy() {
             if (this.view) {
@@ -318,6 +321,7 @@ export default {
         },
         // 清除电井关联商铺的高亮状态
         clearHightLight() {
+            ItemColor.spaceHighColor = new SColor('#FBF2CC')
             for (let key in this.wellMap) {
                 this.wellMap[key].forEach(item => {
                     item.highLightFlag = false

ファイルの差分が大きいため隠しています
+ 366 - 366
src/utils/plugins/components.js


+ 11 - 9
src/views/equipment/eqDialog.vue

@@ -16,7 +16,7 @@
                 />
             </div>
             <!-- 没有tab的页面 -->
-            <div v-if='Object.keys(dialogInfo).length>0 && dialogInfo.children.length==0' style='margin:16px 0 0 24px;height:100%'>
+            <div v-if='Object.keys(dialogInfo).length>0 && dialogInfo.children.length==0' style='padding-top:16px;height:100%'>
                 <!-- 原理图 -->
                 <div v-if='dialogInfo.id.slice(2,4)=="YL"' style='width:100%;overflow:auto;height:100%;margin:0 auto'>
                     <rotation type='3' v-if='rotationImg.length>0' :size='sizePic' :rotationImg='rotationImg'></rotation>
@@ -37,7 +37,7 @@
                 <look-page v-else-if='dialogInfo.id.slice(2,4)=="TZ"' param major></look-page>
             </div>
             <!-- 有tab的页面 -->
-            <div v-else style='margin:16px 0 0 24px;height:100%;'>
+            <div v-else style='padding-top:16px;height:100%;'>
                 <el-tabs v-model='activeName' @tab-click='handleClick' v-if='Object.keys(dialogInfo).length>0 && dialogInfo.children.length>0'>
                     <el-tab-pane
                         v-for='(value,index) in dialogInfo.children'
@@ -332,7 +332,7 @@ export default {
     }
     .el-dialog__body {
         padding: 0 24px;
-        height: 90%;
+        height: calc(100% - 57px);
     }
     .el-tabs--bottom .el-tabs__item.is-bottom:nth-child(2),
     .el-tabs--bottom .el-tabs__item.is-top:nth-child(2),
@@ -349,7 +349,9 @@ export default {
     .el-tabs__nav-wrap::after {
         height: 0;
     }
-    .el-tabs,
+    .el-tabs {
+        height: 100%;
+    }
     .el-tabs__content {
         height: calc(100% - 45px);
         /deep/ .el-tab-pane > div {
@@ -432,11 +434,11 @@ export default {
         }
     }
 }
-@media screen and (max-width: 1366px) {
+@media screen and (max-width: 1600px) {
     /*当屏幕尺寸小于1366px时,应用下面的CSS样式*/
-    .el-tabs,
-    .el-tabs__content {
-        height: 700px;
-    }
+    // .el-tabs,
+    // .el-tabs__content {
+    //     height: 530px !important;
+    // }
 }
 </style>

+ 1 - 1
src/views/equipment/fenbuPic.vue

@@ -2,7 +2,7 @@
     <div class='fenbu-box'>
         <!-- 图例 -->
         <div class='legend-boxs'>
-            <Legend :innerLeng='1' :floors='floors' type='0' :categoryId='`${typecode=="FBT1"?"FZQZL":"XFBFYCFL"}`'></Legend>
+            <Legend :innerLeng='1' :floorInfo="floorInfo"  :floors='floors' type='0' :categoryId='`${typecode=="FBT1"?"FZQZL":"XFBFYCFL"}`'></Legend>
             <floor-list v-if='floors.length>0' :changeDataFlag='false' :floorsArr='floors' @emitFloor='emitFloor' :id='"floor"'></floor-list>
         </div>
         <div v-show='floors.length>0' class='canvas-box'>

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

@@ -527,4 +527,9 @@ export default {
         white-space: nowrap;
     }
 }
+@media screen and (max-width: 1600px) {
+    .el-table td {
+        padding: 4px 0;
+    }
+}
 </style>

+ 1 - 2
src/views/equipment/table/djspTable.vue

@@ -151,8 +151,7 @@ export default {
         }
     },
     mounted() {
-        console.log('商铺电表数 mounted')
-        this.floor = this.$cookie.get('floorMapId')
+        // this.floor = this.$cookie.get('floorMapId')
         console.log(this.floor)
         this.getList()
     }

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

@@ -305,8 +305,8 @@ export default {
 </script>
 <style lang="less" scoped>
 .gdqd-dialog {
-    padding: 16px 24px 40px;
-    height: 610px;
+    // padding: 16px 24px 40px;
+    // height: 610px;
     .gdqd-dialog-top {
         display: flex;
         margin-bottom: 12px;
@@ -323,6 +323,11 @@ export default {
         margin-top: 28px;
     }
 }
+@media screen and (max-width: 1600px) {
+    .gdqd-dialog td {
+        padding: 4px 0;
+    }
+}
 </style>
 <style lang="less">
 </style>

+ 55 - 28
src/views/equipment/table/eqListTable.vue

@@ -43,30 +43,32 @@
                 style='width:192px;'
             ></el-input>
         </div>
-        <el-table :data='tableData' style='width: 100%' :border='true' @row-click='rowHandle'>
-            <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
-            <el-table-column prop='type_name' label='设备名称' show-overflow-tooltip resizable width='250'>
-                <template slot-scope='{row}'>{{row.type_name || '--'}}</template>
-            </el-table-column>
-            <el-table-column prop='sl' label='数量' width='100'>
-                <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
-            </el-table-column>
-            <el-table-column prop='brand' label='品牌' width='120'>
-                <template slot-scope='{row}'>{{row.brand || '--'}}</template>
-            </el-table-column>
-            <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable width='150'>
-                <template slot-scope='{row}'>{{row.sbxh || '--'}}</template>
-            </el-table-column>
-            <el-table-column prop='floorcode' label='楼层' width='100'>
-                <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>
-            </el-table-column>
-            <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable min-width='300'>
-                <template slot-scope='{row}'>{{row.manufacturer || '--'}}</template>
-            </el-table-column>
-        </el-table>
+        <div ref='tableBox' style='height: calc(100% - 115px);'>
+            <el-table :data='tableData' :max-height='tableMaxHeight' style='width: 100%' :border='true' @row-click='rowHandle'>
+                <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
+                <el-table-column prop='type_name' label='设备名称' show-overflow-tooltip resizable width='250'>
+                    <template slot-scope='{row}'>{{row.type_name || '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='sl' label='数量' width='100'>
+                    <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
+                </el-table-column>
+                <el-table-column prop='brand' label='品牌' width='120'>
+                    <template slot-scope='{row}'>{{row.brand || '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable width='150'>
+                    <template slot-scope='{row}'>{{row.sbxh || '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='floorcode' label='楼层' width='240' show-overflow-tooltip resizable>
+                    <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>
+                </el-table-column>-->
+                <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable min-width='300'>
+                    <template slot-scope='{row}'>{{row.manufacturer || '--'}}</template>
+                </el-table-column>
+            </el-table>
+        </div>
         <div class='foot'>
             <el-pagination
                 background
@@ -104,13 +106,14 @@ export default {
             tableData: [],
             total: 0,
             currentPage: 1,
-            size: 11,
+            size: 10,
             innerVisible: false, //详情弹框
             keyword: '',
             manufacturer: '',
             sbjc: '',
             row: {},
             floor: '',
+            tableMaxHeight: 0,
             type_name: ''
         }
     },
@@ -171,6 +174,10 @@ export default {
             console.log(newV, oldV)
             if (newV !== oldV) {
                 this.getList()
+                this.$nextTick(() => {
+                    // 页面渲染完成后的回调
+                    this.tableMaxHeight = this.$refs.tableBox.offsetHeight
+                })
             }
         },
         /* floor(newV, oldV) {
@@ -189,10 +196,12 @@ export default {
         }
     },
     mounted() {
-        this.floor = this.$cookie.get('floorMapId')
+        // this.floor = this.$cookie.get('floorMapId')
         this.getList()
-        console.log(this.InfoName)
-        console.log(this.param)
+        this.$nextTick(() => {
+            // 页面渲染完成后的回调
+            this.tableMaxHeight = this.$refs.tableBox.offsetHeight
+        })
     }
 }
 </script>
@@ -214,4 +223,22 @@ export default {
         margin-top: 28px;
     }
 }
+@media screen and (max-width: 1600px) {
+    /deep/ .el-dialog__body {
+        padding: 0;
+    }
+    /deep/ .el-table td {
+        padding: 4px 0;
+    }
+    /deep/ .el-dialog {
+        margin-top: 5vh !important;
+    }
+}
+</style>
+<style lang="less">
+.eq-list {
+    /deep/.el-table tr {
+        cursor: pointer;
+    }
+}
 </style>

+ 1 - 1
src/views/equipment/table/inputDIalog.vue

@@ -3,7 +3,7 @@
         <div
             @click='show'
             style='color: #1F2429;cursor: pointer;position:absolute;z-index:9999;'
-            :style='`right:${type === 1 ? "48px" : "12px"};top:${type === 1 ? "102px" : "0px"};`'
+            :style='`right:${type === 1 ? "30px" : "12px"};top:${type === 1 ? "77px" : "0px"};`'
         >
             <img style='margin-right:4px;' src='@/assets/imgs/select.png' />
             <span>筛选</span>

+ 41 - 29
src/views/equipment/table/otherTable.vue

@@ -37,38 +37,41 @@
                 @change='getList'
             ></Select>
         </div>
-        <el-table :data='tableData' :border='true' style='width: 100%'>
-            <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
-            <el-table-column prop='lb' label='其他事项详情' align='center'>
-                <el-table-column prop='zlwfwe' label='记录事项' show-overflow-tooltip resizable min-width='320'>
-                    <template slot-scope='{row}'>{{row.jlsx || '--'}}</template>
+        <div ref='tableBox' style='height: calc(100% - 115px);'>
+            <el-table :data='tableData' :max-height='tableMaxHeight' :border='true' style='width: 100%'>
+                <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
+                <el-table-column prop='lb' label='其他事项详情' align='center'>
+                    <el-table-column prop='zlwfwe' label='记录事项' show-overflow-tooltip resizable min-width='320'>
+                        <template slot-scope='{row}'>{{row.jlsx || '--'}}</template>
+                    </el-table-column>
+                    <el-table-column prop label='位置' show-overflow-tooltip resizable width='425'>
+                        <template slot-scope='{row}'>{{row.description || '--'}}</template>
+                    </el-table-column>
+                    <el-table-column prop='content' label='内容' show-overflow-tooltip resizable width='260'>
+                        <template slot-scope='{row}'>{{row.content || '--'}}</template>
+                    </el-table-column>
+                    <el-table-column prop='sl' label='数量' width='80'>
+                        <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
+                    </el-table-column>
                 </el-table-column>
-                <el-table-column prop label='位置' show-overflow-tooltip resizable width='425'>
-                    <template slot-scope='{row}'>{{row.description || '--'}}</template>
+                <el-table-column prop='zfje' label='金额(万元)' width='80' align='right'>
+                    <template slot-scope='{row}'>{{number_format(row.zfje,2) || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='content' label='内容' show-overflow-tooltip resizable width='260'>
-                    <template slot-scope='{row}'>{{row.content || '--'}}</template>
+                <el-table-column prop='handledate' label='处理日期' width='130'>
+                    <template slot-scope='{row}'>{{row.handledate?formatter(row.handledate): '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='sl' label='数量' width='80'>
-                    <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
+                <el-table-column prop='handleresults' label='处置结果' show-overflow-tooltip resizable width='100'>
+                    <template slot-scope='{row}'>{{row.handleresults || '--'}}</template>
                 </el-table-column>
-            </el-table-column>
-            <el-table-column prop='zfje' label='金额(万元)' width='80' align='right'>
-                <template slot-scope='{row}'>{{number_format(row.zfje,2) || '--'}}</template>
-            </el-table-column>
-            <el-table-column prop='handledate' label='处理日期' width='130'>
-                <template slot-scope='{row}'>{{row.handledate?formatter(row.handledate): '--'}}</template>
-            </el-table-column>
-            <el-table-column prop='handleresults' label='处置结果' show-overflow-tooltip resizable width='100'>
-                <template slot-scope='{row}'>{{row.handleresults || '--'}}</template>
-            </el-table-column>
-            <el-table-column prop='zlwfwz ' label='资料存放位置' show-overflow-tooltip resizable width='100'>
-                <template slot-scope='{row}'>{{row.zlwfwz || '--'}}</template>
-            </el-table-column>
-            <el-table-column prop='recordtime' label='记录日期' width='140'>
-                <template slot-scope='{row}'>{{row.createdate?formatter(row.createdate): '--'}}</template>
-            </el-table-column>
-        </el-table>
+                <el-table-column prop='zlwfwz ' label='资料存放位置' show-overflow-tooltip resizable width='100'>
+                    <template slot-scope='{row}'>{{row.zlwfwz || '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='recordtime' label='记录日期' width='140'>
+                    <template slot-scope='{row}'>{{row.createdate?formatter(row.createdate): '--'}}</template>
+                </el-table-column>
+            </el-table>
+        </div>
+
         <div class='foot'>
             <el-pagination
                 background
@@ -100,7 +103,8 @@ export default {
             keyword: '',
             handleresults: '',
             handledate: '',
-            handleOption: []
+            handleOption: [],
+            tableMaxHeight: 0
         }
     },
     props: ['major', 'smsxt', 'tabLabel'],
@@ -205,6 +209,10 @@ export default {
             if (newV !== oldV) {
                 this.tabFind()
                 this.getList()
+                 this.$nextTick(() => {
+                    // 页面渲染完成后的回调
+                    this.tableMaxHeight = this.$refs.tableBox.offsetHeight;
+                })
             }
         },
         handleresults() {
@@ -215,6 +223,10 @@ export default {
         this.tabFind()
         //console.log(this.smsxt)
         this.getList()
+        this.$nextTick(() => {
+            // 页面渲染完成后的回调
+            this.tableMaxHeight = this.$refs.tableBox.offsetHeight
+        })
     }
 }
 </script>

+ 18 - 2
src/views/equipment/table/recordDialog.vue

@@ -2,10 +2,10 @@
     <!-- 记录事项 -->
     <div class='detail-dialog'>
         <el-dialog :title='`${major}${tabName}记录事项`' width='80%' :visible.sync='visible' style='height:900px;overflow-y:scroll;'>
-            <div class='bottom-table' style='height:600px'>
+            <div class='bottom-table' :style='`height:${height}`'>
                 <el-table
                     :data='tableData'
-                    height='560'
+                    :height='tableHeight'
                     :border='true'
                     style='width: 100%;margin-bottom:12px;'
                     :span-method='objectSpanMethod'
@@ -39,6 +39,22 @@ export default {
             tableData: []
         }
     },
+    computed: {
+        tableHeight() {
+            if (window.screen.height <= 768) {
+                return 450
+            } else {
+                return 560
+            }
+        },
+        height() {
+            if (window.screen.height <= 768) {
+                return 500
+            } else {
+                return 600
+            }
+        }
+    },
     methods: {
         open(smsxt) {
             // console.log(major)

+ 55 - 25
src/views/equipment/table/standTable.vue

@@ -43,28 +43,30 @@
                 style='width:192px;'
             ></el-input>
         </div>
-        <el-table :data='tableData' :border='true' style='width: 100%' @row-click='rowHandle'>
-            <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
-            <el-table-column prop label='设备名称' show-overflow-tooltip resizable width='300'>
-                <template slot-scope='{row}'>{{row.type_name || '--'}}</template>
-            </el-table-column>
-            <!-- sbjc -->
-            <el-table-column prop='sl' label='数量' width='100'>
-                <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
-            </el-table-column>
-            <el-table-column prop='brand' label='品牌' width='200'>
-                <template slot-scope='{row}'>{{row.brand || '--'}}</template>
-            </el-table-column>
-            <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable width='150'>
-                <template slot-scope='{row}'>{{row.sbxh || '--'}}</template>
-            </el-table-column>
-            <el-table-column prop='floor' label='楼层' width='180'>
-                <template slot-scope='{row}'>{{row.floorcode || '--'}}</template>
-            </el-table-column>
-            <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable min-width='300'>
-                <template slot-scope='{row}'>{{row.manufacturer || '--'}}</template>
-            </el-table-column>
-        </el-table>
+        <div ref='tableBox' style='height: calc(100% - 115px);'>
+            <el-table :data='tableData' :max-height='tableMaxHeight' :border='true' style='width: 100%' @row-click='rowHandle'>
+                <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
+                <el-table-column prop label='设备名称' show-overflow-tooltip resizable width='300'>
+                    <template slot-scope='{row}'>{{row.type_name || '--'}}</template>
+                </el-table-column>
+                <!-- sbjc -->
+                <el-table-column prop='sl' label='数量' width='100'>
+                    <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
+                </el-table-column>
+                <el-table-column prop='brand' label='品牌' width='200'>
+                    <template slot-scope='{row}'>{{row.brand || '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable width='150'>
+                    <template slot-scope='{row}'>{{row.sbxh || '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='floor' label='楼层' width='240' show-overflow-tooltip resizable>
+                    <template slot-scope='{row}'>{{row.floorcode || '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable min-width='300'>
+                    <template slot-scope='{row}'>{{row.manufacturer || '--'}}</template>
+                </el-table-column>
+            </el-table>
+        </div>
         <div class='foot'>
             <el-pagination
                 background
@@ -97,13 +99,14 @@ export default {
             tableData: [],
             total: 0,
             currentPage: 1,
-            size: 13,
+            size: 10,
             keyword: '',
             floor: '',
             row: {},
             sbjc: '',
             manufacturer: '',
-            type_name: ''
+            type_name: '',
+            tableMaxHeight: 0
         }
     },
     props: ['major', 'param', 'InfoName'],
@@ -175,6 +178,10 @@ export default {
         param(newV, oldV) {
             if (newV !== oldV) {
                 this.getList()
+                this.$nextTick(() => {
+                    // 页面渲染完成后的回调
+                    this.tableMaxHeight = this.$refs.tableBox.offsetHeight
+                })
             }
         },
         /* floor(newV, oldV) {
@@ -192,13 +199,18 @@ export default {
         }
     },
     mounted() {
-        this.floor = this.$cookie.get('floorMapId')
+        // this.floor = this.$cookie.get('floorMapId')
         this.getList()
+        this.$nextTick(() => {
+            // 页面渲染完成后的回调
+            this.tableMaxHeight = this.$refs.tableBox.offsetHeight
+        })
     }
 }
 </script>
 <style lang="less" scoped>
 .stand-list {
+    height: 100%;
     .eq-list-top {
         display: flex;
         margin-bottom: 12px;
@@ -215,4 +227,22 @@ export default {
         margin-top: 28px;
     }
 }
+@media screen and (max-width: 1600px) {
+    /deep/ .el-dialog__body {
+        padding: 0;
+    }
+    /deep/ .el-table td {
+        padding: 4px 0;
+    }
+    /deep/ .el-dialog {
+        margin-top: 5vh !important;
+    }
+}
+</style>
+<style lang="less">
+.stand-list {
+    /deep/.el-table tr {
+        cursor: pointer;
+    }
+}
 </style>

+ 66 - 53
src/views/equipment/table/wbTable.vue

@@ -13,7 +13,7 @@
                 style='width:192px;margin-right:12px'
             ></el-input>
             <el-input
-                placeholder='搜索重要事项记录描述'
+                placeholder='搜索事项类型事项描述'
                 size='small'
                 @keyup.enter.native='getList'
                 @blur='getList'
@@ -64,60 +64,62 @@
             </div>
             <input-dialog :type='2' @confirm='confirm'></input-dialog>
         </div>
-        <el-table :data='tableData' :border='true' style='width: 100%' @row-click='innerTable'>
-            <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
-            <el-table-column prop='sbmc' label='设备名称' show-overflow-tooltip resizable width='460'>
-                <template slot-scope='{row}'>{{row.sbmc || '--'}}</template>
-            </el-table-column>
-            <el-table-column prop='assetnum' label='设备编码' show-overflow-tooltip resizable width='80'>
-                <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
-            </el-table-column>
-            <el-table-column prop='matters' label='重要事项记录' width='180' show-overflow-tooltip resizable>
-                <template slot-scope='{row}'>{{row.matters || '--'}}</template>
-            </el-table-column>
-            <el-table-column prop='description' label='描述' show-overflow-tooltip resizable min-width='340'>
-                <template slot-scope='{row}'>{{row.description || '--'}}</template>
-            </el-table-column>
-            <el-table-column label='更换配件信息' align='center'>
-                <el-table-column prop='ischangepj' label='是/否更换' width='80'>
-                    <template slot-scope='{row}'>{{row.ismodel==1?'是':(row.ismodel==0?"否" :'--')}}</template>
+        <div ref='tableBox' style='height: calc(100% - 115px);'>
+            <el-table :data='tableData' :max-height='tableMaxHeight' :border='true' style='width: 100%' @row-click='innerTable'>
+                <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
+                <el-table-column prop='sbmc' label='设备名称' show-overflow-tooltip resizable width='460'>
+                    <template slot-scope='{row}'>{{row.sbmc || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='model' label='配件名称型号' width='140' show-overflow-tooltip resizable>
-                    <template slot-scope='{row}'>{{row.model || '--'}}</template>
+                <el-table-column prop='assetnum' label='设备内码' show-overflow-tooltip resizable width='80'>
+                    <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='sl' label='数量' width='80'>
-                    <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
+                <el-table-column prop='matters' label='事项类型' width='180' show-overflow-tooltip resizable>
+                    <template slot-scope='{row}'>{{row.matters || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='cost' label='费用(万元)' width='80' align='right'>
-                    <template slot-scope='{row}'>{{number_format(row.cost,2) || '--'}}</template>
+                <el-table-column prop='description' label='事项描述' show-overflow-tooltip resizable min-width='340'>
+                    <template slot-scope='{row}'>{{row.description || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='source' label='费用出处' show-overflow-tooltip resizable width='100'>
-                    <template slot-scope='{row}'>{{row.source|| '--'}}</template>
+                <el-table-column label='更换配件信息' align='center'>
+                    <el-table-column prop='ischangepj' label='是/否更换' width='80'>
+                        <template slot-scope='{row}'>{{row.ismodel==1?'是':(row.ismodel==0?"否" :'--')}}</template>
+                    </el-table-column>
+                    <el-table-column prop='model' label='配件名称型号' width='140' show-overflow-tooltip resizable>
+                        <template slot-scope='{row}'>{{row.model || '--'}}</template>
+                    </el-table-column>
+                    <el-table-column prop='sl' label='数量' width='80'>
+                        <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
+                    </el-table-column>
+                    <el-table-column prop='cost' label='费用(万元)' width='80' align='right'>
+                        <template slot-scope='{row}'>{{number_format(row.cost,2) || '--'}}</template>
+                    </el-table-column>
+                    <el-table-column prop='source' label='费用出处' show-overflow-tooltip resizable width='100'>
+                        <template slot-scope='{row}'>{{row.source|| '--'}}</template>
+                    </el-table-column>
                 </el-table-column>
-            </el-table-column>
-            <el-table-column prop='brand' label='现场照片' width='70'>
-                <template slot-scope='{row}'>
-                    <div
-                        v-if='row.glsmsImage'
-                        style='cursor:pointer;color: #0091ff;'
-                        @click.stop='clickPic(row.glsmsImage)'
-                    >{{row.glsmsImage.length+'张'}}</div>
-                    <div v-else>{{'--'}}</div>
-                </template>
-            </el-table-column>
-            <el-table-column prop='reportdate' label='填报时间' width='140'>
-                <template slot-scope='{row}'>{{row.reportdate?formatter(row.reportdate):'--'}}</template>
-            </el-table-column>
-            <el-table-column prop='sjjssj' label='验收时间' width='140'>
-                <template slot-scope='{row}'>{{row.sjjssj?formatter(row.sjjssj): '--'}}</template>
-            </el-table-column>
-            <el-table-column prop='wonum' label='任务编号' show-overflow-tooltip resizable width='90'>
-                <template slot-scope='{row}'>
-                    <div v-if='row.wb_gzglid' @click.stop='ycgd(row)' style='cursor:pointer;color: #0091ff;'>{{row.wb_gzglid}}</div>
-                    <div v-else>{{'--'}}</div>
-                </template>
-            </el-table-column>
-        </el-table>
+                <el-table-column prop='brand' label='现场照片' width='70'>
+                    <template slot-scope='{row}'>
+                        <div
+                            v-if='row.glsmsImage'
+                            style='cursor:pointer;color: #0091ff;'
+                            @click.stop='clickPic(row.glsmsImage)'
+                        >{{row.glsmsImage.length+'张'}}</div>
+                        <div v-else>{{'--'}}</div>
+                    </template>
+                </el-table-column>
+                <el-table-column prop='reportdate' label='填报时间' width='140'>
+                    <template slot-scope='{row}'>{{row.reportdate?formatter(row.reportdate):'--'}}</template>
+                </el-table-column>
+                <el-table-column prop='sjjssj' label='验收时间' width='140'>
+                    <template slot-scope='{row}'>{{row.sjjssj?formatter(row.sjjssj): '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='wonum' label='任务编号' show-overflow-tooltip resizable width='90'>
+                    <template slot-scope='{row}'>
+                        <div v-if='row.wb_gzglid' @click.stop='ycgd(row)' style='cursor:pointer;color: #0091ff;'>{{row.wb_gzglid}}</div>
+                        <div v-else>{{'--'}}</div>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </div>
         <div class='foot'>
             <el-pagination
                 background
@@ -145,7 +147,7 @@ export default {
             tableData: [],
             total: 0,
             currentPage: 1,
-            size: 11,
+            size: 10,
             sjjssj: '',
             reportdate: '',
             ischange: '',
@@ -165,7 +167,8 @@ export default {
             imgUrl: [],
             shjc: '',
             gzglid: '',
-            matters: ''
+            matters: '',
+            tableMaxHeight: 0
         }
     },
     props: ['smsxt', 'major', 'diff', 'tabLabel'],
@@ -268,6 +271,10 @@ export default {
         diff(newV, oldV) {
             if (newV !== oldV) {
                 this.getList()
+                this.$nextTick(() => {
+                    // 页面渲染完成后的回调
+                    this.tableMaxHeight = this.$refs.tableBox.offsetHeight
+                })
             }
         },
         tabLabel(newV, oldV) {
@@ -282,12 +289,15 @@ export default {
     },
     mounted() {
         this.getList()
+        this.$nextTick(() => {
+            // 页面渲染完成后的回调
+            this.tableMaxHeight = this.$refs.tableBox.offsetHeight
+        })
     }
 }
 </script>
 <style lang="less" scoped>
 .wb-list {
-    min-width: 1366px;
     .eq-list-top {
         display: flex;
         margin-bottom: 12px;
@@ -342,5 +352,8 @@ export default {
             color: rgb(31, 36, 41);
         }
     }
+    /deep/.el-table tr {
+        cursor: pointer;
+    }
 }
 </style>

+ 72 - 55
src/views/equipment/table/wxTable.vue

@@ -6,18 +6,18 @@
                 placeholder='搜索设备名称编号'
                 size='small'
                 @keyup.enter.native='getList'
-                 @blur="getList"
+                @blur='getList'
                 clearable
                 prefix-icon='el-icon-search'
                 v-model='sbjc'
                 style='width:192px;margin-right:12px'
             ></el-input>
             <el-input
-                placeholder='搜索重要事项记录描述'
+                placeholder='搜索事项类型事项描述'
                 size='small'
                 clearable
                 @keyup.enter.native='getList'
-                 @blur="getList"
+                @blur='getList'
                 prefix-icon='el-icon-search'
                 v-model='matters'
                 style='width:192px;margin-right:12px'
@@ -64,60 +64,62 @@
             </div>
             <input-dialog :type='3' @confirm='confirm'></input-dialog>
         </div>
-        <el-table :data='tableData' :border='true' style='width: 100%' @row-click='innerTable'>
-            <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
-            <el-table-column prop='sbmc' label='设备名称' show-overflow-tooltip resizable min-width='460'>
-                <template slot-scope='{row}'>{{row.sbmc || '--'}}</template>
-            </el-table-column>
-            <el-table-column prop='assetnum' label='设备编码' show-overflow-tooltip resizable width='80'>
-                <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
-            </el-table-column>
-            <el-table-column prop='matters' label='重要事项记录' width='180' show-overflow-tooltip resizable>
-                <template slot-scope='{row}'>{{row.matters || '--'}}</template>
-            </el-table-column>
-            <el-table-column prop='description' label='描述' show-overflow-tooltip resizable min-width='340'>
-                <template slot-scope='{row}'>{{row.description || '--'}}</template>
-            </el-table-column>
-            <el-table-column label='更换配件信息' align='center'>
-                <el-table-column prop='ischangepj' label='是/否更换' width='80'>
-                    <template slot-scope='{row}'>{{row.ismodel==1?'是':(row.ismodel==0?"否" :'--')}}</template>
+        <div ref='tableBox' style='height: calc(100% - 115px);'>
+            <el-table :data='tableData' :max-height='tableMaxHeight' :border='true' style='width: 100%' @row-click='innerTable'>
+                <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
+                <el-table-column prop='sbmc' label='设备名称' show-overflow-tooltip resizable min-width='460'>
+                    <template slot-scope='{row}'>{{row.sbmc || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='model' label='配件名称型号' width='140' show-overflow-tooltip resizable>
-                    <template slot-scope='{row}'>{{row.model || '--'}}</template>
+                <el-table-column prop='assetnum' label='设备内码' show-overflow-tooltip resizable width='80'>
+                    <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='sl' label='数量' width='80'>
-                    <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
+                <el-table-column prop='matters' label='事项类型' width='180' show-overflow-tooltip resizable>
+                    <template slot-scope='{row}'>{{row.matters || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='cost' label='费用(万元)' width='80' align='right'>
-                    <template slot-scope='{row}'>{{number_format(row.cost,2) || '--'}}</template>
+                <el-table-column prop='description' label='事项描述' show-overflow-tooltip resizable min-width='340'>
+                    <template slot-scope='{row}'>{{row.description || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='source' label='费用出处' show-overflow-tooltip resizable width='100'>
-                    <template slot-scope='{row}'>{{row.source || '--'}}</template>
+                <el-table-column label='更换配件信息' align='center'>
+                    <el-table-column prop='ischangepj' label='是/否更换' width='80'>
+                        <template slot-scope='{row}'>{{row.ismodel==1?'是':(row.ismodel==0?"否" :'--')}}</template>
+                    </el-table-column>
+                    <el-table-column prop='model' label='配件名称型号' width='140' show-overflow-tooltip resizable>
+                        <template slot-scope='{row}'>{{row.model || '--'}}</template>
+                    </el-table-column>
+                    <el-table-column prop='sl' label='数量' width='80'>
+                        <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
+                    </el-table-column>
+                    <el-table-column prop='cost' label='费用(万元)' width='80' align='right'>
+                        <template slot-scope='{row}'>{{number_format(row.cost,2) || '--'}}</template>
+                    </el-table-column>
+                    <el-table-column prop='source' label='费用出处' show-overflow-tooltip resizable width='100'>
+                        <template slot-scope='{row}'>{{row.source || '--'}}</template>
+                    </el-table-column>
                 </el-table-column>
-            </el-table-column>
-            <el-table-column prop='brand' label='现场照片' width='80'>
-                <template slot-scope='{row}'>
-                    <div
-                        v-if='row.glsmsImage'
-                        style='cursor:pointer;color: #0091ff;'
-                        @click.stop='clickPic(row.glsmsImage)'
-                    >{{row.glsmsImage.length+'张'}}</div>
-                    <div v-else>{{'--'}}</div>
-                </template>
-            </el-table-column>
-            <el-table-column prop='reportdate' label='填报时间' width='140'>
-                <template slot-scope='{row}'>{{row.reportdate?formatter(row.reportdate): '--'}}</template>
-            </el-table-column>
-            <el-table-column prop='sjjssj' label='验收时间' width='140'>
-                <template slot-scope='{row}'>{{row.sjjssj?formatter(row.sjjssj): '--'}}</template>
-            </el-table-column>
-            <el-table-column prop='wonum' label='工单编号' show-overflow-tooltip resizable width='80'>
-                <template slot-scope='{row}'>
-                    <div v-if='row.wonum' @click.stop='staff' style='cursor:pointer;color: #0091ff;'>{{row.wonum}}</div>
-                    <div v-else>{{'--'}}</div>
-                </template>
-            </el-table-column>
-        </el-table>
+                <el-table-column prop='brand' label='现场照片' width='80'>
+                    <template slot-scope='{row}'>
+                        <div
+                            v-if='row.glsmsImage'
+                            style='cursor:pointer;color: #0091ff;'
+                            @click.stop='clickPic(row.glsmsImage)'
+                        >{{row.glsmsImage.length+'张'}}</div>
+                        <div v-else>{{'--'}}</div>
+                    </template>
+                </el-table-column>
+                <el-table-column prop='reportdate' label='填报时间' width='140'>
+                    <template slot-scope='{row}'>{{row.reportdate?formatter(row.reportdate): '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='sjjssj' label='验收时间' width='140'>
+                    <template slot-scope='{row}'>{{row.sjjssj?formatter(row.sjjssj): '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='wonum' label='工单编号' show-overflow-tooltip resizable width='80'>
+                    <template slot-scope='{row}'>
+                        <div v-if='row.wonum' @click.stop='staff' style='cursor:pointer;color: #0091ff;'>{{row.wonum}}</div>
+                        <div v-else>{{'--'}}</div>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </div>
         <div class='foot'>
             <el-pagination
                 background
@@ -145,7 +147,7 @@ export default {
             tableData: [],
             total: 0,
             currentPage: 1,
-            size: 11,
+            size: 10,
             reportdate: '',
             sjjssj: '',
             ischange: '',
@@ -165,7 +167,8 @@ export default {
                     name: '否'
                 }
             ],
-            keyword: ''
+            keyword: '',
+            tableMaxHeight: 0
         }
     },
     computed: {
@@ -255,12 +258,20 @@ export default {
         diff(newV, oldV) {
             if (newV !== oldV) {
                 this.getList()
+                this.$nextTick(() => {
+                    // 页面渲染完成后的回调
+                    this.tableMaxHeight = this.$refs.tableBox.offsetHeight
+                })
             }
         },
         tabLabel(newV, oldV) {
             if (newV !== oldV) {
                 // this.tabFind()
                 this.getList()
+                this.$nextTick(() => {
+                    // 页面渲染完成后的回调
+                    this.tableMaxHeight = this.$refs.tableBox.offsetHeight
+                })
             }
         },
         ischange() {
@@ -269,12 +280,15 @@ export default {
     },
     mounted() {
         this.getList()
+        this.$nextTick(() => {
+            // 页面渲染完成后的回调
+            this.tableMaxHeight = this.$refs.tableBox.offsetHeight
+        })
     }
 }
 </script>
 <style lang="less" scoped>
 .wx-list {
-    min-width: 1366px;
     .eq-list-top {
         display: flex;
         margin-bottom: 12px;
@@ -329,5 +343,8 @@ export default {
             color: rgb(31, 36, 41);
         }
     }
+    /deep/.el-table tr {
+        cursor: pointer;
+    }
 }
 </style>

+ 62 - 42
src/views/equipment/table/zwTable.vue

@@ -62,45 +62,54 @@
             <!-- placeholder='选择验收时间' -->
             <input-dialog v-if='statusOption.length>0' :statusOption='statusOption' :type='4' @confirm='confirm'></input-dialog>
         </div>
-        <el-table :data='tableData' :border='true' style='width: 100%' @row-click='innerTable' v-if='tableData.length>0'>
-            <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
-            <el-table-column prop='nd' label='年度' show-overflow-tooltip resizable width='80'>
-                <template slot-scope='{row}'>{{row.nd || '--'}}</template>
-            </el-table-column>
-            <el-table-column prop='qs' label='期数' show-overflow-tooltip resizable width='80'>
-                <template slot-scope='{row}'>{{row.qs || '--'}}</template>
-            </el-table-column>
-            <el-table-column prop='lb' label='类别' show-overflow-tooltip resizable min-width='210'>
-                <template slot-scope='{row}'>{{row.lb || '--'}}</template>
-            </el-table-column>
-            <el-table-column prop='xm' label='项目' show-overflow-tooltip resizable min-width='150'>
-                <template slot-scope='{row}'>{{row.xm || '--'}}</template>
-            </el-table-column>
-            <el-table-column prop='sl' label='数量' show-overflow-tooltip resizable width='80'>
-                <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
-            </el-table-column>
-            <el-table-column prop='ssfasm' label='实施方案说明' show-overflow-tooltip resizable min-width='320'>
-                <template slot-scope='{row}'>{{row.ssfasm || '--'}}</template>
-            </el-table-column>
-            <el-table-column prop='sxjd' label='当前阶段' show-overflow-tooltip resizable width='80'>
-                <template slot-scope='{row}'>{{row.sxjd || '--'}}</template>
-            </el-table-column>
-            <el-table-column prop='lxsjwcsj' label='立项日期' show-overflow-tooltip resizable width='140'>
-                <template slot-scope='{row}'>{{row.lxsjwcsj?formatter(row.lxsjwcsj):'--'}}</template>
-            </el-table-column>
-            <el-table-column prop='yssjwcsj' label='验收日期' show-overflow-tooltip resizable width='140'>
-                <template slot-scope='{row}'>{{row.yssjwcsj?formatter(row.yssjwcsj):'--'}}</template>
-            </el-table-column>
-            <el-table-column prop='status' label='验收结果' show-overflow-tooltip resizable width='90'>
-                <template slot-scope='{row}'>{{row.status || '--'}}</template>
-            </el-table-column>
-            <el-table-column prop='zfje' label='结算金额' show-overflow-tooltip resizable width='80' align='right'>
-                <template slot-scope='{row}'>{{number_format(row.zfje,2)|| '--'}}</template>
-            </el-table-column>
-            <el-table-column prop='xlcfwz' label='资料存放位置' show-overflow-tooltip resizable width='100'>
-                <template slot-scope='{row}'>{{row.xlcfwz || '--'}}</template>
-            </el-table-column>
-        </el-table>
+        <div ref='tableBox' style='height: calc(100% - 115px);'>
+            <el-table
+                :data='tableData'
+                :max-height='tableMaxHeight'
+                :border='true'
+                style='width: 100%'
+                @row-click='innerTable'
+                v-if='tableData.length>0'
+            >
+                <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
+                <el-table-column prop='nd' label='年度' show-overflow-tooltip resizable width='80'>
+                    <template slot-scope='{row}'>{{row.nd || '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='qs' label='期数' show-overflow-tooltip resizable width='80'>
+                    <template slot-scope='{row}'>{{row.qs || '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='lb' label='类别' show-overflow-tooltip resizable min-width='210'>
+                    <template slot-scope='{row}'>{{row.lb || '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='xm' label='项目' show-overflow-tooltip resizable min-width='150'>
+                    <template slot-scope='{row}'>{{row.xm || '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='sl' label='数量' show-overflow-tooltip resizable width='80'>
+                    <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
+                </el-table-column>
+                <el-table-column prop='ssfasm' label='实施方案说明' show-overflow-tooltip resizable min-width='320'>
+                    <template slot-scope='{row}'>{{row.ssfasm || '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='sxjd' label='当前阶段' show-overflow-tooltip resizable width='80'>
+                    <template slot-scope='{row}'>{{row.sxjd || '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='lxsjwcsj' label='立项日期' show-overflow-tooltip resizable width='140'>
+                    <template slot-scope='{row}'>{{row.lxsjwcsj?formatter(row.lxsjwcsj):'--'}}</template>
+                </el-table-column>
+                <el-table-column prop='yssjwcsj' label='验收日期' show-overflow-tooltip resizable width='140'>
+                    <template slot-scope='{row}'>{{row.yssjwcsj?formatter(row.yssjwcsj):'--'}}</template>
+                </el-table-column>
+                <el-table-column prop='status' label='验收结果' show-overflow-tooltip resizable width='90'>
+                    <template slot-scope='{row}'>{{row.status || '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='zfje' label='结算金额' show-overflow-tooltip resizable width='80' align='right'>
+                    <template slot-scope='{row}'>{{number_format(row.zfje,2)|| '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='xlcfwz' label='资料存放位置' show-overflow-tooltip resizable width='100'>
+                    <template slot-scope='{row}'>{{row.xlcfwz || '--'}}</template>
+                </el-table-column>
+            </el-table>
+        </div>
         <div class='foot'>
             <el-pagination
                 background
@@ -131,7 +140,7 @@ export default {
             yssjwcsj: '',
             lxsjwcsj: '',
             ssfasm: '',
-            size: 11,
+            size: 10,
             keyword: '',
             nd: '',
             lb: '',
@@ -142,7 +151,8 @@ export default {
             statusOption: [],
             sxjdOption: [],
             xmOption: [],
-            lbOption: []
+            lbOption: [],
+            tableMaxHeight: 0
         }
     },
     computed: {
@@ -293,6 +303,10 @@ export default {
             if (newV !== oldV) {
                 this.tabFind()
                 this.getList()
+                this.$nextTick(() => {
+                    // 页面渲染完成后的回调
+                    this.tableMaxHeight = this.$refs.tableBox.offsetHeight
+                })
             }
         },
         tabLabel(newV, oldV) {
@@ -322,12 +336,15 @@ export default {
     mounted() {
         this.tabFind()
         this.getList()
+        this.$nextTick(() => {
+            // 页面渲染完成后的回调
+            this.tableMaxHeight = this.$refs.tableBox.offsetHeight
+        })
     }
 }
 </script>
 <style lang="less" scoped>
 .zw-list {
-    min-width: 1366px;
     .eq-list-top {
         display: flex;
         margin-bottom: 12px;
@@ -382,5 +399,8 @@ export default {
             color: rgb(31, 36, 41);
         }
     }
+    /deep/.el-table tr {
+        cursor: pointer;
+    }
 }
 </style>

+ 3 - 3
src/views/legendLibrary/index.vue

@@ -480,13 +480,13 @@ export default {
                 this.loading = false
             })
         },
-        getTableList() {
-            this.currentPage = 1
+        getTableList(val) {
+            this.currentPage = val || 1
             this.getTableTata()
         },
 
         updateSuccess() {
-            this.getTableList()
+            this.getTableList(this.currentPage)
         },
         addSuccess() {
             this.getTableList()

+ 51 - 35
src/views/other/index.vue

@@ -29,9 +29,12 @@
                 <img src='@/assets/imgs/wtp.png' alt />
                 <p class='fjt'>暂无附加数据图片</p>
             </div>
-            <div class='fzyfImg' v-else>
+            <div class='fzyfImg' v-else-if='floorData.length==1'>
                 <img :src='picFloorImg' alt />
             </div>
+            <div class='fzyfImg' v-else>
+                <rotation :key='2' type='2' :rotationImg='picFloorImg'></rotation>
+            </div>
         </div>
         <gcfz-dialog ref='gcfzDialog' :systemName='systemName'></gcfz-dialog>
     </div>
@@ -93,40 +96,53 @@ export default {
         // 查询哪几个楼层有库房图
         tabSize() {
             let data = { plazaId: this.plazaId }
-            let postParams = [
-                {
-                    tableName: 'glsms_proimgup',
-                    params: { module: '1004', floor: 'f6' }
-                },
-                {
-                    tableName: 'glsms_proimgup',
-                    params: { module: '1004', floor: 'f5' }
-                },
-                {
-                    tableName: 'glsms_proimgup',
-                    params: { module: '1004', floor: 'f4' }
-                },
-                {
-                    tableName: 'glsms_proimgup',
-                    params: { module: '1004', floor: 'f3' }
-                },
-                {
-                    tableName: 'glsms_proimgup',
-                    params: { module: '1004', floor: 'f2' }
-                },
-                {
-                    tableName: 'glsms_proimgup',
-                    params: { module: '1004', floor: 'f1' }
-                },
-                {
-                    tableName: 'glsms_proimgup',
-                    params: { module: '1004', floor: 'b1' }
-                },
-                {
-                    tableName: 'glsms_proimgup',
-                    params: { module: '1004', floor: 'b2' }
-                }
-            ]
+            let postParams = []
+            if (this.floorsArr.length > 0) {
+                this.floorsArr.forEach(e => {
+                    let obj = {
+                        tableName: 'glsms_proimgup',
+                        params: {
+                            module: '1004',
+                            floor: e.gname
+                        }
+                    }
+                    postParams.push(obj)
+                })
+            }
+            // [
+            //     {
+            //         tableName: 'glsms_proimgup',
+            //         params: { module: '1004', floor: 'f6' }
+            //     },
+            //     {
+            //         tableName: 'glsms_proimgup',
+            //         params: { module: '1004', floor: 'f5' }
+            //     },
+            //     {
+            //         tableName: 'glsms_proimgup',
+            //         params: { module: '1004', floor: 'f4' }
+            //     },
+            //     {
+            //         tableName: 'glsms_proimgup',
+            //         params: { module: '1004', floor: 'f3' }
+            //     },
+            //     {
+            //         tableName: 'glsms_proimgup',
+            //         params: { module: '1004', floor: 'f2' }
+            //     },
+            //     {
+            //         tableName: 'glsms_proimgup',
+            //         params: { module: '1004', floor: 'f1' }
+            //     },
+            //     {
+            //         tableName: 'glsms_proimgup',
+            //         params: { module: '1004', floor: 'b1' }
+            //     },
+            //     {
+            //         tableName: 'glsms_proimgup',
+            //         params: { module: '1004', floor: 'b2' }
+            //     }
+            // ]
             queryTab({ data, postParams }).then(res => {
                 //console.log('查询哪几层楼有图', res)
                 this.floorData = []

+ 25 - 2
src/views/other/zhsxDialog.vue

@@ -7,8 +7,15 @@
                 <p>2.广场消防安全培训、消防演习</p>
                 <p>3.相关政府强制性检测的按时完成情况及检测中提出的问题</p>
                 <p>4.广场安全质量第三方检测过程中列出的整改事项</p>
-                <div class='bottom-table'>
-                    <el-table :data='tableData' height='480' style='width:100%;' :span-method='objectSpanMethod' border v-if='tableData.length>0'>
+                <div class='bottom-table' :style='`height:${height}`'>
+                    <el-table
+                        :data='tableData'
+                        :height='tableHeight'
+                        style='width:100%;'
+                        :span-method='objectSpanMethod'
+                        border
+                        v-if='tableData.length>0'
+                    >
                         <el-table-column label='序号' type='index' width='60'></el-table-column>
                         <el-table-column prop='jcsx' label='检测事项' :show-overflow-tooltip='true' width='400'></el-table-column>
                         <el-table-column prop='zgbm' label='主管部门' :show-overflow-tooltip='true'></el-table-column>
@@ -27,6 +34,22 @@ export default {
             visible: false
         }
     },
+    computed: {
+        tableHeight() {
+            if (window.screen.height <= 768) {
+                return 350
+            } else {
+                return 440
+            }
+        },
+        height() {
+            if (window.screen.height <= 768) {
+                return 300
+            } else {
+                return 400
+            }
+        }
+    },
     methods: {
         open() {
             this.visible = true

+ 5 - 0
src/views/other/zhsxOther.vue

@@ -179,5 +179,10 @@ export default {
     .el-input--suffix .el-input__inner {
         padding-right: 20px;
     }
+    @media screen and (max-width: 1366px) {
+        /deep/ .el-table td {
+            padding: 3px 0;
+        }
+    }
 }
 </style>

+ 1 - 1
src/views/other/zhsxOtherTable1.vue

@@ -59,7 +59,7 @@
             <el-table-column prop label='工作要求' :show-overflow-tooltip='true' width='160'>
                 <template slot-scope='{row}'>{{row.workyq||'--'}}</template>
             </el-table-column>
-            <el-table-column prop label='整改要求' :show-overflow-tooltip='true' width='160'>
+            <el-table-column prop label='整改事项' :show-overflow-tooltip='true' width='160'>
                 <template slot-scope='{row}'>{{row.zgyq||'--'}}</template>
             </el-table-column>
             <el-table-column prop label='附件' width='80'>

+ 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'>

+ 73 - 44
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'
@@ -75,6 +75,7 @@
                             ></el-input>
                         </div>
                         <room-table2
+                            ref='roomTable2'
                             v-if='table2.length>=0'
                             :table2='table2'
                             :loading='loading1'
@@ -128,6 +129,7 @@
                             ></el-input>
                         </div>
                         <room-table3
+                            ref='roomTable3'
                             v-if='table3.length>=0'
                             :table3='table3'
                             :systemName='systemName'
@@ -155,7 +157,7 @@
                                 clearable
                                 @keyup.enter.native='Index3'
                                 @blur='Index3'
-                                placeholder='搜索重要事项记录、描述'
+                                placeholder='搜索事项类型、事项描述'
                                 size='small'
                                 prefix-icon='el-icon-search'
                                 v-model='zysxInput4'
@@ -252,6 +254,7 @@
                             </div>
                         </div>
                         <room-table4
+                            ref='roomTable4'
                             v-if='table4.length>=0'
                             :table4='table4'
                             :loading='loading3'
@@ -407,6 +410,7 @@
                             </div>
                         </div>
                         <room-table5
+                            ref='roomTable5'
                             v-if='table5.length>=0'
                             :table5='table5'
                             :loading='loading4'
@@ -451,6 +455,7 @@ export default {
             table3: [],
             table4: [],
             table5: [],
+            showLocationflid: false,
             //
             total: 0,
             page: 1,
@@ -532,13 +537,17 @@ export default {
                 this.Index(this.smsxtArr.smsxt)
             } else if (tab.label == '配电室低压柜及出线明细表') {
                 this.Index1()
+                this.$refs.roomTable2.computedHeight()
             } else if (tab.label == '机房内核心设备') {
                 this.Index2()
+                this.$refs.roomTable3.computedHeight()
             } else if (tab.label == '维修记录') {
                 this.Index3()
+                this.$refs.roomTable4.computedHeight()
             } else if (tab.label == '维保记录') {
                 this.Index4()
                 this.changeSelect()
+                this.$refs.roomTable5.computedHeight()
             }
         },
         // 右上角的筛选点击按钮
@@ -563,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 {
@@ -864,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}分布图`
             })
@@ -990,8 +1004,8 @@ export default {
         }
     }
     .compute-tab {
-        margin-top: 16px;
-        padding: 0 24px;
+        padding-top: 16px;
+        height: 100%;
     }
 }
 </style>
@@ -1004,6 +1018,13 @@ export default {
     .el-dialog__headerbtn .el-dialog__close {
         color: #fff;
     }
+    /deep/ .el-dialog__body {
+        padding: 0 24px;
+        height: calc(100% - 57px);
+        .is-active {
+            background: rgba(2, 91, 170, 0.15);
+        }
+    }
     .compute-tab {
         /deep/ .el-dialog {
             // padding: 16px 20px 20px;
@@ -1023,12 +1044,6 @@ export default {
             .el-dialog__headerbtn {
                 top: 0;
             }
-            .el-dialog__body {
-                padding: 0 24px;
-                .is-active {
-                    background: rgba(2, 91, 170, 0.15);
-                }
-            }
         }
 
         .el-dialog__title {
@@ -1072,9 +1087,20 @@ export default {
         /deep/ .el-tabs__item:nth-child(2) {
             border-radius: 4px 0px 0px 4px;
         }
-        .el-tabs,
+        .el-tabs {
+            height: 100%;
+        }
         .el-tabs__content {
-            height: 800px;
+            height: calc(100% - 45px);
+            /deep/ .el-tab-pane {
+                height: 100% !important;
+                .compute-item {
+                    height: calc(100% - 44px);
+                    .compute-table {
+                        height: calc(100% - 71px);
+                    }
+                }
+            }
         }
         .el-tabs__active-bar {
             background-color: transparent !important;
@@ -1162,37 +1188,40 @@ export default {
     }
 }
 // compute-tab 1366px适配
-@media screen and (max-width: 1366px) {
-    // 表格高度设置
-    .compute-tab {
-        .el-tabs,
-        .el-tabs__content {
-            height: 470px !important;
-        }
-        // 机房内核心设备 padding设置
-        #pane-3 {
-            .compute-table .el-table td,
-            .compute-box .compute-table .el-table th {
-                padding: 3px 0 !important;
-            }
-        }
-        // 维修记录,维保记录 padding设置
-        #pane-4,
-        #pane-5 {
-            .compute-table .el-table td,
-            .compute-box .compute-table .el-table th {
-                padding: 0 !important;
-            }
-        }
-    }
-}
+// @media screen and (max-width: 1366px) {
+//     // 表格高度设置
+//     .compute-tab {
+//         .el-tabs,
+//         .el-tabs__content {
+//             height: 470px !important;
+//         }
+//         // 机房内核心设备 padding设置
+//         #pane-3 {
+//             .compute-table .el-table td,
+//             .compute-box .compute-table .el-table th {
+//                 padding: 3px 0 !important;
+//             }
+//         }
+//         // 维修记录,维保记录 padding设置
+//         #pane-4,
+//         #pane-5 {
+//             .compute-table .el-table td,
+//             .compute-box .compute-table .el-table th {
+//                 padding: 0 !important;
+//             }
+//         }
+//     }
+// }
 @media screen and (max-width: 1600px) {
     // 表格高度设置
-    .compute-tab {
-        .el-tabs,
-        .el-tabs__content {
-            height: 600px !important;
-        }
+    // .compute-tab {
+    //     .el-tabs,
+    //     .el-tabs__content {
+    //         height: 600px !important;
+    //     }
+    // }
+    .compute-box .compute-tab .compute-table .el-table td {
+        padding: 4px 0;
     }
 }
 </style>

+ 16 - 3
src/views/room/room2.vue

@@ -1,10 +1,11 @@
 <template>
     <div class='compute-item'>
-        <div class='compute-table'>
+        <div ref='tableBox2' class='compute-table'>
             <el-table
                 :border='true'
                 v-if='table2.length>=0'
                 v-loading='loading'
+                :max-height='tableMaxHeight'
                 :data='table2'
                 style='width: 100%'
                 :header-cell-style='{background:"rgba(245,246,247,1)",fontFamily:"MicrosoftYaHei",color:"rgba(100,108,115,1)",lineHeight:"16px",fontSize:"12px"}'
@@ -60,7 +61,8 @@ export default {
                 { id: 'test3', name: '下级分项' },
                 { id: 'test4', name: '滑动平均滑动平均' }
             ],
-            searVal: ''
+            searVal: '',
+            tableMaxHeight: 0
         }
     },
     computed: {
@@ -73,9 +75,20 @@ export default {
         },
         pageChanged(page) {
             this.$emit('Index1Emit', page)
+        },
+        computedHeight() {
+            this.$nextTick(() => {
+                // 页面渲染完成后的回调
+                this.tableMaxHeight = this.$refs.tableBox2.offsetHeight
+            })
         }
     },
-    mounted() {}
+    updated() {
+        this.$nextTick(() => {
+            // 页面渲染完成后的回调
+            this.tableMaxHeight = this.$refs.tableBox2.offsetHeight
+        })
+    }
 }
 </script>
 <style lang="less" scoped>

+ 19 - 3
src/views/room/room3.vue

@@ -1,10 +1,11 @@
 <template>
     <div class='compute-item'>
-        <div class='compute-table'>
+        <div ref='tableBox3' class='compute-table'>
             <el-table
                 :border='true'
                 @row-click='innerTable'
                 v-loading='loading'
+                :max-height='tableMaxHeight'
                 :data='table3'
                 style='width: 100%'
                 :header-cell-style='{background:"rgba(245,246,247,1)",fontFamily:"MicrosoftYaHei",color:"rgba(100,108,115,1)",lineHeight:"16px",fontSize:"12px"}'
@@ -57,7 +58,8 @@ export default {
     data() {
         return {
             innerVisible: false,
-            row: {}
+            row: {},
+            tableMaxHeight: 0
         }
     },
 
@@ -76,9 +78,20 @@ export default {
             console.log(row)
             this.row = row
             this.innerVisible = true
+        },
+        computedHeight() {
+            this.$nextTick(() => {
+                // 页面渲染完成后的回调
+                this.tableMaxHeight = this.$refs.tableBox3.offsetHeight
+            })
         }
     },
-    mounted() {}
+    updated() {
+        this.$nextTick(() => {
+            // 页面渲染完成后的回调
+            this.tableMaxHeight = this.$refs.tableBox3.offsetHeight
+        })
+    }
 }
 </script>
 <style lang="less" scoped>
@@ -95,5 +108,8 @@ export default {
         height: 95% !important;
         margin-top: 50px;
     }
+    /deep/.el-table tr {
+        cursor: pointer;
+    }
 }
 </style>

+ 21 - 4
src/views/room/room4.vue

@@ -1,9 +1,10 @@
 <template>
     <div class='compute-item'>
-        <div class='compute-table'>
+        <div ref='tableBox4' class='compute-table'>
             <el-table
                 :border='true'
                 v-loading='loading'
+                :max-height='tableMaxHeight'
                 :data='table4'
                 style='width: 100%'
                 @row-click='innerTable'
@@ -16,10 +17,10 @@
                 <el-table-column prop label='设备编号' show-overflow-tooltip resizable width='80'>
                     <template slot-scope='{row}'>{{row.location||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='重要事项记录' show-overflow-tooltip resizable min-width='120'>
+                <el-table-column prop label='事项类型' show-overflow-tooltip resizable min-width='120'>
                     <template slot-scope='{row}'>{{row.matters||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='描述' show-overflow-tooltip resizable min-width='310'>
+                <el-table-column prop label='事项描述' show-overflow-tooltip resizable min-width='310'>
                     <template slot-scope='{row}'>{{row.description||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='更换配件信息' align='center' show-overflow-tooltip resizable>
@@ -90,7 +91,8 @@ export default {
             dateVal: '',
             value1: '',
             searVal: '',
-            number_format
+            number_format,
+            tableMaxHeight: 0
         }
     },
     components: { Select },
@@ -110,7 +112,19 @@ export default {
             if (row.workorderid) {
                 window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=JXWO&uniqueid=WB_GZGL&uniqueid=${row.wb_gzglid}`, true)
             }
+        },
+        computedHeight() {
+            this.$nextTick(() => {
+                // 页面渲染完成后的回调
+                this.tableMaxHeight = this.$refs.tableBox4.offsetHeight
+            })
         }
+    },
+    updated() {
+        this.$nextTick(() => {
+            // 页面渲染完成后的回调
+            this.tableMaxHeight = this.$refs.tableBox4.offsetHeight
+        })
     }
 }
 </script>
@@ -129,5 +143,8 @@ export default {
         justify-content: flex-end;
         margin-top: 28px;
     }
+    /deep/.el-table tr {
+        cursor: pointer;
+    }
 }
 </style>

+ 19 - 3
src/views/room/room5.vue

@@ -1,9 +1,10 @@
 <template>
     <div class='compute-item'>
-        <div class='compute-table'>
+        <div ref='tableBox5' class='compute-table'>
             <el-table
                 :border='true'
                 v-loading='loading'
+                :max-height='tableMaxHeight'
                 :data='table5'
                 style='width: 100%'
                 @row-click='innerTable'
@@ -98,11 +99,17 @@ export default {
             value1: '',
             searVal: '',
             dateVal: '',
-            imgUrl: []
+            imgUrl: [],
+            tableMaxHeight: 0
         }
     },
     components: { Select },
-    mounted() {},
+    updated() {
+        this.$nextTick(() => {
+            // 页面渲染完成后的回调
+            this.tableMaxHeight = this.$refs.tableBox5.offsetHeight
+        })
+    },
     methods: {
         //工单详情
         innerTable(row) {
@@ -146,6 +153,12 @@ export default {
                 })
             }
             this.$refs.picLargeOpen.open(this.imgUrl)
+        },
+        computedHeight() {
+            this.$nextTick(() => {
+                // 页面渲染完成后的回调
+                this.tableMaxHeight = this.$refs.tableBox5.offsetHeight
+            })
         }
     }
 }
@@ -165,5 +178,8 @@ export default {
         justify-content: flex-end;
         margin-top: 28px;
     }
+    /deep/.el-table tr {
+        cursor: pointer;
+    }
 }
 </style>