فهرست منبع

fix:加班的bug解决

chenzhen2 1 سال پیش
والد
کامیت
4ec282b621
3فایلهای تغییر یافته به همراه15 افزوده شده و 9 حذف شده
  1. 3 1
      src/views/envmonitor/components/Light/index.vue
  2. 3 0
      src/views/envmonitor/index.vue
  3. 9 8
      src/views/home/index.vue

+ 3 - 1
src/views/envmonitor/components/Light/index.vue

@@ -193,7 +193,7 @@ export default defineComponent({
       },
       // 检查设备是否执行空间服务时间
       checkDeviceIsExeSpaceTime(deviceAll: any = []) {
-        // debugger
+        debugger
         if (proxyData.controlMode !== 1) {
           return true;
         }
@@ -290,6 +290,7 @@ export default defineComponent({
             if (item !== "") {
               proxyData.lampSw = item; // 点击全开和全关的时候item动态传值true或者false
             }
+            // debugger
             if (
               proxyData.forceOverTimeFlag &&
               proxyData.lampSw &&
@@ -315,6 +316,7 @@ export default defineComponent({
             let isExeSpaceTime: Boolean = proxyData.checkDeviceIsExeSpaceTime([
               item,
             ]);
+            debugger
             if (proxyData.forceOverTimeFlag && item.switch && isExeSpaceTime) {
               // 强制加班开灯
               contx.emit("triggerWork", 3, item);

+ 3 - 0
src/views/envmonitor/index.vue

@@ -1644,6 +1644,9 @@ export default defineComponent({
             proxyData.isWork = true;
           }
         });
+        if (!proxyData.isWork) {
+          proxyData.forceOverTimeFlag = false;
+        }
       },
       /**
        * 获取场景列表

+ 9 - 8
src/views/home/index.vue

@@ -75,12 +75,7 @@ import {
 } from "vue";
 import QrcodeVue from "qrcode.vue";
 import { useRouter } from "vue-router";
-import {
-  getUserInfo,
-  newNumber,
-  parseImgUrl,
-  setQueryConfig,
-} from "@/utils";
+import { getUserInfo, newNumber, parseImgUrl, setQueryConfig } from "@/utils";
 import { store, useStore } from "@/store";
 import { login } from "@/apis/user";
 import { Form, Field, CellGroup, Button, Toast } from "vant";
@@ -93,7 +88,7 @@ export default defineComponent({
     QrcodeVue,
     vanForm: Form,
     vanField: Field,
-    CellGroup:CellGroup,
+    CellGroup: CellGroup,
     vanButton: Button,
   },
   beforeRouteEnter(to, from, next) {
@@ -151,8 +146,14 @@ export default defineComponent({
       username: "",
       password: "",
       onSubmit(values: any) {
-        console.log("submit", values);
+        // console.log("submit", values);
         let params: any = values;
+        // params.username = params.username
+        //   ? params.username.trim()
+        //   : params.username;
+        // params.password = params.password
+        //   ? params.password.trim()
+        //   : params.password;
         login(params).then((res) => {
           let resData: any = res;
           if (resData.result === "success") {