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
a476552fb1

+ 2 - 1
src/components/editLengend.vue

@@ -117,7 +117,8 @@ export default {
             this.multipleSelection = val
         },
         cancel() {
-            this.$emit('cance')
+            this.save()
+            // this.$emit('cance')
         },
         changeTable(val) {
             this.editNum.push(val)

+ 26 - 27
src/router/index.js

@@ -1,68 +1,67 @@
-import Vue from "vue"
-import VueRouter from "vue-router"
+import Vue from 'vue'
+import VueRouter from 'vue-router'
 
 Vue.use(VueRouter)
 
 const routes = [
     // 登陆页面
     {
-        path: "/",
-        redirect: '/home/first',
+        path: '/',
+        redirect: '/home/overview',
     },
     // home
     {
-        path: "/home",
-        name: "home",
-        component: () => import("../views/index"),
+        path: '/home',
+        name: 'home',
+        component: () => import('../views/index'),
         redirect: '/home/first',
         children: [
-            //手语舞
             {
-                path: "first",
-                component: () => import("../views/first"),
+                path: 'first',
+                component: () => import('../views/first'),
             },
             //概览
             {
-                path: "overview",
-                component: () => import("../views/overview"),
+                path: 'overview',
+                component: () => import('../views/overview'),
             },
             // 楼层功能
             {
-                path: "floorFunc",
-                component: () => import("../views/floorFunc"),
+                path: 'floorFunc',
+                component: () => import('../views/floorFunc'),
             },
             // 设备设施
             {
-                path: "equipment",
-                component: () => import("../views/equipment"),
+                path: 'equipment',
+                component: () => import('../views/equipment'),
             },
             // 其他功能
             {
-                path: "other",
-                component: () => import("../views/other"),
+                path: 'other',
+                component: () => import('../views/other'),
             },
             // 分析
             {
-                path: "analysis",
-                component: () => import("../views/analysis"),
+                path: 'analysis',
+                component: () => import('../views/analysis'),
             },
             //图例库管理
             {
-                path: "legendLibrary",
-                component: () => import("../views/legendLibrary"),
+                path: 'legendLibrary',
+                component: () => import('../views/legendLibrary'),
             },
             //图例绘制规则
             {
-                path: "legendRules",
-                component: () => import("../views/legendRules"),
+                path: 'legendRules',
+                component: () => import('../views/legendRules'),
             },
         ],
-    }
+    },
 ]
 const router = new VueRouter({
-    mode: "history",
+    mode: 'history',
     base: process.env.BASE_URL,
     routes,
 })
 
-export default router
+export default router

+ 5 - 5
src/utils/plugins/components.js

@@ -313,16 +313,16 @@ var system = [
                     id: "RDQD",
                     children: [
                         {
-                            label: "BA楼宇智能化",
-                            id: "RDQD1",
-                            param: { tab_code: "rd02" },
-                        },
-                        {
                             label: "门禁管理",
                             id: "RDQD2",
                             param: { tab_code: "rd01" },
                         },
                         {
+                            label: "BA楼宇智能化",
+                            id: "RDQD1",
+                            param: { tab_code: "rd02" },
+                        },
+                        {
                             label: "视频监控",
                             id: "RDQD3",
                             param: { tab_code: "rd03" },

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

@@ -100,9 +100,9 @@ export default {
             } else if (this.smsxt) {
                 this.smsxt = tab.name
             }
-
             this.activeName = tab.name
         },
+
         visibalBox() {
             this.$refs.Dialog.open()
         },
@@ -128,7 +128,6 @@ export default {
         font-weight: bold;
     }
 }
-
 .top {
     width: 1366px;
     height: 1px;

+ 0 - 24
src/views/equipment/index.vue

@@ -45,11 +45,9 @@
 <script>
 import floorList from '@/components/floorList.vue'
 import floorMap from '@/components/floorMap/index.vue'
-
 import eqDialog from './eqDialog'
 import editList from '@/components/edit.vue'
 import { system, floors } from '@/utils/plugins/components.js'
-import { querySelect, queryTab } from '@/api/public.js'
 export default {
     data() {
         return {
@@ -70,26 +68,6 @@ export default {
     },
     components: { floorList, eqDialog, floorMap, editList },
     methods: {
-        // 查询下拉框
-        query() {
-            let postParams = [
-                {
-                    columnName: { brand: 'brand', manufacturer: 'manufacturer' }, //列名称
-                    params: {
-                        // tab_code: '1572'
-                    },
-                    tableName: 'glsms_asset' //视图名称
-                }
-            ]
-            let data = {
-                major: '弱电',
-                plazaId: '1001145'
-            }
-            querySelect({ data, postParams }).then(res => {
-                this.brand = res.data.data.glsms_asset ? res.data.data.glsms_asset.brand : []
-                this.manufacturer = res.data.data.glsms_asset ? res.data.data.glsms_asset.manufacturer : []
-            })
-        },
         // 查询tab页
         tabSyatem(item) {
             this.systemId = item.id
@@ -106,11 +84,9 @@ export default {
         dialogVisible(eve) {
             console.log(eve)
             this.$refs.dialog.showModal(eve)
-            // this.dialogInfo = eve
         }
     },
     mounted() {
-        this.query()
         this.everySystem = this.system[0].children
         this.$refs.floorMap.init(1)
     }

+ 4 - 1
src/views/equipment/table/lookPageTable.vue

@@ -10,6 +10,8 @@
                 v-model='keyword'
                 style='width:192px;margin-right:12px'
             ></el-input>
+            <Select @change='getList' v-model='floor' style='margin-right:12px;' width='120' tipPlace='top' caption='楼层 :' :selectdata='floorSelect'></Select>
+            <Select @change='getList' v-model='floor' width='120' tipPlace='top' caption='文件类型 :' :selectdata='floorSelect'></Select>
         </div>
         <el-table :data='tableData' style='width: 100%'>
             <el-table-column type='index' label='序号' width='80'></el-table-column>
@@ -55,7 +57,8 @@ export default {
             total: 0,
             currentPage: 1,
             size: 11,
-            keyword: ''
+            keyword: '',
+            floor: ''
         }
     },
     props: ['major'],

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

@@ -4,7 +4,8 @@
         <div class='eq-list-top'>
             <el-date-picker size='small' v-model='yssjwcsj' type='date' placeholder='选择处理日期:' @change='getList' style='width:180px;margin-right:12px'></el-date-picker>
             <Select width='146' tipPlace='top' caption='处置结果:' :selectdata='dataSelect2' :placeholder='"请选择"' @change='getList'></Select>
-            <el-input placeholder='搜索位置和内容' style='width:192px;margin-right:12px' size='small' prefix-icon='el-icon-search' v-model='keyword'></el-input>
+            <el-input placeholder='搜索位置' style='width:192px;margin-left:12px' size='small' prefix-icon='el-icon-search' v-model='keyword'></el-input>
+            <el-input placeholder='搜索内容' style='width:192px;margin-left:12px' size='small' prefix-icon='el-icon-search' v-model='keyword'></el-input>
         </div>
         <el-table :data='tableData' :border='true' style='width: 100%'>
             <el-table-column type='index' label='序号' width='80'></el-table-column>

+ 14 - 3
src/views/other/gcfz2.vue

@@ -1,9 +1,20 @@
 <template>
     <div class='gcfz2'>
         <div class='table-2-input'>
-            <el-date-picker size='small' v-model='dateVal' type='date' style='margin-right:12px;width:140px' placeholder='记录日期'></el-date-picker>
-            <Select width='130' tipPlace='top' caption='楼层:' size='small' style='margin-right:12px' :selectdata='floorSelect' :placeholder='"请选择"'></Select>
-            <el-input placeholder='请按照区域搜索' size='small' style='width:200px' prefix-icon='el-icon-search' v-model='searVal'></el-input>
+            <el-date-picker
+                v-model='dateVal'
+                value-format='yyyyMMdd'
+                type='daterange'
+                @change='getZhjl'
+                size='small'
+                style='margin-right:12px;width:230px'
+                range-separator='-'
+                start-placeholder='开始日期'
+                end-placeholder='结束日期'
+                placeholder='记录日期'
+            ></el-date-picker>
+            <Select width='146' tipPlace='top' caption='楼层:' size='small' style='margin-right:12px' :selectdata='floorSelect' :placeholder='"请选择"'></Select>
+            <el-input placeholder='搜索区域' size='small' style='width:192px' prefix-icon='el-icon-search' v-model='searVal'></el-input>
         </div>
         <div class='table-2-table'>
             <el-table

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

@@ -1,9 +1,19 @@
 <template>
     <div class='tableZh'>
-        <div class='tab-top'>
-            <el-date-picker size='small' v-model='dateVal' type='date' style='margin-right:12px;width:140px' placeholder='日期'></el-date-picker>
+        <div class='tab-top' style='display:flex;align-items: center;'>
+            <el-date-picker
+                v-model='dateVal'
+                value-format='yyyyMMdd'
+                type='daterange'
+                @change='getZhjl'
+                size='small'
+                style='margin-right:12px;width:230px'
+                range-separator='-'
+                start-placeholder='开始日期'
+                end-placeholder='结束日期'
+            ></el-date-picker>
             <Select
-                width='180'
+                width='146'
                 tipPlace='top'
                 caption='政府部门'
                 size='small'
@@ -12,9 +22,10 @@
                 :selectdata='department'
                 :placeholder='"请选择"'
             ></Select>
-            <el-input placeholder='请按照记录事项搜索' size='small' prefix-icon='el-icon-search' v-model='searVal' style='width:200px'></el-input>
+            <el-input placeholder='搜索记录事项' size='small' prefix-icon='el-icon-search' v-model='searVal' style='width:192px'></el-input>
         </div>
         <el-table
+            @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"}'
             :data='zhjlTable'
@@ -69,7 +80,8 @@ export default {
             total: 0,
             page: 1,
             size: 10,
-            department: []
+            department: [],
+            isOpen: true
         }
     },
     components: { Select },
@@ -77,6 +89,14 @@ export default {
         formatter(date) {
             return moment.unix(date / 1000).format('YYYY.MM.DD')
         },
+        rowClick() {
+            console.log('window.location.href', window.location.href)
+            console.log('document.location.href', document.location.href)
+            console.log('document.URL', document.URL)
+        },
+        changeData(val) {
+            console.log(val)
+        },
         // 综合记录
         getZhjl() {
             let getParams = {
@@ -122,6 +142,12 @@ export default {
                     })
                 }
             })
+        },
+        handdle() {
+            this.isOpen = !this.isOpen
+            if (this.isOpen) {
+                window.open('https://www.baidu.com/')
+            }
         }
     },
     mounted() {

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

@@ -22,7 +22,7 @@
                 :placeholder='"请选择"'
             ></Select>
             <Select
-                width='180'
+                width='146'
                 tipPlace='top'
                 caption='检测结论'
                 size='small'
@@ -31,7 +31,7 @@
                 :selectdata='conclusion'
                 :placeholder='"请选择"'
             ></Select>
-            <el-input placeholder='请按照任务名称搜索' size='small' prefix-icon='el-icon-search' v-model='searVal' style='width:200px'></el-input>
+            <el-input placeholder='搜索任务名称' size='small' prefix-icon='el-icon-search' v-model='searVal' style='width:192px'></el-input>
         </div>
         <el-table
             row-key='id'

+ 6 - 0
src/views/overview/index.vue

@@ -214,6 +214,12 @@ export default {
                 }
             })
         },
+        getImages(_url) {
+            if (_url !== undefined) {
+                let _u = _url.substring(7)
+                return 'https://images.weserv.nl/?url=' + _u
+            }
+        },
         formatter(str, arrv) {
             if (str && arrv) {
                 const Objs = arrv.find(e => e && e.project == str)

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

@@ -3,7 +3,7 @@
         <div class='top'></div>
         <div class='gdqd-dialog-top'>
             <Select
-                width='120'
+                width='146'
                 style='margin-right:12px'
                 tipPlace='top'
                 caption='楼层:'
@@ -13,7 +13,7 @@
                 :selectdata='floorSelect'
             ></Select>
             <Select
-                width='224'
+                width='146'
                 v-model='sbglgsStr'
                 style='margin-right:12px'
                 v-if='sbglgs.length>0'
@@ -24,7 +24,7 @@
                 :selectdata='sbglgs'
             ></Select>
             <Select
-                width='224'
+                width='146'
                 style='margin-right:12px'
                 v-if='sb_status.length>0'
                 tipPlace='top'
@@ -34,7 +34,13 @@
                 v-model='statusStr'
                 :selectdata='sb_status'
             ></Select>
-            <el-input placeholder='请输入设备简称、设备编号、品牌、型号、安装位置、生产厂商、服务商搜索' style='width:490px;' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
+            <el-input placeholder='搜索设备简称' style='width:196px;margin-right:12px' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
+            <el-input placeholder='搜索设备编号' style='width:196px;margin-right:12px' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
+            <el-input placeholder='搜索品牌' style='width:196px;margin-right:12px' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
+            <el-input placeholder='搜索型号' style='width:196px;margin-right:12px' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
+            <el-input placeholder='搜索安装位置' style='width:196px;margin-right:12px' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
+            <el-input placeholder='搜索生产厂商' style='width:196px;margin-right:12px' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
+            <el-input placeholder='搜索服务商' style='width:196px;margin-right:12px' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
         </div>
         <el-table
             v-loading='loadingDetail'

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

@@ -171,7 +171,8 @@ export default {
         Index3() {
             let getParams = {
                 location: '1198',
-                plazaId: this.$store.state.plazaId,
+                plazaId: '1000388',
+                // plazaId: this.$store.state.plazaId,
                 page: this.page3,
                 size: this.size3
             }
@@ -189,7 +190,7 @@ export default {
             let postParams = {}
             let data = {
                 location: '1198',
-                plazaId: this.$store.state.plazaId,
+                plazaId: '1000288',
                 page: this.page4,
                 size: this.size4
                 // smsxt: '1001'

+ 4 - 1
src/views/room/room2.vue

@@ -2,7 +2,10 @@
     <div class='compute-item'>
         <div class='compute-center'>
             <Select width='146' tipPlace='top' caption='楼层:' :selectdata='floorSelect' :placeholder='"请选择"' style='margin-right:12px'></Select>
-            <el-input placeholder='请输入抽屉编号、出线规格、电井编号、控制回路搜索' size='small' prefix-icon='el-icon-search' v-model='searVal' style='width:360px'></el-input>
+            <el-input placeholder='搜索抽屉编号' size='small' prefix-icon='el-icon-search' v-model='searVal' style='width:192px;margin-right:12px'></el-input>
+            <el-input placeholder='搜索出线规格' size='small' prefix-icon='el-icon-search' v-model='searVal' style='width:192px;margin-right:12px'></el-input>
+            <el-input placeholder='搜索电井编号' size='small' prefix-icon='el-icon-search' v-model='searVal' style='width:192px;margin-right:12px'></el-input>
+            <el-input placeholder='搜索控制回路' size='small' prefix-icon='el-icon-search' v-model='searVal' style='width:192px;margin-right:12px'></el-input>
         </div>
         <div class='compute-table'>
             <el-table

+ 4 - 1
src/views/room/room3.vue

@@ -2,7 +2,10 @@
     <div class='compute-item'>
         <div class='compute-center'>
             <Select width='146' tipPlace='top' caption='楼层:' :selectdata='floorSelect' :placeholder='"请选择"' style='margin-right:12px'></Select>
-            <el-input placeholder='请输入设备简称、品牌、型号、生产厂商搜索' size='small' prefix-icon='el-icon-search' v-model='searVal' style='width:310px'></el-input>
+            <el-input placeholder='搜索设备简称' size='small' prefix-icon='el-icon-search' v-model='searVal' style='width:192px;margin-right:12px'></el-input>
+            <el-input placeholder='搜索品牌' size='small' prefix-icon='el-icon-search' v-model='searVal' style='width:192px;margin-right:12px'></el-input>
+            <el-input placeholder='搜索型号' size='small' prefix-icon='el-icon-search' v-model='searVal' style='width:192px;margin-right:12px'></el-input>
+            <el-input placeholder='搜索生产厂商' size='small' prefix-icon='el-icon-search' v-model='searVal' style='width:192px;margin-right:12px'></el-input>
         </div>
         <div class='compute-table'>
             <el-table

+ 72 - 17
src/views/room/room4.vue

@@ -1,10 +1,35 @@
 <template>
     <div class='compute-item'>
         <div class='compute-center'>
-            <el-date-picker size='small' v-model='value1' type='date' placeholder='填报时间' style='margin-right:12px;width:150px'></el-date-picker>
-            <el-date-picker size='small' v-model='value1' type='date' placeholder='验收时间' style='margin-right:12px;width:150px'></el-date-picker>
+            <el-date-picker
+                v-model='dateVal'
+                value-format='yyyyMMdd'
+                type='daterange'
+                @change='getZhjl'
+                size='small'
+                style='margin-right:12px;width:230px'
+                range-separator='-'
+                start-placeholder='开始日期'
+                end-placeholder='结束日期'
+                placeholder='填报时间'
+            ></el-date-picker>
+            <el-date-picker
+                v-model='dateVal'
+                value-format='yyyyMMdd'
+                type='daterange'
+                @change='getZhjl'
+                size='small'
+                style='margin-right:12px;width:230px'
+                range-separator='-'
+                start-placeholder='开始日期'
+                end-placeholder='结束日期'
+                placeholder='验收时间'
+            ></el-date-picker>
             <Select width='146' tipPlace='top' caption='是否更换:' :selectdata='isReplaceData' :placeholder='"请选择"' style='margin-right:12px'></Select>
-            <el-input placeholder='请输入设备名称、设备编号、重要事项记录、描述工单编号搜索' size='small' prefix-icon='el-icon-search' v-model='searVal' style='width:410px'></el-input>
+            <el-input placeholder='搜索设备名称' size='small' prefix-icon='el-icon-search' v-model='searVal' style='width:192px;margin-right:12px'></el-input>
+            <el-input placeholder='搜索设备编号' size='small' prefix-icon='el-icon-search' v-model='searVal' style='width:192px;margin-right:12px'></el-input>
+            <el-input placeholder='搜索重要事项记录' size='small' prefix-icon='el-icon-search' v-model='searVal' style='width:192px;margin-right:12px'></el-input>
+            <el-input placeholder='搜索描述工单编号' size='small' prefix-icon='el-icon-search' v-model='searVal' style='width:192px;margin-right:12px'></el-input>
         </div>
         <div class='compute-table'>
             <el-table
@@ -14,21 +39,47 @@
                 :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='lb' label='设备名称'></el-table-column>
-                <el-table-column prop='sl' label='设备编号'></el-table-column>
-                <el-table-column prop='unit' label='重要事项记录' min-width='110'></el-table-column>
-                <el-table-column prop='brand' label='描述'></el-table-column>
-                <el-table-column prop='brand' label='更换配件信息' align='center'>
-                    <el-table-column prop='brand' label='是/否更换'></el-table-column>
-                    <el-table-column prop='brand' label='配件名称型号' min-width='110'></el-table-column>
-                    <el-table-column prop='brand' label='数量'></el-table-column>
-                    <el-table-column prop='brand' label='费用(万元)' min-width='100'></el-table-column>
-                    <el-table-column prop='brand' label='费用出处'></el-table-column>
+                <el-table-column prop label='设备名称' show-overflow-tooltip resizable>
+                    <template slot-scope='{row}'>{{row.sbmc||'--'}}</template>
+                </el-table-column>
+                <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>
+                    <template slot-scope='{row}'>{{row.matters||'--'}}</template>
+                </el-table-column>
+                <el-table-column prop label='描述' show-overflow-tooltip resizable>
+                    <template slot-scope='{row}'>{{row.description||'--'}}</template>
+                </el-table-column>
+                <el-table-column prop label='更换配件信息' align='center' show-overflow-tooltip resizable>
+                    <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>
+                        <template slot-scope='{row}'>{{row.model||'--'}}</template>
+                    </el-table-column>
+                    <el-table-column prop label='数量' show-overflow-tooltip resizable>
+                        <template slot-scope='{row}'>{{row.cost||'--'}}</template>
+                    </el-table-column>
+                    <el-table-column prop label='费用(万元)' min-width='100' show-overflow-tooltip resizable>
+                        <template slot-scope='{row}'>{{row.cost||'--'}}</template>
+                    </el-table-column>
+                    <el-table-column prop label='费用出处' show-overflow-tooltip resizable>
+                        <template slot-scope='{row}'>{{row.source||'--'}}</template>
+                    </el-table-column>
+                </el-table-column>
+                <el-table-column prop label='现场照片' show-overflow-tooltip resizable>
+                    <template slot-scope='{row}'>{{'--'}}</template>
+                </el-table-column>
+                <el-table-column prop label='填报时间' show-overflow-tooltip resizable>
+                    <template slot-scope='{row}'>{{row.reportedby?formatter(row.reportedby):'--'}}</template>
+                </el-table-column>
+                <el-table-column prop label='验收时间' show-overflow-tooltip resizable>
+                    <template slot-scope='{row}'>{{row.sjjssj?formatter(row.sjjssj):'--'}}</template>
+                </el-table-column>
+                <el-table-column prop label='工单编号' show-overflow-tooltip resizable>
+                    <template slot-scope='{row}'>{{row.wonum||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop='brand' label='现场照片'></el-table-column>
-                <el-table-column prop='brand' label='填报时间'></el-table-column>
-                <el-table-column prop='brand' label='验收时间'></el-table-column>
-                <el-table-column prop='brand' label='工单编号'></el-table-column>
             </el-table>
         </div>
         <div class='foot'>
@@ -46,6 +97,7 @@
 </template>
 <script>
 import Select from '@/components/Select/Select.vue'
+import moment from 'moment'
 
 export default {
     props: ['table4', 'total', 'page', 'size', 'loading'],
@@ -62,6 +114,9 @@ export default {
     },
     components: { Select },
     methods: {
+        formatter(date) {
+            return moment.unix(date / 1000).format('YYYY.MM.DD')
+        },
         pageChanged(page) {
             this.page = page
             this.$emit('Index3')

+ 149 - 37
src/views/room/room5.vue

@@ -1,21 +1,61 @@
 <template>
     <div class='compute-item'>
         <div class='compute-center'>
-            <el-date-picker size='small' v-model='value1' type='date' style='margin-right:12px;width:140px' placeholder='开始时间'></el-date-picker>
-            <el-date-picker size='small' v-model='value1' type='date' style='margin-right:12px;width:140px' placeholder='完成时间'></el-date-picker>
-            <el-date-picker size='small' v-model='value1' type='date' style='margin-right:12px;width:140px' placeholder='填报时间'></el-date-picker>
-            <Select width='146' tipPlace='top' caption='是否正常:' :selectdata='dataSelect2' :placeholder='"请选择"' style='margin-right:12px'></Select>
-            <Select width='146' tipPlace='top' caption='任务状态:' :selectdata='dataSelect2' :placeholder='"请选择"' style='margin-right:12px'></Select>
-        </div>
-        <div class='compute-center'>
-            <el-input
-                placeholder='请输入设备名称、设备编号、核心维保事项记录、任务编号、异常工单编号、描述搜索'
+            <el-date-picker
+                v-model='dateVal'
+                value-format='yyyyMMdd'
+                type='daterange'
+                @change='getZhjl'
+                size='small'
+                style='margin-right:12px;width:230px'
+                range-separator='-'
+                start-placeholder='开始日期'
+                end-placeholder='结束日期'
+                placeholder='开始时间'
+            ></el-date-picker>
+            <el-date-picker
+                v-model='dateVal'
+                value-format='yyyyMMdd'
+                type='daterange'
+                @change='getZhjl'
                 size='small'
-                prefix-icon='el-icon-search'
-                v-model='searVal'
-                style='width:540px;'
-            ></el-input>
+                style='margin-right:12px;width:230px'
+                range-separator='-'
+                start-placeholder='开始日期'
+                end-placeholder='结束日期'
+                placeholder='完成时间'
+            ></el-date-picker>
+            <el-date-picker
+                v-model='dateVal'
+                value-format='yyyyMMdd'
+                type='daterange'
+                @change='getZhjl'
+                size='small'
+                style='margin-right:12px;width:230px'
+                range-separator='-'
+                start-placeholder='开始日期'
+                end-placeholder='结束日期'
+                placeholder='填报时间'
+            ></el-date-picker>
+            <Select width='146' tipPlace='top' caption='是否正常:' v-if='zt.length>0' :selectdata='zt' :placeholder='"请选择"' style='margin-right:12px'></Select>
+            <Select
+                width='146'
+                tipPlace='top'
+                caption='任务状态:'
+                v-if='status.length>0'
+                :selectdata='status'
+                :placeholder='"请选择"'
+                style='margin-right:12px'
+            ></Select>
+            <el-input placeholder='搜索设备名称' size='small' prefix-icon='el-icon-search' v-model='searVal' style='margin-right:12px;width:192px;'></el-input>
+            <el-input placeholder='搜索设备编号' size='small' prefix-icon='el-icon-search' v-model='searVal' style='margin-right:12px;width:192px;'></el-input>
+            <!-- 
+            <el-input placeholder='搜索核心维保事项记录' size='small' prefix-icon='el-icon-search' v-model='searVal' style='margin-right:12px;width:192px;'></el-input>
+            <el-input placeholder='搜索任务编号' size='small' prefix-icon='el-icon-search' v-model='searVal' style='margin-right:12px;width:192px;'></el-input>
+            <el-input placeholder='搜索异常工单编号' size='small' prefix-icon='el-icon-search' v-model='searVal' style='margin-right:12px;width:192px;'></el-input>
+            <el-input placeholder='搜索描述' size='small' prefix-icon='el-icon-search' v-model='searVal' style='margin-right:12px;width:192px;'></el-input>-->
         </div>
+        <div class='compute-center'></div>
         <div class='compute-table'>
             <el-table
                 v-loading='loading'
@@ -24,24 +64,54 @@
                 :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='lb' label='设备名称'></el-table-column>
-                <el-table-column prop='sl' label='设备编号'></el-table-column>
-                <el-table-column prop='unit' label='核心维保事项记录' min-width='130'></el-table-column>
-                <el-table-column prop='brand' label='现场照片'></el-table-column>
-                <el-table-column prop='brand' label='维保任务' align='center'>
-                    <el-table-column prop='brand' label='任务编号'></el-table-column>
-                    <el-table-column prop='brand' label='维保任务名称' min-width='100'></el-table-column>
-                    <el-table-column prop='brand' label='任务状态'></el-table-column>
-                    <el-table-column prop='brand' label='开始时间'></el-table-column>
-                    <el-table-column prop='brand' label='完成时间'></el-table-column>
-                    <el-table-column prop='brand' label='执行耗时(天)' min-width='130' :sortable='true'></el-table-column>
+                <el-table-column prop label='设备名称' show-overflow-tooltip resizable>
+                    <template slot-scope='{row}'>{{row.sbmc||'--'}}</template>
+                </el-table-column>
+                <el-table-column prop label='设备编号'>
+                    <template slot-scope='{row}'>{{row.assetnum||'--'}}</template>
+                </el-table-column>
+                <el-table-column prop label='核心维保事项记录' min-width='130'>
+                    <template slot-scope='{row}'>{{row.matters||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop='brand' label='是否正常'></el-table-column>
-                <el-table-column prop='brand' label='异常工单' align='center'>
-                    <el-table-column prop='brand' label='异常工单编号' min-width='110'></el-table-column>
-                    <el-table-column prop='brand' label='描述'></el-table-column>
-                    <el-table-column prop='brand' label='填报时间'></el-table-column>
-                    <el-table-column prop='brand' label='验收时间'></el-table-column>
+                <el-table-column prop label='现场照片'>
+                    <template slot-scope='{row}'>{{'--'}}</template>
+                </el-table-column>
+                <el-table-column prop label='维保任务' align='center'>
+                    <el-table-column prop label='任务编号'>
+                        <template slot-scope='{row}'>{{row.wb_gzglid||'--'}}</template>
+                    </el-table-column>
+                    <el-table-column prop label='维保任务名称' min-width='100'>
+                        <template slot-scope='{row}'>{{'--'}}</template>
+                    </el-table-column>
+                    <el-table-column prop label='任务状态'>
+                        <template slot-scope='{row}'>{{row.status||'--'}}</template>
+                    </el-table-column>
+                    <el-table-column prop label='开始时间' width='90'>
+                        <template slot-scope='{row}'>{{row.sjkssj?formatter(row.sjkssj):'--'}}</template>
+                    </el-table-column>
+                    <el-table-column prop label='完成时间' 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'>
+                        <template slot-scope='{row}'>{{row.sjcxsjt||'--'}}</template>
+                    </el-table-column>
+                </el-table-column>
+                <el-table-column prop label='是否正常'>
+                    <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'>
+                        <template slot-scope='{row}'>{{row.wonum||'--'}}</template>
+                    </el-table-column>
+                    <el-table-column prop label='描述'>
+                        <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>
+                    <el-table-column prop label='验收时间' width='90'>
+                        <template slot-scope='{row}'>{{row.sjjssj?formatter(row.sjjssj):'--'}}</template>
+                    </el-table-column>
                 </el-table-column>
             </el-table>
         </div>
@@ -60,26 +130,68 @@
 </template>
 <script>
 import Select from '@/components/Select/Select.vue'
+import moment from 'moment'
+import { querySelect } from '@/api/public.js'
 
 export default {
     props: ['table5', 'total', 'page', 'size', 'loading'],
     data() {
         return {
             value1: '',
-            dataSelect2: [
-                { id: 'test1', name: '选择项' },
-                { id: 'test2', name: '单平米' },
-                { id: 'test3', name: '下级分项' },
-                { id: 'test4', name: '滑动平均滑动平均' }
-            ],
-            searVal: ''
+            searVal: '',
+            status: [],
+            zt: []
         }
     },
     components: { Select },
+    mounted() {
+        this.changeSelect()
+    },
     methods: {
         pageChanged(page) {
             this.page = page
             this.$emit('Index4')
+        },
+        formatter(date) {
+            return moment.unix(date / 1000).format('YYYY.MM.DD')
+        },
+        changeSelect() {
+            this.department = []
+            let postParams = [
+                {
+                    columnName: { status: 'status', zt: 'zt' },
+                    tableName: 'v_glsms_wbzy'
+                }
+            ]
+            let data = {
+                plazaId: '1000288'
+            }
+            querySelect({ data, postParams }).then(res => {
+                console.log('下拉框', res)
+                let status = [],
+                    zt = []
+
+                status = res.data.data.v_glsms_wbzy.status ? res.data.data.v_glsms_wbzy.status : []
+                zt = res.data.data.v_glsms_wbzy.zt ? res.data.data.v_glsms_wbzy.zt : []
+                if (status.length > 0) {
+                    status.forEach(el => {
+                        let obj = {
+                            id: el.key,
+                            name: el.value
+                        }
+                        this.status.push(obj)
+                    })
+                }
+                if (zt.length > 0) {
+                    zt.forEach(el => {
+                        let obj = {
+                            id: el.key,
+                            name: el.value
+                        }
+                        this.zt.push(obj)
+                    })
+                }
+            })
         }
     }
 }