修改

resources/java/app/application.yml

@@ -1,6 +1,6 @@
 server:
   host: 127.0.0.1
-  port: 8849
+  port: 8845
   path: C:\Users\Administrator\AppData\Roaming\dzsp_shijingjun_offline_Y_save
 poi:
   global:

src/renderer/src/views/components/headers/components/weather/index.vue

@@ -88,8 +88,8 @@
                 class="input height custom-number-input with-arrows"
                 type="number"
                 step="0.1"
-                min="0"
+                :min="0"
-                max="1"
+                :max="1"
                 v-model="weatherData.darkness"
                 @change="changDarkness"
               >
@@ -108,8 +108,8 @@
               <el-input
                 class="input height custom-number-input with-arrows arrows2"
                 type="number"
-                min="-9999999"
+                :min="0.1"
-                max="999999999"
+                :max="999999999"
                 v-model="weatherData.speed"
                 @change="changSpeed"
                 size="small"
@@ -379,8 +379,11 @@ var getDateTimeString = () => {
 watch(
   () => weatherData.darkness,
   (newValue) => {
+    if (newValue < 0 || newValue > 1) {
+      return
+    }
     if (sunshine) {
-      sunshine.darkness = newValue
+      sunshine.darkness = 1 - newValue
     }
   }
 )
@@ -400,6 +403,9 @@ var decrementValue = () => {
 watch(
   () => weatherData.speed,
   (newValue) => {
+    if (newValue < 0 || newValue == 0) {
+      return
+    }
     if (!currWeatherData) {
       weatherData.currWeather = false
     } else {
@@ -413,7 +419,8 @@ var incrementValue2 = () => {
   weatherData.speed = new Decimal(weatherData.speed).add(1).toNumber()
 }
 var decrementValue2 = () => {
-  weatherData.speed = new Decimal(weatherData.speed).sub(1).toNumber()
+  let val = new Decimal(weatherData.speed).sub(1).toNumber()
+  weatherData.speed = val < 0 || val == 0 ? 0.1 : val
 }
 var getCurrentTime = () => {
   const now = new Date()
@@ -461,7 +468,7 @@ var switchFunc = () => {
       sunshine = window.sunshine
       sunshine.timeBar(document.getElementById('currentTime').textContent)
       if (weatherData) {
-        sunshine.darkness = weatherData.darkness
+        sunshine.darkness = 1 - weatherData.darkness
         sunshine.speed = weatherData.speed
         sunshine.softShadow = weatherData.softShadow
       }
@@ -534,9 +541,15 @@ var clickTimeIcon = (item: any) => {
 }
 
 var changDarkness = () => {
-  sunshine && (sunshine.darkness = weatherData.darkness)
+  if (weatherData.darkness < 0) {
+    weatherData.darkness = 0
+  } else if (weatherData.darkness > 1) {
+    weatherData.darkness = 1
+  }
+  sunshine && (sunshine.darkness = 1 - weatherData.darkness)
 }
 var changSpeed = () => {
+  weatherData.speed = weatherData.speed < 0 || weatherData.speed == 0 ? 0.1 : weatherData.speed
   weatherData.currWeather = false
   sunshine && (sunshine.speed = weatherData.speed)
   timeline.setSpeed(weatherData.speed)

src/renderer/src/views/components/headers/components/weather/timeLIne.ts

@@ -81,6 +81,7 @@ export default class TimeLine {
       //   })
       // } else {
       that.pauseed = !that.pauseed;
+
       if (that.pauseed) {//暂停
         that.pausedTime = performance.now(); // 记录暂停时刻
         document.getElementById('timePause').textContent = '播放';
@@ -88,7 +89,7 @@ export default class TimeLine {
         that.sdk.viewer && (that.sdk.viewer.clock.shouldAnimate = false)
 
         //判断当没有开启光照时,点击停止播放时关闭实时光照按钮
-        if (document.getElementById('weatherSwitch').style.color == 'rgba(var(--color-base1), 1)') {
+        if (document.getElementById('weatherSwitch').style.color == 'rgba(var(--color-base1), 1)' || document.getElementById('weatherSwitch').style.color == 'rgb(255, 255, 255)') {
           callback(false)
         }
       } else {//播放

src/renderer/src/views/components/headers/index.vue

@@ -186,22 +186,22 @@ var clickFun = (childData) => {
         hour: data.currWeather ? new Date().toLocaleTimeString() : data.timeerTime
       })
       window.sunshine = sunshine
-      sunshine.darkness = data.darkness
+      sunshine.darkness = 1 - data.darkness
       sunshine.softShadow = data.softShadow
 
       //天气效果
-      if ((window as any).checkAuthIsValid) {
+      // if ((window as any).checkAuthIsValid) {
       data.wearther.forEach((item) => {
         if (item.status) {
           func[item.svg](item)
         }
       })
-      } else {
+      // } else {
-        // ElMessage({
+      //   // ElMessage({
-        //   message: '您没有该功能的权限',
+      //   //   message: '您没有该功能的权限',
-        //   type: 'warning'
+      //   //   type: 'warning'
-        // })
+      //   // })
-      }
+      // }
     } else if (weatherClickPop.value === false) {
       sunshine = new YJ.Global.efflect.Sunshine(window.earth, {
         id: 123,

src/renderer/src/views/components/tree/index.vue

@@ -372,8 +372,7 @@ var key =
   (localStorage.getItem('AMapKey') && localStorage.getItem('AMapKey').split('|')[0]) ||
   'd88fcc689d1aa99866b2d0d83fd36677'
 var isOnline = false
-var loadAmp = (cb = () => {
+var loadAmp = (cb = () => {}) => {
-}) => {
   AMapLoader.reset()
   AMapLoader.load({
     key: key, // 申请好的Web端开发者Key，首次调用 load 时必填
@@ -841,4 +840,9 @@ defineExpose({
 .el-select-dropdown__loading {
   margin-top: -150px !important;
 }
+::v-deep .el-select-dropdown {
+  background: linear-gradient(180deg, rgba(0, 255, 255, 0.2) 0%, rgba(0, 255, 255, 0) 100%),
+    rgba(0, 0, 0, 0.6) !important;
+  border: 1px solid rgba(0, 255, 255, 0.5) !important;
+}
 </style>