|
@@ -127,7 +127,7 @@ var HighlightSiteModelLayer = function(main_view, main_scene, map_view, map_scen
|
|
|
|
|
|
var userService = IV.injector.get("UserService");
|
|
|
//如果没有打开控制点面板,就打开
|
|
|
- if (userService.isAdmin()&&!IV.myMap) {
|
|
|
+ if (userService.isAdmin() && !IV.myMap) {
|
|
|
var main_view = IV.getMainView();
|
|
|
IV.myMap = new addMinMap(main_view, main_scene, map_view, map_scene);
|
|
|
main_view.addToScene(IV.myMap);
|
|
@@ -135,7 +135,7 @@ var HighlightSiteModelLayer = function(main_view, main_scene, map_view, map_scen
|
|
|
//如果没有关闭控制点面板,就关闭
|
|
|
else if (!userService.isAdmin()) {
|
|
|
var menu_items = IV.getMenuItems();
|
|
|
- if(menu_items[menu_items.length-1].title == '控制点'){
|
|
|
+ if (menu_items[menu_items.length - 1].title == '控制点') {
|
|
|
menu_items.pop();
|
|
|
IV.myMap = null;
|
|
|
}
|
|
@@ -950,8 +950,6 @@ var Setting = function() {
|
|
|
var userService = IV.injector.get("UserService");
|
|
|
var general_setting = null;
|
|
|
var main_view = IV.getMainView();
|
|
|
- console.log('!!!!!!!!!!!!!!!!!!!!!!!')
|
|
|
- console.log(main_view)
|
|
|
var main_scene = main_view.scene;
|
|
|
var map_view = IV.getMapView();
|
|
|
var map_scene = map_view.scene;
|
|
@@ -1040,7 +1038,7 @@ var Setting = function() {
|
|
|
var highlightSiteModelLayer = new HighlightSiteModelLayer(main_view, main_scene, map_view, map_scene);
|
|
|
map_view.addToScene(highlightSiteModelLayer);
|
|
|
}
|
|
|
- if (userService.isAdmin()&&!IV.myMap) {
|
|
|
+ if (userService.isAdmin() && !IV.myMap) {
|
|
|
IV.myMap = new addMinMap(main_view, main_scene, map_view, map_scene);
|
|
|
main_view.addToScene(IV.myMap);
|
|
|
}
|