From a93255e0a0334b51ecbaf3d8f496ad0fae1ed747 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 07 六月 2023 10:38:00 +0800
Subject: [PATCH] 1.生产入库有源单提交测试OK
---
src/views/gantt_back/gantt_back.vue | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/views/gantt_back/gantt_back.vue b/src/views/gantt_back/gantt_back.vue
index 59ccad7..d627e07 100644
--- a/src/views/gantt_back/gantt_back.vue
+++ b/src/views/gantt_back/gantt_back.vue
@@ -83,8 +83,11 @@
</el-row>
<el-row />
</el-tabs>
+ <!-- {{ time_data }}-->
+ <!-- {{ bm_data }}-->
<div class="container" style="margin: 30px;">
<v-gantt-chart
+
:start-time="time_data[0]"
:end-time="time_data[1]"
:cell-width="cellWidth"
@@ -102,7 +105,7 @@
@scrollLeft="scrollLeftA"
>
<template slot="block" slot-scope="{data,item}">
- <Test
+ <Scheduling
:data="data"
:update-time-lines="updateTimeLines"
:cell-height="cellHeight"
@@ -140,14 +143,14 @@
</template>
<script>
-import Test from '@/components/Test'
+import Scheduling from '@/components/Scheduling'
import dayjs from 'dayjs'
const scaleList = `30,60,240,360`.split(',').map(n => parseInt(n))
const timeList = `0,30,60,120,240,480`.split(',').map(n => parseInt(n))
export default {
- components: { Test },
+ components: { Scheduling },
data() {
return {
show: false,
@@ -273,7 +276,7 @@
},
'rows': [
{
- 'YearDate': '2022-09-24',
+ 'YearDate': '2022-11-29',
'children': [
{
'AdvaDevicNumber': 'LKFDL_SC-PC029',
@@ -289,7 +292,7 @@
]
},
{
- 'YearDate': '2022-09-25',
+ 'YearDate': '2022-11-30',
'children': [
{
'AdvaDevicNumber': 'LKFDL_SC-PC029',
@@ -305,7 +308,7 @@
]
},
{
- 'YearDate': '2022-09-26',
+ 'YearDate': '2022-12-01',
'children': [
{
'AdvaDevicNumber': 'LKFDL_SC-PC029',
@@ -321,7 +324,7 @@
]
},
{
- 'YearDate': '2022-09-27',
+ 'YearDate': '2022-12-02',
'children': [
{
'AdvaDevicNumber': 'LKFDL_SC-PC029',
@@ -337,7 +340,7 @@
]
},
{
- 'YearDate': '2022-09-28',
+ 'YearDate': '2022-12-03',
'children': [
{
'AdvaDevicNumber': 'LKFDL_SC-PC029',
@@ -353,12 +356,12 @@
]
},
{
- 'YearDate': '2022-09-29',
+ 'YearDate': '2022-12-04',
'children': [
{
'AdvaDevicNumber': 'LKFDL_SC-PC029',
'AdvaDevicName': '閲戦紟鏁版帶杞﹀簥029',
- 'AdvaDevicCropMob': '78',
+ 'AdvaDevicCropMob': '30',
'AdvaDevicRhythm': '10',
'OneStartDate': '08:00~11:30',
'TwoStartDate': '12:30~17:00',
@@ -745,6 +748,7 @@
}
}
}
+ console.log(newList, 321)
for (const i in list) {
this.pushTiem(newList, list[i].id, list[i].gtArray)
}
@@ -977,7 +981,7 @@
for (const i in this.bm_data) {
const newArr = []
for (const j in this.bm_data[i].gtArray) {
- if (this.bm_data[i].gtArray[j].type != 'schedule') {
+ if (this.bm_data[i].gtArray[j].type !== 'schedule') {
newArr.push(this.bm_data[i].gtArray[j])
}
}
--
Gitblit v1.9.3