From c4b49d08cef0805e17646eef03e1c1a62316c3b2 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 05 十一月 2022 10:41:52 +0800
Subject: [PATCH] 1.产能规划优化
---
src/views/scgl/zdpc.vue | 207 +++++++++++++++++++++++++++------------------------
1 files changed, 108 insertions(+), 99 deletions(-)
diff --git a/src/views/scgl/zdpc.vue b/src/views/scgl/zdpc.vue
index e4ad8b3..2520e2c 100644
--- a/src/views/scgl/zdpc.vue
+++ b/src/views/scgl/zdpc.vue
@@ -139,68 +139,58 @@
<!-- 鑷姩鎺掔▼閮ㄥ垎鐨勪唬鐮�-->
<div class="autoScheduling">
- <el-tabs>
- <el-row>
- <el-col :span="7" :offset="1">
- <span class="t_size" style="margin-left:7px">鎺掔▼鏃ユ湡</span>
- <el-date-picker
- v-model="value1"
- type="daterange"
- range-separator="~"
- format="yyyy-MM-dd"
- value-format="yyyy-MM-dd"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- size="small"
- :picker-options="pickerOptions1"
- @change="change_time"
- />
- </el-col>
- <el-col :span="3">
- <span class="t_size">鎺掔▼鏂瑰紡</span>
- <el-select v-model="types" size="small" style="width:120px" @change="changeTypes">
- <el-option value="N" label="璁惧浼樺厛" />
- <el-option value="Y" label="鏃堕棿浼樺厛" />
- </el-select>
- </el-col>
+ <div class="bodyTopFormGroup">
+ <el-form
+ ref="form"
+ :model="formBottom"
+ inline
+ style="display: flex;justify-content: space-between"
+ >
+ <div class="elForm">
+ <el-form-item label-width="70px" label="鎺掔▼鏃ユ湡" style=" display: flex;">
+ <el-date-picker
+ v-model="formBottom.value1"
+ type="daterange"
+ range-separator="~"
+ format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ size="small"
+ :picker-options="pickerOptions1"
+ @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-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-option v-for="item in scaleList" :key="item" :value="item" :label="item" />
+ </el-select>
- <el-col :span="3" :offset="1">
- <div style="height:32px;">
- <span class="t_size">鏃堕棿鍒诲害</span>
- <select id="scale" v-model.number="scale">
- <option v-for="i in scaleList" :key="i">{{ i }}</option>
- </select>
- <span class="t_size">鍒嗛挓</span>
- </div>
- </el-col>
-
- <el-col :span="3">
- <div style="height:32px;">
- <span class="t_size">鎹㈠瀷鏃堕棿</span>
+ </el-form-item>
+ <el-form-item label="鎹㈠瀷鏃堕棿锛堝垎閽燂級" style=" display: flex;">
<el-input
id="scale"
- v-model="times"
+ v-model="formBottom.times"
type="number"
- size="mini"
style="display:inline-block;width:80px;"
@change="no_zero"
/>
- <span class="t_size">鍒嗛挓</span>
- </div>
- </el-col>
-
- <el-col :span="3">
- <div style="height:32px;line-height: 28px;">
- <span class="t_size">棰勬帓杩涘害</span>
+ </el-form-item>
+ <el-form-item label="棰勬帓杩涘害" style=" display: flex;">
<span>
- <span style="text-decoration:underline;">{{ real_num }}</span> /
- <span style="text-decoration:underline">{{ meter }}</span>
+ <span style="text-decoration:underline;">{{ formBottom.real_num }}</span> /
+ <span style="text-decoration:underline">{{ formBottom.meter }}</span>
</span>
- </div>
- </el-col>
-
- <el-col :span="3" style="display: flex">
+ </el-form-item>
+ </div>
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
<el-button
type="primary"
icon="el-icon-document-remove"
@@ -213,11 +203,13 @@
@click="click_yes"
>鎻愪氦
</el-button>
-
- </el-col>
- </el-row>
- <el-row />
- </el-tabs>
+ </div>
+ </el-form>
+ <div
+ class="bodyTopFormExpand"
+ style="height: 5px"
+ />
+ </div>
<div class="container" style="margin: 10px;">
<v-gantt-chart
@@ -227,7 +219,7 @@
:cell-height="cellHeight"
:time-lines="timeLines"
:title-height="titleHeight"
- :scale="scale"
+ :scale="formBottom.scale"
:title-width="titleWidth"
show-current-time
:hide-header="hideHeader"
@@ -321,7 +313,7 @@
return time.getTime() <= Date.now() - 24 * 60 * 60 * 1000
}
},
- real_num: 0,
+
keep_data: [],
all_status: true,
look_data: [],
@@ -353,9 +345,16 @@
click_one: 0,
datasC: [],
radio: '',
- // value1: ['2022-11-04', '2022-11-09'],
- value1: '',
- types: 'N',
+
+ formBottom: {
+ value1: ['2022-11-05', '2022-11-12'], // 鎺掔▼鏃ユ湡
+ types: 'N', // 鎺掔▼鏂瑰紡
+ scale: 60, // 鏃堕棿鍒诲害
+ times: 0, // 鎹㈠瀷鏃堕棿
+ real_num: 0, // 棰勬帓杩涘害
+ meter: 0// 鑺傛媿
+ },
+
no: false,
total: 0,
mn_data: [],
@@ -392,12 +391,12 @@
cellHeight: 30,
titleHeight: 40,
titleWidth: 250,
- scale: 60,
+
datasNum: 100,
datasA: [],
// datasB: mockDatas(100),
dataKey: 'id',
- times: 0,
+
timeList: timeList,
scaleList: scaleList,
scrollToTime: dayjs()
@@ -409,7 +408,7 @@
scrollToY: 0,
positionB: {},
positionA: {},
- meter: 0, // 鑺傛媿
+
title_list: [],
imp_id: '',
submit_flag: false,
@@ -559,8 +558,8 @@
window.addEventListener('resize', this.getHeight)
this.getHeight()
- // this.change_time()
- // this.click_schedule()
+ this.change_time()
+ this.click_schedule()
},
methods: {
async getAdvancedSchedulingSearch() {
@@ -628,8 +627,8 @@
})
},
no_zero() {
- if (this.times < 0) {
- this.times = 0
+ if (this.formBottom.times < 0) {
+ this.formBottom.times = 0
}
},
sortChange(column, prop, order) {
@@ -662,10 +661,10 @@
this.OnclickAdvancedSchedulingDevice()
},
change_time() {
- this.time_data[0] = this.value1[0] + ' 00:00'
- this.time_data[1] = this.value1[1] + ' 23:59'
- this.forms.StartTime = this.value1[0]
- this.forms.EndTime = this.value1[1]
+ 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()
},
click_box(val) {
@@ -714,7 +713,7 @@
}
this.bm_data[i].gtArray = arr
}
- this.real_num = 0
+ this.formBottom.real_num = 0
},
look(data) {
this.showDialog = true
@@ -776,7 +775,7 @@
const list = []
this.time_all = res
const cont = res.Cont
- this.real_num = 0
+ this.formBottom.real_num = 0
for (const i in this.time_all.rows[0].children) {
const obj = {
id: '',
@@ -1009,7 +1008,7 @@
// 鎹㈠瀷鏃堕棿
MinutesTest(time) {
var sdate1 = new Date(time)
- sdate1.setMinutes(sdate1.getMinutes() + this.times * 1)
+ sdate1.setMinutes(sdate1.getMinutes() + this.formBottom.times * 1)
var now =
sdate1.getFullYear() +
'-' +
@@ -1061,17 +1060,17 @@
},
getCurrentRow(row) {
// this.show =true
- this.meter = row.AdvaScheQty * 1 - row.AdvaScheYPQty * 1 // 鍙互鍋氫釜鏁�
- this.value1 = []
+ 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.value1.push(this.getNowFormatDate())
- this.value1.push(row.AdvaScheEndDate)
- if (this.value1 != '') {
- this.time_data[0] = this.value1[0] + ' 00:00'
- this.time_data[1] = this.value1[1] + ' 23:59'
+ 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.forms.WorkCode = row.AdvaScheWorkCode
this.forms.WorkShop = row.AdvaScheWorkShopid
@@ -1154,8 +1153,8 @@
type: 'success'
})
}
- this.meter = 0
- this.real_num = 0
+ this.formBottom.meter = 0
+ this.formBottom.real_num = 0
this.OnclickAdvancedSchedulingDevice()
this.AdvancedSchedulingSearch()
})
@@ -1165,7 +1164,7 @@
// 鏃堕棿/璁惧浼樺厛鎺掔▼
click_schedule() {
const timestamp = new Date().toLocaleDateString()
- if (new Date(this.value1[0]) < new Date(timestamp)) {
+ if (new Date(this.formBottom.value1[0]) < new Date(timestamp)) {
this.$message({
showClose: true,
type: 'error',
@@ -1176,10 +1175,10 @@
this.nitialize()
// 璁惧浼樺厛
- if (this.bm_data != '' && this.types == 'N') {
+ if (this.bm_data != '' && this.formBottom.types == 'N') {
this.fun_time()
this.change_num(this.bm_data)
- } else if (this.facility_data != '' && this.types == 'Y') {
+ } else if (this.facility_data != '' && this.formBottom.types == 'Y') {
this.time_nitalize()
this.fun_facility()
this.dataTransition()
@@ -1209,7 +1208,7 @@
// 缁欐帓绋嬫渶鍚庝竴涓慨鏀规暟閲�
change_num(arr) {
- this.real_num = 0 // 鐪熷疄宸叉帓鏁伴噺
+ this.formBottom.real_num = 0 // 鐪熷疄宸叉帓鏁伴噺
let num = 0 // 鍙栨暣宸叉帓鏁伴噺
const arr_num = [] // 宸叉帓鏁版嵁
let mend_num = 0
@@ -1223,19 +1222,19 @@
}
for (const n in arr_num) {
- this.real_num += arr_num[n].real_number
+ this.formBottom.real_num += arr_num[n].real_number
num += arr_num[n].number * 1
}
- this.real_num = Math.ceil(this.real_num)
- const y10 = this.meter - this.real_num
+ this.formBottom.real_num = Math.ceil(this.formBottom.real_num)
+ const y10 = this.formBottom.meter - this.formBottom.real_num
if (y10 <= 10) {
- this.real_num = this.meter
- mend_num = this.meter - num
+ this.formBottom.real_num = this.formBottom.meter
+ mend_num = this.formBottom.meter - num
} else {
}
- if (this.real_num * 1 == this.meter * 1) {
- // mend_num = this.meter - num
+ if (this.formBottom.real_num * 1 == this.formBottom.meter * 1) {
+ // mend_num = this.formBottom.meter - num
} else {
this.submit_flag = true
}
@@ -1252,7 +1251,7 @@
}
},
fun_time() {
- let all_num = this.meter
+ let all_num = this.formBottom.meter
const all_time = []
let flag1 = 0
const mod = this.bm_data[0].mod
@@ -1393,7 +1392,7 @@
}
this.facility_data[i].gtArray = newArr
}
- let all_num = this.meter
+ let all_num = this.formBottom.meter
const all_time = []
const flag1 = 0
// let nowTime = this.facility_data[0].AdvaDevicRhythm*all_num //鏁伴噺OK
@@ -1865,13 +1864,15 @@
top: 40px;
left: 0;
}
+
/*鑷姩鎺掔▼閮ㄥ垎*/
.autoScheduling {
display: flex;
flex-direction: column;
/*padding: 0 10px;*/
/* height: calc(100vh - 100px); */
- background-color:#f8f8fa ;
+ /*background-color: #f8f8fa;*/
+ background-color: #fff;
margin-top: 20px;
/*height: 390px;*/
}
@@ -2120,7 +2121,15 @@
::v-deep .el-table__fixed {
height: 100% !important;
}
+
}
+
+::v-deep .gantt-header-title{
+ background-color: #fff;
+ //border-left: 1px solid #eee !important;
+ //border-bottom: 1px solid #eee !important;
+}
+
</style>
<style>
--
Gitblit v1.9.3