Browse Source

table style

zhulizhen1111 4 năm trước cách đây
mục cha
commit
71a2bd21eb

+ 22 - 5
src/views/equipment/index.vue

@@ -120,14 +120,13 @@ export default {
     display: flex;
     flex: 1;
     .eq-top {
-        margin-left: 196px;
+        margin-left: 260px;
         padding-top: 24px;
         position: fixed;
         z-index: 3;
         min-width: 1300px;
         .eq-system {
             padding: 12px 23px;
-
             background: #fff;
             font-size: 16px;
             cursor: pointer;
@@ -148,13 +147,13 @@ export default {
         .eq-left {
             position: fixed;
             z-index: 2;
-            width: 196px;
+            width: 260px;
             padding-top: 100px;
             color: #646c73;
             font-size: 14px;
             height: 100%;
             background: rgba(242, 245, 247, 1);
-            box-shadow: 2px 0px 10px 0px rgba(31, 36, 41, 0.06);
+            // box-shadow: 2px 0px 10px 0px rgba(31, 36, 41, 0.06);
         }
         .li-style {
             padding: 0 0 18px 35px;
@@ -180,7 +179,7 @@ export default {
                     position: fixed;
                     z-index: 2;
                     top: 146px;
-                    left: 229px;
+                    left: 260px;
                     display: flex;
                     img {
                         margin-top: -5px;
@@ -211,3 +210,21 @@ export default {
     }
 }
 </style>
+<style lang="less">
+.el-table {
+    th {
+        background: rgba(248, 249, 250, 1);
+        font-size: 12px;
+        padding: 8px 0;
+        color: #646a73;
+    }
+    td {
+        font-size: 14px;
+        color: #1f2429;
+        padding: 8px 0;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+}
+</style>

+ 32 - 28
src/views/equipment/table/djspTable.vue

@@ -3,20 +3,36 @@
     <div class='djsp-list'>
         <div class='eq-list-top'>
             <el-input
-                placeholder='请按照电井间、商铺编号搜索'
+                placeholder='请按照电井间搜索'
                 size='small'
                 @change='getList'
                 prefix-icon='el-icon-search'
                 v-model='keyword'
-                style='width:310px;margin-right:12px'
+                style='width:192px;margin-right:12px'
             ></el-input>
-            <Select @change='getList' width='120' tipPlace='top' caption='楼层 :' :selectdata='floorSelect'></Select>
+            <el-input
+                placeholder='请按照商铺编号搜索'
+                size='small'
+                @change='getList'
+                prefix-icon='el-icon-search'
+                v-model='keyword'
+                style='width:192px;margin-right:12px'
+            ></el-input>
+            <Select @change='getList' v-model='floor' width='120' tipPlace='top' caption='楼层 :' :selectdata='floorSelect'></Select>
         </div>
         <el-table :data='tableData' style='width: 100%' @row-click='innerVisible = true'>
-            <el-table-column prop='floor' label='楼层' width='120'></el-table-column>
-            <el-table-column prop='welldes' label='电井间' width='160'></el-table-column>
-            <el-table-column prop='meterbox' label='商铺电表数'></el-table-column>
-            <el-table-column prop='shopsnum' label='商铺编号'></el-table-column>
+            <el-table-column prop='floor' label='楼层' width='120'>
+                <template slot-scope='{row}'>{{row.floor || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='welldes' label='电井间' width='160'>
+                <template slot-scope='{row}'>{{row.welldes || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='meterbox' label='商铺电表数'>
+                <template slot-scope='{row}'>{{row.meterbox || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='shopsnum' label='商铺编号'>
+                <template slot-scope='{row}'>{{row.shopsnum || '--'}}</template>
+            </el-table-column>
         </el-table>
         <div class='foot'>
             <el-pagination
@@ -51,13 +67,13 @@ export default {
             total: 0,
             currentPage: 1,
             size: 10,
-            floorSelect: [],
+            floor: '',
             innerVisible: false, //详情弹框
             keyword: ''
         }
     },
     computed: {
-        ...mapGetters(['floorsArr'])
+        ...mapGetters(['floorSelect'])
     },
     props: ['major'],
     methods: {
@@ -65,18 +81,6 @@ export default {
             this.currentPage = page
             this.getList()
         },
-        init() {
-            this.floorSelect = []
-            if (this.floorsArr.length > 0) {
-                this.floorsArr.forEach(e => {
-                    let obj = {
-                        id: e,
-                        name: e
-                    }
-                    this.floorSelect.push(obj)
-                })
-            }
-        },
         getList() {
             let postParams = {
                 // tab_code: this.param
@@ -97,7 +101,6 @@ export default {
     },
 
     mounted() {
-        this.init()
         // this.getList()
     }
 }
@@ -106,17 +109,18 @@ export default {
 .djsp-list {
     .eq-list-top {
         display: flex;
-    }
-    .foot {
-        position: absolute;
-        height: 32px;
-        right: 26px;
-        bottom: 20px;
+        margin-bottom: 12px;
     }
     td {
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;
     }
+    .foot {
+        height: 32px;
+        display: flex;
+        justify-content: flex-end;
+        margin-top: 28px;
+    }
 }
 </style>

+ 92 - 47
src/views/equipment/table/eqDetaileDialog.vue

@@ -4,30 +4,50 @@
     <div class='gdqd-dialog'>
         <div class='top'></div>
         <div class='gdqd-dialog-top'>
-            <el-input
-                placeholder='请输入设备简称、设备编号、品牌、型号、安装位置、生产厂商、服务商搜索'
-                style='width:490px;margin-right:12px'
-                size='small'
-                prefix-icon='el-icon-search'
-                v-model='input'
-            ></el-input>
-            <Select width='120' style='margin-right:12px' tipPlace='top' caption='楼层:' size='small' :selectdata='floorSelect'></Select>
-            <Select width='224' style='margin-right:12px' tipPlace='top' caption='管理归属' size='small' :selectdata='dataSelect2'></Select>
-            <Select width='224' tipPlace='top' caption='设备状态' size='small' :selectdata='dataSelect2'></Select>
+            <el-input placeholder='请输入设备简称、设备编号搜索' style='width:192px;margin-right:12px' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
+            <el-input placeholder='请输入品牌、型号搜索' style='width:192px;margin-right:12px' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
+            <el-input placeholder='请输入生产厂商搜索' style='width:192px;margin-right:12px' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
+            <el-input placeholder='请输入安装位置搜索' style='width:192px;margin-right:12px' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
+            <el-input placeholder='请输入服务商搜索' style='width:192px;margin-right:12px' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
+            <Select style='width:146px;margin-right:12px' v-model='floor' tipPlace='top' caption='楼层:' size='small' :selectdata='floorSelect'></Select>
+            <Select v-model='sbglgs' style='width:146px;margin-right:12px' tipPlace='top' caption='管理归属' size='small' :selectdata='sbglgsOption'></Select>
+            <Select style='width:146px;' v-model='status' tipPlace='top' caption='设备状态' size='small' :selectdata='statusOption'></Select>
         </div>
         <el-table :data='tableData' :border='true' style='width: 100%;amrgin-bottom:30px'>
-            <el-table-column type='index' label='序号' width='50'></el-table-column>
-            <el-table-column prop='sbjc' label='设备简称' show-overflow-tooltip resizable></el-table-column>
-            <el-table-column prop='sbbh' label='设备编号' show-overflow-tooltip resizable></el-table-column>
-            <el-table-column prop='sl' label='数量'></el-table-column>
-            <el-table-column prop='glgs' label='管理归属' show-overflow-tooltip resizable></el-table-column>
-            <el-table-column prop='sbbh' label='设备状态'></el-table-column>
-            <el-table-column prop='brand' label='品牌' show-overflow-tooltip resizable></el-table-column>
-            <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable></el-table-column>
-            <el-table-column prop='floor' label='楼层'></el-table-column>
-            <el-table-column prop='azwz' label='安装位置' show-overflow-tooltip resizable></el-table-column>
-            <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable></el-table-column>
-            <el-table-column prop='fws' label='服务商' show-overflow-tooltip resizable></el-table-column>
+            <el-table-column type='index' label='序号' width='80'></el-table-column>
+            <el-table-column prop='sbjc' label='设备简称' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.sbjc || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='assetnum' label='设备编号' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='sl' label='数量'>
+                <template slot-scope='{row}'>{{row.sl || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='sbglgs' label='管理归属' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.sbglgs || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='sb_status' label='设备状态'>
+                <template slot-scope='{row}'>{{row.sb_status || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='brand' label='品牌' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.brand || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.sbxh || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='floor' label='楼层'>
+                <template slot-scope='{row}'>{{row.floor || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='wzjc' label='安装位置' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.wzjc || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.manufacturer || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='fws' label='服务商' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.fws || '--'}}</template>
+            </el-table-column>
         </el-table>
         <div class='foot'>
             <el-pagination
@@ -62,19 +82,22 @@ export default {
             size: 10,
             total: 1,
             keyword: '',
-            floorSelect: []
+            floor: '',
+            status: '',
+            sbglgs: '',
+            sbglgsOption: [],
+            statusOption: []
         }
     },
     components: {
         Select
     },
     computed: {
-        ...mapGetters(['floorsArr'])
+        ...mapGetters(['floorSelect'])
     },
     props: ['row', 'major'],
     mounted() {
         this.queryTableList()
-        this.init()
         this.tabFind()
     },
     methods: {
@@ -82,19 +105,49 @@ export default {
         tabFind() {
             let postParams = [
                 {
+                    columnName: { sbglgs: 'sbglgs', sb_status: 'sb_status' },
                     params: {
                         type_code: this.row.type_code
                     },
                     tableName: 'glsms_asset' //视图名称
                 }
             ]
-
+            let major
+            if (this.major.slice(0, 2) == 'GD') {
+                major = '供电'
+            } else if (this.major.slice(0, 2) == 'XF') {
+                major = '消防'
+            } else if (this.major.slice(0, 2) == 'GPS') {
+                major = '给排水'
+            } else if (this.major.slice(0, 2) == 'DT') {
+                major = '电梯'
+            } else if (this.major.slice(0, 2) == 'RQ') {
+                major = '燃气'
+            } else {
+                major = this.major
+            }
             let data = {
-                major: this.major,
+                major: major,
                 plazaId: this.$store.state.plazaId
             }
-            queryTab({ data, postParams }).then(res => {
+            querySelect({ data, postParams }).then(res => {
                 console.log(res)
+                let sb_status = res.data.data.glsms_asset.sb_status
+                let sbglgs = res.data.data.glsms_asset.sbglgs
+                this.sbglgsOption = []
+                this.statusOption = []
+                sb_status.forEach(el => {
+                    this.statusOption.push({
+                        name: el.value,
+                        id: el.key
+                    })
+                })
+                sbglgs.forEach(el => {
+                    this.sbglgsOption.push({
+                        name: el.value,
+                        id: el.key
+                    })
+                })
             })
         },
 
@@ -123,6 +176,9 @@ export default {
                 page: this.page,
                 size: this.size,
                 keyword: this.keyword
+                // sbglgs:this.sbglgs,
+                // floor:this.floor,
+                // status:this.status
             }
             let postParams = {
                 type_code: this.row.type_code,
@@ -136,18 +192,6 @@ export default {
                 this.tableData = res.data.data
                 this.total = res.data.count
             })
-        },
-        init() {
-            this.floorSelect = []
-            if (this.floorsArr.length > 0) {
-                this.floorsArr.forEach(e => {
-                    let obj = {
-                        id: e,
-                        name: e
-                    }
-                    this.floorSelect.push(obj)
-                })
-            }
         }
     },
     watch: {
@@ -155,7 +199,6 @@ export default {
             handler(newV, oldV) {
                 if (newV != oldV) {
                     this.queryTableList()
-                    this.init()
                     this.tabFind()
                 }
             },
@@ -169,18 +212,20 @@ export default {
     padding: 16px 24px 40px;
     .gdqd-dialog-top {
         display: flex;
-        margin-bottom: 20px;
-    }
-    .foot {
-        position: absolute;
-        height: 32px;
-        right: 26px;
+        flex-wrap: wrap;
+        height: 90px;
     }
     td {
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;
     }
+    .foot {
+        height: 32px;
+        display: flex;
+        justify-content: flex-end;
+        margin-top: 28px;
+    }
 }
 </style>
 <style lang="less">

+ 52 - 34
src/views/equipment/table/eqListTable.vue

@@ -3,24 +3,54 @@
     <div class='eq-list'>
         <div class='eq-list-top'>
             <el-input
-                placeholder='请输入设备简称、品牌、型号、生产厂商搜索'
+                placeholder='请输入设备简称搜索'
                 size='small'
                 @change='getList'
                 prefix-icon='el-icon-search'
                 v-model='keyword'
-                style='width:310px;margin-right:12px'
+                style='width:192px;margin-right:12px'
             ></el-input>
-            <Select @change='getList' width='120' tipPlace='top' caption='楼层 :' :selectdata='floorSelect'></Select>
+            <el-input
+                placeholder='请输入品牌、型号搜索'
+                size='small'
+                @change='getList'
+                prefix-icon='el-icon-search'
+                v-model='keyword'
+                style='width:192px;margin-right:12px'
+            ></el-input>
+            <el-input
+                placeholder='请输入生产厂商搜索'
+                size='small'
+                @change='getList'
+                prefix-icon='el-icon-search'
+                v-model='keyword'
+                style='width:192px;margin-right:12px'
+            ></el-input>
+            <Select @change='getList' v-model='floor' width='120' tipPlace='top' caption='楼层 :' :selectdata='floorSelect'></Select>
         </div>
-        <el-table :data='tableData' style='width: 100%' @row-click='rowHandle'>
-            <el-table-column prop='sbxh' label='序号' width='120'></el-table-column>
-            <el-table-column prop='sbjbm' label='设备编号' width='160'></el-table-column>
-            <el-table-column prop='sl' label='数量'></el-table-column>
-            <el-table-column prop='brand' label='品牌'></el-table-column>
-            <el-table-column prop='sbxh' label='型号'></el-table-column>
-            <el-table-column prop='floor' label='楼层'></el-table-column>
-            <el-table-column prop='wzjc' label='安装位置' width='240'></el-table-column>
-            <el-table-column prop='manufacturer' label='生产厂商' width='240'></el-table-column>
+        <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='assetnum' label='设备编号' width='160'>
+                <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='sl' label='数量'>
+                <template slot-scope='{row}'>{{row.sl || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='brand' label='品牌'>
+                <template slot-scope='{row}'>{{row.brand || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.sbxh || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='floor' label='楼层'>
+                <template slot-scope='{row}'>{{row.floor || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='wzjc' label='安装位置' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.wzjc || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.manufacturer || '--'}}</template>
+            </el-table-column>
         </el-table>
         <div class='foot'>
             <el-pagination
@@ -59,14 +89,14 @@ export default {
             total: 0,
             currentPage: 1,
             size: 10,
-            floorSelect: [],
             innerVisible: false, //详情弹框
             keyword: '',
-            row: {}
+            row: {},
+            floor: ''
         }
     },
     computed: {
-        ...mapGetters(['floorsArr'])
+        ...mapGetters(['floorSelect'])
     },
     props: ['param', 'major'],
     methods: {
@@ -79,18 +109,6 @@ export default {
             this.currentPage = page
             this.getList()
         },
-        init() {
-            this.floorSelect = []
-            if (this.floorsArr.length > 0) {
-                this.floorsArr.forEach(e => {
-                    let obj = {
-                        id: e,
-                        name: e
-                    }
-                    this.floorSelect.push(obj)
-                })
-            }
-        },
         getList() {
             let postParams = {
                 tab_code: this.param
@@ -117,7 +135,6 @@ export default {
         }
     },
     mounted() {
-        this.init()
         this.getList()
     }
 }
@@ -126,17 +143,18 @@ export default {
 .eq-list {
     .eq-list-top {
         display: flex;
-    }
-    .foot {
-        position: absolute;
-        height: 32px;
-        right: 26px;
-        bottom: 20px;
+        margin-bottom: 12px;
     }
     td {
         overflow: hidden;
         white-space: nowrap;
         text-overflow: ellipsis;
     }
+    .foot {
+        height: 32px;
+        display: flex;
+        justify-content: flex-end;
+        margin-top: 28px;
+    }
 }
 </style>

+ 27 - 12
src/views/equipment/table/lookPageTable.vue

@@ -2,15 +2,29 @@
 <template>
     <div class='look-page'>
         <div class='eq-list-top'>
-            <a-input-search placeholder style='width: 192px;margin-bottom:12px;height:32px;' @search='onSearch' />
+            <el-input
+                placeholder='请输入生产厂商搜索'
+                size='small'
+                @change='getList'
+                prefix-icon='el-icon-search'
+                v-model='keyword'
+                style='width:192px;margin-right:12px'
+            ></el-input>
         </div>
         <el-table :data='tableData' style='width: 100%'>
             <el-table-column type='index' label='序号' width='80'></el-table-column>
-            <el-table-column prop='lb' label='分类' width='160'></el-table-column>
-            <el-table-column prop='sl' label='文件名称'></el-table-column>
-            <el-table-column prop='unit' label='文件类型'></el-table-column>
-            <el-table-column prop='brand' label='文件大小(M)'></el-table-column>
-
+            <el-table-column prop='lb' label='分类' width='160'>
+                <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='sl' label='文件名称'>
+                <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='unit' label='文件类型'>
+                <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='brand' label='文件大小(M)'>
+                <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
+            </el-table-column>
             <el-table-column prop='brand' label='操作'>
                 <template slot-scope='{row}'>
                     <el-button type='text' size='mini' @click='handleDown(row)'>
@@ -45,7 +59,6 @@ export default {
     },
     props: ['major'],
     methods: {
-        onSearch() {},
         pageChanged(page, size) {
             this.currentPage = page
             this.size = size
@@ -76,16 +89,18 @@ export default {
 .look-page {
     .eq-list-top {
         display: flex;
-    }
-    .foot {
-        position: absolute;
-        height: 32px;
-        right: 26px;
+        margin-bottom: 12px;
     }
     td {
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;
     }
+    .foot {
+        height: 32px;
+        display: flex;
+        justify-content: flex-end;
+        margin-top: 28px;
+    }
 }
 </style>

+ 37 - 19
src/views/equipment/table/otherTable.vue

@@ -2,22 +2,38 @@
 <template>
     <div class='qt-list'>
         <div class='eq-list-top'>
-            <Select width='146' tipPlace='top' caption='处理日期:' :selectdata='dataSelect2' :placeholder='"请选择"' @change='getList'></Select>
+            <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>
-            <a-input-search placeholder='按照位置和内容搜索' style='width: 192px;margin-bottom:12px;height:32px;' @search='onSearch' />
+            <el-input placeholder='按照位置和内容搜索' style='width:192px;margin-right:12px' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
         </div>
-        <el-table :data='tableData' style='width: 100%'>
+        <el-table :data='tableData' :border='true' style='width: 100%'>
             <el-table-column type='index' label='序号' width='80'></el-table-column>
-            <el-table-column prop='lb' label='其他事项详情' width='160'>
-                <el-table-column prop='sl' label='位置'></el-table-column>
-                <el-table-column prop='unit' label='内容'></el-table-column>
-                <el-table-column prop='sl' label='数量'></el-table-column>
+            <el-table-column prop='lb' label='其他事项详情' show-overflow-tooltip resizable>
+                <el-table-column prop='wzjc' label='位置' show-overflow-tooltip resizable>
+                    <template slot-scope='{row}'>{{row.wzjc || '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='unit' label='内容' show-overflow-tooltip resizable>
+                    <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='sl' label='数量'>
+                    <template slot-scope='{row}'>{{row.sl || '--'}}</template>
+                </el-table-column>
+            </el-table-column>
+            <el-table-column prop='zfje' label='金额(万元)'>
+                <template slot-scope='{row}'>{{row.zfje || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='city' label='处理日期'>
+                <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='address' label='处置结果' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.address || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='zlwfwz ' label='资料存放位置' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.zlwfwz || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='recordtime' label='记录日期'>
+                <template slot-scope='{row}'>{{row.recordtime || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='zfje' label='金额(万元)' width='120'></el-table-column>
-            <el-table-column prop='city' label='处理日期' width='120'></el-table-column>
-            <el-table-column prop='address' label='处置结果' width='300'></el-table-column>
-            <el-table-column prop='zlwfwz ' label='资料存放位置' width='120'></el-table-column>
-            <el-table-column prop='zip' label='记录日期' width='120'></el-table-column>
         </el-table>
         <div class='foot'>
             <el-pagination
@@ -43,6 +59,7 @@ export default {
             total: 0,
             currentPage: 1,
             size: 10,
+            yssjwcsj: '',
             dataSelect2: [
                 { id: 'test1', name: '选择项' },
                 { id: 'test2', name: '单平米' },
@@ -53,10 +70,9 @@ export default {
     },
     props: ['major', 'systemName'],
     computed: {
-        ...mapGetters(['floorsArr'])
+        ...mapGetters(['floorSelect'])
     },
     methods: {
-        onSearch() {},
         pageChanged(page, size) {
             this.currentPage = page
             this.size = size
@@ -100,16 +116,18 @@ export default {
 .qt-list {
     .eq-list-top {
         display: flex;
-    }
-    .foot {
-        position: absolute;
-        height: 32px;
-        right: 26px;
+        margin-bottom: 12px;
     }
     td {
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;
     }
+    .foot {
+        height: 32px;
+        display: flex;
+        justify-content: flex-end;
+        margin-top: 28px;
+    }
 }
 </style>

+ 46 - 31
src/views/equipment/table/standTable.vue

@@ -3,24 +3,52 @@
     <div class='stand-list'>
         <div class='eq-list-top'>
             <el-input
-                placeholder='请输入设备简称、品牌、型号、生产厂商搜索'
+                placeholder='请输入设备简称搜索'
                 size='small'
                 @change='getList'
                 prefix-icon='el-icon-search'
                 v-model='keyword'
-                style='width:310px;margin-right:12px'
+                style='width:192px;margin-right:12px'
             ></el-input>
-            <Select @change='getList' width='120' tipPlace='top' caption='楼层 :' :selectdata='floorSelect'></Select>
+            <el-input
+                placeholder='请输入品牌、型号搜索'
+                size='small'
+                @change='getList'
+                prefix-icon='el-icon-search'
+                v-model='keyword'
+                style='width:192px;margin-right:12px'
+            ></el-input>
+            <el-input
+                placeholder='请输入生产厂商搜索'
+                size='small'
+                @change='getList'
+                prefix-icon='el-icon-search'
+                v-model='keyword'
+                style='width:192px;margin-right:12px'
+            ></el-input>
+            <Select @change='getList' v-model='floor' width='120' tipPlace='top' caption='楼层 :' :selectdata='floorSelect'></Select>
         </div>
-        <el-table :data='tableData' style='width: 100%' @row-click='rowHandle'>
+        <el-table :data='tableData' :border='true' style='width: 100%' @row-click='rowHandle'>
             <el-table-column type='index' label='序号' width='80'></el-table-column>
-            <el-table-column prop='type_name' label='设备简称' width='160'></el-table-column>
+            <el-table-column prop='sbjc' label='设备简称' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.sbjc || '--'}}</template>
+            </el-table-column>
             <!-- sbjc -->
-            <el-table-column prop='sl' label='数量'></el-table-column>
-            <el-table-column prop='brand' label='品牌'></el-table-column>
-            <el-table-column prop='sbxh' label='型号'></el-table-column>
-            <el-table-column prop='floor' label='楼层'></el-table-column>
-            <el-table-column prop='manufacturer' label='生产厂商'></el-table-column>
+            <el-table-column prop='sl' label='数量'>
+                <template slot-scope='{row}'>{{row.sl || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='brand' label='品牌'>
+                <template slot-scope='{row}'>{{row.brand || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.sbxh || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='floor' label='楼层'>
+                <template slot-scope='{row}'>{{row.floor || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.manufacturer || '--'}}</template>
+            </el-table-column>
         </el-table>
         <div class='foot'>
             <el-pagination
@@ -55,7 +83,6 @@ export default {
             currentPage: 1,
             size: 11,
             keyword: '',
-            floorSelect: [],
             floor: '',
             row: {}
         }
@@ -63,7 +90,7 @@ export default {
     props: ['major', 'param'],
     components: { EqDetail, Select },
     computed: {
-        ...mapGetters(['floorsArr'])
+        ...mapGetters(['floorSelect'])
     },
     methods: {
         rowHandle(row) {
@@ -75,18 +102,6 @@ export default {
             this.currentPage = page
             this.getList()
         },
-        init() {
-            this.floorSelect = []
-            if (this.floorsArr.length > 0) {
-                this.floorsArr.forEach(e => {
-                    let obj = {
-                        id: e,
-                        name: e
-                    }
-                    this.floorSelect.push(obj)
-                })
-            }
-        },
         getList() {
             let postParams = {
                 tab_code: this.param
@@ -125,7 +140,6 @@ export default {
         }
     },
     mounted() {
-        this.init()
         this.getList()
     }
 }
@@ -134,17 +148,18 @@ export default {
 .stand-list {
     .eq-list-top {
         display: flex;
-    }
-    .foot {
-        position: absolute;
-        height: 32px;
-        right: 26px;
-        bottom: 20px;
+        margin-bottom: 12px;
     }
     td {
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;
     }
+    .foot {
+        height: 32px;
+        display: flex;
+        justify-content: flex-end;
+        margin-top: 28px;
+    }
 }
 </style>

+ 18 - 11
src/views/equipment/table/tjBuildTable.vue

@@ -2,10 +2,16 @@
 <template>
     <div class='build-list'>
         <el-table :data='tableData' style='width: 100%' @row-click='innerVisible = true'>
-            <el-table-column prop='floor' label='楼层' width='120'></el-table-column>
-            <el-table-column prop='welldes' label='电井间' width='160'></el-table-column>
-            <el-table-column prop='meterbox' label='商铺电表数'></el-table-column>
-            <el-table-column prop='shopsnum' label='商铺编号'></el-table-column>
+            <el-table-column type='index' label='序号' width='80'></el-table-column>
+            <el-table-column prop='xm' label='项目' width='160'>
+                <template slot-scope='{row}'>{{row.xm || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='unit' label='单位'>
+                <template slot-scope='{row}'>{{row.unit || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='shopsnum' label='图例'>
+                <template slot-scope='{row}'>{{row.shopsnum || '--'}}</template>
+            </el-table-column>
         </el-table>
         <div>
             <img src alt />
@@ -23,7 +29,7 @@ export default {
         }
     },
     computed: {
-        ...mapGetters(['floorsArr'])
+        ...mapGetters(['floorSelect'])
     },
     methods: {
         getList() {
@@ -48,17 +54,18 @@ export default {
 .build-list {
     .eq-list-top {
         display: flex;
-    }
-    .foot {
-        position: absolute;
-        height: 32px;
-        right: 26px;
-        bottom: 20px;
+        margin-bottom: 12px;
     }
     td {
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;
     }
+    .foot {
+        height: 32px;
+        display: flex;
+        justify-content: flex-end;
+        margin-top: 28px;
+    }
 }
 </style>

+ 30 - 12
src/views/equipment/table/tjTable.vue

@@ -3,20 +3,36 @@
     <div class='tj-list'>
         <div class='eq-list-top'>
             <el-input
-                placeholder='请输入类别或品牌搜索'
+                placeholder='请输入类别搜索'
                 size='small'
                 @change='getList'
                 prefix-icon='el-icon-search'
                 v-model='keyword'
-                style='width:200px;margin-right:12px'
+                style='width:192px;margin-right:12px'
+            ></el-input>
+            <el-input
+                placeholder='请输入品牌搜索'
+                size='small'
+                @change='getList'
+                prefix-icon='el-icon-search'
+                v-model='keyword'
+                style='width:192px;margin-right:12px'
             ></el-input>
         </div>
         <el-table :data='tableData' style='width: 100%'>
             <el-table-column type='index' label='序号' width='80'></el-table-column>
-            <el-table-column prop='lb' label='类别' width='160'></el-table-column>
-            <el-table-column prop='sl' label='数量'></el-table-column>
-            <el-table-column prop='brand' label='品牌'></el-table-column>
-            <el-table-column prop='unit' label='单位'></el-table-column>
+            <el-table-column prop='lb' label='类别' width='160'>
+                <template slot-scope='{row}'>{{row.lb || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='sl' label='数量'>
+                <template slot-scope='{row}'>{{row.sl || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='brand' label='品牌'>
+                <template slot-scope='{row}'>{{row.brand || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='unit' label='单位'>
+                <template slot-scope='{row}'>{{row.unit || '--'}}</template>
+            </el-table-column>
         </el-table>
         <div class='foot'>
             <el-pagination
@@ -47,7 +63,7 @@ export default {
     },
     props: ['param'],
     computed: {
-        ...mapGetters(['floorsArr'])
+        ...mapGetters(['floorSelect'])
     },
     methods: {
         pageChanged(page, size) {
@@ -85,16 +101,18 @@ export default {
 .tj-list {
     .eq-list-top {
         display: flex;
-    }
-    .foot {
-        position: absolute;
-        height: 32px;
-        right: 26px;
+        margin-bottom: 12px;
     }
     td {
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;
     }
+    .foot {
+        height: 32px;
+        display: flex;
+        justify-content: flex-end;
+        margin-top: 28px;
+    }
 }
 </style>

+ 98 - 48
src/views/equipment/table/wbTable.vue

@@ -2,33 +2,84 @@
 <template>
     <div class='wb-list'>
         <div class='eq-list-top'>
-            <a-input-search
-                placeholder='按照设备名称、设备编号、重要事项记录、描述、任务编号等搜索'
-                style='width: 192px;margin-bottom:12px;height:32px;margin-right:12px'
-                @search='onSearch'
-            />
-            <el-date-picker size='small' v-model='startDate' type='date' placeholder='选择填报时间' @change='getList' style='margin-right:12px'></el-date-picker>
-            <el-date-picker size='small' v-model='endDate' type='date' placeholder='选择验收时间' @change='getList' style='margin-right:12px'></el-date-picker>
-            <Select @change='getList' width='120' tipPlace='top' caption='是否更换配件信息 :' :selectdata='floorSelect'></Select>
-            <Select @change='getList' width='120' tipPlace='top' caption='楼层 :' :selectdata='floorSelect'></Select>
+            <el-input
+                placeholder='请按照设备名称、设备编号搜索'
+                size='small'
+                @change='getList'
+                prefix-icon='el-icon-search'
+                v-model='keyword'
+                style='width:192px;margin-right:12px'
+            ></el-input>
+            <el-input
+                placeholder='请按照重要事项记录、描述搜索'
+                size='small'
+                @change='getList'
+                prefix-icon='el-icon-search'
+                v-model='keyword'
+                style='width:192px;margin-right:12px'
+            ></el-input>
+            <el-input
+                placeholder='请按照任务编号搜索'
+                size='small'
+                @change='getList'
+                prefix-icon='el-icon-search'
+                v-model='keyword'
+                style='width:192px;margin-right:12px'
+            ></el-input>
+            <el-date-picker
+                size='small'
+                v-model='reportdate'
+                type='date'
+                placeholder='选择填报时间'
+                @change='getList'
+                style='width:180px;margin-right:12px'
+            ></el-date-picker>
+            <el-date-picker size='small' v-model='sjjssj' type='date' placeholder='选择验收时间' @change='getList' style='width:180px;margin-right:12px'></el-date-picker>
+            <Select @change='getList' v-model='ischange' width='120' tipPlace='top' caption='是否更换配件信息 :' :selectdata='changeOption'></Select>
         </div>
         <el-table :data='tableData' style='width: 100%'>
             <el-table-column type='index' label='序号' width='80'></el-table-column>
-            <el-table-column prop='sbjc' label='设备名称' width='160' show-overflow-tooltip resizable></el-table-column>
-            <el-table-column prop='sbjbm' label='设备编码' show-overflow-tooltip resizable></el-table-column>
-            <el-table-column prop='matters' label='重要事项记录' width='240' show-overflow-tooltip resizable></el-table-column>
-            <el-table-column prop='description' label='描述' width='200' show-overflow-tooltip resizable></el-table-column>
-            <el-table-column label='更换配件信息'>
-                <el-table-column prop='ischangepj' label='是/否更换' width='120'></el-table-column>
-                <el-table-column prop='model' label='配件名称型号' width='120' show-overflow-tooltip resizable></el-table-column>
-                <el-table-column prop='address' label='数量'></el-table-column>
-                <el-table-column prop='cost' label='费用(万元)' width='120'></el-table-column>
-                <el-table-column prop='source' label='费用出处' width='120' show-overflow-tooltip resizable></el-table-column>
+            <el-table-column prop='sbjc' label='设备名称' width='160' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.sbjc || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='sbjbm' label='设备编码' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.sbjbm || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='matters' label='重要事项记录' width='240' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.matters || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='description' label='描述' width='200' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.description || '--'}}</template>
+            </el-table-column>
+            <el-table-column label='更换配件信息' align='center'>
+                <el-table-column prop='ischangepj' label='是/否更换' width='120'>
+                    <template slot-scope='{row}'>{{row.ischangepj || '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='model' label='配件名称型号' width='120' show-overflow-tooltip resizable>
+                    <template slot-scope='{row}'>{{row.model || '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='sl' label='数量'>
+                    <template slot-scope='{row}'>{{row.sl || '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='cost' label='费用(万元)' width='120'>
+                    <template slot-scope='{row}'>{{row.cost || '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='source' label='费用出处' width='120' show-overflow-tooltip resizable>
+                    <template slot-scope='{row}'>{{row.source || '--'}}</template>
+                </el-table-column>
+            </el-table-column>
+            <el-table-column prop='brand' label='现场照片'>
+                <template slot-scope='{row}'>{{row.brand || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='reportdate' label='填报时间'>
+                <template slot-scope='{row}'>{{row.reportdate || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='sjjssj' label='验收时间'>
+                <template slot-scope='{row}'>{{row.sjjssj || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='wonum' 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='startDate' label='填报时间'></el-table-column>
-            <el-table-column prop='enddate' label='验收时间'></el-table-column>
-            <el-table-column prop='wonum' label='工单编号' show-overflow-tooltip resizable></el-table-column>
         </el-table>
         <div class='foot'>
             <el-pagination
@@ -46,22 +97,34 @@
 <script>
 import { queryWbsms } from '@/api/equipmentList.js'
 import { mapGetters } from 'vuex'
+import Select from '@/components/Select/Select.vue'
 export default {
+    components: { Select },
     data() {
         return {
-            pageSize: 10,
             tableData: [],
             total: 0,
             currentPage: 1,
             size: 10,
-            floorSelect: [],
-            startDate: '',
-            endDate: ''
+            sjjssj: '',
+            reportdate: '',
+            ischange: '',
+            changeOption: [
+                {
+                    id: '1',
+                    name: '是'
+                },
+                {
+                    id: ' 0',
+                    name: '否'
+                }
+            ],
+            keyword: ''
         }
     },
     props: ['smsxt', 'major'],
     computed: {
-        ...mapGetters(['floorsArr'])
+        ...mapGetters(['floorSelect'])
     },
     methods: {
         onSearch() {},
@@ -85,18 +148,6 @@ export default {
                 this.tableData = res.data || []
                 this.total = res.count
             })
-        },
-        init() {
-            this.floorSelect = []
-            if (this.floorsArr.length > 0) {
-                this.floorsArr.forEach(e => {
-                    let obj = {
-                        id: e,
-                        name: e
-                    }
-                    this.floorSelect.push(obj)
-                })
-            }
         }
     },
     watch: {
@@ -107,8 +158,6 @@ export default {
         }
     },
     mounted() {
-        console.log(this.smsxt)
-        this.init()
         this.getList()
     }
 }
@@ -117,17 +166,18 @@ export default {
 .wb-list {
     .eq-list-top {
         display: flex;
-        margin-bottom: 20px;
-    }
-    .foot {
-        position: absolute;
-        height: 32px;
-        right: 26px;
+        margin-bottom: 12px;
     }
     td {
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;
     }
+    .foot {
+        height: 32px;
+        display: flex;
+        justify-content: flex-end;
+        margin-top: 28px;
+    }
 }
 </style>

+ 98 - 48
src/views/equipment/table/wxTable.vue

@@ -2,33 +2,84 @@
 <template>
     <div class='wb-list'>
         <div class='eq-list-top'>
-            <a-input-search
-                placeholder='按照设备名称、设备编号、重要事项记录、描述、任务编号等搜索'
-                style='width: 192px;margin-bottom:12px;height:32px;margin-right:12px'
-                @search='onSearch'
-            />
-            <el-date-picker size='small' v-model='startDate' type='date' placeholder='选择填报时间' @change='getList' style='margin-right:12px'></el-date-picker>
-            <el-date-picker size='small' v-model='endDate' type='date' placeholder='选择验收时间' @change='getList' style='margin-right:12px'></el-date-picker>
-            <Select @change='getList' width='120' tipPlace='top' caption='是否更换配件信息 :' :selectdata='floorSelect'></Select>
-            <Select @change='getList' width='120' tipPlace='top' caption='楼层 :' :selectdata='floorSelect'></Select>
+            <el-input
+                placeholder='请按照设备名称、设备编号搜索'
+                size='small'
+                @change='getList'
+                prefix-icon='el-icon-search'
+                v-model='keyword'
+                style='width:192px;margin-right:12px'
+            ></el-input>
+            <el-input
+                placeholder='请按照重要事项记录、描述搜索'
+                size='small'
+                @change='getList'
+                prefix-icon='el-icon-search'
+                v-model='keyword'
+                style='width:192px;margin-right:12px'
+            ></el-input>
+            <el-input
+                placeholder='请按照任务编号搜索'
+                size='small'
+                @change='getList'
+                prefix-icon='el-icon-search'
+                v-model='keyword'
+                style='width:192px;margin-right:12px'
+            ></el-input>
+            <el-date-picker
+                size='small'
+                v-model='reportdate'
+                type='date'
+                placeholder='选择填报时间'
+                @change='getList'
+                style='width:180px;margin-right:12px'
+            ></el-date-picker>
+            <el-date-picker size='small' v-model='sjjssj' type='date' placeholder='选择验收时间' @change='getList' style='width:180px;margin-right:12px'></el-date-picker>
+            <Select @change='getList' v-model='ischange' width='120' tipPlace='top' caption='是否更换配件信息 :' :selectdata='changeOption'></Select>
         </div>
         <el-table :data='tableData' :border='true' style='width: 100%'>
             <el-table-column type='index' label='序号' width='80'></el-table-column>
-            <el-table-column prop='sbjc' label='设备名称' width='160' show-overflow-tooltip resizable></el-table-column>
-            <el-table-column prop='sbjbm' label='设备编码' show-overflow-tooltip resizable></el-table-column>
-            <el-table-column prop='matters' label='重要事项记录' width='240' show-overflow-tooltip resizable></el-table-column>
-            <el-table-column prop='description' label='描述' width='200' show-overflow-tooltip resizable></el-table-column>
-            <el-table-column label='更换配件信息'>
-                <el-table-column prop='ischangepj' label='是/否更换' width='120'></el-table-column>
-                <el-table-column prop='model' label='配件名称型号' width='120' show-overflow-tooltip resizable></el-table-column>
-                <el-table-column prop='address' label='数量'></el-table-column>
-                <el-table-column prop='cost' label='费用(万元)' width='120'></el-table-column>
-                <el-table-column prop='source' label='费用出处' width='120' show-overflow-tooltip resizable></el-table-column>
+            <el-table-column prop='sbjc' label='设备名称' width='160' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.sbjc || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='sbjbm' label='设备编码' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.sbjbm || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='matters' label='重要事项记录' width='240' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.matters || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='description' label='描述' width='200' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.description || '--'}}</template>
+            </el-table-column>
+            <el-table-column label='更换配件信息' align='center'>
+                <el-table-column prop='ischangepj' label='是/否更换' width='120'>
+                    <template slot-scope='{row}'>{{row.ischangepj || '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='model' label='配件名称型号' width='120' show-overflow-tooltip resizable>
+                    <template slot-scope='{row}'>{{row.model || '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='sl' label='数量'>
+                    <template slot-scope='{row}'>{{row.sl || '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='cost' label='费用(万元)' width='120'>
+                    <template slot-scope='{row}'>{{row.cost || '--'}}</template>
+                </el-table-column>
+                <el-table-column prop='source' label='费用出处' width='120' show-overflow-tooltip resizable>
+                    <template slot-scope='{row}'>{{row.source || '--'}}</template>
+                </el-table-column>
+            </el-table-column>
+            <el-table-column prop='brand' label='现场照片'>
+                <template slot-scope='{row}'>{{row.brand || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='reportdate' label='填报时间'>
+                <template slot-scope='{row}'>{{row.reportdate || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='sjjssj' label='验收时间'>
+                <template slot-scope='{row}'>{{row.sjjssj || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='wonum' 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='startDate' label='填报时间'></el-table-column>
-            <el-table-column prop='enddate' label='验收时间'></el-table-column>
-            <el-table-column prop='wonum' label='工单编号' show-overflow-tooltip resizable></el-table-column>
         </el-table>
         <div class='foot'>
             <el-pagination
@@ -46,21 +97,33 @@
 <script>
 import { queryWx } from '@/api/equipmentList.js'
 import { mapGetters } from 'vuex'
+import Select from '@/components/Select/Select.vue'
 export default {
+    components: { Select },
     data() {
         return {
-            pageSize: 10,
             tableData: [],
             total: 0,
             currentPage: 1,
             size: 10,
-            floorSelect: [],
-            startDate: '',
-            endDate: ''
+            reportdate: '',
+            sjjssj: '',
+            ischange: '',
+            changeOption: [
+                {
+                    id: '1',
+                    name: '是'
+                },
+                {
+                    id: 0,
+                    name: '否'
+                }
+            ],
+            keyword: ''
         }
     },
     computed: {
-        ...mapGetters(['floorsArr'])
+        ...mapGetters(['floorSelect'])
     },
     props: ['smsxt', 'major'],
     methods: {
@@ -85,30 +148,16 @@ export default {
                 this.tableData = res.data || []
                 this.total = res.count
             })
-        },
-        init() {
-            this.floorSelect = []
-            if (this.floorsArr.length > 0) {
-                this.floorsArr.forEach(e => {
-                    let obj = {
-                        id: e,
-                        name: e
-                    }
-                    this.floorSelect.push(obj)
-                })
-            }
         }
     },
     watch: {
         smsxt(newV, oldV) {
             if (newV !== oldV) {
-                this.init()
                 this.getList()
             }
         }
     },
     mounted() {
-        this.init()
         this.getList()
     }
 }
@@ -117,17 +166,18 @@ export default {
 .wb-list {
     .eq-list-top {
         display: flex;
-        margin-bottom: 20px;
-    }
-    .foot {
-        position: absolute;
-        height: 32px;
-        right: 26px;
+        margin-bottom: 12px;
     }
     td {
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;
     }
+    .foot {
+        height: 32px;
+        display: flex;
+        justify-content: flex-end;
+        margin-top: 28px;
+    }
 }
 </style>

+ 120 - 43
src/views/equipment/table/zwTable.vue

@@ -2,29 +2,68 @@
 <template>
     <div class='zw-list'>
         <div class='eq-list-top'>
-            <Select width='146' tipPlace='top' caption='年度:' :selectdata='dataSelect2' :placeholder='"请选择"' @change='getList'></Select>
+            <el-date-picker size='small' v-model='nd' 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>
             <Select width='120' tipPlace='top' caption='项目 :' :selectdata='floorSelect' style='margin:0 12px' @change='getList'></Select>
-            <Select width='224' tipPlace='top' caption='当前阶段' :selectdata='dataSelect2' :placeholder='"请选择"' @change='getList'></Select>
-            <Select width='224' tipPlace='top' caption='立项日期' :selectdata='dataSelect2' :placeholder='"请选择"' @change='getList'></Select>
-            <Select width='224' tipPlace='top' caption='验收日期' :selectdata='dataSelect2' :placeholder='"请选择"' @change='getList'></Select>
-            <Select width='224' tipPlace='top' caption='验收结果' :selectdata='dataSelect2' :placeholder='"请选择"' @change='getList'></Select>
-            <a-input-search placeholder='按照实施方案说明搜索' style='width: 192px;margin-left:12px;height:32px;' @search='getList' />
+            <Select
+                width='224'
+                tipPlace='top'
+                caption='当前阶段'
+                :selectdata='dataSelect2'
+                :placeholder='"请选择"'
+                @change='getList'
+                style='width:146px;margin-right:12px'
+            ></Select>
+            <el-date-picker size='small' v-model='lxsjwcsj' type='date' placeholder='选择立项日期' @change='getList' style='width:180px;margin-right:12px'></el-date-picker>
+            <el-date-picker size='small' v-model='yssjwcsj' type='date' placeholder='选择验收日期' @change='getList' style='width:180px;margin-right:12px'></el-date-picker>
+            <Select width='180' tipPlace='top' caption='验收结果' :selectdata='dataSelect2' :placeholder='"请选择"' @change='getList'></Select>
+            <el-input
+                placeholder='请按照按照实施方案说明搜索'
+                size='small'
+                @change='getList'
+                prefix-icon='el-icon-search'
+                v-model='keyword'
+                style='width:192px;margin-right:12px'
+            ></el-input>
         </div>
         <el-table :data='tableData' :border='true' style='width: 100%'>
             <el-table-column type='index' label='序号' width='80'></el-table-column>
-            <el-table-column prop='sbjbm' label='年度' width='160' show-overflow-tooltip resizable></el-table-column>
-            <el-table-column prop='sbjbm' label='期数' width='160' show-overflow-tooltip resizable></el-table-column>
-            <el-table-column prop='lb' label='类别' show-overflow-tooltip resizable></el-table-column>
-            <el-table-column prop='xm' label='项目' show-overflow-tooltip resizable></el-table-column>
-            <el-table-column prop='sl' label='数量' show-overflow-tooltip resizable></el-table-column>
-            <el-table-column prop='ssfasm' label='实施方案说明' show-overflow-tooltip resizable width='200'></el-table-column>
-            <el-table-column prop='wzjc' label='当前阶段' show-overflow-tooltip resizable width='140'></el-table-column>
-            <el-table-column prop='startDate' label='立项日期' show-overflow-tooltip resizable></el-table-column>
-            <el-table-column prop='endDate' label='验收日期' show-overflow-tooltip resizable></el-table-column>
-            <el-table-column prop='status' label='验收结果' show-overflow-tooltip resizable></el-table-column>
-            <el-table-column prop='zfje' label='结算金额' show-overflow-tooltip resizable></el-table-column>
-            <el-table-column prop='zlwfwz' label='资料存放位置' show-overflow-tooltip resizable></el-table-column>
+            <el-table-column prop='nd' label='年度' width='160' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.nd || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='qs' label='期数' width='160' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.qs || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='lb' label='类别' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.lb || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='xm' label='项目' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.xm || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='sl' label='数量' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.sl || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='ssfasm' label='实施方案说明' show-overflow-tooltip resizable width='200'>
+                <template slot-scope='{row}'>{{row.ssfasm || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='sxjd' label='当前阶段' show-overflow-tooltip resizable width='140'>
+                <template slot-scope='{row}'>{{row.sxjd || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='lxsjwcsj' label='立项日期' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.lxsjwcsj || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='yssjwcsj' label='验收日期' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.yssjwcsj || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='status' label='验收结果' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.status || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='zfje' label='结算金额' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.zfje || '--'}}</template>
+            </el-table-column>
+            <el-table-column prop='xlcfwz' label='资料存放位置' width='180' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.xlcfwz || '--'}}</template>
+            </el-table-column>
         </el-table>
         <div class='foot'>
             <el-pagination
@@ -56,20 +95,70 @@ export default {
             tableData: [],
             total: 0,
             currentPage: 1,
-            size: 10,
-            floorSelect: []
+            yssjwcsj: '',
+            lxsjwcsj: '',
+            size: 10
         }
     },
     computed: {
-        ...mapGetters(['floorsArr'])
+        ...mapGetters(['floorSelect'])
     },
-    props: ['smsxt'],
+    props: ['smsxt', ''],
     methods: {
         pageChanged(page, size) {
             this.currentPage = page
             this.size = size
             this.getList()
         },
+        //下拉框查询
+        tabFind() {
+            let postParams = [
+                {
+                    columnName: { nd: 'nd', lb: 'lb', xm: 'xm', sxjd: 'sxjd' },
+                    params: {
+                        // tab_code: this.param
+                    },
+                    tableName: 'glsms_asset' //视图名称
+                }
+            ]
+            // let major
+            // if (this.major.slice(0, 2) == 'GD') {
+            //     major = '供电'
+            // } else if (this.major.slice(0, 2) == 'XF') {
+            //     major = '消防'
+            // } else if (this.major.slice(0, 2) == 'GPS') {
+            //     major = '给排水'
+            // } else if (this.major.slice(0, 2) == 'DT') {
+            //     major = '电梯'
+            // } else if (this.major.slice(0, 2) == 'RQ') {
+            //     major = '燃气'
+            // } else {
+            //     major = this.major
+            // }
+            let data = {
+                major: this.major,
+                plazaId: this.$store.state.plazaId
+            }
+            querySelect({ data, postParams }).then(res => {
+                console.log(res)
+                let sb_status = res.data.data.glsms_asset.sb_status
+                let sbglgs = res.data.data.glsms_asset.sbglgs
+                this.sbglgsOption = []
+                this.statusOption = []
+                sb_status.forEach(el => {
+                    this.statusOption.push({
+                        name: el.value,
+                        id: el.key
+                    })
+                })
+                sbglgs.forEach(el => {
+                    this.sbglgsOption.push({
+                        name: el.value,
+                        id: el.key
+                    })
+                })
+            })
+        },
         getList() {
             let getParams = {
                 data: {
@@ -86,29 +175,16 @@ export default {
                 this.total = res.count
             })
         }
-        // init() {
-        //     this.floorSelect = []
-        //     if (this.floorsArr.length > 0) {
-        //         this.floorsArr.forEach(e => {
-        //             let obj = {
-        //                 id: e,
-        //                 name: e
-        //             }
-        //             this.floorSelect.push(obj)
-        //         })
-        //     }
-        // }
     },
     watch: {
         smsxt(newV, oldV) {
             if (newV !== oldV) {
-                // this.init()
                 this.getList()
             }
         }
     },
     mounted() {
-        // this.init()
+        // this.tabFind()
         this.getList()
     }
 }
@@ -117,18 +193,19 @@ export default {
 .zw-list {
     .eq-list-top {
         display: flex;
-        margin-bottom: 20px;
-    }
-    .foot {
-        position: absolute;
-        height: 32px;
-        right: 26px;
-        bottom: 20px;
+        height: 90px;
+        flex-wrap: wrap;
     }
     td {
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;
     }
+    .foot {
+        height: 32px;
+        display: flex;
+        justify-content: flex-end;
+        margin-top: 28px;
+    }
 }
 </style>

+ 2 - 0
src/views/legendLibrary/addLegend.vue

@@ -37,6 +37,7 @@ export default {
             this.dialogVisible = true
             this.title = title
             this.GraphCategoryId = GraphCategoryId
+            console.log(title)
             if (title == '添加图例库') {
                 this.info = {
                     Name: '',
@@ -47,6 +48,7 @@ export default {
                 }
             } else if (title == '修改图例库') {
                 this.info = row
+                // 图例库规则中的transform
             } else if (title == '' && this.$refs.searchList) {
                 this.$refs.searchList.queryAll()
             }

+ 10 - 3
src/views/legendLibrary/index.vue

@@ -58,7 +58,13 @@
                     :placeholder='"请选择"'
                     style='margin:0 12px'
                 ></Select>
-                <a-input-search placeholder v-model='keyword' style='width: 192px;height:34px' @search='getTableList' />
+                <el-input
+                    size='small'
+                    @change='getTableList'
+                    prefix-icon='el-icon-search'
+                    v-model='keyword'
+                    style='width:192px;margin-right:12px;margin-bottom:12px'
+                ></el-input>
             </div>
             <el-table :data='tableData' :border='true' style='width: 100%'>
                 <el-table-column prop='Name' label='图例名称'>
@@ -297,9 +303,10 @@ export default {
         }
     }
     .foot {
-        position: absolute;
         height: 32px;
-        right: 26px;
+        display: flex;
+        justify-content: flex-end;
+        margin-top: 28px;
     }
 }
 </style>

+ 8 - 2
src/views/legendRules/addList.vue

@@ -1,7 +1,13 @@
 <template>
     <div class='add-transfer'>
         <div>
-            <a-input-search v-model='keyword' placeholder style='width: 192px;margin-bottom:12px;height:32px;' @search='queryAll' />
+            <el-input
+                size='small'
+                @change='queryAll'
+                prefix-icon='el-icon-search'
+                v-model='keyword'
+                style='width:192px;margin-right:12px;margin-top:20px;margin-bottom:12px'
+            ></el-input>
         </div>
         <el-transfer v-model='value' :data='data' v-loading='loading' @change='transferChange'></el-transfer>
     </div>
@@ -26,7 +32,7 @@ export default {
         },
         queryAll() {
             let getParams = {
-                keywords: this.keywords
+                keywords: this.keyword
             }
             this.data = []
             getTransfer({ getParams }).then(res => {

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

@@ -83,10 +83,10 @@ export default {
         position: relative;
         padding-bottom: 73px;
         .footer {
-            position: absolute;
             height: 32px;
-            right: 28px;
-            bottom: 24px;
+            display: flex;
+            justify-content: flex-end;
+            margin-top: 28px;
         }
     }
 }

+ 15 - 15
vue.config.js

@@ -1,27 +1,27 @@
 module.exports = {
     devServer: {
         proxy: {
-            '/api': {
-                target: 'http://192.168.200.87:9003',
+            "/api": {
+                target: "http://192.168.200.87:9003",
                 changeOrigin: true,
                 secure: false,
                 pathRewrite: {
-                    '^/api': '',
+                    "^/api": "",
                 },
             },
-            '/wanda': {
-                target: 'http://map.wanda.cn/editor/fmap/1001724_29',
+            "/wanda": {
+                target: "http://map.wanda.cn/editor/fmap/1001724_29",
                 changeOrigin: true,
                 pathRewrite: {
-                    '^/wanda': '',
+                    "^/wanda": "",
                 },
             },
-            '/serve': {
-                target: 'http://192.168.200.87:8088/topology-wanda',
+            "/serve": {
+                target: "http://192.168.200.87:8088/topology-wanda",
                 changeOrigin: true,
                 secure: false,
                 pathRewrite: {
-                    '^/serve': '',
+                    "^/serve": "",
                 },
             },
         },
@@ -35,15 +35,15 @@ module.exports = {
         },
     },
     chainWebpack: (config) => {
-        const svgRule = config.module.rule('svg')
+        const svgRule = config.module.rule("svg")
         svgRule.uses.clear()
         svgRule
-            .use('babel-loader')
-            .loader('babel-loader')
+            .use("babel-loader")
+            .loader("babel-loader")
             .end()
-            .use('vue-svg-loader')
-            .loader('vue-svg-loader')
+            .use("vue-svg-loader")
+            .loader("vue-svg-loader")
     },
     lintOnSave: false,
-    publicPath: '/dist',
+    publicPath: "/",
 }