同步最新代码

marsgis · Mar 18, 2022 · 5cc1ea3 · 5cc1ea3
1 parent 0de3612
commit 5cc1ea3
Show file tree

Hide file tree

Showing 387 changed files with 65,520 additions and 15,222 deletions.
diff --git a/es5-project-link-vue2/public/config/config.json b/es5-project-link-vue2/public/config/config.json
@@ -61,7 +61,7 @@
       }
     },
     "terrain": {
-      "url": "{dataServer}/terrain",
+      "url": "//data.mars3d.cn/terrain",
       "show": true
     },
     "basemaps": [

diff --git a/es5-project-link-vue2/public/config/widget.json b/es5-project-link-vue2/public/config/widget.json
@@ -235,6 +235,16 @@
       },
       "disableOther": false
     },
+    {
+      "name": "Socket通信设置",
+      "uri": "widgets/plotSocket/widget.js",
+      "windowOptions": {
+        "position": {
+          "top": 10
+        }
+      },
+      "disableOther": false
+    },
     {
       "name": "路线导航",
       "uri": "widgets/queryRoute/widget.js",
@@ -252,6 +262,40 @@
       "uri": "widgets/print/widget.js",
       "autoDisable": false,
       "disableOther": false
+    },
+    {
+      "name": "企业-地图点",
+      "uri": "widgetsTS/qyPoint/widget.js",
+      "autoDisable": false,
+      "disableOther": false
+    },
+    {
+      "name": "企业详情",
+      "uri": "widgetsTS/qyDetailsView/widget.js",
+      "windowOptions": {
+        "skin": "layer-mars-dialog2",
+        "position": {
+          "top": 50,
+          "bottom": 50,
+          "left": 120,
+          "right": 120
+        }
+      },
+      "disableOther": false
+    },
+    {
+      "name": "企业视频监控",
+      "uri": "widgetsTS/qyVideo/widget.js",
+      "windowOptions": {
+        "skin": "layer-mars-dialog2",
+        "position": {
+          "top": 50,
+          "bottom": 50,
+          "left": 120,
+          "right": 120
+        }
+      },
+      "disableOther": false
     }
   ]
 }
diff --git a/es5-project-link-vue2/public/css/style.css b/es5-project-link-vue2/public/css/style.css
@@ -372,19 +372,6 @@ li {
   right: 50px;
 }
 
-.loadingIndicator {
-  display: block;
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  margin-top: -33px;
-  margin-left: -33px;
-  width: 66px;
-  height: 66px;
-  background-position: center;
-  background-repeat: no-repeat;
-  background-image: url(../img/loader.gif);
-}
 
 .mars-table {
   width: 100%;

diff --git a/es5-project-link-vue2/public/lib/Cesium/Cesium.d.ts b/es5-project-link-vue2/public/lib/Cesium/Cesium.d.ts
diff --git a/es5-project-link-vue2/public/lib/Cesium/Cesium.js b/es5-project-link-vue2/public/lib/Cesium/Cesium.js
diff --git a/es5-project-link-vue2/public/lib/Cesium/ThirdParty/Workers/draco_decoder_nodejs.js b/es5-project-link-vue2/public/lib/Cesium/ThirdParty/Workers/draco_decoder_nodejs.js
diff --git a/es5-project-link-vue2/public/lib/Cesium/ThirdParty/draco_decoder.wasm b/es5-project-link-vue2/public/lib/Cesium/ThirdParty/draco_decoder.wasm
diff --git a/.../Workers/AttributeCompression-6b1e8028.js → .../Workers/AttributeCompression-0ee09568.js b/.../Workers/AttributeCompression-6b1e8028.js → .../Workers/AttributeCompression-0ee09568.js
diff --git a/es5-project-link-vue2/public/lib/Cesium/Workers/AxisAlignedBoundingBox-0ebb51f1.js b/es5-project-link-vue2/public/lib/Cesium/Workers/AxisAlignedBoundingBox-0ebb51f1.js
diff --git a/es5-project-link-vue2/public/lib/Cesium/Workers/AxisAlignedBoundingBox-b31bb45f.js b/es5-project-link-vue2/public/lib/Cesium/Workers/AxisAlignedBoundingBox-b31bb45f.js
diff --git a/...ium/Workers/BoundingRectangle-472718f2.js → ...ium/Workers/BoundingRectangle-8d15888c.js b/...ium/Workers/BoundingRectangle-472718f2.js → ...ium/Workers/BoundingRectangle-8d15888c.js