mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'projects/mesxc-test' into projects/mesxc-zjl

Browse Source
This commit is contained in:
朱菊兰 2024-04-07 08:40:39 +08:00
commit 1e4a33a703
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/OperationalOverview/coldBoard.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2024-01-29 16:50:26 * @Date: 2024-01-29 16:50:26
* @LastEditTime: 2024-04-03 16:34:05 * @LastEditTime: 2024-04-03 17:10:15
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -651,7 +651,7 @@ export default {
wasteList.push(ele.wastArea) wasteList.push(ele.wastArea)
nameWasteList.push('缺陷面积:' + this.NumFormat(ele.wastArea) + '㎡') nameWasteList.push('缺陷面积:' + this.NumFormat(ele.wastArea) + '㎡')
sumAreaList.push(ele.sumArea) sumAreaList.push(ele.sumArea)
yieldList.push(parseFloat((ele.yield * 100).toFixed(2))) yieldList.push(parseFloat((ele.yield * 100).toFixed(0)))
}) })
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.firstPileChart.initChart(nameList, [topNameList[0]], [nameWasteList[0]], [productList[0]], [wasteList[0]]) this.$refs.firstPileChart.initChart(nameList, [topNameList[0]], [nameWasteList[0]], [productList[0]], [wasteList[0]])

4
src/views/OperationalOverview/components/doubleYChart .vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2023-09-21 09:06:28 * @Date: 2023-09-21 09:06:28
* @LastEditTime: 2024-04-03 16:24:21 * @LastEditTime: 2024-04-03 17:09:12
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -227,7 +227,7 @@ export default {
nameTextStyle: {// y轴上方单位的颜色 nameTextStyle: {// y轴上方单位的颜色
color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色 color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
align: "left", align: "left",
padding: [0, 0, 0, 8] padding: [0, 0, 0, 2]
}, },
position: 'right', position: 'right',
alignTicks: true, alignTicks: true,

4
src/views/OperationalOverview/components/pileBarChart.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2023-12-27 13:54:52 * @Date: 2023-12-27 13:54:52
* @LastEditTime: 2024-04-03 16:29:52 * @LastEditTime: 2024-04-03 18:12:18
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -138,7 +138,7 @@ export default {
// }, // },
color:colors[sid], color:colors[sid],
data: rawData.length != 0 ? rawData[sid].map((d, did) => data: rawData.length != 0 ? rawData[sid].map((d, did) =>
totalData[did] <= 0 ? 0 : d / totalData[did] totalData[did] <= 0 ? 0 : (d / totalData[did]).toFixed(4)
) : [] ) : []
}; };
}); });

8
src/views/OperationalOverview/processingBoard.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2021-07-19 15:18:30 * @Date: 2021-07-19 15:18:30
* @LastEditors: zhp * @LastEditors: zhp
* @LastEditTime: 2024-04-03 15:59:25 * @LastEditTime: 2024-04-03 17:14:03
* @Description: * @Description:
--> -->
<template> <template>
@ -416,7 +416,7 @@ export default {
return { return {
id: ele.id, id: ele.id,
name: ele.name, name: ele.name,
progressRate: parseFloat((ele.progressRate * 100).toFixed(2)), progressRate: parseFloat((ele.progressRate * 100).toFixed(0)),
}; };
} }
}); });
@ -690,7 +690,7 @@ export default {
return { return {
id: ele.id, id: ele.id,
name: ele.name, name: ele.name,
progressRate: parseFloat((ele.progressRate * 100).toFixed(2)), progressRate: parseFloat((ele.progressRate * 100).toFixed(0)),
}; };
} }
}); });
@ -922,7 +922,7 @@ export default {
::v-deep .el-progress__text { ::v-deep .el-progress__text {
width: 50px; width: 50px;
margin-top: -70px; margin-top: -70px;
margin-left: 510px; margin-left: 538px;
// background-color: unset; // background-color: unset;
// background-image: linear-gradient(to right, #4573fe, #47f8dc); // background-image: linear-gradient(to right, #4573fe, #47f8dc);
} }