Browse Source

模糊查询

guoxiaohuan 4 years ago
parent
commit
14ba7d6aaf

+ 1 - 1
package.json

@@ -11,7 +11,7 @@
         "@saga-web/base": "^2.1.9",
         "@saga-web/big": "^1.0.20",
         "@saga-web/draw": "^2.1.84",
-        "@saga-web/feng-map": "^1.0.7",
+        "@saga-web/feng-map": "^1.0.9",
         "@saga-web/graph": "^2.1.68",
         "ant-design-vue": "^1.4.10",
         "axios": "^0.19.2",

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

@@ -1,18 +1,22 @@
 <template>
     <div class='gcfz2'>
         <div class='table-2-input'>
-            <el-date-picker
-                v-model='dateVal'
-                value-format='yyyyMMdd'
-                type='daterange'
-                size='small'
-                style='margin-right:12px;width:230px'
-                range-separator='-'
-                start-placeholder='记录日期开始'
-                end-placeholder='记录日期结束'
-            ></el-date-picker>
+            <div class='picker-box'>
+                <span class='picker-span'>记录日期:</span>
+                <el-date-picker
+                    v-model='dateVal'
+                    value-format='yyyyMMdd'
+                    type='daterange'
+                    size='mini'
+                    style='width:190px'
+                    range-separator='-'
+                    start-placeholder
+                    end-placeholder
+                ></el-date-picker>
+            </div>
+
             <Select
-                width='146'
+                width='200'
                 tipPlace='top'
                 @change='changelc'
                 caption='楼层:'
@@ -22,7 +26,7 @@
                 :selectdata='floorSelect'
                 :placeholder='"选择楼层"'
             ></Select>
-            <el-input @change='changelc' placeholder='搜索区域' size='small' style='width:192px' prefix-icon='el-icon-search' v-model='cg.searVal'></el-input>
+            <el-input @change='changelc' placeholder='搜索区域' size='small' style='width:200px' prefix-icon='el-icon-search' v-model='cg.searVal'></el-input>
         </div>
         <div class='table-2-table'>
             <el-table
@@ -126,5 +130,44 @@ export default {
         justify-content: flex-end;
         margin-top: 28px;
     }
+    .picker-box {
+        display: flex;
+        align-items: center;
+        background: #fff;
+        padding: 0 6px;
+        border: 1px solid #dcdfe6;
+        border-radius: 4px;
+        height: 32px;
+        box-sizing: border-box;
+        margin-right: 12px;
+        .picker-span {
+            margin-right: 6px;
+            color: rgba(0, 0, 0, 0.65);
+        }
+    }
+}
+</style>
+<style lang="less">
+.gcfz2 {
+    .picker-box {
+        .el-input__inner {
+            border: none;
+        }
+        .el-range-editor.el-input__inner {
+            padding: 3px 0px;
+        }
+        .el-icon-date {
+            display: none;
+        }
+        .el-range__close-icon {
+            position: absolute;
+            right: 0px;
+            top: 2px;
+        }
+        .el-range-editor--mini .el-range-input {
+            font-size: 14px;
+            color: rgb(31, 36, 41);
+        }
+    }
 }
 </style>

+ 54 - 13
src/views/other/zhsxOtherTable1.vue

@@ -1,20 +1,24 @@
 <template>
     <div class='tableZh'>
         <div class='tab-top' style='display:flex;'>
-            <el-date-picker
-                v-model='dateVal'
-                value-format='yyyyMMdd'
-                type='daterange'
-                style='margin-right:12px;width:230px'
-                @change='getZhjl'
-                size='small'
-                range-separator='-'
-                start-placeholder='开始日期'
-                end-placeholder='结束日期'
-            ></el-date-picker>
+            <div class='picker-box'>
+                <span class='picker-span'>结束日期:</span>
+                <el-date-picker
+                    style='width:190px'
+                    v-model='dateVal'
+                    value-format='yyyyMMdd'
+                    type='daterange'
+                    @change='getZhjl'
+                    size='mini'
+                    range-separator='-'
+                    start-placeholder
+                    end-placeholder
+                ></el-date-picker>
+            </div>
+
             <Select
                 @change='getZhjl'
-                width='146'
+                width='200'
                 tipPlace='top'
                 caption='政府部门'
                 size='small'
@@ -24,7 +28,7 @@
                 :selectdata='department'
                 :placeholder='"选择政府部门"'
             ></Select>
-            <el-input clearable placeholder='搜索记录事项' @change='getZhjl' size='small' prefix-icon='el-icon-search' v-model='ssjlsx' style='width:192px'></el-input>
+            <el-input clearable placeholder='搜索记录事项' @change='getZhjl' size='small' prefix-icon='el-icon-search' v-model='ssjlsx' style='width:200px'></el-input>
         </div>
         <el-table
             @row-click='handdle'
@@ -164,6 +168,25 @@ export default {
     }
 }
 </script>
+<style lang="less" scoped>
+.tableZh {
+    .picker-box {
+        display: flex;
+        align-items: center;
+        background: #fff;
+        padding: 0 6px;
+        border: 1px solid #dcdfe6;
+        border-radius: 4px;
+        height: 32px;
+        box-sizing: border-box;
+        margin-right: 12px;
+        .picker-span {
+            margin-right: 6px;
+            color: rgba(0, 0, 0, 0.65);
+        }
+    }
+}
+</style>
 <style lang="less">
 .tableZh {
     .foot {
@@ -172,5 +195,23 @@ export default {
         justify-content: flex-end;
         margin-top: 28px;
     }
+    .el-input__inner {
+        border: none;
+    }
+    .el-range-editor.el-input__inner {
+        padding: 3px 0px;
+    }
+    .el-icon-date {
+        display: none;
+    }
+    .el-range__close-icon {
+        position: absolute;
+        right: 0px;
+        top: 2px;
+    }
+    .el-range-editor--mini .el-range-input {
+        font-size: 14px;
+        color: rgb(31, 36, 41);
+    }
 }
 </style>

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

@@ -2,7 +2,7 @@
     <div class='tableZh'>
         <div class='tab-top'>
             <Select
-                width='146'
+                width='200'
                 tipPlace='top'
                 caption='状态'
                 size='small'
@@ -15,7 +15,7 @@
             ></Select>
             <Select
                 @change='dsfjc'
-                width='146'
+                width='200'
                 tipPlace='top'
                 caption='部门'
                 v-if='zgbm.length>0'
@@ -27,7 +27,7 @@
             ></Select>
             <Select
                 @change='dsfjc'
-                width='146'
+                width='200'
                 tipPlace='top'
                 caption='检测结论'
                 size='small'
@@ -37,7 +37,7 @@
                 :placeholder='"请选择"'
                 v-model='jcjldsf'
             ></Select>
-            <el-input clearable @change='dsfjc' placeholder='搜索任务名称' size='small' prefix-icon='el-icon-search' v-model='searVal' style='width:192px'></el-input>
+            <el-input clearable @change='dsfjc' placeholder='搜索任务名称' size='small' prefix-icon='el-icon-search' v-model='searVal' style='width:200px'></el-input>
         </div>
         <el-table
             row-key='id'

+ 187 - 28
src/views/room/detail.vue

@@ -2,16 +2,15 @@
     <div class='gdqd-dialog'>
         <div class='top'></div>
         <div class='gdqd-dialog-top'>
-            <Select
-                width='146'
-                style='margin-right:12px'
-                tipPlace='top'
-                caption='楼层:'
+            <el-input
+                clearable
+                @change='queryDetail'
+                placeholder='搜索设备名称编号'
+                style='width:196px;margin-right:12px'
                 size='small'
-                @change='changeFloorStr'
-                v-model='floorStr'
-                :selectdata='floorSelect'
-            ></Select>
+                prefix-icon='el-icon-search'
+                v-model='mcbhChange'
+            ></el-input>
             <Select
                 width='146'
                 v-model='sbglgsStr'
@@ -34,44 +33,109 @@
                 v-model='statusStr'
                 :selectdata='sb_status'
             ></Select>
-            <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
+                clearable
+                @change='queryDetail'
+                placeholder='搜索品牌型号'
+                style='width:196px;margin-right:12px'
+                size='small'
+                prefix-icon='el-icon-search'
+                v-model='ssppbh'
+            ></el-input>
 
-            <input-dialog :keyword='keyword' @confirm='confirm'></input-dialog>
+            <Select
+                width='146'
+                style='margin-right:12px'
+                tipPlace='top'
+                caption='楼层:'
+                size='small'
+                @change='changeFloorStr'
+                v-model='floorStr'
+                :selectdata='floorSelect'
+            ></Select>
+        </div>
+        <div class='dialog-none'>
+            <div class='input-dialog'>
+                <div class='input-dialog-top' @click='show'>
+                    <img src='@/assets/imgs/select.png' />
+                    筛选
+                </div>
+                <div class='input-dialog-form' v-if='dialogFormVisible'>
+                    <p class='input-dialog-p'>安装位置</p>
+                    <p class='input-dialog-p2'>
+                        <el-input
+                            clearable
+                            placeholder='搜索安装位置'
+                            style='width:200px;'
+                            size='mini'
+                            prefix-icon='el-icon-search'
+                            v-model='form.wbsxjlInput5'
+                        ></el-input>
+                    </p>
+
+                    <p class='input-dialog-p'>生产厂商</p>
+                    <p class='input-dialog-p2'>
+                        <el-input
+                            clearable
+                            placeholder='搜索生产厂商'
+                            style='width:200px;'
+                            size='mini'
+                            prefix-icon='el-icon-search'
+                            v-model='form.rwbhInput5'
+                        ></el-input>
+                    </p>
+
+                    <p class='input-dialog-p'>服务商</p>
+                    <p class='input-dialog-p2'>
+                        <el-input
+                            clearable
+                            placeholder='搜索服务商'
+                            style='width:200px;'
+                            size='mini'
+                            prefix-icon='el-icon-search'
+                            v-model='form.ycgdbhInput5'
+                        ></el-input>
+                    </p>
+                    <p class='input-dialog-foot'>
+                        <el-button @click='dialogFormVisible = false' size='mini'>取 消</el-button>
+                        <el-button type='primary' @click='confirm' size='mini'>确 定</el-button>
+                    </p>
+                </div>
+            </div>
         </div>
         <el-table
+            :border='true'
             v-loading='loadingDetail'
             :data='detailData'
             style='width:100%;margin-top:12px'
             :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='sbjc' label='设备简称' :show-overflow-tooltip='true'>
+            <el-table-column prop='sbjc' label='设备名称' :show-overflow-tooltip='true' resizable>
                 <template slot-scope='{row}'>{{row.sbjc||'--'}}</template>
             </el-table-column>
-            <el-table-column prop='sbbh' label='设备编号'>
+            <el-table-column prop='sbbh' label='设备编号' :show-overflow-tooltip='true'>
                 <template slot-scope='{row}'>{{row.sbbh||'--'}}</template>
             </el-table-column>
-            <el-table-column prop='sl' label='数量'>
+            <el-table-column prop='sl' label='数量' :show-overflow-tooltip='true'>
                 <template slot-scope='{row}'>{{row.sl||'--'}}</template>
             </el-table-column>
-            <el-table-column prop='sbglgs' label='管理归属'>
+            <el-table-column prop='sbglgs' label='管理归属' :show-overflow-tooltip='true'>
                 <template slot-scope='{row}'>{{row.sbglgs||'--'}}</template>
             </el-table-column>
-            <el-table-column prop='sbstatus' label='设备状态'>
+            <el-table-column prop='sbstatus' label='设备状态' :show-overflow-tooltip='true'>
                 <template slot-scope='{row}'>{{row.sbstatus||'--'}}</template>
             </el-table-column>
-            <el-table-column prop='brand' label='品牌'>
+            <el-table-column prop='brand' label='品牌' :show-overflow-tooltip='true'>
                 <template slot-scope='{row}'>{{row.brand||'--'}}</template>
             </el-table-column>
-            <el-table-column prop='sbxh' label='型号'>
+            <el-table-column prop='sbxh' label='型号' :show-overflow-tooltip='true'>
                 <template slot-scope='{row}'>{{row.sbxh||'--'}}</template>
             </el-table-column>
-            <el-table-column prop='floor' label='楼层'>
+            <el-table-column prop='floor' label='楼层' :show-overflow-tooltip='true'>
                 <template slot-scope='{row}'>{{row.floor||'--'}}</template>
             </el-table-column>
-            <el-table-column prop='wzqy' label='安装位置'>
+            <el-table-column prop='wzqy' label='安装位置' :show-overflow-tooltip='true'>
                 <template slot-scope='{row}'>{{row.wzqy||'--'}}</template>
             </el-table-column>
             <el-table-column prop='manufacturer' label='生产厂商' :show-overflow-tooltip='true'>
@@ -105,6 +169,7 @@ export default {
     props: ['type_code'],
     data() {
         return {
+            dialogFormVisible: false,
             sb_status: [],
             sbglgs: [],
             input: '',
@@ -116,7 +181,15 @@ export default {
             pageDetail: 1,
             sizeDetail: 10,
             detailData: [],
-            keyword: ''
+            keyword: '',
+            form: {
+                wbsxjlInput5: '',
+                rwbhInput5: '',
+                ycgdbhInput5: '',
+                ssmsInput5: ''
+            },
+            mcbhChange: '',
+            ssppbh: ''
         }
     },
     components: {
@@ -133,6 +206,9 @@ export default {
         }
     },
     methods: {
+        show() {
+            this.dialogFormVisible = !this.dialogFormVisible
+        },
         // 改变楼层
         changeFloorStr() {
             this.queryDetail()
@@ -156,6 +232,11 @@ export default {
             let postParams = {
                 type_code: this.type_code //自定义分类内码 主要设备清单必传
             }
+            let data = {
+                plazaId: this.$store.state.plazaId,
+                page: this.pageDetail,
+                size: this.sizeDetail
+            }
             if (this.floorStr) {
                 postParams.floor = this.floorStr
             }
@@ -166,11 +247,49 @@ export default {
                 postParams.sb_status = this.statusStr
             }
 
-            let data = {
-                plazaId: this.$store.state.plazaId,
-                page: this.pageDetail,
-                size: this.sizeDetail
+            if (this.form.wbsxjlInput5) {
+                if (data.keyword) {
+                    data.keyword = `${data.keyword + ';' + this.form.wbsxjlInput5}:wzqy`
+                } else {
+                    data.keyword = `${this.form.wbsxjlInput5}:wzqy`
+                }
             }
+            if (this.form.rwbhInput5) {
+                if (data.keyword) {
+                    data.keyword = `${data.keyword + ';' + this.form.rwbhInput5}:manufacturer`
+                } else {
+                    data.keyword = `${this.form.rwbhInput5}:manufacturer`
+                }
+            }
+            if (this.form.ycgdbhInput5) {
+                if (data.keyword) {
+                    data.keyword = `${data.keyword + ';' + this.form.ycgdbhInput5}:fws`
+                } else {
+                    data.keyword = `${this.form.ycgdbhInput5}:fws`
+                }
+            }
+            if (this.form.ssmsInput5) {
+                if (data.keyword) {
+                    data.keyword = `${data.keyword + ';' + this.form.ssmsInput5}:sbbh`
+                } else {
+                    data.keyword = `${this.form.ssmsInput5}:sbbh`
+                }
+            }
+            if (this.mcbhChange) {
+                if (data.keyword) {
+                    data.keyword = `${data.keyword + ';' + this.mcbhChange}:sbjc,sbbh`
+                } else {
+                    data.keyword = `${this.mcbhChange}:sbjc,sbbh`
+                }
+            }
+            if (this.ssppbh) {
+                if (data.keyword) {
+                    data.keyword = `${data.keyword + ';' + this.ssppbh}:brand,sbxh`
+                } else {
+                    data.keyword = `${this.ssppbh}:brand,sbxh`
+                }
+            }
+
             queryHxsbDetail({ data, postParams }).then(res => {
                 console.log('钻取表', res)
                 this.loadingDetail = false
@@ -220,7 +339,9 @@ export default {
                 }
             })
         },
-        confirm() {}
+        confirm() {
+            this.queryDetail()
+        }
     }
 }
 </script>
@@ -235,6 +356,44 @@ export default {
         justify-content: flex-end;
         margin-top: 28px;
     }
+    .dialog-none {
+        width: 100px;
+        position: absolute;
+        right: 0;
+        .input-dialog {
+            .input-dialog-top {
+                color: #c3c7cb;
+                cursor: pointer;
+                position: absolute;
+                top: -30px;
+                right: 30px;
+            }
+            .input-dialog-form {
+                padding: 20px 24px;
+                background: rgba(255, 255, 255, 1);
+                border-radius: 4px;
+                border: 1px solid rgba(195, 199, 203, 1);
+                z-index: 9999;
+                position: absolute;
+                top: 0px;
+                right: 30px;
+            }
+            .input-dialog-p {
+                margin-bottom: 8px;
+                font-size: 14px;
+                font-family: MicrosoftYaHei;
+                color: rgba(100, 108, 115, 1);
+                line-height: 22px;
+            }
+            .input-dialog-p2 {
+                margin-bottom: 16px;
+            }
+        }
+        .input-dialog-foot {
+            display: flex;
+            justify-content: flex-end;
+        }
+    }
 }
 </style>
 <style lang="less">

+ 298 - 235
src/views/room/index.vue

@@ -15,7 +15,7 @@
                     <el-tab-pane label='配电室低压柜及出线明细表' name='2'>
                         <div class='compute-center'>
                             <Select
-                                width='146'
+                                width='200'
                                 @change='Index1'
                                 v-model='floor2'
                                 tipPlace='top'
@@ -31,7 +31,7 @@
                                 placeholder='搜索抽屉编号'
                                 size='small'
                                 prefix-icon='el-icon-search'
-                                style='width:192px;margin-right:12px'
+                                style='width:200px;margin-right:12px'
                             ></el-input>
                             <el-input
                                 clearable
@@ -40,7 +40,7 @@
                                 placeholder='搜索出线规格'
                                 size='small'
                                 prefix-icon='el-icon-search'
-                                style='width:192px;margin-right:12px'
+                                style='width:200px;margin-right:12px'
                             ></el-input>
                             <el-input
                                 clearable
@@ -49,7 +49,7 @@
                                 placeholder='搜索电井编号'
                                 size='small'
                                 prefix-icon='el-icon-search'
-                                style='width:192px;margin-right:12px'
+                                style='width:200px;margin-right:12px'
                             ></el-input>
                             <el-input
                                 clearable
@@ -58,7 +58,7 @@
                                 placeholder='搜索控制回路'
                                 size='small'
                                 prefix-icon='el-icon-search'
-                                style='width:192px;margin-right:12px'
+                                style='width:200px;margin-right:12px'
                             ></el-input>
                         </div>
                         <room-table2
@@ -73,16 +73,6 @@
                     </el-tab-pane>
                     <el-tab-pane label='机房内核心设备' name='3'>
                         <div class='compute-center'>
-                            <Select
-                                width='146'
-                                @change='Index2'
-                                tipPlace='top'
-                                v-model='floorChange'
-                                caption='楼层:'
-                                :selectdata='floorSelect'
-                                :placeholder='"请选择"'
-                                style='margin-right:12px'
-                            ></Select>
                             <el-input
                                 clearable
                                 placeholder='搜索设备简称'
@@ -90,7 +80,7 @@
                                 prefix-icon='el-icon-search'
                                 v-model='sbjcInput'
                                 @change='Index2'
-                                style='width:192px;margin-right:12px'
+                                style='width:200px;margin-right:12px'
                             ></el-input>
                             <el-input
                                 clearable
@@ -99,8 +89,18 @@
                                 size='small'
                                 prefix-icon='el-icon-search'
                                 v-model='ppxhInput'
-                                style='width:192px;margin-right:12px'
+                                style='width:200px;margin-right:12px'
                             ></el-input>
+                            <Select
+                                width='200'
+                                @change='Index2'
+                                tipPlace='top'
+                                v-model='floorChange'
+                                caption='楼层:'
+                                :selectdata='floorSelect'
+                                :placeholder='"请选择"'
+                                style='margin-right:12px'
+                            ></Select>
                             <el-input
                                 clearable
                                 @change='Index2'
@@ -108,7 +108,7 @@
                                 size='small'
                                 prefix-icon='el-icon-search'
                                 v-model='sccsInput'
-                                style='width:192px;margin-right:12px'
+                                style='width:200px;margin-right:12px'
                             ></el-input>
                         </div>
                         <room-table3
@@ -123,89 +123,90 @@
                     </el-tab-pane>
                     <el-tab-pane label='维修记录' name='4'>
                         <div class='compute-center'>
-                            <el-date-picker
-                                clearable
-                                @change='Index3'
-                                v-model='tbsjDate'
-                                value-format='yyyyMMdd'
-                                type='daterange'
-                                size='small'
-                                style='margin-right:12px;width:320px'
-                                range-separator='-'
-                                start-placeholder='填报时间开始'
-                                end-placeholder='填报时间结束'
-                                placeholder='填报时间'
-                            ></el-date-picker>
-                            <el-date-picker
-                                clearable
-                                v-model='yssjDate'
-                                value-format='yyyyMMdd'
-                                type='daterange'
-                                @change='Index3'
-                                size='small'
-                                style='margin-right:12px;width:320px'
-                                range-separator='-'
-                                start-placeholder='验收时间开始'
-                                end-placeholder='验收时间结束'
-                                placeholder='验收时间'
-                            ></el-date-picker>
-                            <Select
-                                @change='Index3'
-                                width='146'
-                                tipPlace='top'
-                                caption='是否更换:'
-                                v-model='sfghSelect'
-                                :selectdata='isReplaceData'
-                                :placeholder='"请选择"'
-                                style='margin-right:12px'
-                            ></Select>
                             <el-input
                                 clearable
                                 @change='Index3'
-                                placeholder='搜索设备名称'
+                                placeholder='搜索设备名称、编号'
                                 size='small'
                                 prefix-icon='el-icon-search'
                                 v-model='sbmcInput4'
-                                style='width:192px;margin-right:12px'
+                                style='width:200px;margin-right:12px'
                             ></el-input>
                             <el-input
                                 clearable
                                 @change='Index3'
-                                placeholder='搜索设备编号'
-                                size='small'
-                                prefix-icon='el-icon-search'
-                                v-model='sbbhInput4'
-                                style='width:192px;margin-right:12px'
-                            ></el-input>
-                            <!-- <el-input
-                                clearable
-                                @change='Index3'
-                                placeholder='搜索重要事项记录'
+                                placeholder='搜索重要事项记录、描述'
                                 size='small'
                                 prefix-icon='el-icon-search'
                                 v-model='zysxInput4'
-                                style='width:192px;margin-right:12px'
+                                style='width:200px;margin-right:12px'
                             ></el-input>
-                            <el-input
-                                clearable
-                                @change='Index3'
-                                placeholder='搜索描述'
-                                size='small'
-                                prefix-icon='el-icon-search'
-                                v-model='msInput4'
-                                style='width:192px;margin-right:12px'
-                            ></el-input>
-                            <el-input
-                                clearable
+
+                            <Select
                                 @change='Index3'
-                                placeholder='搜索工单编号'
-                                size='small'
-                                prefix-icon='el-icon-search'
-                                v-model='gdbhInput4'
-                                style='width:192px;margin-right:12px'
-                            ></el-input>-->
+                                width='200'
+                                tipPlace='top'
+                                caption='是否更换:'
+                                v-model='sfghSelect'
+                                :selectdata='isReplaceData'
+                                :placeholder='"请选择"'
+                                style='margin-right:12px'
+                            ></Select>
+                        </div>
+                        <div class='dialog-none'>
+                            <div class='input-dialog'>
+                                <div class='input-dialog-top' @click='show'>
+                                    <img src='@/assets/imgs/select.png' />
+                                    筛选
+                                </div>
+                                <div class='input-dialog-form' v-if='dialogFormVisible'>
+                                    <p class='input-dialog-p'>填报日期</p>
+                                    <p class='input-dialog-p2'>
+                                        <el-date-picker
+                                            clearable
+                                            v-model='tbsjDate'
+                                            value-format='yyyyMMdd'
+                                            type='daterange'
+                                            size='mini'
+                                            style='margin-right:12px;width:200px'
+                                            range-separator='-'
+                                            start-placeholder
+                                            end-placeholder
+                                        ></el-date-picker>
+                                    </p>
+                                    <p class='input-dialog-p'>验收日期</p>
+                                    <p class='input-dialog-p2'>
+                                        <el-date-picker
+                                            clearable
+                                            v-model='yssjDate'
+                                            value-format='yyyyMMdd'
+                                            type='daterange'
+                                            size='mini'
+                                            style='margin-right:12px;width:200px'
+                                            range-separator='-'
+                                            start-placeholder
+                                            end-placeholder
+                                        ></el-date-picker>
+                                    </p>
+                                    <p class='input-dialog-p'>工单编号</p>
+                                    <p class='input-dialog-p2'>
+                                        <el-input
+                                            clearable
+                                            placeholder
+                                            style='width:200px;'
+                                            size='mini'
+                                            prefix-icon='el-icon-search'
+                                            v-model='gdbhInput4'
+                                        ></el-input>
+                                    </p>
+                                    <p class='input-dialog-foot'>
+                                        <el-button @click='dialogFormVisible = false' size='mini'>取 消</el-button>
+                                        <el-button type='primary' @click='confirm
+                                        ' size='mini'>确 定</el-button>
+                                    </p>
+                                </div>
+                            </div>
                         </div>
-                        <!-- <Input-dialog :type='type1' @changeIndex3='changeIndex3'></Input-dialog> -->
                         <room-table4
                             v-if='table4.length>=0'
                             :table4='table4'
@@ -218,98 +219,23 @@
                     </el-tab-pane>
                     <el-tab-pane label='维保记录' name='5'>
                         <div class='compute-center'>
-                            <el-date-picker
-                                clearable
-                                value-format='yyyyMMdd'
-                                type='daterange'
-                                size='small'
-                                style='margin-right:12px;width:320px'
-                                range-separator='-'
-                                start-placeholder='开始日期'
-                                end-placeholder='结束日期'
-                                placeholder='开始时间'
-                            ></el-date-picker>
-                            <el-date-picker
-                                clearable
-                                value-format='yyyyMMdd'
-                                type='daterange'
-                                size='small'
-                                style='margin-right:12px;width:320px'
-                                range-separator='-'
-                                start-placeholder='开始日期'
-                                end-placeholder='结束日期'
-                                placeholder='完成时间'
-                            ></el-date-picker>
-                            <el-date-picker
-                                clearable
-                                value-format='yyyyMMdd'
-                                type='daterange'
-                                size='small'
-                                style='margin-right:12px;width:320px'
-                                range-separator='-'
-                                start-placeholder='开始日期'
-                                end-placeholder='结束日期'
-                                placeholder='填报时间'
-                            ></el-date-picker>
-                            <el-date-picker
-                                clearable
-                                value-format='yyyyMMdd'
-                                type='daterange'
-                                size='small'
-                                style='margin-right:12px;width:320px'
-                                range-separator='-'
-                                start-placeholder='开始日期'
-                                end-placeholder='结束日期'
-                                placeholder='验收时间'
-                            ></el-date-picker>
-                            <Select
-                                @change='Index4'
-                                width='146'
-                                tipPlace='top'
-                                caption='是否正常:'
-                                v-if='zt.length>0'
-                                :selectdata='zt'
-                                v-model='iszcSelect5'
-                                :placeholder='"请选择"'
-                                style='margin-right:12px'
-                            ></Select>
-                            <Select
-                                @change='Index4'
-                                width='146'
-                                tipPlace='top'
-                                v-model='statuSelect5'
-                                caption='任务状态:'
-                                v-if='status.length>0'
-                                :selectdata='status'
-                                :placeholder='"请选择"'
-                                style='margin-right:12px'
-                            ></Select>
                             <el-input
                                 @change='Index4'
                                 clearable
-                                placeholder='搜索设备名称'
+                                placeholder='搜索设备名称、编号'
                                 size='small'
                                 prefix-icon='el-icon-search'
                                 v-model='sbmcInput5'
-                                style='margin-right:12px;width:192px;'
+                                style='margin-right:12px;width:220px;'
                             ></el-input>
                             <el-input
                                 @change='Index4'
                                 clearable
-                                placeholder='搜索设备编号'
-                                size='small'
-                                prefix-icon='el-icon-search'
-                                v-model='sbbhInput5'
-                                style='margin-right:12px;width:192px;'
-                            ></el-input>
-                            <el-input
-                                @change='Index4'
-                                clearable
-                                placeholder='搜索核心维保事项记录'
+                                placeholder='搜索核心维保事项记录描述'
                                 size='small'
                                 prefix-icon='el-icon-search'
                                 v-model='wbsxjlInput5'
-                                style='margin-right:12px;width:192px;'
+                                style='margin-right:12px;width:220px;'
                             ></el-input>
                             <el-input
                                 @change='Index4'
@@ -318,26 +244,114 @@
                                 size='small'
                                 prefix-icon='el-icon-search'
                                 v-model='rwbhInput5'
-                                style='margin-right:12px;width:192px;'
-                            ></el-input>
-                            <el-input
-                                @change='Index4'
-                                clearable
-                                placeholder='搜索异常工单编号'
-                                size='small'
-                                prefix-icon='el-icon-search'
-                                v-model='ycgdbhInput5'
-                                style='margin-right:12px;width:192px;'
-                            ></el-input>
-                            <el-input
-                                @change='Index4'
-                                clearable
-                                placeholder='搜索描述'
-                                size='small'
-                                prefix-icon='el-icon-search'
-                                v-model='ssmsInput5'
-                                style='margin-right:12px;width:192px;'
+                                style='margin-right:12px;width:220px;'
                             ></el-input>
+                            <Select
+                                width='220'
+                                tipPlace='top'
+                                v-model='statuSelect5'
+                                caption='任务状态'
+                                v-if='status.length>0'
+                                :selectdata='status'
+                                :placeholder='"请选择"'
+                                style='margin-right:12px'
+                            ></Select>
+                        </div>
+                        <div class='dialog-none'>
+                            <div class='input-dialog'>
+                                <div class='input-dialog-top' @click='show'>
+                                    <img src='@/assets/imgs/select.png' />
+                                    筛选
+                                </div>
+                                <div class='input-dialog-form' v-if='dialogFormVisible'>
+                                    <p class='input-dialog-p'>任务开始日期</p>
+                                    <p class='input-dialog-p2'>
+                                        <el-date-picker
+                                            clearable
+                                            value-format='yyyyMMdd'
+                                            type='daterange'
+                                            size='mini'
+                                            v-model='rwksrq'
+                                            style='width:200px'
+                                            range-separator='-'
+                                            start-placeholder
+                                            end-placeholder
+                                        ></el-date-picker>
+                                    </p>
+
+                                    <p class='input-dialog-p'>任务完成日期</p>
+                                    <p class='input-dialog-p2'>
+                                        <el-date-picker
+                                            clearable
+                                            value-format='yyyyMMdd'
+                                            type='daterange'
+                                            size='mini'
+                                            v-model='rwwcrq'
+                                            style='width:200px'
+                                            range-separator='-'
+                                            start-placeholder
+                                            end-placeholder
+                                        ></el-date-picker>
+                                    </p>
+
+                                    <p class='input-dialog-p'>维保结果</p>
+                                    <p class='input-dialog-p2'>
+                                        <Select
+                                            width='200'
+                                            tipPlace='top'
+                                            caption='是否正常:'
+                                            v-if='zt.length>0'
+                                            :selectdata='zt'
+                                            v-model='iszcSelect5'
+                                            :placeholder='"请选择"'
+                                            style='margin-right:12px'
+                                        ></Select>
+                                    </p>
+                                    <p class='input-dialog-p'>异常工单编号</p>
+                                    <p class='input-dialog-p2'>
+                                        <el-input
+                                            clearable
+                                            placeholder
+                                            style='width:200px;'
+                                            size='mini'
+                                            prefix-icon='el-icon-search'
+                                            v-model='ycgdbhInput5'
+                                        ></el-input>
+                                    </p>
+                                    <p class='input-dialog-p'>异常工单填报日期</p>
+                                    <p class='input-dialog-p2'>
+                                        <el-date-picker
+                                            clearable
+                                            value-format='yyyyMMdd'
+                                            type='daterange'
+                                            size='mini'
+                                            v-model='ycgdtbsj'
+                                            style='width:200px'
+                                            range-separator='-'
+                                            start-placeholder
+                                            end-placeholder
+                                        ></el-date-picker>
+                                    </p>
+                                    <p class='input-dialog-p'>异常工单验收日期</p>
+                                    <p class='input-dialog-p2'>
+                                        <el-date-picker
+                                            clearable
+                                            value-format='yyyyMMdd'
+                                            type='daterange'
+                                            size='mini'
+                                            style='width:200px'
+                                            range-separator='-'
+                                            start-placeholder
+                                            end-placeholder
+                                            v-model='ycgdyssj'
+                                        ></el-date-picker>
+                                    </p>
+                                    <p class='input-dialog-foot'>
+                                        <el-button @click='dialogFormVisible = false' size='mini'>取 消</el-button>
+                                        <el-button type='primary' @click='confirm2' size='mini'>确 定</el-button>
+                                    </p>
+                                </div>
+                            </div>
                         </div>
                         <room-table5
                             v-if='table5.length>=0'
@@ -371,6 +385,7 @@ export default {
         return {
             activeName: '1',
             visible: false,
+            dialogFormVisible: false,
             systemName: '',
             loading: true,
             loading1: true,
@@ -407,7 +422,7 @@ export default {
             //
             total3: 0,
             page3: 1,
-            size3: 10,
+            size3: 11,
             tbsjDate: '',
             yssjDate: '',
             // 是否更换配件
@@ -426,7 +441,7 @@ export default {
             //
             total4: 0,
             page4: 1,
-            size4: 10,
+            size4: 11,
             searVal: '',
             status: [],
             zt: [],
@@ -437,7 +452,11 @@ export default {
             ycgdbhInput5: '',
             ssmsInput5: '',
             iszcSelect5: '',
-            statuSelect5: ''
+            statuSelect5: '',
+            rwksrq: '',
+            rwwcrq: '',
+            ycgdtbsj: '',
+            ycgdyssj: ''
         }
     },
     components: {
@@ -466,6 +485,9 @@ export default {
                 this.changeSelect()
             }
         },
+        show() {
+            this.dialogFormVisible = !this.dialogFormVisible
+        },
         Index() {
             this.picFloor = this.$cookie.get('floorNow')
             let getParams = {
@@ -548,16 +570,6 @@ export default {
                     data.keyword = `${this.ppxhInput}:brand,sbxh`
                 }
             }
-            console.log(this.msInput4)
-
-            if (this.msInput4) {
-                console.log(this.msInput4)
-                if (data.keyword) {
-                    data.keyword = `${data.keyword + ';' + this.msInput4}:description`
-                } else {
-                    data.keyword = `${this.msInput4}:manufacturer`
-                }
-            }
             if (this.sccsInput) {
                 if (data.keyword) {
                     data.keyword = `${data.keyword + ';' + this.sccsInput}:manufacturer`
@@ -586,38 +598,37 @@ export default {
                 // plazaId: '1000388',
                 plazaId: this.$store.state.plazaId,
                 page: this.page3,
-                size: this.size3
+                size: this.size3,
+                orderBy: 'sjjssj,0;location,1'
             }
             if (this.sfghSelect) {
                 getParams.ismodel = this.sfghSelect
             }
+            // 设备名称、编号
             if (this.sbmcInput4) {
                 if (getParams.keyword) {
                     getParams.keyword = `${getParams.keyword + ';' + this.sbmcInput4}:sbmc`
                 } else {
-                    getParams.keyword = `${this.sbmcInput4}:sbmc`
-                }
-            }
-            if (this.sbbhInput4) {
-                if (getParams.keyword) {
-                    getParams.keyword = `${getParams.keyword + ';' + this.sbbhInput4}:location`
-                } else {
-                    getParams.keyword = `${this.sbbhInput4}:location`
+                    getParams.keyword = `${this.sbmcInput4}:sbmc,location`
                 }
             }
+            // 重要事项记录、描述
             if (this.zysxInput4) {
                 if (getParams.keyword) {
                     getParams.keyword = `${getParams.keyword + ';' + this.zysxInput4}:matters`
                 } else {
-                    getParams.keyword = `${this.zysxInput4}:matters`
+                    getParams.keyword = `${this.zysxInput4}:matters,manufacturer`
                 }
             }
-            if (this.gdbhInput4) {
-                if (getParams.keyword) {
-                    getParams.keyword = `${getParams.keyword + ';' + this.gdbhInput4}:manufacturer`
-                } else {
-                    getParams.keyword = `${this.gdbhInput4}:manufacturer`
-                }
+            // 填报时间
+            if (this.tbsjDate) {
+                getParams.reportedbyStartDate = this.tbsjDate[0] + '000000'
+                getParams.reportedbyEndDate = this.tbsjDate[1] + '000000'
+            }
+            // 验收时间
+            if (this.yssjDate) {
+                getParams.sjjssjStartDate = this.yssjDate[0] + '000000'
+                getParams.sjjssjEndDate = this.yssjDate[1] + '000000'
             }
             queryWxjf({ getParams }).then(res => {
                 console.log('维修', res)
@@ -629,7 +640,6 @@ export default {
             })
         },
         changeIndex3(val) {
-            console.log(val)
             if (val.type == 'wx') {
                 if (val.msInput4) {
                     this.msInput4 = val.msInput4
@@ -648,12 +658,33 @@ export default {
             let postParams = {}
             let data = {
                 location: '1198',
-                // plazaId: '1000288',
                 plazaId: this.$store.state.plazaId,
                 page: this.page4,
-                size: this.size4
-                // smsxt: '1001'
+                size: this.size4,
+                orderBy: 'wb_gzglid,0;assetnum,1;reportedby,0;'
             }
+            //
+            // 任务开始日期
+            if (this.rwksrq) {
+                data.sjkssjStartDate = this.rwksrq[0] + '000000'
+                data.sjkssjEndDate = this.rwksrq[1] + '000000'
+            }
+            // 任务完成日期
+            if (this.rwwcrq) {
+                data.sjwcsjStartDate = this.rwwcrq[0] + '000000'
+                data.sjwcsjEndDate = this.rwwcrq[1] + '000000'
+            }
+            // 异常工单填报时间
+            if (this.ycgdtbsj) {
+                data.reportedbyStartDate = this.ycgdtbsj[0] + '000000'
+                data.reportedbyEndDate = this.ycgdtbsj[1] + '000000'
+            }
+            // 异常工单验收时间
+            if (this.ycgdyssj) {
+                data.sjjssjStartDate = this.ycgdyssj[0] + '000000'
+                data.sjjssjEndDate = this.ycgdyssj[1] + '000000'
+            }
+            //
             // 是否正常
             if (this.iszcSelect5) {
                 data.zt = this.iszcSelect5
@@ -664,23 +695,16 @@ export default {
             }
             if (this.sbmcInput5) {
                 if (data.keyword) {
-                    data.keyword = `${data.keyword + ';' + this.sbmcInput5}:sbmc`
+                    data.keyword = `${data.keyword + ';' + this.sbmcInput5}:sbmc,assetnum`
                 } else {
-                    data.keyword = `${this.sbmcInput5}:sbmc`
-                }
-            }
-            if (this.sbbhInput5) {
-                if (data.keyword) {
-                    data.keyword = `${data.keyword + ';' + this.sbbhInput5}:assetnum`
-                } else {
-                    data.keyword = `${this.sbbhInput5}:assetnum`
+                    data.keyword = `${this.sbmcInput5}:sbmc,assetnum`
                 }
             }
             if (this.wbsxjlInput5) {
                 if (data.keyword) {
                     data.keyword = `${data.keyword + ';' + this.wbsxjlInput5}:matters`
                 } else {
-                    data.keyword = `${this.wbsxjlInput5}:matters`
+                    data.keyword = `${this.wbsxjlInput5}:matters,description`
                 }
             }
             if (this.rwbhInput5) {
@@ -697,13 +721,6 @@ export default {
                     data.keyword = `${this.ycgdbhInput5}:wonum`
                 }
             }
-            if (this.ssmsInput5) {
-                if (data.keyword) {
-                    data.keyword = `${data.keyword + ';' + this.ssmsInput5}:description`
-                } else {
-                    data.keyword = `${this.ssmsInput5}:description`
-                }
-            }
             queryWb({ data, postParams }).then(res => {
                 console.log('维保', res)
                 this.loading4 = false
@@ -711,6 +728,12 @@ export default {
                 this.table5 = res.data.data ? res.data.data : []
             })
         },
+        confirm() {
+            this.Index3()
+        },
+        confirm2() {
+            this.Index4()
+        },
         changeSelect() {
             this.department = []
             let postParams = [
@@ -742,7 +765,7 @@ export default {
                     zt.forEach(el => {
                         let obj = {
                             id: el.key,
-                            name: el.value
+                            name: el.value == '正常' ? '是' : '否'
                         }
                         this.zt.push(obj)
                     })
@@ -773,6 +796,46 @@ export default {
         align-items: center;
         margin-bottom: 12px;
     }
+    //
+    .dialog-none {
+        width: 100px;
+        position: absolute;
+        right: 0;
+        .input-dialog {
+            .input-dialog-top {
+                color: #c3c7cb;
+                cursor: pointer;
+                position: absolute;
+                top: -45px;
+                right: 0px;
+            }
+            .input-dialog-form {
+                padding: 20px 24px;
+                background: rgba(255, 255, 255, 1);
+                border-radius: 4px;
+                border: 1px solid rgba(195, 199, 203, 1);
+                z-index: 9999;
+                position: absolute;
+                top: -20px;
+                right: 0px;
+            }
+            .input-dialog-p {
+                margin-bottom: 8px;
+                font-size: 14px;
+                font-family: MicrosoftYaHei;
+                color: rgba(100, 108, 115, 1);
+                line-height: 22px;
+            }
+            .input-dialog-p2 {
+                margin-bottom: 16px;
+            }
+        }
+        .input-dialog-foot {
+            // margin-bottom: 16px;
+            display: flex;
+            justify-content: flex-end;
+        }
+    }
 }
 </style>
 <style lang="less">
@@ -826,7 +889,7 @@ export default {
         }
         .el-tabs,
         .el-tabs__content {
-            height: 700px;
+            height: 800px;
         }
         .el-tabs__active-bar {
             background-color: transparent !important;

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

@@ -2,6 +2,7 @@
     <div class='compute-item'>
         <div class='compute-table'>
             <el-table
+                :border='true'
                 v-if='table2.length>=0'
                 v-loading='loading'
                 :data='table2'
@@ -9,7 +10,7 @@
                 :header-cell-style='{background:"rgba(245,246,247,1)",fontFamily:"MicrosoftYaHei",color:"rgba(100,108,115,1)",lineHeight:"16px",fontSize:"12px"}'
             >
                 <el-table-column type='index' label='序号' width='50'></el-table-column>
-                <el-table-column prop='a' label='抽屉编号'>
+                <el-table-column prop='a' label='抽屉编号' resizable>
                     <template slot-scope='{row}'>{{row.drawernum||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop='a' label='出线规格'>

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

@@ -2,6 +2,7 @@
     <div class='compute-item'>
         <div class='compute-table'>
             <el-table
+                :border='true'
                 @row-click='innerTable'
                 v-loading='loading'
                 :data='table3'
@@ -9,7 +10,7 @@
                 :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 :show-overflow-tooltip='true' label='设备简称'>
+                <el-table-column prop :show-overflow-tooltip='true' label='设备简称' resizable>
                     <template slot-scope='{row}'>{{row.sbjc||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='数量'>
@@ -21,7 +22,7 @@
                 <el-table-column prop label='型号'>
                     <template slot-scope='{row}'>{{row.sbxh||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='楼层'>
+                <el-table-column prop label='楼层' :show-overflow-tooltip='true'>
                     <template slot-scope='{row}'>{{row.floor||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop :show-overflow-tooltip='true' label='生产厂商'>

+ 1 - 0
src/views/room/room4.vue

@@ -2,6 +2,7 @@
     <div class='compute-item'>
         <div class='compute-table'>
             <el-table
+                :border='true'
                 v-loading='loading'
                 :data='table4'
                 style='width: 100%'

+ 1 - 7
src/views/room/room5.vue

@@ -1,14 +1,8 @@
 <template>
     <div class='compute-item'>
-        <!-- <div class='compute-center'> -->
-        <!-- 
-            <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-table'>
             <el-table
+                :border='true'
                 v-loading='loading'
                 :data='table5'
                 style='width: 100%'