Merge branch 'dev-phase1-0111' of...

Merge branch 'dev-phase1-0111' of http://192.168.110.53/com.pica.cloud.education.frontend/pica-admin-IM into dev-phase1-0111

src/App.vue

@@ -95,7 +95,6 @@ export default {
       };
       vm.POST("/contents/login/header", req).then(res => {
         if (res.code == "000000") {
-					debugger
 					let systemType = 0, authList = res.data.systemInfoList;
 					let s = authList.find( item => {
 						return item.systemNameAbbreviation == 'PCIM';

src/views/IM/current-session/index.vue

@@ -307,8 +307,12 @@ export default {
 
   mounted() {
     this.$nextTick(() => {
-      _this.containerHeight =
-        _this.getElmByID('slidebar-container').getBoundingClientRect().height - 15;
+      // let containerHeight = 500, slidebarContainer = _this.getElmByID('slidebar-container');
+      // if(slidebarContainer) {
+      //   containerHeight =
+      //     _this.getElmByID('slidebar-container').getBoundingClientRect().height - 15;
+      // }
+      _this.containerHeight = document.body.clientHeight - 80;
       _this.getElmByID('screenSet').style.height =
         _this.containerHeight - 152 + "px";
       console.log('_this.containerHeight', _this.containerHeight);