Merge branch 'projects/mescc/develop' into projects/mescc/zjl
This commit is contained in:
commit
daaec2417c
@ -289,7 +289,7 @@ function splitCurrentAndPreviousB(factoryListResponse) {
|
||||
}
|
||||
|
||||
function splitCurrentAndPreviousA(factoryListResponse, targetListResponse, prodOutputFtoListRes,preData,preFtoData) {
|
||||
console.log('工厂',targetListResponse);
|
||||
console.log('工厂',preData);
|
||||
|
||||
// 初始数据
|
||||
const { chipOeeRate, transformRate, chipRate, stdRate } = initA();
|
||||
@ -343,17 +343,24 @@ function splitCurrentAndPreviousA(factoryListResponse, targetListResponse, prodO
|
||||
// componentYieldRate: 0.73,
|
||||
// },
|
||||
// ];
|
||||
if (preData && preData[0] != null) {
|
||||
if (preData) {
|
||||
for (const factory of preData) {
|
||||
const fId = getPreFactoryId(factory);
|
||||
const fId = getPreFactoryId(factory)
|
||||
console.log('factory',factory.previousYearOee);
|
||||
// chipInvest.previous[fId] = factory.previousYearInputNumber;
|
||||
// chipOeeRate.current[fId] = factory.oee;
|
||||
chipOeeRate.previous[fId] = factory.previousYearOee;
|
||||
if (factory.previousGlassType === 0) {
|
||||
chipOeeRate.previous[fId] = factory.previousYearOee;
|
||||
}
|
||||
// chipOeeRate.previous[fId] = factory.previousYearOee;
|
||||
// 转化效率
|
||||
transformRate.previous[fId] =factory.previousYearComponentConversionEfficiency ;
|
||||
if (factory.previousGlassType === 1) {
|
||||
transformRate.previous[fId] = factory.previousYearComponentConversionEfficiency;
|
||||
}
|
||||
// transformRate.previous[fId] =factory.previousYearComponentConversionEfficiency ;
|
||||
// 芯片良率 与 标准组件良率
|
||||
if (![0, 1].includes(factory.glassType)) continue;
|
||||
const _t = [chipRate, stdRate][factory.glassType]
|
||||
if (![0, 1].includes(factory.previousGlassType)) continue;
|
||||
const _t = [chipRate, stdRate][factory.previousGlassType]
|
||||
// _t.current[fId] = factory.yieldRate ;
|
||||
_t.previous[fId] = factory.previousYearYieldRate ;
|
||||
// }
|
||||
@ -393,6 +400,7 @@ function splitCurrentAndPreviousA(factoryListResponse, targetListResponse, prodO
|
||||
_t.current[fId] = factory.yieldRate ;
|
||||
// _t.previous[fId] = factory.previousYearYieldRate ;
|
||||
}
|
||||
console.log('chipOeeRate',stdRate);
|
||||
// console.log('chipOeeRate',chipOeeRate);
|
||||
return {
|
||||
chipOeeRate,
|
||||
|
@ -63,14 +63,22 @@ export default {
|
||||
computed: {},
|
||||
methods: {
|
||||
handleExport() {
|
||||
exportFactoryDataExcel({
|
||||
factoryId: this.companyId,
|
||||
timeSelection: this.period === 1 ? 0 : this.period === 2 ? 1 : this.period === 3 ? 2 : 3,
|
||||
compare: this.than === '同比' ? 1 : 2
|
||||
}).then(response => {
|
||||
this.$download.excel(response, `${this.companyName}生产数据.xls`);
|
||||
// this.exportLoading = false;
|
||||
}).catch(() => { });
|
||||
if (this.period != 1) {
|
||||
exportFactoryDataExcel({
|
||||
factoryId: this.companyId,
|
||||
timeSelection: this.period === 1 ? 0 : this.period === 2 ? 1 : this.period === 3 ? 2 : 3,
|
||||
compare: this.than === '同比' ? 1 : 2
|
||||
}).then(response => {
|
||||
this.$download.excel(response, `${this.companyName}生产数据.xls`);
|
||||
// this.exportLoading = false;
|
||||
}).catch(() => { });
|
||||
} else {
|
||||
this.$message({
|
||||
type: 'warning',
|
||||
message: '为日的情况下没有导出功能',
|
||||
})
|
||||
}
|
||||
|
||||
},
|
||||
toggleFullScreen() {
|
||||
this.isFullscreen = !this.isFullscreen;
|
||||
|
@ -65,21 +65,26 @@ export default {
|
||||
items = [
|
||||
{ label: `${year - 1}年${yesterday}日`, color: "#12f7f1" },
|
||||
{ label: `${yesterday}日`, color: "#58adfa" },
|
||||
{ label: `${yesterday}日目标`, color: "#58adfa" },
|
||||
];
|
||||
} else if (this.period === '日' && this.than === '环比') {
|
||||
items = [
|
||||
{ label: `${dayBeYes}日`, color: "#12f7f1" },
|
||||
{ label: `${yesterday}日`, color: "#58adfa" },
|
||||
{ label: `${yesterday}日目标`, color: "#58adfa" },
|
||||
];
|
||||
} else if (this.period === '周' && this.than === '同比') {
|
||||
items = [
|
||||
{ label: `${year-1}年本周`, color: "#12f7f1" },
|
||||
{ label: `本周`, color: "#58adfa" },
|
||||
{ label: `本周目标`, color: "#58adfa" },
|
||||
|
||||
];
|
||||
} else if (this.period === '周' && this.than === '环比') {
|
||||
items = [
|
||||
{ label: `上周`, color: "#12f7f1" },
|
||||
{ label: `本周`, color: "#58adfa" },
|
||||
{ label: `本周目标`, color: "#58adfa" },
|
||||
];
|
||||
} else if (this.period === '月' && this.than === '同比') {
|
||||
items = [
|
||||
@ -141,14 +146,6 @@ export default {
|
||||
// console.log('chipOee', chipOeeRate)
|
||||
let dataList = null
|
||||
switch (this.period) {
|
||||
case "日":
|
||||
dataList = [];
|
||||
dataList[0] = chipOeeRate?.previous;
|
||||
dataList[1] = chipOeeRate?.current;
|
||||
case "周":
|
||||
dataList = [];
|
||||
dataList[0] = chipOeeRate?.previous;
|
||||
dataList[1] = chipOeeRate?.current;
|
||||
default:
|
||||
dataList = [];
|
||||
dataList[0] = chipOeeRate?.previous;
|
||||
@ -191,6 +188,11 @@ function getTemplate(period, dataList, than) {
|
||||
data: dataList ? dataList[1] : [],
|
||||
// : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
|
||||
},
|
||||
{
|
||||
name: `${yesterday}日目标`,
|
||||
data: dataList ? dataList[2] : [],
|
||||
// : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
|
||||
},
|
||||
];
|
||||
} else if (period === '日' && than === '环比') {
|
||||
items = [
|
||||
@ -203,6 +205,11 @@ function getTemplate(period, dataList, than) {
|
||||
data: dataList ? dataList[1] : [],
|
||||
// : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
|
||||
},
|
||||
{
|
||||
name: `${yesterday}日目标`,
|
||||
data: dataList ? dataList[2] : [],
|
||||
// : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
|
||||
},
|
||||
];
|
||||
} else if (period === '周' && than === '同比') {
|
||||
items = [
|
||||
@ -215,6 +222,11 @@ function getTemplate(period, dataList, than) {
|
||||
data: dataList ? dataList[1] : [],
|
||||
// : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
|
||||
},
|
||||
{
|
||||
name: `本周目标`,
|
||||
data: dataList ? dataList[2] : [],
|
||||
// : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
|
||||
},
|
||||
];
|
||||
} else if (period === '周' && than === '环比') {
|
||||
items = [
|
||||
@ -227,6 +239,11 @@ function getTemplate(period, dataList, than) {
|
||||
data: dataList ? dataList[1] : [],
|
||||
// : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
|
||||
},
|
||||
{
|
||||
name: `本周目标`,
|
||||
data: dataList ? dataList[2] : [],
|
||||
// : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
|
||||
},
|
||||
];
|
||||
} else if (period === '月' && than === '同比') {
|
||||
items = [
|
||||
|
@ -65,21 +65,26 @@ export default {
|
||||
items = [
|
||||
{ label: `${year - 1}年${yesterday}日`, color: "#12f7f1" },
|
||||
{ label: `${yesterday}日`, color: "#58adfa" },
|
||||
{ label: `${yesterday}日目标`, color: "#58adfa" },
|
||||
|
||||
];
|
||||
} else if (this.period === '日' && this.than === '环比') {
|
||||
items = [
|
||||
{ label: `${dayBeYes}日`, color: "#12f7f1" },
|
||||
{ label: `${yesterday}日`, color: "#58adfa" },
|
||||
{ label: `${yesterday}日目标`, color: "#58adfa" },
|
||||
];
|
||||
} else if (this.period === '周' && this.than === '同比') {
|
||||
items = [
|
||||
{ label: `${year-1}年本周`, color: "#12f7f1" },
|
||||
{ label: `本周`, color: "#58adfa" },
|
||||
{ label: `本周目标`, color: "#58adfa" },
|
||||
];
|
||||
} else if (this.period === '周' && this.than === '环比') {
|
||||
items = [
|
||||
{ label: `上周`, color: "#12f7f1" },
|
||||
{ label: `本周`, color: "#58adfa" },
|
||||
{ label: `本周目标`, color: "#58adfa" },
|
||||
];
|
||||
} else if (this.period === '月' && this.than === '同比') {
|
||||
items = [
|
||||
@ -112,17 +117,9 @@ export default {
|
||||
series() {
|
||||
// console.log('aaaaaaaa', this.$store.getters.copilot.efficiency.chipOee);
|
||||
const transformRate = this.transformRate
|
||||
// console.log('chipOee', chipOeeRate)
|
||||
console.log('chipOee', transformRate)
|
||||
let dataList = null;
|
||||
switch (this.period) {
|
||||
case "日":
|
||||
dataList = [];
|
||||
dataList[0] = transformRate.previous;
|
||||
dataList[1] = transformRate.current;
|
||||
case "周":
|
||||
dataList = [];
|
||||
dataList[0] = transformRate.previous;
|
||||
dataList[1] = transformRate.current;
|
||||
default:
|
||||
dataList = [];
|
||||
dataList[0] = transformRate.previous;
|
||||
@ -182,6 +179,11 @@ function getTemplate(period, dataList,than) {
|
||||
data: dataList ? dataList[1] : [],
|
||||
// : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
|
||||
},
|
||||
{
|
||||
name: `${yesterday}日目标`,
|
||||
data: dataList ? dataList[2] : [],
|
||||
// : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
|
||||
},
|
||||
];
|
||||
} else if (period === '日' && than === '环比') {
|
||||
items = [
|
||||
@ -194,6 +196,11 @@ function getTemplate(period, dataList,than) {
|
||||
data: dataList ? dataList[1] : [],
|
||||
// : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
|
||||
},
|
||||
{
|
||||
name: `${yesterday}日目标`,
|
||||
data: dataList ? dataList[2] : [],
|
||||
// : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
|
||||
},
|
||||
];
|
||||
} else if (period === '周' && than === '同比') {
|
||||
items = [
|
||||
@ -206,6 +213,11 @@ function getTemplate(period, dataList,than) {
|
||||
data: dataList ? dataList[1] : [],
|
||||
// : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
|
||||
},
|
||||
{
|
||||
name: `本周目标`,
|
||||
data: dataList ? dataList[2] : [],
|
||||
// : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
|
||||
},
|
||||
];
|
||||
} else if (period === '周' && than === '环比') {
|
||||
items = [
|
||||
@ -218,6 +230,11 @@ function getTemplate(period, dataList,than) {
|
||||
data: dataList ? dataList[1] : [],
|
||||
// : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
|
||||
},
|
||||
{
|
||||
name: `本周目标`,
|
||||
data: dataList ? dataList[2] : [],
|
||||
// : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
|
||||
},
|
||||
];
|
||||
} else if (period === '月' && than === '同比') {
|
||||
items = [
|
||||
|
@ -157,6 +157,7 @@ export default {
|
||||
color: this.color == 1 ? "#4CF0E8" : "#1065ff",
|
||||
titleValue,
|
||||
subtitle,
|
||||
yesterday,
|
||||
currentName: items[0].label,
|
||||
preName: items[1].label,
|
||||
previousSum: vt[0],
|
||||
|
@ -47,12 +47,12 @@ export default {
|
||||
computed: {
|
||||
dataRate() {
|
||||
// if (this.current != 0 && this.target != 0) {
|
||||
console.log( '1111111111', this.current, this.target);
|
||||
console.log( '1111111111', this.current, this.target,this.previous);
|
||||
return this.current == 0 && this.target == 0
|
||||
? 0
|
||||
: this.current != 0 && this.target != 0
|
||||
? `${((this.current / this.target) * 100).toFixed(2)}%`
|
||||
: this.current != 0 && this.target == 0 && this.current >= 100 ? 100 + '%' : this.current != 0 && this.target == 0 && this.current < 100 ? this.current + '%' : this.previous >=100 ? 100 + '%' : this.previous + '%';
|
||||
: this.current != 0 && this.target == 0 && this.current >= 100 ? 100 + '%' : this.current != 0 && this.target == 0 && this.current < 100 ? this.current + '%' : 0 + '%'
|
||||
// } else if(this.previous != 0) {
|
||||
// return this.previous + '%'
|
||||
// }
|
||||
|
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2024-05-07 10:25:10
|
||||
* @LastEditTime: 2024-06-14 09:58:01
|
||||
* @LastEditTime: 2024-06-27 09:13:38
|
||||
* @LastEditors: zhp
|
||||
* @Description:
|
||||
-->
|
||||
@ -11,21 +11,21 @@
|
||||
<CityName :value="city.name" />
|
||||
<div class="std-rate-item__value">
|
||||
<ProgressBar :period="period" :title="title" :target="city.target" :current="city.current" />
|
||||
<ProgressBar :period="period" :title="titlePre" :previous="city.previous" />
|
||||
<preProgressBar :period="period" :title="titlePre" :previous="city.previous" />
|
||||
</div>
|
||||
</div>
|
||||
<div v-else-if="period == '周'" class="std-rate-item">
|
||||
<CityName :value="city.name" />
|
||||
<div class="std-rate-item__value">
|
||||
<ProgressBar :period="period" :title="title" :target="city.target" :current="city.current" />
|
||||
<ProgressBar :period="period" :title="titlePre" :previous="city.previous" />
|
||||
<preProgressBar :period="period" :title="titlePre" :previous="city.previous" />
|
||||
</div>
|
||||
</div>
|
||||
<div v-else-if="period == '月'" class="std-rate-item">
|
||||
<CityName :value="city.name" />
|
||||
<div class="std-rate-item__value">
|
||||
<ProgressBar :period="period" :title="titleTarget" :target="city.target" :current="city.current" />
|
||||
<ProgressBar :period="period" :title="titlePre" :previous="city.previous" />
|
||||
<preProgressBar :period="period" :title="titlePre" :previous="city.previous" />
|
||||
<!-- <ProgressBar :period="period" :title="title" :value="city.current" /> -->
|
||||
</div>
|
||||
</div>
|
||||
@ -33,7 +33,7 @@
|
||||
<CityName :value="city.name" />
|
||||
<div class="std-rate-item__value">
|
||||
<ProgressBar :period="period" :title="titleTarget" :target="city.target" :current="city.current" />
|
||||
<ProgressBar :period="period" :title="titlePre" :previous="city.previous" />
|
||||
<preProgressBar :period="period" :title="titlePre" :previous="city.previous" />
|
||||
<!-- <ProgressBar :period="period" :title="title" :value="city.current" /> -->
|
||||
</div>
|
||||
</div>
|
||||
@ -42,10 +42,12 @@
|
||||
<script>
|
||||
import CityName from "./CityName.vue";
|
||||
import ProgressBar from "./ProgressBar.vue";
|
||||
import preProgressBar from "./preProgressBar.vue";
|
||||
|
||||
|
||||
export default {
|
||||
name: "StdRateItem",
|
||||
components: { CityName, ProgressBar },
|
||||
components: { CityName, ProgressBar, preProgressBar },
|
||||
props: {
|
||||
city: {
|
||||
type: Object,
|
||||
|
@ -0,0 +1,130 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2024-06-27 09:12:54
|
||||
* @LastEditTime: 2024-06-27 09:14:21
|
||||
* @LastEditors: zhp
|
||||
* @Description:
|
||||
-->
|
||||
|
||||
<template>
|
||||
<div class="progress-bar" :data-title="title" :data-rate="previous + '%'">
|
||||
<div class="progress-bar__rate" :style="{ width: dataRate == '-' ? 0 : dataRate }"></div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: "ProgressBar",
|
||||
components: {},
|
||||
props: {
|
||||
value: {
|
||||
type: Number,
|
||||
default: 0,
|
||||
},
|
||||
target: {
|
||||
type: Number,
|
||||
default: 0,
|
||||
},
|
||||
previous: {
|
||||
type: Number,
|
||||
default: 0,
|
||||
},
|
||||
current: {
|
||||
type: Number,
|
||||
default: 0,
|
||||
},
|
||||
// total: {
|
||||
// type: Number,
|
||||
// default: 0,
|
||||
// },
|
||||
title: {
|
||||
type: String,
|
||||
default: "",
|
||||
},
|
||||
},
|
||||
data() {
|
||||
return {};
|
||||
},
|
||||
computed: {
|
||||
dataRate() {
|
||||
// if (this.current != 0 && this.target != 0) {
|
||||
// console.log( '1111111111', this.current, this.target,this.previous);
|
||||
return this.previous >=100 ? 100 + '%' : this.previous + '%';
|
||||
// } else if(this.previous != 0) {
|
||||
// return this.previous + '%'
|
||||
// }
|
||||
},
|
||||
},
|
||||
methods: {},
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.progress-bar {
|
||||
height: 10px;
|
||||
background-color: #002f6b;
|
||||
border-radius: 4px;
|
||||
margin-bottom: 12px;
|
||||
position: relative;
|
||||
|
||||
&:before {
|
||||
content: attr(data-title);
|
||||
display: inline-block;
|
||||
color: #fff;
|
||||
position: absolute;
|
||||
bottom: -200%;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
&:after {
|
||||
content: attr(data-rate);
|
||||
display: inline-block;
|
||||
color: #fff;
|
||||
position: absolute;
|
||||
bottom: -200%;
|
||||
right: 0;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
&:first-child {
|
||||
&:after {
|
||||
color: #11eae3;
|
||||
}
|
||||
}
|
||||
|
||||
&:nth-child(2) {
|
||||
&:after {
|
||||
color: #0e65fd;
|
||||
}
|
||||
}
|
||||
|
||||
.progress-bar__rate {
|
||||
position: absolute;
|
||||
display: inline-block;
|
||||
height: 100%;
|
||||
width: 0;
|
||||
border-radius: 4px;
|
||||
background: linear-gradient(to right,
|
||||
#004c5e11 10%,
|
||||
#004c5e,
|
||||
#0ac0c0,
|
||||
#11eae3);
|
||||
}
|
||||
|
||||
&:first-child {
|
||||
.progress-bar__rate {
|
||||
background: linear-gradient(to right,
|
||||
#004c5e11 10%,
|
||||
#004c5e,
|
||||
#0ac0c0,
|
||||
#11eae3);
|
||||
}
|
||||
}
|
||||
|
||||
&:nth-child(2) {
|
||||
.progress-bar__rate {
|
||||
background: linear-gradient(to right, #0048a811, #0048a8, #0e65fd);
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
@ -6,6 +6,7 @@ export default ({
|
||||
targetSum,
|
||||
currentName,
|
||||
preName,
|
||||
yesterday,
|
||||
}) => ({
|
||||
grid: {
|
||||
left: 300,
|
||||
@ -25,7 +26,7 @@ export default ({
|
||||
fontSize: 26,
|
||||
color: "#fffd",
|
||||
},
|
||||
subtext: `\u2002${subtitle}\u2002`,
|
||||
subtext: `\u2002${yesterday + '日良率'}\u2002`,
|
||||
subtextStyle: {
|
||||
fontSize: 14,
|
||||
fontWeight: 100,
|
||||
|
@ -134,11 +134,11 @@ export default {
|
||||
if (preData && preData[0] != null) {
|
||||
for (const factory of preData) {
|
||||
if (factory.previousGlassType === 0) {
|
||||
preDataDetail[1] = factory.previousYearOutputNumber
|
||||
preDataDetail[1] = factory.previousOutputNumber
|
||||
} else if (factory.previousGlassType === 1) {
|
||||
preDataDetail[2] = factory.previousYearOutputNumber
|
||||
} else if (factory.previousYearOutputNumber === 2) {
|
||||
currentDataDetail[3] = factory.outputNumber
|
||||
preDataDetail[2] = factory.previousOutputNumber
|
||||
} else if (factory.previousGlassType === 2) {
|
||||
preDataDetail[3] = factory.previousOutputNumber
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -132,16 +132,17 @@ export default {
|
||||
// }
|
||||
}
|
||||
}
|
||||
if (preData && preData[0] != null) {
|
||||
if (preData) {
|
||||
for (const factory of preData) {
|
||||
if (factory.previousGlassType === 0) {
|
||||
preDataDetail[1] = factory.previousYearOutputNumber
|
||||
console.log('factory', factory)
|
||||
preDataDetail[1] = factory.previousOutputNumber
|
||||
} else if (factory.previousGlassType === 1) {
|
||||
preDataDetail[2] = factory.previousYearOutputNumber
|
||||
preDataDetail[2] = factory.previousOutputNumber
|
||||
}
|
||||
}
|
||||
}
|
||||
if (targetListResponse && targetListResponse[0] != null) {
|
||||
if (targetListResponse) {
|
||||
for (const factory of targetListResponse) {
|
||||
targetDataDetail[0] = factory.ftoInput
|
||||
// if (factory.previousGlassType === 0) {
|
||||
@ -153,7 +154,7 @@ export default {
|
||||
}
|
||||
}
|
||||
// console.log('ftoInvest',ftoInvest)
|
||||
if (factoryListResponse && factoryListResponse[0] != null) {
|
||||
if (factoryListResponse) {
|
||||
for (const factory of factoryListResponse) {
|
||||
// targetDataDetail[0] = factory.ftoInput
|
||||
if (factory.glassType === 0) {
|
||||
@ -163,6 +164,7 @@ export default {
|
||||
}
|
||||
}
|
||||
}
|
||||
console.log(' this.factoryData.preDataDetail', preDataDetail);
|
||||
this.factoryData.preDataDetail = preDataDetail
|
||||
this.factoryData.currentDataDetail = currentDataDetail
|
||||
this.factoryData.targetDataDetail = targetDataDetail
|
||||
|
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2023-11-06 15:15:30
|
||||
* @LastEditTime: 2024-06-25 08:59:33
|
||||
* @LastEditTime: 2024-06-26 13:39:22
|
||||
* @LastEditors: DY
|
||||
* @Description:
|
||||
-->
|
||||
@ -116,6 +116,8 @@
|
||||
<p class="title">标准组件平均功率(W)</p>
|
||||
<p class="text">{{ dataForm.componentAveragePower }}</p>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="6">
|
||||
<p class="title">标准组件转化效率</p>
|
||||
<p class="text">{{ dataForm.componentTransRate }}</p>
|
||||
|
@ -1,8 +1,8 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2024-04-15 10:49:13
|
||||
* @LastEditTime: 2024-06-26 11:00:11
|
||||
* @LastEditors: zhp
|
||||
* @LastEditTime: 2024-06-27 14:56:20
|
||||
* @LastEditors: DY
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
@ -210,7 +210,7 @@ export default {
|
||||
{
|
||||
prop: 'factory',
|
||||
label: '工厂名称',
|
||||
filter: (val) => [val],
|
||||
filter: (val) => factoryList[val],
|
||||
minWidth: 180,
|
||||
showOverflowtooltip: true
|
||||
},
|
||||
|
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2023-11-06 15:15:30
|
||||
* @LastEditTime: 2024-06-17 17:03:17
|
||||
* @LastEditTime: 2024-06-27 14:50:21
|
||||
* @LastEditors: DY
|
||||
* @Description:
|
||||
-->
|
||||
@ -76,15 +76,44 @@
|
||||
<p class="text">{{ dataForm.endDate?.length > 0 ? dataForm.endDate[0] + '-' + dataForm.endDate[1] + '-' + dataForm.endDate[2] : '' }}</p>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-divider></el-divider>
|
||||
<div class="chartDiv">
|
||||
<div ref="bar" :style="{ height: '30vh', width: '40vw' }" />
|
||||
<div ref="pie" :style="{ height: '30vh', width: '40vw' }" />
|
||||
</div>
|
||||
<div class="chartDiv">
|
||||
<div ref="equipmentLine" :style="{ height: '30vh', width: '40vw' }" />
|
||||
<div ref="line" v-show="dataForm.orderStatus === 2" :style="{ height: '30vh', width: '40vw' }" />
|
||||
</div>
|
||||
<div style="width: 100%; padding: 0 32px"><el-divider style="margin: 0"></el-divider></div>
|
||||
<el-row :gutter="0" style="margin: 20px 32px">
|
||||
<el-col :span="8">
|
||||
<div>
|
||||
<small-title slot="title" :no-padding="true">
|
||||
产品良率
|
||||
</small-title>
|
||||
<div ref="pie" :style="{ height: '40vh', width: '100%' }" />
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="16">
|
||||
<div style="border-left: 1px solid #d1d3d8; width: 100%; padding-left: 32px">
|
||||
<small-title slot="title" :no-padding="true">
|
||||
历史趋势
|
||||
</small-title>
|
||||
<div ref="line" v-show="dataForm.orderStatus === 2" :style="{ height: '40vh', width: '50vw' }" />
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<div style="width: 100%; padding: 0 32px"><el-divider style="margin: 0"></el-divider></div>
|
||||
<el-row :gutter="0" style="margin: 20px 32px">
|
||||
<el-col :span="8">
|
||||
<div>
|
||||
<small-title slot="title" :no-padding="true">
|
||||
生产明细
|
||||
</small-title>
|
||||
<div ref="bar" :style="{ height: '40vh', width: '100%' }" />
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="16">
|
||||
<div style="border-left: 1px solid #d1d3d8; width: 100%; padding-left: 32px">
|
||||
<small-title slot="title" :no-padding="true">
|
||||
待制品分布
|
||||
</small-title>
|
||||
<div ref="equipmentLine" :style="{ height: '40vh', width: '50vw' }" />
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
</el-drawer>
|
||||
|
||||
@ -118,7 +147,8 @@ export default {
|
||||
barChart: null,
|
||||
equipmentLineChart: null,
|
||||
visible: false,
|
||||
dataForm: {}
|
||||
dataForm: {},
|
||||
colorList: ['#3E8EF7', '#69E6D8', '#F7C739'] // pie颜色
|
||||
}
|
||||
},
|
||||
beforeDestroy() {
|
||||
@ -227,38 +257,47 @@ export default {
|
||||
initChart(barData) {
|
||||
this.barChart = echarts.init(this.$refs['bar'])
|
||||
this.barChart.setOption({
|
||||
title: {
|
||||
text: '生产明细',
|
||||
left: 'center'
|
||||
// subtext: 'Fake Data'
|
||||
},
|
||||
// title: {
|
||||
// text: '生产明细',
|
||||
// left: 'center'
|
||||
// // subtext: 'Fake Data'
|
||||
// },
|
||||
color: ['#3E8EF7'],
|
||||
tooltip: {
|
||||
trigger: 'axis'
|
||||
},
|
||||
grid: { top: 100, right: 90, bottom: 10, left: 10, containLabel: true },
|
||||
calculable: true,
|
||||
grid: {
|
||||
top: '20%',
|
||||
left: "1%",
|
||||
right: "3%",
|
||||
bottom: "1%",
|
||||
top: '15%',
|
||||
left: 0,
|
||||
right: '10%',
|
||||
bottom: 0,
|
||||
containLabel: true
|
||||
},
|
||||
xAxis: {
|
||||
type: 'category',
|
||||
data: ['目标产量', '计划投入量', '实际投入', '实际产出', '废品数量', '待再加工数量'],
|
||||
axisLabel: {
|
||||
rotate:45
|
||||
rotate: 25
|
||||
}
|
||||
},
|
||||
yAxis: {
|
||||
type: 'value'
|
||||
type: 'value',
|
||||
name: '单位/片',
|
||||
axisLine: {
|
||||
show: true
|
||||
}
|
||||
},
|
||||
series: [
|
||||
{
|
||||
data: barData,
|
||||
type: 'bar',
|
||||
barWidth: '40%'
|
||||
barWidth: '40%',
|
||||
label: {
|
||||
show: true,
|
||||
position: 'top'
|
||||
}
|
||||
}
|
||||
]
|
||||
}, true)
|
||||
@ -266,8 +305,9 @@ export default {
|
||||
initPieChart(pieData) {
|
||||
this.pieChart = echarts.init(this.$refs['pie'])
|
||||
this.pieChart.setOption({
|
||||
color: ['#3E8EF7', '#69E6D8', '#F7C739'],
|
||||
title: {
|
||||
text: !isNaN((pieData[0].value / (pieData[0].value + pieData[1].value)).toFixed(4) * 100) ? ( '产品良率 ' + (pieData[0].value / (pieData[0].value + pieData[1].value)).toFixed(4) * 100 + '%') : '产品良率 -',
|
||||
// text: !isNaN((pieData[0].value / (pieData[0].value + pieData[1].value)).toFixed(4) * 100) ? ( '产品良率 ' + (pieData[0].value / (pieData[0].value + pieData[1].value)).toFixed(4) * 100 + '%') : '产品良率 -',
|
||||
left: 'center'
|
||||
// subtext: 'Fake Data'
|
||||
},
|
||||
@ -275,31 +315,31 @@ export default {
|
||||
trigger: 'item'
|
||||
},
|
||||
legend: {
|
||||
top: '5%',
|
||||
left: 'right',
|
||||
orient: 'vertical'
|
||||
bottom: 0,
|
||||
left: 'center'
|
||||
},
|
||||
series: [
|
||||
{
|
||||
// name: 'Access From',
|
||||
type: 'pie',
|
||||
radius: ['40%', '70%'],
|
||||
radius: ['50%', '70%'],
|
||||
avoidLabelOverlap: false,
|
||||
data: pieData,
|
||||
label: {
|
||||
show: false,
|
||||
position: 'center'
|
||||
},
|
||||
emphasis: {
|
||||
label: {
|
||||
show: false,
|
||||
fontSize: 40,
|
||||
fontWeight: 'bold'
|
||||
show: true,
|
||||
position: 'outside',
|
||||
formatter: '{d|{d}%} \n {b|{b}}',
|
||||
rich: {
|
||||
d: {
|
||||
color: 'inherit', // 系列色
|
||||
verticalAlign: 'top'
|
||||
},
|
||||
b: {
|
||||
color: '#8C8C8C',
|
||||
verticalAlign: 'top'
|
||||
}
|
||||
}
|
||||
},
|
||||
labelLine: {
|
||||
show: false
|
||||
},
|
||||
data: pieData
|
||||
}
|
||||
}
|
||||
]
|
||||
}, true)
|
||||
@ -307,39 +347,48 @@ export default {
|
||||
initEqLineChart(xAxisList, yAxisList) {
|
||||
this.equipmentLineChart = echarts.init(this.$refs['equipmentLine'])
|
||||
this.equipmentLineChart.setOption({
|
||||
title: {
|
||||
text: '待制品分布',
|
||||
left: 'center'
|
||||
// subtext: 'Fake Data'
|
||||
},
|
||||
// title: {
|
||||
// text: '待制品分布',
|
||||
// left: 'center'
|
||||
// // subtext: 'Fake Data'
|
||||
// },
|
||||
color: ['#3E8EF7'],
|
||||
tooltip: {
|
||||
trigger: 'axis'
|
||||
},
|
||||
grid: { top: 100, right: 90, bottom: 10, left: 10, containLabel: true },
|
||||
calculable: true,
|
||||
grid: {
|
||||
top: '20%',
|
||||
left: "1%",
|
||||
right: "3%",
|
||||
bottom: "1%",
|
||||
top: '15%',
|
||||
left: 0,
|
||||
right: 0,
|
||||
bottom: 0,
|
||||
containLabel: true
|
||||
},
|
||||
xAxis: {
|
||||
type: 'category',
|
||||
data: xAxisList,
|
||||
axisLabel: {
|
||||
rotate:45,
|
||||
rotate: 25
|
||||
// width: '10%'
|
||||
}
|
||||
},
|
||||
yAxis: {
|
||||
type: 'value'
|
||||
type: 'value',
|
||||
name: '单位/片',
|
||||
axisLine: {
|
||||
show: true
|
||||
}
|
||||
},
|
||||
series: [
|
||||
{
|
||||
data: yAxisList,
|
||||
type: 'bar',
|
||||
barWidth: '50%'
|
||||
barWidth: '50%',
|
||||
label: {
|
||||
show: true,
|
||||
position: 'top'
|
||||
}
|
||||
}
|
||||
]
|
||||
}, true)
|
||||
@ -347,27 +396,39 @@ export default {
|
||||
initLineChart(xAxisList, seriesList) {
|
||||
this.lineChart = echarts.init(this.$refs['line'])
|
||||
this.lineChart.setOption({
|
||||
title: {
|
||||
text: '历史趋势',
|
||||
left: 'center' // 设置标题居中
|
||||
},
|
||||
color: ['#3E8EF7'],
|
||||
tooltip: {
|
||||
trigger: 'item'
|
||||
},
|
||||
grid: {
|
||||
top: '15%',
|
||||
left: 0,
|
||||
right: 0,
|
||||
bottom: 0,
|
||||
containLabel: true
|
||||
},
|
||||
xAxis: {
|
||||
type: 'category',
|
||||
data: xAxisList,
|
||||
axisLabel: {
|
||||
rotate:45
|
||||
rotate: 25
|
||||
}
|
||||
},
|
||||
yAxis: {
|
||||
type: 'value'
|
||||
type: 'value',
|
||||
name: '单位/片',
|
||||
axisLine: {
|
||||
show: true
|
||||
}
|
||||
},
|
||||
series: [
|
||||
{
|
||||
data: seriesList,
|
||||
type: 'line'
|
||||
type: 'line',
|
||||
label: {
|
||||
show: true,
|
||||
position: 'top'
|
||||
}
|
||||
}
|
||||
]
|
||||
}, true)
|
||||
@ -381,14 +442,8 @@ export default {
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.chartDiv {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
width: 100%;
|
||||
padding: 5px;
|
||||
padding-left: 30px;
|
||||
}
|
||||
.drawer >>> .el-drawer {
|
||||
border-radius: 8px 0 0 8px;
|
||||
}
|
||||
@ -405,7 +460,8 @@ export default {
|
||||
}
|
||||
.detailBox p {
|
||||
margin: 0;
|
||||
padding: 0 32px;
|
||||
padding-left: 32px;
|
||||
/* padding: 0 32px; */
|
||||
}
|
||||
.detailBox .title {
|
||||
/* width: 56px; */
|
||||
@ -427,6 +483,8 @@ export default {
|
||||
}
|
||||
.detailBox {
|
||||
padding-top: 30px;
|
||||
width: 99%;
|
||||
overflow-x: hidden;
|
||||
overflow-y: auto;
|
||||
/* width: 99%; */
|
||||
}
|
||||
</style>
|
||||
|
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2024-06-19 15:28:34
|
||||
* @LastEditTime: 2024-06-26 10:42:16
|
||||
* @LastEditTime: 2024-06-27 10:40:57
|
||||
* @LastEditors: zhp
|
||||
* @Description:
|
||||
-->
|
||||
@ -87,11 +87,32 @@ export default {
|
||||
// 设置滚动条类型
|
||||
type: "slider",
|
||||
// 设置背景颜色
|
||||
backgroundColor: "rgb(19, 63, 100)",
|
||||
backgroundColor: "#F7F7F7",
|
||||
// handleStyle: {
|
||||
// color: '#D6D6D6'
|
||||
// },
|
||||
handleStyle: {
|
||||
borderColor: '#EBEBEB',
|
||||
color: '#EBEBEB'
|
||||
},
|
||||
moveHandleStyle: {
|
||||
borderColor: '#EBEBEB',
|
||||
color: '#EBEBEB'
|
||||
},
|
||||
emphasis: {
|
||||
handleStyle: {
|
||||
borderColor: '#D6D6D6',
|
||||
color: '#D6D6D6'
|
||||
},
|
||||
moveHandleStyle: {
|
||||
borderColor: '#D6D6D6',
|
||||
color: '#D6D6D6'
|
||||
}
|
||||
},
|
||||
// 设置选中范围的填充颜色
|
||||
fillerColor: "rgb(16, 171, 198)",
|
||||
fillerColor: "#F7F7F7",
|
||||
// 设置边框颜色
|
||||
borderColor: "rgb(19, 63, 100)",
|
||||
borderColor: "#F7F7F7",
|
||||
// 是否显示detail,即拖拽时候显示详细数值信息
|
||||
showDetail: false,
|
||||
// 数据窗口范围的起始数值
|
||||
@ -102,9 +123,9 @@ export default {
|
||||
// 即不会影响其他轴的数据范围
|
||||
filterMode: "empty",
|
||||
// 设置滚动条宽度,相对于盒子宽度
|
||||
width: "50%",
|
||||
width: "100%",
|
||||
// 设置滚动条高度
|
||||
height: 8,
|
||||
height: 3,
|
||||
// 设置滚动条显示位置
|
||||
left: "center",
|
||||
// 是否锁定选择区域(或叫做数据窗口)的大小
|
||||
@ -112,7 +133,7 @@ export default {
|
||||
// 控制手柄的尺寸
|
||||
handleSize: 0,
|
||||
// dataZoom-slider组件离容器下侧的距离
|
||||
bottom: 3,
|
||||
bottom: 14,
|
||||
},
|
||||
{
|
||||
// 没有下面这块的话,只能拖动滚动条,
|
||||
@ -124,7 +145,6 @@ export default {
|
||||
moveOnMouseMove: true,
|
||||
moveOnMouseWheel: true,
|
||||
},
|
||||
|
||||
],
|
||||
yAxis:undefined,
|
||||
series: [],
|
||||
|
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2024-06-20 16:13:36
|
||||
* @LastEditTime: 2024-06-26 14:48:49
|
||||
* @LastEditTime: 2024-06-27 09:51:43
|
||||
* @LastEditors: zhp
|
||||
* @Description:
|
||||
-->
|
||||
@ -36,7 +36,7 @@ export default {
|
||||
color: [],
|
||||
// color: ["#8EF0AB", "#63BDFF", "#288AFF"],
|
||||
grid: {
|
||||
left: -60,
|
||||
left: 20,
|
||||
right: 0,
|
||||
bottom: 31,
|
||||
top: 30,
|
||||
@ -80,52 +80,52 @@ export default {
|
||||
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,
|
||||
},
|
||||
// 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: [],
|
||||
},
|
||||
@ -136,6 +136,10 @@ export default {
|
||||
type: Number,
|
||||
default: 300,
|
||||
},
|
||||
gridLeft: {
|
||||
type: Boolean,
|
||||
default: true,
|
||||
},
|
||||
type: {
|
||||
type: Number,
|
||||
default: 2,
|
||||
@ -166,7 +170,12 @@ export default {
|
||||
handler(newVal) {
|
||||
this.chartHeight = newVal;
|
||||
},
|
||||
|
||||
},
|
||||
// gridLeft(val) {
|
||||
// console.log(val)
|
||||
|
||||
// },
|
||||
type() {
|
||||
this.canvasReset();
|
||||
},
|
||||
@ -190,6 +199,12 @@ export default {
|
||||
}, 500)();
|
||||
},
|
||||
getMes() {
|
||||
console.log(this.gridLeft)
|
||||
if (this.gridLeft === false) {
|
||||
this.option.grid.left = 20
|
||||
} else {
|
||||
this.option.grid.left = -80
|
||||
}
|
||||
// console.log('222222', this.chartMsg);
|
||||
if (this.myChart) {
|
||||
this.myChart.dispose();
|
||||
@ -197,7 +212,7 @@ export default {
|
||||
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.xAxis.data = this.chartMsg.xData
|
||||
// this.option.yAxis.name = this.chartMsg.yName;
|
||||
|
||||
// this.option.yAxis.axisLabel = this.chartMsg.yAxisLabel;
|
||||
|
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2024-06-20 16:13:52
|
||||
* @LastEditTime: 2024-06-25 10:49:34
|
||||
* @LastEditTime: 2024-06-27 09:55:02
|
||||
* @LastEditors: zhp
|
||||
* @Description:
|
||||
-->
|
||||
@ -80,52 +80,52 @@ export default {
|
||||
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,
|
||||
},
|
||||
// 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: [],
|
||||
},
|
||||
|
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2024-06-21 09:05:14
|
||||
* @LastEditTime: 2024-06-26 14:49:15
|
||||
* @LastEditTime: 2024-06-27 10:59:40
|
||||
* @LastEditors: zhp
|
||||
* @Description:
|
||||
-->
|
||||
@ -98,52 +98,51 @@ export default {
|
||||
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,
|
||||
},
|
||||
|
||||
],
|
||||
// dataZoom: [//滚动条
|
||||
// {
|
||||
// // 设置滚动条的隐藏与显示
|
||||
// show: true,
|
||||
// // 设置滚动条类型
|
||||
// type: "slider",
|
||||
// // 设置背景颜色
|
||||
// backgroundColor: "#F7F7F7",
|
||||
// // 设置选中范围的填充颜色
|
||||
// fillerColor: "#EBEBEB",
|
||||
// // 设置边框颜色
|
||||
// borderColor: "#F7F7F7",
|
||||
// // 是否显示detail,即拖拽时候显示详细数值信息
|
||||
// showDetail: false,
|
||||
// // 数据窗口范围的起始数值
|
||||
// startValue: 0,
|
||||
// // 数据窗口范围的结束数值(一页显示多少条数据)
|
||||
// endValue: 5,
|
||||
// // empty:当前数据窗口外的数据,被设置为空。
|
||||
// // 即不会影响其他轴的数据范围
|
||||
// filterMode: "empty",
|
||||
// // 设置滚动条宽度,相对于盒子宽度
|
||||
// width: "100%",
|
||||
// // 设置滚动条高度
|
||||
// height: 8,
|
||||
// // 设置滚动条显示位置
|
||||
// left: "center",
|
||||
// // 是否锁定选择区域(或叫做数据窗口)的大小
|
||||
// zoomLoxk: true,
|
||||
// // 控制手柄的尺寸
|
||||
// handleSize: 0,
|
||||
// // dataZoom-slider组件离容器下侧的距离
|
||||
// bottom: 3,
|
||||
// },
|
||||
// {
|
||||
// // 没有下面这块的话,只能拖动滚动条,
|
||||
// // 鼠标滚轮在区域内不能控制外部滚动条
|
||||
// type: "inside",
|
||||
// // 滚轮是否触发缩放
|
||||
// zoomOnMouseWheel: false,
|
||||
// // 鼠标滚轮触发滚动
|
||||
// moveOnMouseMove: true,
|
||||
// moveOnMouseWheel: true,
|
||||
// },
|
||||
// ],
|
||||
yAxis:undefined,
|
||||
series: [],
|
||||
},
|
||||
|
@ -176,12 +176,12 @@ export default {
|
||||
type: "value",
|
||||
name: "单位/MW",
|
||||
// splitNumber: 5,
|
||||
min: function (value) {//取最小值向下取整为最小刻度
|
||||
return 0
|
||||
},
|
||||
max: function (value) {//取最大值向上取整为最大刻度
|
||||
return Math.ceil(value.max)
|
||||
},
|
||||
// min: function (value) {//取最小值向下取整为最小刻度
|
||||
// return 0
|
||||
// },
|
||||
// max: function (value) {//取最大值向上取整为最大刻度
|
||||
// return Math.ceil(value.max)
|
||||
// },
|
||||
alignTicks: true,
|
||||
nameTextStyle: {
|
||||
fontSize: 12,
|
||||
@ -192,12 +192,12 @@ export default {
|
||||
{
|
||||
type: 'value',
|
||||
alignTicks: true,
|
||||
min: 0,
|
||||
max: 100,
|
||||
// min: 0,
|
||||
// max: 100,
|
||||
// scale: true,
|
||||
interval: 25,//间隔
|
||||
// interval: 25,//间隔
|
||||
// inverse: true,
|
||||
splitNumber: 5,
|
||||
// splitNumber: 5,
|
||||
name: "单位/%",
|
||||
nameTextStyle: {
|
||||
fontSize: 12,
|
||||
@ -248,15 +248,15 @@ export default {
|
||||
{
|
||||
type: "value",
|
||||
name: "单位/片",
|
||||
min: function (value) {//取最小值向下取整为最小刻度
|
||||
return 0
|
||||
},
|
||||
max: function (value) {//取最大值向上取整为最大刻度
|
||||
return Math.ceil(value.max)
|
||||
},
|
||||
// min: function (value) {//取最小值向下取整为最小刻度
|
||||
// return 0
|
||||
// },
|
||||
// max: function (value) {//取最大值向上取整为最大刻度
|
||||
// return Math.ceil(value.max)
|
||||
// },
|
||||
alignTicks: true,
|
||||
// splitNumber: 5,
|
||||
scale: true,
|
||||
// scale: true,
|
||||
nameTextStyle: {
|
||||
fontSize: 12,
|
||||
align: "right",
|
||||
@ -269,10 +269,10 @@ export default {
|
||||
name: "单位/%",
|
||||
scale: true,
|
||||
alignTicks: true,
|
||||
min: 0,
|
||||
max: 100,
|
||||
// min: 0,
|
||||
// max: 100,
|
||||
// scale: true,
|
||||
interval: 25,//间隔
|
||||
// interval: 25,//间隔
|
||||
// splitNumber: 5,
|
||||
nameTextStyle: {
|
||||
fontSize: 12,
|
||||
@ -521,6 +521,7 @@ export default {
|
||||
this.chartMsg.series[2].data = []
|
||||
this.chartMsgYearTarget.series[0].data = []
|
||||
this.chartMsgYearTarget.series[1].data = []
|
||||
this.title = ''
|
||||
if (!this.listQuery.beginTime && !this.listQuery.endTime) {
|
||||
return this.$message('请选择起止时间')
|
||||
}
|
||||
|
@ -64,7 +64,7 @@
|
||||
</el-col>
|
||||
<el-col :span="6" style="margin-top: 30px">
|
||||
<bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
|
||||
:chartMsg="chartMsgTarget" :chartId="'chartTarget'" :chartNum="chartNum" />
|
||||
:chartMsg="chartMsgTarget" :gridLeft="gridLeft" :chartId="'chartTarget'" :chartNum="chartNum" />
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<div class="blueTip">
|
||||
@ -84,7 +84,7 @@
|
||||
</el-col>
|
||||
<el-col :span="6" style="margin-top: 30px">
|
||||
<bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
|
||||
:chartMsg="chartMsgTarget" :chartId="'chartDayTarget'" :chartNum="chartNum" />
|
||||
:chartMsg="chartMsgTarget" :gridLeft="gridLeft" :chartId="'chartDayTarget'" :chartNum="chartNum" />
|
||||
</el-col>
|
||||
<!-- <el-col :span="6">
|
||||
<div class="blueTip">
|
||||
@ -103,8 +103,8 @@
|
||||
:chartId="chartId" :chartNum="chartNum" />
|
||||
<!-- </el-col> -->
|
||||
</el-row>
|
||||
<base-table :key="showTable" :table-props="tableProps" :page="listQuery.current"
|
||||
:limit="listQuery.size" :table-data="tableData" :max-height="tableH" />
|
||||
<base-table :key="showTable" :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size"
|
||||
:table-data="tableData" :max-height="tableH" />
|
||||
</div>
|
||||
<!-- <div class="containerBottom">
|
||||
|
||||
@ -130,6 +130,7 @@ export default {
|
||||
currentMenu: '邯郸',
|
||||
end: undefined,
|
||||
title: '',
|
||||
gridLeft:true,
|
||||
listQuery: {
|
||||
pageNo: 1,
|
||||
pageSize: 999,
|
||||
@ -529,7 +530,11 @@ export default {
|
||||
this.chartMsg.yAxis.interval = (this.chartMsg.yAxis.max - this.chartMsg.yAxis.min) / 4
|
||||
this.chartMsgTarget.yAxis.interval = (this.chartMsgTarget.yAxis.max - this.chartMsgTarget.yAxis.min) / 4
|
||||
if (this.listQuery.type === 2) {
|
||||
|
||||
if (res.data.list.length === 3) {
|
||||
this.gridLeft = false
|
||||
} else {
|
||||
this.gridLeft = true
|
||||
}
|
||||
// res.data.list.forEach((ele) => {
|
||||
res.data.list.slice(0, res.data.list.length - 3).forEach((ele, index) => {
|
||||
// let i = index + 1
|
||||
@ -693,6 +698,11 @@ export default {
|
||||
})
|
||||
// })
|
||||
} else if (this.listQuery.type === 1 || this.listQuery.type === 0) {
|
||||
if (res.data.list.length === 2) {
|
||||
this.gridLeft = false
|
||||
} else {
|
||||
this.gridLeft = true
|
||||
}
|
||||
// res.data.list.forEach((ele) => {
|
||||
res.data.list.slice(0, res.data.list.length - 2).forEach((ele, index) => {
|
||||
// let i = index + 1
|
||||
|
@ -64,7 +64,8 @@
|
||||
</el-col>
|
||||
<el-col :span="6" style="margin-top: 30px">
|
||||
<bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
|
||||
:chartMsg="chartMsgTarget" ref="dayTargetChart" :chartId=" 'chartTarget'" :chartNum="chartNum" />
|
||||
:chartMsg="chartMsgTarget" :gridLeft="gridLeft" ref="dayTargetChart" :chartId=" 'chartTarget'"
|
||||
:chartNum="chartNum" />
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<div class="blueTip">
|
||||
@ -84,7 +85,7 @@
|
||||
</el-col>
|
||||
<el-col :span="6" style="margin-top: 30px">
|
||||
<bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
|
||||
:chartMsg="chartMsgTarget" :chartId=" 'chartDayTarget'" :chartNum="chartNum" />
|
||||
:chartMsg="chartMsgTarget" :gridLeft="gridLeft" :chartId=" 'chartDayTarget'" :chartNum="chartNum" />
|
||||
</el-col>
|
||||
<!-- <el-col :span="6">
|
||||
<div class="blueTip">
|
||||
@ -129,6 +130,7 @@ export default {
|
||||
currentMenu:'邯郸',
|
||||
end: undefined,
|
||||
title: '',
|
||||
gridLeft:true,
|
||||
showTable:false,
|
||||
listQuery: {
|
||||
pageNo: 1,
|
||||
@ -673,6 +675,11 @@ export default {
|
||||
// })
|
||||
})
|
||||
if (this.listQuery.type === 2) {
|
||||
if (res.data.list.length === 3) {
|
||||
this.gridLeft = false
|
||||
} else {
|
||||
this.gridLeft = true
|
||||
}
|
||||
console.log(res.data.list.length);
|
||||
// res.data.list.forEach((ele) => {
|
||||
res.data.list.slice(0, res.data.list.length - 3).forEach((ele, index) => {
|
||||
@ -948,6 +955,11 @@ export default {
|
||||
})
|
||||
// })
|
||||
} else if (this.listQuery.type === 1 || this.listQuery.type === 0) {
|
||||
if (res.data.list.length === 2) {
|
||||
this.gridLeft = false
|
||||
} else {
|
||||
this.gridLeft = true
|
||||
}
|
||||
// console.log(res.data.list.slice(res.data.list.length - 2, res.data.list.length));
|
||||
// res.data.list.forEach((ele) => {
|
||||
res.data.list.slice(0, res.data.list.length - 2).forEach((ele, index) => {
|
||||
|
@ -174,12 +174,12 @@ export default {
|
||||
type: "value",
|
||||
name: "单位/片",
|
||||
splitNumber: 4,
|
||||
min: function (value) {//取最小值向下取整为最小刻度
|
||||
return Math.floor(value.min)
|
||||
},
|
||||
max: function (value) {//取最大值向上取整为最大刻度
|
||||
return Math.ceil(value.max)
|
||||
},
|
||||
// min: function (value) {//取最小值向下取整为最小刻度
|
||||
// return Math.floor(value.min)
|
||||
// },
|
||||
// max: function (value) {//取最大值向上取整为最大刻度
|
||||
// return Math.ceil(value.max)
|
||||
// },
|
||||
alignTicks: true,
|
||||
nameTextStyle: {
|
||||
fontSize: 12,
|
||||
@ -191,10 +191,10 @@ export default {
|
||||
type: 'value',
|
||||
// inverse: true,
|
||||
alignTicks: true,
|
||||
min: 0,
|
||||
max: 100,
|
||||
// min: 0,
|
||||
// max: 100,
|
||||
// scale: true,
|
||||
interval: 25,//间隔
|
||||
// interval: 25,//间隔
|
||||
splitNumber: 4,
|
||||
name: "单位/%",
|
||||
nameTextStyle: {
|
||||
@ -246,15 +246,15 @@ export default {
|
||||
{
|
||||
type: "value",
|
||||
name: "单位/片",
|
||||
min: function (value) {//取最小值向下取整为最小刻度
|
||||
return Math.floor(value.min)
|
||||
},
|
||||
max: function (value) {//取最大值向上取整为最大刻度
|
||||
return Math.ceil(value.max)
|
||||
},
|
||||
// min: function (value) {//取最小值向下取整为最小刻度
|
||||
// return Math.floor(value.min)
|
||||
// },
|
||||
// max: function (value) {//取最大值向上取整为最大刻度
|
||||
// return Math.ceil(value.max)
|
||||
// },
|
||||
alignTicks:true,
|
||||
splitNumber: 4,
|
||||
scale: true,
|
||||
// splitNumber: 4,
|
||||
// scale: true,
|
||||
nameTextStyle: {
|
||||
fontSize: 12,
|
||||
align: "right",
|
||||
@ -266,10 +266,10 @@ export default {
|
||||
// inverse: true,
|
||||
name: "单位/%",
|
||||
alignTicks: true,
|
||||
min: 0,
|
||||
max:100,
|
||||
// min: 0,
|
||||
// max:100,
|
||||
// scale: true,
|
||||
interval: 25,//间隔
|
||||
// interval: 25,//间隔
|
||||
splitNumber: 4,
|
||||
nameTextStyle: {
|
||||
fontSize: 12,
|
||||
|
Loading…
Reference in New Issue
Block a user