Browse Source

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

shaun-sheep 4 years ago
parent
commit
7c4ea83f65

+ 1 - 1
src/components/Legend/src/legend.vue

@@ -106,7 +106,7 @@ export default {
         queryMarks() {
             let params = {
                 postParams: {
-                    categoryId: 'NTXT',
+                    categoryId: this.$cookie.get('categoryId'),
                     projectId: this.$store.state.plazaId
                 }
             }

+ 16 - 14
src/components/floorMap/index.vue

@@ -44,7 +44,8 @@ export default {
             default: '1',
             type: String
         },
-        loadName: null
+        loadName: null,
+        type: null
     },
     components: { RoomBox, canvasFun },
     computed: {
@@ -166,8 +167,10 @@ export default {
         },
         listChange(item, ev) {
             let name = ev[0][0].data.Name
+            console.log(item, ev)
+
             if (name.slice(name.length - 2, name.length) == '机房') {
-                this.$refs.boxRoom.open(name)
+                this.$refs.boxRoom.open({ name: name, type: this.type })
             }
         },
         // 适配底图到窗口
@@ -203,22 +206,21 @@ export default {
                 projectId: this.urlMsg.ProjectID
             }
             return readGroup(data)
+        },
+        // 地图尺寸
+        mapSize() {
+            if (window.screen.height == '768') {
+                this.canvasWidth = this.$refs.graphy.offsetWidth
+                this.canvasHeight = this.$refs.graphy.offsetHeight - 100
+            } else {
+                this.canvasWidth = this.$refs.graphy.offsetWidth
+                this.canvasHeight = 900 + 'px'
+            }
         }
     },
     watch: {},
     mounted() {
-        //console.log(window.screen.height)
-        if (window.screen.height == '768') {
-            this.canvasWidth = this.$refs.graphy.offsetWidth
-            this.canvasHeight = this.$refs.graphy.offsetHeight - 100
-            //console.log(this.canvasWidth)
-            //console.log(this.canvasHeight)
-        } else {
-            this.canvasWidth = this.$refs.graphy.offsetWidth
-            this.canvasHeight = 900 + 'px'
-            //console.log(this.canvasWidth)
-            //console.log(this.canvasHeight)
-        }
+        this.mapSize()
     },
     created() {
         this.urlMsg = {

+ 26 - 24
src/components/menuList.vue

@@ -40,7 +40,6 @@
 import { formatTime } from '@/utils/format.js'
 import { mapGetters } from 'vuex'
 import moment from 'moment'
-
 export default {
     data() {
         return {
@@ -53,41 +52,47 @@ export default {
                 { name: '其他事项', state: false, route: 'other' }, //其他
                 { name: '分析 | 报表', state: false, route: 'analysis' }
             ],
-            // times: `${new Date().getFullYear()}.${formatTime(new Date().getMonth() + 1)}.${formatTime(new Date().getDate())} ${formatTime(
-            //     new Date().getHours()
-            // )}:${formatTime(new Date().getMinutes())}`,
-            times: moment().format('YYYY.MM.DD HH:mm'),
-            value: 190
+            times: `${new Date().getFullYear()}.${formatTime(new Date().getMonth() + 1)}.${formatTime(new Date().getDate())} ${formatTime(
+                new Date().getHours()
+            )}:${formatTime(new Date().getMinutes())}`,
+            value: 190,
+            // 路由词典
+            dict: {
+                first: 1,
+                overview: 2,
+                floorFunc: 3,
+                equipment: 4,
+                other: 5,
+                analysis: 6
+            }
         }
     },
     computed: {
         ...mapGetters(['plazas', 'plazaId'])
     },
+    watch: {
+        $route: 'handleRoute'
+    },
     created() {
         this.currentTime()
     },
     mounted() {
-        let val = ''
-        if (location.pathname.split('/')[3] == 'first') {
-            this.modelNum(1)
-        } else if (location.pathname.split('/')[3] == 'overview') {
-            this.modelNum(2)
-        } else if (location.pathname.split('/')[3] == 'floorFunc') {
-            this.modelNum(3)
-        } else if (location.pathname.split('/')[3] == 'equipment') {
-            this.modelNum(4)
-        } else if (location.pathname.split('/')[3] == 'other') {
-            this.modelNum(5)
-        } else if (location.pathname.split('/')[3] == 'analysis') {
-            this.modelNum(6)
-        }
-        //console.log(this.plazas)
+        window.vm = this
+        this.handleRoute(this.$route)
     },
     methods: {
         currentTime() {
             this.times = moment().format('YYYY.MM.DD HH:mm')
             setTimeout(this.currentTime, 1000)
         },
+        handleRoute(newRouter) {
+            if (!newRouter) {
+                return false
+            }
+            const { path } = newRouter
+            let router = path.split('home/')[1]
+            this.modelNum(this.dict[router])
+        },
         formatter(str, arrv) {
             if (str && arrv) {
                 const Objs = arrv.find(e => e && e.plazaid == str)
@@ -97,7 +102,6 @@ export default {
             }
         },
         modelNum(val) {
-            //console.log(val)
             this.list = this.list.map((item, index) => {
                 if (val == index + 1) {
                     item.state = true
@@ -108,7 +112,6 @@ export default {
             })
         },
         clickEventAcitve(item) {
-            //console.log(item)
             if (item.name == '楼层功能') {
                 this.$cookie.set('categoryId', 'LCGN', 3)
             } else {
@@ -125,7 +128,6 @@ export default {
         dumpLegend() {
             const { conf } = window.__systemConf,
                 { wandaBmGuideUrl } = conf
-            // this.$router.push({ path: `/home/legendLibrary` })
             window.open(`${wandaBmGuideUrl}/home/legendLibrary`, true)
         }
     },

+ 1 - 2
src/views/equipment/eqDialog.vue

@@ -21,6 +21,7 @@
                 <!-- 土建系统主要材料清单 -->
                 <tj-table v-else-if='dialogInfo.id.slice(0,4)=="TJQD"' :param='param'></tj-table>
                 <!-- 主要设备清单 标准设备表格 -->
+                <!-- 内部设备清单 -->
                 <standTable v-else-if='dialogInfo.id.slice(2,4)=="QD"' :param='param' :major='dialogInfo.id'></standTable>
                 <!-- 电井商铺范围清单 -->
                 <djsp-table v-else-if='dialogInfo.id.slice(0,4)=="GJSP"' :param='param'></djsp-table>
@@ -138,8 +139,6 @@ export default {
         },
         //点击tab函数
         handleClick(tab) {
-            //console.log(tab)
-            // //console.log('============================================')
             if (this.param) {
                 this.param = tab.name
             } else if (this.smsxt) {

+ 10 - 8
src/views/equipment/index.vue

@@ -25,7 +25,6 @@
             <div class='eq-right'>
                 <div class='eq-right-bottom'>
                     <div class='title-box'>
-                        <!-- <img src='@/assets/imgs/mainIcon.png' /> -->
                         <div class='eq-title'>
                             <span>{{floorInfo.code}}</span>
                         </div>
@@ -34,7 +33,7 @@
                         <div class='legend-boxs'>
                             <Legend :systemName='systemName'></Legend>
                         </div>
-                        <floorMap ref='floorMap' :id='"equip"' :loadName='loadName'></floorMap>
+                        <floorMap ref='floorMap' :id='"equip"' :loadName='loadName' :type='"system"'></floorMap>
                         <div class='additional-box' v-if='fqPic.length>0'>
                             <div class='additional' @click='additionalColl'>
                                 <img src='../../assets/imgs/bg.png' alt />
@@ -44,10 +43,9 @@
                             </el-collapse-transition>
                         </div>
                     </div>
-                    <floor-list v-if='floorsArr.length>0' :floorsArr='floorsArr' @emitFloor='emitFloor'></floor-list>
+                    <floor-list v-if='floorsArr.length>0' :floorsArr='floorsArr' @emitFloor='emitFloor' id='system'></floor-list>
                 </div>
             </div>
-            <!-- <editList></editList> -->
         </div>
         <eq-dialog ref='dialog' :systemName='systemName' :smsxt='smsxt'></eq-dialog>
     </div>
@@ -80,14 +78,15 @@ export default {
             manufacturer: [],
             show: false,
             fqPic: [],
-            loadName: ''
+            loadName: '',
+            type: ''
         }
     },
     components: { floorList, eqDialog, floorMap, editList },
     methods: {
         // 查询tab页
         tabSyatem(item) {
-            //console.log(item)
+            console.log(item)
             this.systemId = item.id
             this.everySystem = item.children
             this.systemName = item.name
@@ -99,13 +98,11 @@ export default {
             this.init()
         },
         emitFloor(item) {
-            //console.log('item', item)
             this.floorInfo = item
             // this.$refs.floorMap.init(this.floorInfo.gname)
             this.init()
         },
         dialogVisible(eve) {
-            //console.log(eve)
             this.$refs.dialog.showModal(eve)
         },
         additionalColl() {
@@ -128,6 +125,11 @@ export default {
         },
         init() {
             this.loadName = `设备设施-${this.systemName}-${this.floorInfo.code}`
+        },
+        // 从设备设施进入的机房
+        queryType(val) {
+            this.type = val
+            console.log(this.type)
         }
     },
     mounted() {

+ 7 - 3
src/views/equipment/table/eqListTable.vue

@@ -32,9 +32,9 @@
             ></el-input>
         </div>
         <el-table :data='tableData' style='width: 100%' :border='true' @row-click='rowHandle'>
-            <el-table-column type='index' label='序号' width='80'></el-table-column>
-            <el-table-column prop='classqc' label='设备名称' width='160'>
-                <template slot-scope='{row}'>{{row.classqc || '--'}}</template>
+            <el-table-column type='index' label='序号' width='50'></el-table-column>
+            <el-table-column prop='type_name' label='设备名称' show-overflow-tooltip resizable width='160'>
+                <template slot-scope='{row}'>{{row.type_name || '--'}}</template>
             </el-table-column>
             <el-table-column prop='sl' label='数量' width='100'>
                 <template slot-scope='{row}'>{{row.sl || '--'}}</template>
@@ -126,8 +126,10 @@ export default {
             }
             //下拉
             if (this.floor) {
+                console.log(this.floor)
                 postParams.floor = this.floor
             }
+            console.log(this.floor)
             //输入框搜索
             data.keyword = ''
             if (this.keyword) {
@@ -152,6 +154,7 @@ export default {
     },
     watch: {
         param(newV, oldV) {
+            console.log(newV, oldV)
             if (newV !== oldV) {
                 this.getList()
             }
@@ -159,6 +162,7 @@ export default {
     },
     mounted() {
         this.getList()
+        console.log(this.param)
     }
 }
 </script>

+ 2 - 2
src/views/equipment/table/wbTable.vue

@@ -70,7 +70,7 @@
             <el-table-column prop='assetnum' label='设备编码' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='matters' label='重要事项记录' show-overflow-tooltip resizable>
+            <el-table-column prop='matters' label='重要事项记录' width='130' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.matters || '--'}}</template>
             </el-table-column>
             <el-table-column prop='description' label='描述' show-overflow-tooltip resizable>
@@ -80,7 +80,7 @@
                 <el-table-column prop='ischangepj' label='是/否更换'>
                     <template slot-scope='{row}'>{{row.ischangepj || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='model' label='配件名称型号' show-overflow-tooltip resizable>
+                <el-table-column prop='model' label='配件名称型号' width='130' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.model || '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='sl' label='数量'>

+ 2 - 2
src/views/equipment/table/wxTable.vue

@@ -78,7 +78,7 @@
             <el-table-column prop='assetnum' label='设备编码' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='matters' label='重要事项记录' show-overflow-tooltip resizable>
+            <el-table-column prop='matters' label='重要事项记录' width='130' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.matters || '--'}}</template>
             </el-table-column>
             <el-table-column prop='description' label='描述' show-overflow-tooltip resizable>
@@ -88,7 +88,7 @@
                 <el-table-column prop='ischangepj' label='是/否更换'>
                     <template slot-scope='{row}'>{{row.ischangepj || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='model' label='配件名称型号' show-overflow-tooltip resizable>
+                <el-table-column prop='model' label='配件名称型号' width='130' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.model || '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='sl' label='数量'>

+ 3 - 2
src/views/floorFunc/index.vue

@@ -16,7 +16,7 @@
                 <div v-if='show' class='add-img'>我是放附加数据图片哒。。。</div>
             </el-collapse-transition>
         </div>-->
-        <floorMap ref='floorMap' :loadName='loadName'></floorMap>
+        <floorMap ref='floorMap' :loadName='loadName' :type='"floor"'></floorMap>
     </div>
 </template>
 <script>
@@ -33,7 +33,8 @@ export default {
                 gname: 'f1',
                 code: 'F1'
             },
-            loadName: ''
+            loadName: '',
+            type: ''
         }
     },
     computed: {

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

@@ -82,7 +82,7 @@ export default {
             let getParams = {
                 module: '1004',
                 floor: floor,
-                plazaId: this.$store.state.plazaId
+                plazaId: this.plazaId
             }
             queryPic({ getParams }).then(res => {
                 //console.log('库房管理图', res)
@@ -92,7 +92,7 @@ export default {
         },
         // 查询哪几个楼层有库房图
         tabSize() {
-            let data = { plazaId: this.$store.state.plazaId }
+            let data = { plazaId: this.plazaId }
             let postParams = [
                 {
                     tableName: 'glsms_proimgup',
@@ -159,7 +159,7 @@ export default {
         }
     },
     computed: {
-        ...mapGetters(['floorsArr'])
+        ...mapGetters(['floorsArr', 'plazaId'])
     },
     mounted() {
         this.everySystem = this.matter[0].children

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

@@ -48,7 +48,6 @@ export default {
                 let arr = []
                 //console.log('综合事项弹框', res)
                 this.tableData = res.data || []
-
                 // 将tableData中的第三项都设置为相同的数据
                 this.tableData.map(item => {
                     arr.push(item.jlsx)

+ 4 - 6
src/views/room/detail.vue

@@ -163,7 +163,6 @@ import Select from '@/components/Select/Select.vue'
 import { querySelect } from '@/api/public.js'
 import { mapGetters } from 'vuex'
 import { queryHxsbDetail } from '@/api/room.js'
-import InputDialog from './inputDialog'
 
 export default {
     props: ['type_code'],
@@ -193,11 +192,10 @@ export default {
         }
     },
     components: {
-        Select,
-        InputDialog
+        Select
     },
     computed: {
-        ...mapGetters(['floorSelect'])
+        ...mapGetters(['floorSelect', 'plazaId'])
     },
     mounted() {
         if (this.type_code) {
@@ -233,7 +231,7 @@ export default {
                 type_code: this.type_code //自定义分类内码 主要设备清单必传
             }
             let data = {
-                plazaId: this.$store.state.plazaId,
+                plazaId: this.plazaId,
                 page: this.pageDetail,
                 size: this.sizeDetail
             }
@@ -309,7 +307,7 @@ export default {
                 }
             ]
             let data = {
-                plazaId: this.$store.state.plazaId
+                plazaId: this.plazaId
             }
             querySelect({ data, postParams }).then(res => {
                 //console.log('管理归属', res)

+ 33 - 37
src/views/room/index.vue

@@ -7,13 +7,16 @@
     <div class='compute-box'>
         <el-dialog :title='`${systemName}`||"机房"' :visible.sync='visible' :fullscreen='true'>
             <div class='compute-span'></div>
-            <div class='compute-zf' @click='jumpFloor'></div>
+            <el-tooltip class='item' effect='dark' :content='content' placement='top'>
+                <div class='compute-zf' @click='jumpFloor'></div>
+            </el-tooltip>
+
             <div class='compute-tab'>
                 <el-tabs v-model='activeName' @tab-click='handleClick'>
-                    <el-tab-pane label='机房布置图' name='1'>
+                    <el-tab-pane label='机房布置图' name='1' v-if='tableImg.length>0'>
                         <room-table1 v-if='tableImg.length>=0' :tableImg='tableImg'></room-table1>
                     </el-tab-pane>
-                    <el-tab-pane label='配电室低压柜及出线明细表' name='2'>
+                    <el-tab-pane label='配电室低压柜及出线明细表' name='2' v-if='systemName=="配电室机房"'>
                         <div class='compute-center'>
                             <Select
                                 width='200'
@@ -407,11 +410,11 @@ import roomTable4 from './room4'
 import roomTable5 from './room5'
 import { mapGetters } from 'vuex'
 import { querySelect, queryPic } from '@/api/public.js'
-import InputDialog from './inputDialog'
 
 export default {
     data() {
         return {
+            content: '',
             activeName: '1',
             visible: false,
             dialogFormVisible: false,
@@ -494,11 +497,10 @@ export default {
         roomTable2,
         roomTable3,
         roomTable4,
-        roomTable5,
-        InputDialog
+        roomTable5
     },
     computed: {
-        ...mapGetters(['floorSelect'])
+        ...mapGetters(['floorSelect', 'plazaId'])
     },
     methods: {
         handleClick(tab) {
@@ -515,6 +517,7 @@ export default {
                 this.changeSelect()
             }
         },
+        // 右上角的筛选点击按钮
         show() {
             this.dialogFormVisible = !this.dialogFormVisible
         },
@@ -525,8 +528,7 @@ export default {
                 location: '1809',
                 module: '1002',
                 system: '1002',
-                // floor: this.picFloor,
-                plazaId: this.$store.state.plazaId
+                plazaId: this.plazaId
             }
             queryPic({ getParams }).then(res => {
                 //console.log('机房布置图', res)
@@ -537,7 +539,7 @@ export default {
         Index1() {
             let getParams = {
                 location: '1890',
-                plazaId: this.$store.state.plazaId,
+                plazaId: this.plazaId,
                 page: this.page1,
                 size: this.size1
             }
@@ -586,7 +588,7 @@ export default {
             let postParams = {}
             let data = {
                 location: '1890',
-                plazaId: this.$store.state.plazaId,
+                plazaId: this.plazaId,
                 page: this.page2,
                 size: this.size2
             }
@@ -615,7 +617,7 @@ export default {
                 data.floor = this.floorChange
             }
             queryHxsb({ data, postParams }).then(res => {
-                //console.log('核心设备', res)
+                // console.log('核心设备', res)
                 this.loading2 = false
                 this.total2 = res.data.count
                 this.table3 = res.data.data ? res.data.data : []
@@ -637,12 +639,12 @@ export default {
             this.page4 = val
             this.Index4()
         },
-        // 维修
+        // 机房维修记录
         Index3() {
             let getParams = {
                 location: '1890',
                 // plazaId: '1001145',
-                plazaId: this.$store.state.plazaId,
+                plazaId: this.plazaId,
                 page: this.page3,
                 size: this.size3,
                 orderBy: 'sjjssj,0;location,1'
@@ -685,26 +687,12 @@ export default {
                 }
             })
         },
-        changeIndex3(val) {
-            if (val.type == 'wx') {
-                if (val.msInput4) {
-                    this.msInput4 = val.msInput4
-                }
-                if (val.zysxInput4) {
-                    this.zysxInput4 = val.zysxInput4
-                }
-                if (val.gdbhInput4) {
-                    this.gdbhInput4 = val.gdbhInput4
-                }
-                this.Index3()
-            }
-        },
-        // 维保
+        // 机房维保记录
         Index4() {
             let postParams = {}
             let data = {
                 location: '1890',
-                plazaId: this.$store.state.plazaId,
+                plazaId: this.plazaId,
                 page: this.page4,
                 size: this.size4,
                 orderBy: 'wb_gzglid,0;assetnum,1;reportedby,0;'
@@ -780,6 +768,7 @@ export default {
         confirm2() {
             this.Index4()
         },
+        // 下拉框数据
         changeSelect() {
             this.department = []
             let postParams = [
@@ -789,7 +778,7 @@ export default {
                 }
             ]
             let data = {
-                plazaId: this.$store.state.plazaId
+                plazaId: this.plazaId
             }
             querySelect({ data, postParams }).then(res => {
                 //console.log('下拉框', res)
@@ -818,23 +807,32 @@ export default {
                 }
             })
         },
+        // 查询楼层功能下的机房属于哪类设备
         init() {
             this.smsxtArr = []
             let params = {
                 getParams: {
                     locationid: '5209',
-                    plazaId: this.$store.state.plazaId
+                    plazaId: this.plazaId
                 }
             }
             querySystem(params).then(res => {
-                //console.log('系统', res.data[0])
                 this.smsxtArr = res.data[0]
+                this.content = `查看${this.$cookie.get('floorNow')}层${this.smsxtArr.smsxtname}分布图`
             })
         },
+        // 打开机房弹框
         open(name) {
             this.visible = true
-            this.systemName = name
+            this.systemName = name.name
+            if (name.type == 'floor') {
+                this.init()
+            } else if (name.type == 'system') {
+                let floor = this.$cookie.get('floorNow')
+                this.content = `查看${floor}层楼层功能图`
+            }
         },
+        // 机房右上角的跳转 如果是在楼层功能打开的机房则要跳转到设备设施对应的系统\楼层 反之亦然
         jumpFloor() {
             if (location.pathname.split('/')[3] == 'equipment') {
                 this.$router.push({ path: '/home/floorFunc' })
@@ -844,10 +842,8 @@ export default {
         }
     },
     mounted() {
-        this.init()
         this.Index()
-    },
-    watch: {}
+    }
 }
 </script>
 <style lang="less" scoped>

+ 0 - 68
src/views/room/inputDialog.vue

@@ -1,68 +0,0 @@
-<template>
-    <div class='input-dialog'>
-        <div @click='show' style='color: #c3c7cb;cursor: pointer;position:absolute;top:-45px;right:0px;'>
-            <img src='@/assets/imgs/select.png' />
-            筛选
-        </div>
-        <div
-            v-if='dialogFormVisible'
-            style='width:280px;height:450px;background:rgba(255,255,255,1);
-            box-shadow:0px 2px 10px 0px rgba(31,35,41,0.1);border:1px solid rgba(228,229,231,1);z-index:9999;
-            position:absolute;top:0px;right:0px;'
-        >
-            <el-form style=' padding: 20px 24px;'>
-                <p style='margin:16px 0 8px 0'>安装位置</p>
-                <el-input placeholder='搜索安装位置' style='width:192px;margin-right:12px' size='small' prefix-icon='el-icon-search' v-model='keyword'></el-input>
-                <p style='margin:16px 0 8px 0'>生产厂商</p>
-                <el-input placeholder='搜索生产厂商' style='width:192px;margin-right:12px' size='small' prefix-icon='el-icon-search' v-model='keyword'></el-input>
-                <p style='margin:16px 0 8px 0'>服务商</p>
-                <el-input placeholder='搜索服务商' style='width:192px;margin-right:12px' size='small' prefix-icon='el-icon-search' v-model='keyword'></el-input>
-                <p style='margin:16px 0 8px 0'>设备编号</p>
-                <el-input placeholder='搜索设备编号' style='width:192px;margin-right:12px' size='small' prefix-icon='el-icon-search' v-model='keyword'></el-input>
-            </el-form>
-
-            <div style='position:absolute;bottom:40px;right:47px;z-index:9999'>
-                <el-button @click='dialogFormVisible = false' size='small'>取 消</el-button>
-                <el-button type='primary' @click='confirm' size='small'>确 定</el-button>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script>
-export default {
-    data() {
-        return {
-            dialogFormVisible: false,
-            form: {},
-            formLabelWidth: '232px',
-            search: {
-                type: 'wx',
-                msInput4: '',
-                zysxInput4: '',
-                gdbhInput4: ''
-            }
-        }
-    },
-    props: ['type'],
-    methods: {
-        show() {
-            this.dialogFormVisible = !this.dialogFormVisible
-        },
-        confirm() {
-            this.dialogFormVisible = false
-            //console.log(this.type)
-            if (this.type == 'wx') {
-                this.$emit('changeIndex3', this.search)
-            }
-        }
-    },
-    mounted() {}
-}
-</script>
-
-<style lang="less" scoped>
-.input-dialog {
-    position: relative;
-}
-</style>

+ 2 - 2
src/views/room/room4.vue

@@ -15,7 +15,7 @@
                 <el-table-column prop label='设备编号' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.location||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='重要事项记录' min-width='110' show-overflow-tooltip resizable>
+                <el-table-column prop label='重要事项记录' width='130' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.matters||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='描述' show-overflow-tooltip resizable>
@@ -25,7 +25,7 @@
                     <el-table-column prop label='是/否更换' show-overflow-tooltip resizable>
                         <template slot-scope='{row}'>{{row.ismodel||'--'}}</template>
                     </el-table-column>
-                    <el-table-column prop label='配件名称型号' min-width='110' show-overflow-tooltip resizable>
+                    <el-table-column prop label='配件名称型号' width='130' min-width='110' show-overflow-tooltip resizable>
                         <template slot-scope='{row}'>{{row.model||'--'}}</template>
                     </el-table-column>
                     <el-table-column prop label='数量' show-overflow-tooltip resizable>