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

projects/mesxc-zhp #340

Merged
juzi merged 2 commits from projects/mesxc-zhp into projects/mesxc-test 2024-04-17 16:36:23 +08:00
Conversation 0 Commits 2 Files Changed 2 +45 -36
2 changed files with 45 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6f8abc9758 - Show all commits

16
src/views/OperationalOverview/components/ISRAChart.vue
View File

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-01-29 13:45:56
* @LastEditTime: 2024-04-16 13:43:05
* @LastEditTime: 2024-04-17 15:48:21
* @LastEditors: zhp
* @Description:
-->
@ -125,6 +125,12 @@ export default {
fontSize: 20,
color: '#fff00',
},
},
grid: {
left: '1%',
right: '1%',
bottom: '0',
containLabel: true
},
// legend: {
// bottom: '10%',
@ -213,15 +219,19 @@ export default {
.isra-chart {
width: 100%;
height: 100%;
position: absolute;
top: 7%;
}
</style>
<style>
.isra-chart-tooltip {
background: #0a2b4f77 !important;
border: none !important;
backdrop-filter: blur(12px);
}
.isra-chart-tooltip * {
color: #fff !important;
}
</style>
<style>
</style>

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

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-07-19 15:18:30
* @LastEditors: zhp
* @LastEditTime: 2024-04-16 14:03:31
* @LastEditTime: 2024-04-17 16:08:08
* @Description:
-->
<template>
@ -58,7 +58,7 @@
}}</span>
<el-divider class="split" v-if="op.actualQuantity" direction="vertical"></el-divider>
<!-- </div> -->
<el-progress style="width: 620px;" text-color="rgba(255, 255, 255, .6)" :stroke-width="10"
<el-progress style="width: 620px;" text-color="rgba(0, 255, 247, 1)" :stroke-width="10"
define-back-color="rgba(32, 57, 96, 1)" :percentage="op.progressRate" class="custom-progress-bar" />
</el-row>
</div>
@ -111,25 +111,25 @@ const qualityYearList = [
name: '翻转机',
code: 'EQ20240110112358000235',
status: '正常',
error: 'true',
error: true,
},
{
name: '烘干炉',
code: 'EQ20240110112537000241',
status: '计划停机',
error: 'true',
error: true,
},
{
name: '清洗机',
code: ' EQ20240110112310000232',
status: '正常',
error: 'true',
error: true,
},
{
name: '钢化清洗机',
code: 'EQ20240110111700000208',
status: '正常',
error: 'true',
error: true,
},
{
name: '固化机',
@ -141,49 +141,48 @@ const qualityYearList = [
name: '磨边清洗机',
code: ' EQ20240110111700000208',
status: '正常',
error: 'true',
error: true,
},
{
name: '预热机',
code: 'EQ20240110111700000205',
status: '故障',
error: 'true',
error: true,
},
{
name: '下片机',
code: 'EQ20240115151435000279',
status: '正常',
error: 'false',
error: true,
},
{
name: '冷却机',
code: 'EQ20240110111700000203',
status: '正常',
error: 'false',
error: true,
},
{
name: 'A储片机106',
code: 'EQ20240110111700000202',
status: '正常',
error: 'false',
error: true,
},
{
name: '二次清洗机',
code: 'EQ20240110111700000209',
status: '正常',
error: 'false',
error: true,
},
{
name: '二次磨边机',
code: ' EQ20240110110927000181',
status: '正常',
error: 'false',
error: true,
},
{
name: '测试设备',
code: 'EQ20240110111700000201',
status: '正常',
error: 'true',
error: true,
},
];
const qualityMonthList = [
@ -232,37 +231,37 @@ const qualityMonthList = [
];
const orderProcessList = [
{
id: '1',
id: 1,
outRate: '.8',
name: '凯盛0322',
},
{
id: '2',
id: 2,
outRate: '.4',
name: '光伏玻璃4.0',
},
{
id: '3',
id: 3,
outRate: '.5',
name: '光伏玻璃3.0',
},
{
id: '4',
id: 4,
outRate: '.3',
name: '光伏玻璃2.0',
},
{
id: '5',
id: 5,
outRate: '.5',
name: '光伏玻璃1.0',
},
{
id: '6',
id: 6,
outRate: '.8',
name: '光伏玻璃',
},
{
id: '7',
id: 7,
outRate: '.8',
name: '统计订单',
},
@ -483,7 +482,7 @@ export default {
</span>`,
`<span style="color:rgba(255,255,255,0.5)">${item.code || ''}</span>`,
`<span style="color:rgba(255,255,255,0.5)"><div style="${item.status == '正常' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%; background-color: #FFBD02;float:left;margin:13px 10px 0 0 '}"></div> ${item.status || ''}</span>`,
`<span style="color:rgba(255,255,255,0.5)"><div style="${item.error == 'false' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%; background-color: red;float:left;margin:13px 10px 0 0 '}"></div> ${item.error || ''}</span>`,
`<span style="color:rgba(255,255,255,0.5)"><div style="${item.error == 'false' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px red;width:6px;height:6px;border-radius: 50%; background-color: red;float:left;margin:13px 10px 0 0 '}"></div> ${item.error == true ? '是' : '否' || ''}</span>`,
]);
this.eqConfig.data = eqArr;
let data = [
@ -750,7 +749,7 @@ export default {
item.code || ''
}</span>`,
`<span style="color:rgba(255,255,255,0.5)"><div style="${item.status == '正常' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%; background-color: #FFBD02;float:left;margin:10px 10px 0 0 '}"></div> ${item.status || ''}</span>`,
`<span style="color:rgba(255,255,255,0.5)"><div style="${item.error == 'false' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%; background-color: red;float:left;margin:10px 10px 0 0 '}"></div> ${item.error || ''}</span>`,
`<span style="color:rgba(255,255,255,0.5)"><div style="${item.error == 'false' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px red;width:6px;height:6px;border-radius: 50%; background-color: red;float:left;margin:10px 10px 0 0 '}"></div> ${item.error == true ?'是' :'否' || ''}</span>`,
]);
this.eqConfig.data = eqArr;
// this.$nextTick(() => {
@ -868,7 +867,7 @@ export default {
margin-left: 8px;
opacity:calc(.6);
margin-right: 8px;
background-color: #C8CDD7;
background-color: rgba(0, 255, 247, 1);
// border: 1px solid #C8CDD7;
}
.myLegend {
@ -993,7 +992,7 @@ export default {
font-size: 14px;
line-height: 2em;
text-align: right;
color: #fff;
color: rgba(0, 255, 247, 1);
}
.orderPlan {
display: inline-block;