fix(frontend): 轮值起止时间问题修复 TencentBlueKing#9088

jinquantianxia · Jan 16, 2025 · 180f4b9 · 180f4b9
1 parent 892bef9
commit 180f4b9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/dbm-ui/frontend/src/views/duty-rule-manage/index/components/edit-rule/CustomRotate.vue b/dbm-ui/frontend/src/views/duty-rule-manage/index/components/edit-rule/CustomRotate.vue
@@ -207,7 +207,7 @@
       };
       return {
         effective_time: dayjs(formModel.dateTimeRange![0]).startOf('day').format('YYYY-MM-DD HH:mm:ss'),
-        end_time: dayjs(formModel.dateTimeRange![1]).startOf('day').format('YYYY-MM-DD HH:mm:ss'),
+        end_time: dayjs(formModel.dateTimeRange![1]).startOf('day').hour(23).minute(59).second(59).format('YYYY-MM-DD HH:mm:ss'),
         duty_arranges: formModel.tableData.map(item => ({
           date: item.dateTime,
           work_times: item.timeRange.map(data => data.value.map(str => splitTimeToMinute(str)).join('--')),

diff --git a/dbm-ui/frontend/src/views/duty-rule-manage/index/components/edit-rule/CycleRotate.vue b/dbm-ui/frontend/src/views/duty-rule-manage/index/components/edit-rule/CycleRotate.vue
@@ -409,7 +409,7 @@
       };
       return {
         effective_time: dayjs(dateTimeRange.value![0]).startOf('day').format('YYYY-MM-DD HH:mm:ss'),
-        end_time: dayjs(dateTimeRange.value![1]).startOf('day').format('YYYY-MM-DD HH:mm:ss'),
+        end_time: dayjs(dateTimeRange.value![1]).startOf('day').hour(23).minute(59).second(59).format('YYYY-MM-DD HH:mm:ss'),
         duty_arranges: tableData.value.map(item => ({
           duty_number: formModel.singleDutyPeoples,
           duty_day: formModel.sinlgeDutyDays,

diff --git a/dbm-ui/frontend/src/views/duty-rule-manage/index/components/edit-rule/Index.vue b/dbm-ui/frontend/src/views/duty-rule-manage/index/components/edit-rule/Index.vue
@@ -261,15 +261,16 @@
         duty_arranges: customValues.duty_arranges,
         ...bizConfig,
       };
-      if (isCreate.value) {
-        // 新建/克隆
-        runCreateDutyRule(customParams);
-      } else {
-        // 克隆或者编辑
-        if (props.data) {
-          runUpdateDutyRule(props.data.id, customParams);
-        }
-      }
+      console.log(customParams);
+      // if (isCreate.value) {
+      //   // 新建/克隆
+      //   runCreateDutyRule(customParams);
+      // } else {
+      //   // 克隆或者编辑
+      //   if (props.data) {
+      //     runUpdateDutyRule(props.data.id, customParams);
+      //   }
+      // }
     }
   };