Ver código fonte

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

yx 4 anos atrás
pai
commit
83b89309c3

+ 268 - 158
src/views/equipment/table/eqDetaileDialog.vue

@@ -2,111 +2,125 @@
     <!-- 详情页面 -->
     <div class='gdqd-dialog'>
         <div class='top'></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 class='gdqd-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' :key='key' :border='true' style='width: 100%' :highlight-current-row='true'>
+                    <el-table-column type='index' label='序号' width='60'></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='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>
         </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 class='table-bottom'>
+            <!-- 页签切换 -->
+            <div class='title'>
+                <div class='text'>维保:</div>
+                <div class='d-tab d-tab-left' :class='{active:currentTab === 0}' @click='changeTab(0)'>重要维保</div>
+                <div class='d-tab d-tab-right' :class='{active:currentTab === 1}' @click='changeTab(1)'>日常维保</div>
+                <div class='text text-r'>维修:</div>
+                <div class='d-tab d-tab-left' :class='{active:currentTab === 2}' @click='changeTab(2)'>重要维修</div>
+                <div class='d-tab d-tab-right' :class='{active:currentTab === 3}' @click='changeTab(3)'>日常维修</div>
+            </div>
+            <!--  动态显示各个表格组件 : 'wbTable', 'rcwbTable', 'wxTable', 'rcwxTable'  -->
+            <div class='table2-container'>
+                <component
+                    v-if='Object.keys(this.row).length>0'
+                    :is='currentComponent'
+                    :ref='currentComponent'
+                    :smsxt='smsxt'
+                    :tabLabel='tabLabel[currentComponent]'
+                    :diff='diff'
+                    :assetnum='assetnum'
+                    :size='5'
+                ></component>
+            </div>
         </div>
     </div>
 </template>
@@ -116,20 +130,14 @@ 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,
-            page:1,
             sbjc: '',
             brand: '',
             wzjc: '',
@@ -141,38 +149,52 @@ export default {
             sbglgsOption: [],
             statusOption: [],
             floorAllSelect: [],
+            activeId: '1',
+            activeName1: 'wb1',
+            activeName2: '',
+            visible: false,
             key: 0,
+            assetnum: '', //区分设备的维修和维保关键
+            currentTab: 0, //选中页签,默认重要维保
+            currentComponent: 'wbTable', //选中的组件,默认 重要维保
+            componentArr: ['wbTable', 'rcwbTable', 'wxTable', 'rcwxTable'], //下部表格组件列表
+            tabLabel: {
+                //下部表格组件列表使用label
+                wbTable: '重要维保',
+                rcwbTable: '日常维保',
+                wxTable: '重要维修',
+                rcwxTable: '日常维保',
+            },
         }
     },
     components: {
         Select,
         inputDialog,
+        rcwbTable,
+        wbTable,
+        rcwxTable,
+        wxTable,
     },
     computed: {
         ...mapGetters(['floorSelect']),
     },
-    props: ['row', 'major','sign'],
     mounted() {
         this.queryTableList()
-        this.tabFind()
         this.getFloorAllSelect()
+        this.tabFind()
     },
+    props: ['row', 'major', 'sign', 'smsxt', 'diff'],
     methods: {
         innerTable(row) {
-            console.log(row)
+            this.assetnum = row.assetnum
+            this.changeTab(0)
+            // this.$refs.wbTable.startMethods()
             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, '------')
             this.fws = fws
             this.manufacturer = manufacturer
             this.queryTableList()
@@ -206,11 +228,10 @@ export default {
                 major: major,
                 plazaId: this.$store.state.plazaId,
             }
-            if(major!='土建'){
+            if (major != '土建') {
                 data.onlyMainAsset = true
             }
             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 = []
@@ -237,11 +258,8 @@ export default {
                 })
             })
         },
-        pageChanged(page) {
-            this.page = page
-            this.queryTableList()
-        },
         queryTableList() {
+            console.log('queryTableList')
             let major
             if (this.major.slice(0, 2) == 'GD') {
                 major = '供电'
@@ -259,11 +277,9 @@ export default {
             let data = {
                 major: major,
                 plazaId: this.$store.state.plazaId,
-                page: this.page,
-                size: this.size,
             }
             //区分主要设备
-            if(this.major != '土建'){
+            if (this.major != '土建') {
                 data.onlyMainAsset = true
             }
             //输入框搜索
@@ -304,10 +320,13 @@ export default {
                 postParams.status = this.status
             }
             queryAsset({ data, postParams }).then((res) => {
-                //console.log(res)
                 this.tableData = res.data.data
                 this.total = res.data.count
                 this.key++
+                if (this.tableData.length > 0) {
+                    this.assetnum = this.tableData[0].assetnum
+                    this.changeTab(0)
+                }
             })
         },
         getFloorAllSelect() {
@@ -319,18 +338,28 @@ export default {
             this.floorSelect.forEach((el) => {
                 this.floorAllSelect.push(el)
             })
-            console.log(this.floorAllSelect)
         },
-        changePageEvent(){
-            if(this.sign==1){
-                this.page = 1
-            }
-        }
+        // 更改tab页签,切换组件
+        changeTab(index) {
+            this.currentTab = index
+            this.currentComponent = this.componentArr[index]
+            // --- 不需要执行,动态组件会自动执行
+            //如果有组件,执行表格组件的内部方法
+            // this.$nextTick(() => {
+            //     this.$refs[this.currentComponent] && this.$refs[this.currentComponent].startMethods()
+            // })
+        },
     },
     watch: {
         row: {
             handler(newV, oldV) {
-                this.changePageEvent()
+                // console.log('handler', newV, oldV)
+                // 数据改变,重置表格,tab数据
+                if (JSON.stringify(newV) !== JSON.stringify(oldV)) {
+                    this.tableData = []
+                    this.currentTab = 0
+                    this.currentComponent = 'wbTable'
+                }
                 this.queryTableList()
                 this.getFloorAllSelect()
                 this.tabFind()
@@ -338,15 +367,12 @@ export default {
             deep: true,
         },
         sbglgs() {
-            this.changePageEvent()
             this.queryTableList()
         },
         status() {
-            this.changePageEvent()
             this.queryTableList()
         },
         floor() {
-            this.changePageEvent()
             this.queryTableList()
         },
     },
@@ -354,28 +380,97 @@ export default {
 </script>
 <style lang="less" scoped>
 .gdqd-dialog {
-    // padding: 16px 24px 40px;
-    // height: 610px;
-    .gdqd-dialog-top {
-        display: flex;
-        margin-bottom: 12px;
-    }
-    td {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
+    display: flex;
+    flex-direction: column;
+    height: 90vh;
+    .gdqd-top {
+        .gdqd-dialog-bottom {
+            overflow: auto;
+            max-height: 17.6vh;
+            margin-top: 20px;
+        }
     }
-    .foot {
-        height: 32px;
+    // 底部表格
+    .table-bottom {
+        width: 100%;
+        flex: 1;
         display: flex;
-        justify-content: flex-end;
-        margin-top: 28px;
+        flex-direction: column;
+        // tab 样式
+        .title {
+            display: flex;
+            height: 70px;
+            line-height: 30px;
+            align-items: center;
+            padding: 15px 0;
+            // 维修维保文本
+            .text {
+                width: 50px;
+            }
+            .text-r {
+                margin-left: 100px;
+            }
+            // tab页签
+            .d-tab {
+                padding: 5px 16px;
+                height: 30px;
+                line-height: 22px;
+                font-size: 14px;
+                font-family: MicrosoftYaHei;
+                font-weight: 500;
+                color: #1f2429;
+                text-align: center;
+                border: 1px solid #c3c7cb;
+                cursor: pointer;
+            }
+            .d-tab-left {
+                border-radius: 4px 0 0 4px;
+            }
+            .d-tab-right {
+                border-radius: 0 4px 4px 0;
+            }
+            // 当前选中页签
+            .active {
+                color: #025baa !important;
+                border-color: #025baa !important;
+            }
+        }
+        //筛选+表格
+        .table2-container {
+            width: 100%;
+            flex: 1;
+            position: relative;
+        }
     }
 }
 @media screen and (max-width: 1600px) {
     .gdqd-dialog td {
         padding: 4px 0;
     }
+    .gdqd-dialog-bottom {
+        max-height: 20vh !important;
+    }
+}
+@media screen and (max-width: 1366px) {
+    .gdqd-dialog {
+        /deep/ .el-table td {
+            padding: 1px 0 !important;
+        }
+        .gdqd-dialog-bottom {
+            max-height: 20vh !important;
+            margin-top: 10px !important;
+        }
+
+        .table-bottom {
+            .title {
+                height: 60px !important;
+            }
+        }
+        // 底部表格的分页位置修改
+        /deep/ .rcwb-list .foot {
+            margin-top: 10px !important;
+        }
+    }
 }
 </style>
 <style lang="less">
@@ -383,5 +478,20 @@ export default {
     /deep/.el-table td {
         cursor: pointer;
     }
+    .el-dialog__header {
+        padding: 16px 24px;
+        color: #fff;
+        background: linear-gradient(180deg, rgba(54, 156, 247, 1) 0%, rgba(2, 91, 170, 1) 100%);
+    }
+    .el-dialog__headerbtn .el-dialog__close {
+        color: #fff;
+    }
+    .el-dialog__title {
+        font-size: 16px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #fff;
+        line-height: 24px;
+    }
 }
 </style>

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

@@ -81,7 +81,7 @@
             ></el-pagination>
         </div>
         <!-- 标准表格详情钻取表 -->
-        <el-dialog
+        <!-- <el-dialog
             width='1260px'
             :title='`${InfoName}-${type_name}`'
             style='height:900px!important;overflow: hidden;'
@@ -89,11 +89,15 @@
             append-to-body
         >
             <eq-detail ref='qdDialog' :row='row' :major='major' :smsxt='smsxt' :diff='diff' :sign='sign'></eq-detail>
+        </el-dialog>-->
+        <el-dialog width='100%' :title='`${type_name}设备清单`' :visible.sync='innerVisible' append-to-body :fullscreen='true'>
+            <eq-detail ref='qdDialog' :row='row' :major='major' :smsxt='smsxt' :diff='diff' :sign='sign'></eq-detail>
         </el-dialog>
     </div>
 </template>
 <script>
 import { Select } from 'meri-design'
+// import EqDetail from './eqDetaileDialog'
 import EqDetail from './eqDetaileDialog'
 import { queryEquipmentList } from '@/api/equipmentList.js'
 import { mapGetters } from 'vuex'
@@ -236,9 +240,6 @@ export default {
 /deep/ .el-dialog__body {
     padding: 0;
 }
-/deep/.el-dialog {
-    margin-top: 5vh !important;
-}
 @media screen and (max-width: 1600px) {
     /deep/ .el-dialog__body {
         padding: 0;
@@ -247,7 +248,8 @@ export default {
         padding: 4px 0;
     }
     /deep/ .el-dialog {
-        margin-top: 5vh !important;
+        // margin-top: 5vh !important;
+        margin-top: 0 !important;
     }
 }
 </style>
@@ -257,4 +259,20 @@ export default {
         cursor: pointer;
     }
 }
+// 弹窗头部样式修改
+.el-dialog__header {
+    padding: 16px 24px;
+    background: linear-gradient(180deg, rgba(54, 156, 247, 1) 0%, rgba(2, 91, 170, 1) 100%);
+}
+.el-dialog__headerbtn .el-dialog__close {
+    color: #fff;
+}
+.el-dialog__title {
+    font-size: 16px;
+    padding-right: 6px;
+    padding-left: 24px;
+    font-weight: bold;
+    color: #fff;
+    font-weight: normal;
+}
 </style>

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

@@ -363,6 +363,12 @@ export default {
                 this.getList()
             }
         },
+        assetnum(newV, oldV) {
+            if (newV !== oldV) {
+                // this.tabFind()
+                this.getList()
+            }
+        },
         tabLabel(newV, oldV) {
             if (newV !== oldV) {
                 this.changeSelect()

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

@@ -434,6 +434,12 @@ export default {
         this.startMethods();
       }
     },
+     assetnum(newV, oldV) {
+            if (newV !== oldV) {
+                // this.tabFind()
+                this.getList()
+            }
+        },
     tabLabel(newV, oldV) {
       if (newV !== oldV) {
         this.startMethods();

+ 28 - 8
src/views/equipment/table/standTable.vue

@@ -79,13 +79,18 @@
             ></el-pagination>
         </div>
         <!-- 标准表格详情钻取表 -->
-        <el-dialog width='90%' style='height:900px;overflow: hidden;' :title='`${InfoName}-${type_name}`' :visible.sync='innerVisible' append-to-body>
+        <!-- <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' :sign='sign'></eq-detail>
+        </el-dialog>-->
+        <!-- 标准表格详情钻取表,使用全屏弹窗 -->
+        <el-dialog width='100%' :title='`${type_name}设备清单`' :visible.sync='innerVisible' append-to-body :fullscreen='true'>
             <eq-detail ref='qdDialog' :row='row' :major='major' :smsxt='smsxt' :diff='diff' :sign='sign'></eq-detail>
         </el-dialog>
     </div>
 </template>
 <script>
 import { queryEquipmentList } from '@/api/equipmentList.js'
+// import EqDetail from './eqDetaileDialog'
 import EqDetail from './eqDetaileDialog'
 import { mapGetters } from 'vuex'
 import { Select } from 'meri-design'
@@ -236,12 +241,9 @@ export default {
         margin-top: 28px;
     }
 }
-/deep/ .el-dialog__body {
-    padding: 0;
-}
-/deep/.el-dialog {
-    margin-top: 5vh !important;
-}
+ /deep/ .el-dialog__body {
+        padding: 0;
+    }
 @media screen and (max-width: 1600px) {
     /deep/ .el-dialog__body {
         padding: 0;
@@ -250,7 +252,8 @@ export default {
         padding: 4px 0;
     }
     /deep/ .el-dialog {
-        margin-top: 5vh !important;
+        // margin-top: 5vh !important;
+        margin-top: 0 !important;
     }
 }
 </style>
@@ -260,4 +263,21 @@ export default {
         cursor: pointer;
     }
 }
+// 弹窗头部样式修改
+.el-dialog__header {
+    padding: 16px 24px;
+    background: linear-gradient(180deg, rgba(54, 156, 247, 1) 0%, rgba(2, 91, 170, 1) 100%);
+}
+.el-dialog__headerbtn .el-dialog__close {
+    color: #fff;
+}
+
+.el-dialog__title {
+    font-size: 16px;
+    padding-right: 6px;
+    padding-left: 24px;
+    font-weight: bold;
+    color: #fff;
+    font-weight: normal;
+}
 </style>

+ 6 - 0
src/views/equipment/table/wbTable.vue

@@ -293,6 +293,12 @@ export default {
                 this.getList()
             }
         },
+        assetnum(newV, oldV) {
+            if (newV !== oldV) {
+                // this.tabFind()
+                this.getList()
+            }
+        },
         ischange() {
             this.getList()
         },

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

@@ -212,7 +212,7 @@ export default {
                 },
             }
             //区分主要设备
-            if(this.smsxt != '1008'){
+            if (this.smsxt != '1008') {
                 getParams.data.onlyMainAsset = true
             }
             if (this.diff) {
@@ -282,6 +282,12 @@ export default {
                 this.getList()
             }
         },
+        assetnum(newV, oldV) {
+            if (newV !== oldV) {
+                // this.tabFind()
+                this.getList()
+            }
+        },
         ischange() {
             this.getList()
         },