|
@@ -224,16 +224,38 @@ export default defineComponent({
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
+ weathNum: 0,
|
|
|
// 获取天气数据
|
|
|
getWeatherData() {
|
|
|
- getWeather().then((res) => {
|
|
|
- let resResult: any = res;
|
|
|
- let content: any = resResult.content;
|
|
|
- if (content) {
|
|
|
- proxyData.temperature = content.temperature;
|
|
|
- proxyData.setWeatherKey(content);
|
|
|
- }
|
|
|
- });
|
|
|
+ // debugger
|
|
|
+ proxyData.weathNum = proxyData.weathNum + 1;
|
|
|
+ getWeather()
|
|
|
+ .then((res) => {
|
|
|
+ let resResult: any = res || {};
|
|
|
+ let content: any = resResult.content || {};
|
|
|
+ // content = {};
|
|
|
+ if (proxyData.weathNum < 10) {
|
|
|
+ if (
|
|
|
+ resResult.result == "success" &&
|
|
|
+ JSON.stringify(content) != "{}"
|
|
|
+ ) {
|
|
|
+ proxyData.temperature = content.temperature;
|
|
|
+ proxyData.setWeatherKey(content);
|
|
|
+ } else {
|
|
|
+ // debugger;
|
|
|
+ proxyData.getWeatherData();
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ proxyData.setWeatherKey(8);
|
|
|
+ }
|
|
|
+ })
|
|
|
+ .catch(() => {
|
|
|
+ if (proxyData.weathNum < 10) {
|
|
|
+ proxyData.getWeatherData();
|
|
|
+ } else {
|
|
|
+ proxyData.setWeatherKey(8);
|
|
|
+ }
|
|
|
+ });
|
|
|
},
|
|
|
timer: timer,
|
|
|
// 设置环境数据
|
|
@@ -264,6 +286,7 @@ export default defineComponent({
|
|
|
},
|
|
|
// 获取环境数据
|
|
|
queryEnvCurrentPage() {
|
|
|
+ proxyData.num = proxyData.num + 1;
|
|
|
queryEnvCurrent()
|
|
|
.then((res) => {
|
|
|
let resResult: any = res;
|
|
@@ -272,8 +295,6 @@ export default defineComponent({
|
|
|
} else {
|
|
|
proxyData.currentData = [];
|
|
|
}
|
|
|
- proxyData.num++;
|
|
|
- // proxyData.currentData = [];
|
|
|
if (proxyData.num < 10) {
|
|
|
if (proxyData.currentData && proxyData.currentData.length) {
|
|
|
proxyData.setEnvData();
|
|
@@ -311,6 +332,7 @@ export default defineComponent({
|
|
|
});
|
|
|
onMounted(() => {
|
|
|
proxyData.num = 0;
|
|
|
+ proxyData.weathNum = 0;
|
|
|
// 页面跳转修改
|
|
|
proxyData.changePage();
|
|
|
// 设置当前时间
|