From ddbb2bd2691629336faa4491a59fdc3dc3c5934e Mon Sep 17 00:00:00 2001 From: gaoshp <291585735@qq.com> Date: 星期一, 17 六月 2024 23:44:23 +0800 Subject: [PATCH] update --- src/views/console/base/Shiftsystem.vue | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/views/console/base/Shiftsystem.vue b/src/views/console/base/Shiftsystem.vue index e8191da..2e9804a 100644 --- a/src/views/console/base/Shiftsystem.vue +++ b/src/views/console/base/Shiftsystem.vue @@ -1,7 +1,7 @@ <!-- * @Date: 2024-04-09 20:19:46 - * @LastEditors: Sneed - * @LastEditTime: 2024-06-03 22:45:00 + * @LastEditors: lzhe lzhe@example.com + * @LastEditTime: 2024-06-15 23:34:34 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/console/base/Shiftsystem.vue --> <template> @@ -229,21 +229,21 @@ let end = moment.unix(startTime).add(24, 'h').unix() let data = []; this.info.shiftDetailVOList.forEach((item, index) => { - let desc = `鎺掔彮鎯呭喌锛�${moment.unix(startTime + item.shiftStartTime * 60).format('HH:mm')} - ${moment.unix(startTime + item.shiftEndTime * 60).format('HH:mm')}` + let desc = `鎺掔彮鎯呭喌锛�${moment.unix(startTime + (item.shiftStartTime - base) * 60).format('HH:mm')} - ${moment.unix(startTime + (item.shiftEndTime - base) * 60).format('HH:mm')}` data.push({ name: item.indexName, - value: [index, startTime + item.shiftStartTime * 60, startTime + item.shiftEndTime * 60, desc], + value: [index, startTime + (item.shiftStartTime - base) * 60, startTime + (item.shiftEndTime - base) * 60, desc], itemStyle: { normal: { color: this.info.colour } } }) - item.shiftRestTimeVOList.forEach(v => { - let desc = `浼戞伅鏃舵: ${moment.unix(startTime + v.restStartTime * 60).format('HH:mm')} - ${moment.unix(startTime + v.restEndTime * 60).format('HH:mm')}` + item?.shiftRestTimeVOList?.forEach(v => { + let desc = `浼戞伅鏃舵: ${moment.unix(startTime + (v.restStartTime - base) * 60).format('HH:mm')} - ${moment.unix(startTime + (v.restEndTime - base) * 60).format('HH:mm')}` data.push({ name: v.indexName, - value: [index, startTime + v.restStartTime * 60, startTime + v.restEndTime * 60, desc], + value: [index, startTime + (v.restStartTime - base) * 60, startTime + (v.restEndTime - base) * 60, desc], itemStyle: { normal: { color: 'yellow' @@ -283,7 +283,6 @@ }).catch(() => { }) - } }, } -- Gitblit v1.9.3