From 4981a40e2dd1ac177cdcdf29525f83f1d162f11d Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期六, 02 十二月 2023 14:55:59 +0800
Subject: [PATCH] 机器开机率和订单完成比率样式优化
---
src/views/cockpitPage/components/PerSonnelProductivity.vue | 194 ++++++++++++++++++--------------------
src/views/cockpitPage/components/OrderCompleteRadio.vue | 5
public/cockpitPage/order-bg.png | 0
src/views/cockpitPage/components/MachineStartupRate.vue | 48 ++++++---
4 files changed, 127 insertions(+), 120 deletions(-)
diff --git a/public/cockpitPage/order-bg.png b/public/cockpitPage/order-bg.png
index 3583180..207ac9a 100644
--- a/public/cockpitPage/order-bg.png
+++ b/public/cockpitPage/order-bg.png
Binary files differ
diff --git a/src/views/cockpitPage/components/MachineStartupRate.vue b/src/views/cockpitPage/components/MachineStartupRate.vue
index 9383322..5e66228 100644
--- a/src/views/cockpitPage/components/MachineStartupRate.vue
+++ b/src/views/cockpitPage/components/MachineStartupRate.vue
@@ -8,13 +8,6 @@
<span class="top-rate">{{ "60%" }}</span>
</div>
</div>
- <div class="machine-chart-bg">
- <img
- src="/cockpitPage/machine-chart-bg.png"
- alt=""
- style="width: 250px; height: 260px"
- />
- </div>
<div class="chart" ref="chart"></div>
</div>
</div>
@@ -43,12 +36,31 @@
pieChart(chartName, data) {
let chartDom = this.$refs[chartName];
let myChart = echarts.init(chartDom);
+ let img = "/cockpitPage/machine-chart-bg.png";
let option;
if (data) {
option = {
color: ["#065a6f", "#067687", "#00ffff"],
tooltip: {
trigger: "item",
+ },
+ graphic: {
+ elements: [
+ {
+ type: "image",
+ z: 5,
+ right: 25,
+ style: {
+ image: img,
+ width: 240,
+ height: 245,
+ opacity: 0.55,
+ },
+ left: "center",
+ top: "center",
+ position: [5, 5],
+ },
+ ],
},
series: [
{
@@ -60,7 +72,17 @@
color: "#01f7fd",
fontSize: 14,
formatter: function (params) {
- return params.name + params.value + "%";
+ return `{a|${params.name}} {b|${params.value + "%"}}`;
+ },
+ rich: {
+ a: {
+ color: "#00ffff",
+ fontSize: 14,
+ },
+ b: {
+ color: "#fccd1d",
+ fontSize: 14,
+ },
},
},
emphasis: {
@@ -121,16 +143,6 @@
color: #fec718;
}
}
- }
- .machine-chart-bg {
- width: 100%;
- height: 100%;
- text-align: center;
- position: absolute;
- left: 0;
- right: 0;
- margin: auto;
- opacity: 0.55;
}
.chart {
margin-top: 8px;
diff --git a/src/views/cockpitPage/components/OrderCompleteRadio.vue b/src/views/cockpitPage/components/OrderCompleteRadio.vue
index 3f964b9..c90a781 100644
--- a/src/views/cockpitPage/components/OrderCompleteRadio.vue
+++ b/src/views/cockpitPage/components/OrderCompleteRadio.vue
@@ -37,7 +37,7 @@
data() {
return {
tableList: [
- { title: "DD19070047", radio: 50 },
+ { title: "DD19070047", radio: 50.6 },
{ title: "DD19070048", radio: 70 },
{ title: "DD19070049", radio: 85 },
{ title: "DD19070050", radio: 30 },
@@ -96,9 +96,10 @@
.el-progress-bar__innerText {
position: absolute;
top: 2px;
- right: -50px;
+ right: -70px;
text-align: left;
font-size: 18px;
+ width: 60px;
}
}
</style>
diff --git a/src/views/cockpitPage/components/PerSonnelProductivity.vue b/src/views/cockpitPage/components/PerSonnelProductivity.vue
index 85bd057..db0b593 100644
--- a/src/views/cockpitPage/components/PerSonnelProductivity.vue
+++ b/src/views/cockpitPage/components/PerSonnelProductivity.vue
@@ -15,7 +15,7 @@
<script>
import ChartTitle from "@/views/cockpitPage/components/ChartTitle.vue";
//寮曞叆echart
-import * as echarts from 'echarts'
+import * as echarts from "echarts";
export default {
components: {
ChartTitle,
@@ -24,47 +24,47 @@
data() {
return {
chartData: {
- datax: ['浜哄憳1', '浜哄憳2', '浜哄憳3', '浜哄憳4', '浜哄憳5', '浜哄憳6'],
+ datax: ["浜哄憳1", "浜哄憳2", "浜哄憳3", "浜哄憳4", "浜哄憳5", "浜哄憳6"],
datay: [120, 200, 150, 380, 470, 150, 230],
},
};
},
mounted() {
- this.pieChart('chart', this.chartData)
+ this.pieChart("chart", this.chartData);
let chartData2 = [
{ value: 10, name: "涓�绫�" },
{ value: 20, name: "浜岀被" },
{ value: 60, name: "涓夌被" },
{ value: 10, name: "鍥涚被" },
];
- this.getChartRight('chart2', chartData2)
+ this.getChartRight("chart2", chartData2);
},
watch: {},
methods: {
//鍦ㄨ亴
pieChart(chartName, data) {
- let chartDom = this.$refs[chartName]
+ let chartDom = this.$refs[chartName];
let myChart = echarts.init(chartDom);
let option;
- let lineColor = '#35ddc74d'
+ let lineColor = "#35ddc74d";
if (data) {
option = {
- color: ['#00FFFF', '#dcb018'],
+ color: ["#00FFFF", "#dcb018"],
tooltip: {
- trigger: 'axis',
+ trigger: "axis",
axisPointer: {
- type: 'none'
+ type: "none",
},
},
grid: {
right: "80px",
- bottom: '60px',
- left: '60px',
- top: '30px',
+ bottom: "60px",
+ left: "60px",
+ top: "30px",
},
dataZoom: [
{
- type: 'inside',
+ type: "inside",
// show: true, //鏄剧ず婊氬姩鏉�
start: 0,
end: 100,
@@ -75,34 +75,34 @@
},
{
// type: 'slider', //涓や釜涓�涓槸slider锛屼竴涓槸inside锛宻lider鏄鍔犳粴鍔ㄦ潯浠ュ強榧犳爣鎷栧姩婊氬姩鏉″姛鑳斤紝inside鍒欐槸榧犳爣婊氳疆婊氬姩婊氬姩鏉°��
- type: 'inside',
+ type: "inside",
// show: true,
// realtime : true,
yAxisIndex: 0,
minSpan: 20,
maxSpan: 100,
start: 0,
- end: 100
+ end: 100,
},
],
legend: {
itemWidth: 8,
itemHeight: 8,
- itemGap: 35,//闂磋窛
- bottom: '5px',
- left: 'center',
+ itemGap: 35, //闂磋窛
+ bottom: "5px",
+ left: "center",
},
yAxis: [
{
- type: 'category',
+ type: "category",
axisTick: {
- show: false
+ show: false,
},
axisLine: {
show: true,
lineStyle: {
color: lineColor,
- }
+ },
},
axisLabel: {
// rotate:45,
@@ -110,32 +110,33 @@
show: true,
textStyle: {
color: function (params, index) {
- let colorList = ['#dcb018', '#00FFFF']
+ let colorList = ["#dcb018", "#00FFFF"];
if (index % 2 == 0) {
- return colorList[0]
+ return colorList[0];
} else {
- return colorList[1]
+ return colorList[1];
}
- }
+ },
},
},
data: data.datax ? data.datax : [],
- }
+ },
],
xAxis: [
{
- type: '',
- name: '鍗曚綅锛氫欢',
+ type: "",
+ name: "鍗曚綅锛氫欢",
// min: data.yAxis[0].min?data.yAxis.min:0,
- minInterval: 1,//鍧愭爣杞存槸鏁存暟
- max: Math.ceil(eval(`Math.max(${data.datay})`) / 5) * 5,//鏁版嵁鏈�澶у�煎姞3
- interval: Math.ceil(eval(`Math.max(${data.datay})`) / 7) * 7 / 7,
- position: 'left',
+ minInterval: 1, //鍧愭爣杞存槸鏁存暟
+ max: Math.ceil(eval(`Math.max(${data.datay})`) / 5) * 5, //鏁版嵁鏈�澶у�煎姞3
+ interval:
+ (Math.ceil(eval(`Math.max(${data.datay})`) / 7) * 7) / 7,
+ position: "left",
axisLine: {
show: true,
lineStyle: {
- color: '#0a112B',
- }
+ color: "#0a112B",
+ },
},
nameTextStyle: {
color: "#00FFFF",
@@ -145,47 +146,46 @@
lineStyle: {
// 浣跨敤娣辨祬鐨勯棿闅旇壊
color: lineColor,
- }
+ },
},
axisTick: {
- show: false
+ show: false,
},
axisLabel: {
textStyle: {
- color: '#00FFFF'
+ color: "#00FFFF",
},
-
- }
+ },
},
],
series: [
{
- type: 'bar',
- name: '',
- barWidth: '15',
+ type: "bar",
+ name: "",
+ barWidth: "15",
label: {
show: true,
- position: 'right',
- color: '#00FFFF'
+ position: "right",
+ color: "#00FFFF",
},
itemStyle: {
normal: {
//鏌卞舰鍥惧渾瑙掞紝鍒濆鍖栨晥鏋�
barBorderRadius: [4, 4, 0, 0],
color: function (params) {
- let colorList = ['#dcb018', '#00FFFF']
+ let colorList = ["#dcb018", "#00FFFF"];
if (params.dataIndex % 2 == 0) {
- return colorList[0]
+ return colorList[0];
} else {
- return colorList[1]
+ return colorList[1];
}
- }
+ },
},
},
data: data.datay,
},
- ]
+ ],
};
option && myChart.setOption(option);
@@ -197,54 +197,51 @@
getChartRight(chartName, data) {
let chartDom = this.$refs[chartName];
let myChart = echarts.init(chartDom);
- let img='/cockpitPage/dotted-circle.png'
+ let img = "/cockpitPage/dotted-circle.png";
let option;
if (data) {
option = {
- color: ["#dcb018", "#735b09", "#ebd68e",'#FF3000'],
+ color: ["#dcb018", "#735b09", "#ebd68e", "#FF3000"],
tooltip: {
trigger: "item",
},
- graphic:{
- elements:[
+ graphic: {
+ elements: [
{
- type:'image',
- z:3,
- style:{
- image:img,
- width:118,
- height:118,
+ type: "image",
+ z: 3,
+ style: {
+ image: img,
+ width: 118,
+ height: 118,
},
- left:'center',
- top:'center',
- position:[10,10]
- }
-
- ]
+ left: "center",
+ top: "center",
+ position: [10, 10],
+ },
+ ],
},
series: [
{
name: "Access From",
type: "pie",
// center: ['80%', '46%'],
- radius: ['52%','65%'],
+ radius: ["52%", "65%"],
// minAngle: 20,
// startAngle: 60,
avoidLabelOverlap: false,
-
+
label: {
- normal:{
- position: 'outer',
- paddding:[-100,70],
-
+ normal: {
+ position: "outer",
+ paddding: [-100, 70],
+
color: "#01f7fd",
fontSize: 12,
- borderWidth:20,
- borderRadius:4,
+ borderWidth: 20,
+ borderRadius: 4,
formatter: function (params) {
- let str=
- params.name+
- params.value+'%'
+ let str = params.name + params.value + "%";
return str;
},
},
@@ -254,16 +251,16 @@
show: true,
fontSize: 12,
fontWeight: "bold",
- color:'#dcb018',
+ color: "#dcb018",
},
},
labelLine: {
show: true,
length: 20,
- length2:10,
- lineStyle:{
- color:'#dcb018',
- }
+ length2: 10,
+ lineStyle: {
+ color: "#dcb018",
+ },
},
data: data,
},
@@ -275,9 +272,6 @@
option = {};
myChart.setOption(option, true);
}
-
-
-
},
},
};
@@ -296,30 +290,30 @@
.chart-left {
width: calc(60% - 20px);
height: 100%;
- margin-right:20px;
- float:left;
- border: 1px solid #00FFFF;
+ margin-right: 20px;
+ float: left;
+ border: 1px solid #00ffff;
box-sizing: border-box;
}
.chart-right {
width: 40%;
- float:left;
+ float: left;
height: 100%;
- position:relative;
- .chart-bg{
- width:100%;
- position:absolute;
- top:0;
- right:0;
- img{
- width:100%;
+ position: relative;
+ .chart-bg {
+ width: 100%;
+ position: absolute;
+ top: 0;
+ right: 0;
+ img {
+ width: 100%;
}
}
- .chart{
- position:absolute;
- top:0;
- right:0;
+ .chart {
+ position: absolute;
+ top: 0;
+ right: 0;
}
}
--
Gitblit v1.8.0