mt-fe-group/yudao-init
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

projects/mescc/zhp #57

Merged
juzi merged 3 commits from projects/mescc/zhp into projects/mescc/develop 2024-06-21 16:19:02 +08:00
Conversation 0 Commits 3 Files Changed 12 +1247 -930
12 changed files with 1247 additions and 930 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.env.dev
View File

@ -1,8 +1,8 @@
### ###
# @Author: zhp # @Author: zhp
# @Date: 2024-04-28 13:42:51 # @Date: 2024-04-28 13:42:51
# @LastEditTime: 2024-06-20 10:16:40 # @LastEditTime: 2024-06-21 13:40:38
# @LastEditors: DY # @LastEditors: zhp
# @Description: # @Description:
### ###
# 开发环境配置 # 开发环境配置
@ -13,7 +13,7 @@ VUE_APP_TITLE = 发电玻璃智能管控平台
# 芋道管理系统/开发环境 # 芋道管理系统/开发环境
# VUE_APP_BASE_API = 'http://192.168.1.70:30307' # VUE_APP_BASE_API = 'http://192.168.1.70:30307'
VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com' # VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com'
# 闫阳 # 闫阳
# VUE_APP_BASE_API = 'http://192.168.1.81:48080' # VUE_APP_BASE_API = 'http://192.168.1.81:48080'
# 徐 # 徐
@ -24,7 +24,8 @@ VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com'
# VUE_APP_BASE_API = 'http://192.168.1.63:48080' # VUE_APP_BASE_API = 'http://192.168.1.63:48080'
# 张一丁 # 张一丁
# VUE_APP_BASE_API = 'http://192.168.4.139:48080' # VUE_APP_BASE_API = 'http://192.168.4.139:48080'
# 蔡
VUE_APP_BASE_API = 'http://192.168.1.54:48080'
# 路由懒加载 # 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true VUE_CLI_BABEL_TRANSPILE_MODULES = true

10
src/views/dashboard/charts/ChipInvest.vue
View File

@ -1,8 +1,9 @@
<!-- <!--
filename: chip-invest.vue * @Author: zhp
author: liubin * @Date: 2024-06-03 15:38:31
date: 2024-04-10 08:59:28 * @LastEditTime: 2024-06-21 15:06:39
description: * @LastEditors: zhp
* @Description:
--> -->
<template> <template>
@ -34,6 +35,7 @@ export default {
xAxis: cities, xAxis: cities,
}; };
}, },
computed: { computed: {
series() { series() {
const chipInvest = this.$store.getters.home.chipInvest; const chipInvest = this.$store.getters.home.chipInvest;

50
src/views/dashboard/charts/RightChartBase.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2024-04-28 13:42:51 * @Date: 2024-04-28 13:42:51
* @LastEditTime: 2024-06-14 09:16:09 * @LastEditTime: 2024-06-21 15:02:27
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -123,30 +123,30 @@ export default {
itemStyle: { itemStyle: {
color: "#f3c000", color: "#f3c000",
}, },
areaStyle: { // areaStyle: {
color: { // color: {
type: "linear", // type: "linear",
x: 0, // x: 0,
y: 0, // y: 0,
x2: 0, // x2: 0,
y2: 1, // y2: 1,
colorStops: [ // colorStops: [
{ // {
offset: 0, // offset: 0,
color: "#f3c000", // 0% 处的颜色 // color: "#f3c000", // 0% 处的颜色
}, // },
{ // {
offset: 0.55, // offset: 0.55,
color: "#f3c00033", // color: "#f3c00033",
}, // },
{ // {
offset: 1, // offset: 1,
color: "transparent", // 100% 处的颜色 // color: "transparent", // 100% 处的颜色
}, // },
], // ],
global: false, // 缺省为 false // global: false, // 缺省为 false
}, // },
}, // },
data: [], // this.series[0].data, data: [], // this.series[0].data,
}, },
{ {

8
src/views/report/components/produceLineBar.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2024-06-19 15:28:34 * @Date: 2024-06-19 15:28:34
* @LastEditTime: 2024-06-20 20:49:07 * @LastEditTime: 2024-06-21 14:37:44
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -51,7 +51,7 @@ export default {
}, },
}, },
formatter: function (params) { formatter: function (params) {
console.log('params', params); // console.log('params', params);
var res = `<span style='color:rgba(0,0,0,0.8)'>${params[0].axisValueLabel}</span>`; var res = `<span style='color:rgba(0,0,0,0.8)'>${params[0].axisValueLabel}</span>`;
for (var i = 0, l = params.length; i < l; i++) { for (var i = 0, l = params.length; i < l; i++) {
res += res +=
@ -63,8 +63,8 @@ export default {
: params[i].seriesName === "转化效率" : params[i].seriesName === "转化效率"
? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%" ? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
: params[i].seriesName.search('总功率') != -1 : params[i].seriesName.search('总功率') != -1
? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "MW" ? (params[i].value ? params[i] : 0) + "MW"
: params[i].value + "片" : (params[i].value ? params[i].value : 0) + "片"
}</span>`; }</span>`;
} }
return res; return res;

6
src/views/report/components/produceLineBarTarget.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2024-06-20 16:13:36 * @Date: 2024-06-20 16:13:36
* @LastEditTime: 2024-06-20 20:49:23 * @LastEditTime: 2024-06-21 14:37:56
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -70,8 +70,8 @@ export default {
: params[i].seriesName === "转化效率" : params[i].seriesName === "转化效率"
? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%" ? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
: params[i].seriesName.search('总功率') != -1 : params[i].seriesName.search('总功率') != -1
? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "MW" ? (params[i].value ? params[i] : 0) + "MW"
: params[i].value + "片" : (params[i].value ? params[i].value : 0) + "片"
}</span>`; }</span>`;
} }
return res; return res;

8
src/views/report/components/produceLineBarYearTarget.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2024-06-20 16:13:52 * @Date: 2024-06-20 16:13:52
* @LastEditTime: 2024-06-20 20:49:28 * @LastEditTime: 2024-06-21 14:37:59
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -51,7 +51,7 @@ export default {
}, },
}, },
formatter: function (params) { formatter: function (params) {
console.log('params', params); // console.log('params', params);
var res = `<span style='color:rgba(0,0,0,0.8)'>${params[0].axisValueLabel}</span>`; var res = `<span style='color:rgba(0,0,0,0.8)'>${params[0].axisValueLabel}</span>`;
for (var i = 0, l = params.length; i < l; i++) { for (var i = 0, l = params.length; i < l; i++) {
res += res +=
@ -63,8 +63,8 @@ export default {
: params[i].seriesName === "转化效率" : params[i].seriesName === "转化效率"
? params[i].value+ "%" ? params[i].value+ "%"
: params[i].seriesName.search('总功率') != -1 : params[i].seriesName.search('总功率') != -1
? params[i].value + "MW" ? (params[i].value ? params[i] : 0) + "MW"
: params[i].value + "片" : (params[i].value ? params[i].value : 0) + "片"
}</span>`; }</span>`;
} }
return res; return res;

263
src/views/report/components/produceLineYieldBarTarget.vue Normal file
View File

@ -0,0 +1,263 @@
<!--
* @Author: zhp
* @Date: 2024-06-21 09:05:14
* @LastEditTime: 2024-06-21 14:38:06
* @LastEditors: zhp
* @Description:
-->
<template>
<div>
<!-- 暂无数据 -->
<div class="no-data-bg" style="position: relative; left: 50%; transform: translateX(-50%)"
v-show="this.chartMsg.series.length === 0"></div>
<!-- 图例 -->
<div v-show="this.chartMsg.series.length > 0">
<div class="legendData" v-if="show">
<span class="itemData" v-for="item in legendList" :key="item.id">
<span v-if="item.type === 1" class="block" :style="{ backgroundColor: item.color }"></span>
<span v-if="item.type === 2" class="line" :style="{ backgroundColor: item.color }">
<span class="line-block" :style="{ backgroundColor: item.color }"></span>
</span>
{{ item.name }}</span>
</div>
<div :id="chartId" :style="{ width: '100%', height: chartHeight + 'px' }"></div>
</div>
</div>
</template>
<script>
import * as echarts from "echarts";
import { debounce } from "@/utils/debounce";
export default {
name: "bmLineBar",
data() {
return {
myChart: "",
option: {
color: [],
// color: ["#8EF0AB", "#63BDFF", "#288AFF"],
grid: {
left: -30,
right: 0,
bottom: 30,
top: 30,
containLabel:true,
},
tooltip: {
trigger: "axis",
axisPointer: {
// type: "cross",
crossStyle: {
color: "rgba(237,237,237,0.5)",
},
},
formatter: function (params) {
console.log('params', params)
let arr = []
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 === '标准组件产量') {
res +=
"<br/>" +
`<span style='display:inline-block;margin-right:4px;border-radius:10px;width:10px;height:10px;background-color:${params[0].color}'></span>` +
`<span style='display:inline-block;width:150px;color:rgba(0,0,0,0.8);font-size:14px;'>${params[0].axisValueLabel}</span>` +
`<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${params[0].name === "综合良率"
? (params[0].value ? params[0].value.toFixed(2) : 0.0) + "%"
: params[0].name === "转化效率"
? (params[0].value ? params[0].value.toFixed(2) : 0.0) + "%"
: params[i].seriesName.search('总功率') != -1
? (params[i].value ? params[i] : 0) + "MW"
: (params[i].value ? params[i].value : 0) + "片"
}</span>`;
// }
}
if (params[1].axisValue === '综合良率' || params[1].axisValue === '转化效率') {
res +=
"<br/>" +
`<span style='display:inline-block;margin-right:4px;border-radius:10px;width:10px;height:10px;background-color:${params[1].color}'></span>` +
`<span style='display:inline-block;width:150px;color:rgba(0,0,0,0.8);font-size:14px;'>${params[1].axisValueLabel}</span>` +
`<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${params[1].name === "综合良率"
? (params[1].value ? params[1].value.toFixed(2) : 0.0) + "%"
: params[1].name === "转化效率"
? (params[1].value ? params[1].value.toFixed(2) : 0.0) + "%"
: params[i].seriesName.search('总功率') != -1
? (params[i].value ? params[i] : 0) + "MW"
: (params[i].value ? params[i].value : 0) + "片"
}</span>`;
}
return res;
},
},
xAxis: {
type: "category",
data: [],
axisTick: {
show: false,
},
axisPointer: {
type: "shadow",
},
},
dataZoom: [//滚动条
{
// 设置滚动条的隐藏与显示
show: true,
// 设置滚动条类型
type: "slider",
// 设置背景颜色
backgroundColor: "rgb(19, 63, 100)",
// 设置选中范围的填充颜色
fillerColor: "rgb(16, 171, 198)",
// 设置边框颜色
borderColor: "rgb(19, 63, 100)",
// 是否显示detail，即拖拽时候显示详细数值信息
showDetail: false,
// 数据窗口范围的起始数值
startValue: 0,
// 数据窗口范围的结束数值（一页显示多少条数据）
endValue: 5,
// empty：当前数据窗口外的数据，被设置为空。
// 即不会影响其他轴的数据范围
filterMode: "empty",
// 设置滚动条宽度，相对于盒子宽度
width: "50%",
// 设置滚动条高度
height: 8,
// 设置滚动条显示位置
left: "center",
// 是否锁定选择区域（或叫做数据窗口）的大小
zoomLoxk: true,
// 控制手柄的尺寸
handleSize: 0,
// dataZoom-slider组件离容器下侧的距离
bottom: 3,
},
{
// 没有下面这块的话，只能拖动滚动条，
// 鼠标滚轮在区域内不能控制外部滚动条
type: "inside",
// 滚轮是否触发缩放
zoomOnMouseWheel: false,
// 鼠标滚轮触发滚动
moveOnMouseMove: true,
moveOnMouseWheel: true,
},
],
yAxis:undefined,
series: [],
},
};
},
props: {
chartHeight: {
type: Number,
default: 300,
},
type: {
type: Number,
default: 2,
},
show: {
type: Boolean,
default: true,
},
legendList: {
type: Array,
default: () => [],
},
chartMsg: {
type: Object,
default: () => { },
},
chartId: {
type: String,
default: "bmChart",
},
chartNum: {
type: Number,
default: 1,
},
},
watch: {
chartHeight: {
handler(newVal) {
this.chartHeight = newVal;
},
},
type() {
this.canvasReset();
},
chartNum(val) {
this.canvasReset();
},
chartMsg: {
handler(newVal) {
this.canvasReset();
},
deep: true,
},
},
mounted() {
this.canvasReset();
},
methods: {
canvasReset() {
debounce(() => {
this.getMes();
}, 500)();
},
getMes() {
if (this.myChart) {
this.myChart.dispose();
}
var chartDom = document.getElementById(this.chartId);
this.myChart = echarts.init(chartDom);
this.option.color = this.chartMsg.color;
this.option.xAxis.data = this.chartMsg.xData;
// 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;
this.myChart.setOption(this.option);
},
},
};
</script>
<style lang="scss">
.legendData {
text-align: right;
position: relative;
// right: 30;
// top: 10px;
.itemData {
display: inline-block;
margin-right: 10px;
font-size: 14px;
color: #8c8c8c;
.block {
width: 10px;
height: 10px;
display: inline-block;
margin-right: 4px;
}
.line {
width: 10px;
height: 10px;
border-radius: 5px;
display: inline-block;
margin-right: 4px;
position: relative;
.line-block {
position: absolute;
width: 20px;
height: 2px;
left: -5px;
top: 4px;
}
}
}
}
</style>

44
src/views/report/comprehensiveData.vue
View File

@ -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 20:46:53 * @LastEditTime: 2024-06-21 15:18:20
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -57,8 +57,8 @@
<el-button type="primary" size="small" plain @click="handleExport">导出</el-button> <el-button type="primary" size="small" plain @click="handleExport">导出</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" <base-table :span-method="objectSpanMethod" :table-props="tableProps" :page="listQuery.pageNo"
:table-data="tableData"> :limit="listQuery.pageSize" :table-data="tableData">
</base-table> </base-table>
</div> </div>
</div> </div>
@ -86,7 +86,7 @@ export default {
return { return {
factoryList, factoryList,
factoryArray, factoryArray,
currentMenu:'邯郸',
listQuery: { listQuery: {
pageNo: 1, pageNo: 1,
pageSize: 999, pageSize: 999,
@ -147,7 +147,7 @@ export default {
otherProps:[], otherProps:[],
tableData: [], tableData: [],
xAxis: [], xAxis: [],
currentMenu:null, // currentMenu:null,
lineData: {}, lineData: {},
data: {} data: {}
// proLineList: [], // proLineList: [],
@ -200,6 +200,35 @@ export default {
this.getDataList() this.getDataList()
}, },
methods: { methods: {
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
let spanOneArr = [], concatOne = 0;
// let spanTwoArr = [], concatTwo = 0;
this.tableData.map((item, index) => {
// console.log(inde);
if (index === 0) {
spanOneArr.push(1);
} else {
//第一列需合并相同内容的判断条件
if (item.type === this.tableData[index - 1].type) {
spanOneArr[concatOne] += 1;
spanOneArr.push(0);
} else {
spanOneArr.push(1);
concatOne = index;
};
}
});
if (columnIndex === 1) {
const _row = spanOneArr[rowIndex];
const _col = _row > 0 ? 1 : 0;
return {
rowspan: _row,
colspan: _col
}
}
},
getYear(e) { getYear(e) {
if (this.listQuery.end - this.listQuery.start > 10 * 365 * 24 * 60 * 60 * 1000) { if (this.listQuery.end - this.listQuery.start > 10 * 365 * 24 * 60 * 60 * 1000) {
this.$message({ this.$message({
@ -288,7 +317,7 @@ export default {
this.currentMenu === '邯郸' ? arr.push(1) : arr.push(2) this.currentMenu === '邯郸' ? arr.push(1) : arr.push(2)
this.listQuery.factory = arr this.listQuery.factory = arr
const res = await getComprehensiveDataPage(this.listQuery) const res = await getComprehensiveDataPage(this.listQuery)
this.tableData = res.data.list // this.tableData = res.data.list
let dataArr = [{ let dataArr = [{
type: '芯片', type: '芯片',
item: 'FTO投入', item: 'FTO投入',
@ -412,7 +441,7 @@ export default {
// this.chartMsg.xData.push(ele.titleValue) // this.chartMsg.xData.push(ele.titleValue)
this.otherProps.push({ this.otherProps.push({
label: ele.titleValue, label: ele.titleValue,
props: 'value' + i prop: 'value' + i
}) })
}) })
console.log(this.otherProps) console.log(this.otherProps)
@ -456,6 +485,7 @@ export default {
// props: 'value' + index + 1, // props: 'value' + index + 1,
// }) // })
}) })
console.log(dataArr);
if (res.data.length === 0) { if (res.data.length === 0) {
this.tableData = [] this.tableData = []
} else { } else {

497
src/views/report/produceConversion.vue
View File

@ -13,54 +13,41 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-show="listQuery.date === 0 || listQuery.date === ''" label="时间范围" prop="reportTime"> <el-form-item v-show="listQuery.date === 0 || listQuery.date === ''" label="时间范围" prop="reportTime">
<el-date-picker size="small" clearable v-model="listQuery.reportTime" type="daterange" range-separator="至" <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="datetimerange" range-separator="至"
start-placeholder="开始日期" value-format="yyyy-MM-dd" @change="changeDayTime" end-placeholder="结束日期"> start-placeholder="开始日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd" @change="changeDayTime"
end-placeholder="结束日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item v-show="listQuery.date === 1" label="时间范围" prop="reportTime"> <el-form-item v-show="listQuery.date === 1" label="时间范围" prop="reportTime">
<el-date-picker size="small" clearable v-model="start" type="week" format="yyyy 第 WW 周" placeholder="选择周" <el-date-picker size="small" clearable v-model="listQuery.start" type="week" format="yyyy 第 WW 周"
style="width: 180px" @change="onValueChange"> placeholder="选择周" style="width: 180px" @change="onValueChange">
</el-date-picker> </el-date-picker>
至 至
<el-date-picker size="small" clearable v-model="end" type="week" format="yyyy 第 WW 周" placeholder="选择周" <el-date-picker size="small" clearable v-model="listQuery.end" type="week" format="yyyy 第 WW 周"
style="width: 180px" @change="onValueChange"> placeholder="选择周" style="width: 180px" @change="onValueChange">
</el-date-picker> </el-date-picker>
<!-- <span v-if="start && end" style="margin-left: 10px"> <!-- <span v-if="listQuery.start && listQuery.end" style="margin-left: 10px">
{{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周 {{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周
</span> --> </span> -->
</el-form-item> </el-form-item>
<el-form-item v-show="listQuery.date === 2" label="时间值" prop="reportTime"> <el-form-item v-show="listQuery.date === 2" label="时间范围" prop="reportTime">
<el-date-picker size="small" v-model="listQuery.reportTime" type="monthrange" value-format="yyyy-MM-DD" <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="monthrange"
range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份" @change="changeTime"> value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份"
@change="changeTime">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item v-show="listQuery.date === 3" label="时间值" prop="reportTime"> <el-form-item v-show="listQuery.date === 3" label="时间范围" prop="reportTime">
<el-date-picker size="small" clearable v-model="listQuery.reportTime[0]" value-format="yyyy" type="year" <el-date-picker size="small" clearable v-model="listQuery.start" value-format="yyyy-MM-dd" type="year"
placeholder="开始时间"> placeholder="开始时间">
</el-date-picker> </el-date-picker>
~ ~
<el-date-picker size="small" clearable v-model="listQuery.reportTime[1]" value-format="yyyy" type="year" <el-date-picker size="small" clearable v-model="listQuery.end" value-format="yyyy-MM-dd" type="year"
placeholder="结束时间" @change="getYear"> placeholder="结束时间" @change="getYear">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<!-- <el-form-item label="玻璃类型" prop="type">
<el-select v-model="listQuery.type" placeholder="请选择玻璃类型">
<el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item> -->
<!-- <el-form-item label="玻璃类型" prop="type">
<el-select v-model="listQuery.type" placeholder="请选择玻璃类型">
<el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item> -->
<el-form-item> <el-form-item>
<el-button type="primary" size="small" @click="getDataList">查询</el-button> <el-button type="primary" size="small" @click="getDataList">查询</el-button>
<el-divider direction="vertical"></el-divider>
<!-- <el-button type="primary" size="small" plain @click="handleImport">导入</el-button> -->
<el-button type="primary" size="small" plain @click="handleExport">导出</el-button> <el-button type="primary" size="small" plain @click="handleExport">导出</el-button>
<!-- <el-button type="success" size="small" plain @click="addFactory">新增</el-button> -->
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
@ -77,7 +64,7 @@
<div class="blueTip"> <div class="blueTip">
{{ title }} {{ title }}
</div> </div>
<produce-line-bar-year-target :chartHeight="chartHeight" :legendList="legendList" <produce-line-bar-year-target :chartHeight="chartHeight" :legendList="legendListTarget"
:chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" /> :chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" />
</el-col> </el-col>
</el-row> </el-row>
@ -97,8 +84,8 @@
:chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" /> :chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" />
</el-col> --> </el-col> -->
</el-row> </el-row>
<base-table :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size" :table-data="tableData" <base-table :span-method="objectSpanMethod" :table-props="tableProps" :page="listQuery.current"
:max-height="tableH" /> :limit="listQuery.size" :table-data="tableData" :max-height="tableH" />
</div> </div>
<!-- <div class="containerBottom"> <!-- <div class="containerBottom">
@ -110,7 +97,7 @@
import { getProduceTransData, exportProduceTransData } from '@/api/report'; import { getProduceTransData, exportProduceTransData } from '@/api/report';
import bmSearchBar from "./components/bmSearchBar"; import bmSearchBar from "./components/bmSearchBar";
import BmLineBar from "./components/produceLineBar.vue"; import BmLineBar from "./components/produceLineBar.vue";
import produceLineBarYearTarget from "./components/produceLineBarYearTarget.vue"; import produceLineBarYearTarget from "./components/produceLineYieldBarTarget.vue";
import ButtonNav from '@/components/ButtonNav' import ButtonNav from '@/components/ButtonNav'
import moment from 'moment' import moment from 'moment'
@ -119,13 +106,11 @@ export default {
data() { data() {
return { return {
otherProps: [], otherProps: [],
start: undefined, title: '',
end: undefined, currentMenu:'邯郸',
listQuery: { listQuery: {
pageNo: 1, start: undefined,
pageSize: 999, end: undefined,
// size: 10,
// current: 1,
factorys: null, factorys: null,
// total: 0, // total: 0,
date: 2, date: 2,
@ -156,19 +141,34 @@ export default {
tableH: this.tableHeight(137) / 2 - 70, tableH: this.tableHeight(137) / 2 - 70,
legendList: [ legendList: [
{ {
id: 1, name: "综合良率", type: 2, color: "#FFCE6A" id: 2, name: "芯片总功率", type: 1, color: "#8EF0AB"
},
{ id: 3, name: "标准组件总功率", type: 1, color: "#288AFF" },
{
id: 1, name: "转化效率", type: 2, color: "#FFCE6A"
},
// {
// id: 3, name: "", type: 1, color: "#288AFF"
// },
],
legendListTarget: [
{
id: 2, name: "芯片总功率", type: 1, color: "#8EF0AB"
}, },
{ {
id: 2, name: "FTO投入", type: 1, color: "#8EF0AB" id: 3, name: "标准组件总功率", type: 1, color: "#288AFF"
}, },
{ id: 3, name: "芯片产量", type: 1, color: "#288AFF" },
{ {
id: 3, name: "标准组件产量", type: 1, color: "#288AFF" id: 1, name: "转化效率", type: 1, color: "#64BDFF"
}, },
// {
// id: 3, name: "", type: 1, color: "#288AFF"
// },
], ],
chartMsgYearTarget: { chartMsgYearTarget: {
color: ["#8EF0AB", "#288AFF", '#64BDFF', "#FFCE6A",], color: ["#8EF0AB", "#288AFF","#64BDFF",],
xData: [], xData: ['芯片总功率', '标准组件总功率','转化效率'],
// yName: "单位/%", // yName: "单位/%",
yAxis: [ yAxis: [
{ {
@ -208,17 +208,11 @@ export default {
color: '#288AFF' color: '#288AFF'
} }
}, },
{
value: 3,
itemStyle: {
color: '#64BDFF'
}
},
{ {
value: 0, value: 0,
yAxisIndex: 1, yAxisIndex: 1,
itemStyle: { itemStyle: {
color: '#FFCE6A' color: '#64BDFF'
} }
}], }],
type: "bar", type: "bar",
@ -228,35 +222,36 @@ export default {
position: [-18, -16], position: [-18, -16],
color: "#68C483", color: "#68C483",
formatter: function (params) { formatter: function (params) {
return params.value + "片"; return params.value + "MW";
}, },
}, },
}, },
{ {
name: '销量折线图', name: '',
type: 'bar', type: 'bar',
data: [0, 0, 0, data: [0, 0, 0,
{ {
value: 5, value: 5,
itemStyle: { itemStyle: {
color: '#FFCE6A' color: '#68C483'
} }
}], }],
barWith: "40%", type: "bar",
barWidth: 20,
label: { label: {
show: true, show: true,
position: "top", position: [-18, -16],
formatter: "{c}%" color: "#68C483",
}, formatter: function (params) {
lineStyle: { return params.value + "%";
color: "#ffb122" },
}, },
yAxisIndex: 1 yAxisIndex: 1
} }
], ],
}, },
chartMsg: { chartMsg: {
color: ["#8EF0AB", "#288AFF", '#64BDFF', "#FFCE6A",], color: ["#8EF0AB", "#288AFF","#FFCE6A",],
xData: [], xData: [],
yName: "", yName: "",
yAxis: [ yAxis: [
@ -281,11 +276,8 @@ export default {
], ],
series: [ series: [
{ {
name: "FTO投入", name: "芯片总功率",
data: [ data: [
{ name: "%", value: 57.5 },
{ name: "%", value: 21.66 },
{ name: "%", value: 18.4 },
], ],
type: "bar", type: "bar",
barWidth: 20, barWidth: 20,
@ -294,16 +286,13 @@ export default {
position: [-18, -16], position: [-18, -16],
color: "#68C483", color: "#68C483",
formatter: function (params) { formatter: function (params) {
return params.value.toFixed(2) + "%"; return params.value.toFixed(2) + "MW";
}, },
}, },
}, },
{ {
name: "芯片产量", name: "标准组件总功率",
data: [ data: [
{ name: "%", value: 23.33 },
{ name: "%", value: 7.02 },
{ name: "%", value: 80.2 },
], ],
type: "bar", type: "bar",
barWidth: 20, barWidth: 20,
@ -312,34 +301,13 @@ export default {
position: [0, -16], position: [0, -16],
color: "#288AFF", color: "#288AFF",
formatter: function (params) { formatter: function (params) {
return params.value.toFixed(2) + "%"; return params.value.toFixed(2) + "MW";
}, },
}, },
}, },
{ {
name: "标准组件产量", name: "转化效率",
data: [ data: [
{ name: "%", value: 23.33 },
{ name: "%", value: 7.02 },
{ name: "%", value: 80.2 },
],
type: "bar",
barWidth: 20,
label: {
show: true,
position: [0, -16],
color: "#64BDFF",
formatter: function (params) {
return params.value.toFixed(2) + "%";
},
},
},
{
name: "综合良率",
data: [
{ name: "%", value: 85 },
{ name: "%", value: 85 },
{ name: "%", value: 85 },
], ],
type: "line", type: "line",
symbol: "circle", symbol: "circle",
@ -423,67 +391,69 @@ export default {
}, },
mounted() { mounted() {
// this.getOverView() // this.getOverView()
const currentMonth = new Date() const today = new Date()
this.listQuery.reportTime = [moment(currentMonth).format('yyyy-MM-DD'), moment(currentMonth).format('yyyy-MM-DD')] const sevenDaysAgo = new Date(today.getTime() - (7 * 24 * 60 * 60 * 1000))
this.changeTime() this.listQuery.beginTime = moment(sevenDaysAgo).format('yyyy-MM-DD')
this.listQuery.endTime = moment(today).format('yyyy-MM-DD')
this.listQuery.reportTime = [this.listQuery.beginTime, this.listQuery.endTime]
this.getDataList() this.getDataList()
}, },
methods: { methods: {
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
let spanOneArr = [], concatOne = 0;
// let spanTwoArr = [], concatTwo = 0;
this.tableData.map((item, index) => {
// console.log(inde);
if (index === 0) {
spanOneArr.push(1);
} else {
//第一列需合并相同内容的判断条件
if (item.factory === this.tableData[index - 1].factory) {
spanOneArr[concatOne] += 1;
spanOneArr.push(0);
} else {
spanOneArr.push(1);
concatOne = index;
};
}
});
if (columnIndex === 0) {
const _row = spanOneArr[rowIndex];
const _col = _row > 0 ? 1 : 0;
return {
rowspan: _row,
colspan: _col
}
}
},
getYear(e) { getYear(e) {
if (this.end && Number(this.end) - Number(this.start) > 10) { if (this.listQuery.end - this.listQuery.start > 10 * 365 * 24 * 60 * 60 * 1000) {
this.$message({ this.$message({
message: '年份起止时间不能超过十年', message: '年份起止时间不能超过十年',
type: 'warning' type: 'warning'
}); });
this.start = undefined this.listQuery.reportTime = []
this.end = undefined this.listQuery.start = undefined
this.listQuery.end = undefined
// console.log(); // console.log();
} else { } else {
if (Number(this.end) < Number(this.start)) { this.listQuery.beginTime = this.listQuery.start
this.$message({ this.listQuery.endTime = this.listQuery.end
message: '结束年份不能小于开始年份',
type: 'warning'
});
this.start = undefined
this.end = undefined
} else {
this.listQuery.beginTime = Number(this.start)
this.listQuery.endTime = Number(this.end)
}
} }
if (!this.start && !this.end) { if (!this.listQuery.start && !this.listQuery.end) {
this.listQuery.beginTime = undefined this.listQuery.beginTime = undefined
this.listQuery.endTime = undefined this.listQuery.endTime = undefined
} }
// console.log(e); // console.log(e);
}, },
changeTime() {
if (this.listQuery.reportTime) {
console.log(this.listQuery.reportTime)
let start = new Date(this.listQuery.reportTime[0])
let end = new Date(this.listQuery.reportTime[1])
// const years = Number(this.listQuery.reportTime[1].slice(0, 4)) - Number(this.listQuery.reportTime[0].slice(0, 4))
// const months = Number(this.listQuery.reportTime[1].slice(4)) - Number(this.listQuery.reportTime[0].slice(4))
// console.log(years);
if ((end - start) > 31104000000) {
this.$message({
message: '时间范围不能超过24个月',
type: 'warning'
});
this.listQuery.reportTime = [];
} else {
this.listQuery.beginTime = this.listQuery.reportTime[0]
this.listQuery.endTime = this.listQuery.reportTime[1]
}
} else {
this.listQuery.beginTime = undefined
this.listQuery.endTime = undefined
}
},
onValueChange(picker, k) { // 选中近k周后触发的操作 onValueChange(picker, k) { // 选中近k周后触发的操作
if (this.start && this.end) { // console.log(this.listQuery.reportTime[0], this.listQuery.reportTime[1])
this.date1 = moment(this.start.getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD') if (this.listQuery.start && this.listQuery.end) {
this.date2 = moment(this.end.getTime() + 5 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD') 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); const numDays = (new Date(this.date2).getTime() - new Date(this.date1).getTime()) / (24 * 3600 * 1000);
if (numDays > 168) { if (numDays > 168) {
console.log(numDays) console.log(numDays)
@ -492,20 +462,21 @@ export default {
type: 'warning' type: 'warning'
}); });
} else { } else {
this.listQuery.beginTime = this.date1 this.listQuery.beginTime = moment(this.listQuery.start.getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
this.listQuery.endTime = this.date2 this.listQuery.endTime = moment(this.listQuery.end.getTime() + 5 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
// this.listQuery.beginTime = Number(moment(this.start.getTime()).format('YYYYWW'))
// this.listQuery.endTime = Number(moment(this.end.getTime()).format('YYYYWW'))
} }
} }
if (!this.start && !this.end) { if (!this.listQuery.start && !this.listQuery.end) {
this.listQuery.beginTime = undefined this.listQuery.beginTime = undefined
this.listQuery.endTime = undefined this.listQuery.endTime = undefined
} }
}, },
changeDayTime() { changeDayTime() {
if (this.listQuery.reportTime) { if (this.listQuery.reportTime) {
const numDays = Number(this.listQuery.reportTime[1]) - Number(this.listQuery.reportTime[0]) // this.createbeginTime = moment(new Date(this.listQuery.reportTime[0]), 'yyyy-MM-dd hh:mm:ss');
// this.createendTime = moment(new Date(this.listQuery.reportTime[1]), 'yyyy-MM-dd hh:mm:ss');
console.log(this.listQuery.reportTime[1])
const numDays = (this.listQuery.reportTime[1] - this.listQuery.reportTime[0]) / (24 * 3600 * 1000);
if (numDays > 30) { if (numDays > 30) {
this.$message({ this.$message({
message: '时间范围不能超过30天', message: '时间范围不能超过30天',
@ -521,18 +492,23 @@ export default {
this.listQuery.endTime = undefined this.listQuery.endTime = undefined
} }
}, },
getOverView() { changeTime(value) {
// getOverView().then(res => { if (this.listQuery.reportTime) {
// this.data = res.data const numDays = this.listQuery.reportTime[1] - this.listQuery.reportTime[0];
// console.log('aa', res.data) if (numDays > 2 * 365 * 24 * 60 * 60 * 1000) {
// }) this.$message({
}, message: '时间范围不能超过24个月',
otherMethods(val) { type: 'warning'
this.detailOrUpdateVisible = true; });
// this.addOrEditTitle = "详情"; this.listQuery.reportTime = [];
this.$nextTick(() => { } else {
// this.$refs.detailOrUpdate.init(val.data.id); this.listQuery.beginTime = this.listQuery.reportTime[0]
}); this.listQuery.endTime = this.listQuery.reportTime[1]
}
} else {
this.listQuery.beginTime = undefined
this.listQuery.endTime = undefined
}
}, },
async getDataList() { async getDataList() {
this.otherProps = [] this.otherProps = []
@ -563,30 +539,49 @@ export default {
} }
] ]
res.data.forEach(element => { res.data.forEach(element => {
element.list.forEach((ele, index) => { element.list.reverse().forEach((ele, index) => {
let i = index + 1 let i = index + 1
this.chartMsg.xData.push(ele.reportTimep) this.chartMsg.xData.push(ele.reportTimep)
this.otherProps.push({ this.otherProps.push({
label: ele.reportTimep, label: ele.reportTimep,
props: 'value' + i prop: 'value' + i
}) })
}) })
}); })
console.log(this.otherProps) if (res.data[0].list.length != 0) {
res.data.forEach((ele, index) => { this.chartMsg.xData.push(res.data[0].list[0].reportTimep + '目标')
let i = index + 1 if (this.listQuery.date === 0 || this.listQuery.date === 1 || this.listQuery.date === 2) {
let m = 'value' + i this.otherProps.push({
ele.list.forEach((item, index) => { label: res.data[0].list[0].reportTimep + '目标',
prop: 'dayData'
})
dataArr[0]['dayData'] = res.data[0].list[0].chipTarget
dataArr[1]['dayData'] = res.data[0].list[0].standTarget
dataArr[2]['dayData'] = res.data[0].list[0].conversionEfficiencyTarget
}
if (this.listQuery.date === 2 || this.listQuery.date === 3) {
this.otherProps.push({
label: res.data[0].yearTarget.targetTime,
prop: 'yearData'
})
dataArr[0]['yearData'] = res.data[0].yearTarget.chipTotalPower
dataArr[1]['yearData'] = res.data[0].yearTarget.componentTotalPower
dataArr[2]['yearData'] = res.data[0].yearTarget.componentConversionEfficiency
}
res.data.forEach((ele, index) => {
// let i = index + 1
// let m = 'value' + i
ele.list.forEach((item, index) => {
let i = index + 1 let i = index + 1
let m = 'value' + i let m = 'value' + i
// ele.productionSituationDataVOList.forEach((item) => { // ele.productionSituationDataVOList.forEach((item) => {
dataArr[0]['' + m + ''] = item.chipTotalPowers dataArr[0]['' + m + ''] = item.chipTotalPowers
dataArr[1]['' + m + ''] = item.scTotalPowers
dataArr[2]['' + m + ''] = item.conversionEfficiency
dataArr[0].factory = ele.factory === 1 ? '邯郸' : '瑞昌' dataArr[0].factory = ele.factory === 1 ? '邯郸' : '瑞昌'
dataArr[1].factory = ele.factory === 1 ? '邯郸' : '瑞昌' dataArr[1].factory = ele.factory === 1 ? '邯郸' : '瑞昌'
dataArr[2].factory = ele.factory === 1 ? '邯郸' : '瑞昌' dataArr[2].factory = ele.factory === 1 ? '邯郸' : '瑞昌'
dataArr[3].factory = ele.factory === 1 ? '邯郸' : '瑞昌'
dataArr[1]['' + m + ''] = ele.scTotalPowers
dataArr[2]['' + m + ''] = ele.conversionEfficiency
// dataArr[3]['' + m + ''] = ele.comprehensiveYieldRate // dataArr[3]['' + m + ''] = ele.comprehensiveYieldRate
// }) // })
// ele.titleValue // ele.titleValue
@ -595,100 +590,77 @@ export default {
// props: 'value' + index + 1, // props: 'value' + index + 1,
// }) // })
}) })
// ele.productionSituationDataVOList.forEach((item) => { })
// dataArr[0]['' + m + ''] = item.chipTotalPowers this.title = res.data[0].yearTarget.targetTime + '目标值'
// dataArr[0].factory = ele.factory === 1 ? '邯郸' : '瑞昌' this.chartMsgYearTarget.series[0].data = [
// dataArr[1].factory = ele.factory === 1 ? '邯郸' : '瑞昌' {
// dataArr[2].factory = ele.factory === 1 ? '邯郸' : '瑞昌' value: res.data[0].yearTarget.chipTotalPower,
// dataArr[3].factory = ele.factory === 1 ? '邯郸' : '瑞昌' itemStyle: {
// dataArr[1]['' + m + ''] = ele.scTotalPowers color: '#8EF0AB'
// dataArr[2]['' + m + ''] = ele.conversionEfficiency }
// dataArr[3]['' + m + ''] = ele.comprehensiveYieldRate },
// }) {
// ele.titleValue value: res.data[0].yearTarget.componentTotalPower,
// .push({ itemStyle: {
// label: ele.titleValue, color: '#288AFF'
// props: 'value' + index + 1, }
// }) },
}) {
for (let i in dataArr[0]) { value: null,
this.chartMsg.series[0].name = dataArr[0]['item'] itemStyle: {
if (i.search('value') === 0) { color: '#64BDFF'
this.chartMsg.series[0].data.push({ }
name: dataArr[0]['item'], }]
name: dataArr[0][i] this.chartMsgYearTarget.series[1].data = [
}) {
value: null,
itemStyle: {
color: '#8EF0AB'
}
},
{
value: null,
itemStyle: {
color: '#288AFF'
}
},
{
value: res.data[0].yearTarget.componentConversionEfficiency,
itemStyle: {
color: '#64BDFF'
}
}]
console.log(dataArr);
for (let i in dataArr[0]) {
this.chartMsg.series[0].name = dataArr[0]['item']
if (i.search('value') === 0) {
this.chartMsg.series[0].data.push({
name: dataArr[0]['item'],
value: dataArr[0][i]
})
}
} }
} for (let i in dataArr[1]) {
for (let i in dataArr[1]) { this.chartMsg.series[1].name = dataArr[1]['item']
this.chartMsg.series[1].name = dataArr[1]['item'] if (i.search('value') === 0) {
if (i.search('value') === 0) { this.chartMsg.series[1].data.push({
this.chartMsg.series[1].data.push({ name: dataArr[1]['item'],
name: dataArr[1]['item'], value: dataArr[1][i]
name: dataArr[1][i] })
}) }
} }
} for (let i in dataArr[2]) {
for (let i in dataArr[2]) { this.chartMsg.series[2].name = dataArr[2]['item']
this.chartMsg.series[2].name = dataArr[2]['item'] if (i.search('value') === 0) {
if (i.search('value') === 0) { this.chartMsg.series[2].data.push({
this.chartMsg.series[2].data.push({ name: dataArr[2]['item'],
name: dataArr[2]['item'], value: dataArr[2][i]
name: dataArr[2][i] })
}) }
}
}
for (let i in dataArr[3]) {
this.chartMsg.series[3].name = dataArr[3]['item']
if (i.search('value') === 0) {
this.chartMsg.series[3].data.push({
name: dataArr[3]['item'],
name: dataArr[3][i]
})
}
}
// this.tableProps = otherProps
// res.data.list.forEach((ele) => {
// console.log(ele);
// ele.productionSituationDataVOList.forEach((item) => {
// let obj = {
// bipvProductOutput: item.bipvProductOutput,
// chipYield: item.chipYield,
// componentYield: item.componentYield,
// factory: item.factory,
// ftoInput: item.ftoInput,
// titleValue:ele.titleValue
// }
// dataArr.push(obj)
// })
// })
for (let i in dataArr[0]) {
this.chartMsg.series[0].name = dataArr[0]['item']
if (i.search('value') === 0) {
this.chartMsg.series[0].data.push({
name: dataArr[0]['item'],
value: dataArr[0][i]
})
}
}
for (let i in dataArr[1]) {
this.chartMsg.series[1].name = dataArr[1]['item']
if (i.search('value') === 0) {
this.chartMsg.series[1].data.push({
name: dataArr[1]['item'],
value: dataArr[1][i]
})
}
}
for (let i in dataArr[2]) {
this.chartMsg.series[2].name = dataArr[2]['item']
if (i.search('value') === 0) {
this.chartMsg.series[2].data.push({
name: dataArr[2]['item'],
value: dataArr[2][i]
})
} }
} else {
this.chartMsgYearTarget.series[0].data = []
this.chartMsgYearTarget.series[1].data = []
} }
// for (let i in dataArr[3]) { // for (let i in dataArr[3]) {
// this.chartMsg.series[3].name = dataArr[3]['item'] // this.chartMsg.series[3].name = dataArr[3]['item']
@ -699,16 +671,7 @@ export default {
// }) // })
// } // }
// } // }
console.log(dataArr) this.tableData =res.data[0].list.length !== 0? dataArr : []
this.tableData = dataArr
// this.tableProps.push()
this.listQuery.total = res.data.total
if (this.listQuery.total > 0) {
this.tableData.forEach(item => {
item.beginTime = item.beginTime ? item.beginTime[0] + '-' + item.beginTime[1] + '-' + item.beginTime[2] : '--'
item.endTime = item.endTime ? item.endTime[0] + '-' + item.endTime[1] + '-' + item.endTime[2] : '--'
})
}
}, },
_setTableHeight() { _setTableHeight() {
this.tableH = this.tableHeight(137) / 2 - 70; this.tableH = this.tableHeight(137) / 2 - 70;

392
src/views/report/productionSituationMW.vue
View File

@ -100,8 +100,8 @@
:chartId="chartId" :chartNum="chartNum" /> :chartId="chartId" :chartNum="chartNum" />
<!-- </el-col> --> <!-- </el-col> -->
</el-row> </el-row>
<base-table :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size" :table-data="tableData" <base-table :span-method="objectSpanMethod" :table-props="tableProps" :page="listQuery.current"
:max-height="tableH" /> :limit="listQuery.size" :table-data="tableData" :max-height="tableH" />
</div> </div>
<!-- <div class="containerBottom"> <!-- <div class="containerBottom">
@ -185,9 +185,6 @@ export default {
{ {
name: "芯片总功率", name: "芯片总功率",
data: [ data: [
{ name: "%", value: 57.5 },
{ name: "%", value: 21.66 },
{ name: "%", value: 18.4 },
], ],
type: "bar", type: "bar",
barWidth: 20, barWidth: 20,
@ -202,11 +199,7 @@ export default {
}, },
{ {
name: "标准组件总功率", name: "标准组件总功率",
data: [ data: [],
{ name: "%", value: 23.33 },
{ name: "%", value: 7.02 },
{ name: "%", value: 80.2 },
],
type: "bar", type: "bar",
barWidth: 20, barWidth: 20,
label: { label: {
@ -221,7 +214,7 @@ export default {
], ],
}, },
chartMsgTarget: { chartMsgTarget: {
color: [ "#8EF0AB", "#288AFF",'rgba(104, 196, 131, .5)', 'rgba(40, 138, 255, .5)'], color: ["#8EF0AB", 'rgba(104, 196, 131, .3)', "#288AFF", 'rgba(40, 138, 255, .2)',],
xData: [], xData: [],
yName: "单位/MW", yName: "单位/MW",
yAxis: { yAxis: {
@ -256,9 +249,6 @@ export default {
{ {
name: "芯片总功率", name: "芯片总功率",
data: [ data: [
{ name: "%", value: 57.5 },
{ name: "%", value: 21.66 },
{ name: "%", value: 18.4 },
], ],
type: "bar", type: "bar",
barWidth: 20, barWidth: 20,
@ -274,9 +264,6 @@ export default {
{ {
name: "标准组件总功率", name: "标准组件总功率",
data: [ data: [
{ name: "%", value: 23.33 },
{ name: "%", value: 7.02 },
{ name: "%", value: 80.2 },
], ],
type: "bar", type: "bar",
barWidth: 20, barWidth: 20,
@ -381,6 +368,35 @@ export default {
this.getDataList() this.getDataList()
}, },
methods: { methods: {
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
let spanOneArr = [], concatOne = 0;
// let spanTwoArr = [], concatTwo = 0;
this.tableData.map((item, index) => {
// console.log(inde);
if (index === 0) {
spanOneArr.push(1);
} else {
//第一列需合并相同内容的判断条件
if (item.factory === this.tableData[index - 1].factory) {
spanOneArr[concatOne] += 1;
spanOneArr.push(0);
} else {
spanOneArr.push(1);
concatOne = index;
};
}
});
if (columnIndex === 0) {
const _row = spanOneArr[rowIndex];
const _col = _row > 0 ? 1 : 0;
return {
rowspan: _row,
colspan: _col
}
}
},
getYear(e) { getYear(e) {
if (this.listQuery.end - this.listQuery.start > 10 * 365 * 24 * 60 * 60 * 1000) { if (this.listQuery.end - this.listQuery.start > 10 * 365 * 24 * 60 * 60 * 1000) {
this.$message({ this.$message({
@ -480,7 +496,7 @@ export default {
// this.chartMsg.xData.push(ele.titleValue.replace(/[^\d]/g, " ")) // this.chartMsg.xData.push(ele.titleValue.replace(/[^\d]/g, " "))
this.otherProps.push({ this.otherProps.push({
label: ele.titleValue, label: ele.titleValue,
props: 'value' + i prop: 'value' + i
}) })
}) })
// res.data.list.forEach((ele) => { // res.data.list.forEach((ele) => {
@ -520,100 +536,100 @@ export default {
// }, // },
// },] // },]
let arr = [] let arr = []
let chip = []
let std = []
res.data.list.slice(res.data.list.length - 3, res.data.list.length - 1).forEach((ele, index) => { res.data.list.slice(res.data.list.length - 3, res.data.list.length - 1).forEach((ele, index) => {
console.log(ele.titleValue.search('目标')); console.log(ele.titleValue.search('目标'));
// let i = index + 1 // let i = index + 1
// this.chartMsgTarget.xData.push(ele.titleValue) // this.chartMsgTarget.xData.push(ele.titleValue)
ele.productionSituationPowerDataVOList.forEach((item) => { ele.productionSituationPowerDataVOList.forEach((item) => {
if (ele.titleValue.search('目标') != -1) { if (ele.titleValue.search('目标') != -1) {
arr.push( chip.push({
{ name: "芯片总功率目标值",
name: "芯片总功率目标值", // barGap: '-100%',
// barGap: '-100%', stack: 'a',
stack: 'a', data: [
data: [ { name: "芯片总功率目标值", value: item.componentTotalPower },
{ name: "芯片总功率目标值", value: item.componentTotalPower }, // { name: '芯片总功率目标值', value: 22 },
// { name: '芯片总功率目标值', value: 22 }, // { name: "%", value: 21.66 },
// { name: "%", value: 21.66 }, // { name: "%", value: 18.4 },
// { name: "%", value: 18.4 }, ],
], type: "bar",
type: "bar", barWidth: 20,
barWidth: 20, // barGap: '-100%',
// barGap: '-100%', label: {
label: { show: true,
show: true, position: [-18, -16],
position: [-18, -16], color: "rgba(104,196,131,.5)",
color: "rgba(104,196,131,.5)", formatter: function (params) {
formatter: function (params) { return params.value
return params.value
},
}, },
}, },
{ },)
name: "标准组件总功率目标值", std.push({
stack: 'b', name: "标准组件总功率目标值",
data: [ stack: 'b',
{ name: "标准组件总功率目标值", value: item.componentYield }, data: [
// { name: '标准组件总功率目标值', value: 23 }, { name: "标准组件总功率目标值", value: item.componentYield },
// { name: '标准组件总功率目标值', value: 23 },
// { name: "%", value: 7.02 }, // { name: "%", value: 7.02 },
// { name: "%", value: 80.2 }, // { name: "%", value: 80.2 },
], ],
type: "bar", type: "bar",
barWidth: 20, barWidth: 20,
label: { label: {
show: true, show: true,
position: [0, -16], position: [0, -16],
color: "rgba(40,138,255,.5)", color: "rgba(40,138,255,.5)",
formatter: function (params) { formatter: function (params) {
return params.value return params.value
},
},
})
} else {
arr.push(
{
name: "芯片总功率完成值",
// barGap: '-100%',
stack: 'a',
data: [
{ name: "芯片总功率完成值", value: item.componentTotalPower },
// { name: '芯片总功率完成值', value: 55 },
// { name: "%", value: 21.66 },
// { name: "%", value: 18.4 },
],
type: "bar",
barWidth: 20,
// barGap: '-100%',
label: {
show: true,
position: [-18, -16],
color: "rgba(104,196,131)",
formatter: function (params) {
return params.value
},
}, },
}, },
{ })
name: "标准组件总功率完成值", } else {
stack: 'b', chip.unshift({
data: [ name: "芯片总功率完成值",
{ name: "标准组件总功率完成值", value: item.componentYield }, // barGap: '-100%',
// { name: '标准组件总功率完成值', value: 23 }, stack: 'a',
// { name: "%", value: 7.02 }, data: [
// { name: "%", value: 80.2 }, { name: "芯片总功率完成值", value: item.componentTotalPower },
], // { name: '芯片总功率完成值', value: 55 },
type: "bar", // { name: "%", value: 21.66 },
barWidth: 20, // { name: "%", value: 18.4 },
label: { ],
show: true, type: "bar",
position: [0, -16], barWidth: 20,
color: "rgba(40,138,255)", // barGap: '-100%',
formatter: function (params) { label: {
return params.value show: true,
}, position: [-18, -16],
color: "rgba(104,196,131)",
formatter: function (params) {
return params.value
}, },
}) },
},)
std.unshift({
name: "标准组件总功率完成值",
stack: 'b',
data: [
{ name: "标准组件总功率完成值", value: item.componentYield },
// { name: '标准组件总功率完成值', value: 23 },
// { name: "%", value: 7.02 },
// { name: "%", value: 80.2 },
],
type: "bar",
barWidth: 20,
label: {
show: true,
position: [0, -16],
color: "rgba(40,138,255)",
formatter: function (params) {
return params.value
},
},
})
} }
// this.chartMsgTarget.series[1].data.push() // this.chartMsgTarget.series[1].data.push()
@ -622,7 +638,7 @@ export default {
}) })
}) })
console.log('arr', arr) console.log('arr', arr)
this.chartMsgTarget.series = arr this.chartMsgTarget.series = [...chip, ...std]
// arr.forEach((ele) => { // arr.forEach((ele) => {
// }) // })
@ -667,7 +683,7 @@ export default {
// this.chartMsg.xData.push(ele.titleValue.replace(/[^\d]/g, " ")) // this.chartMsg.xData.push(ele.titleValue.replace(/[^\d]/g, " "))
this.otherProps.push({ this.otherProps.push({
label: ele.titleValue, label: ele.titleValue,
props: 'value' + i prop: 'value' + i
}) })
}) })
// res.data.list.forEach((ele) => { // res.data.list.forEach((ele) => {
@ -707,100 +723,100 @@ export default {
// }, // },
// },] // },]
let arr = [] let arr = []
let chip = []
let std = []
res.data.list.slice(res.data.list.length - 1, res.data.list.length).forEach((ele, index) => { res.data.list.slice(res.data.list.length - 1, res.data.list.length).forEach((ele, index) => {
console.log(ele.titleValue.search('目标')); console.log(ele.titleValue.search('目标'));
// let i = index + 1 // let i = index + 1
// this.chartMsgTarget.xData.push(ele.titleValue) // this.chartMsgTarget.xData.push(ele.titleValue)
ele.productionSituationPowerDataVOList.forEach((item) => { ele.productionSituationPowerDataVOList.forEach((item) => {
if (ele.titleValue.search('目标') != -1) { if (ele.titleValue.search('目标') != -1) {
arr.push( chip.push({
{ name: "芯片总功率目标值",
name: "芯片总功率目标值", // barGap: '-100%',
// barGap: '-100%', stack: 'a',
stack: 'a', data: [
data: [ { name: "芯片总功率目标值", value: item.componentTotalPower },
// { name: "芯片总功率目标值", value: item.componentTotalPower }, // { name: '芯片总功率目标值', value: 22 },
{ name: '芯片总功率目标值', value: 22 }, // { name: "%", value: 21.66 },
// { name: "%", value: 21.66 }, // { name: "%", value: 18.4 },
// { name: "%", value: 18.4 }, ],
], type: "bar",
type: "bar", barWidth: 20,
barWidth: 20, // barGap: '-100%',
// barGap: '-100%', label: {
label: { show: true,
show: true, position: [-18, -16],
position: [-18, -16], color: "rgba(104,196,131,.5)",
color: "rgba(104,196,131,.5)", formatter: function (params) {
formatter: function (params) { return params.value
return params.value
},
}, },
}, },
{ },)
name: "标准组件总功率目标值", std.push({
stack: 'b', name: "标准组件总功率目标值",
data: [ stack: 'b',
// { name: "标准组件总功率目标值", value: item.componentYield }, data: [
{ name: '标准组件总功率目标值', value: 23 }, { name: "标准组件总功率目标值", value: item.componentYield },
// { name: '标准组件总功率目标值', value: 23 },
// { name: "%", value: 7.02 }, // { name: "%", value: 7.02 },
// { name: "%", value: 80.2 }, // { name: "%", value: 80.2 },
], ],
type: "bar", type: "bar",
barWidth: 20, barWidth: 20,
label: { label: {
show: true, show: true,
position: [0, -16], position: [0, -16],
color: "rgba(40,138,255,.5)", color: "rgba(40,138,255,.5)",
formatter: function (params) { formatter: function (params) {
return params.value return params.value
},
},
})
} else {
arr.push(
{
name: "芯片总功率完成值",
// barGap: '-100%',
stack: 'a',
data: [
// { name: "芯片总功率完成值", value: item.componentTotalPower },
{ name: '芯片总功率完成值', value: 55 },
// { name: "%", value: 21.66 },
// { name: "%", value: 18.4 },
],
type: "bar",
barWidth: 20,
// barGap: '-100%',
label: {
show: true,
position: [-18, -16],
color: "rgba(104,196,131)",
formatter: function (params) {
return params.value
},
}, },
}, },
{ })
name: "标准组件总功率完成值", } else {
stack: 'b', chip.unshift({
data: [ name: "芯片总功率完成值",
// { name: "标准组件总功率完成值", value: item.componentYield }, // barGap: '-100%',
{ name: '标准组件总功率完成值', value: 23 }, stack: 'a',
// { name: "%", value: 7.02 }, data: [
// { name: "%", value: 80.2 }, { name: "芯片总功率完成值", value: item.componentTotalPower },
], // { name: '芯片总功率完成值', value: 55 },
type: "bar", // { name: "%", value: 21.66 },
barWidth: 20, // { name: "%", value: 18.4 },
label: { ],
show: true, type: "bar",
position: [0, -16], barWidth: 20,
color: "rgba(40,138,255)", // barGap: '-100%',
formatter: function (params) { label: {
return params.value show: true,
}, position: [-18, -16],
color: "rgba(104,196,131)",
formatter: function (params) {
return params.value
}, },
}) },
},)
std.unshift({
name: "标准组件总功率完成值",
stack: 'b',
data: [
{ name: "标准组件总功率完成值", value: item.componentYield },
// { name: '标准组件总功率完成值', value: 23 },
// { name: "%", value: 7.02 },
// { name: "%", value: 80.2 },
],
type: "bar",
barWidth: 20,
label: {
show: true,
position: [0, -16],
color: "rgba(40,138,255)",
formatter: function (params) {
return params.value
},
},
})
} }
// this.chartMsgTarget.series[1].data.push() // this.chartMsgTarget.series[1].data.push()
@ -809,7 +825,7 @@ export default {
}) })
}) })
console.log('arr', arr) console.log('arr', arr)
this.chartMsgTarget.series = arr this.chartMsgTarget.series = [...chip,...std]
console.log(this.chartMsg.xData) console.log(this.chartMsg.xData)
res.data.list.forEach((ele, index) => { res.data.list.forEach((ele, index) => {
let i = index + 1 let i = index + 1
@ -834,7 +850,7 @@ export default {
this.chartMsg.xData.push(ele.titleValue) this.chartMsg.xData.push(ele.titleValue)
this.otherProps.push({ this.otherProps.push({
label: ele.titleValue, label: ele.titleValue,
props: 'value' + i prop: 'value' + i
}) })
}) })
console.log(this.otherProps) console.log(this.otherProps)
@ -872,7 +888,7 @@ export default {
} }
} }
} }
this.tableData = this.dataArr this.tableData = res.data.length != 0 ? this.dataArr : []
// this.tableProps = otherProps // this.tableProps = otherProps
// res.data.list.forEach((ele) => { // res.data.list.forEach((ele) => {
// console.log(ele); // console.log(ele);
@ -910,7 +926,7 @@ export default {
console.log("========================="); console.log("=========================");
}, },
handleExport() { handleExport() {
let fileName = "生产情况(片).xls"; let fileName = "生产情况(MW).xls";
exportProductionSituationMWData(this.listQuery) exportProductionSituationMWData(this.listQuery)
.then((response) => { .then((response) => {
this.$download.excel(response, fileName); this.$download.excel(response, fileName);

662
src/views/report/productionSituationTablets.vue
View File

@ -100,8 +100,8 @@
:chartId="chartId" :chartNum="chartNum" /> :chartId="chartId" :chartNum="chartNum" />
<!-- </el-col> --> <!-- </el-col> -->
</el-row> </el-row>
<base-table :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size" :table-data="tableData" <base-table :span-method="objectSpanMethod" :table-props="tableProps" :page="listQuery.current"
:max-height="tableH" /> :limit="listQuery.size" :table-data="tableData" :max-height="tableH" />
</div> </div>
<!-- <div class="containerBottom"> <!-- <div class="containerBottom">
@ -160,14 +160,14 @@ export default {
chartHeight: this.tableHeight(137) / 2 - 111, chartHeight: this.tableHeight(137) / 2 - 111,
tableH: this.tableHeight(137) / 2 - 70, tableH: this.tableHeight(137) / 2 - 70,
legendList: [ legendList: [
{ id: 1, name: "FTO投入", type: 1, color: "#FFCE6A" }, { id: 1, name: "FTO投入", type: 1, color: "#8EF0AB" },
{ id: 2, name: "芯片产量", type: 1, color: "#8EF0AB" }, { id: 2, name: "芯片产量", type: 1, color: "#288AFF" },
{ id: 3, name: "标准组件产量", type: 1, color: "#288AFF" }, { id: 3, name: "标准组件产量", type: 1, color: "#64BDFF" },
this.currentMenu == '瑞昌' ? '' : this.currentMenu == '瑞昌' ? '' :
{ id: 4, name: "BIPV产量", type: 1, color: "#64BDFF" }, { id: 4, name: "BIPV产量", type: 1, color: "#7164FF" },
], ],
chartMsgYearTarget: { chartMsgYearTarget: {
color: ["#FFCE6A", "#8EF0AB", "#288AFF", '#64BDFF'], color: ["#8EF0AB", "#288AFF", "#64BDFF", '#7164FF'],
xData: [], xData: [],
yName: "单位/片", yName: "单位/片",
yAxis: { yAxis: {
@ -184,15 +184,12 @@ export default {
{ {
name: "FTO投入", name: "FTO投入",
data: [ data: [
{ name: "%", value: 85 },
{ name: "%", value: 85 },
{ name: "%", value: 85 },
], ],
type: "bar", type: "bar",
barWidth: 20, barWidth: 20,
label: { label: {
show: true, show: true,
color: "#FFAE17", color: "#8EF0AB",
position: [-18, -16], position: [-18, -16],
formatter: function (params) { formatter: function (params) {
return params.value return params.value
@ -202,16 +199,13 @@ export default {
{ {
name: "芯片产量", name: "芯片产量",
data: [ data: [
{ name: "%", value: 57.5 },
{ name: "%", value: 21.66 },
{ name: "%", value: 18.4 },
], ],
type: "bar", type: "bar",
barWidth: 20, barWidth: 20,
label: { label: {
show: true, show: true,
position: [-18, -16], position: [-18, -16],
color: "#68C483", color: "#288AFF",
formatter: function (params) { formatter: function (params) {
return params.value return params.value
}, },
@ -220,16 +214,13 @@ export default {
{ {
name: "标准组件产量", name: "标准组件产量",
data: [ data: [
{ name: "%", value: 23.33 },
{ name: "%", value: 7.02 },
{ name: "%", value: 80.2 },
], ],
type: "bar", type: "bar",
barWidth: 20, barWidth: 20,
label: { label: {
show: true, show: true,
position: [0, -16], position: [0, -16],
color: "#288AFF", color: "#64BDFF",
formatter: function (params) { formatter: function (params) {
return params.value return params.value
}, },
@ -238,17 +229,13 @@ export default {
this.currentMenu == '瑞昌' ? '' : this.currentMenu == '瑞昌' ? '' :
{ {
name: "BIPV产量", name: "BIPV产量",
data: [ data: [],
{ name: "%", value: 23.33 },
{ name: "%", value: 7.02 },
{ name: "%", value: 80.2 },
],
type: "bar", type: "bar",
barWidth: 20, barWidth: 20,
label: { label: {
show: true, show: true,
position: [0, -16], position: [0, -16],
color: "#64BDFF", color: "#7164FF",
formatter: function (params) { formatter: function (params) {
return params.value return params.value
}, },
@ -257,7 +244,7 @@ export default {
], ],
}, },
chartMsgTarget: { chartMsgTarget: {
color: ["#FFCE6A", "#8EF0AB", "#288AFF", '#64BDFF', 'rgba(255, 174, 23, .5)', 'rgba(104, 196, 131, .5)', 'rgba(40, 138, 255, .5)', 'rgba(100,189,255,.2)'], color: [ "#8EF0AB", 'rgba(104, 196, 131, .3)', "#288AFF", 'rgba(40, 138, 255, .2)', "#64BDFF", 'rgba(100,189,255,.3)', '#7164FF', 'rgba(113,100,255,.2)',],
xData: [], xData: [],
yName: "单位/片", yName: "单位/片",
yAxis:{ yAxis:{
@ -275,7 +262,7 @@ export default {
], ],
}, },
chartMsg: { chartMsg: {
color: ["#FFCE6A", "#8EF0AB", "#288AFF",'#64BDFF'], color: ["#8EF0AB", "#288AFF", "#64BDFF", '#7164FF'],
xData: [], xData: [],
yName: "单位/片", yName: "单位/片",
yAxis: yAxis:
@ -292,16 +279,13 @@ export default {
{ {
name: "FTO投入", name: "FTO投入",
data: [ data: [
{ name: "%", value: 85 },
{ name: "%", value: 85 },
{ name: "%", value: 85 },
], ],
type: "bar", type: "bar",
barWidth: 20, barWidth: 20,
label: { label: {
show: true, show: true,
position: [-18, -16], position: [-18, -16],
color: "#FFAE17", color: "#8EF0AB",
formatter: function (params) { formatter: function (params) {
return params.value return params.value
}, },
@ -310,16 +294,13 @@ export default {
{ {
name: "芯片产量", name: "芯片产量",
data: [ data: [
{ name: "%", value: 57.5 },
{ name: "%", value: 21.66 },
{ name: "%", value: 18.4 },
], ],
type: "bar", type: "bar",
barWidth: 20, barWidth: 20,
label: { label: {
show: true, show: true,
position: [10, -16], position: [10, -16],
color: "#68C483", color: "#288AFF",
formatter: function (params) { formatter: function (params) {
return params.value return params.value
}, },
@ -328,16 +309,13 @@ export default {
{ {
name: "标准组件产量", name: "标准组件产量",
data: [ data: [
{ name: "%", value: 23.33 },
{ name: "%", value: 7.02 },
{ name: "%", value: 80.2 },
], ],
type: "bar", type: "bar",
barWidth: 20, barWidth: 20,
label: { label: {
show: true, show: true,
position: [0, -16], position: [0, -16],
color: "#288AFF", color: "#64BDFF",
formatter: function (params) { formatter: function (params) {
return params.value return params.value
}, },
@ -346,17 +324,13 @@ export default {
this.currentMenu == '瑞昌' ? '' : this.currentMenu == '瑞昌' ? '' :
{ {
name: "BIPV产量", name: "BIPV产量",
data: [ data: [],
{ name: "%", value: 23.33 },
{ name: "%", value: 7.02 },
{ name: "%", value: 80.2 },
],
type: "bar", type: "bar",
barWidth: 20, barWidth: 20,
label: { label: {
show: true, show: true,
position: [10, -16], position: [10, -16],
color: "#64BDFF", color: "#7164FF",
formatter: function (params) { formatter: function (params) {
return params.value return params.value
}, },
@ -480,6 +454,35 @@ export default {
this.getDataList() this.getDataList()
}, },
methods: { methods: {
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
let spanOneArr = [], concatOne = 0;
// let spanTwoArr = [], concatTwo = 0;
this.tableData.map((item, index) => {
// console.log(inde);
if (index === 0) {
spanOneArr.push(1);
} else {
//第一列需合并相同内容的判断条件
if (item.factory === this.tableData[index - 1].factory) {
spanOneArr[concatOne] += 1;
spanOneArr.push(0);
} else {
spanOneArr.push(1);
concatOne = index;
};
}
});
if (columnIndex === 0) {
const _row = spanOneArr[rowIndex];
const _col = _row > 0 ? 1 : 0;
return {
rowspan: _row,
colspan: _col
}
}
},
getYear(e) { getYear(e) {
if (this.listQuery.end - this.listQuery.start > 10 * 365 * 24 * 60 * 60 * 1000) { if (this.listQuery.end - this.listQuery.start > 10 * 365 * 24 * 60 * 60 * 1000) {
this.$message({ this.$message({
@ -579,7 +582,7 @@ export default {
// this.chartMsg.xData.push(ele.titleValue.replace(/[^\d]/g, " ")) // this.chartMsg.xData.push(ele.titleValue.replace(/[^\d]/g, " "))
this.otherProps.push({ this.otherProps.push({
label: ele.titleValue, label: ele.titleValue,
props: 'value' + i prop: 'value' + i
}) })
}) })
// res.data.list.forEach((ele) => { // res.data.list.forEach((ele) => {
@ -626,105 +629,25 @@ export default {
// }, // },
// }, // },
// },] // },]
let arr = [] let fto = []
let chip = []
let std = []
let bipv = []
res.data.list.slice(res.data.list.length - 3, res.data.list.length - 1).forEach((ele, index) => { res.data.list.slice(res.data.list.length - 3, res.data.list.length - 1).forEach((ele, index) => {
console.log(ele.titleValue.search('目标')); console.log("ele",ele.titleValue);
// let i = index + 1 // let i = index + 1
// this.chartMsgTarget.xData.push(ele.titleValue) // this.chartMsgTarget.xData.push(ele.titleValue)
ele.productionSituationDataVOList.forEach((item) => { if (ele.titleValue.search('完成') == -1) {
if (ele.titleValue.search('目标') != -1) { ele.productionSituationDataVOList.forEach((item) => {
arr.push({ console.log(item);
// if (ele.titleValue.search('目标') != -1) {
fto.push({
name: "FTO投入目标值", name: "FTO投入目标值",
data: [ data: [
// s // s
// { name: 'FTO投入目标', value: item.ftoInput }, { name: 'FTO投入目标', value: item.ftoInput },
{ name: 'FTO投入目标值', value: 11 }, // { name: 'FTO投入目标值', value: 11 },
// { name: "%", value: 85 },
// { name: "%", value: 85 },
],
type: "bar",
barWidth: 20,
stack:'f',
label: {
show: true,
position: [-18, -16],
color: "rgba(255,174,23,.5)",
formatter: function (params) {
return params.value
},
},
},
{
name: "芯片产量目标值",
// barGap: '-100%',
stack: 'a',
data: [
// { name: "芯片产量目标值", value: item.chipYield },
{ name: '芯片产量目标值', value: 22 },
// { name: "%", value: 21.66 },
// { name: "%", value: 18.4 },
],
type: "bar",
barWidth: 20,
// barGap: '-100%',
label: {
show: true,
position: [-18, -16],
color: "rgba(104,196,131,.5)",
formatter: function (params) {
return params.value
},
},
},
{
name: "标准组件产量目标值",
stack: 'b',
data: [
// { name: "标准组件产量目标值", value: item.componentYield },
{ name: '标准组件产量目标值', value: 23 },
// { name: "%", value: 7.02 },
// { name: "%", value: 80.2 },
],
type: "bar",
barWidth: 20,
label: {
show: true,
position: [0, -16],
color: "rgba(40,138,255,.5)",
formatter: function (params) {
return params.value
},
},
},
this.currentMenu == '瑞昌' ? '' :
{
name: "BIPV产量目标值",
stack: 'c',
data: [
// { name: "BIPV产量目标值", value: item.bipvProductOutput },
{ name: 'BIPV产量目标值', value: 24 },
// { name: "%", value: 7.02 },
// { name: "%", value: 80.2 },
],
type: "bar",
barWidth: 20,
label: {
show: true,
position: [0, -16],
color: "rgba(100,189,255,.2)",
formatter: function (params) {
return params.value
},
},
},)
} else {
arr.push({
name: "FTO投入完成值",
data: [
// s
// { name: 'FTO投入完成值', value: item.ftoInput },
{ name: 'FTO投入完成值', value: 33 },
// { name: "%", value: 85 }, // { name: "%", value: 85 },
// { name: "%", value: 85 }, // { name: "%", value: 85 },
], ],
@ -734,40 +657,62 @@ export default {
label: { label: {
show: true, show: true,
position: [-18, -16], position: [-18, -16],
color: "rgba(255,174,23)", color: "rgba(104,196,131,.3)",
formatter: function (params) { formatter: function (params) {
return params.value return params.value
}, },
}, },
}, },)
{ chip.push({
name: "芯片产量完成值", name: "芯片产量目标值",
// barGap: '-100%', // barGap: '-100%',
stack: 'a', stack: 'a',
data: [ data: [
// { name: "芯片产量完成值", value: item.chipYield }, { name: "芯片产量目标值", value: item.chipYield },
{ name: '芯片产量完成值', value:55 }, // { name: '芯片产量目标值', value: 22 },
// { name: "%", value: 21.66 }, // { name: "%", value: 21.66 },
// { name: "%", value: 18.4 }, // { name: "%", value: 18.4 },
], ],
type: "bar", type: "bar",
barWidth: 20, barWidth: 20,
// barGap: '-100%', // barGap: '-100%',
label: { label: {
show: true, show: true,
position: [-18, -16], position: [-18, -16],
color: "rgba(104,196,131)", color: "rgba(40,138,255,.2)",
formatter: function (params) { formatter: function (params) {
return params.value return params.value
},
}, },
}, },
},)
std.push({
name: "标准组件产量目标值",
stack: 'b',
data: [
{ name: "标准组件产量目标值", value: item.componentYield },
// { name: '标准组件产量目标值', value: 23 },
// { name: "%", value: 7.02 },
// { name: "%", value: 80.2 },
],
type: "bar",
barWidth: 20,
label: {
show: true,
position: [0, -16],
color: "rgba(100,189,255,.3)",
formatter: function (params) {
return params.value
},
},
})
bipv.push(this.currentMenu == '瑞昌' ? null :
{ {
name: "标准组件产量完成值", name: "BIPV产量目标值",
stack: 'b', stack: 'c',
data: [ data: [
// { name: "标准组件产量完成值", value: item.componentYield }, { name: "BIPV产量目标值", value: item.bipvProductOutput },
{ name: '标准组件产量完成值', value: 23 }, // { name: 'BIPV产量目标值', value: 24 },
// { name: "%", value: 7.02 }, // { name: "%", value: 7.02 },
// { name: "%", value: 80.2 }, // { name: "%", value: 80.2 },
], ],
@ -776,42 +721,112 @@ export default {
label: { label: {
show: true, show: true,
position: [0, -16], position: [0, -16],
color: "rgba(40,138,255)", color: "rgba(113,100,255,.2)",
formatter: function (params) { formatter: function (params) {
return params.value return params.value
}, },
}, },
},)
// } else {
// }
})
console.log("fto",ele.titleValue,fto);
} else {
ele.productionSituationDataVOList.forEach((item) => {
console.log(item);
// if (ele.titleValue.search('目标') != -1) {
// } else {
fto.unshift({
name: "FTO投入完成值",
data: [
// s
{ name: 'FTO投入完成值', value: item.ftoInput },
// { name: 'FTO投入完成值', value: 33 },
// { name: "%", value: 85 },
// { name: "%", value: 85 },
],
type: "bar",
barWidth: 20,
stack: 'f',
label: {
show: true,
position: [-18, -16],
color: "rgba(104,196,131)",
formatter: function (params) {
return params.value
},
}, },
this.currentMenu == '瑞昌' ? '' : })
{ chip.unshift({
name: "BIPV产量完成值", name: "芯片产量完成值",
stack: 'c', // barGap: '-100%',
data: [ stack: 'a',
// { name: "BIPV产量完成值", value: item.bipvProductOutput }, data: [
{ name: 'BIPV产量完成值', value: 32 }, { name: "芯片产量完成值", value: item.chipYield },
// { name: "%", value: 7.02 }, // { name: '芯片产量完成值', value: 55 },
// { name: "%", value: 80.2 }, // { name: "%", value: 21.66 },
], // { name: "%", value: 18.4 },
type: "bar", ],
barWidth: 20, type: "bar",
label: { barWidth: 20,
show: true, // barGap: '-100%',
position: [0, -16], label: {
color: "rgba(100,189,255)", show: true,
formatter: function (params) { color: "rgba(40,138,255)",
return params.value position: [-18, -16],
}, formatter: function (params) {
return params.value
},
},
},)
std.unshift({
name: "标准组件产量完成值",
stack: 'b',
data: [
{ name: "标准组件产量完成值", value: item.componentYield },
// { name: '标准组件产量完成值', value: 23 },
// { name: "%", value: 7.02 },
// { name: "%", value: 80.2 },
],
type: "bar",
barWidth: 20,
label: {
color: "rgba(100,189,255)",
show: true,
position: [0, -16],
formatter: function (params) {
return params.value
},
},
})
bipv.unshift(this.currentMenu == '瑞昌' ? null :
{
name: "BIPV产量完成值",
stack: 'c',
data: [
{ name: "BIPV产量完成值", value: item.bipvProductOutput },
// { name: 'BIPV产量完成值', value: 32 },
// { name: "%", value: 7.02 },
// { name: "%", value: 80.2 },
],
type: "bar",
barWidth: 20,
label: {
show: true,
position: [0, -16],
color: "rgba(113,100,255)",
formatter: function (params) {
return params.value
}, },
},) },
} },)
// }
// this.chartMsgTarget.series[1].data.push() })
// this.chartMsgTarget.series[2].data.push() }
// this.chartMsgTarget.series[3].data.push()
})
}) })
console.log('arr', arr)
this.chartMsgTarget.series = arr this.chartMsgTarget.series = [...fto, ...chip, ...std, ...bipv]
console.log('arr', this.chartMsgTarget.series)
// arr.forEach((ele) => { // arr.forEach((ele) => {
// }) // })
@ -870,7 +885,7 @@ export default {
// this.chartMsg.xData.push(ele.titleValue.replace(/[^\d]/g, " ")) // this.chartMsg.xData.push(ele.titleValue.replace(/[^\d]/g, " "))
this.otherProps.push({ this.otherProps.push({
label: ele.titleValue, label: ele.titleValue,
props: 'value' + i prop: 'value' + i
}) })
}) })
// res.data.list.forEach((ele) => { // res.data.list.forEach((ele) => {
@ -917,19 +932,26 @@ export default {
// }, // },
// }, // },
// },] // },]
let arr = [] let fto = []
res.data.list.slice(res.data.list.length - 1, res.data.list.length).forEach((ele, index) => { let chip = []
console.log(ele.titleValue.search('目标')); let std = []
let bipv = []
res.data.list.slice(res.data.list.length - 2, res.data.list.length).forEach((ele, index) => {
// console.log("ele", ele.titleValue);
// let i = index + 1 // let i = index + 1
// this.chartMsgTarget.xData.push(ele.titleValue) // this.chartMsgTarget.xData.push(ele.titleValue)
ele.productionSituationDataVOList.forEach((item) => { if (ele.titleValue.search('完成') == -1) {
if (ele.titleValue.search('目标') != -1) { console.log(ele);
arr.push({ ele.productionSituationDataVOList.forEach((item) => {
console.log(item);
// if (ele.titleValue.search('目标') != -1) {
fto.push({
name: "FTO投入目标值", name: "FTO投入目标值",
data: [ data: [
// s // s
// { name: 'FTO投入目标', value: item.ftoInput }, { name: 'FTO投入目标', value: item.ftoInput },
{ name: 'FTO投入目标值', value: 11 }, // { name: 'FTO投入目标值', value: 11 },
// { name: "%", value: 85 }, // { name: "%", value: 85 },
// { name: "%", value: 85 }, // { name: "%", value: 85 },
], ],
@ -939,41 +961,62 @@ export default {
label: { label: {
show: true, show: true,
position: [-18, -16], position: [-18, -16],
color: "rgba(255,174,23,.5)", color: "rgba(104,196,131,.3)",
formatter: function (params) { formatter: function (params) {
return params.value return params.value
}, },
}, },
}, },)
{ chip.push({
name: "芯片产量目标值", name: "芯片产量目标值",
// barGap: '-100%', // barGap: '-100%',
stack: 'a', stack: 'a',
data: [ data: [
// { name: "芯片产量目标值", value: item.chipYield }, { name: "芯片产量目标值", value: item.chipYield },
{ name: '芯片产量目标值', value: 22 }, // { name: '芯片产量目标值', value: 22 },
// { name: "%", value: 21.66 }, // { name: "%", value: 21.66 },
// { name: "%", value: 18.4 }, // { name: "%", value: 18.4 },
], ],
type: "bar", type: "bar",
barWidth: 20, barWidth: 20,
// barGap: '-100%', // barGap: '-100%',
label: { label: {
show: true, show: true,
position: [-18, -16], position: [-18, -16],
color: "rgba(104,196,131,.5)", color: "rgba(40,138,255,.2)",
formatter: function (params) { formatter: function (params) {
return params.value return params.value
},
}, },
}, },
{ },)
name: "标准组件产量目标值", std.push({
stack: 'b', name: "标准组件产量目标值",
data: [ stack: 'b',
// { name: "标准组件产量目标值", value: item.componentYield }, data: [
{ name: '标准组件产量目标值', value: 23 }, { name: "标准组件产量目标值", value: item.componentYield },
// { name: '标准组件产量目标值', value: 23 },
// { name: "%", value: 7.02 },
// { name: "%", value: 80.2 },
],
type: "bar",
barWidth: 20,
label: {
show: true,
position: [0, -16],
color: "rgba(100,189,255,.3)",
formatter: function (params) {
return params.value
},
},
})
bipv.push(this.currentMenu == '瑞昌' ? null :
{
name: "BIPV产量目标值",
stack: 'c',
data: [
{ name: "BIPV产量目标值", value: item.bipvProductOutput },
// { name: 'BIPV产量目标值', value: 24 },
// { name: "%", value: 7.02 }, // { name: "%", value: 7.02 },
// { name: "%", value: 80.2 }, // { name: "%", value: 80.2 },
], ],
@ -982,40 +1025,27 @@ export default {
label: { label: {
show: true, show: true,
position: [0, -16], position: [0, -16],
color: "rgba(40,138,255,.5)", color: "rgba(113,100,255,.2)",
formatter: function (params) { formatter: function (params) {
return params.value return params.value
}, },
}, },
}, },)
this.currentMenu == '瑞昌' ? '' : // } else {
{ // }
name: "BIPV产量目标值", })
stack: 'c', console.log("fto", ele.titleValue, fto);
data: [ } else {
// { name: "BIPV产量目标值", value: item.bipvProductOutput }, ele.productionSituationDataVOList.forEach((item) => {
{ name: 'BIPV产量目标值', value: 24 }, console.log(item);
// { name: "%", value: 7.02 }, // if (ele.titleValue.search('目标') != -1) {
// { name: "%", value: 80.2 }, // } else {
], fto.unshift({
type: "bar",
barWidth: 20,
label: {
show: true,
position: [0, -16],
color: "rgba(100,189,255,.2)",
formatter: function (params) {
return params.value
},
},
},)
} else {
arr.push({
name: "FTO投入完成值", name: "FTO投入完成值",
data: [ data: [
// s // s
// { name: 'FTO投入完成值', value: item.ftoInput }, { name: 'FTO投入完成值', value: item.ftoInput },
{ name: 'FTO投入完成值', value: 33 }, // { name: 'FTO投入完成值', value: 33 },
// { name: "%", value: 85 }, // { name: "%", value: 85 },
// { name: "%", value: 85 }, // { name: "%", value: 85 },
], ],
@ -1025,40 +1055,61 @@ export default {
label: { label: {
show: true, show: true,
position: [-18, -16], position: [-18, -16],
color: "rgba(255,174,23)", color: "rgba(104,196,131)",
formatter: function (params) { formatter: function (params) {
return params.value return params.value
}, },
}, },
}, })
{ chip.unshift({
name: "芯片产量完成值", name: "芯片产量完成值",
// barGap: '-100%', // barGap: '-100%',
stack: 'a', stack: 'a',
data: [ data: [
// { name: "芯片产量完成值", value: item.chipYield }, { name: "芯片产量完成值", value: item.chipYield },
{ name: '芯片产量完成值', value: 55 }, // { name: '芯片产量完成值', value: 55 },
// { name: "%", value: 21.66 }, // { name: "%", value: 21.66 },
// { name: "%", value: 18.4 }, // { name: "%", value: 18.4 },
], ],
type: "bar", type: "bar",
barWidth: 20, barWidth: 20,
// barGap: '-100%', // barGap: '-100%',
label: { label: {
show: true, show: true,
position: [-18, -16], color: "rgba(40,138,255)",
color: "rgba(104,196,131)", position: [-18, -16],
formatter: function (params) { formatter: function (params) {
return params.value return params.value
},
}, },
}, },
},)
std.unshift({
name: "标准组件产量完成值",
stack: 'b',
data: [
{ name: "标准组件产量完成值", value: item.componentYield },
// { name: '标准组件产量完成值', value: 23 },
// { name: "%", value: 7.02 },
// { name: "%", value: 80.2 },
],
type: "bar",
barWidth: 20,
label: {
color: "rgba(100,189,255)",
show: true,
position: [0, -16],
formatter: function (params) {
return params.value
},
},
})
bipv.unshift(this.currentMenu == '瑞昌' ? null :
{ {
name: "标准组件产量完成值", name: "BIPV产量完成值",
stack: 'b', stack: 'c',
data: [ data: [
// { name: "标准组件产量完成值", value: item.componentYield }, { name: "BIPV产量完成值", value: item.bipvProductOutput },
{ name: '标准组件产量完成值', value: 23 }, // { name: 'BIPV产量完成值', value: 32 },
// { name: "%", value: 7.02 }, // { name: "%", value: 7.02 },
// { name: "%", value: 80.2 }, // { name: "%", value: 80.2 },
], ],
@ -1067,43 +1118,18 @@ export default {
label: { label: {
show: true, show: true,
position: [0, -16], position: [0, -16],
color: "rgba(40,138,255)", color: "rgba(113,100,255)",
formatter: function (params) { formatter: function (params) {
return params.value return params.value
}, },
}, },
}, },)
this.currentMenu == '瑞昌' ? '' : // }
{ })
name: "BIPV产量完成值", }
stack: 'c',
data: [
// { name: "BIPV产量完成值", value: item.bipvProductOutput },
{ name: 'BIPV产量完成值', value: 32 },
// { name: "%", value: 7.02 },
// { name: "%", value: 80.2 },
],
type: "bar",
barWidth: 20,
label: {
show: true,
position: [0, -16],
color: "rgba(100,189,255)",
formatter: function (params) {
return params.value
},
},
},)
}
// this.chartMsgTarget.series[1].data.push()
// this.chartMsgTarget.series[2].data.push()
// this.chartMsgTarget.series[3].data.push()
})
}) })
console.log('arr', arr)
this.chartMsgTarget.series = arr this.chartMsgTarget.series = [...fto, ...chip, ...std, ...bipv]
console.log(this.chartMsg.xData)
res.data.list.forEach((ele, index) => { res.data.list.forEach((ele, index) => {
let i = index + 1 let i = index + 1
let m = 'value' + i let m = 'value' + i
@ -1134,7 +1160,7 @@ export default {
this.chartMsg.xData.push(ele.titleValue) this.chartMsg.xData.push(ele.titleValue)
this.otherProps.push({ this.otherProps.push({
label: ele.titleValue, label: ele.titleValue,
props: 'value' + i prop: 'value' + i
}) })
}) })
console.log(this.otherProps) console.log(this.otherProps)
@ -1198,7 +1224,7 @@ export default {
} }
} }
} }
this.tableData = this.dataArr this.tableData = res.data.length != 0 ? this.dataArr : []
// this.tableProps = otherProps // this.tableProps = otherProps
// res.data.list.forEach((ele) => { // res.data.list.forEach((ele) => {
// console.log(ele); // console.log(ele);

228
src/views/report/productionYield.vue
View File

@ -64,7 +64,7 @@
<div class="blueTip"> <div class="blueTip">
{{ title }} {{ title }}
</div> </div>
<produce-line-bar-year-target :chartHeight="chartHeight" :legendList="legendList" <produce-line-bar-year-target :chartHeight="chartHeight" :legendList="legendListTarget"
:chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" /> :chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" />
</el-col> </el-col>
</el-row> </el-row>
@ -84,8 +84,8 @@
:chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" /> :chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" />
</el-col> --> </el-col> -->
</el-row> </el-row>
<base-table :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size" :table-data="tableData" <base-table :span-method="objectSpanMethod" :table-props="tableProps" :page="listQuery.current"
:max-height="tableH" /> :limit="listQuery.size" :table-data="tableData" :max-height="tableH" />
</div> </div>
<!-- <div class="containerBottom"> <!-- <div class="containerBottom">
@ -97,7 +97,7 @@
import { getProductionYieldSituationMWData, exportProductionYieldSituationMWData } from '@/api/report'; import { getProductionYieldSituationMWData, exportProductionYieldSituationMWData } from '@/api/report';
import bmSearchBar from "./components/bmSearchBar"; import bmSearchBar from "./components/bmSearchBar";
import BmLineBar from "./components/produceLineBar.vue"; import BmLineBar from "./components/produceLineBar.vue";
import produceLineBarYearTarget from "./components/produceLineBarYearTarget.vue"; import produceLineBarYearTarget from "./components/produceLineYieldBarTarget.vue";
import ButtonNav from '@/components/ButtonNav' import ButtonNav from '@/components/ButtonNav'
import moment from 'moment' import moment from 'moment'
export default { export default {
@ -145,15 +145,27 @@ export default {
tableH: this.tableHeight(137) / 2 - 70, tableH: this.tableHeight(137) / 2 - 70,
legendList: [ legendList: [
{ {
id: 1, name: "综合良率", type: 1, color: "#FFCE6A" }, id: 1, name: "综合良率", type: 2, color: "#FFCE6A" },
{ {
id: 2, name: "FTO投入", type: 1, color: "#8EF0AB" }, id: 2, name: "FTO投入", type: 1, color: "#8EF0AB" },
{ id: 3, name: "芯片产量", type: 1, color: "#288AFF" }, { id: 3, name: "芯片产量", type: 1, color: "#288AFF" },
{ {
id: 4, name: "标准组件产量", type: 1, color: "#64BDFF" }, id: 4, name: "标准组件产量", type: 1, color: "#64BDFF" },
], ],
legendListTarget: [
{
id: 2, name: "FTO投入", type: 1, color: "#8EF0AB"
},
{ id: 3, name: "芯片产量", type: 1, color: "#288AFF" },
{
id: 4, name: "标准组件产量", type: 1, color: "#64BDFF"
},
{
id: 1, name: "综合良率", type: 1, color: "#7164FF"
},
],
chartMsgYearTarget: { chartMsgYearTarget: {
color: ["#8EF0AB", "#288AFF", '#64BDFF', "#FFCE6A",], color: ["#8EF0AB", "#288AFF", '#64BDFF', "#7164FF",],
xData: [], xData: [],
// yName: "单位/%", // yName: "单位/%",
yAxis: [ yAxis: [
@ -181,32 +193,7 @@ export default {
{ {
name: "", name: "",
// yAxisIndex: 0, // yAxisIndex: 0,
data: [ data: [],
{
value: 1,
itemStyle: {
color: '#8EF0AB'
}
},
{
value: 2,
itemStyle: {
color: '#288AFF'
}
},
{
value: 3,
itemStyle: {
color: '#64BDFF'
}
},
{
value: 0,
yAxisIndex: 1,
itemStyle: {
color: '#FFCE6A'
}
}],
type: "bar", type: "bar",
barWidth: 20, barWidth: 20,
label: { label: {
@ -214,31 +201,26 @@ export default {
position: [-18, -16], position: [-18, -16],
color: "#68C483", color: "#68C483",
formatter: function (params) { formatter: function (params) {
return params.value + "片"; return params.value
}, },
}, },
}, },
// { {
// name: '销量折线图', name: '',
// type: 'bar', // type: 'bar',
// data: [ 0,0,0, data: [],
// { type: "bar",
// value: 5, barWidth: 20,
// itemStyle: { label: {
// color: '#FFCE6A' show: true,
// } position: [-18, -16],
// }], color: "#68C483",
// barWith: "40%", formatter: function (params) {
// label: { return params.value
// show: true, },
// position: "top", },
// formatter: "{c}%" yAxisIndex: 1
// }, }
// lineStyle: {
// color: "#ffb122"
// },
// yAxisIndex: 1
// }
], ],
}, },
chartMsg: { chartMsg: {
@ -270,11 +252,7 @@ export default {
{ {
name: "", name: "",
// yAxisIndex: 0, // yAxisIndex: 0,
data: [ data: [],
{ name: "%", value: 57.5 },
{ name: "%", value: 21.66 },
{ name: "%", value: 18.4 },
],
type: "bar", type: "bar",
barWidth: 20, barWidth: 20,
label: { label: {
@ -289,11 +267,7 @@ export default {
{ {
name: "", name: "",
// yAxisIndex: 0, // yAxisIndex: 0,
data: [ data: [],
{ name: "%", value: 23.33 },
{ name: "%", value: 7.02 },
{ name: "%", value: 80.2 },
],
type: "bar", type: "bar",
barWidth: 20, barWidth: 20,
label: { label: {
@ -308,17 +282,12 @@ export default {
{ {
name: "", name: "",
// yAxisIndex: 0, // yAxisIndex: 0,
data: [ data: [],
{ name: "%", value: 23.33 },
{ name: "%", value: 7.02 },
{ name: "%", value: 80.2 },
],
type: "bar", type: "bar",
barWidth: 20, barWidth: 20,
label: { label: {
show: true, show: true,
position: [0, -16], position: [0, -16],
stack: '标准组件产量',
color: "#64BDFF", color: "#64BDFF",
formatter: function (params) { formatter: function (params) {
return params.value+ "片"; return params.value+ "片";
@ -327,11 +296,7 @@ export default {
}, },
{ {
name: "", name: "",
data: [ data: [],
{ name: "%", value: 115 },
{ name: "%", value: 5 },
{ name: "%", value: 8 },
],
type: "line", type: "line",
// barWidth: 20, // barWidth: 20,
symbol: "circle", symbol: "circle",
@ -428,6 +393,35 @@ export default {
this.getDataList() this.getDataList()
}, },
methods: { methods: {
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
let spanOneArr = [], concatOne = 0;
// let spanTwoArr = [], concatTwo = 0;
this.tableData.map((item, index) => {
// console.log(inde);
if (index === 0) {
spanOneArr.push(1);
} else {
//第一列需合并相同内容的判断条件
if (item.factory === this.tableData[index - 1].factory) {
spanOneArr[concatOne] += 1;
spanOneArr.push(0);
} else {
spanOneArr.push(1);
concatOne = index;
};
}
});
if (columnIndex === 0) {
const _row = spanOneArr[rowIndex];
const _col = _row > 0 ? 1 : 0;
return {
rowspan: _row,
colspan: _col
}
}
},
getYear(e) { getYear(e) {
if (this.listQuery.end - this.listQuery.start > 10 * 365 * 24 * 60 * 60 * 1000) { if (this.listQuery.end - this.listQuery.start > 10 * 365 * 24 * 60 * 60 * 1000) {
this.$message({ this.$message({
@ -543,7 +537,7 @@ export default {
this.chartMsg.xData.push(ele.titleValue) this.chartMsg.xData.push(ele.titleValue)
this.otherProps.push({ this.otherProps.push({
label: ele.titleValue, label: ele.titleValue,
props: 'value' + i prop: 'value' + i
}) })
}) })
this.chartMsgYearTarget.xData.push('FTO投入', '芯片产量', '标准组件产量', '综合良率') this.chartMsgYearTarget.xData.push('FTO投入', '芯片产量', '标准组件产量', '综合良率')
@ -554,31 +548,56 @@ export default {
// this.chartMsgYearTarget.series[1].name = '芯片产量目标值', // this.chartMsgYearTarget.series[1].name = '芯片产量目标值',
// this.chartMsgYearTarget.series[2].name = '标准组件产量目标值', // this.chartMsgYearTarget.series[2].name = '标准组件产量目标值',
// this.chartMsgYearTarget.series[3].name = '综合良率目标值', // this.chartMsgYearTarget.series[3].name = '综合良率目标值',
// this.chartMsgYearTarget.series[0].data = [ this.chartMsgYearTarget.series[0].data = [
// { {
// value: item.ftoInput, value: item.ftoInput,
// itemStyle: { itemStyle: {
// color: '#8EF0AB' color: '#8EF0AB'
// } }
// }, },
// { {
// value: item.chipYield, value: item.chipYield,
// itemStyle: { itemStyle: {
// color: '#288AFF' color: '#288AFF'
// } }
// }, },
// { {
// value: item.componentYield, value: item.componentYield,
// itemStyle: { itemStyle: {
// color: '#64BDFF' color: '#64BDFF'
// } }
// }, },
// { {
// value: item.ftoInput, value: null,
// itemStyle: { itemStyle: {
// color: '#FFCE6A' color: '#FFCE6A'
// } }
// }] }]
this.chartMsgYearTarget.series[1].data = [
{
value: null,
itemStyle: {
color: '#8EF0AB'
}
},
{
value: null,
itemStyle: {
color: '#288AFF'
}
},
{
value: null,
itemStyle: {
color: '#64BDFF'
}
},
{
value: item.ftoInput,
itemStyle: {
color: '#FFCE6A'
}
}]
// dataArr[0]['' + m + ''] = item.ftoInput // dataArr[0]['' + m + ''] = item.ftoInput
// dataArr[0].factory = item.factory == 1 ? '邯郸' : '瑞昌' // dataArr[0].factory = item.factory == 1 ? '邯郸' : '瑞昌'
// dataArr[1].factory = item.factory == 1 ? '邯郸' : '瑞昌' // dataArr[1].factory = item.factory == 1 ? '邯郸' : '瑞昌'
@ -646,13 +665,10 @@ export default {
this.chartMsg.xData.push(ele.titleValue) this.chartMsg.xData.push(ele.titleValue)
this.otherProps.push({ this.otherProps.push({
label: ele.titleValue, label: ele.titleValue,
props: 'value' + i prop: 'value' + i
}) })
}) })
console.log(this.otherProps) console.log(this.otherProps)
if (this.listQuery.type == 2) {
}
res.data.list.forEach((ele, index) => { res.data.list.forEach((ele, index) => {
let i = index + 1 let i = index + 1
let m = 'value' + i let m = 'value' + i
@ -706,7 +722,7 @@ export default {
} }
console.log(dataArr) console.log(dataArr)
this.tableData = dataArr this.tableData = res.data.length != 0 ? dataArr : []
// this.tableProps.push() // this.tableProps.push()
this.listQuery.total = res.data.total this.listQuery.total = res.data.total
if (this.listQuery.total > 0) { if (this.listQuery.total > 0) {