@idmwx/idmui-gl4 2.1.2 → 2.1.4

package/dist/index.js

@@ -11995,7 +11995,7 @@ const om = {
     },
     currentTimestamp: {
       handler() {
-        this.currentTimestamp ? (this.currentDateTimeZ = M(this.currentTimestamp).utc().format("yyyy-MM-DD HH:00[Z]"), this.$emit("dateTime", this.currentDateTimeZ), this.$emit("currentTimestamp", this.currentTimestamp), this.currentDateTime = `${M.tz(this.currentTimestamp, this.timeZoneName).clone().format("yyyy-MM-DD : HH:00")}`) : (this.currentDateTimeZ = void 0, this.$emit("dateTime", this.currentDateTimeZ), this.$emit("currentTimestamp", this.currentTimestamp), this.currentDateTime = void 0);
+        this.currentDateTimeZ = M(this.currentTimestamp).utc().format("yyyy-MM-DD HH:00[Z]"), this.$emit("dateTime", this.currentDateTimeZ), this.$emit("currentTimestamp", this.currentTimestamp), this.currentDateTime = `${M.tz(this.currentTimestamp, this.timeZoneName).clone().format("yyyy-MM-DD : HH:00")}`;
       },
       immediate: !0
     },
@@ -13440,15 +13440,13 @@ const um = {
       ((o = M(this.realTime)) == null ? void 0 : o.diff(t, "d", !0)) >= 0 ? await this.fetchForecastData(this.form) : await this.fetchHistoryData(this.form);
     },
     async fetchForecastData(t) {
-      this.loading = !0, this.showMeteo = !0, this.form.lng = t.lng, this.form.lat = t.lat, this.form.followId = t.followId, this.handleDrawInfoMarker([t.lng, t.lat]), console.log(this.followList);
-      debugger;
-      this.meteoData = [];
+      this.loading = !0, this.showMeteo = !0, this.form.lng = t.lng, this.form.lat = t.lat, this.form.followId = t.followId, this.handleDrawInfoMarker([t.lng, t.lat]), console.log(111, this.followList), this.meteoData = [];
       const { weatherModels: e, marineModels: o } = To.autoPickMeteoModel(t.forecastModel);
       let i = {
         lat: t.lat,
         lng: t.lng,
         datetime: M(t.dateTime).utc().format(),
-        forecastDays: t.day ?? 7,
+        forecastDays: t.day ?? 3,
         weatherModels: e,
         marineModels: o
       };
@@ -13463,21 +13461,25 @@ const um = {
       });
     },
     async fetchHistoryData(t) {
-      this.loading = !0, this.showMeteo = !0, this.form.lng = t.lng, this.form.lat = t.lat, this.form.followId = t.followId, this.handleDrawInfoMarker([t.lng, t.lat]), this.meteoData = [];
+      this.loading = !0, this.showMeteo = !0, this.form.lng = t.lng, this.form.lat = t.lat, this.form.followId = t.followId, this.handleDrawInfoMarker([t.lng, t.lat]), console.log(222, this.followList), this.meteoData = [];
       const { weatherModels: e, marineModels: o } = To.autoPickMeteoModel(t.forecastModel), i = {
         lat: t.lat,
         lng: t.lng,
         datetime: M(t.dateTime).utc().format(),
-        forecastDays: 3,
+        forecastDays: 2,
         pastDays: 1,
         weatherModels: e,
         marineModels: o
-      }, a = await Ae.post(`${this.gateway}/api/arc/meteo2/spot/forecast`, i, {
+      };
+      await Ae.post(`${this.gateway}/api/arc/meteo2/spot/forecast`, i, {
         headers: {
           Authorization: this.token || this.defaultMeteoToken
         }
-      });
-      (a == null ? void 0 : a.data.code) === 0 && (this.meteoData = a == null ? void 0 : a.data.data, this.meteoData.lng = t.lng, this.meteoData.lat = t.lat, this.initTableData(this.meteoData)), this.loading = !1;
+      }).then((a) => {
+        (a == null ? void 0 : a.data.code) === 0 ? (this.meteoData = a == null ? void 0 : a.data.data, this.meteoData.lng = t.lng, this.meteoData.lat = t.lat, this.initTableData(this.meteoData), this.loading = !1) : this.loading = !1;
+      }).catch(() => {
+        this.loading = !1;
+      }), this.loading = !1;
     },
     initTableData(t) {
       var o, i, a, r, l, m, c, f, d, b, v, L, k, P, y, B, D, T, z, w, C, _, R, F, V, X, Y, Q, $, J, se, le, pe, ie, ce, ue, me, he, O, te, be;