From b46bc2dba51a3885a68e4c58316b41a31ea16bb2 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 14 二月 2023 13:35:03 +0800
Subject: [PATCH] 1.存货档案修改
---
src/views/scgl/zdpc.vue | 663 +++++++++++++++++++++++-------------------------------
1 files changed, 283 insertions(+), 380 deletions(-)
diff --git a/src/views/scgl/zdpc.vue b/src/views/scgl/zdpc.vue
index 253703c..716955d 100644
--- a/src/views/scgl/zdpc.vue
+++ b/src/views/scgl/zdpc.vue
@@ -208,7 +208,7 @@
size="small"
:picker-options="pickerOptions1"
:clearable="false"
- @change="change_time"
+ @change="dateChange"
/>
</el-form-item>
<el-form-item label="鎺掔▼鏂瑰紡" style=" display: flex;">
@@ -216,7 +216,7 @@
v-model="formBottom.types"
:disabled="radioSelectedId===''"
style="width:120px"
- @change="changeTypes"
+ @change="typesChange"
>
<el-option value="N" label="璁惧浼樺厛" />
<el-option value="Y" label="鏃堕棿浼樺厛" />
@@ -240,8 +240,8 @@
</el-form-item>
<el-form-item label="棰勬帓杩涘害" style=" display: flex;">
<span>
- <span style="text-decoration:underline;">{{ formBottom.real_num }}</span> /
- <span style="text-decoration:underline">{{ formBottom.meter }}</span>
+ <span style="text-decoration:underline;">{{ formBottom.canArrangeNumber }}</span> /
+ <span style="text-decoration:underline">{{ formBottom.needArrangeNumber }}</span>
</span>
</el-form-item>
</div>
@@ -254,7 +254,7 @@
:disabled="radioSelectedId===''"
type="primary"
icon="el-icon-document-remove"
- @click="click_schedule"
+ @click="prepareArrange"
>棰勬帓
</el-button>
<el-button
@@ -262,11 +262,17 @@
type="primary"
:disabled="radioSelectedId===''"
icon="el-icon-document-checked"
- @click="click_yes"
+ @click="prepareSubmit"
>鎻愪氦
</el-button>
</div>
</el-form>
+ <div class="colorDescription">
+ <div class="colorDescriptionItem"><i class="el-icon-s-opportunity" style="margin-right: 5px;color: rgba(5, 185, 100, 0.5)" />浜ц兘</div>
+ <div class="colorDescriptionItem"><i class="el-icon-s-opportunity" style="margin-right: 5px;color: rgba(5, 185, 100, 1)" />宸叉帓</div>
+ <div class="colorDescriptionItem"><i class="el-icon-s-opportunity" style="margin-right: 5px;color:rgba(128,0,128,0.7)" />棰勬帓</div>
+ <!-- <div class="colorDescriptionItem"><i class="el-icon-s-opportunity" style="margin-right: 5px;color: #a7a7a7" />澶辨晥浜ц兘</div>-->
+ </div>
<div
class="bodyTopFormExpand"
style="height: 5px"
@@ -309,7 +315,7 @@
<el-checkbox
v-model="data.status"
style="margin-right:5px;"
- @change="click_box(data)"
+ @change="checkboxSingle(data)"
/>
{{ data.id }} {{ data.name }}
</div>
@@ -328,7 +334,7 @@
v-model="ganttCheckboxAll"
class="box_style"
:disabled="radioSelectedId===''"
- @change="changeLift()"
+ @change="checkboxAll()"
/>
<input
v-model.number="cellWidth"
@@ -353,7 +359,7 @@
import Test from '@/components/Test'
import dayjs from 'dayjs'
import { AdvancedSchedulingSearch, OnclickAdvancedSchedulingDevice, SubmitAlreadyScheduling } from '@/api/scgl'
-import { handleDatetime } from '@/utils/global'
+import { handleDatetime, handleDatetime2 } from '@/utils/global'
import waves from '@/directive/waves'
export default {
@@ -411,28 +417,28 @@
types: 'N', // 鎺掔▼鏂瑰紡
scale: 60, // 鏃堕棿鍒诲害
times: 0, // 鎹㈠瀷鏃堕棿
- real_num: 0, // 鍙帓鏁伴噺
- meter: 0// 闇�鎺掓暟閲�
+ canArrangeNumber: 0, // 鍙帓鏁伴噺
+ needArrangeNumber: 0// 闇�鎺掓暟閲�
},
schedulingData: [], // 鎺掔▼鐨勬渶缁堟暟鎹�
timeTopTempData: [], // 鏃堕棿浼樺厛鐨勪复鏃舵暟鎹�
+ eqpTopTempData: [], // 璁惧浼樺厛鐨勪复鏃舵暟鎹�
- formUpdata: {
+ formUpdate: {
WorkCode: '',
BotProceCode: '',
json: []
},
- currentTime: dayjs(),
+ // currentTime: dayjs(),
cellWidth: 50,
cellHeight: 30,
titleHeight: 40,
titleWidth: 250,
dataKey: 'id',
- timeList: `0,30,60,120,240,480`.split(',').map(n => parseInt(n)),
+ // timeList: `0,30,60,120,240,480`.split(',').map(n => parseInt(n)),
scaleList: `30,60,240,360`.split(',').map(n => parseInt(n)),
hideHeader: false,
- arrayKeys: ['gtArray', 'error'],
- title_list: []
+ arrayKeys: ['gtArray', 'error']
}
},
@@ -504,18 +510,26 @@
/*
鎺掔▼閮ㄥ垎鐨勬柟娉�
*/
- resetFormcx() {
- this.$nextTick(() => {
- this.$refs.form.resetFields()
- })
- },
+ // 纭繚鎹㈠瀷鏃堕棿涓洪潪璐熸暟
no_zero() {
if (this.formBottom.times < 0) {
this.formBottom.times = 0
}
},
- // 宸ヤ綅鍒楄〃澶嶉�夋鎿嶄綔
- changeLift() {
+ // 鎺掔▼鏂瑰紡鏀瑰彉
+ typesChange() {
+ this.getOnclickAdvancedSchedulingDevice()
+ },
+ // 鎺掔▼鏃ユ湡鍊兼敼鍙樻椂
+ dateChange() {
+ this.time_data[0] = this.formBottom.scheDate[0] + ' 00:00'
+ this.time_data[1] = this.formBottom.scheDate[1] + ' 23:59'
+ this.forms.startdate = this.formBottom.scheDate[0]
+ this.forms.enddate = this.formBottom.scheDate[1]
+ this.getOnclickAdvancedSchedulingDevice()
+ },
+ // 宸ヤ綅鍒楄〃澶嶉�夋鎿嶄綔 (鍏ㄩ�夈�佸叏涓嶉��)
+ checkboxAll() {
if (this.ganttCheckboxAll) {
this.ganttLeftArrId = []
this.getOnclickAdvancedSchedulingDevice()
@@ -528,26 +542,15 @@
this.timeTopTempData[i].gtArray = []
}
}
- // this.click_schedule()
- },
- changeTypes() {
- this.getOnclickAdvancedSchedulingDevice()
- },
- // 鎺掔▼鏃ユ湡鍊兼敼鍙樻椂
- change_time() {
- this.time_data[0] = this.formBottom.scheDate[0] + ' 00:00'
- this.time_data[1] = this.formBottom.scheDate[1] + ' 23:59'
- this.forms.startdate = this.formBottom.scheDate[0]
- this.forms.enddate = this.formBottom.scheDate[1]
- this.getOnclickAdvancedSchedulingDevice()
+ // this.prepareArrange()
},
// 鐢樼壒鍥惧乏渚heckbox鍊奸�変腑鎴栬�呭彇娑堟椂
- click_box(val) {
+ checkboxSingle(val) {
if (!val.status) {
for (const i in this.timeTopTempData) {
const new_arr = []
for (const j in this.timeTopTempData[i].gtArray) {
- if (this.timeTopTempData[i].gtArray[j].id == val.id) {
+ if (this.timeTopTempData[i].gtArray[j].id === val.id) {
} else {
new_arr.push(this.timeTopTempData[i].gtArray[j])
}
@@ -582,16 +585,15 @@
for (const i in this.schedulingData) {
const arr = []
for (const j in this.schedulingData[i].gtArray) {
- if (this.schedulingData[i].gtArray[j].type != 'schedule') {
+ if (this.schedulingData[i].gtArray[j].type !== 'schedule') {
arr.push(this.schedulingData[i].gtArray[j])
}
}
this.schedulingData[i].gtArray = arr
}
- this.formBottom.real_num = 0
- // this.click_schedule()
+ this.formBottom.canArrangeNumber = 0
+ // this.prepareArrange()
},
-
// 鐐瑰嚮甯﹀嚭鏁版嵁
async getOnclickAdvancedSchedulingDevice() {
const res = await OnclickAdvancedSchedulingDevice(this.forms)
@@ -602,95 +604,47 @@
const data = res.rows // 鎷垮埌寰呮帓鏁版嵁 瀵规暟鎹繘琛屾敼閫�
const cont = res.Cont // 鎷垮埌宸叉帓鏁版嵁 瀵规暟鎹繘琛屾敼閫�
- this.formBottom.real_num = 0
+ this.formBottom.canArrangeNumber = 0
// 灏嗕簲涓椂闂存杩涜璧嬪��
- for (const i in data) {
- for (const j in data[i].children) {
- if (data[i].children[j].OneStartDate != '') {
- data[i].children[
- j
- ].OneStartDate = data[i].children[
- j
- ].OneStartDate.split('~')
- data[i].children[j].OneStartDate[0] =
- data[i].YearDate +
- ' ' +
- data[i].children[j].OneStartDate[0]
- data[i].children[j].OneStartDate[1] =
- data[i].YearDate +
- ' ' +
- data[i].children[j].OneStartDate[1]
+ data.forEach(item => {
+ item.children.forEach(it => {
+ if (it.OneStartDate !== '') {
+ it.OneStartDate = it.OneStartDate.split('~')
+ it.OneStartDate[0] = item.YearDate + ' ' + it.OneStartDate[0] + ':00'
+ it.OneStartDate[1] = item.YearDate + ' ' + it.OneStartDate[1] + ':00'
}
- if (data[i].children[j].TwoStartDate != '') {
- data[i].children[
- j
- ].TwoStartDate = data[i].children[
- j
- ].TwoStartDate.split('~')
- data[i].children[j].TwoStartDate[0] =
- data[i].YearDate +
- ' ' +
- data[i].children[j].TwoStartDate[0]
- data[i].children[j].TwoStartDate[1] =
- data[i].YearDate +
- ' ' +
- data[i].children[j].TwoStartDate[1]
- }
- if (data[i].children[j].ThreeStartDate != '') {
- data[i].children[
- j
- ].ThreeStartDate = data[i].children[
- j
- ].ThreeStartDate.split('~')
- data[i].children[j].ThreeStartDate[0] =
- data[i].YearDate +
- ' ' +
- data[i].children[j].ThreeStartDate[0]
- data[i].children[j].ThreeStartDate[1] =
- data[i].YearDate +
- ' ' +
- data[i].children[j].ThreeStartDate[1]
- }
- if (data[i].children[j].FourStartDate != '') {
- data[i].children[
- j
- ].FourStartDate = data[i].children[
- j
- ].FourStartDate.split('~')
- data[i].children[j].FourStartDate[0] =
- data[i].YearDate +
- ' ' +
- data[i].children[j].FourStartDate[0]
- data[i].children[j].FourStartDate[1] =
- data[i].YearDate +
- ' ' +
- data[i].children[j].FourStartDate[1]
- }
- if (data[i].children[j].FiveStartDate != '') {
- data[i].children[
- j
- ].FiveStartDate = data[i].children[
- j
- ].FiveStartDate.split('~')
- data[i].children[j].FiveStartDate[0] =
- data[i].YearDate +
- ' ' +
- data[i].children[j].FiveStartDate[0]
- data[i].children[j].FiveStartDate[1] =
- data[i].YearDate +
- ' ' +
- data[i].children[j].FiveStartDate[1]
- }
- }
- }
+ if (it.TwoStartDate !== '') {
+ it.TwoStartDate = it.TwoStartDate.split('~')
+ it.TwoStartDate[0] = item.YearDate + ' ' + it.TwoStartDate[0] + ':00'
+ it.TwoStartDate[1] = item.YearDate + ' ' + it.TwoStartDate[1] + ':00'
+ }
+ if (it.ThreeStartDate !== '') {
+ it.ThreeStartDate = it.ThreeStartDate.split('~')
+ it.ThreeStartDate[0] = item.YearDate + ' ' + it.ThreeStartDate[0] + ':00'
+ it.ThreeStartDate[1] = item.YearDate + ' ' + it.ThreeStartDate[1] + ':00'
+ }
+ if (it.FourStartDate !== '') {
+ it.FourStartDate = it.FourStartDate.split('~')
+ it.FourStartDate[0] = item.YearDate + ' ' + it.FourStartDate[0] + ':00'
+ it.FourStartDate[1] = item.YearDate + ' ' + it.FourStartDate[1] + ':00'
+ }
+ if (it.FiveStartDate !== '') {
+ it.FiveStartDate = it.FiveStartDate.split('~')
+ it.FiveStartDate[0] = item.YearDate + ' ' + it.FiveStartDate[0] + ':00'
+ it.FiveStartDate[1] = item.YearDate + ' ' + it.FiveStartDate[1] + ':00'
+ }
+ })
+ })
+
+ // 鏋勫缓 鎸夎澶囦紭鍏堟帓绋嬬殑 鏁版嵁鏍煎紡 schedulingData
const list = [] // 涓存椂list 鏆傚瓨
- for (const i in data[0].children) {
+ data[0].children.forEach(item => {
const obj = {
id: '',
name: '',
- AdvaDevicRhythm: '',
+ AdvaDevicRhythm: '', // 鑺傛媿澶氬皯绉掔敓浜т竴涓紙鐢熶骇鑺傛媿锛�
status: true,
colorPair: {
dark: 'rgb(83, 186, 241,0.8)',
@@ -701,19 +655,17 @@
},
gtArray: []
}
- obj.id = data[0].children[i].AdvaDevicNumber
- obj.name = data[0].children[i].AdvaDevicName
- obj.AdvaDevicRhythm = data[0].children[
- i
- ].AdvaDevicRhythm
+ obj.id = item.AdvaDevicNumber
+ obj.name = item.AdvaDevicName
+ obj.AdvaDevicRhythm = item.AdvaDevicRhythm
list.push(obj)
- }
+ })
- // 缁勫悎鏂扮殑缁撴瀯
+ // 缁勫悎鏂扮殑缁撴瀯 娴呯豢鑹茶儗鏅潯
const newList = []
for (const i in data) {
for (const j in data[i].children) {
- if (data[i].children[j].OneStartDate != '') {
+ if (data[i].children[j].OneStartDate !== '') {
const data1 = {
id: '',
start: '',
@@ -723,12 +675,11 @@
data1.id = data[i].children[j].AdvaDevicNumber
data1.start = data[i].children[j].OneStartDate[0]
data1.end = data[i].children[j].OneStartDate[1]
- data1.mod =
- (data[i].children[j].AdvaDevicCropMob * 1) /
- 100
+ // AdvaDevicCropMob 绋煎姩鐜� AdvaDevicRhythm 鐢熶骇鑺傛媿
+ data1.mod = (data[i].children[j].AdvaDevicCropMob * 1) / 100 // 绋煎姩鐜�
newList.push(data1)
}
- if (data[i].children[j].TwoStartDate != '') {
+ if (data[i].children[j].TwoStartDate !== '') {
const data2 = {
id: '',
start: '',
@@ -738,12 +689,10 @@
data2.id = data[i].children[j].AdvaDevicNumber
data2.start = data[i].children[j].TwoStartDate[0]
data2.end = data[i].children[j].TwoStartDate[1]
- data2.mod =
- (data[i].children[j].AdvaDevicCropMob * 1) /
- 100
+ data2.mod = (data[i].children[j].AdvaDevicCropMob * 1) / 100
newList.push(data2)
}
- if (data[i].children[j].ThreeStartDate != '') {
+ if (data[i].children[j].ThreeStartDate !== '') {
const data3 = {
id: '',
start: '',
@@ -751,16 +700,12 @@
mod: ''
}
data3.id = data[i].children[j].AdvaDevicNumber
- data3.start = data[i].children[
- j
- ].ThreeStartDate[0]
+ data3.start = data[i].children[j].ThreeStartDate[0]
data3.end = data[i].children[j].ThreeStartDate[1]
- data3.mod =
- (data[i].children[j].AdvaDevicCropMob * 1) /
- 100
+ data3.mod = (data[i].children[j].AdvaDevicCropMob * 1) / 100
newList.push(data3)
}
- if (data[i].children[j].FourStartDate != '') {
+ if (data[i].children[j].FourStartDate !== '') {
const data4 = {
id: '',
start: '',
@@ -768,16 +713,12 @@
mod: ''
}
data4.id = data[i].children[j].AdvaDevicNumber
- data4.start = data[i].children[
- j
- ].FourStartDate[0]
+ data4.start = data[i].children[j].FourStartDate[0]
data4.end = data[i].children[j].FourStartDate[1]
- data4.mod =
- (data[i].children[j].AdvaDevicCropMob * 1) /
- 100
+ data4.mod = (data[i].children[j].AdvaDevicCropMob * 1) / 100
newList.push(data4)
}
- if (data[i].children[j].FiveStartDate != '') {
+ if (data[i].children[j].FiveStartDate !== '') {
const data5 = {
id: '',
start: '',
@@ -785,13 +726,9 @@
mod: ''
}
data5.id = data[i].children[j].AdvaDevicNumber
- data5.start = data[i].children[
- j
- ].FiveStartDate[0]
+ data5.start = data[i].children[j].FiveStartDate[0]
data5.end = data[i].children[j].FiveStartDate[1]
- data5.mod =
- (data[i].children[j].AdvaDevicCropMob * 1) /
- 100
+ data5.mod = (data[i].children[j].AdvaDevicCropMob * 1) / 100
newList.push(data5)
}
}
@@ -803,30 +740,29 @@
this.schedulingData = list
- if (cont != '') {
+ if (cont !== '') {
for (const i in cont) {
for (const j in this.schedulingData) {
- if (this.schedulingData[j].id == cont[i].eqp_code) {
+ if (this.schedulingData[j].id === cont[i].eqp_code) {
const data = {
id: cont[i].eqp_code,
number: cont[i].alloc_qty,
cl_name: cont[i].part_name,
- cl_code: this.cl_code,
+ cl_code: cont[i].part_code,
+ AdvaScheUom: cont[i].uom_name, // 鍗曚綅
work_order: cont[i].wo_code,
- STATUS: this.AdvaScheUom,
- // status: this.AdvaScheUom,
start: cont[i].time_start,
end: cont[i].time_end,
- type: cont[i].status == 'S' ? 'h_schedule' : 'bm_schedule'
+ // type: cont[i].status === 'S' ? 'h_schedule' : 'bm_schedule'
+ type: 'h_schedule'
}
- this.schedulingData[j].flag = 'isCont'
this.schedulingData[j].gtArray.unshift(data)
}
}
}
}
- if (this.ganttLeftArrId != '') {
+ if (this.ganttLeftArrId !== '') {
for (const j in this.schedulingData) {
if (this.ganttLeftArrId.indexOf(this.schedulingData[j].id) >= 0) {
this.schedulingData[j].gtArray = []
@@ -836,7 +772,7 @@
}
// 璁惧浼樺厛鐨勬暟鎹牸寮�
- this.title_list = []
+ this.eqpTopTempData = []
for (const i in data[0].children) {
const obj = {
id: '',
@@ -858,35 +794,36 @@
obj.AdvaDevicRhythm = data[0].children[i].AdvaDevicRhythm
// obj.mod =data[0].children[i].AdvaDevicCropMob *1
- this.title_list.push(obj)
+ this.eqpTopTempData.push(obj)
}
// 鏇存敼鏍煎紡
this.timeTopTempData = []
+ // 鏋勫缓鎸夋椂闂翠紭鍏堢殑鎺掔▼鏁版嵁鏍煎紡 timeTopTempData
for (const i in data) {
const time = {
date: data[i].YearDate,
AdvaDevicRhythm: '',
gtArray: []
}
- if (data[i].children != '') {
+ if (data[i].children !== '') {
time.AdvaDevicRhythm = data[i].children[0].AdvaDevicRhythm
}
for (const j in data[i].children) {
- if (data[i].children[j].OneStartDate != '') {
+ if (data[i].children[j].OneStartDate !== '') {
const icu1 = {
name: data[i].children[j].AdvaDevicName,
id: data[i].children[j].AdvaDevicNumber,
type: 'capacity',
- rhythm: data[i].children[j].AdvaDevicRhythm,
+ rhythm: data[i].children[j].AdvaDevicRhythm, // 鐢熶骇鑺傛媿
start: data[i].children[j].OneStartDate[0],
end: data[i].children[j].OneStartDate[1],
mod: (data[i].children[j].AdvaDevicCropMob * 1) / 100
}
time.gtArray.push(icu1)
}
- if (data[i].children[j].TwoStartDate != '') {
+ if (data[i].children[j].TwoStartDate !== '') {
const icu2 = {
name: data[i].children[j].AdvaDevicName,
id: data[i].children[j].AdvaDevicNumber,
@@ -898,7 +835,7 @@
}
time.gtArray.push(icu2)
}
- if (data[i].children[j].ThreeStartDate != '') {
+ if (data[i].children[j].ThreeStartDate !== '') {
const icu3 = {
name: data[i].children[j].AdvaDevicName,
id: data[i].children[j].AdvaDevicNumber,
@@ -910,7 +847,7 @@
}
time.gtArray.push(icu3)
}
- if (data[i].children[j].FourStartDate != '') {
+ if (data[i].children[j].FourStartDate !== '') {
const icu4 = {
name: data[i].children[j].AdvaDevicName,
id: data[i].children[j].AdvaDevicNumber,
@@ -922,7 +859,7 @@
}
time.gtArray.push(icu4)
}
- if (data[i].children[j].FiveStartDate != '') {
+ if (data[i].children[j].FiveStartDate !== '') {
const icu5 = {
name: data[i].children[j].AdvaDevicName,
id: data[i].children[j].AdvaDevicNumber,
@@ -939,7 +876,7 @@
this.timeTopTempData.push(time)
}
- if (cont != '') {
+ if (cont !== '') {
for (const i in cont) {
for (const j in this.timeTopTempData) {
const data = {
@@ -947,34 +884,28 @@
date: cont[i].time_start.split(' ')[0],
number: cont[i].alloc_qty,
cl_name: cont[i].part_name,
- cl_code: this.cl_code,
+ cl_code: cont[i].part_code,
+ AdvaScheUom: cont[i].uom_name, // 鍗曚綅
work_order: cont[i].wo_code,
start: cont[i].time_start,
end: cont[i].time_end,
type: 'h_schedule'
}
- if (this.timeTopTempData[j].date == data.date) {
+ if (this.timeTopTempData[j].date === data.date) {
this.timeTopTempData[j].gtArray.unshift(data)
}
}
}
}
-
- // console.log('鎵ц浜�!')
- // console.log(this.schedulingData, ' this.schedulingData')
- // console.log(this.timeTopTempData, 'this.timeTopTempData')
-
- // this.$forceUpdate()
},
// 鎹㈠瀷鏃堕棿
MinutesTest(time) {
const t = new Date(time)
- console.log(t.getMinutes(), 800)
t.setMinutes(t.getMinutes() + this.formBottom.times * 1)
- var now =
+ const now =
t.getFullYear() +
'-' +
- this.add_one(t.getMonth()).toString().padStart(2, '0') +
+ (t.getMonth() + 1).toString().padStart(2, '0') +
'-' +
t.getDate().toString().padStart(2, '0') +
' ' +
@@ -983,17 +914,12 @@
t.getMinutes().toString().padStart(2, '0') +
':' +
t.getSeconds().toString().padStart(2, '0')
- console.log('now', now)
return now
- },
- // +1
- add_one(date) {
- return parseInt(date) + 1
},
// 鎻掑叆浜ц兘鏃堕棿娈�
pushItem(newList, id, arr) {
for (const i in newList) {
- if (newList[i].id == id) {
+ if (newList[i].id === id) {
const data = {
start: newList[i].start,
end: newList[i].end,
@@ -1009,7 +935,7 @@
getCurrentRow(row) {
this.radioSelectedId = row.AdvaScheId // 鎺掔▼id璧嬪�肩粰閫変腑琛宨d
- this.formBottom.meter = row.AdvaScheQty * 1 - row.AdvaScheYPQty * 1 // 闇�鎺掓暟閲� = 鏈帓绋嬫暟閲� - 宸叉帓绋嬫暟閲�
+ this.formBottom.needArrangeNumber = row.AdvaScheQty * 1 - row.AdvaScheYPQty * 1 // 闇�鎺掓暟閲� = 鏈帓绋嬫暟閲� - 宸叉帓绋嬫暟閲�
this.formBottom.scheDate = [] // 鎺掔▼鏃ユ湡缃┖
this.cl_name = row.AdvaSchePartName // 浜у搧鍚嶇О
this.cl_code = row.AdvaSchePartNumber // 浜у搧缂栫爜
@@ -1018,7 +944,7 @@
this.formBottom.scheDate.push(handleDatetime(new Date())) // 褰撳墠鏃ユ湡锛堜粖澶╋級
this.formBottom.scheDate.push(row.AdvaScheEndDate) // 瑕佹眰浜や粯鏃堕棿
- if (this.formBottom.scheDate != '') {
+ if (this.formBottom.scheDate !== '') {
this.time_data[0] = this.formBottom.scheDate[0] + ' 00:00' // 鎺掔▼寮�濮嬫椂闂�
this.time_data[1] = this.formBottom.scheDate[1] + ' 23:59' // 鎺掔▼缁撴潫鏃堕棿
}
@@ -1029,23 +955,23 @@
this.forms.startdate = handleDatetime(new Date()) // 褰撳墠鏃ユ湡锛堜粖澶╋級
this.forms.enddate = row.AdvaScheEndDate // 瑕佹眰浜や粯鏃堕棿
this.getOnclickAdvancedSchedulingDevice()
- this.formUpdata.WorkCode = row.AdvaScheWorkCode // 宸ュ崟缂栧彿
- this.formUpdata.BotProceCode = row.AdvaScheBotProcid // 宸ヨ壓璺嚎缂栫爜
+ this.formUpdate.WorkCode = row.AdvaScheWorkCode // 宸ュ崟缂栧彿
+ this.formUpdate.BotProceCode = row.AdvaScheBotProcid // 宸ヨ壓璺嚎缂栫爜
},
// 鎻愪氦鎺掔▼
- async click_yes() {
- if (this.formBottom.real_num !== this.formBottom.meter) {
+ async prepareSubmit() {
+ if (this.formBottom.canArrangeNumber !== this.formBottom.needArrangeNumber) {
this.$message.error('鏁伴噺鏈帓瀹岋紝璇疯缃骇鑳芥椂闂达紒')
} else {
const list = [] // 鎻愪氦鏁扮粍
for (const i in this.schedulingData) {
const arr = []
for (const j in this.schedulingData[i].gtArray) {
- if (this.schedulingData[i].gtArray[j].type == 'schedule') {
+ if (this.schedulingData[i].gtArray[j].type === 'schedule') {
arr.push(this.schedulingData[i].gtArray[j])
}
}
- if (arr != '') {
+ if (arr !== '') {
for (const i in arr) {
const data = {
AlreDevicNumber: '',
@@ -1063,24 +989,24 @@
}
// 鎺掔▼鐩稿悓璁惧鑾峰彇寮�濮嬫椂闂� 缁撴潫鏃堕棿 鏁伴噺鐨勬�诲拰
// 杩囨护
- let updata = []
+ let update = []
for (const i in list) {
- if (list[i].AlreStartDate != '') {
- updata.push(list[i])
+ if (list[i].AlreStartDate !== '') {
+ update.push(list[i])
}
}
- updata = JSON.stringify(updata)
- this.formUpdata.json = updata
- if (list == '') {
+ update = JSON.stringify(update)
+ this.formUpdate.json = update
+ if (list === '') {
this.$message.error('璇峰厛棰勬帓')
return false
}
const formData = new FormData()
- formData.append('wocode', this.formUpdata.WorkCode)
- formData.append('botprocecode', this.formUpdata.BotProceCode)
- formData.append('json', this.formUpdata.json)
+ formData.append('wocode', this.formUpdate.WorkCode)
+ formData.append('botprocecode', this.formUpdate.BotProceCode)
+ formData.append('json', this.formUpdate.json)
const res = await SubmitAlreadyScheduling(formData)
@@ -1088,14 +1014,14 @@
this.$message.success(res.Message)
}
- this.formBottom.meter = 0
- this.formBottom.real_num = 0
+ this.formBottom.needArrangeNumber = 0
+ this.formBottom.canArrangeNumber = 0
await this.getOnclickAdvancedSchedulingDevice()
await this.getAdvancedSchedulingSearch()
}
},
// 鏃堕棿/璁惧浼樺厛鎺掔▼
- click_schedule() {
+ prepareArrange() {
const timestamp = new Date().toLocaleDateString()
if (new Date(this.formBottom.scheDate[1]) < new Date(timestamp)) {
@@ -1106,22 +1032,14 @@
// 璁惧浼樺厛鎴栬�呮椂闂翠紭鍏� 瀵规暟鎹繘琛岀殑鏍煎紡杞崲
if (this.schedulingData !== '' && this.formBottom.types === 'N') { // 璁惧浼樺厛
- this.fun_time()
+ this.eqpDataTransition()
this.editLastValue(this.schedulingData)
} else if (this.timeTopTempData !== '' && this.formBottom.types === 'Y') { // 鏃堕棿浼樺厛
this.filterAlreadyScheduleTime() // 鎵嬪姩杩囨护鎵�鏈夋椂闂村凡鎺掔▼
- this.fun_facility()
+ this.timeDataTransition()
this.dataTransition()
this.editLastValue(this.schedulingData)
}
-
- // console.log('鎵ц浜�!')
- // console.log(this.schedulingData, ' this.schedulingData')
- // console.log(JSON.stringify(this.schedulingData), ' this.schedulingData')
- // console.log(this.timeTopTempData, 'this.timeTopTempData')
- // console.log(JSON.stringify(this.timeTopTempData), 'this.timeTopTempData')
-
- // this.$forceUpdate()
},
// 鎵嬪姩杩囨护鎵�鏈夋椂闂村凡鎺掔▼
filterAlreadyScheduleTime() {
@@ -1141,86 +1059,81 @@
},
// 缁欐帓绋嬫渶鍚庝竴涓慨鏀规暟閲�
editLastValue(arr) {
- this.formBottom.real_num = 0 // 鐪熷疄宸叉帓鏁伴噺
+ this.formBottom.canArrangeNumber = 0 // 鐪熷疄宸叉帓鏁伴噺
let num = 0 // 鍙栨暣宸叉帓鏁伴噺
const arr_num = [] // 宸叉帓鏁版嵁
- let mend_num = 0
- const len = 0
+ let need_num = 0
for (const i in arr) {
for (const j in arr[i].gtArray) {
- if (arr[i].gtArray[j].type == 'schedule') {
+ if (arr[i].gtArray[j].type === 'schedule') {
arr_num.unshift(arr[i].gtArray[j])
}
}
}
for (const n in arr_num) {
- this.formBottom.real_num += arr_num[n].real_number
+ this.formBottom.canArrangeNumber += arr_num[n].real_number
num += arr_num[n].number * 1
}
- this.formBottom.real_num = Math.ceil(this.formBottom.real_num)
- const y10 = this.formBottom.meter - this.formBottom.real_num
+ this.formBottom.canArrangeNumber = Math.ceil(this.formBottom.canArrangeNumber)
+ const y10 = this.formBottom.needArrangeNumber - this.formBottom.canArrangeNumber
if (y10 <= 10) {
- this.formBottom.real_num = this.formBottom.meter
- mend_num = this.formBottom.meter - num
+ this.formBottom.canArrangeNumber = this.formBottom.needArrangeNumber
+ need_num = this.formBottom.needArrangeNumber - num
} else {
- }
- if (this.formBottom.real_num * 1 == this.formBottom.meter * 1) {
- // mend_num = this.formBottom.meter - num
- } else {
- // this.submit_flag = true
}
for (const i in this.schedulingData) {
for (const j in this.schedulingData[i].gtArray) {
if (
- this.schedulingData[i].gtArray[j].type == 'schedule' &&
+ this.schedulingData[i].gtArray[j].type === 'schedule' &&
this.schedulingData[i].gtArray[j].end_num
) {
this.schedulingData[i].gtArray[j].number =
- this.schedulingData[i].gtArray[j].number * 1 + mend_num
+ this.schedulingData[i].gtArray[j].number * 1 + need_num
}
}
}
},
- fun_time() {
- let all_num = this.formBottom.meter
- const all_time = []
+ // 璁惧浼樺厛 鏁版嵁鏍煎紡杞崲
+ eqpDataTransition() {
+ let needNumber = this.formBottom.needArrangeNumber // 闇�鎺掓暟閲�
let flag1 = 0
- const mod = this.schedulingData[0].mod
- // let nowTime = this.schedulingData[0].AdvaDevicRhythm*all_num
+
for (const i in this.schedulingData) {
let end_arr = [] // 宸叉帓绋嬬殑鏁扮粍
- let nend_arr = [] // 寰呮帓绋嬬殑鏁扮粍
- const add_arr = [] // 宸叉帓绋嬬殑鏁扮粍
+ let need_arr = [] // 寰呮帓绋嬬殑鏁扮粍
+
let capacity_arr = [] // 瑕佹帓绋嬬殑鏁扮粍
this.schedulingData[i].gtArray.sort((a, b) => new Date(a.end).getTime() - new Date(b.end).getTime())
- // let capacity_end = ''
- end_arr = this.schedulingData[i].gtArray.filter(item => item.type == 'h_schedule')
- nend_arr = this.schedulingData[i].gtArray.filter(item => item.type == 'capacity')
+
+ end_arr = JSON.parse(JSON.stringify(this.schedulingData[i].gtArray.filter(item => item.type === 'h_schedule'))) // 宸叉帓绋嬫暟缁�
+ need_arr = JSON.parse(JSON.stringify(this.schedulingData[i].gtArray.filter(item => item.type === 'capacity'))) // 瀹归噺
+
if (end_arr && end_arr.length > 0) {
- capacity_arr = nend_arr.map(item => {
+ capacity_arr = need_arr.map(item => {
// 鎺掗櫎鎺夊凡缁忔帓绋嬬殑瀛樺湪hshedule锛宻tart锛宔nd閮界浉绛夌殑鎯呭喌
- const schedule = end_arr.filter(schedule => {
- return new Date(item.start).getTime() <= new Date(schedule.start).getTime() &&
- new Date(item.end).getTime() > new Date(schedule.end).getTime()
+ const schedule = end_arr.filter(it => {
+ return new Date(item.start).getTime() <= new Date(it.start).getTime() &&
+ new Date(item.end).getTime() >= new Date(it.end).getTime()
})
+
if (schedule && schedule.length > 0) {
- item.start = this.MinutesTest(schedule[0]['end'])
+ item.start = this.MinutesTest(schedule[schedule.length - 1]['end'])
}
const schedule1 = end_arr.filter(schedule => {
- return new Date(item.start).getTime() == new Date(schedule.start).getTime() &&
- new Date(item.end).getTime() == new Date(schedule.end).getTime()
+ return new Date(item.start).getTime() === new Date(schedule.start).getTime() &&
+ new Date(item.end).getTime() === new Date(schedule.end).getTime()
})
if (schedule1 && schedule1.length > 0) {
item.capacity = false
}
return item
- }).filter(item => item.capacity != false)
+ }).filter(item => item.capacity !== false)
} else {
- capacity_arr = nend_arr
+ capacity_arr = need_arr
}
const id_obj = {
@@ -1230,6 +1143,9 @@
if (end_arr != '') {
(id_obj.id = end_arr[0].id), (id_obj.start_time = end_arr[0].end)
}
+
+ capacity_arr = this.filterOutTime(capacity_arr) // 杩囨护鎺夊綋鍓嶆椂闂翠箣鍓嶇殑涓嶈兘鎺掔▼
+
for (const w in capacity_arr) {
let end_time = ''
let mistiming = ''
@@ -1241,21 +1157,21 @@
cl_name: this.cl_name,
cl_code: this.cl_code,
work_order: this.work_order,
+ AdvaScheUom: this.AdvaScheUom,
number: 0,
real_number: 0
}
if (
- id_obj.start_time != '' &&
- flag1 == 0 &&
- new Date(id_obj.start_time) >= new Date(capacity_arr[w].start)
+ id_obj.start_time !== '' &&
+ flag1 === 0 &&
+ new Date(id_obj.start_time).getTime() >= new Date(capacity_arr[w].start).getTime()
) {
data.start = this.MinutesTest(id_obj.start_time)
flag1 = 1
} else {
data.start = capacity_arr[w].start
}
- let nowTime =
- (this.schedulingData[i].AdvaDevicRhythm * all_num) / capacity_arr[w].mod
+ let nowTime = (this.schedulingData[i].AdvaDevicRhythm * needNumber) / capacity_arr[w].mod
end_time = this.formSeconds(nowTime, data.start, capacity_arr[w].mod) // 鎬诲叡鐨勭粨鏉熸椂闂�
data.end = end_time
mistiming = this.compareTime(
@@ -1264,12 +1180,6 @@
capacity_arr[w].mod
) // 鎬诲叡鐨勭粨鏉熸椂闂�-褰撳墠鐨勭粨鏉熸椂闂� = 鍓╀笅澶氫箙鏃堕棿
if (mistiming >= 0) {
- // console.log(
- // new Date(data.end) - new Date(data.start),
- // capacity_arr[w].mod,
- // this.schedulingData[i].AdvaDevicRhythm,
- // '闃挎柉椤垮彂鏂拏鑺�'
- // )
data.number =
((new Date(data.end) - new Date(data.start)) *
capacity_arr[w].mod) /
@@ -1286,26 +1196,34 @@
} else {
this.schedulingData[i].gtArray.push(data)
}
-
return false
} else {
data.end = capacity_arr[w].end
+
+ if (new Date(data.end).getTime() < new Date(data.start)) {
+ continue // 鍥犱负寮�濮嬫椂闂存瘮缁撴潫鏃堕棿澶� 闇�瑕佽烦杩囧悗闈㈡楠�
+ }
+
+ // 杩欓噷闄や互涓�鍗冩槸鍥犱负 new Date() 寰楀埌鐨勬槸姣 姣杞寲涓虹鏄崈杩涘埗
+ // 涓�娈垫椂闂存鍐呯殑鐢熶骇閲�=涓よ�呮椂闂村樊锛堟绉掞級/1000 / 鐢熶骇鑺傛媿 * 绋煎姩鐜�
data.number =
((new Date(data.end) - new Date(data.start)) *
capacity_arr[w].mod) /
this.schedulingData[i].AdvaDevicRhythm /
1000
+
data.real_number =
((new Date(data.end) - new Date(data.start)) *
capacity_arr[w].mod) /
this.schedulingData[i].AdvaDevicRhythm /
1000
+
data.number = data.number.toFixed(0)
- nowTime =
- (all_num - data.real_number) * this.schedulingData[i].AdvaDevicRhythm
- all_num = all_num - data.real_number
+ nowTime = (needNumber - data.real_number) * this.schedulingData[i].AdvaDevicRhythm
+ needNumber = needNumber - data.real_number
if (new Date(data.start) >= new Date(data.end)) {
+
} else {
this.schedulingData[i].gtArray.push(data)
}
@@ -1313,8 +1231,8 @@
}
}
},
- // 璁惧鎺掔▼鏂规硶
- fun_facility() {
+ // 鏃堕棿浼樺厛 鏁版嵁鏍煎紡杞崲
+ timeDataTransition() {
// 鎺掗櫎鏈嬀閫夐」
for (const i in this.timeTopTempData) {
const newArr = []
@@ -1325,105 +1243,86 @@
}
this.timeTopTempData[i].gtArray = newArr
}
- let all_num = this.formBottom.meter
- const all_time = []
- const flag1 = 0
- // let nowTime = this.timeTopTempData[0].AdvaDevicRhythm*all_num //鏁伴噺OK
- console.log(this.timeTopTempData, 889)
- console.log(JSON.stringify(this.timeTopTempData), 889)
+ let needNumber = this.formBottom.needArrangeNumber // 闇�鎺掓暟閲�
+ // 閲岄潰閫昏緫瑕佹悶娓呮 寰堥噸瑕�
for (const i in this.timeTopTempData) {
- console.log(i, 90)
let end_arr = []
- let nend_arr = [] // 鎺掔▼鐨勬暟缁�
- const add_arr = [] // 宸叉帓绋嬬殑鏁扮粍
+ let need_arr = [] // 鎺掔▼鐨勬暟缁�
+
let capacity_arr = [] // 瑕佹帓绋嬬殑鏁扮粍
- // console.log(parseFloat('SV002'.substring(4, 5)))
+
this.timeTopTempData[i].gtArray.sort((a, b) => new Date(a.end).getTime() - new Date(b.end).getTime())
- // this.timeTopTempData[i].gtArray.sort((a, b) => parseFloat(a.id.substring(4, 5)) - parseFloat(b.id.substring(4, 5)))
- // let capacity_end = ''
- // console.log(JSON.stringify(this.timeTopTempData), 671)
+ end_arr = JSON.parse(JSON.stringify(this.timeTopTempData[i].gtArray.filter(item => item.type === 'h_schedule'))) // 宸叉帓绋嬫暟鎹�
+ need_arr = JSON.parse(JSON.stringify(this.timeTopTempData[i].gtArray.filter(item => item.type === 'capacity'))) // 瀹归噺
- end_arr = this.timeTopTempData[i].gtArray.filter(item => item.type === 'h_schedule') // 宸叉帓绋嬫暟鎹�
- nend_arr = this.timeTopTempData[i].gtArray.filter(item => item.type === 'capacity') // 瑕佹帓绋嬫暟鎹�
- console.log(end_arr, nend_arr, 670)
- // console.log(end_arr, 672)
- // console.log(JSON.stringify(end_arr), 672)
- // console.log(nend_arr, 673)
- // console.log(JSON.stringify(nend_arr), 673)
- capacity_arr = JSON.parse(JSON.stringify(nend_arr))
+ capacity_arr = JSON.parse(JSON.stringify(need_arr)) // 瀹归噺
- console.log(capacity_arr, 902)
- end_arr.forEach(item => {
- for (let i = 0; i < capacity_arr.length; i++) {
- if (new Date(capacity_arr[i].start).getTime() === new Date(item.start).getTime()) {
- console.log(i, capacity_arr[i], '鍝囧搱鍝�')
- console.log(capacity_arr.splice(i, 1))
- break
+ // 鑾峰彇鍙帓绋嬬殑鏃堕棿 浠ヤ究鎺ョ潃寰�鍚庢帓绋� 閬嶅巻缁撴潫瑕佸緱鍒扮殑鏄� 褰撳墠鏃ユ湡鍙帓瀹归噺
+ end_arr.forEach((item, index) => { // 宸叉帓绋嬬殑鏁扮粍
+ capacity_arr.forEach((it, ind) => { // 瀹归噺锛堟棩浜ц兘锛�
+ if (item.id === it.id &&
+ new Date(item.start).getTime() >= new Date(it.start).getTime() &&
+ new Date(item.end).getTime() === new Date(it.end).getTime() // new Date(item.end).getTime() <= new Date(it.end).getTime()
+ ) {
+ capacity_arr.splice(ind, 1)
}
- }
+ })
})
- console.log(capacity_arr, '澶цタ鐡�')
- if (!capacity_arr || capacity_arr.length === 0) break
- // const firstCapacity = capacity_arr[0]
+ // continue:琛ㄧず璺冲嚭鏈寰幆锛屼篃灏辨槸涓嶆墽琛屾湰娆″惊鐜痗ontinue涔嬪悗鐨勬搷浣�
+ // break:琛ㄧず璺冲嚭褰撳墠鐨勫惊鐜紝閽堝鏁翠釜寰幆浣撶粓姝㈠悗缁殑閬嶅巻锛�
+ if (!capacity_arr || capacity_arr.length === 0) {
+ continue
+ }
const schedule_arr = end_arr.filter(item => {
- const remain = nend_arr.some(it => {
- // return (new Date(it.start).getTime() === new Date(item.start).getTime() &&
- // new Date(item.end).getTime() < new Date(it.end).getTime()) || (
- // new Date(it.end).getTime() === new Date(item.end).getTime() &&
- // new Date(item.start).getTime() > new Date(it.start).getTime())
- return (new Date(it.start).getTime() === new Date(item.start).getTime() &&
+ const remain = need_arr.some(it => {
+ return (new Date(item.start).getTime() >= new Date(it.start).getTime() &&
new Date(item.end).getTime() < new Date(it.end).getTime())
})
+
return remain
})
- // schedule_arr.sort((a, b) => new Date(b.end).getTime() - new Date(a.end).getTime())
- // schedule_arr = schedule_arr.filter((currentValue, currentIndex, selfArr) => {
- // return selfArr.findIndex(item => item.id === currentValue.id) === currentIndex
- // })
- // schedule_arr = [{ cl_code: '302',
- // cl_name: '8504鍏夋満',
- // date: '2023-02-09',
- // end: '2023-02-09 14:53:20',
- // id: 'SB004',
- // number: 100,
- // start: '2023-02-09 13:30:00',
- // type: 'h_schedule',
- // work_order: 'MO-2022-11-0035_1' }]
-
- console.log(schedule_arr, 1002)
-
- // schedule_arr = [schedule_arr[0]]
+ // 涓嬮潰閫昏緫寰堥噸瑕�
if (schedule_arr && schedule_arr.length > 0) {
const scheduleCan = schedule_arr.map(item => {
- const temp = nend_arr.filter(it => {
+ const temp = need_arr.filter(it => {
if (it.id === item.id) {
- return (new Date(it.start).getTime() === new Date(item.start).getTime() &&
+ return (new Date(item.start).getTime() >= new Date(it.start).getTime() &&
new Date(item.end).getTime() < new Date(it.end).getTime())
+ // ||
+ // (new Date(item.start).getTime() > new Date(it.start).getTime() &&
+ // new Date(item.end).getTime() < new Date(it.end).getTime())
}
})[0]
- console.log('capacity', temp)
- console.log('capacity', item.end)
+
temp.start = this.MinutesTest(item.end)
- // temp.start = item.end
+
return temp
})
+
const newSchedule = JSON.parse(JSON.stringify(scheduleCan))
- capacity_arr = newSchedule.concat(capacity_arr)
+
+ capacity_arr.forEach(item => {
+ newSchedule.forEach(it => {
+ if (item.id === it.id && new Date(item.start).getTime() < new Date(it.start).getTime()) {
+ item.start = it.start
+ }
+ })
+ })
}
- console.log(schedule_arr)
- console.log('鍙帓绋嬫暟缁�', capacity_arr)
+
const id_obj = {}
if (end_arr != '') {
(id_obj.id = end_arr[0].id), (id_obj.start_time = end_arr[0].end)
}
+
+ capacity_arr = this.filterOutTime(capacity_arr) // 杩囨护鎺夊綋鍓嶆椂闂翠箣鍓嶇殑涓嶈兘鎺掔▼
+
for (const w in capacity_arr) {
- let end_time
- let mistiming
const data = {
id: capacity_arr[w].id,
start: '',
@@ -1432,52 +1331,39 @@
cl_name: this.cl_name,
cl_code: this.cl_code,
work_order: this.work_order,
+ AdvaScheUom: this.AdvaScheUom, // 鍗曚綅
number: 0,
real_number: 0
}
- // console.log(id_obj.start_time)
+
if (
id_obj &&
new Date(id_obj.start_time).getTime() >=
new Date(capacity_arr[w].start).getTime()
) {
- if (data.id == id_obj.id) {
+ if (data.id === id_obj.id) {
data.start = this.MinutesTest(id_obj.start_time)
- console.log(data.start, 999)
- // flag1 =1
} else {
data.start = capacity_arr[w].start
- console.log(data.start, 1000)
- // console.log(data.start)
- // flag1 =1
}
} else {
data.start = capacity_arr[w].start
- console.log(data.start, 1001)
}
- // let nowTime = this.timeTopTempData[0].AdvaDevicRhythm*all_num
- let nowTime =
- (capacity_arr[w].rhythm * all_num) / capacity_arr[w].mod
- end_time = this.formSeconds(nowTime, data.start)
+ let nowTime = (capacity_arr[w].rhythm * needNumber) / capacity_arr[w].mod
+
+ const end_time = this.formSeconds(nowTime, data.start)
data.end = end_time
- mistiming = this.compareTime(end_time, capacity_arr[w].end)
+ const mistiming = this.compareTime(end_time, capacity_arr[w].end)
if (mistiming >= 0) {
- data.number =
- ((new Date(data.end) - new Date(data.start)) *
- capacity_arr[w].mod) /
- capacity_arr[w].rhythm /
- 1000
- data.real_number =
- ((new Date(data.end) - new Date(data.start)) *
- capacity_arr[w].mod) /
- capacity_arr[w].rhythm /
- 1000
+ data.number = ((new Date(data.end) - new Date(data.start)) * capacity_arr[w].mod) / capacity_arr[w].rhythm / 1000
+ data.real_number = ((new Date(data.end) - new Date(data.start)) * capacity_arr[w].mod) / capacity_arr[w].rhythm / 1000
data.number = data.number.toFixed(0)
data.end_num = true
if (new Date(data.start) >= new Date(data.end)) {
+
} else {
this.timeTopTempData[i].gtArray.push(data)
}
@@ -1485,21 +1371,12 @@
return false
} else {
data.end = capacity_arr[w].end
- data.number =
- ((new Date(data.end) - new Date(data.start)) *
- capacity_arr[w].mod) /
- capacity_arr[w].rhythm /
- 1000
- data.real_number =
- ((new Date(data.end) - new Date(data.start)) *
- capacity_arr[w].mod) /
- capacity_arr[w].rhythm /
- 1000
+ data.number = ((new Date(data.end) - new Date(data.start)) * capacity_arr[w].mod) / capacity_arr[w].rhythm / 1000
+ data.real_number = ((new Date(data.end) - new Date(data.start)) * capacity_arr[w].mod) / capacity_arr[w].rhythm / 1000
data.number = data.number.toFixed(0)
- nowTime = (all_num - data.real_number) * capacity_arr[w].rhythm
- all_num = all_num - data.real_number
+ nowTime = (needNumber - data.real_number) * capacity_arr[w].rhythm
+ needNumber = needNumber - data.real_number
- // nowTime = mistiming * -1
if (new Date(data.start) >= new Date(data.end)) {
} else {
this.timeTopTempData[i].gtArray.push(data)
@@ -1508,13 +1385,30 @@
}
}
},
- // 缁欒澶囪浆鎹㈡牸寮�
+ // 杩囨护鎺夊綋鍓嶆椂闂翠箣鍓嶇殑涓嶈兘鎺掔▼
+ filterOutTime(capacity_arr) {
+ // 杩欓噷瑕佸皢瀹归噺鍜屽綋鍓嶆椂闂村仛瀵规瘮 鍋氭椂闂村鐞� 濡傛灉鍦ㄥ綋鍓嶆椂闂翠箣鍓嶇殑涓嶈兘鎺掔▼
+ capacity_arr.forEach((item, index) => {
+ // 褰撳墠鏃堕棿 澶т簬绛変簬寮�濮嬫椂闂� 涓斿皬浜庣瓑浜庣粨鏉熸椂闂�
+ if (new Date(item.start).getTime() <= new Date(handleDatetime2(new Date())).getTime() && new Date(item.end).getTime() >= new Date(handleDatetime2(new Date())).getTime()) {
+ item.start = handleDatetime2(new Date())
+ }
+ // 褰撳墠鏃堕棿姣斿紑濮嬫椂闂村ぇ 姣旂粨鏉熸椂闂翠篃澶�
+ if (new Date(item.start).getTime() < new Date(handleDatetime2(new Date())).getTime() && new Date(item.end).getTime() < new Date(handleDatetime2(new Date())).getTime()) {
+ item.capacity = false
+ }
+ })
+
+ return capacity_arr.filter(item => item.capacity !== false)
+ },
+
+ // 鏃堕棿浼樺厛 缁欒澶囪浆鎹㈡牸寮�
dataTransition() {
this.schedulingData = []
const data = this.timeTopTempData
const all = []
- const list = this.title_list
+ const list = this.eqpTopTempData
for (const i in data) {
for (const j in data[i].gtArray) {
all.push(data[i].gtArray[j])
@@ -1532,13 +1426,12 @@
}
}
- // console.log(list)
this.schedulingData = list
},
// 鎻掑叆浜ц兘鏃堕棿娈�
pushTimes(newList, id, arr) {
for (const i in newList) {
- if (newList[i].id == id) {
+ if (newList[i].id === id) {
arr.push(newList[i])
}
}
@@ -1612,6 +1505,16 @@
height: 490px;
}
+.colorDescription {
+ display: flex;
+ padding: 5px 30px 0;
+}
+
+.colorDescriptionItem {
+ display: flex;
+ margin-right: 20px;
+}
+
label {
margin-left: 10px;
}
--
Gitblit v1.9.3