zhulizhen1111 4 years ago
parent
commit
5d1cb3bb46

+ 150 - 241
src/views/equipment/table/eqDetaileDialog.vue

@@ -1,131 +1,112 @@
-
 <template>
     <!-- 详情页面 -->
-    <div class='gdqd-dialog1'>
+    <div class='gdqd-dialog'>
         <div class='top'></div>
-        <div class='qdxq-top'>
-            <div class='gdqd-dialog-top'>
-                <!-- <el-input
-                    placeholder='搜索设备简称编号'
-                    style='width:192px;margin-right:12px'
-                    size='small'
-                    prefix-icon='el-icon-search'
-                    v-model='sbjc'
-                    clearable
-                    @keyup.enter.native='queryTableList'
-                    @blur='queryTableList'
-                ></el-input>
-                <Select v-model='sbglgs' width='180' tipPlace='top' caption='管理归属:' size='small' :selectdata='sbglgsOption' @change='queryTableList'></Select>
-                <Select
-                    width='160'
-                    style='margin: 0 12px;'
-                    v-model='status'
-                    tipPlace='top'
-                    caption='设备状态:'
-                    size='small'
-                    :selectdata='statusOption'
-                    @change='queryTableList'
-                ></Select>
-                <el-input
-                    placeholder='搜索品牌、型号'
-                    style='width:180px;margin-right:12px'
-                    size='small'
-                    clearable
-                    prefix-icon='el-icon-search'
-                    v-model='brand'
-                    @keyup.enter.native='queryTableList'
-                    @blur='queryTableList'
-                ></el-input>
-                <Select
-                    width='150'
-                    style='margin-right:12px;'
-                    v-model='floor'
-                    tipPlace='top'
-                    caption='楼层:'
-                    size='small'
-                    :selectdata='floorAllSelect'
-                    @change='queryTableList'
-                ></Select>
-                <el-input
-                    placeholder='搜索安装位置'
-                    @keyup.enter.native='queryTableList'
-                    @blur='queryTableList'
-                    clearable
-                    style='width:180px;margin-right:12px'
-                    size='small'
-                    prefix-icon='el-icon-search'
-                    v-model='wzjc'
-                ></el-input>-->
-                <!-- 多余的筛选 -->
-                <!-- <input-dialog :type='1' @confirm='confirm'></input-dialog> -->
-            </div>
-            <div class='gdqd-dialog-bottom'>
-                <el-table @row-click='innerTable' :data='tableData' :border='true' style='width: 100%;margin-bottom:30px'>
-                    <el-table-column type='index' label='序号' width='60'></el-table-column>
-                    <el-table-column prop='sbjc' label='设备名称' show-overflow-tooltip resizable min-width='338'>
-                        <template slot-scope='{row}'>{{row.sbjc || '--'}}</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='sl' label='数量' width='60'>
-                        <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
-                    </el-table-column>
-                    <el-table-column prop='sbglgs' label='管理归属' show-overflow-tooltip resizable>
-                        <template slot-scope='{row}'>{{row.sbglgs || '--'}}</template>
-                    </el-table-column>
-                    <el-table-column prop='sb_status' label='设备状态' width='80' show-overflow-tooltip resizable>
-                        <template slot-scope='{row}'>{{row.sb_status || '--'}}</template>
-                    </el-table-column>
-                    <el-table-column prop='brand' label='品牌' show-overflow-tooltip resizable width='80'>
-                        <template slot-scope='{row}'>{{row.brand || '--'}}</template>
-                    </el-table-column>
-                    <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable width='100'>
-                        <template slot-scope='{row}'>{{row.sbxh || '--'}}</template>
-                    </el-table-column>
-                    <el-table-column prop='floor' sortable label='楼层' width='70' show-overflow-tooltip resizable>
-                        <template slot-scope='{row}'>{{row.floorcode || '--'}}</template>
-                    </el-table-column>
-                    <el-table-column prop='wzjc' label='安装位置' show-overflow-tooltip resizable min-width='150'>
-                        <template slot-scope='{row}'>{{row.wzjc || '--'}}</template>
-                    </el-table-column>
-                    <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable min-width='220'>
-                        <template slot-scope='{row}'>{{row.manufacturer || '--'}}</template>
-                    </el-table-column>
-                    <el-table-column prop='fws' label='服务商' show-overflow-tooltip resizable min-width='220'>
-                        <template slot-scope='{row}'>{{row.fws || '--'}}</template>
-                    </el-table-column>
-                    <el-table-column prop label='相关资料' show-overflow-tooltip resizable min-width='150'>
-                        <template slot-scope='{row}'>{{'--'}}</template>
-                    </el-table-column>
-                </el-table>
-            </div>
+        <div class='gdqd-dialog-top'>
+            <el-input
+                placeholder='搜索设备简称编号'
+                style='width:192px;margin-right:12px'
+                size='small'
+                prefix-icon='el-icon-search'
+                v-model='sbjc'
+                clearable
+                @keyup.enter.native='queryTableList'
+                @blur='queryTableList'
+            ></el-input>
+            <Select v-model='sbglgs' width='180' tipPlace='top' caption='管理归属:' size='small' :selectdata='sbglgsOption' @change='queryTableList'></Select>
+            <Select
+                width='160'
+                style='margin: 0 12px;'
+                v-model='status'
+                tipPlace='top'
+                caption='设备状态:'
+                size='small'
+                :selectdata='statusOption'
+                @change='queryTableList'
+            ></Select>
+            <el-input
+                placeholder='搜索品牌、型号'
+                style='width:180px;margin-right:12px'
+                size='small'
+                clearable
+                prefix-icon='el-icon-search'
+                v-model='brand'
+                @keyup.enter.native='queryTableList'
+                @blur='queryTableList'
+            ></el-input>
+            <Select
+                width='150'
+                style='margin-right:12px;'
+                v-model='floor'
+                tipPlace='top'
+                caption='楼层:'
+                size='small'
+                :selectdata='floorAllSelect'
+                @change='queryTableList'
+            ></Select>
+            <el-input
+                placeholder='搜索安装位置'
+                @keyup.enter.native='queryTableList'
+                @blur='queryTableList'
+                clearable
+                style='width:180px;margin-right:12px'
+                size='small'
+                prefix-icon='el-icon-search'
+                v-model='wzjc'
+            ></el-input>
+            <!-- 多余的筛选 -->
+            <input-dialog :type='1' @confirm='confirm'></input-dialog>
         </div>
-        <div class='qdxq-bottom'>
-            <div class='wb-title'>
-                <div class='tab-title' id='1' :class='activeId==1?"active-is":""' @click='tabClick(1)'>维保</div>
-                <div class='tab-title' id='2' :class='activeId==2?"active-is":""' @click='tabClick(2)'>维修</div>
-            </div>
-            <div v-if='activeId==1'>
-                <el-tabs v-model='activeName1' @tab-click='handleClickWb'>
-                    <el-tab-pane label='重要维保' name='wb1'>
-                        <wbTable ref='wb1' :smsxt='smsxt' tabLabel='重要维保' :diff='diff' :assetnum='row.assetnum' :size='3'></wbTable>
-                    </el-tab-pane>
-                    <el-tab-pane label='日常维保' name='wb2'>
-                        <rcwbTable ref='wb2' :smsxt='smsxt' tabLabel='日常维保' :diff='diff' :assetnum='row.assetnum' :size='3'></rcwbTable>
-                    </el-tab-pane>
-                </el-tabs>
-            </div>
-            <div v-if='activeId==2'>
-                <el-tabs v-model='activeName2' @tab-click='handleClickWx'>
-                    <el-tab-pane label='重要维修' name='wx1'>
-                        <wxTable ref='wx1' :smsxt='smsxt' tabLabel='重要维修' :diff='diff' :assetnum='row.assetnum' :size='3'></wxTable>
-                    </el-tab-pane>
-                    <el-tab-pane label='日常维修' name='wx2'>
-                        <rcwxTable ref='wx2' :smsxt='smsxt' tabLabel='日常维修' :diff='diff' :assetnum='row.assetnum' :size='3'></rcwxTable>
-                    </el-tab-pane>
-                </el-tabs>
-            </div>
+        <el-table @row-click='innerTable' :data='tableData' :key='key' :border='true' style='width: 100%;amrgin-bottom:30px'>
+            <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
+            <el-table-column prop='sbjc' label='设备名称' show-overflow-tooltip resizable min-width='150'>
+                <template slot-scope='{row}'>{{row.sbjc || '--'}}</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='sl' label='数量' width='60'>
+                <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
+            </el-table-column>
+            <el-table-column prop='sbglgs' label='管理归属' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.sbglgs || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='sb_status' label='设备状态' width='80' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.sb_status || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='brand' label='品牌' show-overflow-tooltip resizable width='80'>
+                <template slot-scope='{row}'>{{row.brand || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable width='80'>
+                <template slot-scope='{row}'>{{row.sbxh || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='floor' sortable label='楼层' width='70' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.floorcode || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='wzjc' label='安装位置' show-overflow-tooltip resizable min-width='150'>
+                <template slot-scope='{row}'>{{row.wzjc || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable min-width='150'>
+                <template slot-scope='{row}'>{{row.manufacturer || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='fws' label='服务商' show-overflow-tooltip resizable min-width='150'>
+                <template slot-scope='{row}'>{{row.fws || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop label='相关资料' show-overflow-tooltip resizable min-width='150'>
+                <template slot-scope='{row}'>{{'--'}}</template>
+            </el-table-column>
+        </el-table>
+        <div class='foot'>
+            <el-pagination
+                background
+                layout='prev, pager, next'
+                :total='total'
+                :current-page.sync='page'
+                :page-size='size'
+                @prev-click='pageChanged'
+                @next-click='pageChanged'
+                @current-change='pageChanged'
+            ></el-pagination>
         </div>
     </div>
 </template>
@@ -135,10 +116,6 @@ import { mapGetters } from 'vuex'
 import { queryAsset } from '@/api/equipmentList.js'
 import { querySelect } from '@/api/public.js'
 import inputDialog from './inputDIalog'
-import rcwbTable from './rcwbTable'
-import wbTable from './wbTable'
-import rcwxTable from './rcwxTable'
-import wxTable from './wxTable'
 export default {
     data() {
         return {
@@ -150,8 +127,9 @@ export default {
                 { id: 'test4', name: '滑动平均滑动平均' },
             ],
             // page: 1,
-            // size: 10,
-            // total: 1,
+            size: 10,
+            total: 1,
+            page:1,
             sbjc: '',
             brand: '',
             wzjc: '',
@@ -163,47 +141,35 @@ export default {
             sbglgsOption: [],
             statusOption: [],
             floorAllSelect: [],
-            activeId: '1',
-            activeName1: 'wb1',
-            activeName2: 'wx1',
+            key: 0,
         }
     },
     components: {
         Select,
         inputDialog,
-        rcwbTable,
-        wbTable,
-        rcwxTable,
-        wxTable,
     },
     computed: {
         ...mapGetters(['floorSelect']),
     },
-    props: ['row', 'major', 'smsxt', 'diff'],
+    props: ['row', 'major','sign'],
     mounted() {
-        console.log(this.row)
         this.queryTableList()
         this.tabFind()
         this.getFloorAllSelect()
     },
     methods: {
-        tabClick(item) {
-            this.activeId = item
-        },
-        handleClickWb(label) {
-            console.log(label)
-            console.log(this.$refs[`${label.name}`])
-            this.$refs[`${label.name}`].startMethods()
-        },
-        handleClickWx(label) {
-            this.$refs[`${label.name}`].startMethods()
-        },
         innerTable(row) {
             console.log(row)
             if (row.assetuid) {
                 window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=assetdevic&uniqueid=${row.assetuid}`)
             }
         },
+        //序号的方法
+        indexMethod(index) {
+            if (this.page) {
+                return (this.page - 1) * this.size + index + 1
+            }
+        },
         //多余输入框监听
         confirm(fws, manufacturer) {
             //console.log(fws, manufacturer, '------')
@@ -268,6 +234,10 @@ export default {
                 })
             })
         },
+        pageChanged(page) {
+            this.page = page
+            this.queryTableList()
+        },
         queryTableList() {
             let major
             if (this.major.slice(0, 2) == 'GD') {
@@ -286,6 +256,8 @@ export default {
             let data = {
                 major: major,
                 plazaId: this.$store.state.plazaId,
+                page: this.page,
+                size: this.size,
             }
             //输入框搜索
             data.keyword = ''
@@ -328,6 +300,7 @@ export default {
                 //console.log(res)
                 this.tableData = res.data.data
                 this.total = res.data.count
+                this.key++
             })
         },
         getFloorAllSelect() {
@@ -339,66 +312,57 @@ export default {
             this.floorSelect.forEach((el) => {
                 this.floorAllSelect.push(el)
             })
+            console.log(this.floorAllSelect)
         },
+        changePageEvent(){
+            if(this.sign==1){
+                this.page = 1
+            }
+        }
     },
     watch: {
         row: {
             handler(newV, oldV) {
+                this.changePageEvent()
                 this.queryTableList()
                 this.getFloorAllSelect()
                 this.tabFind()
-                this.handleClickWb()
             },
             deep: true,
         },
         sbglgs() {
+            this.changePageEvent()
             this.queryTableList()
         },
         status() {
+            this.changePageEvent()
             this.queryTableList()
         },
         floor() {
+            this.changePageEvent()
             this.queryTableList()
         },
     },
 }
 </script>
 <style lang="less" scoped>
-.gdqd-dialog1 {
-    height: 100vh;
-    display: flex;
-    flex-direction: column;
-    .qdxq-top {
-        .gdqd-dialog-top {
-            // margin-bottom: 20px;
-        }
-        .gdqd-dialog-bottom {
-            overflow: hidden;
-            max-height: 9vh;
-        }
+.gdqd-dialog {
+    // padding: 16px 24px 40px;
+    // height: 610px;
+    .gdqd-dialog-top {
+        display: flex;
+        margin-bottom: 12px;
     }
-    .qdxq-bottom {
-        //max-height: 76vh;
-        flex: 1;
-        .wb-title {
-            display: flex;
-            height: 48px;
-            line-height: 48px;
-            background: #f5f6f7;
-            margin: 20px 0;
-            .tab-title {
-                padding: 4px 16px;
-            }
-            &:hover {
-                cursor: pointer;
-                color: #025baa;
-            }
-            .active-is {
-                color: #025baa;
-                border-bottom: 2px solid #025baa;
-                cursor: pointer;
-            }
-        }
+    td {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+    .foot {
+        height: 32px;
+        display: flex;
+        justify-content: flex-end;
+        margin-top: 28px;
     }
 }
 @media screen and (max-width: 1600px) {
@@ -408,64 +372,9 @@ export default {
 }
 </style>
 <style lang="less">
-.gdqd-dialog1 {
+.gdqd-dialog {
     /deep/.el-table td {
         cursor: pointer;
     }
-    .qdxq-bottom {
-        .el-tabs--bottom .el-tabs__item.is-bottom:nth-child(2),
-        .el-tabs--bottom .el-tabs__item.is-top:nth-child(2),
-        .el-tabs--top .el-tabs__item.is-bottom:nth-child(2),
-        .el-tabs--top .el-tabs__item.is-top:nth-child(2) {
-            padding-left: 16px;
-        }
-        .el-tabs--bottom .el-tabs__item.is-bottom:last-child,
-        .el-tabs--bottom .el-tabs__item.is-top:last-child,
-        .el-tabs--top .el-tabs__item.is-bottom:last-child,
-        .el-tabs--top .el-tabs__item.is-top:last-child {
-            padding-right: 16px;
-        }
-        .el-tabs__nav-wrap::after {
-            height: 0;
-        }
-        .el-tabs {
-            height: 95vh;
-        }
-        .el-tabs__content {
-            height: calc(100% - 45px);
-            /deep/ .el-tab-pane > div {
-                height: 100% !important;
-            }
-        }
-        .is-active {
-            color: #025baa !important;
-            border-color: #025baa !important;
-        }
-        .el-tabs__item {
-            padding: 5px 16px;
-            height: 30px;
-            line-height: 22px;
-            font-size: 14px;
-            font-family: MicrosoftYaHei;
-            color: rgba(31, 36, 41, 1);
-            border: 1px solid rgba(195, 199, 203, 1);
-        }
-
-        /deep/ .el-tabs__item:last-child {
-            border-radius: 0px 4px 4px 0px;
-        }
-        /deep/ .el-tabs__item:nth-child(2) {
-            border-radius: 4px 0px 0px 4px;
-        }
-        .el-tab-pane {
-            height: 100% !important;
-        }
-        .el-tabs__active-bar {
-            background-color: transparent !important;
-        }
-    }
-}
-/deep/.el-dialog {
-    margin-top: 5vh !important;
 }
 </style>

+ 5 - 12
src/views/equipment/table/eqListTable.vue

@@ -43,8 +43,8 @@
                 style='width:192px;'
             ></el-input>
         </div>
-        <div ref='tableBox' style='height: calc(100% - 115px);'>
-            <el-table :data='tableData' :max-height='tableMaxHeight' style='width: 100%' :border='true' @row-click='rowHandle'>
+        <div ref='tableBox'>
+            <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>
@@ -88,7 +88,7 @@
             :visible.sync='innerVisible'
             append-to-body
         >
-            <eq-detail ref='qdDialog' :row='row' :major='major' :smsxt='smsxt' :diff='diff'></eq-detail>
+            <eq-detail ref='qdDialog' :row='row' :major='major' :smsxt='smsxt' :diff='diff' :sign='sign'></eq-detail>
         </el-dialog>
     </div>
 </template>
@@ -113,9 +113,9 @@ export default {
             sbjc: '',
             row: {},
             floor: '1',
-            tableMaxHeight: 0,
             type_name: '',
             floorAllSelect: [],
+            sign:1,
         }
     },
     computed: {
@@ -130,6 +130,7 @@ export default {
             this.type_name = row.type_name
             this.innerVisible = true
             this.row = row
+            this.sign = 1
         },
         pageChanged(page) {
             this.currentPage = page
@@ -185,10 +186,6 @@ export default {
             console.log(newV, oldV)
             if (newV !== oldV) {
                 this.getList()
-                this.$nextTick(() => {
-                    // 页面渲染完成后的回调
-                    this.tableMaxHeight = this.$refs.tableBox.offsetHeight
-                })
                 this.getFloorAllSelect()
             }
         },
@@ -210,10 +207,6 @@ export default {
     mounted() {
         // this.floor = this.$cookie.get('floorMapId')
         this.getList()
-        this.$nextTick(() => {
-            // 页面渲染完成后的回调
-            this.tableMaxHeight = this.$refs.tableBox.offsetHeight
-        })
         this.getFloorAllSelect()
     },
 }

+ 473 - 0
src/views/equipment/table/equipDetail.vue

@@ -0,0 +1,473 @@
+
+<template>
+    <!-- 详情页面 -->
+    <div class='gdqd-dialog1'>
+        <div class='top'></div>
+        <div class='qdxq-top'>
+            <div class='gdqd-dialog-top'>
+                <!-- <el-input
+                    placeholder='搜索设备简称编号'
+                    style='width:192px;margin-right:12px'
+                    size='small'
+                    prefix-icon='el-icon-search'
+                    v-model='sbjc'
+                    clearable
+                    @keyup.enter.native='queryTableList'
+                    @blur='queryTableList'
+                ></el-input>
+                <Select v-model='sbglgs' width='180' tipPlace='top' caption='管理归属:' size='small' :selectdata='sbglgsOption' @change='queryTableList'></Select>
+                <Select
+                    width='160'
+                    style='margin: 0 12px;'
+                    v-model='status'
+                    tipPlace='top'
+                    caption='设备状态:'
+                    size='small'
+                    :selectdata='statusOption'
+                    @change='queryTableList'
+                ></Select>
+                <el-input
+                    placeholder='搜索品牌、型号'
+                    style='width:180px;margin-right:12px'
+                    size='small'
+                    clearable
+                    prefix-icon='el-icon-search'
+                    v-model='brand'
+                    @keyup.enter.native='queryTableList'
+                    @blur='queryTableList'
+                ></el-input>
+                <Select
+                    width='150'
+                    style='margin-right:12px;'
+                    v-model='floor'
+                    tipPlace='top'
+                    caption='楼层:'
+                    size='small'
+                    :selectdata='floorAllSelect'
+                    @change='queryTableList'
+                ></Select>
+                <el-input
+                    placeholder='搜索安装位置'
+                    @keyup.enter.native='queryTableList'
+                    @blur='queryTableList'
+                    clearable
+                    style='width:180px;margin-right:12px'
+                    size='small'
+                    prefix-icon='el-icon-search'
+                    v-model='wzjc'
+                ></el-input>-->
+                <!-- 多余的筛选 -->
+                <!-- <input-dialog :type='1' @confirm='confirm'></input-dialog> -->
+            </div>
+            <div class='gdqd-dialog-bottom'>
+                <el-table @row-click='innerTable' :data='tableData' :border='true' style='width: 100%;margin-bottom:30px'>
+                    <el-table-column type='index' label='序号' width='60'></el-table-column>
+                    <el-table-column prop='sbjc' label='设备名称' show-overflow-tooltip resizable min-width='338'>
+                        <template slot-scope='{row}'>{{row.sbjc || '--'}}</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='sl' label='数量' width='60'>
+                        <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
+                    </el-table-column>
+                    <el-table-column prop='sbglgs' label='管理归属' show-overflow-tooltip resizable>
+                        <template slot-scope='{row}'>{{row.sbglgs || '--'}}</template>
+                    </el-table-column>
+                    <el-table-column prop='sb_status' label='设备状态' width='80' show-overflow-tooltip resizable>
+                        <template slot-scope='{row}'>{{row.sb_status || '--'}}</template>
+                    </el-table-column>
+                    <el-table-column prop='brand' label='品牌' show-overflow-tooltip resizable width='80'>
+                        <template slot-scope='{row}'>{{row.brand || '--'}}</template>
+                    </el-table-column>
+                    <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable width='100'>
+                        <template slot-scope='{row}'>{{row.sbxh || '--'}}</template>
+                    </el-table-column>
+                    <el-table-column prop='floor' sortable label='楼层' width='70' show-overflow-tooltip resizable>
+                        <template slot-scope='{row}'>{{row.floorcode || '--'}}</template>
+                    </el-table-column>
+                    <el-table-column prop='wzjc' label='安装位置' show-overflow-tooltip resizable min-width='150'>
+                        <template slot-scope='{row}'>{{row.wzjc || '--'}}</template>
+                    </el-table-column>
+                    <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable min-width='220'>
+                        <template slot-scope='{row}'>{{row.manufacturer || '--'}}</template>
+                    </el-table-column>
+                    <el-table-column prop='fws' label='服务商' show-overflow-tooltip resizable min-width='220'>
+                        <template slot-scope='{row}'>{{row.fws || '--'}}</template>
+                    </el-table-column>
+                    <el-table-column prop label='相关资料' show-overflow-tooltip resizable min-width='150'>
+                        <template slot-scope='{row}'>{{'--'}}</template>
+                    </el-table-column>
+                </el-table>
+            </div>
+        </div>
+        <div class='qdxq-bottom'>
+            <div class='wb-title'>
+                <div class='tab-title' id='1' :class='activeId==1?"active-is":""' @click='tabClick(1)'>维保</div>
+                <div class='tab-title' id='2' :class='activeId==2?"active-is":""' @click='tabClick(2)'>维修</div>
+            </div>
+            <div v-if='activeId==1'>
+                <el-tabs v-model='activeName1' @tab-click='handleClickWb'>
+                    <el-tab-pane label='重要维保' name='wb1' v-if='Object.keys(this.detailData).length>0'>
+                        <wbTable ref='wb1' :smsxt='smsxt' tabLabel='重要维保' :diff='diff' :assetnum='row.assetnum' :size='3'></wbTable>
+                    </el-tab-pane>
+                    <el-tab-pane label='日常维保' name='wb2' v-if='Object.keys(this.detailData).length>0'>
+                        <rcwbTable ref='wb2' :smsxt='smsxt' tabLabel='日常维保' :diff='diff' :assetnum='detailData.assetnum' :size='3'></rcwbTable>
+                    </el-tab-pane>
+                </el-tabs>
+            </div>
+            <div v-if='activeId==2'>
+                <el-tabs v-model='activeName2' @tab-click='handleClickWx'>
+                    <el-tab-pane label='重要维修' name='wx1' v-if='Object.keys(this.detailData).length>0'>
+                        <wxTable ref='wx1' :smsxt='smsxt' tabLabel='重要维修' :diff='diff' :assetnum='detailData.assetnum' :size='3'></wxTable>
+                    </el-tab-pane>
+                    <el-tab-pane label='日常维修' name='wx2' v-if='Object.keys(this.detailData).length>0'>
+                        <rcwxTable ref='wx2' :smsxt='smsxt' tabLabel='日常维修' :diff='diff' :assetnum='detailData.assetnum' :size='3'></rcwxTable>
+                    </el-tab-pane>
+                </el-tabs>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+import { Select } from 'meri-design'
+import { mapGetters } from 'vuex'
+import { queryAsset } from '@/api/equipmentList.js'
+import { querySelect } from '@/api/public.js'
+import inputDialog from './inputDIalog'
+import rcwbTable from './rcwbTable'
+import wbTable from './wbTable'
+import rcwxTable from './rcwxTable'
+import wxTable from './wxTable'
+export default {
+    data() {
+        return {
+            tableData: [],
+            dataSelect2: [
+                { id: 'test1', name: '选择项' },
+                { id: 'test2', name: '单平米' },
+                { id: 'test3', name: '下级分项' },
+                { id: 'test4', name: '滑动平均滑动平均' },
+            ],
+            // page: 1,
+            // size: 10,
+            // total: 1,
+            sbjc: '',
+            brand: '',
+            wzjc: '',
+            floor: '1',
+            status: '1',
+            manufacturer: '',
+            fws: '',
+            sbglgs: '1',
+            sbglgsOption: [],
+            statusOption: [],
+            floorAllSelect: [],
+            activeId: '1',
+            activeName1: 'wb1',
+            activeName2: 'wx1',
+            detailData: {},
+        }
+    },
+    components: {
+        Select,
+        inputDialog,
+        rcwbTable,
+        wbTable,
+        rcwxTable,
+        wxTable,
+    },
+    computed: {
+        ...mapGetters(['floorSelect']),
+    },
+    props: ['row', 'major', 'smsxt', 'diff'],
+    mounted() {
+        this.queryTableList()
+        this.tabFind()
+        this.getFloorAllSelect()
+    },
+    methods: {
+        tabClick(item) {
+            this.activeId = item
+        },
+        handleClickWb(label) {
+            console.log(label)
+            console.log(this.$refs[`${label.name}`])
+            this.$refs[`${label.name}`].startMethods()
+        },
+        handleClickWx(label) {
+            this.$refs[`${label.name}`].startMethods()
+        },
+        innerTable(row) {
+            console.log(row)
+            if (row.assetuid) {
+                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=assetdevic&uniqueid=${row.assetuid}`)
+            }
+        },
+        //多余输入框监听
+        confirm(fws, manufacturer) {
+            //console.log(fws, manufacturer, '------')
+            this.fws = fws
+            this.manufacturer = manufacturer
+            this.queryTableList()
+        },
+        //下拉框查询
+        tabFind() {
+            let postParams = [
+                {
+                    columnName: { sbglgs: 'sbglgs', sb_status: 'sb_status' },
+                    params: {
+                        type_code: this.row.type_code,
+                    },
+                    tableName: 'sms_asset', //视图名称
+                },
+            ]
+            let major
+            if (this.major.slice(0, 2) == 'GD') {
+                major = '供电'
+            } else if (this.major.slice(0, 2) == 'XF') {
+                major = '消防'
+            } else if (this.major.slice(0, 2) == 'GPS') {
+                major = '给排水'
+            } else if (this.major.slice(0, 2) == 'DT') {
+                major = '电梯'
+            } else if (this.major.slice(0, 2) == 'RQ') {
+                major = '燃气'
+            } else {
+                major = this.major
+            }
+            let data = {
+                major: major,
+                plazaId: this.$store.state.plazaId,
+            }
+            querySelect({ data, postParams }).then((res) => {
+                //console.log(res)
+                let sb_status = res.data.data.sms_asset.sb_status
+                let sbglgs = res.data.data.sms_asset.sbglgs
+                this.sbglgsOption = []
+                this.sbglgsOption.push({
+                    name: '全部',
+                    id: '1',
+                })
+                this.statusOption = []
+                this.statusOption.push({
+                    name: '全部',
+                    id: '1',
+                })
+                sb_status.forEach((el) => {
+                    this.statusOption.push({
+                        name: el.value,
+                        id: el.key,
+                    })
+                })
+                sbglgs.forEach((el) => {
+                    this.sbglgsOption.push({
+                        name: el.value,
+                        id: el.key,
+                    })
+                })
+            })
+        },
+        queryTableList() {
+            let major
+            if (this.major.slice(0, 2) == 'GD') {
+                major = '供电'
+            } else if (this.major.slice(0, 2) == 'XF') {
+                major = '消防'
+            } else if (this.major.slice(0, 2) == 'GPS') {
+                major = '给排水'
+            } else if (this.major.slice(0, 2) == 'DT') {
+                major = '电梯'
+            } else if (this.major.slice(0, 2) == 'RQ') {
+                major = '燃气'
+            } else {
+                major = this.major
+            }
+            let data = {
+                major: major,
+                plazaId: this.$store.state.plazaId,
+            }
+            //输入框搜索
+            data.keyword = ''
+            if (this.sbjc) {
+                data.keyword += `${this.sbjc}:sbjc,assetnum;`
+            }
+            if (this.brand) {
+                data.keyword += `${this.brand}:brand,sbxh;`
+            }
+            if (this.wzjc) {
+                data.keyword += `${this.wzjc}:wzjc;`
+            }
+            if (this.manufacturer) {
+                data.keyword += `${this.manufacturer}:manufacturer;`
+            }
+            if (this.fws) {
+                data.keyword += `${this.fws}:fws;`
+            }
+            if (data.keyword == '') {
+                delete data.keyword
+            }
+            let postParams = {
+                classstructureid: this.row.classstructureid,
+                type_code: this.row.type_code,
+                manufacturer: this.row.manufacturer || '--',
+                sbxh: this.row.sbxh || '--',
+                brand: this.row.brand || '--',
+            }
+            //下拉筛选
+            if (this.floor && this.floor != 1) {
+                postParams.gname = this.floor
+            }
+            if (this.sbglgs && this.sbglgs != 1) {
+                postParams.sbglgs = this.sbglgs
+            }
+            if (this.status && this.status != 1) {
+                postParams.status = this.status
+            }
+            queryAsset({ data, postParams }).then((res) => {
+                //console.log(res)
+                this.tableData = res.data.data
+                this.detailData = this.tableData[0]
+                console.log(this.detailData)
+                this.total = res.data.count
+            })
+        },
+        getFloorAllSelect() {
+            this.floorAllSelect = []
+            this.floorAllSelect.push({
+                id: '1',
+                name: '全部',
+            })
+            this.floorSelect.forEach((el) => {
+                this.floorAllSelect.push(el)
+            })
+        },
+    },
+    watch: {
+        row: {
+            handler(newV, oldV) {
+                this.queryTableList()
+                this.getFloorAllSelect()
+                this.tabFind()
+                this.handleClickWb()
+            },
+            deep: true,
+        },
+        sbglgs() {
+            this.queryTableList()
+        },
+        status() {
+            this.queryTableList()
+        },
+        floor() {
+            this.queryTableList()
+        },
+    },
+}
+</script>
+<style lang="less" scoped>
+.gdqd-dialog1 {
+    height: 100vh;
+    display: flex;
+    flex-direction: column;
+    .qdxq-top {
+        .gdqd-dialog-top {
+            // margin-bottom: 20px;
+        }
+        .gdqd-dialog-bottom {
+            overflow: hidden;
+            max-height: 9vh;
+        }
+    }
+    .qdxq-bottom {
+        //max-height: 76vh;
+        flex: 1;
+        .wb-title {
+            display: flex;
+            height: 48px;
+            line-height: 48px;
+            background: #f5f6f7;
+            margin: 20px 0;
+            .tab-title {
+                padding: 4px 16px;
+            }
+            &:hover {
+                cursor: pointer;
+                color: #025baa;
+            }
+            .active-is {
+                color: #025baa;
+                border-bottom: 2px solid #025baa;
+                cursor: pointer;
+            }
+        }
+    }
+}
+@media screen and (max-width: 1600px) {
+    .gdqd-dialog td {
+        padding: 4px 0;
+    }
+}
+</style>
+<style lang="less">
+.gdqd-dialog1 {
+    /deep/.el-table td {
+        cursor: pointer;
+    }
+    .qdxq-bottom {
+        .el-tabs--bottom .el-tabs__item.is-bottom:nth-child(2),
+        .el-tabs--bottom .el-tabs__item.is-top:nth-child(2),
+        .el-tabs--top .el-tabs__item.is-bottom:nth-child(2),
+        .el-tabs--top .el-tabs__item.is-top:nth-child(2) {
+            padding-left: 16px;
+        }
+        .el-tabs--bottom .el-tabs__item.is-bottom:last-child,
+        .el-tabs--bottom .el-tabs__item.is-top:last-child,
+        .el-tabs--top .el-tabs__item.is-bottom:last-child,
+        .el-tabs--top .el-tabs__item.is-top:last-child {
+            padding-right: 16px;
+        }
+        .el-tabs__nav-wrap::after {
+            height: 0;
+        }
+        .el-tabs {
+            height: 95vh;
+        }
+        .el-tabs__content {
+            height: calc(100% - 45px);
+            /deep/ .el-tab-pane > div {
+                height: 100% !important;
+            }
+        }
+        .is-active {
+            color: #025baa !important;
+            border-color: #025baa !important;
+        }
+        .el-tabs__item {
+            padding: 5px 16px;
+            height: 30px;
+            line-height: 22px;
+            font-size: 14px;
+            font-family: MicrosoftYaHei;
+            color: rgba(31, 36, 41, 1);
+            border: 1px solid rgba(195, 199, 203, 1);
+        }
+
+        /deep/ .el-tabs__item:last-child {
+            border-radius: 0px 4px 4px 0px;
+        }
+        /deep/ .el-tabs__item:nth-child(2) {
+            border-radius: 4px 0px 0px 4px;
+        }
+        .el-tab-pane {
+            height: 100% !important;
+        }
+        .el-tabs__active-bar {
+            background-color: transparent !important;
+        }
+    }
+}
+/deep/.el-dialog {
+    margin-top: 5vh !important;
+}
+</style>

+ 3 - 12
src/views/equipment/table/otherTable.vue

@@ -37,8 +37,8 @@
                 @change='getList'
             ></Select>
         </div>
-        <div ref='tableBox' style='height: calc(100% - 115px);'>
-            <el-table :data='tableData' :max-height='tableMaxHeight' :border='true' style='width: 100%'>
+        <div ref='tableBox'>
+            <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'>
@@ -103,8 +103,7 @@ export default {
             keyword: '',
             handleresults: '1',
             handledate: '',
-            handleOption: [],
-            tableMaxHeight: 0
+            handleOption: []
         }
     },
     props: ['major', 'smsxt', 'tabLabel'],
@@ -216,10 +215,6 @@ export default {
             if (newV !== oldV) {
                 this.tabFind()
                 this.getList()
-                this.$nextTick(() => {
-                    // 页面渲染完成后的回调
-                    this.tableMaxHeight = this.$refs.tableBox.offsetHeight
-                })
             }
         },
         handleresults() {
@@ -230,10 +225,6 @@ export default {
         this.tabFind()
         //console.log(this.smsxt)
         this.getList()
-        this.$nextTick(() => {
-            // 页面渲染完成后的回调
-            this.tableMaxHeight = this.$refs.tableBox.offsetHeight
-        })
     }
 }
 </script>

+ 6 - 11
src/views/equipment/table/rcwbTable.vue

@@ -68,8 +68,8 @@
             </div>
             <input-dialog :type='6' @confirm='confirm'></input-dialog>
         </div>
-        <div ref='tableBox' style='height: calc(100% - 115px);'>
-            <el-table :data='tableData' :max-height='tableMaxHeight' :border='true' style='width: 100%' @row-click='innerTable'>
+        <div ref='tableBox'>
+            <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 label='设备名称' show-overflow-tooltip resizable min-width='434'>
                     <template slot-scope='{row}'>{{row.sbmc||'--'}}</template>
@@ -195,7 +195,6 @@ export default {
             ycgdtbsj: '',
             complete: '',
             ycgdyssj: '',
-            tableMaxHeight: 0,
         }
     },
     props: ['smsxt', 'diff', 'tabLabel', 'size', 'assetnum'],
@@ -289,6 +288,9 @@ export default {
                 size: this.size,
                 orderBy: 'wb_gzglid,0;assetnum,1;reportedby,0;',
             }
+            if (this.assetnum) {
+                data.assetnum = this.assetnum
+            }
             //下拉
             if (this.ischange && this.ischange != '全部') {
                 data.zt = this.ischange
@@ -354,10 +356,6 @@ export default {
         startMethods() {
             this.changeSelect()
             this.getList()
-            this.$nextTick(() => {
-                // 页面渲染完成后的回调
-                this.tableMaxHeight = this.$refs.tableBox.offsetHeight
-            })
         },
     },
     watch: {
@@ -370,10 +368,6 @@ export default {
             if (newV !== oldV) {
                 this.changeSelect()
                 this.getList()
-                this.$nextTick(() => {
-                    // 页面渲染完成后的回调
-                    this.tableMaxHeight = this.$refs.tableBox.offsetHeight
-                })
             }
         },
         ischange() {
@@ -381,6 +375,7 @@ export default {
         },
     },
     mounted() {
+        console.log(this.assetnum)
         this.startMethods()
     },
 }

+ 6 - 7
src/views/equipment/table/rcwxTable.vue

@@ -53,8 +53,8 @@
             ></el-input>
             <input-dialog :type='5' @confirm='confirm'></input-dialog>
         </div>
-        <div ref='tableBox' style='height: calc(100% - 115px);'>
-            <el-table :data='tableData' :max-height='tableMaxHeight' :border='true' style='width: 100%' @row-click='innerTable'>
+        <div ref='tableBox'>
+            <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>
@@ -150,7 +150,7 @@ export default {
             people: '',
             locationName: '',
             keyword: '',
-            tableMaxHeight: 0,
+         
         }
     },
     computed: {
@@ -194,6 +194,9 @@ export default {
                     size: this.size,
                 },
             }
+            if (this.assetnum) {
+                getParamsdata.assetnum = this.assetnum
+            }
             //下拉
             if (this.reportdate) {
                 getParams.data.schedfinishStartDate = this.reportdate[0] + '000000'
@@ -241,10 +244,6 @@ export default {
         startMethods() {
             this.tabFind()
             this.getList()
-            this.$nextTick(() => {
-                // 页面渲染完成后的回调
-                this.tableMaxHeight = this.$refs.tableBox.offsetHeight
-            })
         },
         //下拉框查询
         tabFind() {

+ 5 - 12
src/views/equipment/table/standTable.vue

@@ -43,8 +43,8 @@
                 style='width:192px;'
             ></el-input>
         </div>
-        <div ref='tableBox' style='height: calc(100% - 115px);'>
-            <el-table :data='tableData' :max-height='tableMaxHeight' :border='true' style='width: 100%' @row-click='rowHandle'>
+        <div ref='tableBox'>
+            <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 min-width='300'>
                     <template slot-scope='{row}'>{{row.type_name || '--'}}</template>
@@ -80,7 +80,7 @@
         </div>
         <!-- 标准表格详情钻取表 -->
         <el-dialog width='90%' style='height:900px;overflow: hidden;' :title='`${InfoName}-${type_name}`' :visible.sync='innerVisible' append-to-body>
-            <eq-detail ref='qdDialog' :row='row' :major='major' :smsxt='smsxt' :diff='diff'></eq-detail>
+            <eq-detail ref='qdDialog' :row='row' :major='major' :smsxt='smsxt' :diff='diff' :sign='sign'></eq-detail>
         </el-dialog>
     </div>
 </template>
@@ -106,8 +106,8 @@ export default {
             sbjc: '',
             manufacturer: '',
             type_name: '',
-            tableMaxHeight: 0,
             floorAllSelect: [],
+            sign:1
         }
     },
     props: ['major', 'param', 'InfoName','smsxt','diff'],
@@ -123,6 +123,7 @@ export default {
             this.type_name = row.type_name
             this.innerVisible = true
             this.row = row
+            this.sign = 1
         },
         pageChanged(page) {
             this.currentPage = page
@@ -190,10 +191,6 @@ export default {
         param(newV, oldV) {
             if (newV !== oldV) {
                 this.getList()
-                this.$nextTick(() => {
-                    // 页面渲染完成后的回调
-                    this.tableMaxHeight = this.$refs.tableBox.offsetHeight
-                })
                 this.getFloorAllSelect()
             }
         },
@@ -214,10 +211,6 @@ export default {
     mounted() {
         // this.floor = this.$cookie.get('floorMapId')
         this.getList()
-        this.$nextTick(() => {
-            // 页面渲染完成后的回调
-            this.tableMaxHeight = this.$refs.tableBox.offsetHeight
-        })
         this.getFloorAllSelect()
     },
 }

+ 22 - 28
src/views/equipment/table/wbTable.vue

@@ -64,8 +64,8 @@
             </div>
             <input-dialog :type='2' @confirm='confirm'></input-dialog>
         </div>
-        <div ref='tableBox' style='height: calc(100% - 115px);'>
-            <el-table :data='tableData' :max-height='tableMaxHeight' :border='true' style='width: 100%' @row-click='innerTable'>
+        <div ref='tableBox'>
+            <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>
@@ -156,27 +156,26 @@ export default {
             changeOption: [
                 {
                     id: '2',
-                    name: '全部'
+                    name: '全部',
                 },
                 {
                     id: '1',
-                    name: '是'
+                    name: '是',
                 },
                 {
                     id: ' 0',
-                    name: '否'
-                }
+                    name: '否',
+                },
             ],
             imgUrl: [],
             shjc: '',
             gzglid: '',
-            matters: '',
-            tableMaxHeight: 0
+            matters: ''
         }
     },
-    props: ['smsxt', 'diff', 'tabLabel','size','assetnum'],
+    props: ['smsxt', 'diff', 'tabLabel', 'size', 'assetnum'],
     computed: {
-        ...mapGetters(['floorSelect'])
+        ...mapGetters(['floorSelect']),
     },
     methods: {
         //序号的方法
@@ -220,8 +219,11 @@ export default {
                     diff: this.diff,
                     plazaId: this.$store.state.plazaId,
                     page: this.currentPage,
-                    size: this.size
-                }
+                    size: this.size,
+                },
+            }
+            if (this.assetnum) {
+                getParams.data.assetnum = this.assetnum
             }
             //下拉
             if (this.ischange && this.ischange != 2) {
@@ -251,7 +253,7 @@ export default {
             if (getParams.data.keyword == '') {
                 delete getParams.data.keyword
             }
-            queryWbsms(getParams).then(res => {
+            queryWbsms(getParams).then((res) => {
                 this.tableData = res.data || []
                 this.total = res.count
             })
@@ -259,32 +261,24 @@ export default {
         clickPic(row) {
             this.imgUrl = []
             if (row) {
-                row.forEach(el => {
+                row.forEach((el) => {
                     let obj = {
                         name: el.description,
-                        url: el.url
+                        url: el.url,
                     }
                     this.imgUrl.push(obj)
                 })
             }
             this.$refs.picLargeOpen.open(this.imgUrl)
         },
-        startMethods(){
+        startMethods() {
             this.getList()
-            this.$nextTick(() => {
-                // 页面渲染完成后的回调
-                this.tableMaxHeight = this.$refs.tableBox.offsetHeight
-            })
-        }
+        },
     },
     watch: {
         diff(newV, oldV) {
             if (newV !== oldV) {
                 this.getList()
-                this.$nextTick(() => {
-                    // 页面渲染完成后的回调
-                    this.tableMaxHeight = this.$refs.tableBox.offsetHeight
-                })
             }
         },
         tabLabel(newV, oldV) {
@@ -295,11 +289,11 @@ export default {
         },
         ischange() {
             this.getList()
-        }
+        },
     },
     mounted() {
-       this.startMethods()
-    }
+        this.startMethods()
+    },
 }
 </script>
 <style lang="less" scoped>

+ 5 - 15
src/views/equipment/table/wxTable.vue

@@ -64,8 +64,8 @@
             </div>
             <input-dialog :type='3' @confirm='confirm'></input-dialog>
         </div>
-        <div ref='tableBox' style='height: calc(100% - 115px);'>
-            <el-table :data='tableData' :max-height='tableMaxHeight' :border='true' style='width: 100%' @row-click='innerTable'>
+        <div ref='tableBox'>
+            <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>
@@ -171,7 +171,6 @@ export default {
                 },
             ],
             keyword: '',
-            tableMaxHeight: 0,
         }
     },
     computed: {
@@ -213,6 +212,9 @@ export default {
                     size: this.size,
                 },
             }
+            if (this.assetnum) {
+                getParams.data.assetnum = this.assetnum
+            }
             //下拉
             if (this.ischange && this.ischange != 2) {
                 getParams.data.ismodel = this.ischange
@@ -260,30 +262,18 @@ export default {
         },
         startMethods() {
             this.getList()
-            this.$nextTick(() => {
-                // 页面渲染完成后的回调
-                this.tableMaxHeight = this.$refs.tableBox.offsetHeight
-            })
         },
     },
     watch: {
         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() {

+ 1 - 11
src/views/equipment/table/zwTable.vue

@@ -62,10 +62,9 @@
             <!-- placeholder='选择验收时间' -->
             <input-dialog v-if='statusOption.length>0' :statusOption='statusOption' :type='4' @confirm='confirm'></input-dialog>
         </div>
-        <div ref='tableBox' style='height: calc(100% - 115px);'>
+        <div ref='tableBox'>
             <el-table
                 :data='tableData'
-                :max-height='tableMaxHeight'
                 :border='true'
                 style='width: 100%'
                 @row-click='innerTable'
@@ -153,7 +152,6 @@ export default {
             sxjdOption: [],
             xmOption: [],
             lbOption: [],
-            tableMaxHeight: 0,
         }
     },
     computed: {
@@ -324,10 +322,6 @@ export default {
             if (newV !== oldV) {
                 this.tabFind()
                 this.getList()
-                this.$nextTick(() => {
-                    // 页面渲染完成后的回调
-                    this.tableMaxHeight = this.$refs.tableBox.offsetHeight
-                })
             }
         },
         tabLabel(newV, oldV) {
@@ -357,10 +351,6 @@ export default {
     mounted() {
         this.tabFind()
         this.getList()
-        this.$nextTick(() => {
-            // 页面渲染完成后的回调
-            this.tableMaxHeight = this.$refs.tableBox.offsetHeight
-        })
     },
 }
 </script>

+ 27 - 27
vue.config.js

@@ -1,17 +1,17 @@
-const CompressionPlugin = require('compression-webpack-plugin')
+const CompressionPlugin = require("compression-webpack-plugin")
 module.exports = {
     devServer: {
         port: 8090,
         proxy: {
-            '/data': {
-                // target: "http://60.205.177.43",
-                target: 'http://10.199.143.126',
+            "/data": {
+                target: "http://60.205.177.43",
+                //target: 'http://10.199.143.126',
                 // target: 'http://192.168.200.11:9003', //yll
                 // target: 'http://localhost:6040/data/',
                 changeOrigin: true,
                 secure: false,
                 pathRewrite: {
-                    '^/data': '/data',
+                    "^/data": "/data",
                 },
             },
             // // 工程信息化服务
@@ -24,27 +24,27 @@ module.exports = {
             //     },
             // },
             // 万达蜂鸟服务
-            '/wdfn': {
-                target: 'http://map.wanda.cn',
+            "/wdfn": {
+                target: "http://map.wanda.cn",
                 changeOrigin: true,
                 pathRewrite: {
-                    '^/wdfn': '/editor',
+                    "^/wdfn": "/editor",
                 },
             },
             // 图例库服务
-            '/serve': {
+            "/serve": {
                 // target: 'http://192.168.200.87:8088',
-                target: 'http://60.205.177.43:8080',
+                target: "http://60.205.177.43:8080",
                 changeOrigin: true,
                 pathRewrite: {
-                    '^/serve': '',
+                    "^/serve": "",
                 },
             },
-            '/version': {
-                target: 'http://mapapp.wanda.cn/',
+            "/version": {
+                target: "http://mapapp.wanda.cn/",
                 changeOrigin: true,
                 pathRewrite: {
-                    '^/version': '/sgmap/mapversion',
+                    "^/version": "/sgmap/mapversion",
                 },
             },
         },
@@ -56,27 +56,27 @@ module.exports = {
         },
     },
     chainWebpack: (config) => {
-        const svgRule = config.module.rule('svg')
+        const svgRule = config.module.rule("svg")
         svgRule.uses.clear()
         svgRule
-            .use('babel-loader')
-            .loader('babel-loader')
+            .use("babel-loader")
+            .loader("babel-loader")
             .end()
-            .use('vue-svg-loader')
-            .loader('vue-svg-loader')
-        config.output.filename('static/js/[name].[hash].js').end()
-        config.output.chunkFilename('static/js/[name].[hash].js').end()
+            .use("vue-svg-loader")
+            .loader("vue-svg-loader")
+        config.output.filename("static/js/[name].[hash].js").end()
+        config.output.chunkFilename("static/js/[name].[hash].js").end()
     },
     lintOnSave: false,
-    publicPath: '/wandaBmGuide',
+    publicPath: "/wandaBmGuide",
     // 打包名称
-    outputDir: 'wandaBmGuide',
+    outputDir: "wandaBmGuide",
     // 放置生成的静态资源 (js、css、img、fonts) 的 (相对于 outputDir 的) 目录
-    assetsDir: 'static',
+    assetsDir: "static",
     transpileDependencies: [
-        '@saga-web', // 指定对第三方依赖包进行babel-polyfill处理
-        '@ant-design',
-        'element-ui',
+        "@saga-web", // 指定对第三方依赖包进行babel-polyfill处理
+        "@ant-design",
+        "element-ui",
     ],
     productionSourceMap: false, //
     // CSS 相关选项