Compare commits
No commits in common. "c77130603e4b456a7ff9ecfab6164784792c7b50" and "44283a049b2ed84322adc4109710e6e51cfa7a64" have entirely different histories.
c77130603e
...
44283a049b
6
.env.dev
6
.env.dev
@ -1,7 +1,7 @@
|
||||
###
|
||||
# @Author: zhp
|
||||
# @Date: 2024-04-28 13:42:51
|
||||
# @LastEditTime: 2024-06-04 08:56:35
|
||||
# @LastEditTime: 2024-06-03 08:50:41
|
||||
# @LastEditors: DY
|
||||
# @Description:
|
||||
###
|
||||
@ -13,11 +13,11 @@ VUE_APP_TITLE = 芋道管理系统
|
||||
|
||||
# 芋道管理系统/开发环境
|
||||
# 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'
|
||||
# sara
|
||||
# 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_CLI_BABEL_TRANSPILE_MODULES = true
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*
|
||||
* @Author: zhp
|
||||
* @Date: 2024-05-07 08:54:59
|
||||
* @LastEditTime: 2024-06-03 14:25:02
|
||||
* @LastEditTime: 2024-05-31 15:08:27
|
||||
* @LastEditors: DY
|
||||
* @Description:
|
||||
*/
|
||||
@ -50,11 +50,3 @@ export function exportExcel(data) {
|
||||
responseType: 'blob'
|
||||
})
|
||||
}
|
||||
|
||||
// 获得工单数据概览
|
||||
export function getOverView(){
|
||||
return request({
|
||||
url: '/ip/prod-work-order/getOverView',
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
@ -4,16 +4,16 @@ function __resizeHandler(entries) {
|
||||
console.log(entries)
|
||||
for (const entry of entries) {
|
||||
if (entry.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({
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2024-05-07 10:25:10
|
||||
* @LastEditTime: 2024-06-03 16:40:45
|
||||
* @LastEditTime: 2024-05-31 16:38:29
|
||||
* @LastEditors: zhp
|
||||
* @Description:
|
||||
-->
|
||||
|
||||
<template>
|
||||
<!-- <div class="order"> -->
|
||||
<div class="std-rate" style="width: 100%">
|
||||
<div class="std-rate" style="width: 100%; overflow: hidden scroll; height: 400px">
|
||||
<!-- <div class="span-2">
|
||||
<StdRateItem :period="period" :city="cities[5]" />
|
||||
</div> -->
|
||||
@ -106,12 +106,12 @@ export default {
|
||||
<style scoped lang="scss">
|
||||
.std-rate {
|
||||
display: flex;
|
||||
gap: 16px;
|
||||
// gap: 1px;
|
||||
// flex: 1 1 auto;
|
||||
flex-direction: column;
|
||||
|
||||
// display: -webkit-box;
|
||||
// flex-wrap: wrap;
|
||||
// align-items: center;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
// grid-template-columns: repeat(2, 1fr);
|
||||
// grid-template-rows: repeat(4, 1fr);
|
||||
}
|
||||
@ -120,10 +120,10 @@ export default {
|
||||
}
|
||||
.flex-item{
|
||||
// flex: 1 1 auto;
|
||||
// width: 50%;
|
||||
width: 50%;
|
||||
}
|
||||
.span-2 {
|
||||
flex: 1 1 auto;
|
||||
// flex-basis: 100%;
|
||||
// flex: 1 1 auto;
|
||||
flex-basis: 100%;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2024-05-07 13:22:43
|
||||
* @LastEditTime: 2024-06-03 16:13:52
|
||||
* @LastEditTime: 2024-05-31 15:55:00
|
||||
* @LastEditors: zhp
|
||||
* @Description:
|
||||
-->
|
||||
@ -11,7 +11,7 @@
|
||||
<span v-for="(item,index) in legend" :key="index" class="legend-item"
|
||||
:style="{ fontSize: isFullscreen ? '0.58vw' : '0.54vw' }">{{ item.label }}</span>
|
||||
</div>
|
||||
<div ref="oeeChart" style="height:94%;width:100%"></div>
|
||||
<div ref="oeeChart" style="height:100%;width:100%"></div>
|
||||
</chart-container>
|
||||
</template>
|
||||
|
||||
@ -22,7 +22,7 @@ import ChartContainer from "../../../../components/ChartContainer.vue";
|
||||
import { debounce } from "@/utils/debounce";
|
||||
import * as echarts from "echarts";
|
||||
export default {
|
||||
name: "barChartBaseoee",
|
||||
name: "BarChartBase",
|
||||
components: {
|
||||
ChartContainer,
|
||||
},
|
||||
@ -220,30 +220,30 @@ export default {
|
||||
this.canvasReset()
|
||||
},
|
||||
/** 全屏状态切换时，对柱子粗细和字体大小进行相应调整 */
|
||||
isFullscreen(val) {
|
||||
// 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;
|
||||
// if (val === false && this.isOpen === true) {
|
||||
// console.log(val)
|
||||
// this.width = 97 + '%'
|
||||
// // if (val === false && this.isOpen === true) {
|
||||
// // console.log(val)
|
||||
// // this.width = 97 + '%'
|
||||
// // this.canvasReset()
|
||||
// // } else if (val === false && this.isOpen === false) {
|
||||
// // this.width = 100 + '%'
|
||||
// // this.canvasReset()
|
||||
// // }
|
||||
// // 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.initChart(this.actualOptions)
|
||||
// this.canvasReset()
|
||||
// } else if (val === false && this.isOpen === false) {
|
||||
// this.width = 100 + '%'
|
||||
// this.canvasReset()
|
||||
// }
|
||||
// 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.initChart(this.actualOptions)
|
||||
this.canvasReset()
|
||||
},
|
||||
// },
|
||||
series(val) {
|
||||
if (!val) {
|
||||
this.initChart(this.options);
|
||||
@ -268,11 +268,11 @@ export default {
|
||||
// this.isFullscreen = screenfull.isFullscreen;
|
||||
// });
|
||||
// }
|
||||
if (screenfull.isEnabled) {
|
||||
screenfull.on("change", () => {
|
||||
this.isFullscreen = screenfull.isFullscreen;
|
||||
});
|
||||
}
|
||||
// if (screenfull.isEnabled) {
|
||||
// screenfull.on("change", () => {
|
||||
// this.isFullscreen = screenfull.isFullscreen;
|
||||
// });
|
||||
// }
|
||||
this.actualOptions = this.options
|
||||
this.canvasReset();
|
||||
window.addEventListener("resize", this.canvasReset);
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2024-05-23 15:50:44
|
||||
* @LastEditTime: 2024-06-03 16:14:03
|
||||
* @LastEditTime: 2024-05-31 15:54:41
|
||||
* @LastEditors: zhp
|
||||
* @Description:
|
||||
-->
|
||||
@ -11,7 +11,7 @@
|
||||
<span v-for="(item,index) in legend" :key="index" class="legend-item"
|
||||
:style="{ fontSize: isFullscreen ? '0.58vw' : '0.54vw' }">{{ item.label }}</span>
|
||||
</div>
|
||||
<div ref="oeeChart" style="height:94%;width:100%"></div>
|
||||
<div ref="oeeChart" style="height:100%;width:100%"></div>
|
||||
</chart-container>
|
||||
</template>
|
||||
|
||||
@ -22,7 +22,7 @@ import ChartContainer from "../../../../components/ChartContainer.vue";
|
||||
import { debounce } from "@/utils/debounce";
|
||||
import * as echarts from "echarts";
|
||||
export default {
|
||||
name: "barChartBaseoee",
|
||||
name: "BarChartBase",
|
||||
components: {
|
||||
ChartContainer,
|
||||
},
|
||||
@ -221,12 +221,12 @@ export default {
|
||||
},
|
||||
/** 全屏状态切换时，对柱子粗细和字体大小进行相应调整 */
|
||||
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.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;
|
||||
// if (val === false && this.isOpen === true) {
|
||||
// console.log(val)
|
||||
// this.width = 97 + '%'
|
||||
@ -241,8 +241,8 @@ export default {
|
||||
// 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.initChart(this.actualOptions)
|
||||
this.canvasReset()
|
||||
// this.initChart(this.actualOptions)
|
||||
// this.canvasReset()
|
||||
},
|
||||
series(val) {
|
||||
if (!val) {
|
||||
@ -267,11 +267,11 @@ export default {
|
||||
// this.isFullscreen = screenfull.isFullscreen;
|
||||
// });
|
||||
// }
|
||||
if (screenfull.isEnabled) {
|
||||
screenfull.on("change", () => {
|
||||
this.isFullscreen = screenfull.isFullscreen;
|
||||
});
|
||||
}
|
||||
// if (screenfull.isEnabled) {
|
||||
// screenfull.on("change", () => {
|
||||
// this.isFullscreen = screenfull.isFullscreen;
|
||||
// });
|
||||
// }
|
||||
this.actualOptions = this.options
|
||||
this.canvasReset();
|
||||
window.addEventListener("resize", this.canvasReset);
|
||||
|
||||
@ -270,7 +270,7 @@ export default {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
// justify-content: center;
|
||||
justify-content: center;
|
||||
gap: 3px;
|
||||
backdrop-filter: blur(24px);
|
||||
.cities {
|
||||
@ -283,7 +283,6 @@ export default {
|
||||
flex: 1 1 auto;
|
||||
padding: 0 15%;
|
||||
/* margin: 10%; */
|
||||
height: 16vh;
|
||||
/* min-width: 300px; */
|
||||
align-self: stretch;
|
||||
}
|
||||
|
||||
@ -1,31 +1,25 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2024-05-07 10:04:53
|
||||
* @LastEditTime: 2024-06-03 16:08:27
|
||||
* @LastEditTime: 2024-05-31 13:19:34
|
||||
* @LastEditors: zhp
|
||||
* @Description:
|
||||
-->
|
||||
|
||||
<template>
|
||||
<div class="efficiency-copilot">
|
||||
<section class="top flex">
|
||||
<Container title="芯片良率" icon="chip2">
|
||||
<ChipRate :period="period" :than="than" />
|
||||
</Container>
|
||||
<Container title="标准组件良率" icon="std">
|
||||
<StdRate :period="period" :than="than" />
|
||||
</Container>
|
||||
</section>
|
||||
<section class="bottom flex">
|
||||
<Container title="芯片OEE" icon="chip">
|
||||
<ChipOee :chipOeeRate="chipOeeRate" :period="period" :than="than" />
|
||||
</Container>
|
||||
<Container title="转化效率" icon="cube">
|
||||
<TransformRate :transformRate="transformRate" :period="period" :than="than" />
|
||||
</Container>
|
||||
</section>
|
||||
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@ -37,7 +31,7 @@ import StdRateVue from "./components/StdRate.vue";
|
||||
import TransformRateVue from "./components/TransformRate.vue";
|
||||
|
||||
export default {
|
||||
name: "efficiencyCopilot",
|
||||
name: "EfficiencyCopilot",
|
||||
components: {
|
||||
Container,
|
||||
ChipOee: ChipOeeVue,
|
||||
@ -94,30 +88,7 @@ export default {
|
||||
};
|
||||
</script>
|
||||
|
||||
|
||||
<style scoped>
|
||||
.efficiency-copilot {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 16px;
|
||||
}
|
||||
|
||||
.flex {
|
||||
display: flex;
|
||||
gap: 16px;
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
.top > div,
|
||||
.bottom > div {
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
<!-- <style scoped>
|
||||
|
||||
.efficiency-copilot {
|
||||
flex: 1;
|
||||
display: grid;
|
||||
@ -129,4 +100,4 @@ export default {
|
||||
.efficiency-copilot > div {
|
||||
height: 100%;
|
||||
}
|
||||
</style> -->
|
||||
</style>
|
||||
|
||||
@ -22,7 +22,7 @@ export default ({
|
||||
textAlign: "center",
|
||||
textStyle: {
|
||||
fontWeight: 600,
|
||||
fontSize: 26,
|
||||
fontSize: 32,
|
||||
color: "#fffd",
|
||||
},
|
||||
subtext: `\u2002${subtitle}\u2002`,
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2024-05-20 16:04:18
|
||||
* @LastEditTime: 2024-06-03 15:45:58
|
||||
* @LastEditTime: 2024-05-31 13:16:26
|
||||
* @LastEditors: zhp
|
||||
* @Description:
|
||||
-->
|
||||
@ -95,14 +95,13 @@ export default {
|
||||
</script>
|
||||
<style>
|
||||
|
||||
|
||||
.copilot-layout {
|
||||
padding: 16px;
|
||||
background: url(../../assets/images/copilot-bg.png) 0 0 / 100% 100% no-repeat;
|
||||
position: absolute;
|
||||
left: -16px;
|
||||
/* top: -8px; */
|
||||
height: calc(100% + 30px);
|
||||
height: calc(100% + 240px);
|
||||
width: calc(100% + 30px);
|
||||
z-index: 1001;
|
||||
color: #fff;
|
||||
@ -111,12 +110,12 @@ export default {
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
/* .produce{
|
||||
.produce{
|
||||
height: calc(100% + 38px);
|
||||
} */
|
||||
/* .other { */
|
||||
}
|
||||
.other {
|
||||
/* height: calc(100% + 240px); */
|
||||
/* } */
|
||||
}
|
||||
.copilot-footer {
|
||||
/** position: absolute;
|
||||
bottom: 10px; **/
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2024-05-20 13:32:59
|
||||
* @LastEditTime: 2024-06-03 16:26:24
|
||||
* @LastEditTime: 2024-05-31 15:05:20
|
||||
* @LastEditors: zhp
|
||||
* @Description:
|
||||
-->
|
||||
@ -151,7 +151,7 @@ export default {
|
||||
];
|
||||
}
|
||||
let titleValue =
|
||||
vt[1] != null && (vt[2] !== 0 && vt[2] !== undefined)
|
||||
vt[1] != null && vt[2] !== 0
|
||||
? this.formatNumber((vt[1] / vt[2] * 100)) + '%'
|
||||
: (vt[1] != 0 && vt[1] != null) && vt[2] == 0
|
||||
? "100%" : '0%',
|
||||
|
||||
@ -1,10 +1,17 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2024-05-30 16:00:50
|
||||
* @LastEditTime: 2024-06-03 16:26:03
|
||||
* @LastEditTime: 2024-05-31 16:15:51
|
||||
* @LastEditors: zhp
|
||||
* @Description:
|
||||
-->
|
||||
<!--
|
||||
filename: DoubleRingWrapper.vue
|
||||
author: liubin
|
||||
date: 2024-04-17 09:55:12
|
||||
description:
|
||||
-->
|
||||
|
||||
<template>
|
||||
<div class="double-ring-wrapper">
|
||||
<template>
|
||||
|
||||
@ -22,7 +22,7 @@ export default ({
|
||||
textAlign: "center",
|
||||
textStyle: {
|
||||
fontWeight: 600,
|
||||
fontSize: 20,
|
||||
fontSize: 32,
|
||||
color: "#fffd",
|
||||
},
|
||||
subtext: `\u2002${subtitle}\u2002`,
|
||||
@ -38,7 +38,7 @@ export default ({
|
||||
{
|
||||
type: "pie",
|
||||
name: "当前目标",
|
||||
radius: ["80%", "90%"],
|
||||
radius: ["70%", "85%"],
|
||||
center: ["45%", "52%"],
|
||||
emptyCircleStyle: {
|
||||
color: "#042c5f33",
|
||||
@ -47,7 +47,7 @@ export default ({
|
||||
// 数据 series
|
||||
{
|
||||
type: "pie",
|
||||
radius: ["80%", "90%"],
|
||||
radius: ["70%", "85%"],
|
||||
center: ["45%", "52%"],
|
||||
avoidLabelOvervlap: false,
|
||||
label: {
|
||||
@ -92,7 +92,7 @@ export default ({
|
||||
// 数据 series2 - 2023累计
|
||||
{
|
||||
type: "pie",
|
||||
radius: ["70%", "80%"],
|
||||
radius: ["55%", "70%"],
|
||||
center: ["45%", "52%"],
|
||||
avoidLabelOvervlap: false,
|
||||
label: {
|
||||
|
||||
@ -1,10 +1,16 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2024-04-28 13:42:51
|
||||
* @LastEditTime: 2024-06-03 08:55:42
|
||||
* @LastEditTime: 2024-05-31 16:14:09
|
||||
* @LastEditors: zhp
|
||||
* @Description:
|
||||
-->
|
||||
<!--
|
||||
filename: Bipv.vue
|
||||
author: liubin
|
||||
date: 2024-04-10 15:39:54
|
||||
description:
|
||||
-->
|
||||
|
||||
<template>
|
||||
<right-chart-base
|
||||
@ -25,7 +31,7 @@ export default {
|
||||
data() {
|
||||
const year = new Date().getFullYear();
|
||||
// 城市数组的顺序必须是固定的
|
||||
const cities = [ "邯郸",
|
||||
const cities = ["瑞昌", "邯郸",
|
||||
// "株洲", "佳木斯", "成都", "凯盛", "蚌埠"
|
||||
|
||||
];
|
||||
@ -74,15 +80,15 @@ export default {
|
||||
return [
|
||||
{
|
||||
name: `${new Date().getFullYear()}年目标值`,
|
||||
data: bipvOutput.target.splice(0, 1),
|
||||
data: bipvOutput.target,
|
||||
},
|
||||
{
|
||||
name: `${new Date().getFullYear() - 1}年`,
|
||||
data: bipvOutput.previous.splice(0, 1)
|
||||
data: bipvOutput.previous,
|
||||
},
|
||||
{
|
||||
name: `${new Date().getFullYear()}年`,
|
||||
data: bipvOutput.current.splice(0, 1),
|
||||
data: bipvOutput.current,
|
||||
},
|
||||
];
|
||||
},
|
||||
|
||||
@ -111,6 +111,9 @@ export default {
|
||||
name: '', // this.series[0].name,
|
||||
type: "bar",
|
||||
barWidth: 12,
|
||||
itemStyle: {
|
||||
borderRadius: [10, 10, 0, 0],
|
||||
normal: {
|
||||
label: {
|
||||
show: true, //开启显示
|
||||
position: 'top', //在上方显示
|
||||
@ -118,9 +121,8 @@ export default {
|
||||
color: '#DFF1FE',
|
||||
fontSize: 16
|
||||
}
|
||||
}
|
||||
},
|
||||
itemStyle: {
|
||||
borderRadius: [10, 10, 0, 0],
|
||||
color: {
|
||||
type: "linear",
|
||||
x: 0,
|
||||
@ -154,19 +156,8 @@ export default {
|
||||
name: '', // this.series[1].name,
|
||||
type: "bar",
|
||||
barWidth: 12,
|
||||
label: {
|
||||
show: true, //开启显示
|
||||
position: 'top', //在上方显示
|
||||
textStyle: { //数值样式
|
||||
color: '#DFF1FE',
|
||||
fontSize: 16
|
||||
}
|
||||
},
|
||||
itemStyle: {
|
||||
borderRadius: [10, 10, 0, 0],
|
||||
// normal: {
|
||||
|
||||
// },
|
||||
color: {
|
||||
type: "linear",
|
||||
x: 0,
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
<div id="map-container">
|
||||
<!-- <div v-if="visible" class="cdLine"></div> -->
|
||||
<!-- <div v-if="visible" class="zzLine"></div> -->
|
||||
<!-- <div v-if="visible" class="rcLine"></div> -->
|
||||
<!-- <div v-if="visible" class="rcLineTwo"></div> -->
|
||||
<div v-if="visible" class="rcLine"></div>
|
||||
<div v-if="visible" class="rcLineTwo"></div>
|
||||
<div v-if="visible" class="hdLine"></div>
|
||||
<div v-if="visible" class="hdLineTwo"></div>
|
||||
<!-- <div v-if="visible" class="ksLine"></div> -->
|
||||
@ -39,12 +39,12 @@
|
||||
</div>
|
||||
</div>
|
||||
<company-info v-if="visible" :info="info" :position="rcHintPosition" />
|
||||
<!-- <ks-company-info v-if="visible" :info="ksInfo" :position="ksHintPosition" /> -->
|
||||
<!-- <jms-company-info v-if="visible" :info="jmsInfo" :position="jmsHintPosition" /> -->
|
||||
<ks-company-info v-if="visible" :info="ksInfo" :position="ksHintPosition" />
|
||||
<jms-company-info v-if="visible" :info="jmsInfo" :position="jmsHintPosition" />
|
||||
<hd-company-info v-if="visible" :info="hdInfo" :position="hdHintPosition" />
|
||||
<!-- <bb-company-info v-if="visible" :info="bbInfo" :position="bbHintPosition" /> -->
|
||||
<!-- <cd-company-info v-if="visible" :info="cdInfo" :position="cdHintPosition" /> -->
|
||||
<!-- <zz-company-info v-if="visible" :info="zzInfo" :position="zzHintPosition" /> -->
|
||||
<bb-company-info v-if="visible" :info="bbInfo" :position="bbHintPosition" />
|
||||
<cd-company-info v-if="visible" :info="cdInfo" :position="cdHintPosition" />
|
||||
<zz-company-info v-if="visible" :info="zzInfo" :position="zzHintPosition" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@ -69,17 +69,13 @@ const LOCATIONS = [
|
||||
// 蚌埠2
|
||||
// { x: 61, y: 53, tx: 39, ty: 68, path: 'factoryData/ksIndex' },
|
||||
// 江西 瑞昌
|
||||
{ x: 60, y: 58, tx: 68, ty: 52,lx:61,ly:61.5,ltx:68.8,lty:52, path: 'factoryData/factory-data' },
|
||||
{ x: 60, y: 58, tx: 68, ty: 52, path: 'factoryData/factory-data' },
|
||||
// 湖南 株洲
|
||||
// { x: 56, y: 60, tx: 60, ty: 95, path: 'factoryData/zzIndex' },
|
||||
// 邯郸
|
||||
{ x: 58, y: 45, tx: 47, ty: 34, lx: 58.7, ly: 34, ltx: 53, lty: 34, path: 'factoryData/hdIndex' },
|
||||
{ x: 58, y: 45, tx: 47, ty: 34, path: 'factoryData/hdIndex' },
|
||||
];
|
||||
// rcLine.style.left = `66.8%`;
|
||||
// rcLine.style.top = `52%`;
|
||||
// rcLineTwo.className = "rcLineTwo";
|
||||
// rcLineTwo.style.left = `58.7%`;
|
||||
// rcLineTwo.style.top = `34%`;
|
||||
|
||||
export default {
|
||||
name: "Index",
|
||||
components: {
|
||||
@ -252,16 +248,6 @@ export default {
|
||||
// this.ksInfo = templateInfo;
|
||||
// }
|
||||
(position === LOCATIONS[0]) {
|
||||
const rcLine = document.createElement("div");
|
||||
const rcLineTwo = document.createElement("div");
|
||||
rcLine.className = "rcLine";
|
||||
rcLine.style.left = `${position.lx}%`;
|
||||
rcLine.style.top = `${position.ly}%`;
|
||||
rcLineTwo.className = "rcLineTwo";
|
||||
rcLineTwo.style.left = `${position.ltx}%`;
|
||||
rcLineTwo.style.top = `${position.lty}%`;
|
||||
document.getElementById("map-container").appendChild(rcLine);
|
||||
document.getElementById("map-container").appendChild(rcLineTwo);
|
||||
this.rcHintPosition = position;
|
||||
templateInfo.companyName = "瑞昌中建材";
|
||||
templateInfo.items[0].value = this.homeStore.ftoInvest?.current[0];
|
||||
@ -278,16 +264,6 @@ export default {
|
||||
// templateInfo.items[3].value = this.homeStore.stdOutput.current[2];
|
||||
// this.zzInfo = templateInfo;
|
||||
} else if (position === LOCATIONS[1]) {
|
||||
const hdLine = document.createElement("div");
|
||||
const hdLineTwo = document.createElement("div");
|
||||
hdLine.className = "hdLine";
|
||||
hdLine.style.left = `${position.lx}%`;
|
||||
hdLine.style.top = `${position.ly}%`;
|
||||
hdLineTwo.className = "hdLineTwo";
|
||||
hdLineTwo.style.left = `${position.ltx}%`;
|
||||
hdLineTwo.style.top = `${position.lty}%`;
|
||||
document.getElementById("map-container").appendChild(hdLine);
|
||||
document.getElementById("map-container").appendChild(hdLineTwo);
|
||||
this.hdHintPosition = position;
|
||||
templateInfo.companyName = "邯郸中建材";
|
||||
templateInfo.items[0].value = this.homeStore.ftoInvest?.current[1];
|
||||
@ -374,9 +350,9 @@ export default {
|
||||
.rcLine {
|
||||
display: inline-block;
|
||||
position: absolute;
|
||||
/* left: 61%; */
|
||||
width: 7.9vw;
|
||||
/* top: 61.5%; */
|
||||
left: 61%;
|
||||
width: 100px;
|
||||
top: 61.5%;
|
||||
/* x: 60, y: 58, */
|
||||
height: 1px;
|
||||
border: 2px dashed #FFCF00;
|
||||
@ -384,12 +360,12 @@ export default {
|
||||
|
||||
.rcLineTwo {
|
||||
position: absolute;
|
||||
/* left: 66.8%; */
|
||||
left: 66.8%;
|
||||
width: 1px;
|
||||
/* top: 52%; */
|
||||
top: 52%;
|
||||
display: inline-block;
|
||||
/* // x: 60, y: 58, */
|
||||
height: 5vw;
|
||||
height: 90px;
|
||||
border: 2px dashed #FFCF00;
|
||||
}
|
||||
|
||||
@ -400,13 +376,13 @@ export default {
|
||||
top: 34%;
|
||||
display: inline-block;
|
||||
/* // x: 60, y: 58, */
|
||||
height: 6vw;
|
||||
height: 100px;
|
||||
border: 2px dashed #FFCF00;
|
||||
}
|
||||
.hdLineTwo {
|
||||
position: absolute;
|
||||
left: 53%;
|
||||
width: 5vw;
|
||||
width: 90px;
|
||||
top: 34%;
|
||||
display: inline-block;
|
||||
/* // x: 60, y: 58, */
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2023-11-06 15:15:30
|
||||
* @LastEditTime: 2024-06-03 15:42:47
|
||||
* @LastEditTime: 2024-05-22 15:29:18
|
||||
* @LastEditors: DY
|
||||
* @Description:
|
||||
-->
|
||||
@ -18,11 +18,11 @@
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<p class="title">时间维度</p>
|
||||
<p class="text">{{ ['日', '周', '月', '年'][dataForm.targetType] }}</p>
|
||||
<p class="text">{{ dataForm.targetType === 0 ? '月' : '年' }}</p>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<p class="title">时间</p>
|
||||
<p class="text">{{ dataForm.targetTime}}</p>
|
||||
<p class="text">{{ dataForm.targetType === 1 ? dataForm.targetYear + '年' : dataForm.targetYear + '年' + dataForm.targetMonth + '月'}}</p>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-divider></el-divider>
|
||||
@ -371,8 +371,5 @@ export default {
|
||||
color: rgba(102,102,102,0.75);
|
||||
padding-bottom: 20px;
|
||||
}
|
||||
.detailBox {
|
||||
width: 98%;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2024-04-15 10:49:13
|
||||
* @LastEditTime: 2024-06-03 16:02:56
|
||||
* @LastEditTime: 2024-05-31 16:41:12
|
||||
* @LastEditors: DY
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
<div style="display: flex; flex-direction: column; min-height: calc(100vh - 96px - 32px)">
|
||||
<div style="display: flex; flex-direction: column; min-height: calc(100vh - 96px - 31px)">
|
||||
<ButtonNav v-show="false" :menus="['碲化镉工厂', '铜铟镓硒工厂']" :button-mode="true" @change="changeFactory" style="margin-top: -10px">
|
||||
</ButtonNav>
|
||||
<div class="app-container" style="height: auto; flex-grow: 1;">
|
||||
<div class="app-container" style="padding: 16px 24px 0;height: auto; flex-grow: 1;">
|
||||
<el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
|
||||
<el-form-item v-if="facType === 0" label="工厂名称" prop="factorys">
|
||||
<el-select size="small" v-model="listQuery.factorys" placeholder="请选择工厂名称" multiple clearable>
|
||||
@ -42,9 +42,9 @@
|
||||
<el-date-picker size="small" clearable v-model="end" type="week" format="yyyy 第 WW 周" placeholder="选择周"
|
||||
style="width: 180px" @change="onValueChange">
|
||||
</el-date-picker>
|
||||
<!-- <span v-if="start && end" style="margin-left: 10px">
|
||||
<span v-if="start && end" style="margin-left: 10px">
|
||||
{{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周
|
||||
</span> -->
|
||||
</span>
|
||||
</el-form-item>
|
||||
<el-form-item v-show="listQuery.date === 3" label="时间值" prop="reportTime">
|
||||
<el-date-picker size="small" v-model="listQuery.reportTime" type="monthrange" value-format="yyyyMM" range-separator="至" start-placeholder="开始月份"
|
||||
@ -173,7 +173,7 @@ export default {
|
||||
current: 1,
|
||||
factorys: null,
|
||||
total: 0,
|
||||
date: 3,
|
||||
date: 1,
|
||||
beginTime: undefined,
|
||||
endTime: undefined,
|
||||
reportTime: []
|
||||
@ -450,12 +450,13 @@ export default {
|
||||
})
|
||||
this.upload.url = process.env.VUE_APP_BASE_API + '/admin-api/ip/prod-target/to-target-import-excel'
|
||||
}
|
||||
console.log(112, this.tableProps)
|
||||
}
|
||||
},
|
||||
created() {
|
||||
const currentMonth = new Date()
|
||||
this.listQuery.reportTime = [moment(currentMonth).format('yyyyMM'), moment(currentMonth).format('yyyyMM')]
|
||||
this.changeTime()
|
||||
mounted() {
|
||||
// this.getDict()
|
||||
// this.getCurrentYearFirst()
|
||||
this.getDataList()
|
||||
},
|
||||
methods: {
|
||||
handleImport() {
|
||||
@ -468,6 +469,42 @@ export default {
|
||||
this.upload.isUploading = true;
|
||||
},
|
||||
// 文件上传成功处理
|
||||
// handleFileSuccess(param, type) {
|
||||
// console.log('带的', param.file)
|
||||
// const formData = new FormData()
|
||||
// formData.append('multipartFile', param.file)
|
||||
// console.log('送送', param)
|
||||
// importDiTarget(formData).then(res => {
|
||||
// console.log(res)
|
||||
// if (res.code !== 0) {
|
||||
// this.$modal.msgError(response.msg)
|
||||
// return;
|
||||
// }
|
||||
// this.upload.open = false;
|
||||
// this.upload.isUploading = false;
|
||||
// this.$refs.upload.clearFiles();
|
||||
// }).catch(() => {
|
||||
// this.upload.open = false
|
||||
// this.upload.isUploading = false
|
||||
// })
|
||||
// // 拼接提示语
|
||||
// // let data = response.data;
|
||||
// // let text = '创建成功数量：' + data.createUsernames.length;
|
||||
// // for (const username of data.createUsernames) {
|
||||
// // text += '<br /> ' + username;
|
||||
// // }
|
||||
// // text += '<br />更新成功数量：' + data.updateUsernames.length;
|
||||
// // for (const username of data.updateUsernames) {
|
||||
// // text += '<br /> ' + username;
|
||||
// // }
|
||||
// // text += '<br />更新失败数量：' + Object.keys(data.failureUsernames).length;
|
||||
// // for (const username in data.failureUsernames) {
|
||||
// // text += '<br /> ' + username + '：' + data.failureUsernames[username];
|
||||
// // }
|
||||
// this.$message.success('导入成功！');
|
||||
// this.getDataList();
|
||||
// },
|
||||
// 文件上传成功处理
|
||||
handleFileSuccess(response, file, fileList) {
|
||||
if (response.code !== 0) {
|
||||
this.$modal.msgError(response.msg)
|
||||
@ -492,6 +529,11 @@ export default {
|
||||
changeFactory($event) {
|
||||
this.currentMenu = $event
|
||||
this.facType = this.currentMenu === '碲化镉工厂' ? 0 : 1
|
||||
// if (this.facType === 0) {
|
||||
// this.upload.url = process.env.VUE_APP_BASE_API + '/admin-api/ip/prod-target/di-target-import-excel'
|
||||
// } else {
|
||||
// this.upload.url = process.env.VUE_APP_BASE_API + '/admin-api/ip/prod-target/to-target-import-excel'
|
||||
// }
|
||||
this.getDataList()
|
||||
},
|
||||
handleClick(val) {
|
||||
@ -502,6 +544,7 @@ export default {
|
||||
this.$refs.addOrUpdate.init(val.data.id);
|
||||
});
|
||||
} else if (val.type === "delete") {
|
||||
console.log('啊啊', val)
|
||||
this.deleteHandle(val.data.id, val.data.factory, val.data._pageIndex)
|
||||
} else {
|
||||
this.otherMethods(val)
|
||||
@ -557,10 +600,6 @@ export default {
|
||||
this.listQuery.endTime = Number(this.end)
|
||||
}
|
||||
}
|
||||
if (!this.start && !this.end) {
|
||||
this.listQuery.beginTime = undefined
|
||||
this.listQuery.endTime = undefined
|
||||
}
|
||||
// console.log(e);
|
||||
},
|
||||
changeTime() {
|
||||
@ -576,9 +615,6 @@ export default {
|
||||
this.listQuery.beginTime = Number(this.listQuery.reportTime[0])
|
||||
this.listQuery.endTime = Number(this.listQuery.reportTime[1])
|
||||
}
|
||||
} else {
|
||||
this.listQuery.beginTime = undefined
|
||||
this.listQuery.endTime = undefined
|
||||
}
|
||||
},
|
||||
onValueChange(picker, k) { // 选中近k周后触发的操作
|
||||
@ -597,10 +633,6 @@ export default {
|
||||
this.listQuery.endTime = Number(moment(this.end.getTime()).format('YYYYWW'))
|
||||
}
|
||||
}
|
||||
if (!this.start && !this.end) {
|
||||
this.listQuery.beginTime = undefined
|
||||
this.listQuery.endTime = undefined
|
||||
}
|
||||
},
|
||||
changeDayTime() {
|
||||
if (this.listQuery.reportTime) {
|
||||
@ -615,12 +647,44 @@ export default {
|
||||
this.listQuery.beginTime = Number(this.listQuery.reportTime[0])
|
||||
this.listQuery.endTime = Number(this.listQuery.reportTime[1])
|
||||
}
|
||||
} else {
|
||||
this.listQuery.beginTime = undefined
|
||||
this.listQuery.endTime = undefined
|
||||
}
|
||||
},
|
||||
// 获取数据列表
|
||||
multipliedByHundred(str) {
|
||||
console.log(str);
|
||||
// console.log(str)
|
||||
if ( str != 0) {
|
||||
let floatVal = parseFloat(str);
|
||||
if (isNaN(floatVal)) {
|
||||
return 0;
|
||||
}
|
||||
floatVal = Math.round(str * 10000) / 100;
|
||||
let strVal = floatVal.toString();
|
||||
let searchVal = strVal.indexOf('.');
|
||||
if (searchVal < 0) {
|
||||
searchVal = strVal.length;
|
||||
strVal += '.';
|
||||
}
|
||||
while (strVal.length <= searchVal + 2) {
|
||||
strVal += '0';
|
||||
}
|
||||
return parseFloat(strVal);
|
||||
}
|
||||
|
||||
},
|
||||
async getDataList() {
|
||||
// if (this.listQuery.date === 3) {
|
||||
// if (this.listQuery.reportTime?.length > 0) {
|
||||
// this.listQuery.beginTime = this.listQuery.reportTime[0] ? Number(this.listQuery.reportTime[0]) : undefined
|
||||
// this.listQuery.endTime = this.listQuery.reportTime[1] ? this.listQuery.reportTime[1] : undefined
|
||||
// }
|
||||
// }
|
||||
// if (this.listQuery.date === 4) {
|
||||
// if (this.listQuery.reportTime?.length > 0) {
|
||||
// this.listQuery.beginTime = this.start ? this.start : undefined
|
||||
// this.listQuery.endTime = this.end ? this.end : undefined
|
||||
// }
|
||||
// }
|
||||
if (this.currentMenu === '碲化镉工厂') {
|
||||
await prodTargetDiPage(this.listQuery).then(res => {
|
||||
if (res.code === 0) {
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2023-11-06 15:15:30
|
||||
* @LastEditTime: 2024-06-03 10:17:33
|
||||
* @LastEditTime: 2024-05-31 16:13:22
|
||||
* @LastEditors: DY
|
||||
* @Description:
|
||||
-->
|
||||
@ -134,29 +134,14 @@ export default {
|
||||
exportDetail() {
|
||||
// 导出
|
||||
const pdf = new jsPDF('l', 'pt', 'a4');
|
||||
|
||||
const canvas = document.createElement('canvas')
|
||||
|
||||
const element = this.$refs['detail'];
|
||||
const width = pdf.internal.pageSize.getWidth()
|
||||
const height = pdf.internal.pageSize.getHeight()
|
||||
|
||||
canvas.width = width * 2
|
||||
canvas.height = height * 2
|
||||
|
||||
canvas.style.width = width + 'px'
|
||||
canvas.style.height = height + 'px'
|
||||
|
||||
const options = {
|
||||
// scale: 2,
|
||||
dpi: 300,
|
||||
canvas: canvas,
|
||||
useCORS: true
|
||||
scale: 2
|
||||
};
|
||||
const element = this.$refs['detail'];
|
||||
|
||||
html2canvas(element, options).then((canvas) => {
|
||||
const imgData = canvas.toDataURL('image/png', 1.0);
|
||||
pdf.addImage(imgData, 'PNG', 0, 0, width, height);
|
||||
const imgData = canvas.toDataURL('image/png');
|
||||
pdf.addImage(imgData, 'PNG', 0, 0, pdf.internal.pageSize.getWidth(), pdf.internal.pageSize.getHeight());
|
||||
pdf.save(this.dataForm.workOrderNumber + '详情.pdf');
|
||||
});
|
||||
},
|
||||
|
||||
@ -1,25 +1,16 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2024-04-15 10:49:13
|
||||
* @LastEditTime: 2024-06-03 15:15:18
|
||||
* @LastEditTime: 2024-05-31 17:13:56
|
||||
* @LastEditors: DY
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
<div style="display: flex; flex-direction: column; min-height: calc(100vh - 96px - 35px)">
|
||||
<div class="app-container" style="margin-top: 8px; padding: 0 16px; height: auto; font-size: 20px; text-align: center;">
|
||||
<p style="margin-bottom: 0">数据概览</p>
|
||||
<div class="view">
|
||||
<div v-for="(item, index) in data" :key="index">
|
||||
<p style="color: rgb(194,128,255)">{{ item }}</p>
|
||||
<p>{{ index }}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="app-container" style="margin-top: 8px; height: auto;">
|
||||
<div style="display: flex; flex-direction: column; min-height: calc(100vh - 96px - 31px)">
|
||||
<div class="app-container" style="margin-top: 8px;padding: 16px; height: auto;">
|
||||
<search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
|
||||
</div>
|
||||
<div class="app-container" style="margin-top: 8px;flex-grow: 1; height: auto;">
|
||||
<div class="app-container" style="margin-top: 8px;flex-grow: 1; height: auto; padding: 16px;">
|
||||
<search-bar :formConfigs="formConfig2" ref="searchBarForm" style="margin-bottom: 0" />
|
||||
<base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
|
||||
:table-data="tableData">
|
||||
@ -39,7 +30,7 @@
|
||||
|
||||
<script>
|
||||
// import { parseTime } from '../../core/mixins/code-filter';
|
||||
import { getWorkOrderPage, exportExcel, getOverView } from '@/api/produceData/order';
|
||||
import { getWorkOrderPage, exportExcel } from '@/api/produceData/order';
|
||||
// import inputTable from './inputTable.vue';
|
||||
import lineChart from './lineChart';
|
||||
import moment from 'moment'
|
||||
@ -226,8 +217,7 @@ export default {
|
||||
],
|
||||
tableData: [],
|
||||
xAxis: [],
|
||||
lineData: {},
|
||||
data: {}
|
||||
lineData: {}
|
||||
// proLineList: [],
|
||||
// all: {}
|
||||
};
|
||||
@ -238,16 +228,7 @@ export default {
|
||||
this.listQuery.time = [moment(sevenDaysAgo).format('yyyy-MM-DD'), moment(today).format('yyyy-MM-DD')]
|
||||
this.formConfig[2].defaultSelect = this.listQuery.time
|
||||
},
|
||||
mounted() {
|
||||
this.getOverView()
|
||||
},
|
||||
methods: {
|
||||
getOverView() {
|
||||
getOverView().then(res => {
|
||||
this.data = res.data
|
||||
console.log('aa', res.data)
|
||||
})
|
||||
},
|
||||
otherMethods(val) {
|
||||
this.detailOrUpdateVisible = true;
|
||||
// this.addOrEditTitle = "详情";
|
||||
@ -318,12 +299,6 @@ export default {
|
||||
/* padding-bottom: 10px; */
|
||||
/* } */
|
||||
/* .blueTi */
|
||||
.view {
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
align-items: center;
|
||||
flex: 1;
|
||||
}
|
||||
.blueTip::before{
|
||||
display: inline-block;
|
||||
content: '';
|
||||
|
||||
Loading…
Reference in New Issue
Block a user