Skip to content

N
NLT-e-cigarette
Commit 42e8dc97 authored by 杨硕's avatar 杨硕
Browse files
Options

取消产出统计需要时间的校验

parent c7104966
Hide whitespace changes
Inline Side-by-side
Showing with 578 additions and 88 deletions
src/views/productionStatis/produceStatistics.vue
View file @ 42e8dc97
<template> <template>
<div v-loading="echartsLoading" class="RepairStatistics_module"> <div v-loading="echartsLoading" class="RepairStatistics_module">
<div class="search"> <div class="search">
<el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true" label-width="auto"> <el-form ref="queryForm" :rules="queryRules" style="padding: 0 0 0 10px" :model="queryParams" :inline="true" label-width="auto">
<el-form-item label="计划开工时间"> <div>
<div slot="label" class="labelClass"> <el-form-item label="统计维度" prop="" style="">
<div>开始时间</div> <div slot="label" style="padding-top: 8px">
<div>Start time</div> <div>统计维度</div>
</div> </div>
<el-date-picker <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small" @change="changeChoseType">
v-model="queryParams.startDate" <!-- <el-option :value="btnList[0].dictValue " label="日报" /> -->
:picker-options="choseType === 'day' ? start_date :choseType === 'week' ? week_date : choseType === 'month' ? month_date : start_date " <!-- <el-option :value="'' " label=" " /> -->
type="datetime" <el-option
placeholder="选择日期" v-for="(dict,index) in btnList"
popper-class="date_picker" :key="index"
:editable="false" :label="dict.dictLabel"
:clearable="false" :value="dict.dictValue"
format="yyyy-MM-dd HH:mm:ss" />
value-format="yyyy-MM-dd HH:mm:ss" </el-select>
style="width: 220px" </el-form-item>
:default-time="'07:00:00'" <el-form-item class="flotr">
@change="changeTime" <el-button
/> class="redBtn"
<span>-</span> type="danger"
<el-date-picker size="small"
v-model="queryParams.endDate" @click="handleQuery('queryForm')"
:picker-options="choseType === 'day' ? end_date :choseType === 'week' ? week_end :choseType === 'month' ? month_end : end_date" >查询 Query</el-button>
type="datetime" <el-button class="resetBtn" size="small" @click="resetQuery">重置 Reset</el-button>
popper-class="date_picker" </el-form-item>
placeholder="选择日期" </div>
:editable="false" <div>
:clearable="false"
format="yyyy-MM-dd HH:mm:ss" <el-form-item label="报修时间" required>
value-format="yyyy-MM-dd HH:mm:ss" <div slot="label" class="labelClass;text-alleft" style="position: relative;top: -16px;left: -12px">
style="width: 220px" <div>需要时间</div>
:default-time="'07:00:00'" <div>Need Time</div>
@change="changeTime" </div>
/> <el-form-item prop="startDate">
</el-form-item> <el-date-picker
v-model="queryParams.startDate"
type="datetime"
placeholder="选择日期"
:editable="false"
:clearable="false"
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
popper-class="date_picker"
style="width: 220px"
:default-time="'00:00:00'"
@change="changeTime"
/>
</el-form-item>
<span>-</span>
<el-form-item prop="endDate">
<el-date-picker
v-model="queryParams.endDate"
type="datetime"
placeholder="选择日期"
:editable="false"
:clearable="false"
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
popper-class="date_picker"
style="width: 220px"
:default-time="'23:59:59'"
@change="changeTime"
/>
</el-form-item>
<!-- <el-input
placeholder="请输入主机追溯号"
size="small"
/> -->
</el-form-item>
</div>
<div>
<el-row type="">
<el-row type="flex" justify="space-around">
<el-col :span="8">
<el-form-item label="" prop="" style="display:flex;">
<div slot="label" class="labelClass;text-alleft" style="width: 100px;text-align: right;">
<div>项目</div>
<div>Family Desc</div>
</div>
<el-select
v-model="queryParams.xmCode"
clearable
multiple
filterable
collapse-tags
style=""
placeholder="请选择项目"
size="small"
class="lmtags"
>
<!-- <el-option :value=" '' " label="日报" /> -->
<el-option
v-for="(dict,index) in familyOptions"
:key="index"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="" prop="" style="display:flex;">
<div slot="label" class="labelClass" style="width: 70px;text-align: right;">
<div>线体</div>
<div>Line No.</div>
</div>
<el-select
v-model="queryParams.xtCode"
placeholder="请选择线体"
clearable
multiple
collapse-tags
filterable
size="small"
class="lmtags"
>
<!-- <el-option :value=" '' " label="全部" /> -->
<el-option
v-for="(dict,index) in lineOptions"
:key="index"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="" prop="" style="display:flex;">
<div slot="label" class="labelClass" style="width: 70px;text-align: right;">
<div>班次</div>
<div>Shift</div>
</div>
<el-select
v-model="queryParams.bcCode"
clearable
multiple
filterable
collapse-tags
style=""
placeholder="请选择班次"
size="small"
class="lmtags"
>
<!-- <el-option :value=" '' " label="日报" /> -->
<el-option
v-for="(dict,index) in shiftOptions"
:key="index"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-row>
<el-row type="flex">
<el-col :span="8">
<el-form-item label="" prop="" style="display:flex;">
<div slot="label" class="labelClass" style="width: 100px;text-align: right;">
<div>装配工单</div>
<div>Device Order</div>
</div>
<el-select
v-model="queryParams.zpgdCode"
clearable
multiple
filterable
collapse-tags
style=""
placeholder="请选择装配工单"
size="small"
class="lmtags"
>
<!-- <el-option :value=" '' " label="日报" /> -->
<el-option
v-for="(dict,index) in workingOrderOptions"
:key="index"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="" prop="" style="display:flex;">
<div slot="label" class="labelClass" style="width: 100px;text-align: right;">
<div>装配追溯号</div>
<div>Beach Line No.</div>
</div>
<el-select
v-model="queryParams.lineBatchCode"
clearable
multiple
filterable
collapse-tags
style=""
placeholder="请选择追溯号"
size="small"
class="lmtags"
>
<!-- <el-option :value=" '' " label="日报" /> -->
<el-option
v-for="(dict,index) in lineBatchFilterOptions"
:key="index"
:label="dict"
:value="dict"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="" prop="" style="display:flex;">
<div slot="label" class="labelClass" style="width: 70px;text-align: right;">
<div>成品料号</div>
<div>Part No.</div>
</div>
<el-select
v-model="queryParams.partNumCode"
clearable
multiple
filterable
collapse-tags
style=""
placeholder="请选择成品料号"
size="small"
class="lmtags"
>
<!-- <el-option :value=" '' " label="日报" /> -->
<el-option
v-for="(dict,index) in partNumOptions"
:key="index"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
</div>
</el-form> </el-form>
</div> </div>
<el-divider /> <el-divider />
<div class="search_btn"> <div class="search_btn">
<el-button <!-- <el-button
v-for="(item,index) in btnList" v-for="(item,index) in btnList"
:key="index" :key="index"
class="setupBtn" class="setupBtn"
...@@ -51,7 +257,7 @@ ...@@ -51,7 +257,7 @@
<div>{{ item.dictLabel }}</div> <div>{{ item.dictLabel }}</div>
<div>{{ item.dictLabelEnglish }}</div> <div>{{ item.dictLabelEnglish }}</div>
<img v-if="choseType === item.dictValue" :src="logo" class="chose-icon"> <img v-if="choseType === item.dictValue" :src="logo" class="chose-icon">
</el-button> </el-button> -->
</div> </div>
<div class="homePageIndex-body"> <div class="homePageIndex-body">
<el-card class="box-card"> <el-card class="box-card">
...@@ -176,8 +382,12 @@ ...@@ -176,8 +382,12 @@
<script> <script>
import moment from 'moment' import moment from 'moment'
import * as echarts from 'echarts' import * as echarts from 'echarts'
import { getProDetails, produceStatisicsExport } from './apis' import { getProDetails, produceStatisicsExport, getProDetailsJson } from './apis'
import request from '@/utils/request'
import { forEach } from 'element-resize-detector/src/collection-utils'
import { getDicts } from '@/api/system/dict/data'
import { listData, getData, delData, addData, updateData, exportData, checkDictLabelUnique } from '@/api/system/dict/data'
import { listOrder } from '@/api/workOrder'
export default { export default {
name: 'ProduceStatistics', name: 'ProduceStatistics',
data() { data() {
...@@ -186,8 +396,24 @@ export default { ...@@ -186,8 +396,24 @@ export default {
start_date: { start_date: {
disabledDate: time => { disabledDate: time => {
if (this.queryParams.endDate) { if (this.queryParams.endDate) {
return time.getTime() > new Date(this.queryParams.endDate).getTime() || // return time.getTime() > new Date(this.queryParams.endDate).getTime() ||
time.getTime() < new Date(moment(new Date().getTime() - 3600 * 1000 * 24 * 19).format('YYYY-MM-DD')).getTime() // time.getTime() < new Date(moment(new Date(this.queryParams.endDate).getTime() - 3600 * 1000 * 24 * 20).format('YYYY-MM-DD')).getTime()
return time.getTime() > new Date(moment(new Date(this.queryParams.endDate).getTime()).format('YYYY-MM-DD')).getTime() ||
time.getTime() < new Date(moment(new Date(this.queryParams.endDate).getTime() - 3600 * 1000 * 24 * 20).format('YYYY-MM-DD')).getTime()
}
}
},
start_date1: {
disabledDate: time => {
if (this.queryParams.endDate) {
return time.getTime() >= new Date(moment(new Date(this.queryParams.endDate).getTime()).format('YYYY-MM-DD')).getTime()
}
}
},
end_date1: {
disabledDate: time => {
if (this.queryParams.startDate) {
return time.getTime() < new Date(moment(new Date(this.queryParams.startDate).getTime() - 1000 * 60 * 60 * 24).format('YYYY-MM-DD')).getTime()
} }
} }
}, },
...@@ -195,8 +421,10 @@ export default { ...@@ -195,8 +421,10 @@ export default {
week_date: { week_date: {
disabledDate: time => { disabledDate: time => {
if (this.queryParams.endDate) { if (this.queryParams.endDate) {
return time.getTime() > new Date(this.queryParams.endDate).getTime() || // return time.getTime() > new Date(this.queryParams.endDate).getTime() ||
time.getTime() < new Date(moment(new Date().getTime() - 3600 * 1000 * 24 * 7 * 20).format('YYYY-MM-DD')).getTime() // time.getTime() < new Date(moment(new Date(this.queryParams.endDate).getTime() - 3600 * 1000 * 24 * 7 * 20).format('YYYY-MM-DD')).getTime()
return time.getTime() > new Date(moment(new Date(this.queryParams.endDate).getTime()).format('YYYY-MM-DD')).getTime() ||
time.getTime() < new Date(moment(new Date(this.queryParams.endDate).getTime() - 3600 * 1000 * 24 * 20).format('YYYY-MM-DD')).getTime()
} }
} }
}, },
...@@ -204,8 +432,10 @@ export default { ...@@ -204,8 +432,10 @@ export default {
month_date: { month_date: {
disabledDate: time => { disabledDate: time => {
if (this.queryParams.endDate) { if (this.queryParams.endDate) {
return time.getTime() > new Date(this.queryParams.endDate).getTime() || // return time.getTime() > new Date(this.queryParams.endDate).getTime() ||
time.getTime() < new Date(moment(new Date().getTime() - 3600 * 1000 * 24 * 30 * 20).format('YYYY-MM-DD')).getTime() // time.getTime() < new Date(moment(new Date(this.queryParams.endDate).getTime() - 3600 * 1000 * 24 * 30 * 20).format('YYYY-MM-DD')).getTime()
return time.getTime() > new Date(moment(new Date(this.queryParams.endDate).getTime()).format('YYYY-MM-DD')).getTime() ||
time.getTime() < new Date(moment(new Date(this.queryParams.endDate).getTime() - 3600 * 1000 * 24 * 20).format('YYYY-MM-DD')).getTime()
} }
} }
}, },
...@@ -213,32 +443,49 @@ export default { ...@@ -213,32 +443,49 @@ export default {
end_date: { end_date: {
disabledDate: time => { disabledDate: time => {
if (this.queryParams.startDate) { if (this.queryParams.startDate) {
return time.getTime() >= new Date(moment(new Date().getTime() + 3600 * 1000 * 24).format('YYYY-MM-DD')).getTime() || // return time.getTime() >= new Date(moment(new Date().getTime() + 3600 * 1000 * 24).format('YYYY-MM-DD')).getTime() ||
time.getTime() < new Date(moment(new Date().getTime() - 3600 * 1000 * 24 * 20).format('YYYY-MM-DD')).getTime() || // time.getTime() >= new Date(moment(new Date(this.queryParams.startDate).getTime() + 3600 * 1000 * 24 * 20).format('YYYY-MM-DD')).getTime() ||
time.getTime() < new Date(moment(new Date(this.queryParams.startDate).getTime()).format('YYYY-MM-DD')).getTime() // time.getTime() < new Date(moment(new Date(this.queryParams.startDate).getTime()).format('YYYY-MM-DD')).getTime()
return time.getTime() >= new Date(moment(new Date(this.queryParams.startDate).getTime() + 3600 * 1000 * 24 * 19).format('YYYY-MM-DD')).getTime() ||
time.getTime() < new Date(moment(new Date(this.queryParams.startDate).getTime() - 1000 * 60 * 60 * 24).format('YYYY-MM-DD')).getTime()
} }
} }
}, },
// 选周报时结束时间范围（20周内） // 选周报时结束时间范围（20周内）
week_end: { week_end: {
disabledDate: time => { disabledDate: time => {
return time.getTime() >= new Date(moment(new Date().getTime() + 3600 * 1000 * 24).format('YYYY-MM-DD')).getTime() || // return time.getTime() >= new Date(moment(new Date().getTime() + 3600 * 1000 * 24).format('YYYY-MM-DD')).getTime() ||
time.getTime() < new Date(moment(new Date().getTime() - 3600 * 1000 * 24 * 7 * 20).format('YYYY-MM-DD')).getTime() || // time.getTime() >= new Date(moment(new Date(this.queryParams.startDate).getTime() + 3600 * 1000 * 24 * 7 * 20).format('YYYY-MM-DD')).getTime() ||
time.getTime() < new Date(moment(new Date(this.queryParams.startDate).getTime()).format('YYYY-MM-DD')).getTime() // time.getTime() < new Date(moment(new Date(this.queryParams.startDate).getTime()).format('YYYY-MM-DD')).getTime()
return time.getTime() >= new Date(moment(new Date(this.queryParams.startDate).getTime() + 3600 * 1000 * 24 * 19 * 7).format('YYYY-MM-DD')).getTime() ||
time.getTime() < new Date(moment(new Date(this.queryParams.startDate).getTime() - 1000 * 60 * 60 * 24).format('YYYY-MM-DD')).getTime()
} }
}, },
// 选月报时结束时间范围（20月内） // 选月报时结束时间范围（20月内）
month_end: { month_end: {
disabledDate: time => { disabledDate: time => {
return time.getTime() >= new Date(moment(new Date().getTime() + 3600 * 1000 * 24).format('YYYY-MM-DD')).getTime() || // return time.getTime() >= new Date(moment(new Date().getTime() + 3600 * 1000 * 24).format('YYYY-MM-DD')).getTime() ||
time.getTime() < new Date(moment(new Date().getTime() - 3600 * 1000 * 24 * 30 * 20).format('YYYY-MM-DD')).getTime() || // time.getTime() >= new Date(moment(new Date(this.queryParams.startDate).getTime() + 3600 * 1000 * 24 * 30 * 20).format('YYYY-MM-DD')).getTime() ||
time.getTime() < new Date(moment(new Date(this.queryParams.startDate).getTime()).format('YYYY-MM-DD')).getTime() // time.getTime() < new Date(moment(new Date(this.queryParams.startDate).getTime()).format('YYYY-MM-DD')).getTime()
return time.getTime() >= new Date(moment(new Date(this.queryParams.startDate).getTime() + 3600 * 1000 * 24 * 19).format('YYYY-MM-DD')).getTime() ||
time.getTime() < new Date(moment(new Date(this.queryParams.startDate).getTime() - 1000 * 60 * 60 * 24).format('YYYY-MM-DD')).getTime()
} }
}, },
// 搜索框数据 // 搜索框数据
queryParams: { queryParams: {
startDate: moment(new Date().setTime(new Date().getTime() - 3600 * 1000 * 24 * 18)).format('YYYY-MM-DD') + ' 07:00:00', // startDate: moment(new Date().setTime(new Date().getTime() - 3600 * 1000 * 24 * 18)).format('YYYY-MM-DD') + ' 07:00:00',
endDate: moment(new Date().getTime() + 3600 * 1000 * 24).format('YYYY-MM-DD') + ' 07:00:00' // endDate: moment(new Date().getTime() + 3600 * 1000 * 24).format('YYYY-MM-DD') + ' 07:00:00'
// startDate: moment(new Date().setTime(new Date().getTime() - 3600 * 1000 * 24 * 18)).format('YYYY-MM-DD') + ' 00:00:00',
// endDate: moment(new Date().getTime() + 3600 * 1000 * 24).format('YYYY-MM-DD') + ' 23:59:59',
startDate: '',
endDate: '',
xtCode: [], // 线体号
xmCode: [], // 项目
bcCode: [], // 班次
zpgdCode: [], // 装配工单
lineBatchCode: [], // 追溯号
partNumCode: [] // 成品料号
}, },
HistoricalInvestigation: [], HistoricalInvestigation: [],
logo: require('@/assets/image/btnChose.png'), logo: require('@/assets/image/btnChose.png'),
...@@ -257,13 +504,37 @@ export default { ...@@ -257,13 +504,37 @@ export default {
// { dictLabel: '按PO号统计', dictValue: 'Po Number' }, // { dictLabel: '按PO号统计', dictValue: 'Po Number' },
{ dictLabel: '按项目统计', dictLabelEnglish: 'PO No.', dictValue: 'Project' }, { dictLabel: '按项目统计', dictLabelEnglish: 'PO No.', dictValue: 'Project' },
{ dictLabel: '按成品料号统计', dictLabelEnglish: 'Part Number', dictValue: 'PartNumber' } { dictLabel: '按成品料号统计', dictLabelEnglish: 'Part Number', dictValue: 'PartNumber' }
] ],
// 按项目下拉框
familyOptions: [],
// 线体下拉框
lineOptions: [],
// 班次下拉框
shiftOptions: [],
// 装配工单下拉框
workingOrderOptions: [],
// 装配追溯号
lineBatchOptions: [],
lineBatchFilterOptions: [],
// 成品料号
partNumOptions: [],
// 查询的校验
queryRules: {
startDate: [
{ type: 'string', required: true, message: '请选择日期', trigger: 'change' }
],
endDate: [
{ type: 'string', required: true, message: '请选择日期', trigger: 'change' }
]
}
} }
}, },
created() { created() {
this.getDictFun()
}, },
mounted() { mounted() {
this.getRepairStats() // 获取页面数据 this.queryParams.status = 'day'
// this.getRepairStats() // 获取页面数据
// 通过监听内容部分的宽度让图表resize // 通过监听内容部分的宽度让图表resize
const elementResizeDetectorMaker = require('element-resize-detector') const elementResizeDetectorMaker = require('element-resize-detector')
const erd = elementResizeDetectorMaker() const erd = elementResizeDetectorMaker()
...@@ -295,6 +566,35 @@ export default { ...@@ -295,6 +566,35 @@ export default {
this.getDateType = false this.getDateType = false
}, },
methods: { methods: {
getRepairStats() {
},
/** 重置按钮*/
resetQuery() {
// 清空校验
this.$refs.queryForm.resetFields()
// 恢复默认维度
this.queryParams.status = 'day'
// 恢复时间// 清除筛选项
// this.queryParams.startDate = moment(new Date().setTime(new Date().getTime() - 3600 * 1000 * 24 * 18)).format('YYYY-MM-DD') + ' 00:00:00',
// this.queryParams.endDate = moment(new Date().getTime() + 3600 * 1000 * 24).format('YYYY-MM-DD') + ' 23:59:59',
this.queryParams.startDate = ''
this.queryParams.endDate = ''
// 按项目下拉框
this.queryParams.familyOptions = []
// 线体下拉框
this.queryParams.lineOptions = []
// 班次下拉框
this.queryParams.shiftOptions = []
// 装配工单下拉框
this.queryParams.workingOrderOptions = []
// 装配追溯号
this.queryParams.lineBatchOptions = []
this.queryParams.lineBatchFilterOptions = []
// 成品料号
this.queryParams.partNumOptions = []
// 根据恢复时间重新填充下拉框
this.getDictFun()
},
/** 导出按钮操作*/ /** 导出按钮操作*/
handleExport() { handleExport() {
const params = { const params = {
...@@ -323,36 +623,193 @@ export default { ...@@ -323,36 +623,193 @@ export default {
}) })
}, },
/** 获取页面数据*/ /** 获取页面数据*/
getRepairStats() { // getRepairStats() {
this.echartsLoading = true // this.echartsLoading = true
const params = { // const params = {
beginDate: this.queryParams.startDate, // beginDate: this.queryParams.startDate,
endDate: this.queryParams.endDate, // endDate: this.queryParams.endDate,
type: this.choseType // type: this.choseType
} // }
getProDetails(params).then(res => { // getProDetails(params).then(res => {
if (this.getDateType === true) { // if (this.getDateType === true) {
this.dataList = res.data // this.dataList = res.data
this.getProLineMonitor() // this.getProLineMonitor()
this.getStatistics() // this.getStatistics()
this.echartsLoading = false // this.echartsLoading = false
// }
// })
// },
/** 更改筛选时间*/
changeTime() {
this.getDictFun()
},
/** 修改范围类型*/
changeChoseType(val) {
console.log('choseType', val)
this.choseType = val
},
/** 获取数据字典方法 **/
getDictFun() {
// 填充线体下拉框
const paramsLine = 'productionLine'
getDicts(paramsLine).then(response => {
this.lineOptions = response.data
})
// 项目数据
request({
url: '/ifs/all',
methods: 'get'
}).then(res => {
this.familyOptions.length = 0
forEach(res.data, (item) => {
// 填充下拉框
const dict = {
dictLabel: item.description,
dictValue: item.businessId
}
this.familyOptions.push(dict)
})
})
// 班次下拉框查询
this.queryShiftOptions()
// 获取时间范围内的工单 // 获取成品料号
request({
url: '/nltifsorder/findOrdersByNeedTime',
methods: 'get',
params: {
startNeedTime: this.queryParams.startDate,
endNeedTime: this.queryParams.endDate
}
}).then(res => {
this.workingOrderOptions.length = 0
this.partNumOptions.length = 0
const partNos = []
forEach(res.data, (item) => {
const dict = {
dictLabel: item.orderNo,
dictValue: item.orderNo,
orderId: item.businessId
}
// 过滤
if (partNos.indexOf(item.partNo) === -1) {
partNos.push(item.partNo)
}
this.workingOrderOptions.push(dict)
// this.partNumOptions.push(dict1)
})
forEach(partNos, (item) => {
const dict = {
dictLabel: item,
dictValue: item
}
this.partNumOptions.push(dict)
})
// 获取装配追溯号 -- 根据工单的自增id
if (this.workingOrderOptions !== null && this.workingOrderOptions.length > 0) {
// 获取工单id列表
const purl = '/nltorderlinelogic/selectByOrderId?' + 'oidlist='
let orderlist = ''
for (let i = 0; i < this.workingOrderOptions.length; i++) {
// workingOrderOptions[i].orderId
orderlist += this.workingOrderOptions[i].orderId
if (i + 1 < this.workingOrderOptions.length) {
orderlist = orderlist + ','
}
}
console.log(purl + orderlist)
request({
url: purl + orderlist,
methods: 'get',
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
}).then(res => {
forEach(res.data, (item) => {
console.log(item)
const dict = {
dictLabel: item.lineCode,
dictValue: item.lineCode
}
this.lineBatchOptions.push(dict)
})
this.filterSamelineCode()
})
} }
}) })
}, },
/** 更改筛选时间*/ filterSamelineCode() {
changeTime() { // const lineBatchOptions = []
this.echartsLoading = true this.lineBatchFilterOptions.length = 0
const params = { forEach(this.lineBatchOptions, (item) => {
beginDate: this.queryParams.startDate, // alert(item.dictLabel)
endDate: this.queryParams.endDate, // 没有一样的线体号就加入其中
type: this.choseType if (this.lineBatchFilterOptions.indexOf(item.dictLabel) === -1) {
} this.lineBatchFilterOptions.push(item.dictLabel)
getProDetails(params).then(res => { }
if (this.getDateType === true) { })
this.dataList = res.data },
this.getProLineMonitor() /** 查询按钮*/
this.getStatistics() handleQuery(formName) {
this.echartsLoading = false this.$refs[formName].validate((valid) => {
if (valid) {
// if (this.choseType === 'day') {
// const start = Date.parse(this.queryParams.startDate)
// const end = Date.parse(this.queryParams.endDate)
// const diffDate = Math.abs(end - start)
// const totalDays = Math.floor(diffDate / (1000 * 3600 * 24))
// } else if (this.choseType === 'week') {
// var date1 = new Date(this.queryParams.startDate)
// var date2 = new Date(this.queryParams.endDate)
// var dt1 = date1.getTime()
// var dt2 = date2.getTime()
// var num = Math.ceil(Math.abs(dt1 - dt2) / 1000 / 60 / 60 / 24 / 7)
// // 向上取整
// // TODO: clear this log
// console.log(`num`, num)
// } else if(this.choseType=='month'){
// var date3 = new Date(this.queryParams.startDate)
// var date4 = new Date(this.queryParams.endDate)
// var dt3 = date3.getTime()
// var dt4 = date4.getTime()
// var num1 = Math.ceil(Math.abs(dt3 - dt4) / 1000 / 60 / 60 / 24 / 30)
// // 向上取整
// // TODO: clear this log
// console.log(`num`, num1)
// }
this.echartsLoading = true
const params = {
beginDate: this.queryParams.startDate,
endDate: this.queryParams.endDate,
type: this.choseType,
xtCode: this.queryParams.xtCode, // 线体号
xmCode: this.queryParams.xmCode, // 项目
bcCode: this.queryParams.bcCode, // 班次
zpgdCode: this.queryParams.zpgdCode, // 装配工单
lineBatchCode: this.queryParams.lineBatchCode, // 追溯号
partNumCode: this.queryParams.partNumCode // 成品料号
}
console.log(params)
const paramjson = JSON.stringify(params)
getProDetailsJson(paramjson.toString()).then(res => {
// console.log(res.data)
if (this.getDateType === true) {
this.dataList = res.data
this.getProLineMonitor()
this.getStatistics()
this.echartsLoading = false
}
})
// getProDetails(params).then(res => {
// if (this.getDateType === true) {
// this.dataList = res.data
// this.getProLineMonitor()
// this.getStatistics()
// this.echartsLoading = false
// }
// })
} }
}) })
}, },
...@@ -521,10 +978,34 @@ export default { ...@@ -521,10 +978,34 @@ export default {
] ]
} }
myChartAge.setOption(option) myChartAge.setOption(option)
},
/** 填充班次 - 查的数据字典*/
queryShiftOptions() {
// this.queryOptionsParams.dictType = 'defectiveParts'
listData({ dictType: 'shift' }).then(res => {
this.shiftOptions.length = 0
forEach(res.rows, (item) => {
console.log(item)
const dict = {
dictLabel: item.dictLabel,
dictValue: item.dictValue
}
this.shiftOptions.push(dict)
})
})
} }
} }
} }
</script> </script>
<style scoped>
/* 样式穿透 */
.lmtags >>> .el-select__tags .el-tag:nth-child(1){
/* color: #D20A10 !important; */
max-width: 69px;
overflow: hidden;
text-overflow: ellipsis;
}
</style>
<style scoped lang="scss"> <style scoped lang="scss">
.RepairStatistics_module{ .RepairStatistics_module{
...@@ -535,8 +1016,13 @@ export default { ...@@ -535,8 +1016,13 @@ export default {
} }
.labelClass{ .labelClass{
position: relative; position: relative;
right: 13px; // right: 13px;
text-align: center; text-align: center;
//padding-top: 8px;
// width: 70px;
}
.labelClass div:first-child {
padding-left: 13px;
} }
} }
.el-divider--horizontal{ .el-divider--horizontal{
...@@ -580,5 +1066,9 @@ export default { ...@@ -580,5 +1066,9 @@ export default {
margin-left: 15px margin-left: 15px
} }
} }
.flotr {
float:right;
}
} }
</style> </style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment