From 5a36b247b962b8835e5cc3fac3bb8af86943b07a Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期四, 02 五月 2024 01:10:22 +0800
Subject: [PATCH] update
---
src/views/console/base/Shiftsystem.vue | 33 ++++++----------
src/views/console/base/Dialog.vue | 66 +++++++++++++++++++++++++++------
2 files changed, 67 insertions(+), 32 deletions(-)
diff --git a/src/views/console/base/Dialog.vue b/src/views/console/base/Dialog.vue
index c383997..3e9506b 100644
--- a/src/views/console/base/Dialog.vue
+++ b/src/views/console/base/Dialog.vue
@@ -7,33 +7,33 @@
鐝埗璇︽儏
</el-col>
<el-col :span="12">
- <el-form-item label="鐝埗缂栧彿" prop="userName">
- <el-input style="width: 240px" v-model="form.userName" placeholder="宸ヤ綅缂栧彿" clearable></el-input>
+ <el-form-item label="鐝埗缂栧彿" prop="code">
+ <el-input style="width: 240px" v-model="form.code" placeholder="鐝埗缂栧彿" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鐝埗鍚嶇О" prop="userName">
- <el-input style="width: 240px" v-model="form.userName" placeholder="宸ヤ綅鍚嶇О" clearable></el-input>
+ <el-form-item label="鐝埗鍚嶇О" prop="name">
+ <el-input style="width: 240px" v-model="form.name" placeholder="鐝埗鍚嶇О" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鐝埗棰滆壊" prop="userName">
- <el-input style="width: 240px" v-model="form.userName" placeholder="宸ヤ綅鍚嶇О" clearable></el-input>
+ <el-form-item label="鐝埗棰滆壊" prop="colour">
+ <el-input style="width: 240px" v-model="form.userName" placeholder="鐝埗棰滆壊" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鐝埗鏃堕棿" prop="userName">
- <el-input style="width: 240px" v-model="form.userName" placeholder="宸ヤ綅鍚嶇О" clearable></el-input>
+ <el-input style="width: 240px" v-model="form.userName" placeholder="鐝埗鏃堕棿" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
- <el-row>
+ <el-row v-for="item in detail.paramValue" :key="item">
<el-col :span="24">
鐝1
</el-col>
<el-col :span="24">
- <el-form-item label="鐝鍚嶇О" prop="userName">
- <el-input style="width: 240px" v-model="form.userName" placeholder="宸ヤ綅鍚嶇О" clearable></el-input>
+ <el-form-item label="鐝鍚嶇О" prop="indexName">
+ <el-input style="width: 240px" v-model="form.userName" placeholder="" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="9">
@@ -43,7 +43,7 @@
</el-form-item>
</el-col>
<el-col :span="9">
- <el-form-item label="" prop="userName">
+ <el-form-item label="" prop="userName">
<el-time-picker style="width: 100%;" v-model="form.userName" format="HH:mm"
placeholder="Arbitrary time" />
</el-form-item>
@@ -113,6 +113,47 @@
props: {
option: {
type: Object
+ },
+ detail: {
+ type: Object
+ }
+ },
+ watch: {
+ detail() {
+ let len = this?.detail?.paramValue - 0 || 1
+ let shiftDetailDTOList = []
+ for (let i = 0; i < len; i++) {
+ shiftDetailDTOList.push({
+ shiftStartTime: 0,
+ shiftEndTime: 0,
+ shiftIndex: i + 1,
+ indexName: '',
+ restNumber: i + 1,
+ shiftRestTimeDTOList: [
+ {
+ restStartTime: 0,
+ restEndTime: 0,
+ restIndex: 1,
+ },
+ {
+ restStartTime: 0,
+ restEndTime: 0,
+ restIndex: 2,
+ },
+ {
+ restStartTime: 0,
+ restEndTime: 0,
+ restIndex: 3,
+ },
+ {
+ restStartTime: 0,
+ restEndTime: 0,
+ restIndex: 4,
+ }
+ ]
+ })
+ }
+ return this.shiftDetailDTOList = shiftDetailDTOList
}
},
computed: {
@@ -127,7 +168,7 @@
work_type: this.work_type,
machining_type: this.machining_type
}
- }
+ },
},
data() {
return {
@@ -149,6 +190,7 @@
dept: "",
group: []
},
+ shiftDetailDTOList: [],
//楠岃瘉瑙勫垯
rules: {
avatar: [
diff --git a/src/views/console/base/Shiftsystem.vue b/src/views/console/base/Shiftsystem.vue
index 798763d..b7f7136 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-04-29 23:01:13
+ * @LastEditTime: 2024-05-02 00:31:01
* @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 }"></Dialog>
+ <Dialog ref="dialog" :option="{ types, status, group }" :detail="detail"></Dialog>
</el-container>
</template>
@@ -97,24 +97,6 @@
},
dayCharts() {
- // if (!this?.info?.shiftDetailVOList?.length) return
- // let yData = this.info.shiftDetailVOList.map(item => {
- // return item.indexName
- // })
- // let series = this.info.shiftDetailVOList.map(item => {
- // let base = moment().format('YYYY-MM-DD') + ' 00:00:00'
- // return [item.indexName, moment(base).add(item.shiftStartTime, 'm').unix(), moment(base).add(item.shiftEndTime, 'm').unix()]
- // // return {
- // // name: item.indexName,
- // // type: 'bar',
- // // data: [moment(base).add(item.shiftStartTime, 'm').format('YYYY-MM-DD HH:mm:ss').unix(), moment(base).add(item.shiftEndTime, 'm').format('YYYY-MM-DD HH:mm:ss').unix()],
- // // label: {
- // // show: true
- // // }
- // // }
- // })
- // console.log(series)
-
let { data = [], categories = [], startTime, end } = this.getData1()
console.log('>>>>>>', data)
return {
@@ -211,11 +193,22 @@
info: {
code: ''
},
+ detail: {
+
+ }
}
},
created() {
+ this.init()
},
methods: {
+ init() {
+ this.$HTTP.get('/api/blade-system/param/detail?paramKey=system.shift.max').then(res => {
+ if (res.code === 200) {
+ this.detail = res.data
+ }
+ })
+ },
getData1() {
if (!this?.info?.shiftDetailVOList?.length) return { data: [], categories: [], startTime: 0 }
let categories = this.info.shiftDetailVOList.map(item => {
--
Gitblit v1.9.3