Browse Source

fix: 平板bug修改

chenzhen2 2 years ago
parent
commit
7acd9a1f97

+ 1 - 0
src/styles/index.scss

@@ -114,6 +114,7 @@ div:focus {
   bottom: 0;
   width: 100%;
   height: 48px;
+  z-index: 444;
 }
 
 

+ 50 - 18
src/views/choiceSpace/choiceSpace.vue

@@ -41,6 +41,7 @@
             <van-checkbox
               class="item-check"
               v-model="item.checked"
+              @change="updateWorkSpace(item)"
               shape="square"
             ></van-checkbox>
           </div>
@@ -101,10 +102,12 @@ import { store } from "@/store";
 import { UserMutationTypes } from "@/store/modules/user/mutation-types";
 import {
   checkWorkSpace,
+  deleteWorkSpace,
   getBuildingList,
   getDefaultLocation,
   getFloorList,
   getPadSpaceList,
+  insertWorkSpace,
   queryWorkSpace,
   saveWorkSpace,
 } from "@/apis/envmonitor";
@@ -337,23 +340,48 @@ export default defineComponent({
       },
       // 设置主空间
       goNext() {
-        let data: any = proxyData.formataWorkData();
-        let idArr: any = [];
-        data.map((item: any) => {
-          idArr.push(item.spaceId);
-        });
-        if (idArr.length) {
-          let params: any = {
-            floorId: proxyData.checkPositon.floorId,
-            workSpaceList: idArr,
-            majorSpaceId: idArr[0], //类型:String  必有字段  备注:主空间
-            macAddress: proxyData.userInfo.mac, //类型:String  必有字段  备注:平板地址
-          };
-          proxyData.saveWorkSpace(params);
+        // let data: any = proxyData.formataWorkData();
+        // let idArr: any = [];
+        // data.map((item: any) => {
+        //   idArr.push(item.spaceId);
+        // });
+        // if (idArr.length) {
+        //   let params: any = {
+        //     floorId: proxyData.checkPositon.floorId,
+        //     workSpaceList: idArr,
+        //     majorSpaceId: idArr[0], //类型:String  必有字段  备注:主空间
+        //     macAddress: proxyData.userInfo.mac, //类型:String  必有字段  备注:平板地址
+        //   };
+        //   proxyData.saveWorkSpace(params);
+        // } else {
+        //   Toast("请选择办公空间!");
+        // }
+        // proxyData.saveWorkSpace();
+        proxyGlobal.proxy.$loadingStart(0);
+        proxyData.querySpaceList();
+      },
+      updateWorkSpace(item: any) {
+        if (item.checked) {
+          proxyData.insertWorkSpace(item);
         } else {
-          Toast("请选择办公空间!");
+          proxyData.deleteWorkSpace(item);
         }
       },
+      insertWorkSpace(item: any) {
+        let params: any = {
+          spaceId: item.spaceId, //类型:String  必有字段  备注:工作空间列表
+          isMajorSapce: 0, //类型:Number  必有字段  备注:是否主空间 0-否 1-是
+          macAddress: proxyData.userInfo.mac, //类型:String  必有字段  备注:平板地址
+        };
+        insertWorkSpace(params).then((res: any) => {});
+      },
+      deleteWorkSpace(item: any) {
+        let params: any = {
+          spaceId: item.spaceId, //类型:String  必有字段  备注:工作空间列表
+          macAddress: proxyData.userInfo.mac, //类型:String  必有字段  备注:平板地址
+        };
+        deleteWorkSpace(params).then((res: any) => {});
+      },
       // 保存空间
       saveWorkSpace(params: any) {
         proxyGlobal.proxy.$loadingStart(0);
@@ -385,12 +413,14 @@ export default defineComponent({
                 proxyGlobal.proxy.$loadinngEnd();
                 router.push({ name: "setMainSpace" });
               }, 1000);
-            } else {
+            } else if (data.length === 1) {
               proxyGlobal.proxy.$loadinngEnd();
               router.push({
                 name: "envmonitor",
                 query: { spaceId: data[0].spaceId },
               });
+            } else {
+              Toast("请选择办公空间!");
             }
           })
           .catch(() => {
@@ -409,8 +439,8 @@ export default defineComponent({
         proxyData.checkPositon.floorName = item.localName;
         proxyData.show = false;
         nextTick(() => {
-            proxyData.setPageScroolTop();
-          });
+          proxyData.setPageScroolTop();
+        });
         proxyData.clearSearchName();
         proxyData.getPadSpaceList();
       },
@@ -529,8 +559,10 @@ export default defineComponent({
   width: 100%;
   height: 100%;
   overflow: scroll;
+  // padding-bottom: 70px;
   .search {
     position: fixed;
+    background: rgb(245, 245, 245);
     width: 100%;
     top: 48px;
     left: 0;
@@ -612,7 +644,7 @@ export default defineComponent({
   .space-content {
     display: block;
     width: 100%;
-    height: 100%;
+    // height: 100%;
     padding-top: $headerHeightPading;
     padding-right: 20px;
     padding-left: 4px;

+ 32 - 5
src/views/envmonitor/components/workOvertime/WorkConfig.vue

@@ -108,18 +108,22 @@ export default defineComponent({
       ) {
         let data: any = proxyData.workkArr;
         let text: any = "";
+        // debugger
+        console.log("customSceneList11===")
         if (type === 1) {
+          // 工作时间和第二天连续的问题
           // 工作时间连续的问题
-          if (endTime === 240000) {
+          if (endTime === "240000") {
             // 处理时间连续的问题
-            let date: any = formatDateStr(data[index].date);
             let cusStartTime: any = data[index].cusStartTime;
             let cusEndTime: any = data[index].cusEndTime;
-            // let customSceneList: any = data[index]?.customSceneList ?? [];
+            let customSceneList: any = data[index]?.customSceneList ?? [];
             if (cusStartTime === "000000") {
               text = data[index].week;
               endTime = cusEndTime;
             }
+            console.log("customSceneList===")
+            console.log(customSceneList)
             customSceneList.map((item: any) => {
               if (item.startTime === "000000") {
                 text = data[index].week;
@@ -139,14 +143,25 @@ export default defineComponent({
             let nowIndex: any = index + 1;
             if (nowIndex < data.length - 1) {
               proxyData.formateTimeContinuous(nowIndex, startTime, endTime, 1);
+            } else {
+              return {
+                text: proxyData.text,
+                startTime: startTime,
+                endTime: endTime,
+              };
             }
+          } else {
+            return {
+              text: proxyData.text,
+              startTime: startTime,
+              endTime: endTime,
+            };
           }
         } else {
           // 预约时候后找最近的一段预约时间
           let cusStartTime: any = data[index].cusStartTime;
           let cusEndTime: any = data[index].cusEndTime;
-          if(cusStartTime && cusEndTime){
-            
+          if (cusStartTime && cusEndTime) {
           }
         }
       },
@@ -275,6 +290,14 @@ export default defineComponent({
                 /**
                  * 需要补加上和未来时间连续的问题
                  */
+                let obj: any = proxyData.formateTimeContinuous(
+                  0,
+                  startTime,
+                  endTime,
+                  1
+                );
+                console.log("预约加班的记录---")
+                console.log(obj)
                 proxyData.timerText.text = "工作时间";
                 proxyData.timerText.timer =
                   formatTimerStr(startTime) + "~" + formatTimerStr(endTime);
@@ -319,6 +342,10 @@ export default defineComponent({
                   /**
                    * 需要补加上和未来时间连续的问题
                    */
+                   let btnObj: any = proxyData.formateTimeContinuous( 0,startTime,endTime,1);
+                    console.log("预约加班的记录---")
+                    console.log(btnObj)
+                  
                   proxyData.timerText.text = "工作时间";
                   proxyData.timerText.timer =
                     formatTimerStr(startTime) + "~" + formatTimerStr(endTime);

+ 13 - 10
src/views/envmonitor/components/workOvertime/index.vue

@@ -133,10 +133,11 @@ export default defineComponent({
       },
       // 获取当前位置
       getNowIndex() {
-        let nowIndex: any = 0;
-        if (proxyData.nowData.week === "今天") {
-          nowIndex = getNowTime()[1];
-        }
+        // let nowIndex: any = 0;
+        // if (proxyData.nowData.week === "今天") {
+        //   nowIndex = getNowTime()[1];
+        // }
+        let nowIndex: any = getNowTime()[1];
         return nowIndex;
       },
       // 获取当前位置的坐标
@@ -461,10 +462,12 @@ export default defineComponent({
        * 设置过去的时间
        */
       setPastTime(index: any) {
-        let sliderBoxArr: any = document.querySelectorAll(".slider-box");
-        for (let i = 0; i < sliderBoxArr.length; i++) {
-          if (i < index) {
-            sliderBoxArr[i].style.background = `rgba(196, 196, 196, 0.2)`;
+        if (proxyData.nowData.week === "今天") {
+          let sliderBoxArr: any = document.querySelectorAll(".slider-box");
+          for (let i = 0; i < sliderBoxArr.length; i++) {
+            if (i < index) {
+              sliderBoxArr[i].style.background = `rgba(196, 196, 196, 0.2)`;
+            }
           }
         }
       },
@@ -553,7 +556,7 @@ export default defineComponent({
         // 按钮的状态
         proxyData.formBtn = false;
         let nowIndex: any = proxyData.getNowIndex();
-        if (index < nowIndex) {
+        if (proxyData.nowData.week === "今天" && index < nowIndex) {
           // 过去的时间不可选择
           // 过去的时间不可选择
           return;
@@ -818,7 +821,7 @@ export default defineComponent({
         }
         let relNowTime: any = getRelNowTime();
         let type = "0";
-        if (relNowTime >= startTime && relNowTime <= endTime) {
+        if (proxyData.nowData.week === "今天" && relNowTime >= startTime && relNowTime <= endTime) {
           type = "2";
         }
 

+ 5 - 5
src/views/envmonitor/index.vue

@@ -88,7 +88,7 @@
           </div>
         </div>
       </div>
-      <div class="fotter">
+      <div class="fotter" v-if="spaceData && spaceData.length > 1">
         <template v-for="(item, index) in spaceData">
           <div
             class="fotter-item"
@@ -1618,10 +1618,10 @@ export default defineComponent({
             proxyData.spaceData = [];
           }
           proxyData.spaceData.map((item: any) => {
-            if(proxyData.spaceInfo.spaceId===item.spaceId){
+            if (proxyData.spaceInfo.spaceId === item.spaceId) {
               item.active = true;
               proxyData.spaceInfo = item;
-            }else {
+            } else {
               item.active = false;
             }
             // if (item.isMajorSpace) {
@@ -1639,8 +1639,8 @@ export default defineComponent({
           item.active = false;
         });
         proxyData.roomType = "";
-         //  切换空间的时候把加班按钮平板
-         proxyData.setForceOverTimeFlag(false)
+        //  切换空间的时候把加班按钮平板
+        proxyData.setForceOverTimeFlag(false);
         proxyData.isWork = false;
       },
       // 更多空间