From 963a2313f4f8959715293d38f69894078150d508 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期五, 14 六月 2024 11:29:47 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/smart-web
---
src/views/console/base/Shiftsystem.vue | 58 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 39 insertions(+), 19 deletions(-)
diff --git a/src/views/console/base/Shiftsystem.vue b/src/views/console/base/Shiftsystem.vue
index b7f7136..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-02 00:31:01
+ * @LastEditTime: 2024-06-03 22:57:46
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/console/base/Shiftsystem.vue
-->
<template>
@@ -56,7 +56,7 @@
</el-row>
</el-main>
</el-container>
- <Dialog ref="dialog" :option="{ types, status, group }" :detail="detail"></Dialog>
+ <Dialog ref="dialog" :option="{ types, status, group }" :detail="detail" @success="success"></Dialog>
</el-container>
</template>
@@ -98,7 +98,7 @@
dayCharts() {
let { data = [], categories = [], startTime, end } = this.getData1()
- console.log('>>>>>>', data)
+ console.log(data, startTime, '?????')
return {
title: {
text: '鐝埗姒傝'
@@ -116,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')
@@ -202,6 +202,9 @@
this.init()
},
methods: {
+ success() {
+ this.$refs.table.reload(this.params)
+ },
init() {
this.$HTTP.get('/api/blade-system/param/detail?paramKey=system.shift.max').then(res => {
if (res.code === 200) {
@@ -214,35 +217,39 @@
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()
- console.log(moment.unix(startTime).format('YYYY-MM-DD HH:mm:ss'), 'startTIme', moment.unix(end).format('YYYY-MM-DD HH:mm:ss'))
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 }
@@ -257,12 +264,25 @@
})
},
table_add() {
- this.$refs.dialog.open()
+ this.$refs.dialog.open('add', {
+
+ })
},
table_edit() {
- this.$refs.dialog.open()
+ this.$refs.dialog.open('edit', this.info)
},
del() {
+ this.$confirm(`纭畾鍒犻櫎鏁版嵁?`, '', {
+ type: 'warning'
+ }).then(() => {
+ this.$HTTP.delete(`/api/blade-cps/shift/${this.info.id}`).then(res => {
+ if (res.code === 200) {
+ this.$refs.table.reload(this.params)
+ }
+ })
+ }).catch(() => {
+
+ })
}
},
--
Gitblit v1.9.3