guoxiaohuan 4 jaren geleden
bovenliggende
commit
34f86c1ea6

+ 2 - 1
package.json

@@ -11,7 +11,7 @@
         "@saga-web/base": "^2.1.9",
         "@saga-web/big": "^1.0.20",
         "@saga-web/draw": "^2.1.84",
-        "@saga-web/feng-map": "^1.0.9",
+        "@saga-web/feng-map": "^1.0.10",
         "@saga-web/graph": "^2.1.68",
         "ant-design-vue": "^1.4.10",
         "axios": "^0.19.2",
@@ -22,6 +22,7 @@
         "quill": "^1.3.7",
         "vue": "^2.6.10",
         "vue-cookie": "^1.1.4",
+        "vue-pdf": "^4.1.0",
         "vue-quill-editor": "^3.0.6",
         "vue-router": "^3.1.3",
         "vuex": "^3.4.0"

BIN
src/assets/imgs/zffx.png


+ 42 - 33
src/components/floorMap/index.vue

@@ -18,6 +18,8 @@ import { FloorScene } from '@/lib/FloorScene'
 import RoomBox from '@/views/room/index'
 import canvasFun from '@/components/floorMap/canvasFun'
 
+let fengmap = null
+
 export default {
     data() {
         return {
@@ -25,11 +27,9 @@ export default {
             key: '23f30a832a862c58637a4aadbf50a566',
             mapServerURL: `/wdfn`,
             fmapID: '1000423_120', // 2020-6-18 磊哥发 1000423 大连高新万达
-            fmap: null,
             canvasWidth: 1100,
             canvasHeight: 800,
-            fParser: null,
-            loading: false,
+            loading: true,
             view: null,
             isQuerying: false // 限制重复查询
         }
@@ -38,43 +38,52 @@ export default {
     methods: {
         init(floorid) {
             if (this.isQuerying) {
-                console.log('正在查询')
-                // this.$message.warning('正在查询')
+                console.log('正在查询...')
                 return
             }
             this.isQuerying = true
             this.clearGraphy()
             this.scene = new FloorScene()
             this.scene.selectContainer.connect('listChange', this, this.listChange)
-            this.fmap = new SFengParser('fengMap', `${this.mapServerURL}/${this.fmapID}`, this.key, this.appName, null)
-            // if (isNaN(Number(floorid))) {
-            //     console.log('楼层id错误')
-            //     // this.$message.warning("楼层id错误");
-            //     floorid = 1
-            // }
-            console.log(floorid)
-            this.fmap.parseData(this.fmapID, 'f1', res => {
-                if (res.err) {
-                    console.log(res.err)
-                    return
-                }
-                this.fParser = new SFloorParser(null)
-                this.fParser.parseData(res)
-                this.fParser.spaceList.forEach(t => {
-                    t.selectable = true
-                    this.scene.addItem(t)
+            if (!fengmap) {
+                fengmap = new SFengParser('fengMap', `${this.mapServerURL}/${this.fmapID}`, this.key, this.appName, null)
+
+                fengmap.loadMap(this.fmapID, res => {
+                    this.floorList = res
+                    this.parserData(floorid)
+                })
+            } else {
+                this.parserData(floorid)
+            }
+        },
+        parserData(floor) {
+            if (this.floorList[floor]) {
+                console.log(this.floorList[floor])
+                fengmap.parseData(this.floorList[floor], res => {
+                    if (res.err) {
+                        console.log(res.err)
+                        return
+                    }
+                    const fParser = new SFloorParser(null)
+                    fParser.parseData(res)
+                    fParser.spaceList.forEach(t => {
+                        t.selectable = true
+                        this.scene.addItem(t)
+                    })
+                    fParser.wallList.forEach(t => this.scene.addItem(t))
+                    fParser.virtualWallList.forEach(t => this.scene.addItem(t))
+                    fParser.doorList.forEach(t => this.scene.addItem(t))
+                    fParser.columnList.forEach(t => this.scene.addItem(t))
+                    fParser.casementList.forEach(t => this.scene.addItem(t))
+                    this.view.scene = this.scene
+                    this.view.fitSceneToView()
+                    this.loading = false
+                    this.isQuerying = false
+                    console.log('success')
                 })
-                this.fParser.wallList.forEach(t => this.scene.addItem(t))
-                this.fParser.virtualWallList.forEach(t => this.scene.addItem(t))
-                this.fParser.doorList.forEach(t => this.scene.addItem(t))
-                this.fParser.columnList.forEach(t => this.scene.addItem(t))
-                this.fParser.casementList.forEach(t => this.scene.addItem(t))
-                this.view.scene = this.scene
-                this.view.fitSceneToView()
-                this.loading = false
-                this.isQuerying = false
-                console.log('success')
-            })
+            } else {
+                console.log('楼层不正确')
+            }
         },
         clearGraphy() {
             if (this.view) {

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

@@ -90,7 +90,7 @@ export default {
         emitFloor(item) {
             console.log('item', item)
             this.floorInfo = item
-            // this.$refs.floorMap.init(this.floorInfo.gname)
+            this.$refs.floorMap.init(this.floorInfo.gname)
         },
         dialogVisible(eve) {
             console.log(eve)
@@ -102,7 +102,7 @@ export default {
     },
     mounted() {
         this.everySystem = this.system[0].children
-        // this.$refs.floorMap.init(this.floorInfo.gname)
+        this.$refs.floorMap.init(this.floorInfo.gname)
     }
 }
 </script>

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

@@ -59,10 +59,11 @@ export default {
         objectSpanMethod({ row, column, rowIndex, columnIndex }) {},
         getRecordList(major) {
             let getParams = {
-                major: major,
+                // major: major,
                 plazaId: this.$store.state.plazaId
             }
             queryRecord({ getParams }).then(res => {
+                console.log('设备设施记录事项', res)
                 let data = res.data || []
                 for (let i in data) {
                     console.log(data[i])

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

@@ -36,14 +36,14 @@ export default {
     methods: {
         emitFloor(item) {
             this.floorInfo = item
-            //this.$refs.floorMap.init(this.floorInfo.gname)
+            this.$refs.floorMap.init(this.floorInfo.gname)
         },
         additionalColl() {
             this.show = !this.show
         }
     },
     mounted() {
-        // this.$refs.floorMap.init(this.floorInfo.gname)
+        this.$refs.floorMap.init(this.floorInfo.gname)
     }
 }
 </script>

+ 4 - 4
src/views/other/gcfz1.vue

@@ -1,15 +1,16 @@
 <template>
     <el-table
-        v-if='hztjTable.length>0'
+        v-if='hztjTable.length>=0'
         :header-cell-style='{background:"rgba(245,246,247,1)",fontFamily:"MicrosoftYaHei",color:"rgba(100,108,115,1)",lineHeight:"16px",fontSize:"12px"}'
         v-loading='loading'
         :data='hztjTable'
         style='width: 100%'
         :summary-method='getSummaries'
         show-summary
+        border
     >
         <el-table-column label='序号' type='index'></el-table-column>
-        <el-table-column prop='floor' label='楼层'>
+        <el-table-column prop='floor' label='楼层' :show-overflow-tooltip='true' resizable>
             <template slot-scope='{row}'>{{row.floor||'--'}}</template>
         </el-table-column>
         <el-table-column prop='roomsl' label='总间数'>
@@ -35,11 +36,10 @@ export default {
 
             const sums = []
             columns.forEach((column, index) => {
-                if (index === 0) {
+                if (index === 1) {
                     sums[index] = '小计'
                     return
                 }
-                console.log(columns)
                 const values = data.map(item => Number(item[column.property]))
                 if (!values.every(value => isNaN(value))) {
                     sums[index] = values.reduce((prev, curr) => {

+ 12 - 13
src/views/other/gcfz2.vue

@@ -1,6 +1,18 @@
 <template>
     <div class='gcfz2'>
         <div class='table-2-input'>
+            <Select
+                width='200'
+                tipPlace='top'
+                @change='changelc'
+                caption='楼层:'
+                v-model='cg.floors'
+                size='small'
+                style='margin-right:12px'
+                :selectdata='floorSelect'
+                :placeholder='"选择楼层"'
+            ></Select>
+            <el-input @change='changelc' placeholder='搜索区域' size='small' style='width:200px' prefix-icon='el-icon-search' v-model='cg.searVal'></el-input>
             <div class='picker-box'>
                 <span class='picker-span'>记录日期:</span>
                 <el-date-picker
@@ -15,19 +27,6 @@
                     @change='changelc'
                 ></el-date-picker>
             </div>
-
-            <Select
-                width='200'
-                tipPlace='top'
-                @change='changelc'
-                caption='楼层:'
-                v-model='cg.floors'
-                size='small'
-                style='margin-right:12px'
-                :selectdata='floorSelect'
-                :placeholder='"选择楼层"'
-            ></Select>
-            <el-input @change='changelc' placeholder='搜索区域' size='small' style='width:200px' prefix-icon='el-icon-search' v-model='cg.searVal'></el-input>
         </div>
         <div class='table-2-table'>
             <el-table

+ 50 - 9
src/views/other/gcfzDialog.vue

@@ -1,7 +1,6 @@
 <template>
     <div class='dialog-container'>
         <el-dialog v-if='Object.keys(dialogInfo).length>0' :title='`${systemName}-${dialogInfo.label}`' :visible.sync='visible' :fullscreen='true'>
-            <div class='top'></div>
             <div v-if='dialogInfo.type==1' class='table-1'>
                 <gcfz-table1 v-if='hztjTable.length>=0' :loading='loading' :hztjTable='hztjTable'></gcfz-table1>
                 <p class='table1-p'>注:详细位置可在辅助用房管理平面图中查询</p>
@@ -53,9 +52,10 @@ export default {
         // 辅助用房管理-汇总统计报
         query() {
             let getParams = {
-                plazaId: '1000303'
-                // plazaId: this.$store.state.plazaId
+                plazaId: this.$store.state.plazaId,
+                orderBy: 'floor,1'
             }
+
             querygcfzyfhz({ getParams }).then(res => {
                 if (res.result == 'success') {
                     console.log('汇总统计报', res)
@@ -116,12 +116,6 @@ export default {
 }
 </script>
 <style lang="less" scoped>
-.top {
-    width: 100%;
-    height: 1px;
-    background: rgba(0, 0, 0, 0.06);
-    margin-bottom: 20px;
-}
 .table-1 {
     padding: 16px 24px 24px 24px;
     .table1-p {
@@ -148,4 +142,51 @@ export default {
         padding-right: 20px;
     }
 }
+.el-dialog__wrapper {
+    transition-duration: 0.3s;
+}
+.dialog-fade-enter-active {
+    animation: none !important;
+}
+.dialog-fade-leave-active {
+    transition-duration: 0.15s !important;
+    animation: none !important;
+}
+
+.dialog-fade-enter-active .el-dialog,
+.dialog-fade-leave-active .el-dialog {
+    animation-fill-mode: forwards;
+}
+
+.dialog-fade-enter-active .el-dialog {
+    animation-duration: 0.3s;
+    animation-name: anim-open;
+    animation-timing-function: cubic-bezier(0.6, 0, 0.4, 1);
+}
+
+.dialog-fade-leave-active .el-dialog {
+    animation-duration: 0.3s;
+    animation-name: anim-close;
+}
+
+@keyframes anim-open {
+    0% {
+        opacity: 0;
+        transform: scale3d(0, 0, 1);
+    }
+    100% {
+        opacity: 1;
+        transform: scale3d(1, 1, 1);
+    }
+}
+
+@keyframes anim-close {
+    0% {
+        opacity: 1;
+    }
+    100% {
+        opacity: 0;
+        transform: scale3d(0.5, 0.5, 1);
+    }
+}
 </style>

+ 14 - 2
src/views/other/index.vue

@@ -11,7 +11,7 @@
                 <ul>
                     <li class='li-style' v-for='(item,index) in everySystem' :key='"o"+index' @click='dialogVisible(item)'>
                         <span class='circle'></span>
-                        {{item.label}}
+                        <span class='hanzi'>{{item.label}}</span>
                     </li>
                 </ul>
             </div>
@@ -135,14 +135,26 @@ export default {
             font-size: 14px;
         }
         .li-style {
-            padding: 0 0 18px 35px;
+            padding: 0 0 8px 35px;
             cursor: pointer;
+            display: flex;
+            align-items: center;
             .circle {
                 width: 6px;
                 height: 6px;
                 border-radius: 50%;
                 display: inline-block;
                 margin-right: 10px;
+                background: linear-gradient(180deg, rgba(54, 156, 247, 1) 0%, rgba(2, 91, 170, 1) 100%);
+            }
+            .hanzi {
+                padding: 10px 2px;
+                width: 200px;
+                display: inline-block;
+                &:hover {
+                    color: rgba(2, 91, 170, 1);
+                    background: linear-gradient(270deg, rgba(199, 217, 234, 0) 0%, rgba(199, 217, 234, 1) 100%);
+                }
             }
         }
         .other-right {

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

@@ -1,5 +1,4 @@
 <template>
-    <!-- 设备设施的三级路由的tabs -->
     <div class='dialog-container'>
         <el-dialog :title='`${systemName}-${dialogInfo.label}`' :visible.sync='visible' :fullscreen='true'>
             <div class='top'></div>

+ 31 - 14
src/views/other/zhsxOtherTable1.vue

@@ -15,7 +15,6 @@
                     end-placeholder
                 ></el-date-picker>
             </div>
-
             <Select
                 @change='getZhjl'
                 width='200'
@@ -31,6 +30,7 @@
             <el-input clearable placeholder='搜索记录事项' @change='getZhjl' size='small' prefix-icon='el-icon-search' v-model='ssjlsx' style='width:200px'></el-input>
         </div>
         <el-table
+            border
             @row-click='handdle'
             v-loading='loading'
             :header-cell-style='{background:"rgba(245,246,247,1)",fontFamily:"MicrosoftYaHei",color:"rgba(100,108,115,1)",lineHeight:"16px",fontSize:"12px"}'
@@ -38,23 +38,33 @@
             style='width: 100%;margin-top:12px'
         >
             <el-table-column label='序号' type='index' width='50'></el-table-column>
-            <el-table-column prop sortable label='日期'>
+            <el-table-column prop sortable label='日期' resizable>
                 <template slot-scope='{row}'>{{formatter(row.createdate)||'--'}}</template>
             </el-table-column>
-            <el-table-column prop='type' label='政府部门'>
+            <el-table-column prop label='政府部门'>
                 <template slot-scope='{row}'>{{row.department||'--'}}</template>
             </el-table-column>
-            <el-table-column prop='thing' label='记录事项' :show-overflow-tooltip='true'>
+            <el-table-column prop label='记录事项' :show-overflow-tooltip='true'>
                 <template slot-scope='{row}'>{{row.recordsx||'--'}}</template>
             </el-table-column>
-            <el-table-column prop='name' label='工作要求'>
+            <el-table-column prop label='工作要求'>
                 <template slot-scope='{row}'>{{row.workyq||'--'}}</template>
             </el-table-column>
-            <el-table-column prop='type' label='整改要求'>
+            <el-table-column prop label='整改要求'>
                 <template slot-scope='{row}'>{{row.zgyq||'--'}}</template>
             </el-table-column>
-            <el-table-column prop='name' label='附件'>
-                <template slot-scope='{row}'>{{'--'}}</template>
+            <el-table-column prop label='附件'>
+                <template slot-scope='{row}'>
+                    <el-popover placement='right' trigger='hover'>
+                        <div>
+                            <p style='display: flex;justify-content: space-between;color: rgba(0, 145, 255, 1);cursor: pointer;'>
+                                <span>南区防雷检测报告. pdf</span>
+                                <i style='margin-left: 20px;font-size: 16px;' class='el-icon-download'></i>
+                            </p>
+                        </div>
+                        <div class='fileOpen' slot='reference'>预览({{row.file}})</div>
+                    </el-popover>
+                </template>
             </el-table-column>
         </el-table>
         <div class='foot'>
@@ -75,12 +85,13 @@ import moment from 'moment'
 import Select from '@/components/Select/Select.vue'
 import { queryGlams } from '@/api/other.js'
 import { querySelect } from '@/api/public.js'
+import pdf from 'vue-pdf'
 
 export default {
     data() {
         return {
             dateVal: '',
-            loading: true,
+            loading: false,
             zhjlTable: [],
             searVal: '',
             total: 0,
@@ -91,7 +102,7 @@ export default {
             isOpen: true
         }
     },
-    components: { Select },
+    components: { Select, pdf },
     methods: {
         formatter(date) {
             return moment.unix(date / 1000).format('YYYY.MM.DD')
@@ -109,7 +120,8 @@ export default {
             let getParams = {
                 plazaId: this.$store.state.plazaId,
                 page: this.page,
-                size: this.size
+                size: this.size,
+                orderBy: 'createdate,0'
             }
             if (this.searVal) {
                 getParams.department = this.searVal
@@ -157,17 +169,18 @@ export default {
                         }
                         this.department.push(obj)
                     })
+                    console.log(this.department)
                 }
             })
         },
         handdle() {
-            this.isOpen = !this.isOpen
             if (this.isOpen) {
-                window.open('https://www.baidu.com/')
+                window.open('http://bing.com', true)
             }
         }
     },
-    mounted() {
+    mounted() {},
+    created() {
         this.changeSelect()
     }
 }
@@ -189,6 +202,10 @@ export default {
             color: rgba(0, 0, 0, 0.65);
         }
     }
+    .fileOpen {
+        color: rgba(0, 145, 255, 1);
+        cursor: pointer;
+    }
 }
 </style>
 <style lang="less">

+ 4 - 4
src/views/other/zhsxOtherTable2.vue

@@ -1,6 +1,7 @@
 <template>
     <div class='tableZh'>
         <div class='tab-top'>
+            <el-input clearable @change='dsfjc' placeholder='搜索任务名称' size='small' prefix-icon='el-icon-search' v-model='searVal' style='width:200px'></el-input>
             <Select
                 width='200'
                 tipPlace='top'
@@ -8,7 +9,7 @@
                 size='small'
                 v-model='ztdsf'
                 style='margin-right:12px'
-                v-if='status2.length>0'
+                v-if='status2.length>=0'
                 :selectdata='status2'
                 :placeholder='"请选择"'
                 @change='dsfjc'
@@ -18,7 +19,7 @@
                 width='200'
                 tipPlace='top'
                 caption='部门'
-                v-if='zgbm.length>0'
+                v-if='zgbm.length>=0'
                 size='small'
                 v-model='bmdsf'
                 style='margin-right:12px'
@@ -32,12 +33,11 @@
                 caption='检测结论'
                 size='small'
                 style='margin-right:12px'
-                v-if='conclusion.length>0'
+                v-if='conclusion.length>=0'
                 :selectdata='conclusion'
                 :placeholder='"请选择"'
                 v-model='jcjldsf'
             ></Select>
-            <el-input clearable @change='dsfjc' placeholder='搜索任务名称' size='small' prefix-icon='el-icon-search' v-model='searVal' style='width:200px'></el-input>
         </div>
         <el-table
             row-key='id'

+ 2 - 2
src/views/overview/index.vue

@@ -27,11 +27,11 @@
                         <span></span>
                         <span>建筑综合信息</span>
                     </nav>
-                    <p class='place-p1'>{{'-'}}</p>
+                    <p class='place-p1'>{{build.length>0?formatter('项目名称',build):'--'}}</p>
                     <p class='place-p2'>
                         <span>
                             <img src='@/assets/imgs/didian.png' alt />
-                            {{'-'}}
+                            {{build.length>0?formatter('项目地址',build):'--'}}
                         </span>
                     </p>
                     <div class='place-bottom'>

+ 77 - 6
src/views/room/index.vue

@@ -7,6 +7,7 @@
     <div class='compute-box'>
         <el-dialog :title='`${systemName}`||"机房"' :visible.sync='visible' :fullscreen='true'>
             <div class='compute-span'></div>
+            <div class='compute-zf'></div>
             <div class='compute-tab'>
                 <el-tabs v-model='activeName' @tab-click='handleClick'>
                     <el-tab-pane label='机房布置图' name='1'>
@@ -594,7 +595,7 @@ export default {
         // 维修
         Index3() {
             let getParams = {
-                location: '1198',
+                location: '1175',
                 // plazaId: '1000388',
                 plazaId: this.$store.state.plazaId,
                 page: this.page3,
@@ -657,7 +658,7 @@ export default {
         Index4() {
             let postParams = {}
             let data = {
-                location: '1198',
+                location: '1175',
                 plazaId: this.$store.state.plazaId,
                 page: this.page4,
                 size: this.size4,
@@ -676,8 +677,8 @@ export default {
             }
             // 异常工单填报时间
             if (this.ycgdtbsj) {
-                data.reportedbyStartDate = this.ycgdtbsj[0] + '000000'
-                data.reportedbyEndDate = this.ycgdtbsj[1] + '000000'
+                data.reportdateStartDate = this.ycgdtbsj[0] + '000000'
+                data.reportdateEndDate = this.ycgdtbsj[1] + '000000'
             }
             // 异常工单验收时间
             if (this.ycgdyssj) {
@@ -738,12 +739,12 @@ export default {
             this.department = []
             let postParams = [
                 {
-                    columnName: { status: 'status', zt: 'zt' },
+                    columnName: { status2: 'status2', zt: 'zt' },
                     tableName: 'v_glsms_wbzy'
                 }
             ]
             let data = {
-                plazaId: '1000288'
+                plazaId: this.$store.state.plazaId
             }
             querySelect({ data, postParams }).then(res => {
                 console.log('下拉框', res)
@@ -785,6 +786,25 @@ export default {
 </script>
 <style lang="less" scoped>
 .compute-box {
+    .compute-zf {
+        width: 15px;
+        height: 13px;
+        background: url('../../assets/imgs/zffx.png');
+        background-repeat: no-repeat;
+        background-size: 100% 100%;
+        position: absolute;
+        right: 74px;
+        top: 25px;
+        cursor: pointer;
+        &::after {
+            content: '';
+            position: absolute;
+            right: -16px;
+            width: 1px;
+            height: 16px;
+            background: rgba(216, 216, 216, 1);
+        }
+    }
     .compute-span {
         width: 100%;
         height: 1px;
@@ -836,6 +856,10 @@ export default {
             justify-content: flex-end;
         }
     }
+    .compute-tab {
+        margin-top: 16px;
+        padding: 0 24px;
+    }
 }
 </style>
 <style lang="less">
@@ -908,5 +932,52 @@ export default {
     .el-input--suffix .el-input__inner {
         padding-right: 20px;
     }
+    .el-dialog__wrapper {
+        transition-duration: 0.3s;
+    }
+    .dialog-fade-enter-active {
+        animation: none !important;
+    }
+    .dialog-fade-leave-active {
+        transition-duration: 0.15s !important;
+        animation: none !important;
+    }
+
+    .dialog-fade-enter-active .el-dialog,
+    .dialog-fade-leave-active .el-dialog {
+        animation-fill-mode: forwards;
+    }
+
+    .dialog-fade-enter-active .el-dialog {
+        animation-duration: 0.3s;
+        animation-name: anim-open;
+        animation-timing-function: cubic-bezier(0.6, 0, 0.4, 1);
+    }
+
+    .dialog-fade-leave-active .el-dialog {
+        animation-duration: 0.3s;
+        animation-name: anim-close;
+    }
+
+    @keyframes anim-open {
+        0% {
+            opacity: 0;
+            transform: scale3d(0, 0, 1);
+        }
+        100% {
+            opacity: 1;
+            transform: scale3d(1, 1, 1);
+        }
+    }
+
+    @keyframes anim-close {
+        0% {
+            opacity: 1;
+        }
+        100% {
+            opacity: 0;
+            transform: scale3d(0.5, 0.5, 1);
+        }
+    }
 }
 </style>

+ 7 - 7
src/views/room/room2.vue

@@ -10,25 +10,25 @@
                 :header-cell-style='{background:"rgba(245,246,247,1)",fontFamily:"MicrosoftYaHei",color:"rgba(100,108,115,1)",lineHeight:"16px",fontSize:"12px"}'
             >
                 <el-table-column type='index' label='序号' width='50'></el-table-column>
-                <el-table-column prop='a' label='抽屉编号' resizable>
+                <el-table-column prop='a' label='抽屉编号' :show-overflow-tooltip='true' resizable>
                     <template slot-scope='{row}'>{{row.drawernum||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop='a' label='出线规格'>
+                <el-table-column prop='a' label='出线规格' :show-overflow-tooltip='true'>
                     <template slot-scope='{row}'>{{row.outspec||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop='a' label='楼层'>
+                <el-table-column prop='a' label='楼层' :show-overflow-tooltip='true'>
                     <template slot-scope='{row}'>{{row.floor||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop='a' label='电井编号'>
+                <el-table-column prop='a' label='电井编号' :show-overflow-tooltip='true'>
                     <template slot-scope='{row}'>{{row.wellnum||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop='brand' label='电箱编号'>
+                <el-table-column prop='brand' label='电箱编号' :show-overflow-tooltip='true'>
                     <template slot-scope='{row}'>{{row.boxnum||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop='brand' label='供电容量(kw)'>
+                <el-table-column prop='brand' label='供电容量(kw)' :show-overflow-tooltip='true'>
                     <template slot-scope='{row}'>{{row.capacitynum||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop='brand' label='控制回路'>
+                <el-table-column prop='brand' label='控制回路' :show-overflow-tooltip='true'>
                     <template slot-scope='{row}'>{{row.control||'--'}}</template>
                 </el-table-column>
             </el-table>

+ 6 - 3
src/views/room/room3.vue

@@ -13,13 +13,13 @@
                 <el-table-column prop :show-overflow-tooltip='true' label='设备简称' resizable>
                     <template slot-scope='{row}'>{{row.sbjc||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='数量'>
+                <el-table-column prop label='数量' :show-overflow-tooltip='true'>
                     <template slot-scope='{row}'>{{row.sl||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='品牌'>
+                <el-table-column prop label='品牌' :show-overflow-tooltip='true'>
                     <template slot-scope='{row}'>{{row.brand||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='型号'>
+                <el-table-column prop label='型号' :show-overflow-tooltip='true'>
                     <template slot-scope='{row}'>{{row.sbxh||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='楼层' :show-overflow-tooltip='true'>
@@ -62,6 +62,9 @@ export default {
 
     components: { Select, Detail },
     methods: {
+        modalClose() {
+            this.innerVisible = false
+        },
         pageChanged(page) {
             this.$emit('Index2Emit', page)
         },

+ 15 - 15
src/views/room/room5.vue

@@ -12,49 +12,49 @@
                 <el-table-column prop label='设备名称' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.sbmc||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='设备编号'>
+                <el-table-column prop label='设备编号' :show-overflow-tooltip='true'>
                     <template slot-scope='{row}'>{{row.assetnum||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='核心维保事项记录' min-width='130'>
+                <el-table-column prop label='核心维保事项记录' :show-overflow-tooltip='true' min-width='130'>
                     <template slot-scope='{row}'>{{row.matters||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='现场照片'>
+                <el-table-column prop label='现场照片' :show-overflow-tooltip='true'>
                     <template slot-scope='{row}'>{{row.pics ||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='维保任务' align='center'>
-                    <el-table-column prop label='任务编号'>
+                    <el-table-column prop label='任务编号' :show-overflow-tooltip='true'>
                         <template slot-scope='{row}'>{{row.wb_gzglid||'--'}}</template>
                     </el-table-column>
-                    <el-table-column prop label='维保任务名称' min-width='100'>
+                    <el-table-column prop label='维保任务名称' :show-overflow-tooltip='true' min-width='100'>
                         <template slot-scope='{row}'>{{row.wbrwmc || '--'}}</template>
                     </el-table-column>
-                    <el-table-column prop label='任务状态'>
+                    <el-table-column prop label='任务状态' :show-overflow-tooltip='true'>
                         <template slot-scope='{row}'>{{row.status||'--'}}</template>
                     </el-table-column>
-                    <el-table-column prop label='开始时间' width='90'>
+                    <el-table-column prop label='开始时间' :show-overflow-tooltip='true' width='90'>
                         <template slot-scope='{row}'>{{row.sjkssj?formatter(row.sjkssj):'--'}}</template>
                     </el-table-column>
-                    <el-table-column prop label='完成时间' width='90'>
+                    <el-table-column prop label='完成时间' :show-overflow-tooltip='true' width='90'>
                         <template slot-scope='{row}'>{{row.sjwcsj?formatter(row.sjwcsj):'--'}}</template>
                     </el-table-column>
-                    <el-table-column prop label='执行耗时(天)' min-width='130' :sortable='true'>
+                    <el-table-column prop label='执行耗时(天)' :show-overflow-tooltip='true' min-width='130' :sortable='true'>
                         <template slot-scope='{row}'>{{row.sjcxsjt||'--'}}</template>
                     </el-table-column>
                 </el-table-column>
-                <el-table-column prop label='是否正常'>
+                <el-table-column prop label='是否正常' :show-overflow-tooltip='true'>
                     <template slot-scope='{row}'>{{row.zt||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='异常工单' align='center'>
-                    <el-table-column prop label='异常工单编号' min-width='110'>
+                    <el-table-column prop label='异常工单编号' :show-overflow-tooltip='true' min-width='110'>
                         <template slot-scope='{row}'>{{row.wonum||'--'}}</template>
                     </el-table-column>
-                    <el-table-column prop label='描述'>
+                    <el-table-column prop label='描述' :show-overflow-tooltip='true'>
                         <template slot-scope='{row}'>{{row.description||'--'}}</template>
                     </el-table-column>
-                    <el-table-column prop label='填报时间' width='90'>
-                        <template slot-scope='{row}'>{{row.reportedby?formatter(row.reportedby):'--'}}</template>
+                    <el-table-column prop label='填报时间' :show-overflow-tooltip='true' width='90'>
+                        <template slot-scope='{row}'>{{row.reportdate?formatter(row.reportdate):'--'}}</template>
                     </el-table-column>
-                    <el-table-column prop label='验收时间' width='90'>
+                    <el-table-column prop label='验收时间' :show-overflow-tooltip='true' width='90'>
                         <template slot-scope='{row}'>{{row.sjjssj?formatter(row.sjjssj):'--'}}</template>
                     </el-table-column>
                 </el-table-column>