Browse Source

设备中各种类型表格的统计

zhulizhen1111 4 years ago
parent
commit
8f08adddf3

+ 59 - 2
src/utils/plugins/components.js

@@ -13,7 +13,7 @@ var system = [
                 {
                     label: "变配电室内部设备清单",
                     children: [],
-                    id: "LDQD",
+                    id: "GDQD",
                 },
                 {
                     label: "楼层电井(间)控制商铺范围清单",
@@ -22,40 +22,49 @@ var system = [
                 },
                 {
                     label: "维保事项",
+                    id: "GDWB",
                     children: [
                         {
                             label: "配电室内",
                             id: "GDWB1",
+                            param: { CLASSSTRUCTUREID: "1592" },
                         },
                         {
                             label: "配电室外",
                             id: "GDWB2",
+                            param: { CLASSSTRUCTUREID: "1593" },
                         },
                     ],
                 },
                 {
                     label: "维修事项",
+                    id: "GDWX",
                     children: [
                         {
                             label: "配电室内",
                             id: "GDWX1",
+                            param: { CLASSSTRUCTUREID: "1592" },
                         },
                         {
                             label: "配电室外",
                             id: "GDWX2",
+                            param: { CLASSSTRUCTUREID: "1593" },
                         },
                     ],
                 },
                 {
                     label: "专维及其他事项",
+                    id: "GDZW",
                     children: [
                         {
                             label: "专项维修",
                             id: "GDZW1",
+                            param: { CLASSSTRUCTUREID: "1592" },
                         },
                         {
                             label: "其他事项",
                             id: "GDZW2",
+                            param: { CLASSSTRUCTUREID: "1593" },
                         },
                     ],
                 },
@@ -74,22 +83,27 @@ var system = [
             children: [
                 {
                     label: "系统原理图",
+                    id: "NTYL",
                     children: [
                         {
                             label: "空调系统原理图",
                             id: "NTYL1",
+                            param: { CLASSSTRUCTUREID: "1572" },
                         },
                         {
                             label: "超市空调系统原理图",
                             id: "NTYL2",
+                            param: { CLASSSTRUCTUREID: "1512" },
                         },
                         {
                             label: "分水器支路分布明细",
                             id: "NTYL3",
+                            param: { CLASSSTRUCTUREID: "1502" },
                         },
                         {
                             label: "分水器支路分布图",
                             id: "NTYL4",
+                            param: { CLASSSTRUCTUREID: "1542" },
                         },
                     ],
                 },
@@ -104,7 +118,7 @@ var system = [
                         {
                             label: "楼层末端",
                             id: "NTQD2",
-                            param: { CLASSSTRUCTUREID: "1592" },
+                            param: { CLASSSTRUCTUREID: "1593" },
                         },
                     ],
                     id: "NTQD",
@@ -115,10 +129,12 @@ var system = [
                         {
                             label: "冷源机房内",
                             id: "NTWB1",
+                            param: { CLASSSTRUCTUREID: "1592" },
                         },
                         {
                             label: "冷源机房外",
                             id: "NTWB2",
+                            param: { CLASSSTRUCTUREID: "1593" },
                         },
                     ],
                     id: "NTWB",
@@ -129,10 +145,12 @@ var system = [
                         {
                             label: "冷源机房内",
                             id: "NTWX1",
+                            param: { CLASSSTRUCTUREID: "1592" },
                         },
                         {
                             label: "冷源机房外",
                             id: "NTWX2",
+                            param: { CLASSSTRUCTUREID: "1593" },
                         },
                     ],
                     id: "NTWX",
@@ -143,10 +161,12 @@ var system = [
                         {
                             label: "专项维修",
                             id: "NTZW1",
+                            param: { CLASSSTRUCTUREID: "1592" },
                         },
                         {
                             label: "其他事项",
                             id: "NTZW2",
+                            param: { CLASSSTRUCTUREID: "1593" },
                         },
                     ],
                     id: "NTZW",
@@ -170,14 +190,17 @@ var system = [
                         {
                             label: "消防电系统原理示意图",
                             id: "XFYL1",
+                            param: { CLASSSTRUCTUREID: "1572" },
                         },
                         {
                             label: "消防喷淋系统示意图",
                             id: "XFYL2",
+                            param: { CLASSSTRUCTUREID: "1552" },
                         },
                         {
                             label: "消防窗喷系统示意图",
                             id: "XFYL3",
+                            param: { CLASSSTRUCTUREID: "1542" },
                         },
                         {
                             label: "消防栓系统示意图",
@@ -202,10 +225,12 @@ var system = [
                         {
                             label: "中控室/消防泵房内",
                             id: "XFWB1",
+                            param: { CLASSSTRUCTUREID: "1573" },
                         },
                         {
                             label: "中控室/消防泵房外",
                             id: "XFWB2",
+                            param: { CLASSSTRUCTUREID: "1572" },
                         },
                     ],
                 },
@@ -216,10 +241,12 @@ var system = [
                         {
                             label: "中控室/消防泵房内",
                             id: "XFWX1",
+                            param: { CLASSSTRUCTUREID: "1573" },
                         },
                         {
                             label: "中控室/消防泵房外",
                             id: "XFWX2",
+                            param: { CLASSSTRUCTUREID: "1572" },
                         },
                     ],
                 },
@@ -230,10 +257,12 @@ var system = [
                         {
                             label: "专项维修",
                             id: "XFZW1",
+                            param: { CLASSSTRUCTUREID: "1576" },
                         },
                         {
                             label: "其他事项",
                             id: "XFZW2",
+                            param: { CLASSSTRUCTUREID: "1572" },
                         },
                     ],
                 },
@@ -256,14 +285,17 @@ var system = [
                         {
                             label: "视频监控系统原理图",
                             id: "RDYL1",
+                            param: { CLASSSTRUCTUREID: "1572" },
                         },
                         {
                             label: "门禁管理系统原理图",
                             id: "RDYL2",
+                            param: { CLASSSTRUCTUREID: "1573" },
                         },
                         {
                             label: "BA楼宇智能化系统原理图",
                             id: "RDYL3",
+                            param: { CLASSSTRUCTUREID: "1574" },
                         },
                     ],
                     id: "RDYL",
@@ -296,10 +328,12 @@ var system = [
                         {
                             label: "慧云机房内",
                             id: "RDWB1",
+                            param: { CLASSSTRUCTUREID: "1592" },
                         },
                         {
                             label: "慧云机房外",
                             id: "RDWB2",
+                            param: { CLASSSTRUCTUREID: "1593" },
                         },
                     ],
                 },
@@ -310,10 +344,12 @@ var system = [
                         {
                             label: "慧云机房内",
                             id: "RDWX1",
+                            param: { CLASSSTRUCTUREID: "1592" },
                         },
                         {
                             label: "慧云机房外",
                             id: "RDWX2",
+                            param: { CLASSSTRUCTUREID: "1593" },
                         },
                     ],
                 },
@@ -324,10 +360,12 @@ var system = [
                         {
                             label: "专项维修",
                             id: "RDZW1",
+                            param: { CLASSSTRUCTUREID: "1592" },
                         },
                         {
                             label: "其他事项",
                             id: "RDZW2",
+                            param: { CLASSSTRUCTUREID: "1593" },
                         },
                     ],
                 },
@@ -351,10 +389,12 @@ var system = [
                         {
                             label: "给水系统原理示意图",
                             id: "GSYL1",
+                            param: { CLASSSTRUCTUREID: "1572" },
                         },
                         {
                             label: "排水系统原理示意图",
                             id: "GSYL2",
+                            param: { CLASSSTRUCTUREID: "1542" },
                         },
                     ],
                 },
@@ -370,10 +410,12 @@ var system = [
                         {
                             label: "给水系统",
                             id: "GSQD1",
+                            param: { CLASSSTRUCTUREID: "1592" },
                         },
                         {
                             label: "排水系统",
                             id: "GSQD2",
+                            param: { CLASSSTRUCTUREID: "1593" },
                         },
                     ],
                 },
@@ -384,10 +426,12 @@ var system = [
                         {
                             label: "给水系统",
                             id: "GSWX1",
+                            param: { CLASSSTRUCTUREID: "1592" },
                         },
                         {
                             label: "排水系统",
                             id: "GSWX2",
+                            param: { CLASSSTRUCTUREID: "1593" },
                         },
                     ],
                 },
@@ -398,14 +442,17 @@ var system = [
                         {
                             label: "给水系统专项维修",
                             id: "GSZW1",
+                            param: { CLASSSTRUCTUREID: "1592" },
                         },
                         {
                             label: "排水系统专项维修",
                             id: "GSZW2",
+                            param: { CLASSSTRUCTUREID: "1593" },
                         },
                         {
                             label: "其他事项",
                             id: "GSZW3",
+                            param: { CLASSSTRUCTUREID: "1594" },
                         },
                     ],
                 },
@@ -428,10 +475,12 @@ var system = [
                         {
                             label: "扶梯原理图",
                             id: "DTYL1",
+                            param: { CLASSSTRUCTUREID: "1572" },
                         },
                         {
                             label: "直梯原理图",
                             id: "DTYL2",
+                            param: { CLASSSTRUCTUREID: "1072" },
                         },
                     ],
                     id: "DTYL",
@@ -499,10 +548,12 @@ var system = [
                         {
                             label: "维保事项",
                             id: "RQWX1",
+                            param: { CLASSSTRUCTUREID: "1592" },
                         },
                         {
                             label: "维修事项",
                             id: "RQWX2",
+                            param: { CLASSSTRUCTUREID: "1593" },
                         },
                     ],
                 },
@@ -513,10 +564,12 @@ var system = [
                         {
                             label: "专项维修",
                             id: "RQZW1",
+                            param: { CLASSSTRUCTUREID: "1592" },
                         },
                         {
                             label: "其他事项",
                             id: "RQZW2",
+                            param: { CLASSSTRUCTUREID: "1593" },
                         },
                     ],
                 },
@@ -563,10 +616,12 @@ var system = [
                         {
                             label: "维保事项",
                             id: "TJWB1",
+                            param: { CLASSSTRUCTUREID: "1592" },
                         },
                         {
                             label: "维修事项",
                             id: "TJWB2",
+                            param: { CLASSSTRUCTUREID: "1593" },
                         },
                     ],
                 },
@@ -577,10 +632,12 @@ var system = [
                         {
                             label: "专项维修",
                             id: "TJZW1",
+                            param: { CLASSSTRUCTUREID: "1592" },
                         },
                         {
                             label: "其他事项",
                             id: "TJZW2",
+                            param: { CLASSSTRUCTUREID: "1593" },
                         },
                     ],
                 },

+ 30 - 17
src/views/equipment/eqDialog.vue

@@ -3,28 +3,41 @@
     <div class='dialog-container'>
         <el-dialog :title='`${systemName}-${dialogInfo.label}`' :visible.sync='visible' :fullscreen='true'>
             <div class='top'></div>
-            <el-tabs v-model='activeName' @tab-click='handleClick' v-if='Object.keys(dialogInfo).length>0 && dialogInfo.children.length>0'>
-                <el-tab-pane
-                    v-for='(value,index) in dialogInfo.children'
-                    :key='"u"+index'
-                    :label='`${value.label}`'
-                    :name='`${value.param.CLASSSTRUCTUREID}`'
-                >
-                    <div v-if='value.id.slice(2,4)=="YL"' style='width:100%;height:600px;overflow:hidden'>
-                        <rotation :rotationImg='rotationImg'></rotation>
-                    </div>
-                    <tableList v-if='value.id.slice(0,4)=="RDQD"' ref='list' :param='param' major='弱电'></tableList>
-                    <tableList v-if='value.id.slice(0,4)=="NTQD"' ref='list' :param='param' major='暖通'></tableList>
-                </el-tab-pane>
-            </el-tabs>
-            <tj-table v-if='Object.keys(dialogInfo).length>0 && dialogInfo.id.slice(0,4)=="TJQD"' major='土建'></tj-table>
+            <div v-if='Object.keys(dialogInfo).length>0 && dialogInfo.id.slice(2,4)=="YL"' style='width:100%;height:600px;overflow:hidden'>
+                <rotation :rotationImg='rotationImg'></rotation>
+            </div>
+            <tj-table v-else-if='Object.keys(dialogInfo).length>0 && dialogInfo.id.slice(0,4)=="TJQD"' major='土建'></tj-table>
+            <GDQDTable v-else-if='Object.keys(dialogInfo).length>0 && dialogInfo.id.slice(0,4)=="GDQD"' major></GDQDTable>
+            <look-page v-else-if='Object.keys(dialogInfo).length>0 && dialogInfo.id.slice(2,4)=="TZ"' param major></look-page>
+            <div v-else>
+                <el-tabs v-model='activeName' @tab-click='handleClick' v-if='Object.keys(dialogInfo).length>0 && dialogInfo.children.length>0'>
+                    <el-tab-pane
+                        v-for='(value,index) in dialogInfo.children'
+                        :key='"u"+index'
+                        :label='`${value.label}`'
+                        :name='`${value.param.CLASSSTRUCTUREID}`'
+                    >
+                        <div v-if='value.id.slice(2,4)=="YL"' style='width:100%;height:600px;overflow:hidden'>
+                            <rotation :rotationImg='rotationImg'></rotation>
+                        </div>
+                        <tableList v-else-if='value.id.slice(0,4)=="RDQD"' ref='list' :param='param' major='弱电'></tableList>
+                        <tableList v-else-if='value.id.slice(0,4)=="NTQD"' ref='list' :param='param' major='暖通'></tableList>
+                        <wb-table v-else-if='value.id.slice(2,4)=="WX"' param major='维修'></wb-table>
+                        <zw-table v-else-if='value.id.slice(2,4)=="ZW"' param major='专维'></zw-table>
+                        <wb-table v-else-if='value.id.slice(2,4)=="WB"' param major='维保'></wb-table>
+                    </el-tab-pane>
+                </el-tabs>
+            </div>
         </el-dialog>
     </div>
 </template>
 <script>
 import tableList from './table/eqListTable'
 import tjTable from './table/tjTable'
-
+import wbTable from './table/wbTable'
+import zwTable from './table/zwTable'
+import lookPage from './table/lookPageTable'
+import GDQDTable from './table/GDQDTable'
 export default {
     props: ['systemName'],
     data() {
@@ -37,7 +50,7 @@ export default {
         }
     },
     mounted() {},
-    components: { tableList, tjTable },
+    components: { tableList, tjTable, wbTable, zwTable, lookPage, GDQDTable },
     methods: {
         showModal(item) {
             this.visible = true

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

@@ -67,6 +67,7 @@ export default {
             this.$refs.floorMap.init()
         },
         dialogVisible(eve) {
+            console.log(eve)
             this.$refs.dialog.showModal(eve)
             // this.dialogInfo = eve
         }

+ 84 - 0
src/views/equipment/table/GDQDTable.vue

@@ -0,0 +1,84 @@
+<!-- 设备清单的有select的表格 -->
+<template>
+    <div class='compute-list'>
+        <div class='eq-list-top'>
+            <Select width='120' tipPlace='top' caption='楼层 :' :selectdata='dataSelect2' style='margin-right:12px' @change='getList'></Select>
+            <a-input-search placeholder='请按照电井或商铺编号搜索' style='width: 192px;margin-bottom:12px;height:32px;' @search='onSearch' />
+        </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>
+        <div class='foot'>
+            <el-pagination
+                background
+                layout='prev, pager, next'
+                :total='total/pageSize'
+                :page-size='size'
+                @prev-click='pageChanged'
+                @next-click='pageChanged'
+                @current-change='pageChanged'
+            ></el-pagination>
+        </div>
+    </div>
+</template>
+<script>
+import { queryEquipmentList } from '@/api/equipmentList.js'
+export default {
+    data() {
+        return {
+            pageSize: 10,
+            tableData: [],
+            total: 0,
+            currentPage: 1,
+            size: 10
+        }
+    },
+    props: ['major'],
+    methods: {
+        onSearch() {},
+        pageChanged(page, size) {
+            this.currentPage = page
+            this.size = size
+            this.getList()
+        },
+        getList() {
+            let postParams = {}
+            let data = {
+                page: this.currentPage,
+                size: this.size,
+                plazaId: this.$store.state.plazaId,
+                major: this.major
+            }
+            queryEquipmentList({ data, postParams }).then(res => {
+                console.log(res)
+                this.tableData = res.data.data
+                this.total = res.data.count
+            })
+        }
+    },
+    mounted() {
+        this.getList()
+    }
+}
+</script>
+<style lang="less" scoped>
+.compute-list {
+    .eq-list-top {
+        display: flex;
+    }
+    .foot {
+        position: absolute;
+        height: 32px;
+        right: 26px;
+        bottom: 20px;
+    }
+    td {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+}
+</style>

+ 87 - 0
src/views/equipment/table/computerTable.vue

@@ -0,0 +1,87 @@
+<!-- 设备清单的有select的表格 -->
+<template>
+    <div class='compute-list'>
+        <div class='eq-list-top'>
+            <a-input-search placeholder style='width: 192px;margin-bottom:12px;height:32px;' @search='onSearch' />
+        </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='电井编码'></el-table-column>
+            <el-table-column prop='brand' label='电箱编码'></el-table-column>
+            <el-table-column prop='brand' label='供电容量(KW)'></el-table-column>
+            <el-table-column prop='brand' label='控制回路'></el-table-column>
+        </el-table>
+        <div class='foot'>
+            <el-pagination
+                background
+                layout='prev, pager, next'
+                :total='total/pageSize'
+                :page-size='size'
+                @prev-click='pageChanged'
+                @next-click='pageChanged'
+                @current-change='pageChanged'
+            ></el-pagination>
+        </div>
+    </div>
+</template>
+<script>
+import { queryEquipmentList } from '@/api/equipmentList.js'
+export default {
+    data() {
+        return {
+            pageSize: 10,
+            tableData: [],
+            total: 0,
+            currentPage: 1,
+            size: 10
+        }
+    },
+    props: ['major'],
+    methods: {
+        onSearch() {},
+        pageChanged(page, size) {
+            this.currentPage = page
+            this.size = size
+            this.getList()
+        },
+        getList() {
+            let postParams = {}
+            let data = {
+                page: this.currentPage,
+                size: this.size,
+                plazaId: this.$store.state.plazaId,
+                major: this.major
+            }
+            queryEquipmentList({ data, postParams }).then(res => {
+                console.log(res)
+                this.tableData = res.data.data
+                this.total = res.data.count
+            })
+        }
+    },
+    mounted() {
+        this.getList()
+    }
+}
+</script>
+<style lang="less" scoped>
+.compute-list {
+    .eq-list-top {
+        display: flex;
+    }
+    .foot {
+        position: absolute;
+        height: 32px;
+        right: 26px;
+        bottom: 20px;
+    }
+    td {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+}
+</style>

+ 93 - 0
src/views/equipment/table/lookPageTable.vue

@@ -0,0 +1,93 @@
+<!-- 设备清单的有select的表格 -->
+<template>
+    <div class='look-page'>
+        <div class='eq-list-top'>
+            <a-input-search placeholder style='width: 192px;margin-bottom:12px;height:32px;' @search='onSearch' />
+        </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='brand' label='操作'>
+                <template slot-scope='{row}'>
+                    <el-button type='text' size='mini' @click='handleDown(row)'>
+                        <i class='el-icon-download'></i>下载
+                    </el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class='foot'>
+            <el-pagination
+                background
+                layout='prev, pager, next'
+                :total='total/pageSize'
+                :page-size='size'
+                @prev-click='pageChanged'
+                @next-click='pageChanged'
+                @current-change='pageChanged'
+            ></el-pagination>
+        </div>
+    </div>
+</template>
+<script>
+import { queryEquipmentList } from '@/api/equipmentList.js'
+export default {
+    data() {
+        return {
+            pageSize: 10,
+            tableData: [{ index: 1 }],
+            total: 0,
+            currentPage: 1,
+            size: 10
+        }
+    },
+    props: ['major'],
+    methods: {
+        onSearch() {},
+        pageChanged(page, size) {
+            this.currentPage = page
+            this.size = size
+            this.getList()
+        },
+        getList() {
+            let postParams = {}
+            let data = {
+                page: this.currentPage,
+                size: this.size,
+                plazaId: this.$store.state.plazaId,
+                major: this.major
+            }
+            queryEquipmentList({ data, postParams }).then(res => {
+                console.log(res)
+                this.tableData = res.data.data
+                this.total = res.data.count
+            })
+        },
+        handleDown() {}
+    },
+    mounted() {
+        // this.getList()
+    }
+}
+</script>
+<style lang="less" scoped>
+.look-page {
+    .eq-list-top {
+        display: flex;
+    }
+    .foot {
+        position: absolute;
+        height: 32px;
+        right: 26px;
+        bottom: 20px;
+    }
+    td {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+}
+</style>

+ 1 - 1
src/views/equipment/table/tjTable.vue

@@ -2,7 +2,7 @@
 <template>
     <div class='tj-list'>
         <div class='eq-list-top'>
-            <a-input-search placeholder style='width: 192px;margin-left:12px;height:32px;' @search='onSearch' />
+            <a-input-search placeholder='请按照类别或品牌搜索' style='width: 192px;margin-left:12px;height:32px;' @search='onSearch' />
         </div>
         <el-table :data='tableData' style='width: 100%'>
             <el-table-column type='index' label='序号' width='80'></el-table-column>

+ 30 - 0
src/views/equipment/table/wbDailogTable.vue

@@ -0,0 +1,30 @@
+<template>
+    <div class='wb-dialog-Table'>
+        <el-dialog title='综合记录事项' :visible.sync='visible'>
+            <el-table :data='tableData' style='width: 100%'>
+                <el-table-column label='位置' prop='position' width='50'></el-table-column>
+                <el-table-column prop='equipment' label='设备' width='140'></el-table-column>
+                <el-table-column prop='thing' label='记录事项' :show-overflow-tooltip='true'></el-table-column>
+            </el-table>
+        </el-dialog>
+    </div>
+</template>
+<script>
+export default {
+    data() {
+        return {
+            visible: false,
+            tableData: []
+        }
+    },
+    methods: {
+        open() {
+            this.visible = true
+        }
+    }
+}
+</script>
+<style lang="less" scoped>
+.wb-dialog-Table {
+}
+</style>

+ 92 - 0
src/views/equipment/table/wbTable.vue

@@ -0,0 +1,92 @@
+<!-- 设备清单的有select的表格 -->
+<template>
+    <div class='wb-list'>
+        <div class='eq-list-top'>
+            <a-input-search placeholder style='width: 192px;margin-bottom:12px;height:32px;' @search='onSearch' />
+        </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='描述'></el-table-column>
+            <el-table-column label='更换配件信息'>
+                <el-table-column prop='province' 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='zip' label='费用(万元)' width='120'></el-table-column>
+                <el-table-column prop='zip' label='费用出处' width='120'></el-table-column>
+            </el-table-column>
+            <el-table-column prop='brand' label='现场照片'></el-table-column>
+        </el-table>
+        <div class='foot'>
+            <el-pagination
+                background
+                layout='prev, pager, next'
+                :total='total/pageSize'
+                :page-size='size'
+                @prev-click='pageChanged'
+                @next-click='pageChanged'
+                @current-change='pageChanged'
+            ></el-pagination>
+        </div>
+    </div>
+</template>
+<script>
+import { queryEquipmentList } from '@/api/equipmentList.js'
+export default {
+    data() {
+        return {
+            pageSize: 10,
+            tableData: [],
+            total: 0,
+            currentPage: 1,
+            size: 10
+        }
+    },
+    props: ['major'],
+    methods: {
+        onSearch() {},
+        pageChanged(page, size) {
+            this.currentPage = page
+            this.size = size
+            this.getList()
+        },
+        getList() {
+            let postParams = {}
+            let data = {
+                page: this.currentPage,
+                size: this.size,
+                plazaId: this.$store.state.plazaId,
+                major: this.major
+            }
+            queryEquipmentList({ data, postParams }).then(res => {
+                console.log(res)
+                this.tableData = res.data.data
+                this.total = res.data.count
+            })
+        }
+    },
+    mounted() {
+        // this.getList()
+    }
+}
+</script>
+<style lang="less" scoped>
+.wb-list {
+    .eq-list-top {
+        display: flex;
+    }
+    .foot {
+        position: absolute;
+        height: 32px;
+        right: 26px;
+        bottom: 20px;
+    }
+    td {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+}
+</style>

+ 107 - 0
src/views/equipment/table/zwTable.vue

@@ -0,0 +1,107 @@
+<!-- 设备清单的有select的表格 -->
+<template>
+    <div class='zw-list'>
+        <div class='eq-list-top'>
+            <Select width='146' tipPlace='top' caption='类别:' :selectdata='dataSelect2' :placeholder='"请选择"' @change='getList'></Select>
+            <Select width='120' tipPlace='top' caption='楼层 :' :selectdata='dataSelect2' style='margin:0 12px' @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' />
+        </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'></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='当前阶段' show-overflow-tooltip resizable width='140'></el-table-column>
+            <el-table-column prop='manufacturer' label='开始日期'></el-table-column>
+            <el-table-column prop='manufacturer' label='验收日期'></el-table-column>
+        </el-table>
+        <div class='foot'>
+            <el-pagination
+                background
+                layout='prev, pager, next'
+                :total='total/pageSize'
+                :page-size='size'
+                @prev-click='pageChanged'
+                @next-click='pageChanged'
+                @current-change='pageChanged'
+            ></el-pagination>
+        </div>
+    </div>
+</template>
+<script>
+import Select from '@/components/Select/Select.vue'
+import { queryEquipmentList } from '@/api/equipmentList.js'
+export default {
+    components: { Select },
+    data() {
+        return {
+            pageSize: 10,
+            dataSelect2: [
+                { id: 'test1', name: '选择项' },
+                { id: 'test2', name: '单平米' },
+                { id: 'test3', name: '下级分项' },
+                { id: 'test4', name: '滑动平均滑动平均' }
+            ],
+            tableData: [],
+            total: 0,
+            currentPage: 1,
+            size: 10
+        }
+    },
+    props: ['param', 'major'],
+    methods: {
+        pageChanged(page, size) {
+            this.currentPage = page
+            this.size = size
+            this.getList()
+        },
+        getList() {
+            let postParams = {
+                CLASSSTRUCTUREID: this.param
+            }
+            let data = {
+                page: this.currentPage,
+                size: this.size,
+                plazaId: this.$store.state.plazaId,
+                major: this.major
+            }
+            queryEquipmentList({ data, postParams }).then(res => {
+                console.log(res)
+                this.tableData = res.data.data
+                this.total = res.data.count
+            })
+        }
+    },
+    watch: {
+        param(newV, oldV) {
+            if (newV !== oldV) {
+                this.getList()
+            }
+        }
+    },
+    mounted() {
+        this.getList()
+    }
+}
+</script>
+<style lang="less" scoped>
+.zw-list {
+    .eq-list-top {
+        display: flex;
+    }
+    .foot {
+        position: absolute;
+        height: 32px;
+        right: 26px;
+        bottom: 20px;
+    }
+    td {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+}
+</style>

+ 33 - 5
src/views/other/zhsxOther.vue

@@ -7,17 +7,36 @@
                 <img src='../../assets/imgs/zy.svg' alt @click='zhsxLog()' />
             </div>
             <div class='zhsx-top-right'>
-                <el-input placeholder='请搜索' size='mini' prefix-icon='el-icon-search' v-model='input'></el-input>
+                <el-date-picker
+                    v-model='value1'
+                    type='daterange'
+                    size='small'
+                    style='margin-right:12px'
+                    range-separator='至'
+                    start-placeholder='开始日期'
+                    end-placeholder='结束日期'
+                ></el-date-picker>
+                <Select
+                    width='224'
+                    tipPlace='top'
+                    caption='政府部门'
+                    size='small'
+                    style='margin-right:12px'
+                    :selectdata='dataSelect2'
+                    :placeholder='"请选择"'
+                ></Select>
+                <el-input placeholder='请按照记录事项搜索' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
             </div>
         </div>
         <div class='zhsx-bottom'>
             <el-table :data='tableData' style='width: 100%'>
                 <el-table-column label='序号' type='index' width='50'></el-table-column>
-                <el-table-column prop='date' label='日期' width='130'></el-table-column>
+                <el-table-column prop='date' sortable label='日期' width='130'></el-table-column>
                 <el-table-column prop='address1' label='政府部门' :show-overflow-tooltip='true'></el-table-column>
                 <el-table-column prop='address1' label='记录事项' :show-overflow-tooltip='true'></el-table-column>
-                <el-table-column prop='address2' label='工程经理签字'></el-table-column>
-                <el-table-column prop='address2' label='工程物业副总签字'></el-table-column>
+                <el-table-column prop='address2' label='工作要求'></el-table-column>
+                <el-table-column prop='address2' label='整改要求'></el-table-column>
+                <el-table-column prop='address2' label='附件'></el-table-column>
             </el-table>
             <div class='footer'>
                 <el-pagination background layout='prev, pager, next' :total='100'></el-pagination>
@@ -27,6 +46,7 @@
     </div>
 </template>
 <script>
+import Select from '@/components/Select/Select.vue'
 import ZhsxDialog from './zhsxDialog'
 export default {
     data() {
@@ -103,10 +123,17 @@ export default {
                     address1: 'BI超市消防联动测试故障,要求2.5前完,再复查',
                     address2: '陈卫国'
                 }
+            ],
+            value1: '',
+            dataSelect2: [
+                { id: 'test1', name: '选择项' },
+                { id: 'test2', name: '单平米' },
+                { id: 'test3', name: '下级分项' },
+                { id: 'test4', name: '滑动平均滑动平均' }
             ]
         }
     },
-    components: { ZhsxDialog },
+    components: { ZhsxDialog, Select },
     methods: {
         zhsxLog() {
             this.$refs.Dialog.open()
@@ -153,6 +180,7 @@ export default {
             }
         }
         .zhsx-top-right {
+            display: flex;
         }
     }
     .zhsx-bottom {