diff --git a/resources/java/app/application.yml b/resources/java/app/application.yml index 7753f07..41e4c70 100644 --- a/resources/java/app/application.yml +++ b/resources/java/app/application.yml @@ -1,7 +1,7 @@ server: host: 127.0.0.1 port: 8848 - path: C:\Users\MSI\AppData\Roaming\dzsp_shijingjun_offline_Y_save + path: C:\Users\Administrator\AppData\Roaming\dzsp_shijingjun_offline_Y_save poi: global: enabled: false diff --git a/resources/java/app/yjearth.jar b/resources/java/app/yjearth.jar index 0084284..31d745d 100644 Binary files a/resources/java/app/yjearth.jar and b/resources/java/app/yjearth.jar differ diff --git a/src/renderer/src/views/components/headers/components/weather/index.vue b/src/renderer/src/views/components/headers/components/weather/index.vue index 020287e..23b081d 100644 --- a/src/renderer/src/views/components/headers/components/weather/index.vue +++ b/src/renderer/src/views/components/headers/components/weather/index.vue @@ -109,7 +109,7 @@ class="input height custom-number-input with-arrows arrows2" type="number" :min="0.1" - :max="999999999" + :max="9999" v-model="weatherData.speed" @change="changSpeed" size="small" @@ -264,16 +264,19 @@ onMounted(() => { weatherData.softShadow = data.softShadow weatherData.darkness = data.darkness weatherData.speed = data.speed - data?.wearther.forEach((item, index) => { - list[index].status = item.status - }) + // data?.wearther.forEach((item, index) => { + // list[index].status = item.status + // }) } // list = data.wearther switchStatus.value = true sunshine = window.sunshine myData = formatTimeToBeijing() } - + let wearther = JSON.parse(localStorage.getItem('weartherSetting')) + wearther?.forEach((item, index) => { + list[index].status = item.status + }) timeline && timeline.clear() timeline = new TimeLine(window.earth, weatherData.speed, switchStatus.value, myData, initCallback) @@ -302,10 +305,11 @@ onBeforeUnmount(() => { darkness: weatherData.darkness, speed: weatherData.speed, time: weatherData.time, - timeerTime: document.getElementById('currentTime').textContent, - wearther: list + timeerTime: document.getElementById('currentTime').textContent + // wearther: list } localStorage.setItem('shineSetting', JSON.stringify(data)) + localStorage.setItem('weartherSetting', JSON.stringify(list)) // sunshine && sunshine.remove() timeline && timeline.clear() emit('isPause', document.getElementById('timePause').textContent == '播放') @@ -403,7 +407,7 @@ var decrementValue = () => { watch( () => weatherData.speed, (newValue) => { - if (newValue < 0 || newValue == 0) { + if (newValue < 0 || newValue == 0 || newValue > 9999) { return } if (!currWeatherData) { @@ -416,11 +420,13 @@ watch( } ) var incrementValue2 = () => { - weatherData.speed = new Decimal(weatherData.speed).add(1).toNumber() + let val = new Decimal(weatherData.speed).add(1).toNumber() + weatherData.speed = Math.min(val, 9999) } var decrementValue2 = () => { let val = new Decimal(weatherData.speed).sub(1).toNumber() - weatherData.speed = val < 0 || val == 0 ? 0.1 : val + // weatherData.speed = val < 0 || val == 0 ? 0.1 : val + weatherData.speed = Math.max(val, 0.1) } var getCurrentTime = () => { const now = new Date() @@ -549,7 +555,11 @@ var changDarkness = () => { sunshine && (sunshine.darkness = 1 - weatherData.darkness) } var changSpeed = () => { - weatherData.speed = weatherData.speed < 0 || weatherData.speed == 0 ? 0.1 : weatherData.speed + if (weatherData.speed < 0 || weatherData.speed == 0) { + weatherData.speed = 0.1 + } else if (weatherData.speed > 9999) { + weatherData.speed = 9999 + } weatherData.currWeather = false sunshine && (sunshine.speed = weatherData.speed) timeline.setSpeed(weatherData.speed) diff --git a/src/renderer/src/views/components/headers/index.vue b/src/renderer/src/views/components/headers/index.vue index 75083a8..1c19a54 100644 --- a/src/renderer/src/views/components/headers/index.vue +++ b/src/renderer/src/views/components/headers/index.vue @@ -147,33 +147,33 @@ var clickFun = (childData) => { darkness: 0.4, speed: 1, time: formattedDate, - timeerTime: '00:00:00', - wearther: [ - // 雨 - { - name: '雨', - svg: 'rain', - status: false - }, - // 雪 - { - name: '雪', - svg: 'snow', - status: false - }, - //雾 - { - name: '雾', - svg: 'fog', - status: false - }, - //星空 - { - name: '星空', - svg: 'skystarry', - status: false - } - ] + timeerTime: '00:00:00' + // wearther: [ + // // 雨 + // { + // name: '雨', + // svg: 'rain', + // status: false + // }, + // // 雪 + // { + // name: '雪', + // svg: 'snow', + // status: false + // }, + // //雾 + // { + // name: '雾', + // svg: 'fog', + // status: false + // }, + // //星空 + // { + // name: '星空', + // svg: 'skystarry', + // status: false + // } + // ] } } //光照 @@ -191,11 +191,11 @@ var clickFun = (childData) => { //天气效果 // if ((window as any).checkAuthIsValid) { - data.wearther.forEach((item) => { - if (item.status) { - func[item.svg](item) - } - }) + // data.wearther.forEach((item) => { + // if (item.status) { + // func[item.svg](item) + // } + // }) // } else { // // ElMessage({ // // message: '您没有该功能的权限', diff --git a/src/renderer/src/views/home/index.vue b/src/renderer/src/views/home/index.vue index 7ff8f7f..894dfb6 100644 --- a/src/renderer/src/views/home/index.vue +++ b/src/renderer/src/views/home/index.vue @@ -160,6 +160,8 @@ if (!localStorage.getItem('defaultLabelStyle')) { let defaultLabelStyle = getdefaultLabelStyle(null) localStorage.setItem('defaultLabelStyle', JSON.stringify(defaultLabelStyle)) } +//移除天气设置 +localStorage.removeItem('weartherSetting') eventBus.on('openDialog', async (sourceType: any, id: any) => { if (dynamicComponentRef.value && dynamicComponentRef.value.close) {