Browse Source

维修维保设备钻取表的基本完成

lizhuang 4 years ago
parent
commit
a4f2d7338c

+ 10 - 4
src/views/equipment/eqDialog.vue

@@ -28,6 +28,8 @@
                 <standTable
                     v-else-if='dialogInfo.id.slice(2,4)=="QD"'
                     :param='param'
+                    :smsxt='smsxt'
+                    :diff='diff'
                     :major='dialogInfo.id'
                     :InfoName='`${systemName}-${dialogInfo.label}`'
                 ></standTable>
@@ -51,6 +53,8 @@
                             v-if='value.id.slice(0,4)=="RDQD"'
                             :InfoName='`${systemName}-${dialogInfo.label}`'
                             :param='param'
+                            :smsxt='smsxt'
+                            :diff='diff'
                             ref='list1'
                             major='弱电'
                         ></tableList>
@@ -58,17 +62,19 @@
                             v-else-if='value.id.slice(0,4)=="NTQD"'
                             :InfoName='`${systemName}-${dialogInfo.label}`'
                             :param='param'
+                            :smsxt='smsxt'
+                            :diff='diff'
                             ref='list2'
                             major='暖通'
                         ></tableList>
                         <!-- 重要维保表格 -->
-                        <wb-table v-else-if='value.id.slice(2,4)=="WB"' :smsxt='smsxt' :tabLabel='tabLabel' :diff='diff' :major='dialogInfo.id'></wb-table>
+                        <wb-table v-else-if='value.id.slice(2,4)=="WB"' :smsxt='smsxt' :tabLabel='tabLabel' :diff='diff' :size='10'></wb-table>
                         <!-- 日常维保表格 -->
-                        <rcwb-table v-else-if='value.id=="RB"' :smsxt='smsxt' :tabLabel='tabLabel' :diff='diff' :major='dialogInfo.id'></rcwb-table>
+                        <rcwb-table v-else-if='value.id=="RB"' :smsxt='smsxt' :tabLabel='tabLabel' :diff='diff' :size='10'></rcwb-table>
                         <!-- 重要维修的表格 -->
-                        <wx-table v-else-if='value.id.slice(2,4)=="WX"' :smsxt='smsxt' :tabLabel='tabLabel' :diff='diff' :major='dialogInfo.id'></wx-table>
+                        <wx-table v-else-if='value.id.slice(2,4)=="WX"' :smsxt='smsxt' :tabLabel='tabLabel' :diff='diff' :size='10'></wx-table>
                         <!-- 日常维修的表格 -->
-                        <rcwx-table v-else-if='value.id=="RX"' :smsxt='smsxt' :tabLabel='tabLabel' :diff='diff' :major='dialogInfo.id'></rcwx-table>
+                        <rcwx-table v-else-if='value.id=="RX"' :smsxt='smsxt' :tabLabel='tabLabel' :diff='diff' :size='10'></rcwx-table>
                         <!-- 专维 -->
                         <zw-table v-else-if='value.id.slice(2,4)=="ZW"' :smsxt='smsxt' :tabLabel='tabLabel' :diff='difference' :major='dialogInfo.id'></zw-table>
                         <!-- 其他 -->

+ 179 - 73
src/views/equipment/table/eqDetaileDialog.vue

@@ -59,59 +59,75 @@
                 <!-- 多余的筛选 -->
                 <input-dialog :type='1' @confirm='confirm'></input-dialog>
             </div>
-            <el-table @row-click='innerTable' :data='tableData' :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='sonpage'
-                    :page-size='size'
-                    @prev-click='pageChanged'
-                    @next-click='pageChanged'
-                    @current-change='pageChanged'
-                ></el-pagination>
-            </div>-->
+            <div class="gdqd-dialog-bottom">
+                <el-table @row-click='innerTable' :data='tableData' :border='true' style='width: 100%;amrgin-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">
+                        <wbTable ref="wb1" :smsxt='smsxt' tabLabel='重要维保' :diff='diff' :size='3'></wbTable>
+                    </el-tab-pane>
+                    <el-tab-pane label="日常维保" name="wb2">
+                        <rcwbTable ref="wb2" :smsxt='smsxt' tabLabel='日常维保'  :diff='diff' :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' :size='3'></wxTable>
+                    </el-tab-pane>
+                    <el-tab-pane label="日常维修" name="wx2">
+                        <rcwxTable ref="wx2" :smsxt='smsxt' tabLabel='日常维修' :diff='diff' :size='3'></rcwxTable>
+                    </el-tab-pane>
+                </el-tabs>
+            </div>
         </div>
-        <div class='qdxq-bottom'></div>
     </div>
 </template>
 <script>
@@ -120,6 +136,10 @@ 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 {
@@ -131,8 +151,8 @@ export default {
                 { id: 'test4', name: '滑动平均滑动平均' },
             ],
             // page: 1,
-            size: 10,
-            total: 1,
+            // size: 10,
+            // total: 1,
             sbjc: '',
             brand: '',
             wzjc: '',
@@ -144,34 +164,46 @@ export default {
             sbglgsOption: [],
             statusOption: [],
             floorAllSelect: [],
+            activeId:'1',
+            activeName1:'wb1',
+            activeName2:'wx1'
         }
     },
     components: {
         Select,
         inputDialog,
+        rcwbTable,
+        wbTable,
+        rcwxTable,
+        wxTable
     },
     computed: {
         ...mapGetters(['floorSelect']),
     },
-    props: ['row', 'major', 'sonpage'],
+    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}`)
             }
         },
-        //序号的方法
-        indexMethod(index) {
-            if (this.sonpage) {
-                return (this.sonpage - 1) * this.size + index + 1
-            }
-        },
         //多余输入框监听
         confirm(fws, manufacturer) {
             //console.log(fws, manufacturer, '------')
@@ -236,10 +268,6 @@ export default {
                 })
             })
         },
-        pageChanged(page) {
-            this.sonpage = page
-            this.queryTableList()
-        },
         queryTableList() {
             let major
             if (this.major.slice(0, 2) == 'GD') {
@@ -257,9 +285,7 @@ export default {
             }
             let data = {
                 major: major,
-                plazaId: this.$store.state.plazaId,
-                page: this.sonpage,
-                size: this.size,
+                plazaId: this.$store.state.plazaId
             }
             //输入框搜索
             data.keyword = ''
@@ -313,7 +339,6 @@ export default {
             this.floorSelect.forEach((el) => {
                 this.floorAllSelect.push(el)
             })
-            console.log(this.floorAllSelect)
         },
     },
     watch: {
@@ -322,6 +347,7 @@ export default {
                 this.queryTableList()
                 this.getFloorAllSelect()
                 this.tabFind()
+                this.handleClickWb()
             },
             deep: true,
         },
@@ -339,16 +365,41 @@ export default {
 </script>
 <style lang="less" scoped>
 .gdqd-dialog {
-    height: 100%;
+    height: 100vh;
+    display: flex;
+    flex-direction: column;
     .qdxq-top {
-        overflow: auto;
-        max-height: 50%;
         .gdqd-dialog-top {
             margin-bottom: 20px;
         }
+        .gdqd-dialog-bottom{
+            overflow: auto;
+            max-height: calc(24vh - 32px);
+            
+        }
     }
     .qdxq-bottom {
-        max-height: 50%;
+        //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) {
@@ -362,5 +413,60 @@ export default {
     /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: 38vh;
+        }
+        .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>

+ 2 - 4
src/views/equipment/table/eqListTable.vue

@@ -88,7 +88,7 @@
             :visible.sync='innerVisible'
             append-to-body
         >
-            <eq-detail ref='qdDialog' :row='row' :major='major' :sonpage='sonpage'></eq-detail>
+            <eq-detail ref='qdDialog' :row='row' :major='major' :smsxt='smsxt' :diff='diff'></eq-detail>
         </el-dialog>
     </div>
 </template>
@@ -106,7 +106,6 @@ export default {
             tableData: [],
             total: 0,
             currentPage: 1,
-            sonpage: 1,
             size: 10,
             innerVisible: false, //详情弹框
             keyword: '',
@@ -122,7 +121,7 @@ export default {
     computed: {
         ...mapGetters(['floorSelect']),
     },
-    props: ['param', 'major', 'systemName', 'InfoName'],
+    props: ['param', 'major', 'systemName', 'InfoName','smsxt','diff'],
     methods: {
         indexMethod(index) {
             return (this.currentPage - 1) * this.size + index + 1
@@ -131,7 +130,6 @@ export default {
             this.type_name = row.type_name
             this.innerVisible = true
             this.row = row
-            this.sonpage = 1
         },
         pageChanged(page) {
             this.currentPage = page

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

@@ -161,7 +161,6 @@ export default {
             tableData: [],
             total: 0,
             currentPage: 1,
-            size: 10,
             reportdate: '',
             ischange: '全部',
             sbjc: '',
@@ -199,7 +198,7 @@ export default {
             tableMaxHeight: 0,
         }
     },
-    props: ['smsxt', 'major', 'diff', 'tabLabel'],
+    props: ['smsxt', 'diff', 'tabLabel','size'],
     computed: {
         ...mapGetters(['floorSelect', 'plazaId']),
     },
@@ -282,14 +281,13 @@ export default {
                 }
             })
         },
-        getList() {
-           
+        getList() {     
             let data = {
                 smsxt: this.smsxt,
                 plazaId: this.plazaId,
                 page: this.currentPage,
                 size: this.size,
-                //orderBy: 'wb_gzglid,0;assetnum,1;reportedby,0;',
+                orderBy: 'wb_gzglid,0;assetnum,1;reportedby,0;',
             }
             //下拉
             if (this.ischange && this.ischange != '全部') {
@@ -353,6 +351,14 @@ export default {
             }
             this.$refs.picLargeOpen.open(this.imgUrl)
         },
+        startMethods(){
+            this.changeSelect()
+            this.getList()
+            this.$nextTick(() => {
+                // 页面渲染完成后的回调
+                this.tableMaxHeight = this.$refs.tableBox.offsetHeight
+            })
+        }
     },
     watch: {
         diff(newV, oldV) {
@@ -375,12 +381,7 @@ export default {
         },
     },
     mounted() {
-        this.changeSelect()
-        this.getList()
-        this.$nextTick(() => {
-            // 页面渲染完成后的回调
-            this.tableMaxHeight = this.$refs.tableBox.offsetHeight
-        })
+       this.startMethods()
     },
 }
 </script>

+ 50 - 25
src/views/equipment/table/rcwxTable.vue

@@ -69,22 +69,22 @@
                     <template slot-scope='{row}'>{{row.wonum || '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='description' label='报修来源' show-overflow-tooltip resizable min-width='340'>
-                    <template slot-scope='{row}'>{{row.description || '--'}}</template>
+                    <template slot-scope='{row}'>{{row.bxfwlymc || '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='description' label='执行人' show-overflow-tooltip resizable min-width='340'>
-                    <template slot-scope='{row}'>{{row.description || '--'}}</template>
+                    <template slot-scope='{row}'>{{row.lead || '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='reportdate' label='要求完成时间' width='140'>
-                    <template slot-scope='{row}'>{{row.reportdate?formatterTime(row.reportdate): '--'}}</template>
+                    <template slot-scope='{row}'>{{row.schedfinish?formatterTime(row.schedfinish): '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='sjjssj' label='实际完工时间' width='140'>
-                    <template slot-scope='{row}'>{{row.sjjssj?formatterTime(row.sjjssj): '--'}}</template>
+                    <template slot-scope='{row}'>{{row.wotjyssj?formatterTime(row.wotjyssj): '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='matters' label='位置名称' width='180' show-overflow-tooltip resizable>
-                    <template slot-scope='{row}'>{{row.matters || '--'}}</template>
+                    <template slot-scope='{row}'>{{row.wzjc || '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='description' label='位置内码' show-overflow-tooltip resizable min-width='340'>
-                    <template slot-scope='{row}'>{{row.description || '--'}}</template>
+                    <template slot-scope='{row}'>{{row.location || '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='brand' label='保修照片' width='80'>
                     <template slot-scope='{row}'>
@@ -127,6 +127,7 @@ import { queryWx } from '@/api/equipmentList.js'
 import { mapGetters } from 'vuex'
 import inputDialog from './inputDIalog'
 import { Select } from 'meri-design'
+import { querySelect } from '@/api/public.js'
 import { formatterTime, number_format } from '@/utils/format.js'
 export default {
     components: { Select, inputDialog },
@@ -135,7 +136,6 @@ export default {
             tableData: [],
             total: 0,
             currentPage: 1,
-            size: 10,
             reportdate: '',
             sjjssj: '',
             sbjc: '',
@@ -143,7 +143,7 @@ export default {
             wonum2: '',
             wonum: '',
             sourceOption: [],
-            source: '',
+            source: '全部',
             formatterTime,
             number_format,
             imgUrl: [],
@@ -156,7 +156,7 @@ export default {
     computed: {
         ...mapGetters(['floorSelect']),
     },
-    props: ['smsxt', 'major', 'diff', 'tabLabel'],
+    props: ['smsxt', 'diff', 'tabLabel','size'],
     methods: {
         //序号的方法
         indexMethod(index) {
@@ -236,34 +236,59 @@ export default {
             }
             this.$refs.picLargeOpen.open(this.imgUrl)
         },
+        startMethods(){
+            this.tabFind()
+            this.getList()
+            this.$nextTick(() => {
+                // 页面渲染完成后的回调
+                this.tableMaxHeight = this.$refs.tableBox.offsetHeight
+            })
+        },
+         //下拉框查询
+        tabFind() {
+            let postParams = [
+                {
+                    columnName: { bxfwly: 'bxfwlymc' },
+                    params: {
+                        smsxt: this.smsxt,
+                    },
+                    tableName: 'sms_wxzy', //视图名称
+                },
+            ] 
+            let data = {
+                plazaId: this.$store.state.plazaId,
+            }
+            querySelect({ data, postParams }).then((res) => {
+                //console.log(res)
+                let bxfwlymc = res.data && res.data.data && res.data.data.sms_zxzy?res.data.data.sms_zxzy.bxfwlymc:[]
+                this.sourceOption = []
+                this.sourceOption.push({
+                    name: '全部',
+                    id: '1',
+                })
+                bxfwlymc.forEach((el) => {
+                    this.sourceOption.push({
+                        name: el.value,
+                        id: el.key,
+                    })
+                })
+            })
+        },
     },
     watch: {
         diff(newV, oldV) {
             if (newV !== oldV) {
-                this.getList()
-                this.$nextTick(() => {
-                    // 页面渲染完成后的回调
-                    this.tableMaxHeight = this.$refs.tableBox.offsetHeight
-                })
+               this.startMethods()
             }
         },
         tabLabel(newV, oldV) {
             if (newV !== oldV) {
-                // this.tabFind()
-                this.getList()
-                this.$nextTick(() => {
-                    // 页面渲染完成后的回调
-                    this.tableMaxHeight = this.$refs.tableBox.offsetHeight
-                })
+             this.startMethods()
             }
         },
     },
     mounted() {
-        this.getList()
-        this.$nextTick(() => {
-            // 页面渲染完成后的回调
-            this.tableMaxHeight = this.$refs.tableBox.offsetHeight
-        })
+        this.startMethods()
     },
 }
 </script>

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

@@ -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' :sonpage='sonpage'></eq-detail>
+            <eq-detail ref='qdDialog' :row='row' :major='major' :smsxt='smsxt' :diff='diff'></eq-detail>
         </el-dialog>
     </div>
 </template>
@@ -99,7 +99,6 @@ export default {
             tableData: [],
             total: 0,
             currentPage: 1,
-            sonpage: 1,
             size: 10,
             keyword: '',
             floor: '1',
@@ -111,7 +110,7 @@ export default {
             floorAllSelect: [],
         }
     },
-    props: ['major', 'param', 'InfoName'],
+    props: ['major', 'param', 'InfoName','smsxt','diff'],
     components: { EqDetail, Select },
     computed: {
         ...mapGetters(['floorSelect']),
@@ -124,9 +123,8 @@ export default {
             this.type_name = row.type_name
             this.innerVisible = true
             this.row = row
-            this.sonpage = 1
         },
-        pageChanged(page, size) {
+        pageChanged(page) {
             this.currentPage = page
             this.getList()
         },

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

@@ -59,7 +59,6 @@ import { mapGetters } from 'vuex'
 export default {
     data() {
         return {
-            pageSize: 10,
             tableData: [],
             total: 0,
             currentPage: 1,
@@ -77,7 +76,7 @@ export default {
         indexMethod(index) {
             return (this.currentPage - 1) * this.size + index + 1
         },
-        pageChanged(page, size) {
+        pageChanged(page) {
             this.currentPage = page
             this.getList()
         },

+ 9 - 7
src/views/equipment/table/wbTable.vue

@@ -147,7 +147,6 @@ export default {
             tableData: [],
             total: 0,
             currentPage: 1,
-            size: 10,
             sjjssj: '',
             reportdate: '',
             ischange: '2',
@@ -175,7 +174,7 @@ export default {
             tableMaxHeight: 0
         }
     },
-    props: ['smsxt', 'major', 'diff', 'tabLabel'],
+    props: ['smsxt', 'diff', 'tabLabel','size'],
     computed: {
         ...mapGetters(['floorSelect'])
     },
@@ -269,6 +268,13 @@ export default {
                 })
             }
             this.$refs.picLargeOpen.open(this.imgUrl)
+        },
+        startMethods(){
+            this.getList()
+            this.$nextTick(() => {
+                // 页面渲染完成后的回调
+                this.tableMaxHeight = this.$refs.tableBox.offsetHeight
+            })
         }
     },
     watch: {
@@ -292,11 +298,7 @@ export default {
         }
     },
     mounted() {
-        this.getList()
-        this.$nextTick(() => {
-            // 页面渲染完成后的回调
-            this.tableMaxHeight = this.$refs.tableBox.offsetHeight
-        })
+       this.startMethods()
     }
 }
 </script>

+ 9 - 7
src/views/equipment/table/wxTable.vue

@@ -147,7 +147,6 @@ export default {
             tableData: [],
             total: 0,
             currentPage: 1,
-            size: 10,
             reportdate: '',
             sjjssj: '',
             ischange: '2',
@@ -178,7 +177,7 @@ export default {
     computed: {
         ...mapGetters(['floorSelect']),
     },
-    props: ['smsxt', 'major', 'diff', 'tabLabel'],
+    props: ['smsxt', 'diff', 'tabLabel','size'],
     methods: {
         //序号的方法
         indexMethod(index) {
@@ -259,6 +258,13 @@ export default {
             }
             this.$refs.picLargeOpen.open(this.imgUrl)
         },
+        startMethods(){
+            this.getList()
+            this.$nextTick(() => {
+                // 页面渲染完成后的回调
+                this.tableMaxHeight = this.$refs.tableBox.offsetHeight
+            })
+        }
     },
     watch: {
         diff(newV, oldV) {
@@ -285,11 +291,7 @@ export default {
         },
     },
     mounted() {
-        this.getList()
-        this.$nextTick(() => {
-            // 页面渲染完成后的回调
-            this.tableMaxHeight = this.$refs.tableBox.offsetHeight
-        })
+       this.startMethods()
     },
 }
 </script>