From fd7586c8d91473d2850af1e48b12f1a289e6b8d1 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期四, 13 六月 2024 00:10:43 +0800
Subject: [PATCH] 新增文件
---
src/views/console/base/Shiftsystem.vue | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/src/views/console/base/Shiftsystem.vue b/src/views/console/base/Shiftsystem.vue
index 8d624d7..4d50e5d 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-05-03 00:11:11
+ * @LastEditTime: 2024-06-03 22:57:46
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/console/base/Shiftsystem.vue
-->
<template>
@@ -98,6 +98,7 @@
dayCharts() {
let { data = [], categories = [], startTime, end } = this.getData1()
+ console.log(data, startTime, '?????')
return {
title: {
text: '鐝埗姒傝'
@@ -115,7 +116,7 @@
interval: 2 * 60 * 60,
axisLabel: {
formatter: function (val, index) {
-
+ console.log('>>>>>>', val)
let str = ''
let now = moment()
let current = now.format('YYYY-MM-DD')
@@ -216,35 +217,40 @@
let categories = this.info.shiftDetailVOList.map(item => {
return item.indexName
})
- let base
+ let base = null
this.info.shiftDetailVOList.forEach(item => {
- !base && (base = item.shiftStartTime)
+ base === null && (base = item.shiftStartTime)
if (base > item.shiftStartTime) {
base = item.shiftStartTime
}
})
+ console.log('.....')
let startTime = moment(moment().format('YYYY-MM-DD') + ' 00:00:00').add(base, 'm').unix()
let end = moment.unix(startTime).add(24, 'h').unix()
let data = [];
- var types = [
- { name: 1, color: '#7b9ce1' },
- { name: 2, color: '#bd6d6c' },
- { name: 3, color: '#75d874' },
- { name: 4, color: '#e0bc78' },
- { name: 5, color: '#dc77dc' },
- { name: 6, color: '#72b362' }
- ];
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 - 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 - base) * 60, startTime + (v.restEndTime - base) * 60, desc],
+ itemStyle: {
+ normal: {
+ color: 'yellow'
+ }
+ }
+ })
+ })
})
return { data, categories, startTime, end }
},
--
Gitblit v1.9.3