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 +++++++++++++------------
src/lib/v-gantt-chart/lib/gantt.vue | 8
src/lib/v-gantt-chart/lib/components/time-line/index.vue | 141 +++++++++--------
src/lib/v-gantt-chart/lib/components/left-bar/index.vue | 39 ++--
src/components/DatePicker/index.vue | 18 +-
src/lib/v-gantt-chart/lib/gantt.scss | 9
6 files changed, 227 insertions(+), 195 deletions(-)
diff --git a/src/components/DatePicker/index.vue b/src/components/DatePicker/index.vue
index 716a199..a79d0a1 100644
--- a/src/components/DatePicker/index.vue
+++ b/src/components/DatePicker/index.vue
@@ -129,6 +129,7 @@
CapacityPlanningOnclickSelect,
CapacityPlanningSetupSearch
} from '@/api/scgl'
+import { handleDatetime } from '@/utils/global'
var time = null
export default {
@@ -401,13 +402,13 @@
this.getCapacityPlanningOnclickSelect(DATA)
this.getDblTime()
- // const indexV = this.value.indexOf(this.handleDatetime(date))
- // this.value.splice(indexV, 1)
- // for (const i in this.defArr) {
- // if (this.defArr[i].name === this.handleDatetime(date)) {
- // this.defArr.splice(i, 1)
- // }
- // }
+ // const indexV = this.value.indexOf(this.handleDatetime(date))
+ // this.value.splice(indexV, 1)
+ // for (const i in this.defArr) {
+ // if (this.defArr[i].name === this.handleDatetime(date)) {
+ // this.defArr.splice(i, 1)
+ // }
+ // }
}
}
this.$emit('input', this.value)
@@ -514,7 +515,8 @@
},
getCapacityPlanningCalendar() {
CapacityPlanningCalendar({ captplanid: this.rowData.CaptPlanId }).then((res) => {
- this.defArr = res.data
+ const currentDate = handleDatetime(new Date())
+ this.defArr = res.data.filter(i => i.name >= currentDate)
})
},
closeCapacityPlanningCalendar() {
diff --git a/src/lib/v-gantt-chart/lib/components/left-bar/index.vue b/src/lib/v-gantt-chart/lib/components/left-bar/index.vue
index 5662465..21809cd 100644
--- a/src/lib/v-gantt-chart/lib/components/left-bar/index.vue
+++ b/src/lib/v-gantt-chart/lib/components/left-bar/index.vue
@@ -1,37 +1,40 @@
<template>
- <div class="gantt-leftbar">
- <div class="gantt-leftbar-item "
- :style="{height:calTopSpace()+'px'}">
- </div>
- <div class="gantt-leftbar-item"
- :style="cellHeightStyle"
- v-for="(data,index) in showDatas"
- :key="dataKey?data[dataKey]:index">
+ <div class="gantt-leftbar" style="border-top: 1px solid #eee">
+ <div
+ class="gantt-leftbar-item "
+ :style="{height:calTopSpace()+'px'}"
+ />
+ <div
+ v-for="(data,index) in showDatas"
+ :key="dataKey?data[dataKey]:index"
+ class="gantt-leftbar-item"
+ :style="cellHeightStyle"
+ >
<slot :data="data">
<div class="gantt-leftbar-defalutItem">need slot</div>
</slot>
</div>
</div>
</template>
-
+
<script>
import dr from '../dynamic-render.js'
export default {
- name: "LeftBar",
- mixins:[dr],
- props:{
- dataKey:String,
+ name: 'LeftBar',
+ mixins: [dr],
+ props: {
+ dataKey: String,
datas: {
type: Array,
required: true
}
},
- computed:{
- cellHeightStyle(){
+ computed: {
+ cellHeightStyle() {
return {
- 'height':`${this.cellHeight}px`
+ 'height': `${this.cellHeight}px`
}
}
}
-};
-</script>
\ No newline at end of file
+}
+</script>
diff --git a/src/lib/v-gantt-chart/lib/components/time-line/index.vue b/src/lib/v-gantt-chart/lib/components/time-line/index.vue
index 1715e11..1c069e1 100644
--- a/src/lib/v-gantt-chart/lib/components/time-line/index.vue
+++ b/src/lib/v-gantt-chart/lib/components/time-line/index.vue
@@ -1,20 +1,32 @@
<template>
- <div class="gantt-timeline"
- :style="{'margin-left':-cellWidth/2+'px'}">
- <div class="gantt-timeline-block"
- v-for="(day,index) in getDays" :style="{width:getTimeScales(day).length*cellWidth+'px'}"
- :key="index">
- <div class="gantt-timeline-day "
- :style="heightStyle">
- {{day.format("YYYY-MM-DD")}}
- {{getDayMy(day.format("YYYY-MM-DD"))}}
- </div>
- <div class="gantt-timeline-scale "
- :style="heightStyle">
- <div :style="cellWidthStyle"
- v-for="(hour,index) in getTimeScales(day)"
- :key="index">
- {{hour}}
+ <div
+ class="gantt-timeline"
+ :style="{'margin-left':-cellWidth/2+'px'}"
+ >
+ <div
+ v-for="(day,index) in getDays"
+ :key="index"
+ class="gantt-timeline-block"
+ :style="{width:getTimeScales(day).length*cellWidth+'px'}"
+ >
+ <div
+ class="gantt-timeline-day "
+ :style="heightStyle"
+ >
+ {{ day.format("YYYY-MM-DD") }}
+ {{ getDayMy(day.format("YYYY-MM-DD")) }}
+ </div>
+ <div
+ class="gantt-timeline-scale"
+ :style="heightStyle"
+ style="border-right: 1px solid #eee"
+ >
+ <div
+ v-for="(hour,index) in getTimeScales(day)"
+ :key="index"
+ :style="cellWidthStyle"
+ >
+ {{ hour }}
<!-- <span v-if="hour !='01' ">{{hour}}</span> -->
</div>
</div>
@@ -23,19 +35,19 @@
</template>
<script>
-import dayjs from "dayjs";
-import { getBeginTimeOfTimeLine } from "../../utils/timeLineUtils.js";
+import dayjs from 'dayjs'
+import { getBeginTimeOfTimeLine } from '../../utils/timeLineUtils.js'
-const START_DAY = Symbol();
-const MIDDLE_DAY = Symbol();
-const END_DAY = Symbol();
+const START_DAY = Symbol()
+const MIDDLE_DAY = Symbol()
+const END_DAY = Symbol()
function isSameDay(one, two) {
- return one.isSame(two, "day");
+ return one.isSame(two, 'day')
}
export default {
- name: "Timeline",
+ name: 'Timeline',
props: {
start: {
@@ -61,33 +73,33 @@
* @returns {[dayjs]} 璇ata涓墍鏈夐渶瑕佹覆鏌撶殑鏁版嵁
*/
getDays() {
- let temp = [];
- let { start, end } = this;
+ const temp = []
+ let { start, end } = this
- for (; !isSameDay(start, end); start = start.add(1, "day")) {
- temp.push(start);
+ for (; !isSameDay(start, end); start = start.add(1, 'day')) {
+ temp.push(start)
}
- temp.push(start);
+ temp.push(start)
- return temp;
+ return temp
},
cellWidthStyle() {
return {
width: `${this.cellWidth}px`
- };
+ }
},
heightStyle() {
return {
- height: this.titleHeight + "px",
- "line-height": this.titleHeight + "px",
- };
+ height: this.titleHeight + 'px',
+ 'line-height': this.titleHeight + 'px'
+ }
}
},
methods: {
// 绠楀嚭鏄熸湡
- getDayMy(day){
- let weekArray = new Array("鏄熸湡鏃�", "鏄熸湡涓�", "鏄熸湡浜�", "鏄熸湡涓�", "鏄熸湡鍥�", "鏄熸湡浜�", "鏄熸湡鍏�");
+ getDayMy(day) {
+ const weekArray = new Array('鏄熸湡鏃�', '鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�')
return weekArray[new Date(day).getDay()]
},
/**
@@ -97,13 +109,13 @@
* @returns {[string]} 璇ata涓墍鏈夐渶瑕佹覆鏌撶殑鏁版嵁
*/
getTimeScales(date) {
- let { start, end } = this;
+ const { start, end } = this
if (isSameDay(date, start)) {
- return this.generateTimeScale(START_DAY);
+ return this.generateTimeScale(START_DAY)
} else if (isSameDay(date, end)) {
- return this.generateTimeScale(END_DAY);
+ return this.generateTimeScale(END_DAY)
} else {
- return this.generateTimeScale(MIDDLE_DAY);
+ return this.generateTimeScale(MIDDLE_DAY)
}
},
/**
@@ -113,49 +125,50 @@
* @returns {[string]} 璇ata涓墍鏈夐渶瑕佹覆鏌撶殑鏁版嵁
*/
generateTimeScale(type) {
- let totalblock = [];
- let { start, end, scale } = this;
- let a, b;
+ const totalblock = []
+ const { start, end, scale } = this
+ let a, b
switch (type) {
- case START_DAY: //鍜宻tart鍚屼竴澶�
- a = getBeginTimeOfTimeLine(start, scale);
- //start鍜宔nd鍚屼竴澶╃壒娈婂鐞�
+ case START_DAY: // 鍜宻tart鍚屼竴澶�
+ a = getBeginTimeOfTimeLine(start, scale)
+ // start鍜宔nd鍚屼竴澶╃壒娈婂鐞�
if (isSameDay(start, end)) {
- b = end;
+ b = end
} else {
- b = start.endOf("day");
+ b = start.endOf('day')
}
- break;
- case END_DAY: //鍜宔nd 鍚屼竴澶�
- a = end.startOf("day");
- b = end;
- break;
- case MIDDLE_DAY: //start鍜宔nd涓棿鐨勫ぉ
- a = start.startOf("day");
- b = start.endOf("day");
- break;
+ break
+ case END_DAY: // 鍜宔nd 鍚屼竴澶�
+ a = end.startOf('day')
+ b = end
+ break
+ case MIDDLE_DAY: // start鍜宔nd涓棿鐨勫ぉ
+ a = start.startOf('day')
+ b = start.endOf('day')
+ break
default:
- throw new TypeError("閿欒鐨勮绠楃被鍨�");
+ throw new TypeError('閿欒鐨勮绠楃被鍨�')
}
while (!a.isAfter(b)) {
if (scale >= 60) {
- totalblock.push(a.format("HH"));
+ totalblock.push(a.format('HH'))
} else {
- totalblock.push(a.format("HH:mm"));
+ totalblock.push(a.format('HH:mm'))
}
- a = a.add(scale, "minute");
+ a = a.add(scale, 'minute')
}
- return totalblock;
+ return totalblock
}
- },
-};
+ }
+}
</script>
<style lang="scss" scoped>
.gantt-timeline-day{
border-right: 1px solid #ebeef5;
border-bottom: 1px solid #ebeef5;
- background: rgb(245, 245, 245);
+ //background: rgb(245, 245, 245);
+ background: #fff;
color: #909399;
font-size: 14px;
}
diff --git a/src/lib/v-gantt-chart/lib/gantt.scss b/src/lib/v-gantt-chart/lib/gantt.scss
index 6c06552..1723feb 100644
--- a/src/lib/v-gantt-chart/lib/gantt.scss
+++ b/src/lib/v-gantt-chart/lib/gantt.scss
@@ -28,6 +28,9 @@
color: #777;
font-weight: bold;
text-align: center;
+
+ border-right: 1px solid #eee;
+ border-bottom: 1px solid #eee;
}
&-timeline {
@@ -147,6 +150,7 @@
}
&-scroll-y {
+ display: none;
overflow-y: scroll;
position: absolute;
z-index: 1000;
@@ -170,7 +174,8 @@
height: 17px;
&>div {
- height: 17px;
+ //height: 17px;
+ height: 8px;
}
}
-}
\ No newline at end of file
+}
diff --git a/src/lib/v-gantt-chart/lib/gantt.vue b/src/lib/v-gantt-chart/lib/gantt.vue
index 7334293..850cdf4 100644
--- a/src/lib/v-gantt-chart/lib/gantt.vue
+++ b/src/lib/v-gantt-chart/lib/gantt.vue
@@ -77,15 +77,15 @@
:startTimeOfRenderArea="startTimeOfRenderArea"
:endTimeOfRenderArea="endTimeOfRenderArea"
:style="{width:totalWidth+'px'}">
-
- <!-- <template slot-scope="{data,item}">
+
+ <!-- <template slot-scope="{data,item}">
<slot name="block"
:data="data"
:item="item">
</slot>
</template> -->
- <template
+ <template
slot-scope="{data,item,getPositonOffset,getWidthAbout2Times,isInRenderingTimeRange}">
<slot name="block"
:data="data"
@@ -96,7 +96,7 @@
:startTimeOfRenderArea="startTimeOfRenderArea"
:endTimeOfRenderArea="endTimeOfRenderArea"></slot>
</template>
-
+
</blocks>
</div>
</div>
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