瀏覽代碼

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

jinx 4 年之前
父節點
當前提交
02f8505fa5
共有 4 個文件被更改,包括 5 次插入4 次删除
  1. 1 1
      api/bundles
  2. 0 0
      components/upload-pointClound/index.js
  3. 2 2
      index.html
  4. 2 1
      main.js

+ 1 - 1
api/bundles

@@ -4,7 +4,7 @@
 		"group_write": 1,
 		"can_write": false
 	},
-	"id": 3,
+	"id": 1,
 	"serial": "abc",
 	"name": "4dage"
 }]

components/upload-Pointclound/index.js → components/upload-pointClound/index.js


+ 2 - 2
index.html

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

+ 2 - 1
main.js

@@ -52888,6 +52888,7 @@ and limitations under the License.
         
            let matchingUrls = [
                'api/images',
+               'api/site_model',
                'api/site_model/within',
                'api/site_model/within_polygon',
                'api/search/site_model',
@@ -152995,7 +152996,7 @@ and limitations under the License.
                        else if(a.indexOf('/poi/icon')>-1||a.indexOf('/poi/image')>-1){
                           a = '../../indoor/'+sceneNum+a.substring(a.indexOf('/poi/'));
                        }
-                               else if(a.indexOf('/api/jobs')>-1||a.indexOf('/api/site_model/validate')>-1||a.indexOf('/api/pointcloud/crop')>-1||a.indexOf('/api/newmeasurements')>-1||a.indexOf('/api/datasets')>-1||a.indexOf('/api/site_model/within_polygon')>-1||a.indexOf('/api/pois')>-1||a.indexOf('/api/poi_types')>-1||a.indexOf('/api/poi_type_groups')>-1||a.indexOf('/api/auth/token')>-1){
+                               else if(a.indexOf('/api/site_model')>-1||a.indexOf('/api/jobs')>-1||a.indexOf('/api/site_model/validate')>-1||a.indexOf('/api/pointcloud/crop')>-1||a.indexOf('/api/newmeasurements')>-1||a.indexOf('/api/datasets')>-1||a.indexOf('/api/site_model/within_polygon')>-1||a.indexOf('/api/pois')>-1||a.indexOf('/api/poi_types')>-1||a.indexOf('/api/poi_type_groups')>-1||a.indexOf('/api/auth/token')>-1){
                                    a = '../../indoor/'+sceneNum+a.substring(a.indexOf('/api/'));
                                }
                                y.open(o, a, !0),