解决冲突

Merge branch 'main' of http://192.168.110.199:3000/lcj/xinnengy

.env.development

@@ -5,7 +5,14 @@ VITE_APP_TITLE = 新能源项目管理平台
 VITE_APP_ENV = 'development'
 
 # 开发环境
-VITE_APP_BASE_API = 'http://192.168.110.8:8899'
+# VITE_APP_BASE_API = 'http://192.168.110.119:8899'
+VITE_APP_BASE_API = 'http://58.17.134.85:8899'
+# GO开发环境
+VITE_APP_BASE_API_GO = 'http://58.17.134.85:8919'
+
+# 无人机接口地址
+
+VITE_APP_BASE_DRONE_API = 'http://58.17.134.85:9512'
 
 # 应用访问路径 例如使用前缀 /admin/
 VITE_APP_CONTEXT_PATH = '/'

.env.production

@@ -14,7 +14,9 @@ VITE_APP_MONITOR_ADMIN = '/admin/applications'
 VITE_APP_SNAILJOB_ADMIN = '/snail-job'
 
 # 生产环境
-VITE_APP_BASE_API = 'http://192.168.110.5:8899'
+VITE_APP_BASE_API = 'http://58.17.134.85:8899'
+# GO生产环境
+VITE_APP_BASE_API_GO = 'http://58.17.134.85:7363'
 
 # 是否在打包时开启压缩，支持 gzip 和 brotli
 VITE_BUILD_COMPRESS = gzip

.gitignore

@@ -1,11 +1,16 @@
 .DS_Store
 .history
 node_modules/
+public/image/
 dist/
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 **/*.log
+# 忽略所有 .tif 文件
+*.tif
+*.zip
+
 
 tests/**/coverage/
 tests/e2e/reports

index.html

@@ -209,7 +209,15 @@
         <div class="load_title">正在加载系统资源，请耐心等待</div>
       </div>
     </div>
-    <script src="./src/assets/sdk/YJEarth.min.js"></script>
+    <script type="text/javascript"
+		src="http://58.17.134.85:7363/changxieoffice/web-apps/apps/api/documents/api.js"></script>
+    <script src="/js/html-docx.js"></script>
+    <script src="/webrtc/adapter-7.4.0.min.js"></script>
+    <script src="/webrtc/jquery-1.12.2.min.js"></script>
+    <script src="/webrtc/srs.sdk.js"></script>
+
+    <script src="/sdk/YJEarth.min.js"></script>
+    <script src="/js/reconnecting-websocket.js"></script>
     <script type="module" src="/src/main.ts"></script>
   </body>
 </html>

package.json

@@ -13,13 +13,15 @@
     "preview": "vite preview",
     "lint:eslint": "eslint",
     "lint:eslint:fix": "eslint --fix",
-    "prettier": "prettier --write ."
+    "prettier": "prettier --write .",
+    "copy-cesium": "cpy './public/sdk/Cesium/{Workers,Assets,Widgets}' ./public/Cesium --flat --parents"
   },
   "repository": {
     "type": "git",
     "url": "https://gitee.com/JavaLionLi/plus-ui.git"
   },
   "dependencies": {
+    "@amap/amap-jsapi-loader": "^1.0.1",
     "@element-plus/icons-vue": "2.3.1",
     "@highlightjs/vue-plugin": "2.1.0",
     "@turf/turf": "^7.2.0",
@@ -34,17 +36,26 @@
     "echarts": "5.5.0",
     "element-plus": "2.8.8",
     "esbuild": "^0.25.0",
-    "file-saver": "2.0.5",
+    "ezuikit-js": "^8.1.10",
+    "file-saver": "^2.0.5",
     "fuse.js": "7.0.0",
+    "gcoord": "^1.0.7",
+    "geotiff": "^2.1.3",
     "highlight.js": "11.9.0",
     "image-conversion": "2.1.1",
     "js-cookie": "3.0.5",
     "js-md5": "^0.8.3",
     "jsencrypt": "3.3.2",
+    "jszip": "^3.10.1",
+    "leaflet": "^1.9.4",
+    "lodash": "^4.17.21",
+    "md5": "^2.3.0",
     "mitt": "^3.0.1",
     "nprogress": "0.2.0",
     "ol": "^10.5.0",
     "pinia": "2.2.6",
+    "proj4": "^2.19.3",
+    "proj4leaflet": "^1.0.2",
     "screenfull": "6.0.2",
     "spark-md5": "^3.0.2",
     "vue": "3.5.13",
@@ -66,12 +77,14 @@
     "@types/js-cookie": "3.0.6",
     "@types/node": "18.18.2",
     "@types/nprogress": "0.2.3",
+    "@types/proj4": "^2.5.6",
     "@unocss/preset-attributify": "0.64.1",
     "@unocss/preset-icons": "0.64.1",
     "@unocss/preset-uno": "0.64.1",
     "@vitejs/plugin-vue": "5.0.4",
     "@vue/compiler-sfc": "3.4.23",
     "autoprefixer": "10.4.18",
+    "cpy": "^11.1.0",
     "eslint": "9.15.0",
     "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-vue": "9.31.0",

public/Cesium/Assets/Textures/NaturalEarthII/tilemapresource.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+    <TileMap version="1.0.0" tilemapservice="http://tms.osgeo.org/1.0.0">
+      <Title>NE2_HR_LC_SR_W_DR_recolored.tif</Title>
+      <Abstract></Abstract>
+      <SRS>EPSG:4326</SRS>
+      <BoundingBox miny="-90.00000000000000" minx="-180.00000000000000" maxy="90.00000000000000" maxx="180.00000000000000"/>
+      <Origin y="-90.00000000000000" x="-180.00000000000000"/>
+      <TileFormat width="256" height="256" mime-type="image/jpg" extension="jpg"/>
+      <TileSets profile="geodetic">
+        <TileSet href="0" units-per-pixel="0.70312500000000" order="0"/>
+        <TileSet href="1" units-per-pixel="0.35156250000000" order="1"/>
+        <TileSet href="2" units-per-pixel="0.17578125000000" order="2"/>
+      </TileSets>
+    </TileMap>