Browse Source

设备清单表格

zhulizhen1111 4 years ago
parent
commit
bfb2ac7ce7

+ 1 - 0
src/components/menuList.vue

@@ -80,6 +80,7 @@ export default {
 <style scoped lang="less">
 .menu {
     height: 48px;
+    min-width: 1366px;
     color: #1f2429;
     font-size: 16px;
     background: rgba(255, 255, 255, 1);

+ 49 - 17
src/utils/plugins/components.js

@@ -2,33 +2,23 @@ var system = [
         {
             name: "供电系统",
             id: 1,
-            icon: require("@/assets/imgs/cdgd.svg"),
-            icon1: require("@/assets/imgs/cdgd2.svg"),
+            icon: "@/assets/imgs/cdgd.svg",
+            icon1: "@/assets/imgs/cdgd2.svg",
             children: [
                 {
                     label: "系统原理图",
                     children: [],
+                    id: "GDYL",
                 },
                 {
                     label: "变配电室内部设备清单",
                     children: [],
+                    id: "LDQD",
                 },
                 {
                     label: "楼层电井(间)控制商铺范围清单",
-                    children: [
-                        {
-                            label: "BA楼宇智能化",
-                            id: "GDQD1",
-                        },
-                        {
-                            label: "门禁管理(科松)",
-                            id: "GDQD2",
-                        },
-                        {
-                            label: "视频监控",
-                            id: "GDQD3",
-                        },
-                    ],
+                    id: "GDQD",
+                    children: [],
                 },
                 {
                     label: "维保事项",
@@ -72,6 +62,7 @@ var system = [
                 {
                     label: "查看图纸",
                     children: [],
+                    id: "GDTZ",
                 },
             ],
         },
@@ -114,6 +105,7 @@ var system = [
                             id: "NTQD2",
                         },
                     ],
+                    id: "NTQD",
                 },
                 {
                     label: "维保事项",
@@ -127,6 +119,7 @@ var system = [
                             id: "NTWB2",
                         },
                     ],
+                    id: "NTWB",
                 },
                 {
                     label: "维修事项",
@@ -140,6 +133,7 @@ var system = [
                             id: "NTWX2",
                         },
                     ],
+                    id: "NTWX",
                 },
                 {
                     label: "专维及其他事项",
@@ -153,10 +147,12 @@ var system = [
                             id: "NTZW2",
                         },
                     ],
+                    id: "NTZW",
                 },
                 {
                     label: "查看图纸",
                     children: [],
+                    id: "NTTZ",
                 },
             ],
         },
@@ -190,13 +186,16 @@ var system = [
                             id: "XFYL5",
                         },
                     ],
+                    id: "XFYL",
                 },
                 {
                     label: "主要设备清单",
                     children: [],
+                    id: "XFQD",
                 },
                 {
                     label: "维保事项",
+                    id: "XFWB",
                     children: [
                         {
                             label: "中控室/消防泵房内",
@@ -210,6 +209,7 @@ var system = [
                 },
                 {
                     label: "维修事项",
+                    id: "XFWX",
                     children: [
                         {
                             label: "中控室/消防泵房内",
@@ -223,6 +223,7 @@ var system = [
                 },
                 {
                     label: "专维及其他事项",
+                    id: "XFZW",
                     children: [
                         {
                             label: "专项维修",
@@ -237,12 +238,13 @@ var system = [
                 {
                     label: "查看图纸",
                     children: [],
+                    id: "XFTZ",
                 },
             ],
         },
         {
             name: "弱电系统",
-            id: 4,
+            id: "1004",
             icon: require("@/assets/imgs/cdrd.svg"),
             icon1: require("@/assets/imgs/cdrd2.svg"),
             children: [
@@ -262,26 +264,32 @@ var system = [
                             id: "RDYL3",
                         },
                     ],
+                    id: "RDYL",
                 },
                 {
                     label: "主要设备清单",
+                    id: "RDQD",
                     children: [
                         {
                             label: "BA楼宇智能化",
                             id: "RDQD1",
+                            param: { sblx: ["BA"] },
                         },
                         {
                             label: "门禁管理",
                             id: "RDQD2",
+                            param: { sblx: ["MJ"] },
                         },
                         {
                             label: "视频监控",
                             id: "RDQD3",
+                            param: { sblx: ["JK"] },
                         },
                     ],
                 },
                 {
                     label: "维保事项",
+                    id: "RDWB",
                     children: [
                         {
                             label: "慧云机房内",
@@ -295,6 +303,7 @@ var system = [
                 },
                 {
                     label: "维修事项",
+                    id: "RDWX",
                     children: [
                         {
                             label: "慧云机房内",
@@ -308,6 +317,7 @@ var system = [
                 },
                 {
                     label: "专维及其他事项",
+                    id: "RDZW",
                     children: [
                         {
                             label: "专项维修",
@@ -321,6 +331,7 @@ var system = [
                 },
                 {
                     label: "查看图纸",
+                    id: "RDTZ",
                     children: [],
                 },
             ],
@@ -333,6 +344,7 @@ var system = [
             children: [
                 {
                     label: "系统原理图",
+                    id: "GSYL",
                     children: [
                         {
                             label: "给水系统原理示意图",
@@ -346,10 +358,12 @@ var system = [
                 },
                 {
                     label: "主要设备清单",
+                    id: "GSQD",
                     children: [],
                 },
                 {
                     label: "维保事项",
+                    id: "GSWB",
                     children: [
                         {
                             label: "给水系统",
@@ -363,6 +377,7 @@ var system = [
                 },
                 {
                     label: "维修事项",
+                    id: "GSWX",
                     children: [
                         {
                             label: "给水系统",
@@ -376,6 +391,7 @@ var system = [
                 },
                 {
                     label: "专维及其他事项",
+                    id: "GSZW",
                     children: [
                         {
                             label: "给水系统专项维修",
@@ -393,6 +409,7 @@ var system = [
                 },
                 {
                     label: "查看图纸",
+                    id: "GSTZ",
                     children: [],
                 },
             ],
@@ -415,13 +432,16 @@ var system = [
                             id: "DTYL2",
                         },
                     ],
+                    id: "DTYL",
                 },
                 {
                     label: "主要设备清单",
+                    id: "DTQD",
                     children: [],
                 },
                 {
                     label: "维修及维保事项",
+                    id: "DTWX",
                     children: [
                         {
                             label: "维保事项",
@@ -435,6 +455,7 @@ var system = [
                 },
                 {
                     label: "专维及其他事项",
+                    id: "DTZW",
                     children: [
                         {
                             label: "专项维修",
@@ -448,6 +469,7 @@ var system = [
                 },
                 {
                     label: "查看图纸",
+                    id: "DTTZ",
                     children: [],
                 },
             ],
@@ -461,13 +483,16 @@ var system = [
                 {
                     label: "系统原理图",
                     children: [],
+                    id: "RQYL",
                 },
                 {
                     label: "主要设备清单",
                     children: [],
+                    id: "RQQD",
                 },
                 {
                     label: "维修及维保事项",
+                    id: "RQWX",
                     children: [
                         {
                             label: "维保事项",
@@ -481,6 +506,7 @@ var system = [
                 },
                 {
                     label: "专维及其他事项",
+                    id: "RQZW",
                     children: [
                         {
                             label: "专项维修",
@@ -494,6 +520,7 @@ var system = [
                 },
                 {
                     label: "查看图纸",
+                    id: "RQTZ",
                     children: [],
                 },
             ],
@@ -506,6 +533,7 @@ var system = [
             children: [
                 {
                     label: "建筑立面图",
+                    id: "TJLM",
                     children: [
                         {
                             label: "西面外立面",
@@ -523,10 +551,12 @@ var system = [
                 },
                 {
                     label: "主要材料清单",
+                    id: "TJQD",
                     children: [],
                 },
                 {
                     label: "维修及维保事项",
+                    id: "TJWX",
                     children: [
                         {
                             label: "维保事项",
@@ -540,6 +570,7 @@ var system = [
                 },
                 {
                     label: "专维及其他事项",
+                    id: "TJZW",
                     children: [
                         {
                             label: "专项维修",
@@ -553,6 +584,7 @@ var system = [
                 },
                 {
                     label: "查看图纸",
+                    id: "TJTZ",
                     children: [],
                 },
             ],

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

@@ -68,6 +68,7 @@ export default {
     }
     .el-dialog__body {
         padding: 0 24px;
+        height: 90%;
     }
     .el-tabs--bottom .el-tabs__item.is-bottom:nth-child(2),
     .el-tabs--bottom .el-tabs__item.is-top:nth-child(2),
@@ -93,7 +94,10 @@ export default {
         color: rgba(31, 36, 41, 1);
         border: 1px solid rgba(195, 199, 203, 1);
     }
-
+    .el-tabs,
+    .el-tabs__content {
+        height: 94%;
+    }
     .el-tabs__active-bar {
         background-color: transparent !important;
     }

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

@@ -29,7 +29,7 @@
             </div>
             <editList></editList>
         </div>
-        <eq-dialog ref='dialog' v-if='systemName' :systemName='systemName'></eq-dialog>
+        <eq-dialog ref='dialog' :systemName='systemName'></eq-dialog>
     </div>
 </template>
 
@@ -41,7 +41,6 @@ import bottomLayer from './bottomLayer'
 import editList from '@/components/edit.vue'
 import { system, floors } from '@/utils/plugins/components.js'
 import { getFloorList } from '@/api/public.js'
-import { queryEquipmentList } from '@/api/equipmentList.js'
 export default {
     data() {
         return {
@@ -70,17 +69,6 @@ export default {
         dialogVisible(eve) {
             this.$refs.dialog.showModal(eve)
             // this.dialogInfo = eve
-        },
-        getList() {
-            let getParams = {
-                page: 1,
-                size: 10,
-                orderBy: 1,
-                keyword: ''
-            }
-            queryEquipmentList({ getParams }).then(res => {
-                console.log(res)
-            })
         }
     },
     mounted() {
@@ -91,7 +79,6 @@ export default {
         })
         // this.$refs.dialog.init()
         // this.$refs.floorMap.init()
-        this.getList()
     }
 }
 </script>
@@ -105,6 +92,7 @@ export default {
         padding-top: 24px;
         position: fixed;
         z-index: 2;
+        min-width: 1300px;
         .eq-system {
             padding: 12px 23px;
             color: #1f2429;

+ 65 - 61
src/views/equipment/table/eqListTable.vue

@@ -1,90 +1,83 @@
 <!-- 设备清单的有select的表格 -->
 <template>
-    <div>
+    <div class='eq-list'>
         <div class='eq-list-top'>
             <Select width='146' tipPlace='top' caption='品牌:' :selectdata='dataSelect2' :placeholder='"请选择"'></Select>
             <Select width='120' tipPlace='top' caption='楼层:' :selectdata='dataSelect2' style='margin:0 12px'></Select>
             <Select width='224' tipPlace='top' caption='生产厂商:' :selectdata='dataSelect2' :placeholder='"请选择"'></Select>
-            <a-input-search placeholder style='width: 192px;margin-left:12px;height:32px;margin-top:2px;' @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>
+            <el-table-column prop='sbjbm' label='设备编号' width='160'></el-table-column>
+            <el-table-column prop='sl' label='数量'></el-table-column>
+            <el-table-column prop='brand' label='品牌'></el-table-column>
+            <el-table-column prop='sbxh' label='型号'></el-table-column>
+            <el-table-column prop='floor' label='楼层'></el-table-column>
+            <el-table-column prop='wzjc' label='安装位置' width='240'></el-table-column>
+            <el-table-column prop='manufacturer' label='生产厂商'></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>
-        <a-table size='small' style='margin-top:12px' :columns='columns' :pagination='{ pageSize: pageSize }' :data-source='data'></a-table>
     </div>
 </template>
 <script>
 import Select from '@/components/Select/Select.vue'
+import { queryEquipmentList } from '@/api/equipmentList.js'
 export default {
     components: { Select },
     data() {
         return {
-            columns: [
-                {
-                    title: '序号',
-                    dataIndex: 'index',
-                    key: 'index'
-                },
-                {
-                    title: '设备编号',
-                    dataIndex: 'eqLocalId',
-                    key: 'eqLocalId'
-                },
-                {
-                    title: '数量',
-                    dataIndex: 'count',
-                    key: 'count'
-                },
-                {
-                    title: '品牌',
-                    dataIndex: 'brand',
-                    key: 'brand'
-                },
-                {
-                    title: '型号',
-                    dataIndex: 'size',
-                    key: 'size'
-                },
-                {
-                    title: '楼层',
-                    dataIndex: 'floorName',
-                    key: 'floorName'
-                },
-                {
-                    title: '安装位置',
-                    dataIndex: 'location',
-                    key: 'location'
-                },
-                {
-                    title: '生产厂商',
-                    dataIndex: 'people',
-                    key: 'people'
-                }
-            ],
             pageSize: 10,
-            data: [
-                { size: '11' },
-                { size: '11' },
-                { size: '11' },
-                { size: '11' },
-                { size: '11' },
-                { size: '11' },
-                { size: '11' },
-                { size: '11' },
-                { size: '11' },
-                { size: '11' },
-                { size: '11' }
-            ],
             dataSelect2: [
                 { id: 'test1', name: '选择项' },
                 { id: 'test2', name: '单平米' },
                 { id: 'test3', name: '下级分项' },
                 { id: 'test4', name: '滑动平均滑动平均' }
-            ]
+            ],
+            tableData: [],
+            total: 0,
+            currentPage: 1,
+            size: 10
         }
     },
+    props: [],
     methods: {
         handleChange() {},
-        onSearch() {}
+        onSearch() {},
+        pageChanged(page, size) {
+            this.currentPage = page
+            this.size = size
+            this.getList()
+        },
+        getList() {
+            let getParams = {
+                page: this.currentPage,
+                size: this.size,
+                major: '弱电',
+                system: 'MJ'
+                // orderBy: 1,
+                // keyword: ''
+            }
+            queryEquipmentList({ getParams }).then(res => {
+                console.log(res)
+                this.tableData = res.data
+                this.total = res.count
+            })
+        }
     },
-    mounted() {}
+    mounted() {
+        this.getList()
+    }
 }
 </script>
 <style lang="less" scoped>
@@ -92,5 +85,16 @@ export default {
     .eq-list-top {
         display: flex;
     }
+    .foot {
+        position: absolute;
+        height: 32px;
+        right: 26px;
+        bottom: 20px;
+    }
+    td {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
 }
 </style>

+ 94 - 0
src/views/equipment/table/tjTable.vue

@@ -0,0 +1,94 @@
+<!-- 设备清单的有select的表格 -->
+<template>
+    <div class='tj-list'>
+        <div class='eq-list-top'>
+            <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>
+            <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>
+        <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: [],
+    methods: {
+        handleChange() {},
+        onSearch() {},
+        pageChanged(page, size) {
+            this.currentPage = page
+            this.size = size
+            this.getList()
+        },
+        getList() {
+            let getParams = {
+                page: this.currentPage,
+                size: this.size,
+                major: '弱电',
+                system: 'MJ'
+                // orderBy: 1,
+                // keyword: ''
+            }
+            queryEquipmentList({ getParams }).then(res => {
+                console.log(res)
+                this.tableData = res.data
+                this.total = res.count
+            })
+        }
+    },
+    mounted() {
+        this.getList()
+    }
+}
+</script>
+<style lang="less" scoped>
+.tj-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>

+ 60 - 24
src/views/legendLibrary/addForm.vue

@@ -16,7 +16,12 @@
                     <el-option v-for='item in options' :key='item.value' :label='item.label' :value='item.value'></el-option>
                 </el-select>
             </div>
-            <div class='input-right' v-if='ruleForm.type==1 || ruleForm.type==3'></div>
+            <div class='input-right' v-if='ruleForm.type==1 || ruleForm.type==3'>
+                <div
+                    class='model'
+                    :style='`background:${ruleForm.color};border-width:${ruleForm.borderLine}px;border-style:${ruleForm.borderColor}; border-color:${ruleForm.borderColor};`'
+                ></div>
+            </div>
         </div>
         <div v-if='ruleForm.type==1' class='form3'>
             <div class='form3-top'>
@@ -29,14 +34,21 @@
                 <el-color-picker v-model='ruleForm.color' show-alpha style='margin:0 172px 0 10px'></el-color-picker>
                 <el-color-picker v-model='ruleForm.borderColor' show-alpha style='margin:0 90px 0 10px'></el-color-picker>
 
-                <el-select v-model='ruleForm.borderLine' placeholder='请选择' size='small' style='width:120px;margin-right:24px'>
-                    <el-option v-for='item in borderLineOption' :key='item.value' :value='item.value'>
-                        <img :src='item.label' alt />
+                <el-select
+                    v-model='ruleForm.borderLine'
+                    placeholder='请选择'
+                    size='small'
+                    style='width:160px;margin-right:24px'
+                    ref='select1'
+                    @change='changeSelection1'
+                >
+                    <el-option v-for='item in borderLineOption' :key='item.id' :label='item.src' :value='item.id'>
+                        <img :src='item.src' alt />
                     </el-option>
                 </el-select>
-                <el-select v-model='ruleForm.linepx' placeholder='请选择' size='small' style='width:120px;'>
-                    <el-option v-for='item in linepxOption' :key='item.value' :label='item.label' :value='item.value'>
-                        <img :src='item.label' alt />
+                <el-select v-model='ruleForm.linepx' placeholder='请选择' size='small' style='width:160px;' ref='select' @change='changeSelection'>
+                    <el-option v-for='item in linepxOption' :key='item.id' :label='item.src' :value='item.id'>
+                        <img :src='item.src' alt />
                     </el-option>
                 </el-select>
             </div>
@@ -77,8 +89,8 @@ export default {
             ruleForm: {
                 color: 'rgba(19, 206, 102, 0.8)',
                 borderColor: 'rgba(19, 206, 102, 0.8)',
-                borderLine: '_____________',
-                linepx: '________________',
+                borderLine: '',
+                linepx: '',
                 code: '',
                 name: '',
                 type: '2',
@@ -100,37 +112,54 @@ export default {
             ],
             borderLineOption: [
                 {
-                    value: '1',
-                    label: require('@/assets/imgs/solidLine.jpg')
+                    id: 'solid',
+                    src: require('@/assets/imgs/1pxline.jpg')
                 },
                 {
-                    value: '2',
-                    label: require('@/assets/imgs/dashedLine.jpg')
+                    id: 'dashed',
+                    src: require('@/assets/imgs/dashedLine.jpg')
                 },
                 {
-                    value: '3',
-                    label: require('@/assets/imgs/dotLine.jpg')
+                    id: 'dotted',
+                    src: require('@/assets/imgs/dotLine.jpg')
                 }
             ],
             linepxOption: [
                 {
-                    value: '1',
-                    label: require('@/assets/imgs/1pxline.jpg')
+                    id: '1',
+                    src: require('@/assets/imgs/1pxline.jpg')
                 },
                 {
-                    value: '2',
-                    label: require('@/assets/imgs/2pxline.jpg')
+                    id: '2',
+                    src: require('@/assets/imgs/2pxline.jpg')
                 },
                 {
-                    value: '3',
-                    label: require('@/assets/imgs/3pxline.jpg')
+                    id: '3',
+                    src: require('@/assets/imgs/3pxline.jpg')
                 }
             ],
             fileList: [],
             value: ''
         }
     },
-    methods: {}
+    methods: {
+        changeSelection() {
+            console.log(this.ruleForm.linepx)
+            let path = this.$refs.select.selectedLabel
+            this.$refs.select.$el.children[0].children[0].setAttribute(
+                'style',
+                'background:url(' + path + ') center center no-repeat;color:transparent;'
+            )
+        },
+        changeSelection1() {
+            console.log(this.ruleForm.borderLine)
+            let path = this.$refs.select1.selectedLabel
+            this.$refs.select1.$el.children[0].children[0].setAttribute(
+                'style',
+                'background:url(' + path + ')  center center no-repeat;color:transparent;'
+            )
+        }
+    }
 }
 </script>
 
@@ -171,6 +200,13 @@ export default {
             background: rgba(245, 246, 247, 1);
             display: inline-block;
             margin-left: 18px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            .model {
+                width: 56px;
+                height: 6px;
+            }
         }
     }
     .form3 {
@@ -188,10 +224,10 @@ export default {
                 margin-right: 78px;
             }
             .form3-span3 {
-                margin-right: 88px;
+                margin-right: 64px;
             }
             .form3-span4 {
-                margin-right: 88px;
+                margin-right: 130px;
             }
         }
         .form3-bottom {

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

@@ -158,6 +158,9 @@ export default {
         .select-box {
             height: 56px;
             line-height: 56px;
+            min-width: 1366px;
+            display: flex;
+            align-items: center;
         }
     }
 }