@@ -1,7 +1,7 @@ | |||||
<!-- | <!-- | ||||
* @Author: zhp | * @Author: zhp | ||||
* @Date: 2024-04-15 10:49:13 | * @Date: 2024-04-15 10:49:13 | ||||
* @LastEditTime: 2024-06-27 14:56:20 | |||||
* @LastEditTime: 2024-07-02 16:33:59 | |||||
* @LastEditors: DY | * @LastEditors: DY | ||||
* @Description: | * @Description: | ||||
--> | --> | ||||
@@ -16,8 +16,8 @@ | |||||
</el-select> | </el-select> | ||||
</el-form-item> | </el-form-item> | ||||
<el-form-item v-show="listQuery.type === 0 || listQuery.type === ''" label="时间范围" prop="reportTime"> | <el-form-item v-show="listQuery.type === 0 || listQuery.type === ''" label="时间范围" prop="reportTime"> | ||||
<el-date-picker size="small" clearable v-model="listQuery.reportTime" type="datetimerange" range-separator="至" | |||||
start-placeholder="开始日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd" @change="changeDayTime" end-placeholder="结束日期"> | |||||
<el-date-picker size="small" clearable v-model="listQuery.reportTime" type="daterange" range-separator="至" | |||||
start-placeholder="开始日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd" @change="changeDayTime" end-placeholder="结束日期" :picker-options="{ }"> | |||||
</el-date-picker> | </el-date-picker> | ||||
</el-form-item> | </el-form-item> | ||||
<el-form-item v-show="listQuery.type === 1" label="时间范围" prop="reportTime"> | <el-form-item v-show="listQuery.type === 1" label="时间范围" prop="reportTime"> | ||||
@@ -234,7 +234,7 @@ export default { | |||||
{ | { | ||||
prop: 'goodRatio', | prop: 'goodRatio', | ||||
label: '良品率%', | label: '良品率%', | ||||
filter: (val) => val + '%' | |||||
filter: (val) => val.toFixed(2) + '%' | |||||
}, | }, | ||||
], | ], | ||||
tableData: [], | tableData: [], | ||||
@@ -535,11 +535,23 @@ export default { | |||||
}; | }; | ||||
</script> | </script> | ||||
<style scoped> | |||||
<style> | |||||
/* .blueTip { */ | /* .blueTip { */ | ||||
/* padding-bottom: 10px; */ | /* padding-bottom: 10px; */ | ||||
/* } */ | /* } */ | ||||
/* .blueTi */ | /* .blueTi */ | ||||
.blueTip .el-date-editor .el-range__icon { | |||||
font-size: 16px; | |||||
color: #0b58ff; | |||||
} | |||||
.blueTip .el-input__prefix .el-icon-date { | |||||
font-size: 16px; | |||||
color: #0b58ff; | |||||
} | |||||
.blueTip .el-input__prefix .el-icon-time { | |||||
font-size: 16px; | |||||
color: #0b58ff; | |||||
} | |||||
.blueTip::before{ | .blueTip::before{ | ||||
display: inline-block; | display: inline-block; | ||||
content: ''; | content: ''; | ||||
@@ -2,7 +2,7 @@ | |||||
* @Author: zwq | * @Author: zwq | ||||
* @Date: 2022-01-21 14:43:06 | * @Date: 2022-01-21 14:43:06 | ||||
* @LastEditors: DY | * @LastEditors: DY | ||||
* @LastEditTime: 2024-06-24 11:13:48 | |||||
* @LastEditTime: 2024-07-01 16:54:41 | |||||
* @Description: | * @Description: | ||||
--> | --> | ||||
<template> | <template> | ||||
@@ -74,7 +74,6 @@ export default { | |||||
}, | }, | ||||
methods: { | methods: { | ||||
initChart(xAxis, seriesList) { | initChart(xAxis, seriesList) { | ||||
console.log('2', xAxis, seriesList) | |||||
if (xAxis.length === 0) { | if (xAxis.length === 0) { | ||||
this.chart.clear() | this.chart.clear() | ||||
} | } | ||||
@@ -100,12 +99,16 @@ export default { | |||||
}, | }, | ||||
tooltip: { | tooltip: { | ||||
trigger: 'axis', | trigger: 'axis', | ||||
axisPointer: { | |||||
type: 'shadow', | |||||
color: "rgba(237,237,237,0.5)" | |||||
}, | |||||
formatter: function(params) { | formatter: function(params) { | ||||
let result = ` | let result = ` | ||||
<div style="width: 270px; display: flex"> | <div style="width: 270px; display: flex"> | ||||
<div style="width: 150px">${params[0].name}</div> | <div style="width: 150px">${params[0].name}</div> | ||||
<div style="width: 60px">${factoryListabbr[0]}</div> | |||||
<div style="width: 60px">${factoryListabbr[1]}</div> | |||||
<div style="width: 60px; text-align: right">${factoryListabbr[0]}</div> | |||||
<div style="width: 60px; text-align: right">${factoryListabbr[1]}</div> | |||||
</div>` | </div>` | ||||
const newArray = params.map(p => { | const newArray = params.map(p => { | ||||
return { | return { | ||||
@@ -113,14 +116,17 @@ export default { | |||||
factoryName: factoryListabbr[p.seriesName.split('-')[1]], // 工厂名称 | factoryName: factoryListabbr[p.seriesName.split('-')[1]], // 工厂名称 | ||||
value: p.value, | value: p.value, | ||||
name: p.name, | name: p.name, | ||||
marker: p.marker | |||||
marker: p.marker, | |||||
color: p.color | |||||
} | } | ||||
}) | }) | ||||
const analyzeList = Object.groupBy(newArray, (member) => member.glass) | const analyzeList = Object.groupBy(newArray, (member) => member.glass) | ||||
for (let g in analyzeList) { | for (let g in analyzeList) { | ||||
// date => 玻璃类型 | // date => 玻璃类型 | ||||
let oneData = `<div style="width: 270px; display: flex"> | let oneData = `<div style="width: 270px; display: flex"> | ||||
<div style="width: 150px">${analyzeList[g][0].marker} ${g}</div>` | |||||
<div style="width: 150px; display: flex; align-items: center"> | |||||
<div style="background-color: ${analyzeList[g][0].color}; width: 10px; height: 10px; margin-right: 5px"></div> | |||||
<div>${g}</div></div>` | |||||
for (let fac of factoryListabbr) { | for (let fac of factoryListabbr) { | ||||
let goodNum = 0 | let goodNum = 0 | ||||
for (let ana of analyzeList[g]) { | for (let ana of analyzeList[g]) { | ||||
@@ -128,7 +134,7 @@ export default { | |||||
goodNum = ana.value | goodNum = ana.value | ||||
} | } | ||||
} | } | ||||
oneData += `<div style="width: 60px">${goodNum}</div>` | |||||
oneData += `<div style="width: 60px; text-align: right">${goodNum}</div>` | |||||
} | } | ||||
result = result + oneData + '</div>' | result = result + oneData + '</div>' | ||||
} | } | ||||
@@ -155,7 +161,7 @@ export default { | |||||
], | ], | ||||
grid: { | grid: { | ||||
top: '10%', | top: '10%', | ||||
left: "1%", | |||||
left: "2%", | |||||
right: "5%", | right: "5%", | ||||
bottom: "0%", | bottom: "0%", | ||||
containLabel: true | containLabel: true | ||||
@@ -1,7 +1,7 @@ | |||||
<!-- | <!-- | ||||
* @Author: zhp | * @Author: zhp | ||||
* @Date: 2024-04-15 10:49:13 | * @Date: 2024-04-15 10:49:13 | ||||
* @LastEditTime: 2024-06-20 16:41:48 | |||||
* @LastEditTime: 2024-07-02 16:35:01 | |||||
* @LastEditors: DY | * @LastEditors: DY | ||||
* @Description: | * @Description: | ||||
--> | --> | ||||
@@ -691,11 +691,22 @@ export default { | |||||
}; | }; | ||||
</script> | </script> | ||||
<style scoped> | |||||
<style> | |||||
/* .blueTip { */ | /* .blueTip { */ | ||||
/* padding-bottom: 10px; */ | /* padding-bottom: 10px; */ | ||||
/* } */ | /* } */ | ||||
/* .blueTi */ | |||||
.blueTip .el-date-editor .el-range__icon { | |||||
font-size: 16px; | |||||
color: #0b58ff; | |||||
} | |||||
.blueTip .el-input__prefix .el-icon-date { | |||||
font-size: 16px; | |||||
color: #0b58ff; | |||||
} | |||||
.blueTip .el-input__prefix .el-icon-time { | |||||
font-size: 16px; | |||||
color: #0b58ff; | |||||
} | |||||
.blueTip::before{ | .blueTip::before{ | ||||
display: inline-block; | display: inline-block; | ||||
content: ''; | content: ''; | ||||
@@ -1,7 +1,7 @@ | |||||
<!-- | <!-- | ||||
* @Author: zhp | * @Author: zhp | ||||
* @Date: 2024-04-15 10:49:13 | * @Date: 2024-04-15 10:49:13 | ||||
* @LastEditTime: 2024-06-24 15:08:34 | |||||
* @LastEditTime: 2024-07-01 17:06:29 | |||||
* @LastEditors: DY | * @LastEditors: DY | ||||
* @Description: | * @Description: | ||||
--> | --> | ||||
@@ -242,7 +242,7 @@ export default { | |||||
{ | { | ||||
prop: 'productionProgress', | prop: 'productionProgress', | ||||
label: '生产进度', | label: '生产进度', | ||||
filter: (val) => (val * 100) + '%' | |||||
filter: (val) => (val * 100).toFixed(2) + '%' | |||||
}, | }, | ||||
{ | { | ||||
prop: 'orderStatus', | prop: 'orderStatus', | ||||