Quellcode durchsuchen

fix:灯的展示bug修改

chenzhen2 vor 2 Jahren
Ursprung
Commit
d1f314b6c7

BIN
public/images/page-officehome/atmLamp_small_close.png


BIN
public/images/page-officehome/atmLamp_small_open.png


+ 33 - 10
src/views/envmonitor/components/Light/index.vue

@@ -214,14 +214,26 @@ export default defineComponent({
                 let lampOpen = false; // 如果有一个开 则总灯开
                 for (let i = 0; i < content.length; i++) {
                   content[i].type = "lamp";
-                  content[i].imgOpen = parseImgUrl(
-                    "page-officehome",
-                    "lamp_open.png"
-                  );
-                  content[i].imgClose = parseImgUrl(
-                    "page-officehome",
-                    "lamp_close.png"
-                  );
+                  if (content[i].lightType == 1) {
+                    content[i].imgOpen = parseImgUrl(
+                      "page-officehome",
+                      "lamp_open.png"
+                    );
+                    content[i].imgClose = parseImgUrl(
+                      "page-officehome",
+                      "lamp_close.png"
+                    );
+                  } else {
+                    content[i].imgOpen = parseImgUrl(
+                      "page-officehome",
+                      "atmLamp_small_open.png"
+                    );
+                    content[i].imgClose = parseImgUrl(
+                      "page-officehome",
+                      "atmLamp_small_close.png"
+                    );
+                  }
+
                   content[i].switch = content[i].runStatus ? true : false;
                   if (content[i].runStatus) {
                     lampOpen = true;
@@ -231,12 +243,23 @@ export default defineComponent({
                 proxyData.initData = JSON.parse(JSON.stringify(content)); //  灯的数据
                 proxyData.lampSw = lampOpen; // 主灯开关
                 proxyData.lampList = content;
+
                 proxyData.lightImg = proxyData.lampSw
                   ? parseImgUrl("page-officehome", "lamp_open.png")
                   : parseImgUrl("page-officehome", "lamp_close.png");
+                if (content[0]) {
+                  if (content[0].lightType !== 1) {
+                    proxyData.lightImg = proxyData.lampSw
+                      ? parseImgUrl("page-officehome", "atmLamp_small_open.png")
+                      : parseImgUrl(
+                          "page-officehome",
+                          "atmLamp_small_close.png"
+                        );
+                  }
+                }
               }
             }
-            console.log("执行了----====");
+            // console.log("执行了----====");
             proxyData.startLightsStatusTimer();
           })
           .catch(() => {
@@ -513,7 +536,7 @@ export default defineComponent({
         if (newProps.spaceId) {
           // 空间id改变的重新获取值调用接口
           proxyData.spaceId = newProps.spaceId;
-          proxyData.showFlag=false
+          proxyData.showFlag = false;
           proxyData.clearLightStatusTimer();
           proxyData.getLampList();
           console.log("调用了====");