guoxiaohuan 4 years ago
parent
commit
1ac7884d5d

File diff suppressed because it is too large
+ 16 - 0
public/imgs/zhsx.svg


+ 1 - 0
src/api/other.js

@@ -0,0 +1 @@
+import httputils from '@/api/httputils'

+ 5 - 0
src/api/overview.js

@@ -0,0 +1,5 @@
+import httputils from '@/api/httputils'
+// 查询广场概况
+export function queryFact({ getParams }) {
+    return httputils.getJson(`/api/plaza/fact`, getParams)
+}

+ 16 - 1
src/components/Legend/src/legend.vue

@@ -16,6 +16,9 @@
             </el-collapse-transition>
             <edit-list></edit-list>
         </div>
+        <!-- <div class='legend2'>
+            <i class='el-icon-s-grid'></i>
+        </div>-->
         <div class='edit_map'>
             <el-tooltip class='item' effect='dark' content='编辑平面图' placement='left'>
                 <span class='edit-icon'>
@@ -189,6 +192,7 @@ export default {
 <style lang="less" scoped>
 .legend-container {
     position: relative;
+    top: -13px;
     .legend {
         // padding: 12px 8px;
         text-align: center;
@@ -198,12 +202,12 @@ export default {
         font-size: 14px;
         font-family: MicrosoftYaHei;
         color: rgba(2, 91, 170, 1);
-        line-height: 19px;
         background: #ffffff;
         cursor: pointer;
         line-height: 44px;
         text-align: center;
     }
+
     .legend-tab {
         position: absolute;
         // width: 600px;
@@ -223,6 +227,17 @@ export default {
         }
     }
 }
+.legend2 {
+    width: 44px;
+    height: 44px;
+    font-size: 18px;
+    cursor: pointer;
+    background: #ffffff;
+    text-align: center;
+    line-height: 44px;
+    position: relative;
+    top: 218px;
+}
 .edit_map {
     position: fixed;
     bottom: 28px;

+ 21 - 23
src/components/editLengend.vue

@@ -18,7 +18,7 @@
                         </el-table-column>
                     </el-table>
                 </div>
-                <div class='legend-table2' v-if='tbData2.length>0'>
+                <!-- <div class='legend-table2' v-if='tbData2.length>0'>
                     <el-table ref='multipleTable' height='430px' :data='tbData2' tooltip-effect='dark' @selection-change='handleSelectionChange'>
                         <el-table-column prop='project' label='项目' width='100'></el-table-column>
                         <el-table-column prop='num' label='数量'>
@@ -33,8 +33,8 @@
                             <template slot-scope='scope'>{{ scope.row.lege }}</template>
                         </el-table-column>
                     </el-table>
-                </div>
-                <div class='legend-table2' v-if='tbData3.length>0'>
+                </div>-->
+                <!-- <div class='legend-table2' v-if='tbData3.length>0'>
                     <el-table ref='multipleTable' height='430px' :data='tbData3' tooltip-effect='dark' @selection-change='handleSelectionChange'>
                         <el-table-column prop='project' label='项目' width='100'></el-table-column>
                         <el-table-column prop='num' label='数量'>
@@ -49,7 +49,7 @@
                             <template slot-scope='scope'>{{ scope.row.lege }}</template>
                         </el-table-column>
                     </el-table>
-                </div>
+                </div>-->
             </div>
 
             <div class='swich'>
@@ -87,25 +87,23 @@ export default {
             this.tbData2 = []
             this.tbData3 = []
             if (this.tableData.length > 0) {
-                let len = this.tableData.length
-                console.log(len)
-                if (len <= 10) {
-                    this.tbData1 = this.tableData
-                } else if (len > 10 && len <= 20) {
-                    this.tbData1 = this.tableData.slice(0, 10)
-                    this.tbData2 = this.tableData.slice(10, len)
-                } else if (len > 10 && len <= 30) {
-                    this.tbData1 = this.tableData.slice(0, 10)
-                    this.tbData2 = this.tableData.slice(10, 20)
-                    this.tbData3 = this.tableData.slice(20, len)
-                } else {
-                    this.tbData1 = this.tableData.slice(0, parseInt(len / 3))
-                    this.tbData2 = this.tableData.slice(parseInt(len / 3), parseInt(len / 3) * 2)
-                    this.tbData3 = this.tableData.slice(parseInt(len / 3) * 2, len)
-                }
-                console.log(this.tbData1)
-                console.log(this.tbData2)
-                console.log(this.tbData3)
+                this.tbData1 = this.tableData
+                // 以下不要动 不要删
+                // let len = this.tableData.length
+                // if (len <= 10) {
+                //     this.tbData1 = this.tableData
+                // } else if (len > 10 && len <= 20) {
+                //     this.tbData1 = this.tableData.slice(0, 10)
+                //     this.tbData2 = this.tableData.slice(10, len)
+                // } else if (len > 10 && len <= 30) {
+                //     this.tbData1 = this.tableData.slice(0, 10)
+                //     this.tbData2 = this.tableData.slice(10, 20)
+                //     this.tbData3 = this.tableData.slice(20, len)
+                // } else {
+                //     this.tbData1 = this.tableData.slice(0, parseInt(len / 3))
+                //     this.tbData2 = this.tableData.slice(parseInt(len / 3), parseInt(len / 3) * 2)
+                //     this.tbData3 = this.tableData.slice(parseInt(len / 3) * 2, len)
+                // }
             }
         }
     },

+ 45 - 49
src/store/index.js

@@ -1,56 +1,52 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
-import {
-  login
-} from '@/api/login.js'
+import { login } from '@/api/login.js'
 Vue.use(Vuex)
 export default new Vuex.Store({
-  state: {
-    isrequestAuth: false, // 是否请求登录校验接口
-    permissions: [], //权限信息 "GLSMS_VIEW":"说明书查看"、"GLSMS_SYMBOL_MANAGE": "图例库管理"、 "GLSMS_PLANARGRAPH_MANAGE":"平面图维护"
-    plazas: [], //项目列表
-    userInfo: {
-      employeename: '', //用户名称:艾宇;
-      orgCode: '',
-      username: 'aiyu6' //账户名称
-    }
-  },
-
-  mutations: {
-    // 设置是否登陆校验
-    SETISREQUESTtAUTH(state, palyload) {
-      state.isrequestAuth = palyload;
+    state: {
+        isrequestAuth: false, // 是否请求登录校验接口
+        permissions: [], //权限信息 "GLSMS_VIEW":"说明书查看"、"GLSMS_SYMBOL_MANAGE": "图例库管理"、 "GLSMS_PLANARGRAPH_MANAGE":"平面图维护"
+        plazas: [], //项目列表
+        userInfo: {
+            employeename: '', //用户名称:艾宇;
+            orgCode: '',
+            username: 'aiyu6', //账户名称
+        },
     },
-    // 设置相关权限信息
-    SETAUTHMSG(state, palyload) {
-      state.permissions = palyload.permissions;
-      state.plazas = palyload.plazas;
-      state.userInfo.employeename = palyload.employeename;
-      state.userInfo.orgCode = palyload.orgCode;
-      state.userInfo.username = palyload.username;
+
+    mutations: {
+        // 设置是否登陆校验
+        SETISREQUESTtAUTH(state, palyload) {
+            state.isrequestAuth = palyload
+        },
+        // 设置相关权限信息
+        SETAUTHMSG(state, palyload) {
+            state.permissions = palyload.permissions
+            state.plazas = palyload.plazas
+            state.userInfo.employeename = palyload.employeename
+            state.userInfo.orgCode = palyload.orgCode
+            state.userInfo.username = palyload.username
+        },
     },
-  },
-  //   const params = {
-  //     username: 'aiyu6'
-  // }
+    //   const params = {
+    //     username: 'aiyu6'
+    // }
 
-  actions: {
-    // 获取项目列表、userId
-    async getUserInfo({
-      commit
-    }, palyload) {
-      await login({
-        username: palyload
-      }).then(res => {
-        if (res.result == "success") {
-          commit("SETISREQUESTtAUTH", true);
-          commit("SETAUTHMSG", res);
-        } else {
-          console.log('接口报错!!')
-          commit("SETISREQUESTtAUTH", false);
-        }
-      })
-    }
-  },
-  modules: {}
-})
+    actions: {
+        // 获取项目列表、userId
+        async getUserInfo({ commit }, palyload) {
+            await login({
+                username: palyload,
+            }).then((res) => {
+                if (res.result == 'success') {
+                    commit('SETISREQUESTtAUTH', true)
+                    commit('SETAUTHMSG', res)
+                } else {
+                    console.log('接口报错!!')
+                    commit('SETISREQUESTtAUTH', false)
+                }
+            })
+        },
+    },
+    modules: {},
+})

+ 242 - 230
src/utils/plugins/components.js

@@ -1,558 +1,558 @@
 var system = [
         {
-            name: "供电系统",
+            name: '供电系统',
             id: 1,
-            icon: require("@/assets/imgs/cdgd.svg"),
-            icon1: require("@/assets/imgs/cdgd2.svg"),
+            icon: require('@/assets/imgs/cdgd.svg'),
+            icon1: require('@/assets/imgs/cdgd2.svg'),
             children: [
                 {
-                    label: "系统原理图",
+                    label: '系统原理图',
                     children: [],
                 },
                 {
-                    label: "变配电室内部设备清单",
+                    label: '变配电室内部设备清单',
                     children: [],
                 },
                 {
-                    label: "楼层电井(间)控制商铺范围清单",
+                    label: '楼层电井(间)控制商铺范围清单',
                     children: [
                         {
-                            label: "BA楼宇智能化",
-                            id: "GDQD1",
+                            label: 'BA楼宇智能化',
+                            id: 'GDQD1',
                         },
                         {
-                            label: "门禁管理(科松)",
-                            id: "GDQD2",
+                            label: '门禁管理(科松)',
+                            id: 'GDQD2',
                         },
                         {
-                            label: "视频监控",
-                            id: "GDQD3",
+                            label: '视频监控',
+                            id: 'GDQD3',
                         },
                     ],
                 },
                 {
-                    label: "维保事项",
+                    label: '维保事项',
                     children: [
                         {
-                            label: "配电室内",
-                            id: "GDWB1",
+                            label: '配电室内',
+                            id: 'GDWB1',
                         },
                         {
-                            label: "配电室外",
-                            id: "GDWB2",
+                            label: '配电室外',
+                            id: 'GDWB2',
                         },
                     ],
                 },
                 {
-                    label: "维修事项",
+                    label: '维修事项',
                     children: [
                         {
-                            label: "配电室内",
-                            id: "GDWX1",
+                            label: '配电室内',
+                            id: 'GDWX1',
                         },
                         {
-                            label: "配电室外",
-                            id: "GDWX2",
+                            label: '配电室外',
+                            id: 'GDWX2',
                         },
                     ],
                 },
                 {
-                    label: "专维及其他事项",
+                    label: '专维及其他事项',
                     children: [
                         {
-                            label: "专项维修",
-                            id: "GDZW1",
+                            label: '专项维修',
+                            id: 'GDZW1',
                         },
                         {
-                            label: "其他事项",
-                            id: "GDZW2",
+                            label: '其他事项',
+                            id: 'GDZW2',
                         },
                     ],
                 },
                 {
-                    label: "查看图纸",
+                    label: '查看图纸',
                     children: [],
                 },
             ],
         },
         {
-            name: "暖通系统",
+            name: '暖通系统',
             id: 2,
-            icon: require("@/assets/imgs/cdnt2.svg"),
-            icon1: require("@/assets/imgs/cdnt1.svg"),
+            icon: require('@/assets/imgs/cdnt2.svg'),
+            icon1: require('@/assets/imgs/cdnt1.svg'),
             children: [
                 {
-                    label: "系统原理图",
+                    label: '系统原理图',
                     children: [
                         {
-                            label: "空调系统原理图",
-                            id: "NTYL1",
+                            label: '空调系统原理图',
+                            id: 'NTYL1',
                         },
                         {
-                            label: "超市空调系统原理图",
-                            id: "NTYL2",
+                            label: '超市空调系统原理图',
+                            id: 'NTYL2',
                         },
                         {
-                            label: "分水器支路分布明细",
-                            id: "NTYL3",
+                            label: '分水器支路分布明细',
+                            id: 'NTYL3',
                         },
                         {
-                            label: "分水器支路分布图",
-                            id: "NTYL4",
+                            label: '分水器支路分布图',
+                            id: 'NTYL4',
                         },
                     ],
                 },
                 {
-                    label: "主要设备清单",
+                    label: '主要设备清单',
                     children: [
                         {
-                            label: "冷热源机房内",
-                            id: "NTQD1",
+                            label: '冷热源机房内',
+                            id: 'NTQD1',
                         },
                         {
-                            label: "楼层末端",
-                            id: "NTQD2",
+                            label: '楼层末端',
+                            id: 'NTQD2',
                         },
                     ],
                 },
                 {
-                    label: "维保事项",
+                    label: '维保事项',
                     children: [
                         {
-                            label: "冷源机房内",
-                            id: "NTWB1",
+                            label: '冷源机房内',
+                            id: 'NTWB1',
                         },
                         {
-                            label: "冷源机房外",
-                            id: "NTWB2",
+                            label: '冷源机房外',
+                            id: 'NTWB2',
                         },
                     ],
                 },
                 {
-                    label: "维修事项",
+                    label: '维修事项',
                     children: [
                         {
-                            label: "冷源机房内",
-                            id: "NTWX1",
+                            label: '冷源机房内',
+                            id: 'NTWX1',
                         },
                         {
-                            label: "冷源机房外",
-                            id: "NTWX2",
+                            label: '冷源机房外',
+                            id: 'NTWX2',
                         },
                     ],
                 },
                 {
-                    label: "专维及其他事项",
+                    label: '专维及其他事项',
                     children: [
                         {
-                            label: "专项维修",
-                            id: "NTZW1",
+                            label: '专项维修',
+                            id: 'NTZW1',
                         },
                         {
-                            label: "其他事项",
-                            id: "NTZW2",
+                            label: '其他事项',
+                            id: 'NTZW2',
                         },
                     ],
                 },
                 {
-                    label: "查看图纸",
+                    label: '查看图纸',
                     children: [],
                 },
             ],
         },
         {
-            name: "消防系统",
-            icon: require("@/assets/imgs/cdxf.svg"),
-            icon1: require("@/assets/imgs/cdxf2.svg"),
+            name: '消防系统',
+            icon: require('@/assets/imgs/cdxf.svg'),
+            icon1: require('@/assets/imgs/cdxf2.svg'),
             id: 3,
             children: [
                 {
-                    label: "系统原理图",
+                    label: '系统原理图',
                     children: [
                         {
-                            label: "消防电系统原理示意图",
-                            id: "XFYL1",
+                            label: '消防电系统原理示意图',
+                            id: 'XFYL1',
                         },
                         {
-                            label: "消防喷淋系统示意图",
-                            id: "XFYL2",
+                            label: '消防喷淋系统示意图',
+                            id: 'XFYL2',
                         },
                         {
-                            label: "消防窗喷系统示意图",
-                            id: "XFYL3",
+                            label: '消防窗喷系统示意图',
+                            id: 'XFYL3',
                         },
                         {
-                            label: "消防栓系统示意图",
-                            id: "XFYL4",
+                            label: '消防栓系统示意图',
+                            id: 'XFYL4',
                         },
                         {
-                            label: "消防泵房引出管路分布图",
-                            id: "XFYL5",
+                            label: '消防泵房引出管路分布图',
+                            id: 'XFYL5',
                         },
                     ],
                 },
                 {
-                    label: "主要设备清单",
+                    label: '主要设备清单',
                     children: [],
                 },
                 {
-                    label: "维保事项",
+                    label: '维保事项',
                     children: [
                         {
-                            label: "中控室/消防泵房内",
-                            id: "XFWB1",
+                            label: '中控室/消防泵房内',
+                            id: 'XFWB1',
                         },
                         {
-                            label: "中控室/消防泵房外",
-                            id: "XFWB2",
+                            label: '中控室/消防泵房外',
+                            id: 'XFWB2',
                         },
                     ],
                 },
                 {
-                    label: "维修事项",
+                    label: '维修事项',
                     children: [
                         {
-                            label: "中控室/消防泵房内",
-                            id: "XFWX1",
+                            label: '中控室/消防泵房内',
+                            id: 'XFWX1',
                         },
                         {
-                            label: "中控室/消防泵房外",
-                            id: "XFWX2",
+                            label: '中控室/消防泵房外',
+                            id: 'XFWX2',
                         },
                     ],
                 },
                 {
-                    label: "专维及其他事项",
+                    label: '专维及其他事项',
                     children: [
                         {
-                            label: "专项维修",
-                            id: "XFZW1",
+                            label: '专项维修',
+                            id: 'XFZW1',
                         },
                         {
-                            label: "其他事项",
-                            id: "XFZW2",
+                            label: '其他事项',
+                            id: 'XFZW2',
                         },
                     ],
                 },
                 {
-                    label: "查看图纸",
+                    label: '查看图纸',
                     children: [],
                 },
             ],
         },
         {
-            name: "弱电系统",
+            name: '弱电系统',
             id: 4,
-            icon: require("@/assets/imgs/cdrd.svg"),
-            icon1: require("@/assets/imgs/cdrd2.svg"),
+            icon: require('@/assets/imgs/cdrd.svg'),
+            icon1: require('@/assets/imgs/cdrd2.svg'),
             children: [
                 {
-                    label: "系统原理图",
+                    label: '系统原理图',
                     children: [
                         {
-                            label: "视频监控系统原理图",
-                            id: "RDYL1",
+                            label: '视频监控系统原理图',
+                            id: 'RDYL1',
                         },
                         {
-                            label: "门禁管理系统原理图",
-                            id: "RDYL2",
+                            label: '门禁管理系统原理图',
+                            id: 'RDYL2',
                         },
                         {
-                            label: "BA楼宇智能化系统原理图",
-                            id: "RDYL3",
+                            label: 'BA楼宇智能化系统原理图',
+                            id: 'RDYL3',
                         },
                     ],
                 },
                 {
-                    label: "主要设备清单",
+                    label: '主要设备清单',
                     children: [
                         {
-                            label: "BA楼宇智能化",
-                            id: "RDQD1",
+                            label: 'BA楼宇智能化',
+                            id: 'RDQD1',
                         },
                         {
-                            label: "门禁管理",
-                            id: "RDQD2",
+                            label: '门禁管理',
+                            id: 'RDQD2',
                         },
                         {
-                            label: "视频监控",
-                            id: "RDQD3",
+                            label: '视频监控',
+                            id: 'RDQD3',
                         },
                     ],
                 },
                 {
-                    label: "维保事项",
+                    label: '维保事项',
                     children: [
                         {
-                            label: "慧云机房内",
-                            id: "RDWB1",
+                            label: '慧云机房内',
+                            id: 'RDWB1',
                         },
                         {
-                            label: "慧云机房外",
-                            id: "RDWB2",
+                            label: '慧云机房外',
+                            id: 'RDWB2',
                         },
                     ],
                 },
                 {
-                    label: "维修事项",
+                    label: '维修事项',
                     children: [
                         {
-                            label: "慧云机房内",
-                            id: "RDWX1",
+                            label: '慧云机房内',
+                            id: 'RDWX1',
                         },
                         {
-                            label: "慧云机房外",
-                            id: "RDWX2",
+                            label: '慧云机房外',
+                            id: 'RDWX2',
                         },
                     ],
                 },
                 {
-                    label: "专维及其他事项",
+                    label: '专维及其他事项',
                     children: [
                         {
-                            label: "专项维修",
-                            id: "RDZW1",
+                            label: '专项维修',
+                            id: 'RDZW1',
                         },
                         {
-                            label: "其他事项",
-                            id: "RDZW2",
+                            label: '其他事项',
+                            id: 'RDZW2',
                         },
                     ],
                 },
                 {
-                    label: "查看图纸",
+                    label: '查看图纸',
                     children: [],
                 },
             ],
         },
         {
-            name: "给排水系统",
+            name: '给排水系统',
             id: 5,
-            icon: require("@/assets/imgs/cdgps.svg"),
-            icon1: require("@/assets/imgs/cdgps2.svg"),
+            icon: require('@/assets/imgs/cdgps.svg'),
+            icon1: require('@/assets/imgs/cdgps2.svg'),
             children: [
                 {
-                    label: "系统原理图",
+                    label: '系统原理图',
                     children: [
                         {
-                            label: "给水系统原理示意图",
-                            id: "GSYL1",
+                            label: '给水系统原理示意图',
+                            id: 'GSYL1',
                         },
                         {
-                            label: "排水系统原理示意图",
-                            id: "GSYL2",
+                            label: '排水系统原理示意图',
+                            id: 'GSYL2',
                         },
                     ],
                 },
                 {
-                    label: "主要设备清单",
+                    label: '主要设备清单',
                     children: [],
                 },
                 {
-                    label: "维保事项",
+                    label: '维保事项',
                     children: [
                         {
-                            label: "给水系统",
-                            id: "GSQD1",
+                            label: '给水系统',
+                            id: 'GSQD1',
                         },
                         {
-                            label: "排水系统",
-                            id: "GSQD2",
+                            label: '排水系统',
+                            id: 'GSQD2',
                         },
                     ],
                 },
                 {
-                    label: "维修事项",
+                    label: '维修事项',
                     children: [
                         {
-                            label: "给水系统",
-                            id: "GSWX1",
+                            label: '给水系统',
+                            id: 'GSWX1',
                         },
                         {
-                            label: "排水系统",
-                            id: "GSWX2",
+                            label: '排水系统',
+                            id: 'GSWX2',
                         },
                     ],
                 },
                 {
-                    label: "专维及其他事项",
+                    label: '专维及其他事项',
                     children: [
                         {
-                            label: "给水系统专项维修",
-                            id: "GSZW1",
+                            label: '给水系统专项维修',
+                            id: 'GSZW1',
                         },
                         {
-                            label: "排水系统专项维修",
-                            id: "GSZW2",
+                            label: '排水系统专项维修',
+                            id: 'GSZW2',
                         },
                         {
-                            label: "其他事项",
-                            id: "GSZW3",
+                            label: '其他事项',
+                            id: 'GSZW3',
                         },
                     ],
                 },
                 {
-                    label: "查看图纸",
+                    label: '查看图纸',
                     children: [],
                 },
             ],
         },
         {
-            name: "电梯系统",
+            name: '电梯系统',
             id: 6,
-            icon: require("@/assets/imgs/cddt.svg"),
-            icon1: require("@/assets/imgs/cddt2.svg"),
+            icon: require('@/assets/imgs/cddt.svg'),
+            icon1: require('@/assets/imgs/cddt2.svg'),
             children: [
                 {
-                    label: "系统原理图",
+                    label: '系统原理图',
                     children: [
                         {
-                            label: "扶梯原理图",
-                            id: "DTYL1",
+                            label: '扶梯原理图',
+                            id: 'DTYL1',
                         },
                         {
-                            label: "直梯原理图",
-                            id: "DTYL2",
+                            label: '直梯原理图',
+                            id: 'DTYL2',
                         },
                     ],
                 },
                 {
-                    label: "主要设备清单",
+                    label: '主要设备清单',
                     children: [],
                 },
                 {
-                    label: "维修及维保事项",
+                    label: '维修及维保事项',
                     children: [
                         {
-                            label: "维保事项",
-                            id: "DTWX1",
+                            label: '维保事项',
+                            id: 'DTWX1',
                         },
                         {
-                            label: "维修事项",
-                            id: "DTWX2",
+                            label: '维修事项',
+                            id: 'DTWX2',
                         },
                     ],
                 },
                 {
-                    label: "专维及其他事项",
+                    label: '专维及其他事项',
                     children: [
                         {
-                            label: "专项维修",
-                            id: "DTZW1",
+                            label: '专项维修',
+                            id: 'DTZW1',
                         },
                         {
-                            label: "其他事项",
-                            id: "DTZW2",
+                            label: '其他事项',
+                            id: 'DTZW2',
                         },
                     ],
                 },
                 {
-                    label: "查看图纸",
+                    label: '查看图纸',
                     children: [],
                 },
             ],
         },
         {
-            name: "燃气系统",
+            name: '燃气系统',
             id: 7,
-            icon: require("@/assets/imgs/cdrq.svg"),
-            icon1: require("@/assets/imgs/cdrq2.svg"),
+            icon: require('@/assets/imgs/cdrq.svg'),
+            icon1: require('@/assets/imgs/cdrq2.svg'),
             children: [
                 {
-                    label: "系统原理图",
+                    label: '系统原理图',
                     children: [],
                 },
                 {
-                    label: "主要设备清单",
+                    label: '主要设备清单',
                     children: [],
                 },
                 {
-                    label: "维修及维保事项",
+                    label: '维修及维保事项',
                     children: [
                         {
-                            label: "维保事项",
-                            id: "RQWX1",
+                            label: '维保事项',
+                            id: 'RQWX1',
                         },
                         {
-                            label: "维修事项",
-                            id: "RQWX2",
+                            label: '维修事项',
+                            id: 'RQWX2',
                         },
                     ],
                 },
                 {
-                    label: "专维及其他事项",
+                    label: '专维及其他事项',
                     children: [
                         {
-                            label: "专项维修",
-                            id: "RQZW1",
+                            label: '专项维修',
+                            id: 'RQZW1',
                         },
                         {
-                            label: "其他事项",
-                            id: "RQZW2",
+                            label: '其他事项',
+                            id: 'RQZW2',
                         },
                     ],
                 },
                 {
-                    label: "查看图纸",
+                    label: '查看图纸',
                     children: [],
                 },
             ],
         },
         {
-            name: "土建系统",
-            icon: require("@/assets/imgs/cdtj.svg"),
-            icon1: require("@/assets/imgs/cdtj2.svg"),
+            name: '土建系统',
+            icon: require('@/assets/imgs/cdtj.svg'),
+            icon1: require('@/assets/imgs/cdtj2.svg'),
             id: 8,
             children: [
                 {
-                    label: "建筑立面图",
+                    label: '建筑立面图',
                     children: [
                         {
-                            label: "西面外立面",
+                            label: '西面外立面',
                         },
                         {
-                            label: "南面外立面",
+                            label: '南面外立面',
                         },
                         {
-                            label: "东面外立面",
+                            label: '东面外立面',
                         },
                         {
-                            label: "北面外立面",
+                            label: '北面外立面',
                         },
                     ],
                 },
                 {
-                    label: "主要材料清单",
+                    label: '主要材料清单',
                     children: [],
                 },
                 {
-                    label: "维修及维保事项",
+                    label: '维修及维保事项',
                     children: [
                         {
-                            label: "维保事项",
-                            id: "TJWB1",
+                            label: '维保事项',
+                            id: 'TJWB1',
                         },
                         {
-                            label: "维修事项",
-                            id: "TJWB2",
+                            label: '维修事项',
+                            id: 'TJWB2',
                         },
                     ],
                 },
                 {
-                    label: "专维及其他事项",
+                    label: '专维及其他事项',
                     children: [
                         {
-                            label: "专项维修",
-                            id: "TJZW1",
+                            label: '专项维修',
+                            id: 'TJZW1',
                         },
                         {
-                            label: "其他事项",
-                            id: "TJZW2",
+                            label: '其他事项',
+                            id: 'TJZW2',
                         },
                     ],
                 },
                 {
-                    label: "查看图纸",
+                    label: '查看图纸',
                     children: [],
                 },
             ],
@@ -560,46 +560,58 @@ var system = [
     ],
     floors = [
         {
-            floorName: "F4",
-            id: "f4",
+            floorName: 'F7',
+            id: 'f7',
         },
         {
-            floorName: "F3",
-            id: "f3",
+            floorName: 'F6',
+            id: 'f6',
         },
         {
-            floorName: "F2",
-            id: "f2",
+            floorName: 'F5',
+            id: 'f5',
         },
         {
-            floorName: "F1",
-            id: "f1",
+            floorName: 'F4',
+            id: 'f4',
         },
         {
-            floorName: "B1",
-            id: "b1",
+            floorName: 'F3',
+            id: 'f3',
         },
         {
-            floorName: "B2",
-            id: "b2",
+            floorName: 'F2',
+            id: 'f2',
+        },
+        {
+            floorName: 'F1',
+            id: 'f1',
+        },
+        {
+            floorName: 'B1',
+            id: 'b1',
+        },
+        {
+            floorName: 'B2',
+            id: 'b2',
         },
     ],
     // 事项
     matter = [
         {
-            icon: require("@/assets/imgs/zhsx.svg"),
-            icon1: require("@/assets/imgs/zhsx2.svg"),
-            name: "综合事项管理",
-            id: "1",
+            icon: require('@/assets/imgs/zhsx.svg'),
+            icon1: require('@/assets/imgs/zhsx2.svg'),
+            name: '综合事项管理',
+            id: '1',
         },
         {
-            icon: require("@/assets/imgs/fzyf.svg"),
-            icon1: require("@/assets/imgs/fzyf2.svg"),
-            name: "辅助用房管理",
-            id: "2",
+            icon: require('@/assets/imgs/fzyf.svg'),
+            icon1: require('@/assets/imgs/fzyf2.svg'),
+            name: '辅助用房管理',
+            id: '2',
             children: [
-                { label: "广场辅助用房汇总统计表", type: 1 },
-                { label: "广场辅助用房调改变更记录", type: 2 },
+                { label: '广场辅助用房汇总统计表', type: 1 },
+                { label: '广场辅助用房调改变更记录', type: 2 },
             ],
         },
     ]

+ 1 - 1
src/views/floorFunc/index.vue

@@ -67,7 +67,7 @@ export default {
         }
     },
     mounted() {
-        this.$refs.floorMap.init()
+        // this.$refs.floorMap.init()
     }
 }
 </script>

+ 167 - 83
src/views/other/floorList.vue

@@ -1,7 +1,21 @@
 <template>
     <div class='floor-box'>
         <div class='floor-list'>
-            <a-icon class='i-style1' v-if='showTopButton' type='caret-up' @click='removeTop' />
+            <i class='el-icon-caret-top icon-top' v-if='showT' @click='removeTop'></i>
+            <i class='el-icon-caret-top icon-top' v-else style='color:#ccc'></i>
+            <div class='floor-out'>
+                <div class='floor-center'>
+                    <div
+                        class='floor-item'
+                        :class='item.id==floorId?"isActive":""'
+                        @click='tabFloor(item)'
+                        v-for='(item,index) in floors'
+                        :key='index'
+                    >{{item.floorName}}</div>
+                </div>
+            </div>
+            <!-- 611 299 607 329 609 360 -->
+            <!-- <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'>
@@ -15,7 +29,9 @@
                 </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' />
+            <a-icon class='i-style2' v-if='!showBottomButton' type='caret-down' style='color:#ccc' />-->
+            <i class='el-icon-caret-bottom icon-bottom' v-if='showB' @click='removeBottom'></i>
+            <i class='el-icon-caret-bottom icon-bottom' v-else style='color:#ccc'></i>
         </div>
     </div>
 </template>
@@ -25,6 +41,8 @@ export default {
         return {
             floorId: 'f1',
             floorName: 'F3',
+            showT: true,
+            showB: true,
             showTopButton: true,
             showBottomButton: true
         }
@@ -36,7 +54,6 @@ export default {
     },
     methods: {
         tabFloor(item) {
-            console.log(item)
             this.showTopButton = true
             this.showBottomButton = true
             this.floorId = item.id
@@ -58,29 +75,37 @@ export default {
             })
         },
         removeTop() {
-            let tempFloorIdList = []
-            let tempFloorIndex = 0
-            let clickCount = 0
-            this.floors.map(el => {
-                tempFloorIdList.push(el.id)
-            })
-            tempFloorIdList.forEach((el, index) => {
-                if (el == this.floorId) {
-                    tempFloorIndex = index
-                    if (tempFloorIndex == 1) {
-                        this.showTopButton = false
-                    }
-                    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)
-                }
-            })
-            this.floorId = tempFloorIdList[tempFloorIndex]
+            // let tempFloorIdList = []
+            // let tempFloorIndex = 0
+            // let clickCount = 0
+            // this.floors.map(el => {
+            //     tempFloorIdList.push(el.id)
+            // })
+            // tempFloorIdList.forEach((el, index) => {
+            //     if (el == this.floorId) {
+            //         tempFloorIndex = index
+            //         if (tempFloorIndex == 1) {
+            //             this.showT = false
+            //         }
+            //         console.log(tempFloorIndex)
+            //         if (tempFloorIndex != 0) {
+            //             tempFloorIndex--
+            //             clickCount++
+            //             console.log(clickCount)
+            //             let fontGroup = document.querySelector('.floor-center')
+            //             fontGroup.style.top = clickCount * -28 + 'px'
+            //             console.log(fontGroup.style.top)
+            //             this.showB = true
+            //         }
+            //         console.log(tempFloorIndex)
+            //     }
+            // })
+            // this.floorId = tempFloorIdList[tempFloorIndex]
+            // let map = document.querySelector('.floor-center')
+            // console.log(map.style.height)
+            // let floor = document.querySelector('.floor-item')
+            // map.style.bottom = -28 + 'px'
+            // console.log(map.style.bottom)
         },
         removeBottom() {
             let tempFloorIdList = []
@@ -99,9 +124,9 @@ 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
+                        let fontGroup = document.querySelector('.floor-center')
+                        fontGroup.style.top += clickCount + 28 + 'px'
+                        this.showB = true
                     }
                 }
             })
@@ -113,75 +138,134 @@ export default {
 <style lang="less" scoped>
 .floor-box {
     position: fixed;
-    top: 154px;
     right: 32px;
-
+    top: 196px;
     .floor-list {
-        position: fixed;
-        right: 32px;
-        top: 208px;
-        width: 40px;
-        background: #ffffff;
+        width: 44px;
+        height: 212px;
+        background: rgba(255, 255, 255, 1);
+        box-shadow: 0px 2px 15px 0px rgba(31, 36, 41, 0.08);
+        border-radius: 2px;
+        position: relative;
+        padding: 28px 4px;
         text-align: center;
-        .floors {
-            position: fixed;
-            right: 32px;
-            top: 234px;
-            width: 40px;
-            height: 140px;
-            background: #ffffff;
-            text-align: center;
+        .floor-out {
+            height: 160px;
             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 {
+            // overflow-y: auto;
+            position: relative;
+            // &::-webkit-scrollbar {
+            //     display: none;
+            // }
+
+            .floor-center {
+                position: absolute;
+                bottom: 0;
+                .floor-item {
                     width: 36px;
                     height: 28px;
-                    line-height: 28px;
-                    text-align: center;
-                    background: #fff;
-                    display: block;
+                    margin: 3px 0;
                     cursor: pointer;
-                    font-size: 14px;
-                    margin-left: 2px;
-                    border-radius: 4px;
-                }
-                .isActive {
-                    border-radius: 4px;
-                    color: #025baa;
-                    background: #e1f2ff;
                 }
             }
         }
-        .i-style1 {
-            right: 32px;
-            position: fixed;
-            top: 210px;
-            width: 40px;
-            height: 28px;
-            background: #fff;
+
+        .icon-top {
             text-align: center;
-            line-height: 28px;
+            font-size: 18px;
+            margin: 0 auto;
+            display: flex;
+            justify-content: center;
+            position: absolute;
+            top: 0;
+            right: 0;
+            width: 100%;
+            cursor: pointer;
+            margin-top: 5px;
         }
-        .i-style2 {
-            right: 32px;
-            position: fixed;
-            top: 374px;
-            width: 40px;
-            height: 28px;
-            background: #fff;
+        .icon-bottom {
             text-align: center;
+            font-size: 18px;
+            margin: 0 auto;
+            display: flex;
+            justify-content: center;
+            position: absolute;
+            bottom: 0;
+            right: 0;
+            width: 100%;
+            margin-bottom: 5px;
+            cursor: pointer;
+            line-height: 28px;
+        }
+        .isActive {
+            border-radius: 4px;
+            color: #025baa;
+            background: #e1f2ff;
             line-height: 28px;
         }
+        // background: #ffffff;
+        // text-align: center;
+        // .floors {
+        //     position: fixed;
+        //     right: 32px;
+        //     top: 234px;
+        //     width: 40px;
+        //     height: 140px;
+        //     background: #ffffff;
+        //     text-align: center;
+        //     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;
+        //         border: 2px solid green;
+        //         .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;
+        //             border: 1px solid red;
+        //         }
+        //         .isActive {
+        //             border-radius: 4px;
+        //             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-style2 {
+        //     right: 32px;
+        //     position: fixed;
+        //     top: 374px;
+        //     width: 40px;
+        //     height: 28px;
+        //     background: #fff;
+        //     text-align: center;
+        //     line-height: 28px;
+        // }
     }
 }
 </style>

+ 3 - 2
src/views/other/index.vue

@@ -15,10 +15,11 @@
                     </li>
                 </ul>
             </div>
-
+            <!-- 楼层 -->
             <div class='other-right' v-if='matterId!=1'>
                 <floor-list :floors='floors' @emitFloor='emitFloor'></floor-list>
             </div>
+            <!-- 图例 -->
             <div class='legend-box' v-if='matterId!=1'>
                 <Legend></Legend>
             </div>
@@ -44,7 +45,7 @@ export default {
             matter,
             floors,
             everySystem: [],
-            matterId: 1,
+            matterId: 2,
             systemName: '供电系统',
             floorInfo: {
                 floorName: 'F1',

+ 14 - 0
src/views/overview/index.vue

@@ -159,6 +159,7 @@
 </template>
 <script>
 import PicModal from './picModal'
+import { queryFact } from '@/api/overview'
 export default {
     data() {
         return {
@@ -188,8 +189,21 @@ export default {
     methods: {
         picClick() {
             this.$refs.picModal.showModal()
+        },
+        query() {
+            let params = {
+                getParams: {
+                    plazaId: 964
+                }
+            }
+            queryFact(params).then(res => {
+                console.log(res)
+            })
         }
     },
+    mounted() {
+        this.query()
+    },
     components: {
         PicModal
     }

File diff suppressed because it is too large
+ 16 - 0
static/imgs/zhsx.svg