From e713b378b01d189f972cfb5b9eae749ee95a8b51 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 29 十月 2022 13:48:00 +0800
Subject: [PATCH] 1.解决两个账号登录，是否被挤掉的问题
---
src/views/gantt_back/gantt_back.vue | 102 ++++++++++++++++++++++++++------------------------
1 files changed, 53 insertions(+), 49 deletions(-)
diff --git a/src/views/gantt_back/gantt_back.vue b/src/views/gantt_back/gantt_back.vue
index 59ccad7..203fa8f 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"
@@ -273,54 +276,6 @@
},
'rows': [
{
- 'YearDate': '2022-09-24',
- 'children': [
- {
- 'AdvaDevicNumber': 'LKFDL_SC-PC029',
- 'AdvaDevicName': '閲戦紟鏁版帶杞﹀簥029',
- 'AdvaDevicCropMob': '78',
- 'AdvaDevicRhythm': '10',
- 'OneStartDate': '08:00~11:30',
- 'TwoStartDate': '12:30~17:00',
- 'ThreeStartDate': '',
- 'FourStartDate': '',
- 'FiveStartDate': ''
- }
- ]
- },
- {
- 'YearDate': '2022-09-25',
- 'children': [
- {
- 'AdvaDevicNumber': 'LKFDL_SC-PC029',
- 'AdvaDevicName': '閲戦紟鏁版帶杞﹀簥029',
- 'AdvaDevicCropMob': '78',
- 'AdvaDevicRhythm': '10',
- 'OneStartDate': '08:00~11:30',
- 'TwoStartDate': '12:30~17:00',
- 'ThreeStartDate': '',
- 'FourStartDate': '',
- 'FiveStartDate': ''
- }
- ]
- },
- {
- 'YearDate': '2022-09-26',
- 'children': [
- {
- 'AdvaDevicNumber': 'LKFDL_SC-PC029',
- 'AdvaDevicName': '閲戦紟鏁版帶杞﹀簥029',
- 'AdvaDevicCropMob': '78',
- 'AdvaDevicRhythm': '10',
- 'OneStartDate': '08:00~11:30',
- 'TwoStartDate': '12:30~17:00',
- 'ThreeStartDate': '',
- 'FourStartDate': '',
- 'FiveStartDate': ''
- }
- ]
- },
- {
'YearDate': '2022-09-27',
'children': [
{
@@ -359,6 +314,54 @@
'AdvaDevicNumber': 'LKFDL_SC-PC029',
'AdvaDevicName': '閲戦紟鏁版帶杞﹀簥029',
'AdvaDevicCropMob': '78',
+ 'AdvaDevicRhythm': '10',
+ 'OneStartDate': '08:00~11:30',
+ 'TwoStartDate': '12:30~17:00',
+ 'ThreeStartDate': '',
+ 'FourStartDate': '',
+ 'FiveStartDate': ''
+ }
+ ]
+ },
+ {
+ 'YearDate': '2022-09-30',
+ 'children': [
+ {
+ 'AdvaDevicNumber': 'LKFDL_SC-PC029',
+ 'AdvaDevicName': '閲戦紟鏁版帶杞﹀簥029',
+ 'AdvaDevicCropMob': '78',
+ 'AdvaDevicRhythm': '10',
+ 'OneStartDate': '08:00~11:30',
+ 'TwoStartDate': '12:30~17:00',
+ 'ThreeStartDate': '',
+ 'FourStartDate': '',
+ 'FiveStartDate': ''
+ }
+ ]
+ },
+ {
+ 'YearDate': '2022-10-01',
+ 'children': [
+ {
+ 'AdvaDevicNumber': 'LKFDL_SC-PC029',
+ 'AdvaDevicName': '閲戦紟鏁版帶杞﹀簥029',
+ 'AdvaDevicCropMob': '78',
+ 'AdvaDevicRhythm': '10',
+ 'OneStartDate': '08:00~11:30',
+ 'TwoStartDate': '12:30~17:00',
+ 'ThreeStartDate': '',
+ 'FourStartDate': '',
+ 'FiveStartDate': ''
+ }
+ ]
+ },
+ {
+ 'YearDate': '2022-10-02',
+ 'children': [
+ {
+ 'AdvaDevicNumber': 'LKFDL_SC-PC029',
+ 'AdvaDevicName': '閲戦紟鏁版帶杞﹀簥029',
+ '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