zhulizhen1111 4 éve
szülő
commit
e0667819bd

+ 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.loading = false
                 })
-                // 增加图片
-                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)
+                .catch(() => {
+                    this.loading = false
                 })
-                // 增加管线类
-                // 增加图标类图例
-                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

+ 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'
@@ -326,7 +326,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),
@@ -343,7 +343,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 {
@@ -426,11 +428,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>

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

@@ -135,7 +135,7 @@ export default {
                 target: item.name,
                 parameter: item.categoryId
             }
-            getPvUv(data, postParams )
+            getPvUv(data, postParams)
                 .then(res => {
                     console.log('pvuv', res)
                 })
@@ -180,7 +180,7 @@ export default {
                     target: eve.id,
                     parameter: eve.label
                 }
-                getPvUv( data, postParams )
+                getPvUv(data, postParams)
                     .then(res => {
                         console.log('pvuv', res)
                     })
@@ -520,4 +520,9 @@ export default {
         white-space: nowrap;
     }
 }
+@media screen and (max-width: 1600px) {
+    .el-table td {
+        padding: 4px 0;
+    }
+}
 </style>

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

+ 48 - 26
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: ''
+            floor: '',
+            tableMaxHeight: 0
         }
     },
     computed: {
@@ -170,6 +173,10 @@ export default {
             console.log(newV, oldV)
             if (newV !== oldV) {
                 this.getList()
+                this.$nextTick(() => {
+                    // 页面渲染完成后的回调
+                    this.tableMaxHeight = this.$refs.tableBox.offsetHeight
+                })
             }
         },
         /* floor(newV, oldV) {
@@ -190,6 +197,10 @@ export default {
     mounted() {
         this.floor = this.$cookie.get('floorMapId')
         this.getList()
+        this.$nextTick(() => {
+            // 页面渲染完成后的回调
+            this.tableMaxHeight = this.$refs.tableBox.offsetHeight
+        })
         console.log(this.param)
     }
 }
@@ -212,4 +223,15 @@ 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>

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

+ 47 - 24
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) {
@@ -194,11 +201,16 @@ export default {
     mounted() {
         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,15 @@ 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>

+ 62 - 52
src/views/equipment/table/wbTable.vue

@@ -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;

+ 64 - 54
src/views/equipment/table/wxTable.vue

@@ -6,7 +6,7 @@
                 placeholder='搜索设备名称编号'
                 size='small'
                 @keyup.enter.native='getList'
-                 @blur="getList"
+                @blur='getList'
                 clearable
                 prefix-icon='el-icon-search'
                 v-model='sbjc'
@@ -17,7 +17,7 @@
                 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,6 +258,10 @@ export default {
         diff(newV, oldV) {
             if (newV !== oldV) {
                 this.getList()
+                this.$nextTick(() => {
+                    // 页面渲染完成后的回调
+                    this.tableMaxHeight = this.$refs.tableBox.offsetHeight
+                })
             }
         },
         tabLabel(newV, oldV) {
@@ -269,12 +276,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;

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