From 2ab541d4c1ae4ab3efc9214f57ea08be7c40c82f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Fri, 28 Jun 2024 14:41:50 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/store/modules/home.js | 20 +++++++-------
.../components/produceLineBarTarget.vue | 20 ++++++++------
.../components/produceLineBarYearTarget.vue | 4 +--
.../components/produceLineYieldBarTarget.vue | 4 +--
src/views/report/comprehensiveData.vue | 6 ++---
src/views/report/productionSituationMW.vue | 4 ++-
.../report/productionSituationTablets.vue | 26 +++++++++----------
7 files changed, 45 insertions(+), 39 deletions(-)
diff --git a/src/store/modules/home.js b/src/store/modules/home.js
index e01a745..61dc840 100644
--- a/src/store/modules/home.js
+++ b/src/store/modules/home.js
@@ -92,7 +92,7 @@ const actions = {
/** 初始化首页数据 */
async initHome({ commit }) {
const dataArr = await getHomeInfo();
- console.log('dataArr', dataArr);
+ // console.log('dataArr', dataArr);
let preData = dataArr.previousProdOutputOutDO
let preFtoData = dataArr.previousProdOutputFtoDO
// const targetArr = await getHomeInfo();
@@ -127,7 +127,7 @@ const actions = {
// const payload = handler(factoryData)
// commit("SET_COPILOT_INFO", { type, payload });
// } else {
- console.log('factoryList',factoryList)
+ // console.log('factoryList',factoryList)
let factoryData = factoryList.prodOutputOutDO ? factoryList.prodOutputOutDO : factoryList.prodOutputRateDO
let preData = factoryList.previousProdOutputOutDO ? factoryList.previousProdOutputOutDO : factoryList.previousProdOutputRateDO
let preFtoData = factoryList.previousProdOutputFtoDO ? factoryList.previousProdOutputFtoDO : []
@@ -289,7 +289,7 @@ function splitCurrentAndPreviousB(factoryListResponse) {
}
function splitCurrentAndPreviousA(factoryListResponse, targetListResponse, prodOutputFtoListRes,preData,preFtoData) {
- console.log('工厂',preData);
+ // console.log('工厂',preData);
// 初始数据
const { chipOeeRate, transformRate, chipRate, stdRate } = initA();
@@ -346,7 +346,7 @@ function splitCurrentAndPreviousA(factoryListResponse, targetListResponse, prodO
if (preData) {
for (const factory of preData) {
const fId = getPreFactoryId(factory)
- console.log('factory',factory.previousYearOee);
+ // console.log('factory',factory.previousYearOee);
// chipInvest.previous[fId] = factory.previousYearInputNumber;
// chipOeeRate.current[fId] = factory.oee;
if (factory.previousGlassType === 0) {
@@ -400,7 +400,7 @@ function splitCurrentAndPreviousA(factoryListResponse, targetListResponse, prodO
_t.current[fId] = factory.yieldRate ;
// _t.previous[fId] = factory.previousYearYieldRate ;
}
- console.log('chipOeeRate',stdRate);
+ // console.log('chipOeeRate',stdRate);
// console.log('chipOeeRate',chipOeeRate);
return {
chipOeeRate,
@@ -412,12 +412,12 @@ function splitCurrentAndPreviousA(factoryListResponse, targetListResponse, prodO
}
function splitCurrentAndPrevious(factoryListResponse, targetListResponse, prodOutputFtoListRes,preData,preFtoData) {
- console.log('prodOutputFtoListRes',preFtoData);
+ // console.log('prodOutputFtoListRes',preFtoData);
// 初始数据
const { chipInvest, ftoInvest, chipOutput, stdOutput, bipvOutput } = init()
if (prodOutputFtoListRes.length !== 0 ) {
for (const factory of prodOutputFtoListRes) {
- console.log(factory);
+ // console.log(factory);
const fId = getFactoryId(factory);
// const preFId = getPreFactoryId(factory);
// if (fId) {
@@ -430,7 +430,7 @@ function splitCurrentAndPrevious(factoryListResponse, targetListResponse, prodOu
}
if (preFtoData) {
for (const factory of preFtoData) {
- console.log(factory);
+ // console.log(factory);
const fId = getPreFactoryId(factory);
// const preFId = getPreFactoryId(factory);
// if (fId) {
@@ -463,7 +463,7 @@ function splitCurrentAndPrevious(factoryListResponse, targetListResponse, prodOu
if (factoryListResponse) {
for (const factory of factoryListResponse) {
const fId = getFactoryId(factory);
- console.log('factory.inputNumber', factory, fId);
+ // console.log('factory.inputNumber', factory, fId);
if (factory.glassType === 0) {
chipInvest.current[fId] = factory.inputNumber
}
@@ -484,7 +484,7 @@ function splitCurrentAndPrevious(factoryListResponse, targetListResponse, prodOu
const _t = [chipOutput, stdOutput, bipvOutput][factory.glassType];
_t.current[fId] = factory.outputNumber;
}
- console.log('chipInvest',ftoInvest);
+ // console.log('chipInvest',ftoInvest);
return {
chipInvest,
// ftoInvest,
diff --git a/src/views/report/components/produceLineBarTarget.vue b/src/views/report/components/produceLineBarTarget.vue
index 3105759..e53d4cf 100644
--- a/src/views/report/components/produceLineBarTarget.vue
+++ b/src/views/report/components/produceLineBarTarget.vue
@@ -1,7 +1,7 @@
@@ -36,7 +36,7 @@ export default {
color: [],
// color: ["#8EF0AB", "#63BDFF", "#288AFF"],
grid: {
- left: 20,
+ left: '12%',
right: 0,
bottom: 31,
top: 30,
@@ -51,7 +51,7 @@ export default {
},
},
formatter: function (params) {
- console.log('params', params.data)
+ // console.log('params', params.data)
var res = `${params[0].axisValueLabel}`;
for (var i = 0, l = params.length; i < l; i++) {
res +=
@@ -172,10 +172,14 @@ export default {
},
},
- // gridLeft(val) {
- // console.log(val)
-
- // },
+ gridLeft(val) {
+ if (val === false) {
+ this.option.grid.left = '12%'
+ } else {
+ this.option.grid.left = -80
+ }
+ this.canvasReset()
+ },
type() {
this.canvasReset();
},
@@ -201,7 +205,7 @@ export default {
getMes() {
console.log(this.gridLeft)
if (this.gridLeft === false) {
- this.option.grid.left = 20
+ this.option.grid.left = '12%'
} else {
this.option.grid.left = -80
}
diff --git a/src/views/report/components/produceLineBarYearTarget.vue b/src/views/report/components/produceLineBarYearTarget.vue
index 4ff7d92..acbe6d9 100644
--- a/src/views/report/components/produceLineBarYearTarget.vue
+++ b/src/views/report/components/produceLineBarYearTarget.vue
@@ -1,7 +1,7 @@
@@ -51,7 +51,7 @@ export default {
},
},
formatter: function (params) {
- console.log('params', params);
+ // console.log('params', params);
var res = `${params[0].axisValueLabel}`;
for (var i = 0, l = params.length; i < l; i++) {
res +=
diff --git a/src/views/report/components/produceLineYieldBarTarget.vue b/src/views/report/components/produceLineYieldBarTarget.vue
index 6617d50..3138e68 100644
--- a/src/views/report/components/produceLineYieldBarTarget.vue
+++ b/src/views/report/components/produceLineYieldBarTarget.vue
@@ -1,7 +1,7 @@
@@ -55,7 +55,7 @@ export default {
let arr = []
var res = ``;
// for (var i = 0, l = params.length; i < l; i++) {
- console.log()
+ // console.log()
if (params[0].axisValue === 'FTO投入' || params[0].axisValue === '芯片产量' || params[0].axisValue === '标准组件产量') {
res +=
`` +
diff --git a/src/views/report/comprehensiveData.vue b/src/views/report/comprehensiveData.vue
index b27048d..a2b4fac 100644
--- a/src/views/report/comprehensiveData.vue
+++ b/src/views/report/comprehensiveData.vue
@@ -1,7 +1,7 @@
@@ -476,8 +476,8 @@ export default {
dataArr[3]['' + m + ''] = item.chipAveragePower
dataArr[4]['' + m + ''] = item.chipYieldRate
dataArr[5]['' + m + ''] = item.chipTotalPower
- dataArr[6]['' + m + ''] = item.chipOee
- dataArr[7]['' + m + ''] = item.chipCssMarriageRate
+ dataArr[6]['' + m + ''] = item.chipCssMarriageRate
+ dataArr[7]['' + m + ''] = item.chipOee
dataArr[8]['' + m + ''] = item.chipCapacityUtilizationRate
dataArr[9]['' + m + ''] = item.chipAnnualAverageProduction
dataArr[10]['' + m + ''] = item.chipBom
diff --git a/src/views/report/productionSituationMW.vue b/src/views/report/productionSituationMW.vue
index 9c5f536..50b17dd 100644
--- a/src/views/report/productionSituationMW.vue
+++ b/src/views/report/productionSituationMW.vue
@@ -226,6 +226,7 @@ export default {
show: true,
type: "value",
name: "单位/MW",
+ position:'left',
// splitNumber: 4,
nameTextStyle: {
fontSize: 12,
@@ -240,10 +241,11 @@ export default {
chartMsg: {
color: ["#8EF0AB", "#288AFF"],
xData: [],
- yName: "单位/MW",
+ // yName: "单位/MW",
yAxis:{
type: "value",
name: "单位/MW",
+
// splitNumber: 4,
nameTextStyle: {
fontSize: 12,
diff --git a/src/views/report/productionSituationTablets.vue b/src/views/report/productionSituationTablets.vue
index 5b35f5b..4ce6264 100644
--- a/src/views/report/productionSituationTablets.vue
+++ b/src/views/report/productionSituationTablets.vue
@@ -448,7 +448,7 @@ export default {
this.tableData = val
},
currentMenu(val) {
- console.log(val)
+ // console.log(val)
if (val === '瑞昌') {
this.legendList = [
{ id: 1, name: "FTO投入", type: 1, color: "#8EF0AB" },
@@ -554,12 +554,12 @@ export default {
onValueChange(picker, k) { // 选中近k周后触发的操作
// console.log(this.listQuery.reportTime[0], this.listQuery.reportTime[1])
if (this.listQuery.start && this.listQuery.end) {
- console.log(this.listQuery.reportTime)
+ // console.log(this.listQuery.reportTime)
this.date1 = moment(this.listQuery.start.getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss')
this.date2 = moment(this.listQuery.end.getTime() + 5 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss')
const numDays = (new Date(this.date2).getTime() - new Date(this.date1).getTime()) / (24 * 3600 * 1000);
if (numDays > 168) {
- console.log(numDays)
+ // console.log(numDays)
this.$message({
message: '周范围不能超过24周',
type: 'warning'
@@ -578,7 +578,7 @@ export default {
if (this.listQuery.reportTime) {
// this.createStartDate = moment(new Date(this.listQuery.reportTime[0]), 'yyyy-MM-dd hh:mm:ss');
// this.createEndDate = moment(new Date(this.listQuery.reportTime[1]), 'yyyy-MM-dd hh:mm:ss');
- console.log(this.listQuery.reportTime[1])
+ // console.log(this.listQuery.reportTime[1])
const numDays = (this.listQuery.reportTime[1] - this.listQuery.reportTime[0]) / (24 * 3600 * 1000);
if (numDays > 30) {
this.$message({
@@ -631,7 +631,7 @@ export default {
if (this.chartMsgYearTarget.series[3]) {
this.chartMsgYearTarget.series[3].data = []
}
- console.log(this.listQuery);
+ // console.log(this.listQuery);
if (!this.listQuery.startDate && !this.listQuery.endDate) {
return this.$message('请选择起止时间')
}
@@ -695,7 +695,7 @@ export default {
} else {
this.gridLeft = true
}
- console.log(res.data.list.length);
+ // console.log(res.data.list.length);
// res.data.list.forEach((ele) => {
res.data.list.slice(0, res.data.list.length - 3).forEach((ele, index) => {
// let i = index + 1
@@ -749,7 +749,7 @@ export default {
let targetObj = {}
let obj = {}
res.data.list.slice(res.data.list.length - 3, res.data.list.length - 1).forEach((ele, index) => {
- console.log("ele",ele.titleValue);
+ // console.log("ele",ele.titleValue);
// let i = index + 1
// this.chartMsgTarget.xData.push(ele.titleValue)
if (ele.titleValue.search('完成') == -1) {
@@ -759,7 +759,7 @@ export default {
targetObj.componentYield = item.componentYield
targetObj.bipvProductOutput = this.currentMenu == '瑞昌' ? null : item.bipvProductOutput
})
- console.log("fto",ele.titleValue,fto);
+ // console.log("fto",ele.titleValue,fto);
} else {
ele.productionSituationDataVOList.forEach((item) => {
obj.ftoInput = item.ftoInput
@@ -939,7 +939,7 @@ export default {
},)
// }
this.chartMsgTarget.series = [...fto, ...chip, ...std, ...bipv]
- console.log('arr', this.chartMsgTarget.series)
+ // console.log('arr', this.chartMsgTarget.series)
// arr.forEach((ele) => {
// })
@@ -1001,7 +1001,7 @@ export default {
}
})
})
- console.log(this.chartMsg.series[0]);
+ // console.log(this.chartMsg.series[0]);
this.chartMsgTarget.xData.push(res.data.list[res.data.list.length - 1].titleValue.slice(0, res.data.list[res.data.list.length - 1].titleValue.length - 3))
// this.chartMsgTarget.series = [{
// name: "FTO投入",
@@ -1030,7 +1030,7 @@ export default {
let targetObj = {}
let obj = {}
res.data.list.slice(res.data.list.length - 2, res.data.list.length).forEach((ele, index) => {
- console.log("ele", ele.titleValue);
+ // console.log("ele", ele.titleValue);
// let i = index + 1
// this.chartMsgTarget.xData.push(ele.titleValue)
ele.productionSituationDataVOList.forEach((item) => {
@@ -1039,7 +1039,7 @@ export default {
targetObj.chipYield = item.chipYield
targetObj.componentYield = item.componentYield
targetObj.bipvProductOutput = this.currentMenu == '瑞昌' ? null : item.bipvProductOutput
- console.log("fto", ele.titleValue, fto);
+ // console.log("fto", ele.titleValue, fto);
} else {
obj.ftoInput = item.ftoInput
@@ -1312,7 +1312,7 @@ export default {
this.$message.success("导出成功");
})
.catch(() => { });
- },
+ },
},
};
--
2.45.2
From 04af70f4163666378822361c3c4de681659853ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Fri, 28 Jun 2024 14:55:12 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/produceLineBarTarget.vue | 33 ++++++++++---------
src/views/report/comprehensiveData.vue | 6 ++--
2 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/src/views/report/components/produceLineBarTarget.vue b/src/views/report/components/produceLineBarTarget.vue
index e53d4cf..d7deb12 100644
--- a/src/views/report/components/produceLineBarTarget.vue
+++ b/src/views/report/components/produceLineBarTarget.vue
@@ -1,7 +1,7 @@
@@ -36,7 +36,7 @@ export default {
color: [],
// color: ["#8EF0AB", "#63BDFF", "#288AFF"],
grid: {
- left: '12%',
+ left: 50,
right: 0,
bottom: 31,
top: 30,
@@ -172,14 +172,14 @@ export default {
},
},
- gridLeft(val) {
- if (val === false) {
- this.option.grid.left = '12%'
- } else {
- this.option.grid.left = -80
- }
- this.canvasReset()
- },
+ // gridLeft(val) {
+ // if (val === false) {
+ // this.option.grid.left = 100
+ // } else {
+ // this.option.grid.left = -80
+ // }
+ // this.canvasReset()
+ // },
type() {
this.canvasReset();
},
@@ -204,11 +204,7 @@ export default {
},
getMes() {
console.log(this.gridLeft)
- if (this.gridLeft === false) {
- this.option.grid.left = '12%'
- } else {
- this.option.grid.left = -80
- }
+
// console.log('222222', this.chartMsg);
if (this.myChart) {
this.myChart.dispose();
@@ -217,12 +213,17 @@ export default {
this.myChart = echarts.init(chartDom);
this.option.color = this.chartMsg.color;
this.option.xAxis.data = this.chartMsg.xData
+ if (this.gridLeft === false) {
+ this.option.grid.left = 50
+ } else {
+ this.option.grid.left = -80
+ }
// this.option.yAxis.name = this.chartMsg.yName;
// this.option.yAxis.axisLabel = this.chartMsg.yAxisLabel;
this.option.series = this.chartMsg.series;
this.option.yAxis = this.chartMsg.yAxis;
-
+ console.log(this.option.grid);
this.myChart.setOption(this.option);
},
},
diff --git a/src/views/report/comprehensiveData.vue b/src/views/report/comprehensiveData.vue
index a2b4fac..8984324 100644
--- a/src/views/report/comprehensiveData.vue
+++ b/src/views/report/comprehensiveData.vue
@@ -1,7 +1,7 @@
@@ -473,8 +473,8 @@ export default {
// dataArr[3].factory = item.factory === 1 ? '邯郸' : '瑞昌'
dataArr[1]['' + m + ''] = item.chipInput
dataArr[2]['' + m + ''] = item.chipYield
- dataArr[3]['' + m + ''] = item.chipAveragePower
- dataArr[4]['' + m + ''] = item.chipYieldRate
+ dataArr[3]['' + m + ''] = item.chipYieldRate
+ dataArr[4]['' + m + ''] = item.chipAveragePower
dataArr[5]['' + m + ''] = item.chipTotalPower
dataArr[6]['' + m + ''] = item.chipCssMarriageRate
dataArr[7]['' + m + ''] = item.chipOee
--
2.45.2
From 99f5f978d4d78b166d32d4f8fb41243dcaf07c1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Fri, 28 Jun 2024 15:35:28 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/copilot/yield/options/double-ring-chart-options.js | 4 ++--
src/views/report/productionYield.vue | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/views/copilot/yield/options/double-ring-chart-options.js b/src/views/copilot/yield/options/double-ring-chart-options.js
index 6d9d3a3..617d24d 100644
--- a/src/views/copilot/yield/options/double-ring-chart-options.js
+++ b/src/views/copilot/yield/options/double-ring-chart-options.js
@@ -17,12 +17,12 @@ export default ({
tooltip: {},
title: {
text: titleValue,
- left: "48%",
+ left: "48.5%",
top: "37%",
textAlign: "center",
textStyle: {
fontWeight: 600,
- fontSize: 20,
+ fontSize: 26,
color: "#fffd",
},
subtext: `\u2002${subtitle}\u2002`,
diff --git a/src/views/report/productionYield.vue b/src/views/report/productionYield.vue
index f8459d0..3e49f09 100644
--- a/src/views/report/productionYield.vue
+++ b/src/views/report/productionYield.vue
@@ -107,6 +107,7 @@ export default {
otherProps: [],
start: undefined,
end: undefined,
+ currentMenu:'邯郸',
title: '',
showTable:false,
listQuery: {
--
2.45.2
From 5ac5da1bf5d3d353cddf24c0c87bf9d557ceeb48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Fri, 28 Jun 2024 16:03:42 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../report/components/produceLineYieldBarTarget.vue | 6 +++---
src/views/report/produceConversion.vue | 12 ++++++++++++
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/views/report/components/produceLineYieldBarTarget.vue b/src/views/report/components/produceLineYieldBarTarget.vue
index 3138e68..fcbd44d 100644
--- a/src/views/report/components/produceLineYieldBarTarget.vue
+++ b/src/views/report/components/produceLineYieldBarTarget.vue
@@ -1,7 +1,7 @@
@@ -56,7 +56,7 @@ export default {
var res = ``;
// for (var i = 0, l = params.length; i < l; i++) {
// console.log()
- if (params[0].axisValue === 'FTO投入' || params[0].axisValue === '芯片产量' || params[0].axisValue === '标准组件产量') {
+ if (params[0].axisValue === 'FTO投入' || params[0].axisValue === '芯片产量' || params[0].axisValue === '标准组件产量' || params[0].axisValue === '芯片总功率' || params[0].axisValue === '标准组件总功率') {
res +=
`` +
`${params[0].axisValueLabel}` +
@@ -79,7 +79,7 @@ export default {
: params[1].name === "转化效率"
? (params[1].value ? params[1].value.toFixed(2) : 0.0) + "%"
: params[1].seriesName.search('总功率') != -1
- ? (params[i].value ? params[1].value : 0) + "MW"
+ ? (params[1].value ? params[1].value : 0) + "MW"
: (params[1].value ? params[1].value : 0) + "片"
}`;
}
diff --git a/src/views/report/produceConversion.vue b/src/views/report/produceConversion.vue
index 9e76ce9..fa4abab 100644
--- a/src/views/report/produceConversion.vue
+++ b/src/views/report/produceConversion.vue
@@ -674,6 +674,18 @@ export default {
})
}
}
+ this.chartMsg.series[0].data.push({
+ name: '芯片总功率',
+ value: dataArr[0]['dayData'] === 0 ? null : dataArr[0]['dayData']
+ })
+ this.chartMsg.series[1].data.push({
+ name: '标准组件总功率',
+ value: dataArr[1]['dayData'] === 0 ? null : dataArr[1]['dayData']
+ })
+ this.chartMsg.series[2].data.push({
+ name: '转化效率',
+ value: dataArr[2]['dayData'] === 0 ? null : dataArr[2]['dayData']
+ })
} else {
this.chartMsgYearTarget.series[0].data = []
this.chartMsgYearTarget.series[1].data = []
--
2.45.2