fix:按照楼层展示数据

src/apis/envmonitor.ts

@@ -18,8 +18,8 @@ export const getWeather = () => {
 }
 
 // 获取环境数据
-export const queryEnvCurrent = () => {
-  return https().request<RootWeatherObject<OutherWeather>>(`${setupService}environment/queryEnvCurrent`, Method.GET, undefined, ContentType.json)
+export const queryEnvCurrent = (floorId:any) => {
+  return https().request<RootWeatherObject<OutherWeather>>(`${setupService}environment/queryEnvCurrent?floorId=${floorId}`, Method.GET, undefined, ContentType.json)
 }
 
 export const getSpaceInfo = (data: any) => {

src/views/home/index.vue

@@ -145,7 +145,7 @@
 </template>
 
 <script>
-import { useRouter } from "vue-router";
+import { useRouter, useRoute } from "vue-router";
 import { formatEnergyDate, getWeek } from "@/utils";
 import $ from "jquery";
 import { nextTick } from "vue";
@@ -211,11 +211,13 @@ export default defineComponent({
       return str;
     };
     const router = useRouter();
+    const route = useRoute();
     const proxyData = reactive({
       nowTime: formatEnergyDate()[2],
       sTime: formatEnergyDate(2)[2],
       nowDate: formatEnergyDate()[0],
       intevell: null,
+      type: "",
       showFalg: false,
       week: getWeek(),
       // 设置现在时间
@@ -311,7 +313,7 @@ export default defineComponent({
               clearTimeout(time2);
               router.push({
                 path: "/weather",
-                // query: { showSpaceTip: 'true' }
+                query: { type: proxyData.type },
               });
               // 30000
             }, 30000);
@@ -341,6 +343,8 @@ export default defineComponent({
     });
     onBeforeUnmount(() => {});
     onMounted(() => {
+      let type = route.query.type;
+      proxyData.type = type;
       proxyData.showFalg = true;
       nextTick(() => {
         proxyData.init();

src/views/home/tiantan.vue

@@ -154,7 +154,7 @@
 </template>
   
 <script>
-import { useRouter } from "vue-router";
+import { useRouter, useRoute } from "vue-router";
 import { formatEnergyDate, getWeek } from "@/utils";
 import $ from "jquery";
 import { nextTick } from "vue";
@@ -220,11 +220,13 @@ export default defineComponent({
       return str;
     };
     const router = useRouter();
+    const route = useRoute();
     const proxyData = reactive({
       nowTime: formatEnergyDate()[2],
       sTime: formatEnergyDate(2)[2],
       nowDate: formatEnergyDate()[0],
       intevell: null,
+      type: "",
       showFalg: false,
       week: getWeek(),
       init() {
@@ -299,6 +301,7 @@ export default defineComponent({
           $(slogan).addClass("sloganActive");
 
           proxyData.updateStyle();
+          let type = proxyData.type;
           // 第3部分
 
           let timer = setTimeout(function () {
@@ -311,9 +314,10 @@ export default defineComponent({
             clearTimeout(timer);
             let time2 = setTimeout(() => {
               clearTimeout(time2);
+              console.log("/weather" + "?type=" + type);
               router.push({
                 path: "/weather",
-                // query: { showSpaceTip: 'true' }
+                query: { type: proxyData.type },
               });
             }, 30000);
             // 30000
@@ -343,6 +347,9 @@ export default defineComponent({
     });
     onBeforeUnmount(() => {});
     onMounted(() => {
+      let type = route.query.type;
+      proxyData.type = type;
+      console.log(proxyData.type);
       proxyData.showFalg = true;
       nextTick(() => {
         proxyData.init();

src/views/weather/index.vue

@@ -126,7 +126,7 @@ import snow from "./snow.vue"; //  雪
 import sunny from "./sunny.vue"; //  晴
 import { getWeather, queryEnvCurrent } from "@/apis/envmonitor";
 import { formatEnergyDate, getWeek } from "@/utils";
-import { useRouter } from "vue-router";
+import { useRoute, useRouter } from "vue-router";
 export default defineComponent({
   components: {
     ran,
@@ -135,8 +135,6 @@ export default defineComponent({
     sunny,
   },
   beforeRouteEnter(to, from, next) {
-    console.log("to===");
-    console.log(from);
     if (from.name == "tiantan") {
       next();
     } else {
@@ -147,6 +145,7 @@ export default defineComponent({
   },
   setup(props) {
     const router = useRouter();
+    const route: any = useRoute();
     let weatherData: any = [
       {
         text: "云",
@@ -187,10 +186,13 @@ export default defineComponent({
       pathUrl: "/sk/home",
       logonIcon: "阴.png",
       currentData: currentData,
+      route: route,
       nowTime: formatEnergyDate()[2],
       sTime: formatEnergyDate(2)[2],
       nowDate: formatEnergyDate()[0],
       intevell: intevell,
+      floorId: "",
+      type: 1,
       week: getWeek(),
       // 设置现在时间
       setNowDate() {
@@ -285,7 +287,7 @@ export default defineComponent({
       // 获取环境数据
       queryEnvCurrentPage() {
         proxyData.num = proxyData.num + 1;
-        queryEnvCurrent()
+        queryEnvCurrent(proxyData.floorId)
           .then((res) => {
             let resResult: any = res;
             if (resResult.result == "success") {
@@ -318,7 +320,7 @@ export default defineComponent({
         proxyData.times = setTimeout(() => {
           clearTimeout(proxyData.times);
           // router.push({ path: "/home" });
-          window.location.href = proxyData.pathUrl;
+          window.location.href = proxyData.pathUrl + "?type=" + proxyData.type;
         }, 300000);
         // 300000
       },
@@ -329,6 +331,15 @@ export default defineComponent({
       clearTimeout(proxyData.times);
     });
     onMounted(() => {
+      let type: any = route.query.type;
+      proxyData.type = type;
+      if (type == 1) {
+        // 5楼
+        proxyData.floorId = "Fl110105005078e5eda2a7484f17aa5acd9ca334a292";
+      } else if (type == 2) {
+        // 6楼
+        proxyData.floorId = "Fl11010500507c8707d0777f40e098c109f44ce06485";
+      }
       proxyData.num = 0;
       proxyData.weathNum = 0;
       // 页面跳转修改

src/views/weatherTest/index.vue

@@ -259,7 +259,7 @@ export default defineComponent({
       },
       // 获取环境数据
       queryEnvCurrent() {
-        queryEnvCurrent()
+        queryEnvCurrent('')
           .then((res) => {
             let resResult: any = res;
             if (resResult.result == "success") {