Преглед на файлове

fix: 加班功能调整

chenzhen2 преди 2 години
родител
ревизия
f4fea81097
променени са 3 файла, в които са добавени 47 реда и са изтрити 12 реда
  1. 3 0
      src/styles/index.scss
  2. 31 7
      src/views/envmonitor/components/workOvertime/index.vue
  3. 13 5
      src/views/envmonitor/index.vue

+ 3 - 0
src/styles/index.scss

@@ -219,4 +219,7 @@ div:focus {
     font-size: 25px;
     color: #373c43;
   }
+}
+.van-dialog__confirm, .van-dialog__confirm:active{
+  color: $elActiveColor !important;
 }

+ 31 - 7
src/views/envmonitor/components/workOvertime/index.vue

@@ -56,7 +56,7 @@
 </template>
 
 <script lang="ts">
-import { Slider } from "vant";
+import { Dialog, Slider } from "vant";
 import {
   defineComponent,
   reactive,
@@ -83,6 +83,7 @@ import {
 import { myTime } from "@/model/workTimeData";
 import { propsToAttrMap } from "@vue/shared";
 import { isTemplateElement } from "@babel/types";
+import { saveBatchCustomScene } from "@/apis/envmonitor";
 
 export default defineComponent({
   components: {
@@ -98,7 +99,7 @@ export default defineComponent({
       default: () => "",
     },
   },
-  setup(props) {
+  setup(props, context) {
     const screenInfo: any = {
       screenWidth: 0,
       screenHeight: 0,
@@ -738,9 +739,12 @@ export default defineComponent({
         let timerArr: any = proxyData.nowData.timerArr;
         let startTime: any = timerArr[proxyData.startIndex].formatTimer;
         let endTime: any = timerArr[proxyData.endIndex].formatTimer;
+        // debugger;
         let delTimerArr: any = [];
         // 加班时间拼接
         customSceneList.map((item: any, index: any) => {
+          // let itemStartTime:any=proxyData.parseCusStartTime(item.startTime)
+          // let itemEndTime:any=proxyData.parseCusStartTime(item.endTime)
           // item时间段保护当前时间端
           if (startTime < item.startTime) {
             if (endTime < item.startTime) {
@@ -754,7 +758,7 @@ export default defineComponent({
               );
               delTimerArr.push(delObj);
               startTime = startTime;
-              endTime = item.endTime;
+              endTime = endTime;
             }
           } else if (startTime >= item.startTime && startTime < item.endTime) {
             if (endTime <= item.endTime) {
@@ -851,6 +855,7 @@ export default defineComponent({
       formateDelTimer() {
         let timerArr: any = proxyData.nowData.timerArr;
         let endIndex: any = proxyData.endIndex > 0 ? proxyData.endIndex - 1 : 0;
+        // debugger
         // 如果当前选择的日期只在已经选中的范围内
         if (
           timerArr[proxyData.startIndex].isCheck &&
@@ -963,7 +968,7 @@ export default defineComponent({
             }
           });
           let formTimeArr: any = addTimeArr.concat(delTimerArr);
-          // return formTimeArr;
+          return formTimeArr;
         } else {
           return [];
         }
@@ -971,15 +976,34 @@ export default defineComponent({
       // 提交申请
       addWorkTimer() {
         let formTimerArr: any = proxyData.formateAddTimer();
-        console.log("提交申请-----");
-        console.log(formTimerArr);
+        proxyData.saveBatchCustomScene(formTimerArr);
+        // console.log("提交申请-----");
+        // console.log(formTimerArr);
+      },
+      // 提交加班记录
+      saveBatchCustomScene(formTimerArr: any, type: any = 1) {
+        saveBatchCustomScene(formTimerArr).then((res) => {
+          if (type === 1) {
+            context.emit("closeWork");
+          }
+        });
       },
       // 删除
       triggerDelTime() {
         let formTimeArr: any = proxyData.formateDelTimer();
         if (formTimeArr && formTimeArr.length) {
           console.log(formTimeArr);
-          alert("确定删除当前时间吗?");
+          // alert("确定删除当前时间吗?");
+          Dialog.confirm({
+            title: "确认",
+            message: "确定删除当前时间吗?",
+          })
+            .then(() => {
+              proxyData.saveBatchCustomScene(formTimeArr, 2);
+            })
+            .catch(() => {
+              // on cancel
+            });
         }
       },
     });

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

@@ -148,6 +148,7 @@
     >
       <work-overtime
         v-if="isShowWork"
+        @closeWork="closeWork"
         :projectId="projectId"
         :workkArr="workkArr"
       ></work-overtime>
@@ -641,6 +642,13 @@ export default defineComponent({
       triggerWork() {
         proxyData.isShowWork = true;
       },
+      /**
+       * 关闭加班
+       */
+      closeWork(){
+        proxyData.isShowWork = false;
+        console.log("关闭加班功能---")
+      },
       // /**
       //  * 修改空间id
       //  * @param spaceId
@@ -1719,9 +1727,9 @@ export default defineComponent({
           &:nth-child(2) {
             position: absolute;
             bottom: 12px;
-            width: 55px;
-            height: 20px;
-            line-height: 20px;
+            width: 70px;
+            height: 25px;
+            line-height: 25px;
             text-align: center;
             margin-left: 10px;
             background: #edf1f5;
@@ -1729,8 +1737,8 @@ export default defineComponent({
             img {
               display: inline-block;
               vertical-align: middle;
-              width: 12px;
-              height: 12px;
+              width: 15px;
+              height: 15px;
               // margin-top: 4px;
             }
             span {