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

IndoorViewerAPI.js

@@ -67,17 +67,17 @@
                         12: "",
                         13: "bda930fc91df500ed80d",
                         14: "4331acc2c778ecc64c4a",
-                        15: "911fc079db6705d168db",
-                        16: "6063f7445eac865e067e",
-                        17: "82bbf60e16d46d39aea0",
-                        18: "74aff998a9a0809c55ec",
-                        19: "77825ef0e44aed4d6923",
-                        20: "6b25999da18928efa560",
-                        21: "6e35bf5486d7bec96c04",
-                        22: "5e732276a454498ed917",
-                        23: "8641b8fc3d6165bb187f",
-                        24: "4b5f0f3ea342b634f9c3",
-                        25: "1f3d6c9616e13f12f5f2"
+                        15: "",
+                        16: "",
+                        17: "",
+                        18: "",
+                        19: "",
+                        20: "",
+                        21: "",
+                        22: "",
+                        23: "",
+                        24: "",
+                        25: ""
                     }[t] + ".js"
                 }(t);
                 var c = new Error;

js/popindoorAPI2.7.1.js

@@ -124,9 +124,24 @@ var HighlightSiteModelLayer = function(main_view, main_scene, map_view, map_scen
             };
             sub_menu_items.push(menu_item)
         }
-        // add lock highlight
+
+        var userService = IV.injector.get("UserService");
+        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);
+        }
+        else{
+            var menu_items = IV.getMenuItems();
+            if (!userService.isAdmin()) {
+                if(menu_items[menu_items.length-1].title == '控制点'){
+                    menu_items.pop();
+                }
+            }
+        }
 
 
+        // add lock highlight
         that.onContextMenu = function(e) //点击测量图标执行删除功能
             {
                 var menu_items = [{
@@ -1024,9 +1039,9 @@ var Setting = function() {
             var highlightSiteModelLayer = new HighlightSiteModelLayer(main_view, main_scene, map_view, map_scene);
             map_view.addToScene(highlightSiteModelLayer);
         }
-        if (userService.isAdmin()) {
-            var myMap = new addMinMap(main_view, main_scene, map_view, map_scene);
-            main_view.addToScene(myMap);
+        if (userService.isAdmin()&&!IV.myMap) {
+            IV.myMap = new addMinMap(main_view, main_scene, map_view, map_scene);
+            main_view.addToScene(IV.myMap);
         }
     }
     IV.custom.settingSave = function(e) {

数据参考/数据方面的笔记.txt

@@ -137,6 +137,19 @@ NotoSansCJKsc-Regular.3d696b37feacacc5ade6.js      —————————
 fonts.5129d374a8ae9f620fd1.js              ——————————         8.js
 main.async.937f8f38454add70d57b.js			——————————         10.js
 vendors~main.async.cbcba49054e73e98695c.js		——————————         12.js
+14.4331acc2c778ecc64c4a.js						——————————         14.js
+15.911fc079db6705d168db.js						——————————         15.js
+16.6063f7445eac865e067e.js						——————————         16.js
+17.82bbf60e16d46d39aea0.js						——————————         17.js
+18.74aff998a9a0809c55ec.js						——————————         18.js
+19.77825ef0e44aed4d6923.js						——————————         19.js
+20.6b25999da18928efa560.js						——————————         20.js
+21.6e35bf5486d7bec96c04.js						——————————         21.js
+22.5e732276a454498ed917.js						——————————         22.js
+23.8641b8fc3d6165bb187f.js						——————————         23.js
+24.4b5f0f3ea342b634f9c3.js						——————————         24.js
+25.1f3d6c9616e13f12f5f2.js						——————————         25.js
+
 PointCloud.6891a103d9b18f6f5ac7.worker.js       ——————————         PointCloud.worker.js