From 32403d94889c69f17612ef7072aac5cadb78caf5 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 07 二月 2023 15:16:52 +0800
Subject: [PATCH] 1.自动排程代码备份
---
src/views/scgl/zdpc.vue | 1763 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 971 insertions(+), 792 deletions(-)
diff --git a/src/views/scgl/zdpc.vue b/src/views/scgl/zdpc.vue
index 2520e2c..8c001e7 100644
--- a/src/views/scgl/zdpc.vue
+++ b/src/views/scgl/zdpc.vue
@@ -8,10 +8,10 @@
:model="formTop"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label-width="70px" label="杞﹂棿缂栫爜" style=" display: flex;">
+ <el-form-item label="杞﹂棿缂栫爜" style=" display: flex;">
<el-input v-model="formTop.workshop" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="鐢熶骇宸ュ崟鍙�" style=" display: flex;">
@@ -24,9 +24,9 @@
<el-input v-model="formTop.partname" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
- <el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
- <el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
+ <el-button v-waves type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+ <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
</el-form>
<div
@@ -40,15 +40,17 @@
ref="tableDataRef"
class="tableFixed"
:data="tableData"
- :height="(tableHeight-300)+'px'"
+ :height="(tableHeight-400)+'px'"
border
:row-class-name="tableRowClassName"
- :style="{width: 100+'%',height:(tableHeight-300)+'px',}"
+ :style="{width: 100+'%',height:(tableHeight-400)+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="sortChangeTop"
+ @row-click="getCurrentRow"
>
+ <!-- @row-click="rowClick"-->
<el-table-column
width="50"
fixed
@@ -56,10 +58,9 @@
<template slot-scope="{row}">
<el-radio
v-model="radioSelectedId"
- :label="row.id"
- style="color: transparent;padding-left: 10px;"
- @change.native="getCurrentRowTop(row.id)"
+ :label="row.AdvaScheId"
/>
+
</template>
</el-table-column>
<el-table-column
@@ -69,60 +70,102 @@
label="搴忓彿"
/>
<el-table-column
- prop="org_code"
+ prop="AdvaSchePiroQue"
+ show-tooltip-when-overflow
label="浼樺厛绾�"
+ width="90"
sortable="custom"
/>
<el-table-column
- prop="org_name"
+ prop="AdvaScheWorkShop"
label="鐢熶骇杞﹂棿"
+ width="110"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
- prop="description"
+ prop="AdvaScheWorkCode"
label="宸ュ崟缂栧彿"
+ min-width="160"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
- prop="parentorg_name"
+ prop="AdvaSchePartNumber"
label="浜у搧缂栫爜"
+ min-width="110"
+ show-tooltip-when-overflow
sortable="custom"
- />
+ >
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.AdvaSchePartNumber">{{ row.AdvaSchePartNumber }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ </el-table-column>
<el-table-column
- prop="lm_user"
+ prop="AdvaSchePartName"
+ min-width="160"
+ show-tooltip-when-overflow
label="浜у搧鍚嶇О"
sortable="custom"
/>
<el-table-column
- prop="lm_user"
+ prop="AdvaSchePartSpec"
label="浜у搧瑙勬牸"
+ width="110"
+ show-tooltip-when-overflow
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.AdvaSchePartSpec">{{ row.AdvaSchePartSpec }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
- prop="lm_user"
+ prop="AdvaScheQty"
label="鏁伴噺"
+ show-tooltip-when-overflow
+ width="110"
sortable="custom"
/>
<el-table-column
- prop="lm_user"
+ prop="AdvaScheEndDate"
label="瑕佹眰浜や粯鏃堕棿"
sortable="custom"
+ show-tooltip-when-overflow
+ width="160"
/>
<el-table-column
- prop="lm_user"
- label="浜や粯鐘舵��"
+ prop="AdvaScheStus"
+ label="鎺掔▼鐘舵��"
+ show-tooltip-when-overflow
+ width="110"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.AdvaScheStus==='NOSCHED'">寰呮帓绋�</div>
+ <div v-if="row.AdvaScheStus==='SCHED'">宸叉帓绋�</div>
+ </template>
+ </el-table-column>
<el-table-column
- prop="lm_user"
+ prop="AdvaScheBotProcName"
label="鎺掔▼宸ュ簭"
+ show-tooltip-when-overflow
+ width="110"
sortable="custom"
/>
<el-table-column
- prop="lm_user"
+ prop="AdvaSchePCStartDate"
label="璁″垝鎺掔▼鏃堕棿"
+ width="200"
sortable="custom"
- />
+ show-tooltip-when-overflow
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.AdvaSchePCStartDate">{{ row.AdvaSchePCStartDate }} ~ {{ row.AdvaSchePCEndDate }} </div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
</el-table>
</div>
@@ -145,12 +188,14 @@
ref="form"
:model="formBottom"
inline
- style="display: flex;justify-content: space-between"
+ label-width="100px"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label-width="70px" label="鎺掔▼鏃ユ湡" style=" display: flex;">
+ <el-form-item label="鎺掔▼鏃ユ湡" style=" display: flex;">
<el-date-picker
- v-model="formBottom.value1"
+ v-model="formBottom.scheDate"
+ :disabled="radioSelectedId===''"
type="daterange"
range-separator="~"
format="yyyy-MM-dd"
@@ -159,25 +204,27 @@
end-placeholder="缁撴潫鏃ユ湡"
size="small"
:picker-options="pickerOptions1"
+ :clearable="false"
@change="change_time"
/>
</el-form-item>
<el-form-item label="鎺掔▼鏂瑰紡" style=" display: flex;">
- <el-select v-model="formBottom.types" style="width:120px" @change="changeTypes">
+ <el-select v-model="formBottom.types" :disabled="radioSelectedId===''" style="width:120px" @change="changeTypes">
<el-option value="N" label="璁惧浼樺厛" />
<el-option value="Y" label="鏃堕棿浼樺厛" />
</el-select>
</el-form-item>
- <el-form-item label="鏃堕棿鍒诲害锛堝垎閽燂級" style=" display: flex;">
- <el-select v-model.number="formBottom.scale" style="width: 120px;">
+ <el-form-item label="鏃堕棿鍒诲害(鍒嗛挓)" label-width="110" style=" display: flex;">
+ <el-select v-model.number="formBottom.scale" :disabled="radioSelectedId===''" style="width: 120px;">
<el-option v-for="item in scaleList" :key="item" :value="item" :label="item" />
</el-select>
</el-form-item>
- <el-form-item label="鎹㈠瀷鏃堕棿锛堝垎閽燂級" style=" display: flex;">
+ <el-form-item label="鎹㈠瀷鏃堕棿(鍒嗛挓)" label-width="110" style=" display: flex;">
<el-input
id="scale"
v-model="formBottom.times"
+ :disabled="radioSelectedId===''"
type="number"
style="display:inline-block;width:80px;"
@change="no_zero"
@@ -190,15 +237,19 @@
</span>
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
<el-button
+ v-waves
+ :disabled="radioSelectedId===''"
type="primary"
icon="el-icon-document-remove"
@click="click_schedule"
>棰勬帓
</el-button>
<el-button
+ v-waves
type="primary"
+ :disabled="radioSelectedId===''"
icon="el-icon-document-checked"
@click="click_yes"
>鎻愪氦
@@ -249,18 +300,18 @@
{{ data.id }} {{ data.name }}
</div>
<div class="speed">
- <el-tooltip class="item" effect="dark" content="鏌ョ湅" placement="top">
- <el-button type="text" size="mini" @click="look(data)">
- <i class="el-icon-document size i-color" />
- </el-button>
- </el-tooltip>
+ <!-- <el-tooltip class="item" effect="dark" content="鏌ョ湅" placement="top">-->
+ <!-- <el-button v-waves type="text" size="mini" @click="look(data)">-->
+ <!-- <i class="el-icon-document size i-color" />-->
+ <!-- </el-button>-->
+ <!-- </el-tooltip>-->
</div>
</div>
</template>
<template slot="title">
<span class="tc">宸ヤ綅鍒楄〃</span>
- <el-checkbox v-model="all_status" class="box_style" @change="changeLift()" />
- <input v-model.number="cellWidth" type="range" min="20" max="100" class="box_styles">
+ <el-checkbox v-model="all_status" class="box_style" :disabled="radioSelectedId===''" @change="changeLift()" />
+ <input v-model.number="cellWidth" type="range" min="20" max="100" class="box_styles" :disabled="radioSelectedId===''">
</template>
</v-gantt-chart>
</div>
@@ -273,9 +324,11 @@
<script>
import Pagination from '@/components/Pagination'
-import { OrganizationSearch } from '@/api/jcsz'
import Test from '@/components/Test'
import dayjs from 'dayjs'
+import { AdvancedSchedulingSearch, OnclickAdvancedSchedulingDevice, SubmitAlreadyScheduling } from '@/api/scgl'
+import { handleDatetime } from '@/utils/global'
+import waves from '@/directive/waves'
const scaleList = `30,60,240,360`.split(',').map(n => parseInt(n))
const timeList = `0,30,60,120,240,480`.split(',').map(n => parseInt(n))
@@ -285,6 +338,7 @@
components: {
Pagination, Test
},
+ directives: { waves },
data() {
return {
mouseHoverType: 'mouseout',
@@ -297,7 +351,7 @@
wocode: '', // 鐢熶骇宸ュ崟鍙�
partcode: '', // 鐗╂枡缂栫爜
partname: '', // 鐗╂枡鍚嶇О
- prop: 'lm_date', // 鎺掑簭瀛楁
+ prop: 'AdvaScheWorkCode', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
@@ -307,7 +361,7 @@
/*
鎺掔▼閮ㄥ垎鐨勫睘鎬�
* */
- show: false,
+
pickerOptions1: {
disabledDate(time) {
return time.getTime() <= Date.now() - 24 * 60 * 60 * 1000
@@ -318,8 +372,8 @@
all_status: true,
look_data: [],
look_total: 0,
- cl_name: '',
- cl_code: '',
+ cl_name: '', // 浜у搧鍚嶇О
+ cl_code: '', // 浜у搧缂栫爜
work_order: '',
false_arr: [],
ckeckVal: true,
@@ -333,26 +387,26 @@
page: 1
},
showDialog: false,
- time_data: [],
+ time_data: [[handleDatetime(new Date()) + ' 00:00:00'], [handleDatetime(new Date()) + ' 00:00:00']],
forms: {
- WorkCode: '',
- WorkShop: '',
- PartNumber: '',
- BotProceCode: '',
- StartTime: '',
- EndTime: ''
+ wocode: '', // 宸ュ崟缂栧彿
+ wkshpcode: '', // 杞﹂棿缂栫爜
+ partcode: '', // 鐗╂枡缂栫爜
+ botproccode: '', // 鐡堕宸ュ簭缂栫爜(棣栭亾宸ュ簭)
+ startdate: '', // 寮�濮嬫棩鏈�
+ enddate: ''// 缁撴潫鏃ユ湡
},
click_one: 0,
datasC: [],
radio: '',
formBottom: {
- value1: ['2022-11-05', '2022-11-12'], // 鎺掔▼鏃ユ湡
+ scheDate: [handleDatetime(new Date()), handleDatetime(new Date())], // 鎺掔▼鏃ユ湡
types: 'N', // 鎺掔▼鏂瑰紡
scale: 60, // 鏃堕棿鍒诲害
times: 0, // 鎹㈠瀷鏃堕棿
- real_num: 0, // 棰勬帓杩涘害
- meter: 0// 鑺傛媿
+ real_num: 0, // 鍙帓鏁伴噺
+ meter: 0// 闇�鎺掓暟閲�
},
no: false,
@@ -392,7 +446,7 @@
titleHeight: 40,
titleWidth: 250,
- datasNum: 100,
+ // datasNum: 100,
datasA: [],
// datasB: mockDatas(100),
dataKey: 'id',
@@ -408,9 +462,7 @@
scrollToY: 0,
positionB: {},
positionA: {},
-
title_list: [],
- imp_id: '',
submit_flag: false,
search_from: {
page: 1,
@@ -418,154 +470,45 @@
WorkTime: '',
BotProceName: ''
},
- testValue: {
- 'rus': {
- 'statusCode': '',
- 'message': '',
- 'MOD_S': '',
- 'MAR_S': '',
- 'EQP_S': '',
- 'CUT_S': '',
- 'FIXT_S': '',
- 'HouseNumber': '',
- 'navTabId': '',
- 'dialogid': '',
- 'rel': '',
- 'dt': null,
- 'list': {},
- 'callbackType': '',
- 'forwardUrl': ''
- },
- 'rows': [
- {
- 'YearDate': '2022-11-03',
- '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-11-04',
- '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-11-05',
- '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-11-06',
- '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-11-07',
- '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-11-08',
- 'children': [
- {
- 'AdvaDevicNumber': 'LKFDL_SC-PC029',
- 'AdvaDevicName': '閲戦紟鏁版帶杞﹀簥029',
- 'AdvaDevicCropMob': '30',
- 'AdvaDevicRhythm': '10',
- 'OneStartDate': '08:00~11:30',
- 'TwoStartDate': '12:30~17:00',
- 'ThreeStartDate': '',
- 'FourStartDate': '',
- 'FiveStartDate': ''
- }
- ]
- }
- ],
- 'Cont': null
- }
+ time_all: null
}
},
watch: {
- datasNum(newV) {
- // this.datasA = mockDatas(newV)
- // this.datasB = mockDatas(newV)
- },
+ // datasNum(newV) {
+ // // this.datasA = mockDatas(newV)
+ // // this.datasB = mockDatas(newV)
+ // },
scrollToY(val) {
this.positionA = { x: val }
}
},
created() {
- this.getAdvancedSchedulingSearch()
+ const loading = this.$loading({
+ lock: true,
+ text: '姝ｅ湪鍔犺浇鏁版嵁锛岃绋嶇瓑...',
+ spinner: 'el-icon-loading',
+ customClass: 'osloading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ })
+ setTimeout(() => {
+ if (this.getAdvancedSchedulingSearch()) {
+ loading.close()
+ }
+ }, 3000)
- this.AdvancedSchedulingSearch()
- // this.AdvancedSchedulingWorkShop()
- this.OnclickAdvancedSchedulingDevice()
+ // this.getAdvancedSchedulingSearch()
},
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
-
- this.change_time()
- this.click_schedule()
},
methods: {
- async getAdvancedSchedulingSearch() {
- const res = await OrganizationSearch(this.formTop)
+ async getAdvancedSchedulingSearch() {
+ const res = await AdvancedSchedulingSearch(this.formTop)
this.tableData = res.data
this.totalTop = res.count
+
+ return true
},
// 鎺掑簭鏀瑰彉鏃�
sortChangeTop({ column, prop, order }) {
@@ -592,10 +535,6 @@
this.formTop.partname = ''
this.getAdvancedSchedulingSearch()
},
- // 鍗曢�夋鐐瑰嚮
- getCurrentRowTop(val) {
- console.log(val)
- },
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
@@ -607,6 +546,25 @@
tableRowClassName({ row, rowIndex }) {
return 'custom-row'
},
+ // 琛岀偣鍑讳簨浠�
+ // async rowClick(row, event, column) {
+ // this.radioSelectedId = row.AdvaScheId
+ //
+ // // this.meter = row.AdvaScheQty * 1 - row.AdvaScheYPQty * 1 //鍙互鍋氫釜鏁�
+ //
+ // const data = {
+ // wocode: row.AdvaScheWorkCode,
+ // wkshpcode: row.AdvaScheWorkShopid,
+ // partcode: row.AdvaSchePartNumber,
+ // botproccode: row.AdvaScheBotProcid,
+ // startdate: handleDatetime(new Date()),
+ // enddate: row.AdvaScheEndDate
+ // }
+ //
+ // const res = await OnclickAdvancedSchedulingDevice(data)
+ // console.log(res)
+ // },
+
/*
鎺掔▼閮ㄥ垎鐨勬柟娉�
*/
@@ -614,12 +572,6 @@
// automaticScheduling.AdvancedSchedulingWorkShop().then(res => {
// this.list = res
// })
- },
- Search() {
- this.form.page = 1
- this.show = false
- this.radio = ''
- this.AdvancedSchedulingSearch()
},
resetFormcx() {
this.$nextTick(() => {
@@ -631,22 +583,11 @@
this.formBottom.times = 0
}
},
- sortChange(column, prop, order) {
- this.radio = '';
- (this.form.prop = column.prop), (this.form.order = column.order)
- this.show = false
- this.AdvancedSchedulingSearch()
- },
- SeachKey() {
- this.form.page = 1
- this.AdvancedSchedulingSearch()
- this.show = false
- this.radio = ''
- },
+ // 宸ヤ綅鍒楄〃澶嶉�夋鎿嶄綔
changeLift() {
if (this.all_status) {
this.false_arr = []
- this.OnclickAdvancedSchedulingDevice()
+ this.getOnclickAdvancedSchedulingDevice()
} else {
for (const i in this.bm_data) {
this.bm_data[i].status = false
@@ -656,18 +597,20 @@
this.facility_data[i].gtArray = []
}
}
+ // this.click_schedule()
},
changeTypes() {
- this.OnclickAdvancedSchedulingDevice()
+ this.getOnclickAdvancedSchedulingDevice()
},
change_time() {
- this.time_data[0] = this.formBottom.value1[0] + ' 00:00'
- this.time_data[1] = this.formBottom.value1[1] + ' 23:59'
- this.forms.StartTime = this.formBottom.value1[0]
- this.forms.EndTime = this.formBottom.value1[1]
- this.OnclickAdvancedSchedulingDevice()
+ 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()
},
click_box(val) {
+ // console.log(val, 567)
if (!val.status) {
for (const i in this.facility_data) {
const new_arr = []
@@ -686,7 +629,7 @@
this.false_arr.push(this.bm_data[i].id)
}
}
- this.OnclickAdvancedSchedulingDevice()
+ this.getOnclickAdvancedSchedulingDevice()
}
if (!val.status) {
@@ -702,7 +645,7 @@
this.false_arr.push(this.bm_data[i].id)
}
}
- this.OnclickAdvancedSchedulingDevice()
+ this.getOnclickAdvancedSchedulingDevice()
}
for (const i in this.bm_data) {
const arr = []
@@ -714,6 +657,7 @@
this.bm_data[i].gtArray = arr
}
this.formBottom.real_num = 0
+ // this.click_schedule()
},
look(data) {
this.showDialog = true
@@ -728,273 +672,296 @@
// this.look_total = res.total
// })
},
- sizeChange_look(val) {
- this.search_from.rows = val
- this.AdvancedSchedulingEquipmenTask()
- },
- pageChange_look(val) {
- this.search_from.page = val
- this.AdvancedSchedulingEquipmenTask()
- },
- sizeChange(val) {
- this.form.rows = val
- this.show = false
- this.radio = ''
- this.AdvancedSchedulingSearch()
- },
- pageChange(val) {
- this.form.page = val
- this.show = false
- this.radio = ''
- this.AdvancedSchedulingSearch()
- },
- // 鏌ヨ
- AdvancedSchedulingSearch() {
- // automaticScheduling.AdvancedSchedulingSearch(this.form).then(res => {
- // this.mn_data = res.rows
- // this.total = res.total
- // this.oneClick()
- // })
- },
+ // sizeChange_look(val) {
+ // this.search_from.rows = val
+ // this.AdvancedSchedulingEquipmenTask()
+ // },
+ // pageChange_look(val) {
+ // this.search_from.page = val
+ // this.AdvancedSchedulingEquipmenTask()
+ // },
// 鐐瑰嚮甯﹀嚭鏁版嵁
- OnclickAdvancedSchedulingDevice() {
- // this.facility_top()
+ getOnclickAdvancedSchedulingDevice() {
+ this.getOnclickAdvancedSchedulingDeviceTest()
+ },
+ async getOnclickAdvancedSchedulingDeviceTest() {
+ const res = await OnclickAdvancedSchedulingDevice(this.forms)
- // automaticScheduling
- // .OnclickAdvancedSchedulingDevice(this.forms)
- // .then(res => {
- const res = this.testValue
- if (res.rus.message) {
- this.$message({
- showClose: true,
- type: 'error',
- message: res.rus.message
- })
- }
- this.submit_flag = false
- const list = []
- this.time_all = res
+ const data = res.rows // 鎷垮埌鏁版嵁 瀵规暟鎹繘琛屾敼閫�
const cont = res.Cont
- this.formBottom.real_num = 0
- for (const i in this.time_all.rows[0].children) {
+ this.title_list = []
+
+ data[0].children.forEach((item, index) => {
const obj = {
id: '',
name: '',
- AdvaDevicRhythm: '',
status: true,
+ AdvaDevicRhythm: '',
+ // mod:'',
colorPair: {
dark: 'rgb(83, 186, 241,0.8)',
light: 'rgb(83, 186, 241,0.1)',
light_capacity: 'rgb(209,239,237,0.8)',
- h_schedule: ' rgb(100,255,192,0.8)',
+ h_schedule: 'rgb(100,255,192,0.8)',
scheduleing: 'rgb(20,182,231,0.8)'
},
gtArray: []
}
- obj.id = this.time_all.rows[0].children[i].AdvaDevicNumber
- obj.name = this.time_all.rows[0].children[i].AdvaDevicName
- obj.AdvaDevicRhythm = this.time_all.rows[0].children[
- i
- ].AdvaDevicRhythm
- list.push(obj)
- }
+ obj.id = item.AdvaDevicNumber
+ obj.name = item.AdvaDevicName
+ obj.AdvaDevicRhythm = item.AdvaDevicRhythm
+ obj.mod = item.AdvaDevicCropMob * 1 // 鎹㈠瀷鏃堕棿
+ this.title_list.push(obj)
+ })
- for (const i in this.time_all.rows) {
- for (const j in this.time_all.rows[i].children) {
- if (this.time_all.rows[i].children[j].OneStartDate != '') {
- this.time_all.rows[i].children[
- j
- ].OneStartDate = this.time_all.rows[i].children[
+ // 灏嗕簲涓椂闂存杩涜璧嬪��
+ for (const i in data) {
+ for (const j in data[i].children) {
+ // console.log(data[i].children, 101)
+ // 鍥犱负鏈変簲涓椂闂存 鎵�浠ヨ繘琛屼簲娆″垽鏂� 骞惰祴鍊�
+ if (data[i].children[j].OneStartDate != '') {
+ data[i].children[j].OneStartDate = data[i].children[
j
].OneStartDate.split('~')
- this.time_all.rows[i].children[j].OneStartDate[0] =
- this.time_all.rows[i].YearDate +
- ' ' +
- this.time_all.rows[i].children[j].OneStartDate[0]
- this.time_all.rows[i].children[j].OneStartDate[1] =
- this.time_all.rows[i].YearDate +
- ' ' +
- this.time_all.rows[i].children[j].OneStartDate[1]
+ 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]
}
- if (this.time_all.rows[i].children[j].TwoStartDate != '') {
- this.time_all.rows[i].children[
- j
- ].TwoStartDate = this.time_all.rows[i].children[
+ if (data[i].children[j].TwoStartDate != '') {
+ data[i].children[j].TwoStartDate = data[i].children[
j
].TwoStartDate.split('~')
- this.time_all.rows[i].children[j].TwoStartDate[0] =
- this.time_all.rows[i].YearDate +
- ' ' +
- this.time_all.rows[i].children[j].TwoStartDate[0]
- this.time_all.rows[i].children[j].TwoStartDate[1] =
- this.time_all.rows[i].YearDate +
- ' ' +
- this.time_all.rows[i].children[j].TwoStartDate[1]
+ 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 (this.time_all.rows[i].children[j].ThreeStartDate != '') {
- this.time_all.rows[i].children[
- j
- ].ThreeStartDate = this.time_all.rows[i].children[
+ if (data[i].children[j].ThreeStartDate != '') {
+ data[i].children[j].ThreeStartDate = data[i].children[
j
].ThreeStartDate.split('~')
- this.time_all.rows[i].children[j].ThreeStartDate[0] =
- this.time_all.rows[i].YearDate +
+ data[i].children[j].ThreeStartDate[0] =
+ data[i].YearDate +
' ' +
- this.time_all.rows[i].children[j].ThreeStartDate[0]
- this.time_all.rows[i].children[j].ThreeStartDate[1] =
- this.time_all.rows[i].YearDate +
+ data[i].children[j].ThreeStartDate[0]
+ data[i].children[j].ThreeStartDate[1] =
+ data[i].YearDate +
' ' +
- this.time_all.rows[i].children[j].ThreeStartDate[1]
+ data[i].children[j].ThreeStartDate[1]
}
- if (this.time_all.rows[i].children[j].FourStartDate != '') {
- this.time_all.rows[i].children[
- j
- ].FourStartDate = this.time_all.rows[i].children[
+ if (data[i].children[j].FourStartDate != '') {
+ data[i].children[j].FourStartDate = data[i].children[
j
].FourStartDate.split('~')
- this.time_all.rows[i].children[j].FourStartDate[0] =
- this.time_all.rows[i].YearDate +
- ' ' +
- this.time_all.rows[i].children[j].FourStartDate[0]
- this.time_all.rows[i].children[j].FourStartDate[1] =
- this.time_all.rows[i].YearDate +
- ' ' +
- this.time_all.rows[i].children[j].FourStartDate[1]
+ 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 (this.time_all.rows[i].children[j].FiveStartDate != '') {
- this.time_all.rows[i].children[
- j
- ].FiveStartDate = this.time_all.rows[i].children[
+ if (data[i].children[j].FiveStartDate != '') {
+ data[i].children[j].FiveStartDate = data[i].children[
j
].FiveStartDate.split('~')
- this.time_all.rows[i].children[j].FiveStartDate[0] =
- this.time_all.rows[i].YearDate +
- ' ' +
- this.time_all.rows[i].children[j].FiveStartDate[0]
- this.time_all.rows[i].children[j].FiveStartDate[1] =
- this.time_all.rows[i].YearDate +
- ' ' +
- this.time_all.rows[i].children[j].FiveStartDate[1]
+ 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]
}
}
}
- // 缁勫悎鏂扮殑缁撴瀯
- const newList = []
- for (const i in this.time_all.rows) {
- for (const j in this.time_all.rows[i].children) {
- if (this.time_all.rows[i].children[j].OneStartDate != '') {
+
+ // 鏇存敼鏍煎紡 鏇存敼鎴愮粍浠堕噷闈㈡墍闇�瑕佺殑瀛楁鏍煎紡
+ this.facility_data = []
+
+ for (const i in data) {
+ const time = {
+ date: data[i].YearDate,
+ AdvaDevicRhythm: '',
+ gtArray: []
+ }
+ if (data[i].children != '') {
+ time.AdvaDevicRhythm = data[i].children[0].AdvaDevicRhythm
+ }
+ for (const j in data[i].children) {
+ 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,
+ 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 != '') {
+ const icu2 = {
+ name: data[i].children[j].AdvaDevicName,
+ id: data[i].children[j].AdvaDevicNumber,
+ type: 'capacity',
+ rhythm: data[i].children[j].AdvaDevicRhythm,
+ start: data[i].children[j].TwoStartDate[0],
+ end: data[i].children[j].TwoStartDate[1],
+ mod: (data[i].children[j].AdvaDevicCropMob * 1) / 100
+ }
+ time.gtArray.push(icu2)
+ }
+ if (data[i].children[j].ThreeStartDate != '') {
+ const icu3 = {
+ name: data[i].children[j].AdvaDevicName,
+ id: data[i].children[j].AdvaDevicNumber,
+ type: 'capacity',
+ rhythm: data[i].children[j].AdvaDevicRhythm,
+ start: data[i].children[j].ThreeStartDate[0],
+ end: data[i].children[j].ThreeStartDate[1],
+ mod: (data[i].children[j].AdvaDevicCropMob * 1) / 100
+ }
+ time.gtArray.push(icu3)
+ }
+ if (data[i].children[j].FourStartDate != '') {
+ const icu4 = {
+ name: data[i].children[j].AdvaDevicName,
+ id: data[i].children[j].AdvaDevicNumber,
+ type: 'capacity',
+ rhythm: data[i].children[j].AdvaDevicRhythm,
+ start: data[i].children[j].FourStartDate[0],
+ end: data[i].children[j].FourStartDate[1],
+ mod: (data[i].children[j].AdvaDevicCropMob * 1) / 100
+ }
+ time.gtArray.push(icu4)
+ }
+ if (data[i].children[j].FiveStartDate != '') {
+ const icu5 = {
+ name: data[i].children[j].AdvaDevicName,
+ id: data[i].children[j].AdvaDevicNumber,
+ type: 'capacity',
+ rhythm: data[i].children[j].AdvaDevicRhythm,
+ start: data[i].children[j].FiveStartDate[0],
+ end: data[i].children[j].FiveStartDate[1],
+ mod: (data[i].children[j].AdvaDevicCropMob * 1) / 100
+ }
+ time.gtArray.push(icu5)
+ }
+ }
+
+ this.facility_data.push(time)
+ }
+
+ const newList = [] // 缁勫悎鏂扮殑缁撴瀯
+ for (const i in data) {
+ for (const j in data[i].children) {
+ if (data[i].children[j].OneStartDate != '') {
const data1 = {
id: '',
start: '',
end: '',
mod: ''
}
- data1.id = this.time_all.rows[i].children[j].AdvaDevicNumber
- data1.start = this.time_all.rows[i].children[j].OneStartDate[0]
- data1.end = this.time_all.rows[i].children[j].OneStartDate[1]
- data1.mod =
- (this.time_all.rows[i].children[j].AdvaDevicCropMob * 1) /
- 100
+
+ // name: data[i].children[j].AdvaDevicName,
+ // type: 'capacity',
+ // rhythm: data[i].children[j].AdvaDevicRhythm
+
+ 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
newList.push(data1)
}
- if (this.time_all.rows[i].children[j].TwoStartDate != '') {
+ if (data[i].children[j].TwoStartDate != '') {
const data2 = {
id: '',
start: '',
end: '',
mod: ''
}
- data2.id = this.time_all.rows[i].children[j].AdvaDevicNumber
- data2.start = this.time_all.rows[i].children[j].TwoStartDate[0]
- data2.end = this.time_all.rows[i].children[j].TwoStartDate[1]
- data2.mod =
- (this.time_all.rows[i].children[j].AdvaDevicCropMob * 1) /
- 100
+ 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
newList.push(data2)
}
- if (this.time_all.rows[i].children[j].ThreeStartDate != '') {
+ if (data[i].children[j].ThreeStartDate != '') {
const data3 = {
id: '',
start: '',
end: '',
mod: ''
}
- data3.id = this.time_all.rows[i].children[j].AdvaDevicNumber
- data3.start = this.time_all.rows[i].children[
- j
- ].ThreeStartDate[0]
- data3.end = this.time_all.rows[i].children[j].ThreeStartDate[1]
- data3.mod =
- (this.time_all.rows[i].children[j].AdvaDevicCropMob * 1) /
- 100
+ data3.id = data[i].children[j].AdvaDevicNumber
+ 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
newList.push(data3)
}
- if (this.time_all.rows[i].children[j].FourStartDate != '') {
+ if (data[i].children[j].FourStartDate != '') {
const data4 = {
id: '',
start: '',
end: '',
mod: ''
}
- data4.id = this.time_all.rows[i].children[j].AdvaDevicNumber
- data4.start = this.time_all.rows[i].children[
- j
- ].FourStartDate[0]
- data4.end = this.time_all.rows[i].children[j].FourStartDate[1]
- data4.mod =
- (this.time_all.rows[i].children[j].AdvaDevicCropMob * 1) /
- 100
+ data4.id = data[i].children[j].AdvaDevicNumber
+ 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
newList.push(data4)
}
- if (this.time_all.rows[i].children[j].FiveStartDate != '') {
+ if (data[i].children[j].FiveStartDate != '') {
const data5 = {
id: '',
start: '',
end: '',
mod: ''
}
- data5.id = this.time_all.rows[i].children[j].AdvaDevicNumber
- data5.start = this.time_all.rows[i].children[
- j
- ].FiveStartDate[0]
- data5.end = this.time_all.rows[i].children[j].FiveStartDate[1]
- data5.mod =
- (this.time_all.rows[i].children[j].AdvaDevicCropMob * 1) /
- 100
+ data5.id = data[i].children[j].AdvaDevicNumber
+ 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
newList.push(data5)
}
}
}
- console.log(newList, 321)
- for (const i in list) {
- this.pushTiem(newList, list[i].id, list[i].gtArray)
+ // console.log(newList, 2)
+ console.log(this.title_list, 3) // 浠ｈ〃鐨勬槸涔嬪墠鐨勬暟鎹�
+ for (const i in this.title_list) {
+ this.pushItem(newList, this.title_list[i].id, this.title_list[i].gtArray)
}
- this.bm_data = list
- const _this = this
+
+ this.bm_data = this.title_list
+ // 閽堝cont 涓嶄负 null 鏃讹紝鏁版嵁鏍兼暟杞寲
if (cont != '') {
for (const i in cont) {
for (const j in this.bm_data) {
- if (this.bm_data[j].id == cont[i].EQP_CODE) {
+ if (this.bm_data[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,
- work_order: cont[i].WO_CODE,
- STATUS: _this.AdvaScheUom,
- start: cont[i].TIME_START,
- end: cont[i].TIME_END,
- type: cont[i].STATUS == 'S' ? 'h_schedule' : 'bm_schedule'
+ // 闇�璺熷悗绔崗璋� 璋冩暣鍙傛暟 浜у搧缂栫爜銆佷骇鍝佸崟浣�(cl_code,AdvaScheUom)闇�鍚庣杩斿洖
+ id: cont[i].eqp_code,
+ number: cont[i].alloc_qty,
+ cl_name: cont[i].part_name,
+ cl_code: this.cl_code, // 涓存椂
+ work_order: cont[i].wo_code,
+ AdvaScheUom: this.AdvaScheUom, // 鍗曚綅 //涓存椂
+ date: cont[i].time_start.split(' ')[0],
+ start: cont[i].time_start,
+ end: cont[i].time_end,
+ type: cont[i].status == 'S' ? 'h_schedule' : 'bm_schedule'
}
-
this.bm_data[j].flag = 'isCont'
-
this.bm_data[j].gtArray.unshift(data)
+ if (this.facility_data[j].date == data.date) {
+ // console.log(data.date, 1)
+ // console.log(this.facility_data[j], 1)
+ this.facility_data[j].gtArray.unshift(data)
+ }
}
}
}
}
+ // 閽堝宸︿晶澶嶉�夋鐨勭姸鎬� 鏄惁閫変腑
if (this.false_arr != '') {
for (const j in this.bm_data) {
if (this.false_arr.indexOf(this.bm_data[j].id) >= 0) {
@@ -1003,8 +970,10 @@
}
}
}
- // })
+ console.log(this.facility_data, 555)
+ console.log(this.bm_data, 556)
},
+
// 鎹㈠瀷鏃堕棿
MinutesTest(time) {
var sdate1 = new Date(time)
@@ -1028,7 +997,7 @@
return parseInt(date) + 1
},
// 鎻掑叆浜ц兘鏃堕棿娈�
- pushTiem(newList, id, arr) {
+ pushItem(newList, id, arr) {
for (const i in newList) {
if (newList[i].id == id) {
const data = {
@@ -1042,58 +1011,39 @@
}
}
},
- getNowFormatDate() {
- var date = new Date()
- var seperator1 = '-'
- var year = date.getFullYear()
- var month = date.getMonth() + 1
- // var strDate = date.getDate()+1;
- var strDate = date.getDate()
- if (month >= 1 && month <= 9) {
- month = '0' + month
- }
- if (strDate >= 0 && strDate <= 9) {
- strDate = '0' + strDate
- }
- var currentdate = year + seperator1 + month + seperator1 + strDate
- return currentdate
- },
+ // 琛岀偣鍑讳簨浠�
getCurrentRow(row) {
- // this.show =true
- this.formBottom.meter = row.AdvaScheQty * 1 - row.AdvaScheYPQty * 1 // 鍙互鍋氫釜鏁�
- this.formBottom.value1 = []
- this.cl_name = row.AdvaSchePartName
- this.cl_code = row.AdvaSchePartNumber
- this.AdvaScheUom = row.AdvaScheUom
- this.work_order = row.AdvaScheWorkCode
- this.formBottom.value1.push(this.getNowFormatDate())
- this.formBottom.value1.push(row.AdvaScheEndDate)
- if (this.formBottom.value1 != '') {
- this.time_data[0] = this.formBottom.value1[0] + ' 00:00'
- this.time_data[1] = this.formBottom.value1[1] + ' 23:59'
+ this.radioSelectedId = row.AdvaScheId // 鎺掔▼id璧嬪�肩粰閫変腑琛宨d
+ this.formBottom.meter = row.AdvaScheQty * 1 - row.AdvaScheYPQty * 1 // 闇�鎺掓暟閲� = 鏈帓绋嬫暟閲� - 宸叉帓绋嬫暟閲�
+ this.formBottom.scheDate = [] // 鎺掔▼鏃ユ湡缃┖
+ this.cl_name = row.AdvaSchePartName // 浜у搧鍚嶇О
+ this.cl_code = row.AdvaSchePartNumber // 浜у搧缂栫爜
+ this.AdvaScheUom = row.AdvaScheUom // 浜у搧鍗曚綅
+ this.work_order = row.AdvaScheWorkCode // 宸ュ崟缂栧彿
+
+ this.formBottom.scheDate.push(handleDatetime(new Date())) // 褰撳墠鏃ユ湡锛堜粖澶╋級
+ this.formBottom.scheDate.push(row.AdvaScheEndDate) // 瑕佹眰浜や粯鏃堕棿
+ if (this.formBottom.scheDate != '') {
+ this.time_data[0] = this.formBottom.scheDate[0] + ' 00:00' // 鎺掔▼寮�濮嬫椂闂�
+ this.time_data[1] = this.formBottom.scheDate[1] + ' 23:59' // 鎺掔▼缁撴潫鏃堕棿
}
- this.forms.WorkCode = row.AdvaScheWorkCode
- this.forms.WorkShop = row.AdvaScheWorkShopid
- this.forms.PartNumber = row.AdvaSchePartNumber
- this.forms.BotProceCode = row.AdvaScheBotProcid
- this.forms.StartTime = this.getNowFormatDate()
- this.forms.EndTime = row.AdvaScheEndDate
- this.OnclickAdvancedSchedulingDevice()
- this.formUpdata.WorkCode = row.AdvaScheWorkCode
- this.formUpdata.BotProceCode = row.AdvaScheBotProcid
- this.search_from.WorkTime =
- this.getNowFormatDate() + '~' + row.AdvaScheEndDate
- this.search_from.BotProceName = row.AdvaScheBotProcName
+ this.forms.wocode = row.AdvaScheWorkCode // 宸ュ崟缂栧彿
+ this.forms.wkshpcode = row.AdvaScheWorkShopid // 杞﹂棿缂栫爜
+ this.forms.partcode = row.AdvaSchePartNumber // 浜у搧缂栫爜
+ this.forms.botproccode = row.AdvaScheBotProcid // 宸ヨ壓璺嚎缂栫爜
+ this.forms.startdate = handleDatetime(new Date()) // 褰撳墠鏃ユ湡锛堜粖澶╋級
+ this.forms.enddate = row.AdvaScheEndDate // 瑕佹眰浜や粯鏃堕棿
+ this.getOnclickAdvancedSchedulingDevice()
+ this.formUpdata.WorkCode = row.AdvaScheWorkCode // 宸ュ崟缂栧彿
+ this.formUpdata.BotProceCode = row.AdvaScheBotProcid // 宸ヨ壓璺嚎缂栫爜
+ this.search_from.WorkTime = handleDatetime(new Date()) + '~' + row.AdvaScheEndDate // 鎺掔▼鐨勬棩鏈� 寮�濮媬缁撴潫
+ this.search_from.BotProceName = row.AdvaScheBotProcName // 宸ュ簭鍚嶇О
},
// 鎻愪氦鎺掔▼
- click_yes() {
- if (this.submit_flag) {
- this.$message({
- showClose: true,
- type: 'error',
- message: '鏁伴噺鏈帓瀹�,璇疯缃骇鑳芥椂闂�'
- })
- } else {
+ async click_yes() {
+ if (this.formBottom.real_num !== this.formBottom.meter) {
+ this.$message.error('鏁伴噺鏈帓瀹岋紝璇疯缃骇鑳芥椂闂达紒')
+ } else { // 棰勬帓杩涘害涓�100% 鏁伴噺宸叉帓瀹�
const list = [] // 鎻愪氦鏁扮粍
for (const i in this.bm_data) {
const arr = []
@@ -1130,55 +1080,47 @@
updata = JSON.stringify(updata)
this.formUpdata.json = updata
if (list == '') {
- this.$message({
- showClose: true,
- message: '璇峰厛棰勬帓',
- type: 'error'
- })
+ this.$message.error('璇峰厛棰勬帓')
return false
}
- automaticScheduling
- .SubmitAlreadyScheduling(this.formUpdata)
- .then(res => {
- if (res.statusCode == 300) {
- this.$message({
- showClose: true,
- message: res.message,
- type: 'error'
- })
- } else {
- this.$message({
- showClose: true,
- message: res.message,
- type: 'success'
- })
- }
- this.formBottom.meter = 0
- this.formBottom.real_num = 0
- this.OnclickAdvancedSchedulingDevice()
- this.AdvancedSchedulingSearch()
- })
+
+ const formData = new FormData()
+ formData.append('wocode', this.formUpdata.WorkCode)
+ formData.append('botprocecode', this.formUpdata.BotProceCode)
+ formData.append('json', this.formUpdata.json)
+
+ const res = await SubmitAlreadyScheduling(formData)
+
+ if (res.code === '200') {
+ this.$message.success(res.Message)
+ }
+
+ this.formBottom.meter = 0
+ this.formBottom.real_num = 0
+ await this.getOnclickAdvancedSchedulingDevice()
+ await this.getAdvancedSchedulingSearch()
}
},
-
// 鏃堕棿/璁惧浼樺厛鎺掔▼
click_schedule() {
const timestamp = new Date().toLocaleDateString()
- if (new Date(this.formBottom.value1[0]) < new Date(timestamp)) {
- this.$message({
- showClose: true,
- type: 'error',
- message: '鎺掔▼鏃堕棿涓嶅彲浠ュ皬浜庡綋鍓嶆椂闂�'
- })
+
+ if (new Date(this.formBottom.scheDate[1]) < new Date(timestamp)) {
+ this.$message.error('鎺掔▼鏃ユ湡涓嶅彲浠ュ皬浜庡綋鍓嶆椂闂�!')
return false
}
- this.nitialize()
- // 璁惧浼樺厛
- if (this.bm_data != '' && this.formBottom.types == 'N') {
+ this.nitialize()// 鎵嬪姩杩囨护鎵�鏈夎澶囧凡鎺掔▼
+ // console.log(this.facility_data, 67890)
+ if (this.bm_data != '' && this.formBottom.types == 'N') { // 璁惧浼樺厛
this.fun_time()
this.change_num(this.bm_data)
- } else if (this.facility_data != '' && this.formBottom.types == 'Y') {
+ } else if (this.facility_data != '' && this.formBottom.types == 'Y') { // 鏃堕棿浼樺厛
+ // 杩欓儴鍒嗛�昏緫閲嶅啓 鐩墠鏈夐棶棰�
+
+ // this.fun_time()
+ // this.change_num(this.bm_data)
+
this.time_nitalize()
this.fun_facility()
this.dataTransition()
@@ -1192,20 +1134,18 @@
this.facility_data[i].gtArray = this.facility_data[i].gtArray.filter(item => item.type != 'schedule')
}
},
-
// 鎵嬪姩杩囨护鎵�鏈夎澶囧凡鎺掔▼
nitialize() {
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])
}
}
this.bm_data[i].gtArray = newArr
}
},
-
// 缁欐帓绋嬫渶鍚庝竴涓慨鏀规暟閲�
change_num(arr) {
this.formBottom.real_num = 0 // 鐪熷疄宸叉帓鏁伴噺
@@ -1249,6 +1189,9 @@
}
}
}
+
+ console.log(this.bm_data, 668)
+ // console.log(JSON.stringify(this.bm_data), 668)
},
fun_time() {
let all_num = this.formBottom.meter
@@ -1311,18 +1254,13 @@
number: 0,
real_number: 0
}
- if (
- id_obj.start_time != '' &&
- flag1 == 0 &&
- new Date(id_obj.start_time) >= new Date(capacity_arr[w].start)
- ) {
+ if (id_obj.start_time != '' && flag1 == 0 && new Date(id_obj.start_time) >= new Date(capacity_arr[w].start)) {
data.start = this.MinutesTest(id_obj.start_time)
flag1 = 1
} else {
data.start = capacity_arr[w].start
}
- let nowTime =
- (this.bm_data[i].AdvaDevicRhythm * all_num) / capacity_arr[w].mod
+ let nowTime = (this.bm_data[i].AdvaDevicRhythm * all_num) / capacity_arr[w].mod
end_time = this.formSeconds(nowTime, data.start, capacity_arr[w].mod) // 鎬诲叡鐨勭粨鏉熸椂闂�
data.end = end_time
mistiming = this.formTime(
@@ -1331,12 +1269,12 @@
capacity_arr[w].mod
) // 鎬诲叡鐨勭粨鏉熸椂闂�-褰撳墠鐨勭粨鏉熸椂闂� = 鍓╀笅澶氫箙鏃堕棿
if (mistiming >= 0) {
- console.log(
- new Date(data.end) - new Date(data.start),
- capacity_arr[w].mod,
- this.bm_data[i].AdvaDevicRhythm,
- '闃挎柉椤垮彂鏂拏鑺�'
- )
+ // console.log(
+ // new Date(data.end) - new Date(data.start),
+ // capacity_arr[w].mod,
+ // this.bm_data[i].AdvaDevicRhythm,
+ // '闃挎柉椤垮彂鏂拏鑺�'
+ // )
data.number =
((new Date(data.end) - new Date(data.start)) *
capacity_arr[w].mod) /
@@ -1382,6 +1320,7 @@
},
// 璁惧鎺掔▼鏂规硶
fun_facility() {
+ // this.bm_data
// 鎺掗櫎鏈嬀閫夐」
for (const i in this.facility_data) {
const newArr = []
@@ -1407,45 +1346,45 @@
// let capacity_end = ''
end_arr = this.facility_data[i].gtArray.filter(item => item.type == 'h_schedule')
nend_arr = this.facility_data[i].gtArray.filter(item => item.type == 'capacity')
- console.log(nend_arr)
+ // console.log(nend_arr)
capacity_arr = JSON.parse(JSON.stringify(nend_arr))
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()) {
+ if (new Date(capacity_arr[i].start).getTime() == new Date(item.start).getTime()) {
console.log(i, capacity_arr[i], '鍝囧搱鍝�')
capacity_arr.splice(i, 1)
break
}
}
})
- console.log(capacity_arr, '澶цタ鐡�')
+ // console.log(capacity_arr, '澶цタ鐡�')
if (!capacity_arr || capacity_arr.length == 0) break
// const firstCapacity = capacity_arr[0]
const schedule_arr = end_arr.filter(item => {
const remain = nend_arr.some(sitem => {
- return new Date(sitem.start).getTime() === new Date(item.start).getTime() &&
+ return new Date(sitem.start).getTime() == new Date(item.start).getTime() &&
new Date(item.end).getTime() < new Date(sitem.end).getTime()
})
return remain
})
- console.log(schedule_arr)
+ // console.log(schedule_arr)
if (schedule_arr && schedule_arr.length > 0) {
const scheduleCan = schedule_arr.map(item => {
const capcity = nend_arr.filter(sitem => {
- return new Date(sitem.start).getTime() === new Date(item.start).getTime() &&
+ return new Date(sitem.start).getTime() == new Date(item.start).getTime() &&
new Date(item.end).getTime() < new Date(sitem.end).getTime()
})[0]
- console.log('capacity', capcity)
+ // console.log('capacity', capcity)
capcity.start = this.MinutesTest(item.end)
return capcity
})
const newSchedule = JSON.parse(JSON.stringify(scheduleCan))
capacity_arr = newSchedule.concat(capacity_arr)
}
- console.log(schedule_arr)
- console.log('鍙帓绋嬫暟缁�', capacity_arr)
+ // 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)
@@ -1535,8 +1474,14 @@
}
}
},
+ dataTransition2() {
+
+ },
// 缁欒澶囪浆鎹㈡牸寮�
dataTransition() {
+ console.log(this.bm_data, 800)
+ console.log(this.facility_data, 801)
+ console.log(this.title_list, 802)
this.bm_data = []
const data = this.facility_data
@@ -1550,213 +1495,494 @@
for (const i in list) {
list[i].gtArray = []
- this.pushTiemsss(all, list[i].id, list[i].gtArray)
+ // this.pushTimes(all, list[i].id, list[i].gtArray)
+ all.forEach(j => {
+ if (j.id == list[i].id) {
+ list[i].gtArray.push(j)
+ }
+ })
}
+ console.log(list, 805)
+ // for (const n in list) {
+ // if (list[n].gtArray.length === 0) {
+ // list[n].status = false
+ // }
+ // }
- for (const n in list) {
- if (list[n].gtArray.length == 0) {
- list[n].status = false
- }
- }
-
- // console.log(list)
+ console.log(list)
this.bm_data = list
+
+ // this.bm_data = [
+ // {
+ // 'id': 'SB004',
+ // 'name': '榻胯疆绠辩粍浜岀嚎',
+ // 'status': true,
+ // 'AdvaDevicRhythm': '5.0',
+ // 'colorPair': {
+ // 'dark': 'rgb(83, 186, 241,0.8)',
+ // 'light': 'rgb(83, 186, 241,0.1)',
+ // 'light_capacity': 'rgb(209,239,237,0.8)',
+ // 'h_schedule': 'rgb(100,255,192,0.8)',
+ // 'scheduleing': 'rgb(20,182,231,0.8)'
+ // },
+ // 'gtArray': [
+ // {
+ // 'id': 'SB004',
+ // 'number': 224,
+ // 'cl_name': '8504鍏夋満',
+ // 'cl_code': '302',
+ // 'work_order': 'MO-2022-11-0032_1',
+ // 'AdvaScheUom': '鍙�',
+ // 'date': '2023-02-07',
+ // 'start': '2023-02-07 08:00:00',
+ // 'end': '2023-02-07 11:06:40',
+ // 'type': 'h_schedule' // h_schedule浠ｈ〃宸叉帓鐨勬椂闂�
+ // }, {
+ // 'start': '2023-2-7 11:6:40',
+ // 'end': '2023-02-07 11:30',
+ // 'id': 'SB004',
+ // 'mod': 0.1,
+ // 'type': 'capacity'
+ // }, {
+ // 'start': '2023-02-07 12:30',
+ // 'end': '2023-02-07 17:00',
+ // 'id': 'SB004',
+ // 'mod': 0.1,
+ // 'type': 'capacity'
+ // }, {
+ // 'start': '2023-02-08 08:00',
+ // 'end': '2023-02-08 11:30',
+ // 'id': 'SB004',
+ // 'mod': 0.1,
+ // 'type': 'capacity'
+ // }, {
+ // 'start': '2023-02-08 12:30',
+ // 'end': '2023-02-08 17:00',
+ // 'id': 'SB004',
+ // 'mod': 0.1,
+ // 'type': 'capacity'
+ // }, {
+ // 'start': '2023-02-09 08:00',
+ // 'end': '2023-02-09 11:30',
+ // 'id': 'SB004',
+ // 'mod': 0.1,
+ // 'type': 'capacity'
+ // }, {
+ // 'start': '2023-02-09 12:30',
+ // 'end': '2023-02-09 17:00',
+ // 'id': 'SB004',
+ // 'mod': 0.1,
+ // 'type': 'capacity'
+ // }, {
+ // 'id': 'SB004',
+ // 'start': '2023-2-7 11:6:40',
+ // 'end': '2023-02-07 11:30',
+ // 'type': 'schedule', // schedule 姝ｅ湪鎺掔▼
+ // 'cl_name': '8504鍏夋満',
+ // 'cl_code': '302',
+ // 'work_order': 'MO-2022-11-0034_1',
+ // 'number': '28',
+ // 'real_number': 28
+ // }, {
+ // 'id': 'SB004',
+ // 'start': '2023-02-07 12:30',
+ // 'end': '2023-02-07 17:00',
+ // 'type': 'schedule',
+ // 'cl_name': '8504鍏夋満',
+ // 'cl_code': '302',
+ // 'work_order': 'MO-2022-11-0034_1',
+ // 'number': '324',
+ // 'real_number': 324
+ // }, {
+ // 'id': 'SB004',
+ // 'start': '2023-02-08 08:00',
+ // 'end': '2023-02-08 11:30',
+ // 'type': 'schedule',
+ // 'cl_name': '8504鍏夋満',
+ // 'cl_code': '302',
+ // 'work_order': 'MO-2022-11-0034_1',
+ // 'number': '252',
+ // 'real_number': 252
+ // }, {
+ // 'id': 'SB004',
+ // 'start': '2023-02-08 12:30',
+ // 'end': '2023-02-08 17:00',
+ // 'type': 'schedule',
+ // 'cl_name': '8504鍏夋満',
+ // 'cl_code': '302',
+ // 'work_order': 'MO-2022-11-0034_1',
+ // 'number': '324',
+ // 'real_number': 324
+ // }, {
+ // 'id': 'SB004',
+ // 'start': '2023-02-09 08:00',
+ // 'end': '2023-02-09 11:30',
+ // 'type': 'schedule',
+ // 'cl_name': '8504鍏夋満',
+ // 'cl_code': '302',
+ // 'work_order': 'MO-2022-11-0034_1',
+ // 'number': '252',
+ // 'real_number': 252
+ // }, {
+ // 'id': 'SB004',
+ // 'start': '2023-02-09 12:30',
+ // 'end': '2023-02-09 17:00',
+ // 'type': 'schedule',
+ // 'cl_name': '8504鍏夋満',
+ // 'cl_code': '302',
+ // 'work_order': 'MO-2022-11-0034_1',
+ // 'number': '324',
+ // 'real_number': 324
+ // }],
+ // 'mod': 10,
+ // 'flag': 'isCont'
+ // },
+ // {
+ // 'id': 'SB005',
+ // 'name': '涓绘満缁勪竴绾�',
+ // 'status': true,
+ // 'AdvaDevicRhythm': '15.0',
+ // 'colorPair': {
+ // 'dark': 'rgb(83, 186, 241,0.8)',
+ // 'light': 'rgb(83, 186, 241,0.1)',
+ // 'light_capacity': 'rgb(209,239,237,0.8)',
+ // 'h_schedule': 'rgb(100,255,192,0.8)',
+ // 'scheduleing': 'rgb(20,182,231,0.8)'
+ // },
+ // 'gtArray': [{
+ // 'name': '涓绘満缁勪竴绾�',
+ // 'id': 'SB005',
+ // 'type': 'capacity',
+ // 'rhythm': '15.0',
+ // 'start': '2023-02-07 08:00',
+ // 'end': '2023-02-07 11:30',
+ // 'mod': 0.1
+ // }, {
+ // 'name': '涓绘満缁勪竴绾�',
+ // 'id': 'SB005',
+ // 'type': 'capacity',
+ // 'rhythm': '15.0',
+ // 'start': '2023-02-07 12:30',
+ // 'end': '2023-02-07 17:00',
+ // 'mod': 0.1
+ // }, {
+ // 'id': 'SB005',
+ // 'start': '2023-02-07 08:00',
+ // 'end': '2023-02-07 11:30',
+ // 'type': 'schedule',
+ // 'cl_name': '8504鍏夋満',
+ // 'cl_code': '302',
+ // 'work_order': 'MO-2022-11-0034_1',
+ // 'number': '84',
+ // 'real_number': 84
+ // }, {
+ // 'id': 'SB005',
+ // 'start': '2023-02-07 12:30',
+ // 'end': '2023-02-07 17:00',
+ // 'type': 'schedule',
+ // 'cl_name': '8504鍏夋満',
+ // 'cl_code': '302',
+ // 'work_order': 'MO-2022-11-0034_1',
+ // 'number': '108',
+ // 'real_number': 108
+ // }, {
+ // 'name': '涓绘満缁勪竴绾�',
+ // 'id': 'SB005',
+ // 'type': 'capacity',
+ // 'rhythm': '15.0',
+ // 'start': '2023-02-08 08:00',
+ // 'end': '2023-02-08 11:30',
+ // 'mod': 0.1
+ // }, {
+ // 'name': '涓绘満缁勪竴绾�',
+ // 'id': 'SB005',
+ // 'type': 'capacity',
+ // 'rhythm': '15.0',
+ // 'start': '2023-02-08 12:30',
+ // 'end': '2023-02-08 17:00',
+ // 'mod': 0.1
+ // }, {
+ // 'id': 'SB005',
+ // 'start': '2023-02-08 08:00',
+ // 'end': '2023-02-08 11:30',
+ // 'type': 'schedule',
+ // 'cl_name': '8504鍏夋満',
+ // 'cl_code': '302',
+ // 'work_order': 'MO-2022-11-0034_1',
+ // 'number': '84',
+ // 'real_number': 84
+ // }, {
+ // 'id': 'SB005',
+ // 'start': '2023-02-08 12:30',
+ // 'end': '2023-02-08 17:00',
+ // 'type': 'schedule',
+ // 'cl_name': '8504鍏夋満',
+ // 'cl_code': '302',
+ // 'work_order': 'MO-2022-11-0034_1',
+ // 'number': '108',
+ // 'real_number': 108
+ // }, {
+ // 'name': '涓绘満缁勪竴绾�',
+ // 'id': 'SB005',
+ // 'type': 'capacity',
+ // 'rhythm': '15.0',
+ // 'start': '2023-02-09 08:00',
+ // 'end': '2023-02-09 11:30',
+ // 'mod': 0.1
+ // }, {
+ // 'name': '涓绘満缁勪竴绾�',
+ // 'id': 'SB005',
+ // 'type': 'capacity',
+ // 'rhythm': '15.0',
+ // 'start': '2023-02-09 12:30',
+ // 'end': '2023-02-09 17:00',
+ // 'mod': 0.1
+ // }],
+ // 'mod': 10
+ // }
+ //
+ // ]
+ //
+ // const a = [
+ // {
+ // 'id': 'SB004',
+ // 'name': '榻胯疆绠辩粍浜岀嚎',
+ // 'status': true,
+ // 'AdvaDevicRhythm': '5.0',
+ // 'colorPair': {
+ // 'dark': 'rgb(83, 186, 241,0.8)',
+ // 'light': 'rgb(83, 186, 241,0.1)',
+ // 'light_capacity': 'rgb(209,239,237,0.8)',
+ // 'h_schedule': 'rgb(100,255,192,0.8)',
+ // 'scheduleing': 'rgb(20,182,231,0.8)'
+ // },
+ // 'gtArray': [
+ // {
+ // 'id': 'SB004',
+ // 'number': 224,
+ // 'cl_name': '8504鍏夋満',
+ // 'cl_code': '302',
+ // 'work_order': 'MO-2022-11-0032_1',
+ // 'AdvaScheUom': '鍙�',
+ // 'date': '2023-02-07',
+ // 'start': '2023-02-07 08:00:00',
+ // 'end': '2023-02-07 11:06:40',
+ // 'type': 'h_schedule'
+ // }, {
+ // 'start': '2023-2-7 11:6:40',
+ // 'end': '2023-02-07 11:30',
+ // 'id': 'SB004',
+ // 'mod': 0.1,
+ // 'type': 'capacity'
+ // }, {
+ // 'start': '2023-02-07 12:30',
+ // 'end': '2023-02-07 17:00',
+ // 'id': 'SB004',
+ // 'mod': 0.1,
+ // 'type': 'capacity'
+ // }, {
+ // 'start': '2023-02-08 08:00',
+ // 'end': '2023-02-08 11:30',
+ // 'id': 'SB004',
+ // 'mod': 0.1,
+ // 'type': 'capacity'
+ // }, {
+ // 'start': '2023-02-08 12:30',
+ // 'end': '2023-02-08 17:00',
+ // 'id': 'SB004',
+ // 'mod': 0.1,
+ // 'type': 'capacity'
+ // }, {
+ // 'start': '2023-02-09 08:00',
+ // 'end': '2023-02-09 11:30',
+ // 'id': 'SB004',
+ // 'mod': 0.1,
+ // 'type': 'capacity'
+ // }, {
+ // 'start': '2023-02-09 12:30',
+ // 'end': '2023-02-09 17:00',
+ // 'id': 'SB004',
+ // 'mod': 0.1,
+ // 'type': 'capacity'
+ // }, {
+ // 'id': 'SB004',
+ // 'start': '2023-2-7 11:6:40',
+ // 'end': '2023-02-07 11:30',
+ // 'type': 'schedule',
+ // 'cl_name': '8504鍏夋満',
+ // 'cl_code': '302',
+ // 'work_order': 'MO-2022-11-0034_1',
+ // 'number': '28',
+ // 'real_number': 28
+ // }, {
+ // 'id': 'SB004',
+ // 'start': '2023-02-07 12:30',
+ // 'end': '2023-02-07 17:00',
+ // 'type': 'schedule',
+ // 'cl_name': '8504鍏夋満',
+ // 'cl_code': '302',
+ // 'work_order': 'MO-2022-11-0034_1',
+ // 'number': '324',
+ // 'real_number': 324
+ // }, {
+ // 'id': 'SB004',
+ // 'start': '2023-02-08 08:00',
+ // 'end': '2023-02-08 11:30',
+ // 'type': 'schedule',
+ // 'cl_name': '8504鍏夋満',
+ // 'cl_code': '302',
+ // 'work_order': 'MO-2022-11-0034_1',
+ // 'number': '252',
+ // 'real_number': 252
+ // }, {
+ // 'id': 'SB004',
+ // 'start': '2023-02-08 12:30',
+ // 'end': '2023-02-08 17:00',
+ // 'type': 'schedule',
+ // 'cl_name': '8504鍏夋満',
+ // 'cl_code': '302',
+ // 'work_order': 'MO-2022-11-0034_1',
+ // 'number': '324',
+ // 'real_number': 324
+ // }, {
+ // 'id': 'SB004',
+ // 'start': '2023-02-09 08:00',
+ // 'end': '2023-02-09 11:30',
+ // 'type': 'schedule',
+ // 'cl_name': '8504鍏夋満',
+ // 'cl_code': '302',
+ // 'work_order': 'MO-2022-11-0034_1',
+ // 'number': '252',
+ // 'real_number': 252
+ // }, {
+ // 'id': 'SB004',
+ // 'start': '2023-02-09 12:30',
+ // 'end': '2023-02-09 17:00',
+ // 'type': 'schedule',
+ // 'cl_name': '8504鍏夋満',
+ // 'cl_code': '302',
+ // 'work_order': 'MO-2022-11-0034_1',
+ // 'number': '324',
+ // 'real_number': 324
+ // }],
+ // 'mod': 10,
+ // 'flag': 'isCont'
+ // },
+ // {
+ // 'id': 'SB005',
+ // 'name': '涓绘満缁勪竴绾�',
+ // 'status': true,
+ // 'AdvaDevicRhythm': '15.0',
+ // 'colorPair': {
+ // 'dark': 'rgb(83, 186, 241,0.8)',
+ // 'light': 'rgb(83, 186, 241,0.1)',
+ // 'light_capacity': 'rgb(209,239,237,0.8)',
+ // 'h_schedule': 'rgb(100,255,192,0.8)',
+ // 'scheduleing': 'rgb(20,182,231,0.8)'
+ // },
+ // 'gtArray': [{
+ // 'name': '涓绘満缁勪竴绾�',
+ // 'id': 'SB005',
+ // 'type': 'capacity',
+ // 'rhythm': '15.0',
+ // 'start': '2023-02-07 08:00',
+ // 'end': '2023-02-07 11:30',
+ // 'mod': 0.1
+ // }, {
+ // 'name': '涓绘満缁勪竴绾�',
+ // 'id': 'SB005',
+ // 'type': 'capacity',
+ // 'rhythm': '15.0',
+ // 'start': '2023-02-07 12:30',
+ // 'end': '2023-02-07 17:00',
+ // 'mod': 0.1
+ // }, {
+ // 'id': 'SB005',
+ // 'start': '2023-02-07 08:00',
+ // 'end': '2023-02-07 11:30',
+ // 'type': 'schedule',
+ // 'cl_name': '8504鍏夋満',
+ // 'cl_code': '302',
+ // 'work_order': 'MO-2022-11-0034_1',
+ // 'number': '84',
+ // 'real_number': 84
+ // }, {
+ // 'id': 'SB005',
+ // 'start': '2023-02-07 12:30',
+ // 'end': '2023-02-07 17:00',
+ // 'type': 'schedule',
+ // 'cl_name': '8504鍏夋満',
+ // 'cl_code': '302',
+ // 'work_order': 'MO-2022-11-0034_1',
+ // 'number': '108',
+ // 'real_number': 108
+ // }, {
+ // 'name': '涓绘満缁勪竴绾�',
+ // 'id': 'SB005',
+ // 'type': 'capacity',
+ // 'rhythm': '15.0',
+ // 'start': '2023-02-08 08:00',
+ // 'end': '2023-02-08 11:30',
+ // 'mod': 0.1
+ // }, {
+ // 'name': '涓绘満缁勪竴绾�',
+ // 'id': 'SB005',
+ // 'type': 'capacity',
+ // 'rhythm': '15.0',
+ // 'start': '2023-02-08 12:30',
+ // 'end': '2023-02-08 17:00',
+ // 'mod': 0.1
+ // }, {
+ // 'id': 'SB005',
+ // 'start': '2023-02-08 08:00',
+ // 'end': '2023-02-08 11:30',
+ // 'type': 'schedule',
+ // 'cl_name': '8504鍏夋満',
+ // 'cl_code': '302',
+ // 'work_order': 'MO-2022-11-0034_1',
+ // 'number': '84',
+ // 'real_number': 84
+ // }, {
+ // 'id': 'SB005',
+ // 'start': '2023-02-08 12:30',
+ // 'end': '2023-02-08 17:00',
+ // 'type': 'schedule',
+ // 'cl_name': '8504鍏夋満',
+ // 'cl_code': '302',
+ // 'work_order': 'MO-2022-11-0034_1',
+ // 'number': '108',
+ // 'real_number': 108
+ // }, {
+ // 'name': '涓绘満缁勪竴绾�',
+ // 'id': 'SB005',
+ // 'type': 'capacity',
+ // 'rhythm': '15.0',
+ // 'start': '2023-02-09 08:00',
+ // 'end': '2023-02-09 11:30',
+ // 'mod': 0.1
+ // }, {
+ // 'name': '涓绘満缁勪竴绾�',
+ // 'id': 'SB005',
+ // 'type': 'capacity',
+ // 'rhythm': '15.0',
+ // 'start': '2023-02-09 12:30',
+ // 'end': '2023-02-09 17:00',
+ // 'mod': 0.1
+ // }],
+ // 'mod': 10
+ // }
+ //
+ // ]
+ //
+ // console.log(a, 803)
},
// 鎻掑叆浜ц兘鏃堕棿娈�
- pushTiemsss(newList, id, arr) {
+ pushTimes(newList, id, arr) {
for (const i in newList) {
if (newList[i].id == id) {
arr.push(newList[i])
}
}
- },
- // 璁惧浼樺厛
- facility_top() {
- // automaticScheduling
- // .OnclickAdvancedSchedulingDevice(this.forms)
- // .then(res => {
- const res = this.testValue
- this.show = true
- const data = res.rows
- const cont = res.Cont
- this.title_list = []
- for (const i in data[0].children) {
- const obj = {
- id: '',
- name: '',
- status: true,
- AdvaDevicRhythm: '',
- // mod:'',
- colorPair: {
- dark: 'rgb(83, 186, 241,0.8)',
- light: 'rgb(83, 186, 241,0.1)',
- light_capacity: 'rgb(209,239,237,0.8)',
- h_schedule: ' rgb(100,255,192,0.8)',
- scheduleing: 'rgb(20,182,231,0.8)'
- },
- gtArray: []
- }
- obj.id = data[0].children[i].AdvaDevicNumber
- obj.name = data[0].children[i].AdvaDevicName
- obj.AdvaDevicRhythm = data[0].children[i].AdvaDevicRhythm
- // obj.mod =data[0].children[i].AdvaDevicCropMob *1
-
- this.title_list.push(obj)
- }
- 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]
- }
- 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]
- }
- }
- }
- // 鏇存敼鏍煎紡
- this.facility_data = []
-
- for (const i in data) {
- const time = {
- date: data[i].YearDate,
- AdvaDevicRhythm: '',
- gtArray: []
- }
- if (data[i].children != '') {
- time.AdvaDevicRhythm = data[i].children[0].AdvaDevicRhythm
- }
- for (const j in data[i].children) {
- 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,
- 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 != '') {
- const icu2 = {
- name: data[i].children[j].AdvaDevicName,
- id: data[i].children[j].AdvaDevicNumber,
- type: 'capacity',
- rhythm: data[i].children[j].AdvaDevicRhythm,
- start: data[i].children[j].TwoStartDate[0],
- end: data[i].children[j].TwoStartDate[1],
- mod: (data[i].children[j].AdvaDevicCropMob * 1) / 100
- }
- time.gtArray.push(icu2)
- }
- if (data[i].children[j].ThreeStartDate != '') {
- const icu3 = {
- name: data[i].children[j].AdvaDevicName,
- id: data[i].children[j].AdvaDevicNumber,
- type: 'capacity',
- rhythm: data[i].children[j].AdvaDevicRhythm,
- start: data[i].children[j].ThreeStartDate[0],
- end: data[i].children[j].ThreeStartDate[1],
- mod: (data[i].children[j].AdvaDevicCropMob * 1) / 100
- }
- time.gtArray.push(icu3)
- }
- if (data[i].children[j].FourStartDate != '') {
- const icu4 = {
- name: data[i].children[j].AdvaDevicName,
- id: data[i].children[j].AdvaDevicNumber,
- type: 'capacity',
- rhythm: data[i].children[j].AdvaDevicRhythm,
- start: data[i].children[j].FourStartDate[0],
- end: data[i].children[j].FourStartDate[1],
- mod: (data[i].children[j].AdvaDevicCropMob * 1) / 100
- }
- time.gtArray.push(icu4)
- }
- if (data[i].children[j].FiveStartDate != '') {
- const icu5 = {
- name: data[i].children[j].AdvaDevicName,
- id: data[i].children[j].AdvaDevicNumber,
- type: 'capacity',
- rhythm: data[i].children[j].AdvaDevicRhythm,
- start: data[i].children[j].FiveStartDate[0],
- end: data[i].children[j].FiveStartDate[1],
- mod: (data[i].children[j].AdvaDevicCropMob * 1) / 100
- }
- time.gtArray.push(icu5)
- }
- }
-
- this.facility_data.push(time)
- }
-
- if (cont != '') {
- for (const i in cont) {
- const date_time = cont[i].TIME_START.split(' ')
- const cont_date = date_time[0]
- for (const j in this.facility_data) {
- const data = {
- id: cont[i].EQP_CODE,
- date: cont_date,
- number: cont[i].ALLOC_QTY,
- cl_name: cont[i].PART_NAME,
- cl_code: this.cl_code,
- work_order: cont[i].WO_CODE,
- start: cont[i].TIME_START,
- end: cont[i].TIME_END,
- type: 'h_schedule'
- }
- if (this.facility_data[j].date == data.date) {
- this.facility_data[j].gtArray.unshift(data)
- }
- }
- }
- }
- // })
},
// 鎺掔▼鏂规硶
formSeconds(s1, start, mod) {
@@ -1856,7 +2082,7 @@
.box_style {
position: relative;
top: 40px;
- left: -75px;
+ left: -91px;
}
.box_styles {
@@ -1874,7 +2100,7 @@
/*background-color: #f8f8fa;*/
background-color: #fff;
margin-top: 20px;
- /*height: 390px;*/
+ height: 490px;
}
label {
@@ -1891,31 +2117,10 @@
width: 100px;
}
-.top-bar {
- /* height: 30px; */
- margin-bottom: 20px;
-}
-
.container {
display: flex;
flex-direction: column;
flex: 1;
-}
-
-.main-footer {
- /* height: 30px; */
-}
-
-.ib {
- display: inline-block;
-}
-
-.w250 {
- width: 250px;
-}
-
-.el-slider {
- width: 100px;
}
.tc {
@@ -1933,11 +2138,6 @@
align-items: center;
}
-.colorBar {
- width: 10px;
- height: 100%;
-}
-
.carId {
flex: 1;
}
@@ -1945,63 +2145,6 @@
.tc {
color: #909399;
font-size: 14px;
-}
-
-.type {
- padding: 0 5px 0 0;
- font-size: 1.2rem;
-}
-
-.t_size {
- font-size: 14px;
-}
-
-.icon_true {
- height: 8px;
- display: inline-block;
- width: 8px;
- background: #00a79d;
- margin-right: 7px;
- border-radius: 15px;
-}
-
-.icon_ty {
- height: 8px;
- display: inline-block;
- width: 8px;
- background: red;
- margin-right: 7px;
- border-radius: 15px;
-}
-
-.icon_gz {
- height: 8px;
- display: inline-block;
- width: 8px;
- background: yellow;
- margin-right: 7px;
- border-radius: 15px;
-}
-
-/* .el-col-offset-1 {
- margin-left: 0.5% !important;
-} */
-.marginLeft {
- margin-left: 15px;
-}
-
-.button_style {
- background: #00a79d;
- color: #ffff;
- border-color: #00a79d;
-}
-
-.rg {
- float: right;
-}
-
-.color {
- color: #909399;
}
</style>
@@ -2138,3 +2281,39 @@
}
</style>
+
+<!--<style>-->
+<!--input[type=range]:focus {-->
+<!-- display: none;-->
+<!--}-->
+
+<!--input[type=range] {-->
+<!-- -webkit-appearance: none;-->
+<!-- width: 500px;-->
+<!-- border-radius: 10px;-->
+<!-- /*杩欎釜灞炴�ц缃娇濉厖杩涘害鏉℃椂鐨勫浘褰负鍦嗚*/-->
+<!--}-->
+
+<!--input[type=range]::-webkit-slider-runnable-track {-->
+<!-- height: 20px;-->
+<!-- border-radius: 10px;-->
+<!-- /*灏嗚建閬撹涓哄渾瑙掔殑*/-->
+<!-- /* box-shadow: 0 1px 1px #def3f8, inset 0 .125em .125em #0d1112; */-->
+<!-- border: solid 1px red;-->
+<!--}-->
+
+<!--input[type=range]::-webkit-slider-thumb {-->
+<!-- -webkit-appearance: none;-->
+<!-- height: 30px;-->
+<!-- width: 120px;-->
+<!-- margin-top: -5px;-->
+<!-- /*浣挎粦鍧楄秴鍑鸿建閬撻儴鍒嗙殑鍋忕Щ閲忕浉绛�*/-->
+<!-- background: #ffffff;-->
+<!-- /* border-radius: 50%; */-->
+<!-- /*澶栬璁剧疆涓哄渾褰�*/-->
+<!-- border: solid 0.125em rgba(205, 224, 230, 0.5);-->
+<!-- /*璁剧疆杈规*/-->
+<!-- /* box-shadow: 0 .125em .125em #3b4547; */-->
+<!-- /*娣诲姞搴曢儴闃村奖*/-->
+<!--}-->
+<!--</style>-->
--
Gitblit v1.9.3