Merge branch 'master' of http://192.168.0.115:3000/4dkankan/laser_v1

IndoorViewerAPI.js

@@ -61687,7 +61687,7 @@ and limitations under the License.
                         switch (e.label) {
                         case 0:
 							//window.eventBus.emit('my-event');
-							$('sidebar-menu-item li').has('span[data-original-title="控制点"]').show()
+							//$('sidebar-menu-item li').has('span[data-original-title="控制点"]').show()
                             return this.JWTTokenService.saveJwt(t.token),
                             this.currentUser = this.UserRepository.create(),
                             this.currentUser.fillFromData(t.principal),
@@ -61779,7 +61779,7 @@ and limitations under the License.
             this.loggedInWithToken = !1,
             this.clearRefreshTimers(),
             this.fetchCurrentUser().then((function() {
-				$('sidebar-menu-item li').has('span[data-original-title="控制点"]').hide()
+				//$('sidebar-menu-item li').has('span[data-original-title="控制点"]').hide()
 			
                 return t.sendAuthenticationChanged()
             }

js/popindoorAPI2.7.1.js

@@ -998,7 +998,7 @@ var Setting = function() {
         }
 
         load_menu();
-        window.eventBus = new EventBus();
+        // window.eventBus = new EventBus();
         // window.eventBus.on('my-event', function() {
         //     alert(1)
         //     load_menu();