|
@@ -1,7 +1,7 @@
|
|
|
<template>
|
|
|
<div class="app-container">
|
|
|
<div class="search">
|
|
|
- <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 450px;" :picker-options="pickerOptions" @change="change_date"/>
|
|
|
+ <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" :picker-options="pickerOptions" @change="change_date"/>
|
|
|
<el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled" @click="handleBefore" />
|
|
|
<el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled" @click="handleNext" />
|
|
|
<el-select v-model="table.getdataListParm.parammaps.lpplantype" placeholder="计划类型" class="filter-item" style="width: 120px;" clearable>
|
|
@@ -39,6 +39,11 @@
|
|
|
<el-input-number :controls="false" :precision="2" v-model="slzq1" placeholder="撒料准确率" :min="0" :max="100" style="width: 120px;" class="filter-item" clearable />
|
|
|
<span>-</span>
|
|
|
<el-input-number :controls="false" :precision="2" v-model="slzq2" placeholder="撒料准确率" :min="0" :max="100" style="width: 120px;" class="filter-item" clearable />
|
|
|
+ </div>
|
|
|
+ <div style="display: inline-block;" class="filter-item1">
|
|
|
+ <el-input-number :controls="false" :precision="2" v-model="minproesstime" placeholder="过程时间" :min="0" :max="100" style="width: 120px;" class="filter-item" clearable />
|
|
|
+ <span>-</span>
|
|
|
+ <el-input-number :controls="false" :precision="2" v-model="maxproesstime" placeholder="过程时间" :min="0" :max="100" style="width: 120px;" class="filter-item" clearable />
|
|
|
</div>
|
|
|
<el-checkbox v-model="ccys"style="margin-right: 10px;" @change="changeccysChecked">只看超出预设值数据</el-checkbox>
|
|
|
<!-- 临时注释 -->
|
|
@@ -68,6 +73,7 @@
|
|
|
<el-table-column sortable label="计划类型" min-width="80px" align="center" prop="lpplantype" />
|
|
|
<el-table-column sortable label="描述" min-width="90px" align="center" prop="remark" />
|
|
|
<el-table-column sortable label="TMR名称" min-width="80px" align="center" prop="tmrtname" />
|
|
|
+ <el-table-column sortable label="过程时间" min-width="80px" align="center" prop="proesstime" />
|
|
|
</el-table>
|
|
|
</div>
|
|
|
<span v-if="table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ table.total }}条</span>
|
|
@@ -525,7 +531,9 @@ export default {
|
|
|
slwc1:undefined ,
|
|
|
slwc2:undefined ,
|
|
|
slzq1:undefined ,
|
|
|
- slzq2:undefined ,
|
|
|
+ slzq2:undefined ,
|
|
|
+ minproesstime:undefined ,
|
|
|
+ maxproesstime:undefined ,
|
|
|
ccys:false,
|
|
|
myheight:970,
|
|
|
title: '',
|
|
@@ -583,8 +591,8 @@ export default {
|
|
|
returntype: 'Map',
|
|
|
parammaps: {
|
|
|
pastureid: Cookies.get('pastureid'),
|
|
|
- startTime: parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}'),
|
|
|
- stopTime: parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}'),
|
|
|
+ startTime: parseTime(new Date(), '{y}-{m}-{d}'),
|
|
|
+ stopTime: parseTime(new Date(), '{y}-{m}-{d}'),
|
|
|
inputDatetime: [new Date(), new Date()],
|
|
|
iscompleted: '',
|
|
|
tmrtname: '',
|
|
@@ -699,8 +707,8 @@ export default {
|
|
|
},
|
|
|
|
|
|
getDownList() {
|
|
|
- this.downTMR.parammaps.startdate = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d} {h}:{i}:{s}')
|
|
|
- this.downTMR.parammaps.enddate = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d} {h}:{i}:{s}')
|
|
|
+ this.downTMR.parammaps.startdate = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
|
|
|
+ this.downTMR.parammaps.enddate = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
|
|
|
GetDataByName(this.downTMR).then(response => {
|
|
|
console.log(response.data.list)
|
|
|
this.TMRList = response.data.list
|
|
@@ -875,8 +883,8 @@ export default {
|
|
|
form_search() {
|
|
|
console.log('点击了查询')
|
|
|
if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
|
|
|
- this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d} {h}:{i}:{s}')
|
|
|
- this.table.getdataListParm.parammaps.stopTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d} {h}:{i}:{s}')
|
|
|
+ this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
|
|
|
+ this.table.getdataListParm.parammaps.stopTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
|
|
|
} else {
|
|
|
this.table.getdataListParm.parammaps.inputDatetime = ''
|
|
|
this.table.getdataListParm.parammaps.startTime = ''
|
|
@@ -891,6 +899,8 @@ export default {
|
|
|
this.table.getdataListParm.parammaps.slwc2 = this.slwc2
|
|
|
this.table.getdataListParm.parammaps.slzq1 = this.slzq1
|
|
|
this.table.getdataListParm.parammaps.slzq2 = this.slzq2
|
|
|
+ this.table.getdataListParm.parammaps.minproesstime = this.minproesstime
|
|
|
+ this.table.getdataListParm.parammaps.maxproesstime = this.maxproesstime
|
|
|
// if(this.ccys == true){
|
|
|
// if(this.table3.getdataListParm.name !== 'getprocessAnalysisHL'){
|
|
|
// this.hlwc1 = undefined
|
|
@@ -968,8 +978,8 @@ export default {
|
|
|
this.table.getdataListParm.parammaps.tmrtname = ''
|
|
|
this.table.getdataListParm.parammaps.iscompleted = ''
|
|
|
this.table.getdataListParm.parammaps.lpplantype = ''
|
|
|
- this.table.getdataListParm.parammaps.startTime = parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}')
|
|
|
- this.table.getdataListParm.parammaps.stopTime = parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}')
|
|
|
+ this.table.getdataListParm.parammaps.startTime = parseTime(new Date(), '{y}-{m}-{d}')
|
|
|
+ this.table.getdataListParm.parammaps.stopTime = parseTime(new Date(), '{y}-{m}-{d}')
|
|
|
this.table.getdataListParm.parammaps.inputDatetime = [new Date(), new Date()]
|
|
|
this.table.getdataListParm.offset = 1
|
|
|
this.getList()
|
|
@@ -989,8 +999,8 @@ export default {
|
|
|
this.table.getdataListParm.parammaps.inputDatetime.push(start, stop)
|
|
|
this.$forceUpdate()
|
|
|
}
|
|
|
- this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d} {h}:{i}:{s}')
|
|
|
- this.table.getdataListParm.parammaps.stopTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d} {h}:{i}:{s}')
|
|
|
+ this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
|
|
|
+ this.table.getdataListParm.parammaps.stopTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
|
|
|
this.getDownList()
|
|
|
this.getList()
|
|
|
},
|
|
@@ -1012,8 +1022,8 @@ export default {
|
|
|
this.table.getdataListParm.parammaps.inputDatetime.push(start2, stop2)
|
|
|
this.$forceUpdate()
|
|
|
}
|
|
|
- this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d} {h}:{i}:{s}')
|
|
|
- this.table.getdataListParm.parammaps.stopTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d} {h}:{i}:{s}')
|
|
|
+ this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
|
|
|
+ this.table.getdataListParm.parammaps.stopTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
|
|
|
this.getDownList()
|
|
|
this.getList()
|
|
|
},
|