Merge branch 'master' of http://39.106.8.246:3003/web/ibms

src/components/ledger/handsontables/assets.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="height: 94%;">
     <!-- <div class="hanson-bar">
       <span>当前筛选条件下共{{page.total || '--'}}资产</span>
       <div style="width:300px;float:right;overflow:hidden;">
@@ -78,7 +78,8 @@
       v-show="!mess.deviceId && (!main || !main.length)"
       style="width:100%;text-align:center;font-size:30px;color:gray;"
     >请选择设备族</div> -->
-    <div class="center" v-show="!mess.deviceId && (!main || !main.length)">
+    <div style="height: 91%" class="middle_sty">
+            <div class="center" v-show="!mess.deviceId && (!main || !main.length)">
         <i class="iconwushuju iconfont"></i>
         请选择设备族
     </div>
@@ -86,6 +87,7 @@
         <i class="iconwushuju iconfont"></i>
         暂无数据
     </div>
+    </div>
     <div v-show="mess.deviceId && main && main.length" v-loading="loading" id="handsontable" ref="handsontable"></div>
     <div v-show="main && main.length" class='right'>
         <my-pagination @change="getMain" :page="page"></my-pagination>

src/components/ledger/handsontables/device.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="height: 94%;">
     <div class="hanson-bar">
       <span
         style="width:20px;float:left;display:block;height:20px;cursor: pointer;"
@@ -78,6 +78,19 @@
       :keysArr="picsArr"
       @change="changePics"
     ></pic-dialog>
+    <div style="height: 91%" class="middle_sty" >
+            <div class="center" v-show="!mess.deviceId && (!main || !main.length)">
+                <i class="iconwushuju iconfont"></i>
+                请选择设备族
+            </div> 
+            
+            <div class="center" v-show="mess.deviceId && (!main || !main.length)">
+                <i class="iconwushuju iconfont"></i>
+                暂无数据
+        </div>
+    </div>
+
+    
     <system-type :infos="systemId" :graphyId="graphyId" :dialog="dialog"></system-type>
     <!-- <div
       v-show="!main || !main.length"
@@ -86,15 +99,10 @@
         <!-- <div
       v-show="!mess.deviceId && (!main || !main.length)"
       style="width:100%;text-align:center;font-size:30px;color:gray;"
-    >请选择设备族</div> -->
-        <div class="center" v-show="!mess.deviceId && (!main || !main.length)">
-        <i class="iconwushuju iconfont"></i>
-        请选择设备族
-    </div>
-    <div class="center" v-show="mess.deviceId && (!main || !main.length)">
-        <i class="iconwushuju iconfont"></i>
-        暂无数据
-    </div>
+    >请选择设备族</div> --> 
+        
+        
+    
     <div v-show="mess.deviceId && main && main.length" v-loading="loading" id="handsontable" ref="handsontable"></div>
     <div  v-show="mess.deviceId && main && main.length" class="right">
         <my-pagination @change="getMain" :page="page"></my-pagination>

src/components/ledger/handsontables/system.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="height: 94%;">
     <div class="hanson-bar">
       <span>当前筛选条件下共{{page.total || '--'}}系统</span>
       <div style="float:right;overflow:hidden;">
@@ -58,14 +58,17 @@
       v-show="!mess.deviceId && (!main || !main.length)"
       style="width:100%;text-align:center;font-size:30px;color:gray;"
     >请选择系统类型</div> -->
-    <div class="center" v-show="!mess.deviceId && (!main || !main.length)">
-        <i class="iconwushuju iconfont"></i>
-        请选择系统类型
-    </div>
-    <div class="center" v-show="mess.deviceId && (!main || !main.length)">
-        <i class="iconwushuju iconfont"></i>
-        暂无数据
+    <div  style="height: 91%" class="middle_sty">
+        <div class="center" v-show="!mess.deviceId && (!main || !main.length)">
+            <i class="iconwushuju iconfont"></i>
+            请选择系统类型
+        </div>
+        <div class="center" v-show="mess.deviceId && (!main || !main.length)">
+            <i class="iconwushuju iconfont"></i>
+            暂无数据
+        </div>
     </div>
+    
     <div v-show="mess.deviceId && main && main.length" v-loading="loading" id="handsontable" ref="handsontable"></div>
     <div v-show="mess.deviceId && main && main.length" class="right">
         <my-pagination @change="getMain" :page="page"></my-pagination>

src/components/ledger/lib/title.vue

@@ -4,12 +4,12 @@
 <template>
     <div id="listHeader">
         <div class="border-main">
-            <p class="list-name"><span style="padding-right: 12px;">项目名称</span>{{mess.perjectName}}</p>
+            <!-- <p class="list-name"><span style="padding-right: 12px;">项目名称</span>{{mess.perjectName}}</p> -->
             <div class="card-view">
-                <div class="card" v-for="(i,index) in mess.name" :key="index">
-                    <p>{{index == 1 ? "已对应" : "全部"}}{{i.key}}</p>
-                    <p class="num">{{i.num |numFormat}}</p>
-                </div>
+                <span class="card" v-for="(i,index) in mess.name" :key="index">
+                    <span>{{index == 1 ? "已对应" : "全部"}}{{i.key}}</span>
+                    <span class="num">{{i.num |numFormat}}</span>
+                </span>
             </div>
         </div>
     </div>
@@ -96,25 +96,22 @@ export default {
     .card-view {
       // height: 80px;
       // overflow: hidden;
+      display: flex;           
+      margin-top: 10px;
+      background-color: #e4e4e4;
+      margin-right: 10px;
       .card {
-        float: left;
-        margin-top: 10px;
-        height: 70px;
-        width: 200px;
-        border: 1px solid #dfe6ec;
-        border-radius: 5px;
-        background-color: #e4e4e4;
-        padding: 10px;
-        margin-right: 15px;
-        p {
+          padding: 10px;
+          width: 140px;
+          text-align: center;
+        span {
           color: #797979;
           font-size: 13px;
         }
-        p.num {
+        span.num {
           color: #3d3d3d;
-          padding-left: 10px;
-          padding-top: 5px;
           font-size: 17px;
+          padding-left: 8px;
         }
       }
     }

src/framework/layout/Main.vue

@@ -29,6 +29,7 @@
 import { mapGetters, mapMutations } from 'vuex'
 import PageHeader from './PageHeader'
 import PageSidebar from './PageSidebar'
+import menus from '@/data/menus' 
 export default {
     name: 'Main',
     components: {
@@ -37,13 +38,15 @@ export default {
     },
     props: [],
     data() {
-        return {}
+        return {
+            isPath:  false
+        }
     },
     computed: {
         ...mapGetters('layout', ['sidebarClosed', 'breadcrumb'])
     },
     methods: {
-        ...mapMutations('layout', ['setSidebarClosed']),
+        ...mapMutations('layout', ['setSidebarClosed','setSidebarSelected']),
         windwoResize() {
             // 窗口大小发生变化时
             let clientWidth = `${document.documentElement.clientWidth}`
@@ -56,15 +59,31 @@ export default {
             } else {
                 this.setSidebarClosed(false)
             }
+        },
+        findPathInArray(arr, path) {
+            arr.forEach(ele => {
+                if(ele.path == path) {
+                    this.isPath = true
+                }
+                if(ele.children) {
+                   this.findPathInArray(ele.children, path)
+                }
+            })
         }
     },
-    created() {
-        // console.log('--------------------- Main created')
-        // console.log(this.$store.getters.flag)
+    watch: {
+        "$route": {
+            handler: function(route, oldVal){
+                let path = route.path
+                this.isPath = false;
+                this.findPathInArray(menus,path)
+                if(this.isPath) {
+                    this.setSidebarSelected(path)
+                }
+            },
+            // 深度观察监听
+            deep: true
+        }
     },
-    mounted() {
-        // this.windwoResize()
-        // window.onresize = this.windwoResize
-    }
 }
 </script>

src/framework/layout/PageSidebar.vue

@@ -1,5 +1,6 @@
 <template>
     <div id='page-sidebar-wrapper' class='page-sidebar-wrapper'>
+        {{sidebarSelected}}
         <el-menu
             :collapse='sidebarClosed'
             :default-active='sidebarSelected'
@@ -69,6 +70,7 @@ export default {
         // console.log('--------------------- PageSidebar created')
         // console.log('menus ', this.menus)
     },
+
     mounted() {},
     components: {}
 }

src/framework/layout/layout-store.js

@@ -19,13 +19,14 @@ export default {
     getters: {
         sidebarClosed: state => state.sidebarClosed,
         sidebarSelected: state => {
-            if (!state.pageSidebarSelected) {
-                let menu = storage.get(KEY_MENU_SELECTED)
-                if (menu) {
-                    state.pageSidebarSelected = menu
-                }
-            }
-            return state.pageSidebarSelected
+            // if (!state.pageSidebarSelected) {
+            //     let menu = storage.get(KEY_MENU_SELECTED)
+            //     if (menu) {
+            //         state.pageSidebarSelected = menu
+            //     }
+            // }
+            // return state.pageSidebarSelected
+            return state.sidebarSelected
         },
         userInfo: state => state.userInfo,
         permissions: state => state.permissions,
@@ -64,7 +65,7 @@ export default {
         loadUserInfo({ state }) {
             return new Promise((resolve, reject) => {
                 frameworkApi.loadUserInfo().then(resp => {
-                    console.log('api load user info ', resp)
+                    // console.log('api load user info ', resp)
                     if (resp.result == 'success') {
                         state.userInfo = { username: resp.username }
                         state.permissions = {}

src/framework/style/layout.scss

@@ -203,6 +203,7 @@ body {
         margin-top: 10px;
     }
     >.data-table-pagination {
+        z-index: 99999;
         margin-top: 10px;
         flex-grow: 0;
         flex-shrink: 0;

src/framework/template/TablePageTemplate.vue

@@ -22,7 +22,7 @@ export default {
     computed: {},
     methods: {},
     created() {
-        console.log('--------------------- TablePageTemplate created')
+        // console.log('--------------------- TablePageTemplate created')
     },
     mounted() {},
     components: {}

src/router/system.js

@@ -80,7 +80,7 @@ export default [
                 path: 'pointsetting',
                 name: 'Dasboard',
                 component: pointConfig,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '系统集成' }, { label: '点位表配置工具' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '系统集成',path: '/point/pointsetting' }, { label: '点位表配置工具' }] }
             },
             { path: 'editDataSouce', name: 'editDataSouce', component: editDataSouce },
             { path: 'pointSteps', name: 'pointSteps', component: pointSteps },
@@ -88,7 +88,7 @@ export default [
                 path: 'dynamicdata',
                 name: 'dynamicdata',
                 component: Dasboard,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '系统集成' }, { label: '动态数据关联' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '系统集成',path: '/point/pointsetting' }, { label: '动态数据关联' }] }
             }
         ]
     },
@@ -103,19 +103,19 @@ export default [
                 path: 'custominfo',
                 name: 'Dasboard',
                 component: Dasboard,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '项目基础设置' }, { label: '自定义信息点' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '项目基础设置' ,path: '/proj/collectsetting'}, { label: '自定义信息点' }] }
             },
             {
                 path: 'collectsetting',
                 name: 'collectsetting',
                 component: collectsetting,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '项目基础设置' }, { label: '项目需采集的信息点' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '项目基础设置',path: '/proj/collectsetting' }, { label: '项目需采集的信息点' }] }
             },
             {
                 path: 'floorinfo',
                 name: 'Dasboard',
                 component: Dasboard,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '项目基础设置' }, { label: '楼层信息管理' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '项目基础设置',path: '/proj/collectsetting' }, { label: '楼层信息管理' }] }
             }
         ]
     },
@@ -130,31 +130,31 @@ export default [
                 path: 'file',
                 name: 'Dasboard',
                 component: Dasboard,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '模型管理' }, { label: '模型文件管理' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '模型管理',path: '/model/file' }, { label: '模型文件管理' }] }
             },
             {
                 path: 'noentity',
                 name: 'collectsetting',
                 component: Dasboard,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '模型管理' }, { label: '未实体化模型清单' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '模型管理',path: '/model/file' }, { label: '未实体化模型清单' }] }
             },
             {
                 path: 'beforemodel',
                 name: 'Dasboard',
                 component: Dasboard,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '模型管理' }, { label: '待建模清单' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '模型管理',path: '/model/file' }, { label: '待建模清单' }] }
             },
             {
                 path: 'modelrule',
                 name: 'Dasboard',
                 component: Dasboard,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '模型管理' }, { label: '拓扑检查' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '模型管理',path: '/model/file' }, { label: '拓扑检查' }] }
             },
             {
                 path: 'beacon',
                 name: 'Dasboard',
                 component: Dasboard,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '模型管理' }, { label: '信标清单' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '模型管理',path: '/model/file' }, { label: '信标清单' }] }
             }
         ]
     },
@@ -169,37 +169,37 @@ export default [
                 path: 'facility',
                 name: 'facilityLedger',
                 component: facilityLedger,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理' }, { label: '设备清单' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理',path:'/ledger/facility' }, { label: '设备清单' }] }
             },
             {
                 path: 'property',
                 name: 'propertyLedger',
                 component: propertyLedger,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理' }, { label: '资产清单' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理',path:'/ledger/facility' }, { label: '资产清单' }] }
             },
             {
                 path: 'cenotelist',
                 name: 'Dasboard',
                 component: Dasboard,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理' }, { label: '竖井清单' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理',path:'/ledger/facility' }, { label: '竖井清单' }] }
             },
             {
                 path: 'dimension',
                 name: 'Dasboard',
                 component: Dasboard,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理' }, { label: '元空间管理' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理',path:'/ledger/facility' }, { label: '元空间管理' }] }
             },
             {
                 path: 'rubbish',
                 name: 'Dasboard',
                 component: Dasboard,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理' }, { label: '垃圾数据检查' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理',path:'/ledger/facility' }, { label: '垃圾数据检查' }] }
             },
             {
                 path: 'updowncheck',
                 name: 'Dasboard',
                 component: Dasboard,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理' }, { label: '上下级关系检查' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理',path:'/ledger/facility' }, { label: '上下级关系检查' }] }
             }
         ]
     },
@@ -214,7 +214,7 @@ export default [
                 path: 'spacelist',
                 name: 'spacelist',
                 component: spacelist,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '业务空间管理' }, { label: '业务空间清单' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '业务空间管理', path: '/business/spacelist' }, { label: '业务空间清单' }] }
             }
         ]
     },
@@ -229,7 +229,7 @@ export default [
                 path: 'rentlist',
                 name: 'Dasboard',
                 component: Dasboard,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '租户管理' }, { label: '租户清单' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '租户管理',path: '/rent/rentlist' }, { label: '租户清单' }] }
             }
         ]
     },
@@ -244,31 +244,31 @@ export default [
                 path: 'data',
                 name: 'buildData',
                 component: buildData,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '扫楼作业' }, { label: '扫楼数据管理' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '扫楼作业', path:'/floor/data' }, { label: '扫楼数据管理' }] }
             },
             {
                 path: 'plan',
                 name: 'buildGraphy',
                 component: buildGraphy,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '扫楼作业' }, { label: '楼层平面图管理' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '扫楼作业', path:'/floor/data' }, { label: '楼层平面图管理' }] }
             },
             {
                 path: 'abnormalprop',
                 name: 'buildAssets',
                 component: buildAssets,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '扫楼作业' }, { label: '异常资产清单' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '扫楼作业', path:'/floor/data' }, { label: '异常资产清单' }] }
             },
             {
                 path: 'log',
                 name: 'buildLog',
                 component: buildLog,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '扫楼作业' }, { label: '扫楼日志查看' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '扫楼作业', path:'/floor/data' }, { label: '扫楼日志查看' }] }
             },
             {
                 path: 'appuser',
                 name: 'buildUser',
                 component: buildUser,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '项目基础设置' }, { label: '扫楼App用户管理' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '项目基础设置' ,path: '/proj/collectsetting' }, { label: '扫楼App用户管理' }] }
             }
         ]
     },
@@ -302,7 +302,7 @@ export default [
                 path: 'list',
                 name: 'systemlist',
                 component: systemLedger,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '系统管理' }, { label: '系统清单' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '系统管理', path: '/system/list' }, { label: '系统清单' }] }
             }
         ]
     }

src/views/business_space/business_list/index.vue

@@ -18,7 +18,7 @@
                 <el-button class="saga-btn" type="text" @click="changeShow">切换楼层</el-button>
             </div> -->
             <div class="saga-build-mess">
-                    建筑楼层
+                    <span style="padding-right:12px">建筑楼层</span>
                     <el-cascader
                         :options="options"
                         v-model="buildMess.selectd"
@@ -431,7 +431,7 @@
             font-size: 14px;
             position: relative;
             line-height: 54px;
-            width: 98%;
+            width: 100%;
             margin-bottom:10px;
             border: 1px solid #dfe6ec;
             .saga-build-mess {
@@ -494,6 +494,12 @@
             overflow: hidden;
             overflow-y: auto;
             background: #fff;
+            .el-tabs__nav{
+                padding-left: 10px;
+            }
+            .el-tabs__active-bar{
+                padding-left: 24px;
+            }
         }
     }
 </style>

src/views/data_admin/buildAssets/NoMap.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="page-table-template" style='display: flex;flex-direction: column;flex-grow: 1;flex-shrink: 1;'>
         <div class='data-table'>
-            <el-table  :data='tableData' style='width: 100%' border  v-loading='loading'>
+            <el-table  :data='tableData' style='width: 100%' border  v-loading='loading' height="600px">
             <el-table-column header-align='center' align='center' prop='BuildName' label='建筑'  width="150"></el-table-column>、
             <el-table-column header-align='center' align='center' prop='floorName' label='楼层' width="80"></el-table-column>
             <el-table-column header-align='center' align='center' prop='PointName' label='点位标签名称'>

src/views/data_admin/buildAssets/Nofind.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="page-table-template" style='display: flex;flex-direction: column;flex-grow: 1;flex-shrink: 1;'>
         <div  class='data-table'>
-            <el-table :data='tableData' style='width: 100%' border v-loading='loading'>
+            <el-table :data='tableData' style='width: 100%' border v-loading='loading' height="600px">
             <el-table-column header-align='center' align='center' prop='BuildName' label='建筑' width="150"></el-table-column>、
             <el-table-column header-align='center' align='center' prop='floorName' label='楼层'  width="80"></el-table-column>
             <el-table-column header-align='center' align='center' prop='PointName' label='点位标签名称'>

src/views/data_admin/buildAssets/Nopaint.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="page-table-template" style='display: flex;flex-direction: column;flex-grow: 1;flex-shrink: 1;'>
         <div class='data-table'>
-            <el-table  :data='tableData' style='width: 100%' border  v-loading='loading'>
+            <el-table  :data='tableData' style='width: 100%' border  v-loading='loading' height="600px">
             <el-table-column header-align='center' align='center' prop='BuildName' label='建筑'  width="150"></el-table-column>、
             <el-table-column header-align='center' align='center' prop='floorName' label='楼层' width="80"></el-table-column>
             <el-table-column header-align='center' align='center' prop='PointName' label='点位标签名称'>

src/views/data_admin/buildLog/index.vue

@@ -34,9 +34,10 @@
                 tooltip-effect='dark'
                 style='width: 100%;'
                 v-loading='loading'
+                height="600px"
             >
                 <el-table-column prop='CreateTime' label='时间' width='150' align='center' header-align='center'></el-table-column>
-                <el-table-column prop='Comming' label='来源' width='120' header-align='center'></el-table-column>
+                <el-table-column prop='Comming' label='来源' width='120' header-align='center' align="center"></el-table-column>
                 <el-table-column prop='UserName' label='操作人' width='120' header-align='center' align='center'></el-table-column>
                 <el-table-column prop='Phone' label='手机' width='150' header-align='center' align='center'></el-table-column>
                 <el-table-column prop='Action' label='动作' header-align='center'></el-table-column>

src/views/data_admin/buildUser/index.vue

@@ -14,6 +14,7 @@
                 <!-- <el-button type='danger' @click='someDel'>批量删除</el-button> -->
             </div>
             <el-table
+                height="600"
                 slot='table'
                 :data='tableData'
                 border

src/views/ledger/facility/index.vue

@@ -187,7 +187,7 @@ export default {
   position: relative;
   .table-main {
     position: absolute;
-    top: 160px;
+    top: 76px;
     bottom: 10px;
     left: 0;
     right: 0;

src/views/ledger/index.scss

@@ -1,5 +1,5 @@
 .page-content {
     #listHeader {
-        height: 148px;
+        height: 74px;
     }
 }

src/views/ledger/property/index.vue

@@ -167,7 +167,7 @@ export default {
   position: relative;
   .table-main {
     position: absolute;
-    top: 160px;
+    top: 76px;
     bottom: 10px;
     left: 0;
     right: 0;

src/views/ledger/system/index.vue

@@ -173,7 +173,7 @@ export default {
   position: relative;
   .table-main {
     position: absolute;
-    top: 160px;
+    top: 76px;
     bottom: 10px;
     left: 0;
     right: 0;