zhulizhen1111 4 年 前
コミット
4c6b6adf2d

ファイルの差分が大きいため隠しています
+ 11356 - 0
package-lock.json


+ 59 - 0
src/components/edit.vue

@@ -0,0 +1,59 @@
+<template>
+    <div class='edit_map'>
+        <span class='edit-icon'>
+            <a-icon type='edit' style='color:#fff' />
+        </span>
+        <div class='hover-div'>
+            <a-popover placement='left'>
+                <template slot='content'>编辑图例</template>
+                <a-button type='primary'>
+                    <a-icon type='form' />
+                </a-button>
+            </a-popover>
+            <a-popover placement='left'>
+                <template slot='content'>修改</template>
+                <a-button type='primary'>
+                    <a-icon type='form' />
+                </a-button>
+            </a-popover>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    components: {},
+    data() {
+        return {}
+    },
+    methods: {},
+    mounted() {}
+}
+</script>
+<style lang="less" scoped>
+.edit_map {
+    position: fixed;
+    bottom: 28px;
+    right: 28px;
+    z-index: 2;
+    width: 48px;
+    height: 48px;
+    background: linear-gradient(180deg, rgba(54, 156, 247, 1) 0%, rgba(2, 91, 170, 1) 100%);
+    box-shadow: 0px 2px 8px 0px rgba(31, 36, 41, 0.2);
+    border-radius: 50%;
+    text-align: center;
+    line-height: 48px;
+    display: inline-block;
+    cursor: pointer;
+    .edit-icon {
+        &:hover + .hover-div {
+            display: block;
+        }
+    }
+    .hover-div {
+        position: absolute;
+        bottom: 58px;
+        right: 28px;
+        display: none;
+    }
+}
+</style>

+ 117 - 34
src/components/floorList.vue

@@ -1,20 +1,24 @@
 <template>
     <div class='floor-box'>
-        <a-icon class='box-style' type='check-square' @click='showLegend' />
+        <span class='box-style1' @click='showLegend'>图例</span>
         <div class='floor-list'>
-            <a-icon class='i-style' v-if='showTopButton' type='caret-up' @click='removeTop' />
-            <a-icon class='i-style' v-if='!showTopButton' type='caret-up' style='color:#ccc' />
-            <span
-                class='eq-floor'
-                v-for='(item,index) in floors'
-                :class='item.id==floorId?"isActive":""'
-                :key='index'
-                @click='tabFloor(item)'
-            >{{item.floorName}}</span>
-            <a-icon class='i-style' v-if='showBottomButton' type='caret-down' @click='removeBottom' />
-            <a-icon class='i-style' v-if='!showBottomButton' type='caret-down' style='color:#ccc' />
+            <a-icon class='i-style1' v-if='showTopButton' type='caret-up' @click='removeTop' />
+            <a-icon class='i-style1' v-if='!showTopButton' type='caret-up' style='color:#ccc' />
+            <span class='floors'>
+                <span class='font-group'>
+                    <span
+                        class='eq-floor'
+                        v-for='(item,index) in floors'
+                        :class='item.id==floorId?"isActive":""'
+                        :key='index'
+                        @click='tabFloor(item)'
+                    >{{item.floorName}}</span>
+                </span>
+            </span>
+            <a-icon class='i-style2' v-if='showBottomButton' type='caret-down' @click='removeBottom' />
+            <a-icon class='i-style2' v-if='!showBottomButton' type='caret-down' style='color:#ccc' />
         </div>
-        <a-icon class='box-style' type='unordered-list' @click='showPic' />
+        <a-icon class='box-style2' type='unordered-list' @click='showPic' />
         <legendBox ref='legend'></legendBox>
     </div>
 </template>
@@ -38,13 +42,30 @@ export default {
     components: { legendBox },
     methods: {
         tabFloor(item) {
+            this.showTopButton = true
+            this.showBottomButton = true
             this.floorId = item.id
             this.floorName = item.floorName
             this.$emit('emitFloor', item)
+            let tempFloorIdList = []
+            this.floors.map(el => {
+                tempFloorIdList.push(el.id)
+            })
+            tempFloorIdList.forEach((el, index) => {
+                if (item.id == el) {
+                    if (index == 0) {
+                        this.showTopButton = false
+                    }
+                    if (index == this.floors.length - 1) {
+                        this.showBottomButton = false
+                    }
+                }
+            })
         },
         removeTop() {
             let tempFloorIdList = []
             let tempFloorIndex = 0
+            let clickCount = 0
             this.floors.map(el => {
                 tempFloorIdList.push(el.id)
             })
@@ -56,6 +77,9 @@ export default {
                     }
                     if (tempFloorIndex != 0) {
                         tempFloorIndex--
+                        clickCount += 1
+                        let fontGroup = document.querySelector('.font-group')
+                        fontGroup.style.top = 254 - clickCount * 40 + 'px'
                         this.showBottomButton = true
                     }
                     console.log(tempFloorIndex)
@@ -66,6 +90,7 @@ export default {
         removeBottom() {
             let tempFloorIdList = []
             let tempFloorIndex = 0
+            let clickCount = 0
             this.floors.map(el => {
                 tempFloorIdList.push(el.id)
             })
@@ -78,17 +103,21 @@ export default {
                     }
                     if (tempFloorIndex != tempFloorIdList.length - 1) {
                         tempFloorIndex++
+                        clickCount += 1
+                        let fontGroup = document.querySelector('.font-group')
+                        fontGroup.style.top += clickCount * 40 + 'px'
                         this.showTopButton = true
                     }
                 }
             })
             this.floorId = tempFloorIdList[tempFloorIndex]
-            console.log(this.floorId)
         },
         showLegend() {
             this.$refs.legend.open()
         },
-        showPic() {}
+        showPic() {
+            this.$refs.legend.openPic()
+        }
     }
 }
 </script>
@@ -98,37 +127,90 @@ export default {
     position: fixed;
     top: 154px;
     right: 32px;
-    z-index: 2;
+
     .floor-list {
+        position: fixed;
+        right: 32px;
+        top: 208px;
         width: 40px;
         background: #ffffff;
         text-align: center;
-        .eq-floor {
-            width: 28px;
-            height: 28px;
-            line-height: 28px;
+        .floors {
+            position: fixed;
+            right: 32px;
+            top: 234px;
+            width: 40px;
+            height: 140px;
+            background: #ffffff;
             text-align: center;
-            background: #fff;
-            display: block;
-            cursor: pointer;
-            font-size: 14px;
-            margin-left: 6px;
-            border-radius: 4px;
+            overflow: hidden;
+            display: flex;
+            flex-direction: column;
+            .font-group {
+                position: fixed;
+                right: 36px;
+                top: 234px;
+                width: 36px;
+                background: #ffffff;
+                text-align: center;
+                display: flex;
+                flex-direction: column;
+                .eq-floor {
+                    width: 36px;
+                    height: 28px;
+                    line-height: 28px;
+                    text-align: center;
+                    background: #fff;
+                    display: block;
+                    cursor: pointer;
+                    font-size: 14px;
+                    margin-left: 2px;
+                    border-radius: 4px;
+                }
+                .isActive {
+                    color: #025baa;
+                    background: #e1f2ff;
+                }
+            }
         }
-        .isActive {
-            color: #025baa;
-            background: #e1f2ff;
+        .i-style1 {
+            right: 32px;
+            position: fixed;
+            top: 210px;
+            width: 40px;
+            height: 28px;
+            background: #fff;
+            text-align: center;
+            line-height: 28px;
         }
-        .i-style {
+        .i-style2 {
+            right: 32px;
+            position: fixed;
+            top: 374px;
             width: 40px;
-            height: 32px;
+            height: 28px;
             background: #fff;
             text-align: center;
-            line-height: 32px;
+            line-height: 28px;
         }
     }
-
-    .box-style {
+    .box-style1 {
+        position: fixed;
+        cursor: pointer;
+        right: 32px;
+        width: 40px;
+        height: 40px;
+        background: #fff;
+        display: block;
+        line-height: 40px;
+        text-align: center;
+        margin: 8px 0;
+        color: #025baa;
+    }
+    .box-style2 {
+        position: fixed;
+        top: 400px;
+        right: 32px;
         width: 40px;
         height: 40px;
         background: #fff;
@@ -137,6 +219,7 @@ export default {
         text-align: center;
         margin: 8px 0;
         color: #025baa;
+        cursor: pointer;
     }
 }
 </style>

+ 2 - 1
src/components/menuList.vue

@@ -98,7 +98,8 @@ export default {
         .is-active {
             // background: url('../assets/images/topbar2.png') no-repeat;
             color: #025baa;
-            background: linear-gradient(180deg, rgba(2, 91, 170, 1) 0%, rgba(2, 91, 170, 0) 100%);
+            font-weight: bolder;
+            background: linear-gradient(180deg, rgba(2, 91, 170, 0) 0%, rgba(2, 91, 170, 0.2) 100%);
         }
     }
     .home-right {

+ 42 - 9
src/views/equipment/eqDialog.vue

@@ -1,15 +1,29 @@
 <template>
-    <a-modal v-model='visible' :footer='null' :title='`${systemName}-${dialogInfo.label}`' @ok='handleOk' :maskClosable='false' width='100%'>
-        <a-radio-group v-model='mode'>
-            <a-radio-button v-for='(value,index) in dialogInfo.children' :key='"u"+index' :value='value.label'>{{value.label}}</a-radio-button>
-        </a-radio-group>
-        <a-tabs @prevClick='callback' @nextClick='callback'>
-            <img src='@/assets/imgs/eq.jpg' />
+    <a-modal
+        class='modal'
+        v-model='visible'
+        :footer='null'
+        :title='`${systemName}-${dialogInfo.label}`'
+        @ok='handleOk'
+        :maskClosable='false'
+        width='100%'
+    >
+        <a-tabs
+            v-if='Object.keys(dialogInfo).length>0 && dialogInfo.children.length>0'
+            :default-active-key='dialogInfo.children[0].id'
+            size='small'
+            @change='fn'
+        >
+            <a-tab-pane v-for='(value,index) in dialogInfo.children' :key='"u"+index' :tab='`${value.label}`'>
+                <img v-if='value.id.slice(2,4)=="YL"' src='@/assets/imgs/eq.jpg' />
+                <tableList v-else></tableList>
+            </a-tab-pane>
         </a-tabs>
     </a-modal>
 </template>
 
 <script>
+import tableList from './table/eqListTable'
 export default {
     data() {
         return {
@@ -18,6 +32,7 @@ export default {
         }
     },
     props: ['dialogInfo', 'systemName'],
+    components: { tableList },
     methods: {
         showModal() {
             this.visible = true
@@ -26,12 +41,30 @@ export default {
             console.log(e)
             this.visible = false
         },
-        callback(val) {
-            console.log(val)
+        fn(key) {
+            console.log(key)
         }
     }
 }
 </script>
 
-<style>
+<style lang='less'>
+.modal {
+    .ant-tabs-bar {
+        border: none;
+    }
+    .ant-tabs-tab {
+        text-align: center;
+        background: rgba(255, 255, 255, 1);
+        border-radius: 0px 4px 4px 0px;
+        border: 1px solid rgba(217, 217, 217, 1);
+        font-size: 14px;
+        color: #1f2429;
+        margin: 0;
+        padding: 5px 15px !important;
+    }
+    .ant-select {
+        margin-right: 12px;
+    }
+}
 </style>

+ 143 - 91
src/views/equipment/index.vue

@@ -28,9 +28,9 @@
                         <bottomLayer></bottomLayer>
                     </div>
                     <floor-list :floors='floors' @emitFloor='emitFloor'></floor-list>
-                    <div class='edit-box'></div>
                 </div>
             </div>
+            <editList></editList>
         </div>
         <eq-dialog ref='dialog' :systemName='systemName' :dialogInfo='dialogInfo'></eq-dialog>
     </div>
@@ -41,6 +41,7 @@ import floorList from '@/components/floorList.vue'
 import floorMap from '@/components/floorMap/index.vue'
 import eqDialog from './eqDialog'
 import bottomLayer from './bottomLayer'
+import editList from '@/components/edit.vue'
 export default {
     data() {
         return {
@@ -61,13 +62,16 @@ export default {
                             label: '楼层电井(间)控制商铺范围清单',
                             children: [
                                 {
-                                    label: 'BA楼宇智能化'
+                                    label: 'BA楼宇智能化',
+                                    id: 'GDQD1'
                                 },
                                 {
-                                    label: '门禁管理(科松)'
+                                    label: '门禁管理(科松)',
+                                    id: 'GDQD2'
                                 },
                                 {
-                                    label: '视频监控'
+                                    label: '视频监控',
+                                    id: 'GDQD3'
                                 }
                             ]
                         },
@@ -75,10 +79,12 @@ export default {
                             label: '维保事项',
                             children: [
                                 {
-                                    label: '中控室/消防泵房内'
+                                    label: '配电室内',
+                                    id: 'GDWB1'
                                 },
                                 {
-                                    label: '中控室/消防泵房外'
+                                    label: '配电室外',
+                                    id: 'GDWB2'
                                 }
                             ]
                         },
@@ -86,10 +92,12 @@ export default {
                             label: '维修事项',
                             children: [
                                 {
-                                    label: '中控室/消防泵房内'
+                                    label: '配电室内',
+                                    id: 'GDWX1'
                                 },
                                 {
-                                    label: '中控室/消防泵房外'
+                                    label: '配电室外',
+                                    id: 'GDWX2'
                                 }
                             ]
                         },
@@ -97,13 +105,12 @@ export default {
                             label: '专维及其他事项',
                             children: [
                                 {
-                                    label: '给水系统专项维修'
+                                    label: '专项维修',
+                                    id: 'GDZW1'
                                 },
                                 {
-                                    label: '排水系统专项维修'
-                                },
-                                {
-                                    label: '其他事项'
+                                    label: '其他事项',
+                                    id: 'GDZW2'
                                 }
                             ]
                         },
@@ -121,16 +128,20 @@ export default {
                             label: '系统原理图',
                             children: [
                                 {
-                                    label: '空调系统原理图'
+                                    label: '空调系统原理图',
+                                    id: 'NTYL1'
                                 },
                                 {
-                                    label: '超市空调系统原理图'
+                                    label: '超市空调系统原理图',
+                                    id: 'NTYL2'
                                 },
                                 {
-                                    label: '分水器支路分布明细'
+                                    label: '分水器支路分布明细',
+                                    id: 'NTYL3'
                                 },
                                 {
-                                    label: '分水器支路分布图'
+                                    label: '分水器支路分布图',
+                                    id: 'NTYL4'
                                 }
                             ]
                         },
@@ -138,10 +149,12 @@ export default {
                             label: '主要设备清单',
                             children: [
                                 {
-                                    label: '冷热源机房内'
+                                    label: '冷热源机房内',
+                                    id: 'NTQD1'
                                 },
                                 {
-                                    label: '楼层末端'
+                                    label: '楼层末端',
+                                    id: 'NTQD2'
                                 }
                             ]
                         },
@@ -149,10 +162,12 @@ export default {
                             label: '维保事项',
                             children: [
                                 {
-                                    label: '中控室/消防泵房内'
+                                    label: '冷源机房内',
+                                    id: 'NTWB1'
                                 },
                                 {
-                                    label: '中控室/消防泵房外'
+                                    label: '冷源机房外',
+                                    id: 'NTWB2'
                                 }
                             ]
                         },
@@ -160,10 +175,12 @@ export default {
                             label: '维修事项',
                             children: [
                                 {
-                                    label: '中控室/消防泵房内'
+                                    label: '冷源机房内',
+                                    id: 'NTWX1'
                                 },
                                 {
-                                    label: '中控室/消防泵房外'
+                                    label: '冷源机房外',
+                                    id: 'NTWX2'
                                 }
                             ]
                         },
@@ -171,13 +188,12 @@ export default {
                             label: '专维及其他事项',
                             children: [
                                 {
-                                    label: '给水系统专项维修'
+                                    label: '专项维修',
+                                    id: 'NTZW1'
                                 },
                                 {
-                                    label: '排水系统专项维修'
-                                },
-                                {
-                                    label: '其他事项'
+                                    label: '其他事项',
+                                    id: 'NTZW2'
                                 }
                             ]
                         },
@@ -195,19 +211,24 @@ export default {
                             label: '系统原理图',
                             children: [
                                 {
-                                    label: '消防电系统原理示意图'
+                                    label: '消防电系统原理示意图',
+                                    id: 'XFYL1'
                                 },
                                 {
-                                    label: '消防喷淋系统示意图'
+                                    label: '消防喷淋系统示意图',
+                                    id: 'XFYL2'
                                 },
                                 {
-                                    label: '消防窗喷系统示意图'
+                                    label: '消防窗喷系统示意图',
+                                    id: 'XFYL3'
                                 },
                                 {
-                                    label: '消防栓系统示意图'
+                                    label: '消防栓系统示意图',
+                                    id: 'XFYL4'
                                 },
                                 {
-                                    label: '消防泵房引出管路分布图'
+                                    label: '消防泵房引出管路分布图',
+                                    id: 'XFYL5'
                                 }
                             ]
                         },
@@ -219,10 +240,12 @@ export default {
                             label: '维保事项',
                             children: [
                                 {
-                                    label: '中控室/消防泵房内'
+                                    label: '中控室/消防泵房内',
+                                    id: 'XFWB1'
                                 },
                                 {
-                                    label: '中控室/消防泵房外'
+                                    label: '中控室/消防泵房外',
+                                    id: 'XFWB2'
                                 }
                             ]
                         },
@@ -230,10 +253,12 @@ export default {
                             label: '维修事项',
                             children: [
                                 {
-                                    label: '中控室/消防泵房内'
+                                    label: '中控室/消防泵房内',
+                                    id: 'XFWX1'
                                 },
                                 {
-                                    label: '中控室/消防泵房外'
+                                    label: '中控室/消防泵房外',
+                                    id: 'XFWX2'
                                 }
                             ]
                         },
@@ -241,13 +266,12 @@ export default {
                             label: '专维及其他事项',
                             children: [
                                 {
-                                    label: '给水系统专项维修'
+                                    label: '专项维修',
+                                    id: 'XFZW1'
                                 },
                                 {
-                                    label: '排水系统专项维修'
-                                },
-                                {
-                                    label: '其他事项'
+                                    label: '其他事项',
+                                    id: 'XFZW2'
                                 }
                             ]
                         },
@@ -265,13 +289,16 @@ export default {
                             label: '系统原理图',
                             children: [
                                 {
-                                    label: '视频监控系统原理图'
+                                    label: '视频监控系统原理图',
+                                    id: 'RDYL1'
                                 },
                                 {
-                                    label: '门禁管理系统原理图'
+                                    label: '门禁管理系统原理图',
+                                    id: 'RDYL2'
                                 },
                                 {
-                                    label: 'BA楼宇智能化系统原理图'
+                                    label: 'BA楼宇智能化系统原理图',
+                                    id: 'RDYL3'
                                 }
                             ]
                         },
@@ -279,13 +306,16 @@ export default {
                             label: '主要设备清单',
                             children: [
                                 {
-                                    label: 'BA楼宇智能化'
+                                    label: 'BA楼宇智能化',
+                                    id: 'RDQD1'
                                 },
                                 {
-                                    label: '门禁管理'
+                                    label: '门禁管理',
+                                    id: 'RDQD2'
                                 },
                                 {
-                                    label: '视频监控'
+                                    label: '视频监控',
+                                    id: 'RDQD3'
                                 }
                             ]
                         },
@@ -293,10 +323,12 @@ export default {
                             label: '维保事项',
                             children: [
                                 {
-                                    label: '中控室/消防泵房内'
+                                    label: '慧云机房内',
+                                    id: 'RDWB1'
                                 },
                                 {
-                                    label: '中控室/消防泵房外'
+                                    label: '慧云机房外',
+                                    id: 'RDWB2'
                                 }
                             ]
                         },
@@ -304,10 +336,12 @@ export default {
                             label: '维修事项',
                             children: [
                                 {
-                                    label: '中控室/消防泵房内'
+                                    label: '慧云机房内',
+                                    id: 'RDWX1'
                                 },
                                 {
-                                    label: '中控室/消防泵房外'
+                                    label: '慧云机房外',
+                                    id: 'RDWX2'
                                 }
                             ]
                         },
@@ -315,13 +349,12 @@ export default {
                             label: '专维及其他事项',
                             children: [
                                 {
-                                    label: '给水系统专项维修'
-                                },
-                                {
-                                    label: '排水系统专项维修'
+                                    label: '专项维修',
+                                    id: 'RDZW1'
                                 },
                                 {
-                                    label: '其他事项'
+                                    label: '其他事项',
+                                    id: 'RDZW2'
                                 }
                             ]
                         },
@@ -339,10 +372,12 @@ export default {
                             label: '系统原理图',
                             children: [
                                 {
-                                    label: '给水系统原理示意图'
+                                    label: '给水系统原理示意图',
+                                    id: 'GSYL1'
                                 },
                                 {
-                                    label: '排水系统原理示意图'
+                                    label: '排水系统原理示意图',
+                                    id: 'GSYL2'
                                 }
                             ]
                         },
@@ -354,10 +389,12 @@ export default {
                             label: '维保事项',
                             children: [
                                 {
-                                    label: '中控室/消防泵房内'
+                                    label: '给水系统',
+                                    id: 'GSQD1'
                                 },
                                 {
-                                    label: '中控室/消防泵房外'
+                                    label: '排水系统',
+                                    id: 'GSQD2'
                                 }
                             ]
                         },
@@ -365,10 +402,12 @@ export default {
                             label: '维修事项',
                             children: [
                                 {
-                                    label: '中控室/消防泵房内'
+                                    label: '给水系统',
+                                    id: 'GSWX1'
                                 },
                                 {
-                                    label: '中控室/消防泵房外'
+                                    label: '排水系统',
+                                    id: 'GSWX2'
                                 }
                             ]
                         },
@@ -376,13 +415,16 @@ export default {
                             label: '专维及其他事项',
                             children: [
                                 {
-                                    label: '给水系统专项维修'
+                                    label: '给水系统专项维修',
+                                    id: 'GSZW1'
                                 },
                                 {
-                                    label: '排水系统专项维修'
+                                    label: '排水系统专项维修',
+                                    id: 'GSZW2'
                                 },
                                 {
-                                    label: '其他事项'
+                                    label: '其他事项',
+                                    id: 'GSZW3'
                                 }
                             ]
                         },
@@ -400,10 +442,12 @@ export default {
                             label: '系统原理图',
                             children: [
                                 {
-                                    label: '扶梯原理图'
+                                    label: '扶梯原理图',
+                                    id: 'DTYL1'
                                 },
                                 {
-                                    label: '直梯原理图'
+                                    label: '直梯原理图',
+                                    id: 'DTYL2'
                                 }
                             ]
                         },
@@ -415,10 +459,12 @@ export default {
                             label: '维修及维保事项',
                             children: [
                                 {
-                                    label: '中控室/消防泵房内'
+                                    label: '维保事项',
+                                    id: 'DTWX1'
                                 },
                                 {
-                                    label: '中控室/消防泵房外'
+                                    label: '维修事项',
+                                    id: 'DTWX2'
                                 }
                             ]
                         },
@@ -426,13 +472,12 @@ export default {
                             label: '专维及其他事项',
                             children: [
                                 {
-                                    label: '给水系统专项维修'
-                                },
-                                {
-                                    label: '排水系统专项维修'
+                                    label: '专项维修',
+                                    id: 'DTZW1'
                                 },
                                 {
-                                    label: '其他事项'
+                                    label: '其他事项',
+                                    id: 'DTZW2'
                                 }
                             ]
                         },
@@ -447,7 +492,8 @@ export default {
                     id: 7,
                     children: [
                         {
-                            label: '系统原理图'
+                            label: '系统原理图',
+                            children: []
                         },
                         {
                             label: '主要设备清单',
@@ -457,10 +503,12 @@ export default {
                             label: '维修及维保事项',
                             children: [
                                 {
-                                    label: '中控室/消防泵房内'
+                                    label: '维保事项',
+                                    id: 'RQWX1'
                                 },
                                 {
-                                    label: '中控室/消防泵房外'
+                                    label: '维修事项',
+                                    id: 'RQWX2'
                                 }
                             ]
                         },
@@ -468,13 +516,12 @@ export default {
                             label: '专维及其他事项',
                             children: [
                                 {
-                                    label: '给水系统专项维修'
-                                },
-                                {
-                                    label: '排水系统专项维修'
+                                    label: '专项维修',
+                                    id: 'RQZW1'
                                 },
                                 {
-                                    label: '其他事项'
+                                    label: '其他事项',
+                                    id: 'RQZW2'
                                 }
                             ]
                         },
@@ -513,10 +560,12 @@ export default {
                             label: '维修及维保事项',
                             children: [
                                 {
-                                    label: '中控室/消防泵房内'
+                                    label: '维保事项',
+                                    id: 'TJWB1'
                                 },
                                 {
-                                    label: '中控室/消防泵房外'
+                                    label: '维修事项',
+                                    id: 'TJWB2'
                                 }
                             ]
                         },
@@ -524,13 +573,12 @@ export default {
                             label: '专维及其他事项',
                             children: [
                                 {
-                                    label: '给水系统专项维修'
+                                    label: '专项维修',
+                                    id: 'TJZW1'
                                 },
                                 {
-                                    label: '排水系统专项维修'
-                                },
-                                {
-                                    label: '其他事项'
+                                    label: '其他事项',
+                                    id: 'TJZW2'
                                 }
                             ]
                         },
@@ -544,6 +592,10 @@ export default {
             everySystem: [],
             floors: [
                 {
+                    floorName: 'F4',
+                    id: 'f4'
+                },
+                {
                     floorName: 'F3',
                     id: 'f3'
                 },
@@ -573,7 +625,7 @@ export default {
             dialogInfo: {}
         }
     },
-    components: { floorList, eqDialog, floorMap, bottomLayer },
+    components: { floorList, eqDialog, floorMap, bottomLayer, editList },
     methods: {
         tabSyatem(item) {
             this.systemId = item.id

+ 69 - 41
src/views/equipment/legendBox.vue

@@ -1,13 +1,18 @@
 <template>
-    <div class='legend-box' v-if='isShow'>
-        <a-table :columns='columns' :data-source='data' :row-selection='rowSelection' :pagination='false' size='small' />
-        <div class='switch-btn'>
-            <a-switch @change='changeSwitch' size='small' />&nbsp;&nbsp;隐藏数量为0的项目
+    <div class='box'>
+        <div class='legend-box' v-if='isShow'>
+            <a-table :columns='columns' :data-source='data' :row-selection='rowSelection' :pagination='false' size='small' />
+            <div class='switch-btn'>
+                <a-switch @change='changeSwitch' size='small' />&nbsp;&nbsp;隐藏数量为0的项目
+            </div>
+            <div class='remark'>
+                注:1.主要设备房包括:制冷机房、生活水泵房、消防泵房
+                <p>2.图例后 的数字,代表此位置的数量</p>
+                <p>&nbsp;&nbsp;&nbsp;&nbsp;3.B2-1至B2-8为防火分区编号</p>
+            </div>
         </div>
-        <div class='remark'>
-            注:1.主要设备房包括:制冷机房、生活水泵房、消防泵房
-            <p>2.图例后 的数字,代表此位置的数量</p>
-            <p>&nbsp;&nbsp;&nbsp;&nbsp;3.B2-1至B2-8为防火分区编号</p>
+        <div v-if='!isShow && showPic' class='pic-box'>
+            <img src='@/assets/imgs/eq.jpg' alt />
         </div>
     </div>
 </template>
@@ -17,6 +22,7 @@ export default {
     data() {
         return {
             isShow: false,
+            showPic: false,
             columns: [
                 {
                     title: '项目',
@@ -114,12 +120,16 @@ export default {
             }
         }
     },
+    computed: {},
     methods: {
         changeSwitch(checked) {
             console.log(`a-switch to ${checked}`)
         },
         open() {
             this.isShow = !this.isShow
+        },
+        openPic() {
+            this.showPic = !this.showPic
         }
     }
 }
@@ -127,44 +137,62 @@ export default {
 
 
 <style lang="less" scoped>
-.legend-box {
-    width: 387px;
-    height: 546px;
-    background: rgba(255, 255, 255, 1);
-    box-shadow: 0px 2px 8px 0px rgba(31, 36, 41, 0.06);
-    border-radius: 2px;
-    border: 1px solid rgba(228, 229, 231, 1);
-    position: fixed;
-    z-index: 2;
-    right: 80px;
-    top: 164px;
-    padding: 16px 0;
-    overflow-y: auto;
-    .switch-btn {
-        position: absolute;
-        bottom: 78px;
-        right: 16px;
-        color: #646c73;
-    }
-    .remark {
-        position: absolute;
-        bottom: 16px;
-        left: 16px;
-        p {
-            padding-left: 28px;
-            margin-bottom: 0;
+.box {
+    .legend-box {
+        width: 387px;
+        height: 546px;
+        background: rgba(255, 255, 255, 1);
+        box-shadow: 0px 2px 8px 0px rgba(31, 36, 41, 0.06);
+        border-radius: 2px;
+        border: 1px solid rgba(228, 229, 231, 1);
+        position: fixed;
+        z-index: 2;
+        right: 80px;
+        top: 164px;
+        padding: 16px 0;
+        overflow-y: auto;
+        .switch-btn {
+            position: absolute;
+            bottom: 78px;
+            right: 16px;
+            color: #646c73;
+        }
+        .remark {
+            position: absolute;
+            bottom: 16px;
+            left: 16px;
+            p {
+                padding-left: 28px;
+                margin-bottom: 0;
+            }
         }
     }
+    .pic-box {
+        width: 387px;
+        height: 346px;
+        background: rgba(255, 255, 255, 1);
+        box-shadow: 0px 2px 8px 0px rgba(31, 36, 41, 0.06);
+        border-radius: 2px;
+        border: 1px solid rgba(228, 229, 231, 1);
+        position: fixed;
+        z-index: 2;
+        right: 80px;
+        top: 405px;
+        padding: 16px 0;
+        overflow-y: auto;
+    }
 }
 </style>
 <style lang="less" >
-.legend-box {
-    th {
-        background: rgba(2, 91, 170, 0.1) !important;
-        font-size: 12px;
-        font-family: PingFangSC-Medium, PingFang SC;
-        font-weight: border;
-        color: #000;
+.box {
+    .legend-box {
+        th {
+            background: rgba(2, 91, 170, 0.1) !important;
+            font-size: 12px;
+            font-family: PingFangSC-Medium, PingFang SC;
+            font-weight: border;
+            color: #000;
+        }
     }
 }
 </style>

+ 64 - 0
src/views/equipment/table/eqListTable.vue

@@ -0,0 +1,64 @@
+<template>
+    <div class='eq-list'>
+        <a-select default-value='全部' style='width: 120px' @change='handleChange'>
+            <a-select-option value='全部'>全部</a-select-option>
+        </a-select>
+        <a-select default-value='3F' style='width: 120px' @change='handleChange'>
+            <a-select-option value='3F'>3F</a-select-option>
+        </a-select>
+        <a-select default-value='全部' style='width: 120px' @change='handleChange'>
+            <a-select-option value='全部'>全部</a-select-option>
+        </a-select>
+        <a-input-search placeholder style='width: 200px' @search='onSearch' />
+        <a-table size='small' style='margin-top:12px' :columns='columns' :data-source='data'></a-table>
+    </div>
+</template>
+<script>
+export default {
+    components: {},
+    data() {
+        return {
+            columns: [
+                {
+                    title: '序号',
+                    dataIndex: 'index'
+                },
+                {
+                    title: '设备编号',
+                    dataIndex: 'eqLocalId'
+                },
+                {
+                    title: '数量',
+                    dataIndex: 'count'
+                },
+                {
+                    title: '品牌',
+                    dataIndex: 'brand'
+                },
+                {
+                    title: '型号',
+                    dataIndex: 'size'
+                },
+                {
+                    title: '楼层',
+                    dataIndex: 'floorName'
+                },
+                {
+                    title: '安装位置',
+                    dataIndex: 'location'
+                },
+                {
+                    title: '生产厂商',
+                    dataIndex: 'people'
+                }
+            ],
+            data: []
+        }
+    },
+    methods: {
+        handleChange() {},
+        onSearch() {}
+    },
+    mounted() {}
+}
+</script>