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

projects/mescc/zhp #17

Merged
juzi merged 3 commits from projects/mescc/zhp into projects/mescc/develop 2024-05-20 10:23:10 +08:00
Conversation 0 Commits 3 Files Changed 28 +130 -192
15 changed files with 130 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 83ad88858b - Show all commits

6
.env.dev
View File

@ -1,7 +1,7 @@
###
# @Author: zhp
# @Date: 2024-04-28 13:42:51
# @LastEditTime: 2024-05-16 09:00:26
# @LastEditTime: 2024-05-20 08:31:10
# @LastEditors: zhp
# @Description:
###
@ -12,8 +12,8 @@ ENV = 'development'
VUE_APP_TITLE = 芋道管理系统
# 芋道管理系统/开发环境
# VUE_APP_BASE_API = 'http://192.168.1.54:48080'
VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com'
VUE_APP_BASE_API = 'http://192.168.1.61:48080'
# VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com'
#
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true

22
src/mixins/chart.js
View File

@ -1,19 +1,19 @@
import * as echarts from "echarts";
function __resizeHandler(entries) {
console.log(entries)
for (const entry of entries) {
if (entry.contentBoxSize) {
// manipulate contentBoxSize
// const contentBoxSize = Array.isArray(entry.contentBoxSize)
// ? entry.contentBoxSize[0]
// : entry.contentBoxSize;
// this.chart_mixin_chartInstance.resize({
// width:
// contentBoxSize.inlineSize < this.MIN_WIDTH
// ? this.MIN_WIDTH
// : contentBoxSize.inlineSize,
// height: contentBoxSize.blockSize,
// });
// const contentBoxSize = Array.isArray(entry.contentBoxSize)
// ? entry.contentBoxSize[0]
// : entry.contentBoxSize;
// this.chart_mixin_chartInstance.resize({
// width:
// contentBoxSize.inlineSize < this.MIN_WIDTH
// ? this.MIN_WIDTH
// : contentBoxSize.inlineSize,
// height: contentBoxSize.blockSize,
// });
} else {
// manipulate contentRect
this.chart_mixin_chartInstance.resize({

35
src/store/modules/home.js
View File

@ -90,8 +90,10 @@ const actions = {
/** 初始化首页数据 */
async initHome({ commit }) {
const dataArr = await getHomeInfo();
const targetArr = await getHomeInfo();
const payload = splitCurrentAndPrevious(dataArr.prodOutputResultDO, targetArr.prodTargetDO);
console.log('dataArr',dataArr);
// const targetArr = await getHomeInfo();
const payload = splitCurrentAndPrevious(dataArr.prodOutputOutDO, dataArr.prodTargetDO,dataArr.prodOutputFtoDO
);
commit("SET_HOME_INFO", payload);
},
/** 初始化驾驶舱数据 */
@ -121,9 +123,10 @@ const actions = {
const payload = handler(factoryData)
commit("SET_COPILOT_INFO", { type, payload });
} else {
let factoryData = factoryList.prodOutputResultDO ? factoryList.prodOutputResultDO : factoryList.prodOutputRateDO
let factoryData = factoryList.prodOutputOutDO ? factoryList.prodOutputOutDO : factoryList.prodOutputRateDO
let prodOutputFtoDO = factoryList.prodOutputFtoDO ? factoryList.prodOutputFtoDO : []
let targetData = targetList.prodTargetDO ? targetList.prodTargetDO : targetList.prodTargetDO
const payload = handler(factoryData, targetData)
const payload = handler(factoryData, targetData,prodOutputFtoDO)
commit("SET_COPILOT_INFO", { type, payload });
}
@ -372,14 +375,20 @@ function splitCurrentAndPreviousA(factoryListResponse, targetListResponse) {
}
}
function splitCurrentAndPrevious(factoryListResponse, targetListResponse) {
function splitCurrentAndPrevious(factoryListResponse, targetListResponse, prodOutputFtoListRes) {
console.log('prodOutputFtoListRes',prodOutputFtoListRes);
// 初始数据
const { chipInvest, ftoInvest, chipOutput, stdOutput, bipvOutput } = init();
const { chipInvest, ftoInvest, chipOutput, stdOutput, bipvOutput } = init()
if (prodOutputFtoListRes) {
for (const factory of prodOutputFtoListRes) {
console.log(factory);
const fId = getFactoryId(factory);
ftoInvest.current[fId] = factory.chipInput;
ftoInvest.previous[fId] = factory.previousYearChipInput;
}
}
if (factoryListResponse) {
for (const factory of factoryListResponse) {
const fId = getFactoryId(factory);
// 获取目标值
if (targetListResponse) {
@ -393,8 +402,11 @@ function splitCurrentAndPrevious(factoryListResponse, targetListResponse) {
chipInvest.current[fId] = factory.inputNumber;
chipInvest.previous[fId] = factory.previousYearInputNumber;
// FTO投入
ftoInvest.current[fId] = factory.chipInput;
ftoInvest.previous[fId] = factory.previousYearChipInput;
// if (factory.chipInput || factory.previousYearChipInput) {
// ftoInvest.current[fId] = factory.chipInput;
// ftoInvest.previous[fId] = factory.previousYearChipInput;
// }
// 产出数据, 0 - （玻璃）芯片产出， 1 - 标准组件产出， 2 - BIPV产出
// 因为后端写的垃圾数据，所以这里要做一下判断
if (![0, 1, 2].includes(factory.glassType)) continue;
@ -406,6 +418,7 @@ function splitCurrentAndPrevious(factoryListResponse, targetListResponse) {
return {
chipInvest,
// ftoInvest,
ftoInvest,
chipOutput,
stdOutput,

1
src/views/copilot/components/CopilotHeader.vue
View File

@ -62,7 +62,6 @@ export default {
methods: {
toggleFullScreen() {
this.isFullscreen = !this.isFullscreen;
screenfull.toggle(document.querySelector(".copilot-layout"))
// 矫正宽度
// const el = document.querySelector(".copilot-layout");

2
src/views/copilot/container.vue
View File

@ -85,7 +85,7 @@ export default {
height: calc(100% + 38px);
}
.other {
height: 100vh + 50px;
height: calc(100% + 240px);
}
.copilot-footer {
/** position: absolute;

10
src/views/copilot/efficiency/components/StdRate.vue
View File

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-05-07 10:25:10
* @LastEditTime: 2024-05-16 10:46:33
* @LastEditTime: 2024-05-20 10:04:03
* @LastEditors: zhp
* @Description:
-->
@ -98,17 +98,21 @@ export default {
<style scoped lang="scss">
.std-rate {
display: flex;
// gap: 8px;
display: -webkit-box;
// gap: 1px;
flex: 1 1 auto;
// display: -webkit-box;
flex-wrap: wrap;
align-items: center;
// grid-template-columns: repeat(2, 1fr);
// grid-template-rows: repeat(4, 1fr);
}
.flex-item{
// flex: 1 1 auto;
width: 50%;
}
.span-2 {
// flex: 1 1 auto;
flex-basis: 100%;
}
</style>

34
src/views/copilot/efficiency/components/sub/chip/ChipRateItem.vue
View File

@ -11,7 +11,7 @@
<CopilotButtons :options="cities" @update:active="handleCityUpdate" />
</div>
<!-- <div style="flex:1;padding: 0 20%;"> -->
<div class="chart" ref="chart"></div>
<div class="chart" ref="chart"></div>
<!-- </div> -->
<div class="legend" v-if="period == '月' || period == '年'">
<div class="legend-item" v-for="lgd in legend" :key="lgd.label">
@ -145,25 +145,29 @@ export default {
</script>
<style scoped lang="scss">
.chip-rate-item {
flex: 1;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
gap: 3px;
backdrop-filter: blur(24px);
.chip-rate-item {
flex: 1;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
gap: 3px;
backdrop-filter: blur(24px);
.cities {
height: 40px;
}
.chart {
// width: 390px;
align-self: stretch;
height: 150px;
}
.chart {
// margin-left: 5%;
// width: 290px;
align-self: stretch;
// flex: 1 1 auto;
// padding: 0 10%;
/* margin: 10%; */
/* min-width: 300px; */
height: 200px;
}
.legend {
height: 80px;
display: flex;

7
src/views/copilot/efficiency/components/sub/std/StdRateItem.vue
View File

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-05-07 10:25:10
* @LastEditTime: 2024-05-16 08:45:32
* @LastEditTime: 2024-05-20 09:46:19
* @LastEditors: zhp
* @Description:
-->
@ -109,15 +109,16 @@ export default {
display: flex;
align-items: center;
gap: 8px;
flex: 1 1 auto;
padding: 12px;
}
.std-rate-item__value {
flex: 1;
flex: 1 1 auto;
margin: 6px;
display: flex;
gap: 12px;
height: auto;
// height: auto;
flex-direction: column;
justify-content: center;
}

2
src/views/copilot/efficiency/index.vue
View File

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-05-07 10:04:53
* @LastEditTime: 2024-05-15 16:46:15
* @LastEditTime: 2024-05-17 17:05:36
* @LastEditors: zhp
* @Description:
-->

2
src/views/copilot/energy/components/StockMonitor.vue
View File

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-05-07 10:25:10
* @LastEditTime: 2024-05-16 10:42:25
* @LastEditTime: 2024-05-17 10:34:51
* @LastEditors: zhp
* @Description:
-->

54
src/views/copilot/energy/components/sub/monitor/MonitorItem.vue
View File

@ -10,16 +10,16 @@
<div class="cities">
<CopilotButtons :options="cities" @update:active="handleCityUpdate" />
</div>
<div style="padding: 0 40px;width: 90%;">
<!-- <div style="width: 90%;"> -->
<div class="chart" ref="chart"></div>
</div>
<!-- </div> -->
<div class="legend" v-if="1">
<div class="legend-item" v-for="(lgd,index) in legendList" :key="lgd.name">
<div class="legend-item" v-for="(lgd, index) in legendList" :key="lgd.name">
<div>
<span :style="'backgroundColor:' + colors[index%5]" class="legend-item__chart"></span>
<span :style="'color:' + colors[index%5]" class="legend-item__label">{{ lgd.name }}</span>
<span :style="'backgroundColor:' + colors[index % 5]" class="legend-item__chart"></span>
<span :style="'color:' + colors[index % 5]" class="legend-item__label">{{ lgd.name }}</span>
</div>
<div :style="'color:' + colors[index%5]" class="legend-item__value">{{ lgd.value }}</div>
<div :style="'color:' + colors[index % 5]" class="legend-item__value">{{ lgd.value }}</div>
</div>
</div>
</div>
@ -54,7 +54,7 @@ export default {
period: "月",
factoryId: 0,
// legendList:[],
colors:['#2760FF', '#5996F7', '#8BC566', '#11FAF0', '#F3C000'],
colors: ['#2760FF', '#5996F7', '#8BC566', '#11FAF0', '#F3C000'],
// valueTuple: [100, 100, 200],
};
},
@ -69,13 +69,13 @@ export default {
legendList() {
// if (this.valueTuple) {
// if (this.valueTuple.length == 0) {
return this.valueTuple
return this.valueTuple
// } else {
// return []
// }
// return []
// }
// console.log(this.valueTuple)
// } else {
// return []
// return []
// }
},
options() {
@ -88,7 +88,7 @@ export default {
arr.push(ele.value)
});
let vt = arr
titleValue = vt.reduce(function (prev, cur, index, arr) {
titleValue = vt.reduce(function (prev, cur, index, arr) {
return prev + cur
})
} else {
@ -119,13 +119,13 @@ export default {
factoryId(newVal, oldVal) {
console.log(newVal);
// if (newVal) {
// this.legendList = this.data[newVal]
// if ( == 0) {
// this.initOptions(this.options)
// }
// console.log(this.valueTuple.length)
// console.log(this.options)
this.initOptions(this.options)
// this.legendList = this.data[newVal]
// if ( == 0) {
// this.initOptions(this.options)
// }
// console.log(this.valueTuple.length)
// console.log(this.options)
this.initOptions(this.options)
// }
},
// chipRate() {
@ -164,9 +164,13 @@ export default {
.chart {
// margin-left: 5%;
width: 290px;
// width: 290px;
align-self: stretch;
height: 150px;
flex: 1 1 auto;
// padding: 0 10%;
/* margin: 10%; */
/* min-width: 300px; */
height: 0;
}
.legend {
@ -185,7 +189,8 @@ export default {
align-items: center;
flex-wrap: wrap;
gap: 3px;
.legend-item__chart{
.legend-item__chart {
display: inline-block;
width: 14px;
height: 14px;
@ -193,9 +198,11 @@ export default {
border-radius: 2px;
// margin-right: 8px;
}
.legend-item__label {
.legend-item__label {
margin-left: 8px;
}
// }
}
@ -205,4 +212,3 @@ export default {
}
}
</style>
l

106
src/views/copilot/energy/index.vue
View File

@ -33,7 +33,6 @@ import StockMonitorVue from "./components/StockMonitor.vue";
import ElecCostVue from "./components/ElecCost.vue";
import NatGasVue from "./components/NatGas.vue";
import WaterCostVue from "./components/WaterCost.vue";
import { getEnergySumPage } from '@/api/energy'
export default {
name: "EnergyCopilot",
components: {
@ -78,111 +77,6 @@ export default {
// source: "comprehensive",
// });
},
dedupe(array){
return Array.from(new Set(array));
},
async getData(period) {
let date = null
switch (period) {
case "日":
date = 1;
break;
case "周":
date = 2;
break;
case "月":
date = 3;
break;
case "年":
date = 4;
break;
default:
date = 1;
break;
}
const res = await getEnergySumPage({
// factorys:[],
date
})
let factoryArr = [
{
id: 0,
name: '瑞昌中建材光电材料有限公司',
stockData: [],
waterData: [],
elsData: [],
gasData: [],
},
{
id: 1,
name: '邯郸中建材光电材料有限公司',
stockData: [],
waterData: [],
elsData: [],
gasData: [],
},
{
id: 2,
name: '中建材株洲光电材料有限公司',
stockData: [],
waterData: [],
elsData: [],
gasData: [],
},
{
id: 3,
name: '佳木斯中建材光电材料有限公司',
stockData: [],
waterData: [],
elsData: [],
gasData: [],
},
{
id: 4,
name: '成都中建材光电材料有限公司',
stockData: [],
waterData: [],
elsData: [],
gasData: [],
},
{
id: 5,
name: '凯盛光伏材料有限公司',
stockData: [],
waterData: [],
elsData: [],
gasData: [],
},
{
id: 6,
name: '蚌埠兴科玻璃有限公司',
stockData: [],
waterData: [],
elsData: [],
gasData: [],
},
]
for (let i in res.data.stockDO) {
const index = factoryArr.findIndex(item => item.id == res.data.stockDO[i].factory)
if (index != -1) {
res.data.stockDO[i].stockInfo.forEach(ele => {
factoryArr[index].stockData.push(ele)
});
}
}
let stockDOData = []
factoryArr.forEach((ele, index) => [
stockDOData[index]= [],
ele.stockData.forEach((item) => {
let obj = {}
obj.name = item.glassType == 0 ? '玻璃芯片' : item.glassType == 1 ? '标准组件' : item.glassType == 2 ? 'BIPV' : '定制组件'
obj.value = item.stockNumber
stockDOData[index].push(obj)
}),
])
this.stockDOData = stockDOData
this.$store.commit('home/updateEnergyData', stockDOData)
}
},
};
</script>

1
src/views/copilot/yield/components/FtoInvest.vue
View File

@ -65,6 +65,7 @@ export default {
},
series() {
const { ftoInvest } = this.$store.getters.copilot.yield;
console.log('ftoInvest', this.$store.getters.copilot.yield);
let dataList = null;
switch (this.period) {

36
src/views/copilot/yield/components/sub/ring/DoubleRingChart.vue
View File

@ -7,9 +7,9 @@
<template>
<div class="double-ring-chart">
<div class="double-ring-chart__container">
<div ref="chart" style="height: 100%;"></div>
</div>
<!-- <div> -->
<div ref="chart" class="double-ring-chart__container"></div>
<!-- </div> -->
<!-- style="{ height: vHeight + 'vh' }" -->
<div class="double-ring-chart__legend">
<div v-for="item in legendItems" :key="item.label" class="legend-item">
@ -22,12 +22,12 @@
<script>
import chartMixin from "@/mixins/chart.js";
import fullscreenMixin from "@/mixins/fullscreen.js";
import screenfull from "screenfull";
import getOptions from "../../../options/double-ring-chart-options";
export default {
name: "DoubleRingChart",
mixins: [chartMixin, fullscreenMixin],
mixins: [chartMixin],
props: {
vHeight: {
type: Number,
@ -47,7 +47,9 @@ export default {
},
},
data() {
return {};
return {
isFullscreen: false,
};
},
filters: {
numberFilter(val) {
@ -111,18 +113,32 @@ export default {
},
},
watch: {
isFullscreen(val) {
// this.actualOptions.series.map((item) => {
// item.barWidth = val ? 18 : 12;
// });
// this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
// this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
// this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
this.initOptions(this.options)
},
legendItems() {
this.initOptions(this.options);
},
},
mounted() {
this.initOptions(this.options);
if (screenfull.isEnabled) {
screenfull.on("change", () => {
this.isFullscreen = screenfull.isFullscreen;
});
}
},
methods: {
// fullscreen mixin 需要的回调
fullscreenCallback(isFullscreen) {
console.log("isFullscreen--->", isFullscreen);
},
// fullscreenCallback(isFullscreen) {
// console.log("isFullscreen--->", isFullscreen);
// },
},
};
@ -171,7 +187,7 @@ function calculateItems(period, valueTuple) {
}
.double-ring-chart__container {
flex:1;
flex:1 1 auto;
padding: 0 10%;
/* margin: 10%; */
/* min-width: 300px; */

4
src/views/copilot/yield/components/sub/ring/DoubleRingWrapper.vue
View File

@ -1,8 +1,8 @@
<!--
<!--
filename: DoubleRingWrapper.vue
author: liubin
date: 2024-04-17 09:55:12
description:
description:
-->
<template>