Merge remote-tracking branch 'origin/pet' into pet

代码格式化，没用更改任何代码
1.线上map正式地址
2024-04-29 17:38:52 +08:00 · 2024-04-29 16:21:23 +08:00 · 2024-04-29 09:15:35 +08:00
5 changed files with 51 additions and 48 deletions
--- a/src/views/firefighting/points/components/edit.vue
+++ b/src/views/firefighting/points/components/edit.vue
@ -167,11 +167,12 @@ import { upload } from '@/utils/upload'
 import SelectTree from '@/components/SelectTree'
 import waves from '@/directive/waves' // waves directive
 import TiandiMap from '@/components/TianMap/TiandiMap.vue'
-import RyDragEntity from "../../../map/js/ry_dragentity";
-import DragEntity from "../../../map/js/dragentity";
+import RyDragEntity from '../../../map/js/ry_dragentity'
+import DragEntity from '../../../map/js/dragentity'

 let viewer = null
 let drag = null
+// eslint-disable-next-line no-unused-vars
 let ry_drag = null
 var tiandituTk = 'e8a16137fd226a62a23cc7ba5c9c78ce'
 var subdomains = ['0', '1', '2', '3', '4', '5', '6', '7']
@ -389,11 +390,10 @@ export default {
      viewer.cesiumWidget.screenSpaceEventHandler.removeInputAction(Cesium.ScreenSpaceEventType.LEFT_CLICK)
      // 去掉entity的点击事件 end
      this.handler = new Cesium.ScreenSpaceEventHandler(viewer.scene.canvas)
-      let id
      this.handler.setInputAction(movement => {
+        // eslint-disable-next-line no-unused-vars
        var cartesian = this.getCatesian3FromPX(movement.position)
      }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
-
    },
    getCatesian3FromPX: function(px) {
      if (viewer && px) {
@ -421,8 +421,11 @@ export default {
            if (cartesian) {
              const cartographic = Cesium.Cartographic.fromCartesian(cartesian)
              if (cartographic.height < 0) cartographic.height = 0
+              // eslint-disable-next-line prefer-const,one-var
              let lon = Cesium.Math.toDegrees(cartographic.longitude),
+                // eslint-disable-next-line prefer-const
                lat = Cesium.Math.toDegrees(cartographic.latitude),
+                // eslint-disable-next-line prefer-const
                height = cartographic.height
              cartesian = this.transformWGS84ToCartesian({
                lng: lon,
--- a/static/mapshow.html
+++ b/static/mapshow.html
@ -5,13 +5,13 @@
 <head>
  <meta charset="utf-8"/>
  <title>hello-jsmap</title>
-  <script src="http://192.168.0.31:8089/joysuch/jsmap/jsmap.js" type="text/javascript"></script>
-  <link type="text/css" href="http://192.168.0.31:8089/joysuch/jsmap/jsmap.css" rel="stylesheet"/>
+  <script src="http://192.168.192.201:7024/joysuch/jsmap/jsmap.js" type="text/javascript"></script>
+  <link type="text/css" href="http://192.168.192.201:7024/joysuch/jsmap/jsmap.css" rel="stylesheet"/>
  <!--  <script src="http://mapdemo.joysuch.com/lib/jsmap/jsmap.js" type="text/javascript"></script>-->
  <!--  <link type="text/css" href="http://mapdemo.joysuch.com/lib/jsmap/jsmap.css" rel="stylesheet"/>-->
-  <link rel="stylesheet" href="http://192.168.0.31:8089/joysuch/LocalAssets/css/animation/pop.css">
-  <link rel="stylesheet" href="http://192.168.0.31:8089/joysuch/LocalAssets/css/animation/loading.css">
-  <link rel="stylesheet" href="http://192.168.0.31:8089/joysuch/LocalAssets/css/dom.css">
+  <link rel="stylesheet" href="http://192.168.192.201:7024/joysuch/LocalAssets/css/animation/pop.css">
+  <link rel="stylesheet" href="http://192.168.192.201:7024/joysuch/LocalAssets/css/animation/loading.css">
+  <link rel="stylesheet" href="http://192.168.192.201:7024/joysuch/LocalAssets/css/dom.css">
  <style>
    .jsmap-animation-point,
    .jsmap-animation-point:after,
@ -326,7 +326,7 @@
      mapType: jsmap.JSMapType.MAP_3D,
      //必要，地图路径
      // mapServerURL: 'http://mapdemo.joysuch.com',
-      mapServerURL: 'http://192.168.0.31:8089/joysuch/jsmap/data/map',
+      mapServerURL: 'http://192.168.192.201:7024/joysuch/jsmap/data/map',
      openingAnimation: false,
      enableLighting: true,
      enableShadows: true,
--- a/static/mapshowbox.html
+++ b/static/mapshowbox.html
@ -5,13 +5,13 @@
 <head>
  <meta charset="utf-8"/>
  <title>hello-jsmap</title>
-  <script src="http://192.168.0.31:8089/joysuch/jsmap/jsmap.js" type="text/javascript"></script>
-  <link type="text/css" href="http://192.168.0.31:8089/joysuch/jsmap/jsmap.css" rel="stylesheet"/>
+  <script src="http://192.168.192.201:7024/joysuch/jsmap/jsmap.js" type="text/javascript"></script>
+  <link type="text/css" href="http://192.168.192.201:7024/joysuch/jsmap/jsmap.css" rel="stylesheet"/>
  <!--  <script src="http://mapdemo.joysuch.com/lib/jsmap/jsmap.js" type="text/javascript"></script>-->
  <!--  <link type="text/css" href="http://mapdemo.joysuch.com/lib/jsmap/jsmap.css" rel="stylesheet"/>-->
-  <link rel="stylesheet" href="http://192.168.0.31:8089/joysuch/LocalAssets/css/animation/pop.css">
-  <link rel="stylesheet" href="http://192.168.0.31:8089/joysuch/LocalAssets/css/animation/loading.css">
-  <link rel="stylesheet" href="http://192.168.0.31:8089/joysuch/LocalAssets/css/dom.css">
+  <link rel="stylesheet" href="http://192.168.192.201:7024/joysuch/LocalAssets/css/animation/pop.css">
+  <link rel="stylesheet" href="http://192.168.192.201:7024/joysuch/LocalAssets/css/animation/loading.css">
+  <link rel="stylesheet" href="http://192.168.192.201:7024/joysuch/LocalAssets/css/dom.css">
  <style>
    .jsmap-animation-point,
    .jsmap-animation-point:after,
@ -329,7 +329,7 @@
      mapType: jsmap.JSMapType.MAP_3D,
      //必要，地图路径
      // mapServerURL: 'http://mapdemo.joysuch.com',
-      mapServerURL: 'http://192.168.0.31:8089/joysuch/jsmap/data/map',
+      mapServerURL: 'http://192.168.192.201:7024/joysuch/jsmap/data/map',
      mapScaleLevelRange: [15,20], //地图缩放范围，默认[1,24]
      openingAnimation: false, // 是否开启开场动画，默认true
      lightingColor: '#3C4040', // 光照颜色,修改3D地图以外地图的遮罩颜色
--- a/static/mapshowimage.html
+++ b/static/mapshowimage.html
@ -5,13 +5,13 @@
 <head>
  <meta charset="utf-8"/>
  <title>hello-jsmap</title>
-  <script src="http://192.168.0.31:8089/joysuch/jsmap/jsmap.js" type="text/javascript"></script>
-  <link type="text/css" href="http://192.168.0.31:8089/joysuch/jsmap/jsmap.css" rel="stylesheet"/>
+  <script src="http://192.168.192.201:7024/joysuch/jsmap/jsmap.js" type="text/javascript"></script>
+  <link type="text/css" href="http://192.168.192.201:7024/joysuch/jsmap/jsmap.css" rel="stylesheet"/>
  <!--  <script src="http://mapdemo.joysuch.com/lib/jsmap/jsmap.js" type="text/javascript"></script>-->
  <!--  <link type="text/css" href="http://mapdemo.joysuch.com/lib/jsmap/jsmap.css" rel="stylesheet"/>-->
-  <link rel="stylesheet" href="http://192.168.0.31:8089/joysuch/LocalAssets/css/animation/pop.css">
-  <link rel="stylesheet" href="http://192.168.0.31:8089/joysuch/LocalAssets/css/animation/loading.css">
-  <link rel="stylesheet" href="http://192.168.0.31:8089/joysuch/LocalAssets/css/dom.css">
+  <link rel="stylesheet" href="http://192.168.192.201:7024/joysuch/LocalAssets/css/animation/pop.css">
+  <link rel="stylesheet" href="http://192.168.192.201:7024/joysuch/LocalAssets/css/animation/loading.css">
+  <link rel="stylesheet" href="http://192.168.192.201:7024/joysuch/LocalAssets/css/dom.css">
  <style>
    .jsmap-animation-point,
    .jsmap-animation-point:after,
@ -336,7 +336,7 @@
      mapType: jsmap.JSMapType.MAP_3D,
      //必要，地图路径
      // mapServerURL: 'http://mapdemo.joysuch.com',
-      mapServerURL: 'http://192.168.0.31:8089/joysuch/jsmap/data/map',
+      mapServerURL: 'http://192.168.192.201:7024/joysuch/jsmap/data/map',
      mapScaleLevelRange: [15,20], //地图缩放范围，默认[1,24]
      openingAnimation: false,
      enableLighting: true,
Author	SHA1	Message	Date
guoyuepeng	d270d23494	Merge remote-tracking branch 'origin/pet' into pet	2024-04-29 17:38:52 +08:00
liujun	407af0be27	代码格式化，没用更改任何代码	2024-04-29 16:21:23 +08:00
guoyuepeng	223e857db7	1.线上map正式地址	2024-04-29 09:15:35 +08:00