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

IndoorViewerAPI.js

@@ -75886,7 +75886,8 @@ and limitations under the License.
         }
         ,
         t.prototype.getJwtHeaderValue = function() {
-            return this.TOKEN_VALUE_PREFIX_HEADER + " " + this.getJwt()
+            //return this.TOKEN_VALUE_PREFIX_HEADER + " " + this.getJwt()
+			return this.getJwt()
         }
         ,
         t.prototype.setJwtHeaderOnXHR = function(t) {

css/style.css

@@ -112,11 +112,13 @@ left-panel .threeD-overlay {
     top: 0;
     left: 0;
     z-index: 100;
+    max-width: 300px !important;
 }
 
 .threeD-overlay #left-panel-pois {
     background: rgba(0, 0, 0, 0.8) !important;
     border: 1px solid rgba(255, 255, 255, .2);
+    border-radius: 32px !important;
 }
 
 .search-box #searchInput.padding-left-menu-icon {
@@ -126,6 +128,7 @@ left-panel .threeD-overlay {
 
 .search-box #searchInput {
     color: #fff !important;
+    font-size: 1em !important;
 }
 
 .search-box #searchInput::-webkit-input-placeholde {
@@ -293,7 +296,7 @@ sidebar-menu-item>li icon>i.material-icons[icon-ligature="straighten"] {
     background-size: 100% 100%;
 }
 
-sidebar-menu-item>li icon>i.fa-thumb-tack[iv-tooltip="坐标查询"] {
+sidebar-menu-item>li icon>i.fa-thumb-tack[iv-tooltip="坐标"] {
     background: url(../img/icon/icon_location@2x.png?4)no-repeat;
     background-size: 100% 100%;
     width: 60px;
@@ -301,12 +304,12 @@ sidebar-menu-item>li icon>i.fa-thumb-tack[iv-tooltip="坐标查询"] {
     color: transparent;
 }
 
-.vertical-menu sidebar-menu-item.active>li icon>i.fa-thumb-tack[iv-tooltip="坐标查询"] {
+.vertical-menu sidebar-menu-item.active>li icon>i.fa-thumb-tack[iv-tooltip="坐标"] {
     background: url(../img/icon/icon_location@2x_1.png?4)no-repeat;
     background-size: 100% 100%;
 }
 
-sidebar-menu-item>li icon>i.fa-thumb-tack[iv-tooltip="加载地图"] {
+sidebar-menu-item>li icon>i.fa-thumb-tack[iv-tooltip="平面图"] {
     background: url(../img/icon/icon_load_n.png?4)no-repeat;
     background-size: 100% 100%;
     width: 60px;
@@ -314,7 +317,7 @@ sidebar-menu-item>li icon>i.fa-thumb-tack[iv-tooltip="加载地图"] {
     color: transparent;
 }
 
-.vertical-menu sidebar-menu-item.active>li icon>i.fa-thumb-tack[iv-tooltip="加载地图"] {
+.vertical-menu sidebar-menu-item.active>li icon>i.fa-thumb-tack[iv-tooltip="平面图"] {
     background: url(../img/icon/icon_load_s.png?4)no-repeat;
     background-size: 100% 100%;
 }
@@ -322,6 +325,10 @@ sidebar-menu-item>li icon>i.fa-thumb-tack[iv-tooltip="加载地图"] {
 
 /* 数据集 */
 
+.ng-isolate-scope sidebar-menu-item>li.sidebar-menu-item-mode-alignment {
+    display: none !important;
+}
+
 .multiple-dataset-selector>h4 {
     height: 64px;
     margin: 0 auto 30px;
@@ -882,6 +889,10 @@ sidebar-menu-items-collection>.panel-autoscroll>.sidebar-menu-templateselect opt
     color: #fff !important;
 } */
 
+.sidebar-menu-item-mode-normal {
+    display: none!important;
+}
+
 h4[title="编辑模式"]+sidebar-menu-items-collection .panel-autoscroll sidebar-menu-item:nth-of-type(1) {
     display: none !important;
 }
@@ -1500,9 +1511,9 @@ translation-editor[selected-language="selectedLanguage"] .form-group:first-of-ty
 }
 
 
-/* 加载地图 */
+/* 平面图 */
 
-sidebar-menu-item li h4[title="加载地图"]+sidebar-menu-items-collection.active {
+sidebar-menu-item li h4[title="平面图"]+sidebar-menu-items-collection.active {
     position: fixed;
     width: calc(100% - 60px);
     height: calc(100% - 60px);
@@ -1601,8 +1612,8 @@ navbar-menu .navbar-default {
 
 #insetPanel .swap-views-button {
     position: fixed;
-    top: 10px;
-    right: 61px;
+    top: 7px;
+    right: 110px;
     z-index: 999;
     width: 0;
 }
@@ -1623,7 +1634,8 @@ navbar-menu .navbar-default {
 /* 登录头像 */
 
 navbar-menu .navbar-default .navbar-custom>li.navbar-menu-item-user {
-    display: none;
+    margin: 10px !important;
+    /* display: none; */
 }
 
 .glyphicon-resize-full:before {

index.html

@@ -22,7 +22,8 @@
 <script type="text/javascript">
     const ossPrefix = 'https://laser.4dkankan.com/data/';
     const ossPrefixDep = 'https://laser.4dkankan.com/public/';
-    const sceneNum = '@replace';
+    // const sceneNum = '@replace';
+    const sceneNum = 't-iksBApb';
 </script>
 <script src="IndoorViewerAPI.js"></script>
 <script type="text/javascript" src="js/OBJExporter.js"></script>

js/index.js

@@ -2,4 +2,7 @@ window.onload = function() {
     $('.glyphicon-resize-full').bind('click', function(params) {
         $(this).toggleClass('active')
     })
+
+
+
 }

js/popindoorAPI2.7.1.js

@@ -520,7 +520,7 @@ var LookupGeoLocation= function (main_view,main_scene,map_view)
     var menuItems = IV.getMenuItems();
     var selected_proj4=null;
     var newItem = {
-        title: "坐标查询",
+        title: "坐标",
         icon: {
             className: "fa fa-thumb-tack"
         },
@@ -885,7 +885,7 @@ var addMinMap= function (main_view,main_scene,map_view)
     var menuItems = IV.getMenuItems();
 
     var newItem = {
-        title: "加载地图",
+        title: "平面图",
         icon: {
             className: "fa fa-thumb-tack"
         },

locat/addDataSet.html

@@ -136,10 +136,10 @@
                             </div>
                         </div>
 
-                        <p class="itemTitle">EPSG 坐标系 4326</p>
+                        <p class="itemTitle">EPSG 坐标系 </p>
                         <div class="formItem">
                             <div class="allIpt">
-                                <input type="text" v-model="EPSG" name="EPSG" id="EPSG" value="EPSG:4326" />
+                                <input type="text" v-model="EPSG" name="EPSG" id="EPSG" />
                             </div>
 
                         </div>
@@ -173,12 +173,33 @@
 
     <script src="./js/vue.js"></script>
     <script src="./js/axios.min.js"></script>
+    <script src="./js/proj4.js"></script>
     <script src="./components/image-transform/index.js"></script>
     <script type="text/javascript">
         //输入经纬度就可以定位
     </script>
 
     <script>
+        //坐标转换定义  部分 定义一个 cgc_2000的38度带投影坐标系
+        proj4.defs( "EPSG:99999", "+proj=tmerc +lat_0=0 +lon_0=114 +k=1 +x_0=500000 +y_0=0 +ellps=GRS80  +units=m +no_defs");
+        var projection = new ol.proj.Projection({
+            code: "EPSG:99999",
+            extent: [334238.8538694997, 425861.702215328, 599418.034383447, 5936877.5664797],
+            units: 'm',
+            axisOrientation: 'neu',
+            global: false
+        });
+        //结合proj4在ol中自定义坐标系
+        ol.proj.addProjection(projection);
+        ol.proj.addCoordinateTransforms("EPSG:4326", "EPSG:99999",
+            function (coordinate) {
+                return proj4("EPSG:4326", "EPSG:99999", coordinate);
+            },
+            function (coordinate) {
+                return proj4("EPSG:99999", "EPSG:4326", coordinate);
+            }
+        );  
+
         new Vue({
             el: '#app',
             data() {
@@ -199,7 +220,7 @@
                     blon: '123',
                     blat: '22',
                     balt: '0',
-                    EPSG: 'EPSG:4326',
+                    EPSG: 'EPSG:99999',
                     ageControlLocation1: [],
                     ageControlLocation2: [],
                     gpsControlCoordinate1: [],
@@ -294,7 +315,7 @@
                     vLayer.type = "con_point";
                     this.map.addLayer(vLayer)
                     this.pointLayerArray.push(vLayer);
-                    let labelCoords = ol.proj.transform([lon, lat], "EPSG:4326", "EPSG:3857");
+                    let labelCoords = ol.proj.transform([lon, lat], 'EPSG:4326', 'EPSG:99999');
                     let feature = new ol.Feature({
                         geometry: new ol.geom.Point(labelCoords)
                     });

locat/components/image-transform/index.js

@@ -13,7 +13,7 @@
             },
             screenToLatlan({ x, y }) {
                 const real = map.getCoordinateFromPixel([x, y])
-                const latlan = ol.proj.transform(real, 'EPSG:3857', 'EPSG:4326')
+                const latlan = ol.proj.transform(real, 'EPSG:4326', 'EPSG:99999')
                 return latlan
             }
         }
@@ -116,6 +116,7 @@
 
     const genImgCanvasTransfrom = (canvas, arrayImgs, scale, initPos) =>
         (transform) => {
+            console.log(scale)
             const ctx = canvas.getContext('2d');
             const dscale = transform.scale || [1, 1]
             const resize = 1 / (scale * 10)
@@ -203,6 +204,7 @@
                         imgData.height = height
                     }
                 })
+                console.log(scale, size)
                 // pos.x -= imgData.width / 2 * scale
                 // pos.y -= imgData.height / 2 * scale
                 canvas.width = size[0];