projects/mescc/develop #24

Merged
juzi merged 94 commits from projects/mescc/develop into projects/mescc/main 2024-05-31 14:21:24 +08:00
4 changed files with 13 additions and 4 deletions
Showing only changes of commit ad8e6972fb - Show all commits

View File

@ -1,7 +1,7 @@
### ###
# @Author: zhp # @Author: zhp
# @Date: 2024-04-28 13:42:51 # @Date: 2024-04-28 13:42:51
# @LastEditTime: 2024-05-11 08:52:30 # @LastEditTime: 2024-05-13 13:30:20
# @LastEditors: zhp # @LastEditors: zhp
# @Description: # @Description:
### ###

View File

@ -159,6 +159,7 @@ export default {
} }
.chart { .chart {
width: 390px;
align-self: stretch; align-self: stretch;
height: 280px; height: 280px;
} }

View File

@ -10,10 +10,12 @@
<div class="cities"> <div class="cities">
<CopilotButtons :options="cities" @update:active="handleCityUpdate" /> <CopilotButtons :options="cities" @update:active="handleCityUpdate" />
</div> </div>
<div class="chart" ref="chart"></div> <div style="padding: 0 30px;width: 90%;">
<div class="chart" ref="chart"></div>
</div>
<div class="legend" v-if="1"> <div class="legend" v-if="1">
<div class="legend-item" v-for="(lgd,index) in legendList" :key="lgd.name"> <div class="legend-item" v-for="(lgd,index) in legendList" :key="lgd.name">
<div > <div>
<span :style="'backgroundColor:' + colors[index%5]" class="legend-item__chart"></span> <span :style="'backgroundColor:' + colors[index%5]" class="legend-item__chart"></span>
<span :style="'color:' + colors[index%5]" class="legend-item__label">{{ lgd.name }}</span> <span :style="'color:' + colors[index%5]" class="legend-item__label">{{ lgd.name }}</span>
</div> </div>
@ -108,6 +110,8 @@ export default {
} }
.chart { .chart {
margin-left: 5%;
width: 290px;
align-self: stretch; align-self: stretch;
height: 280px; height: 280px;
} }

View File

@ -25,6 +25,7 @@ export default {
props: {}, props: {},
data() { data() {
return { return {
weatherInterval:null,
isFullscreen: false, isFullscreen: false,
times: null, times: null,
weather:'', weather:'',
@ -43,6 +44,9 @@ export default {
;this.getTimes() ;this.getTimes()
this.getWeather() this.getWeather()
}, },
destroyed() {
clearInterval(this.weatherInterval)
},
methods: { methods: {
getTimes() { getTimes() {
setInterval(this.getTimesInterval, 1000); setInterval(this.getTimesInterval, 1000);
@ -84,7 +88,7 @@ export default {
day day
}, },
async getWeather() { async getWeather() {
setInterval(() => { this.weatherInterval = setInterval(() => {
fetch(`https://restapi.amap.com/v3/weather/weatherInfo?key=a20a2093715deb9bd68e423c34a2ac3c&city=110108`, { fetch(`https://restapi.amap.com/v3/weather/weatherInfo?key=a20a2093715deb9bd68e423c34a2ac3c&city=110108`, {
method: 'get', method: 'get',
extensions: 'base', extensions: 'base',