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

projects/mesxc-zjl #179

Merged
juzi merged 2 commits from projects/mesxc-zjl into projects/mesxc-test 2024-01-12 09:48:36 +08:00
Conversation 0 Commits 2 Files Changed 15 +80 -152
15 changed files with 80 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 90be2a826b - Show all commits

5
.env.stage
View File

@ -7,6 +7,11 @@ VUE_APP_TITLE = MES系统
# 芋道管理系统/生产环境
VUE_APP_BASE_API = '/prod-api'
# dcs地址
VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
# socket地址
VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
# 积木报表指向地址
VUE_APP_JIMU_API = 'http://192.168.0.33:48082'

12
src/views/databoard/components/DefectChart.vue
View File

@ -127,11 +127,13 @@ export default {
obj.name = this.israCheckType[i]
obj.barWidth = 12
obj.data = []
obj.labe = {
show: true,
position: 'inside',
distance: 10,
color: "red"
if (i === this.israCheckType.length-1) {
obj.label = {
show: true,
position: 'top',
color: "#fffc",
formatter: (params)=>this.tempData[params.dataIndex].sum
}
}
for (let j = 0;j < this.tempData.length; j++) {
let num = 0

2
src/views/databoard/components/DefectClassChart.vue
View File

@ -96,7 +96,7 @@ export default {
},
},
yAxis: {
name: "单位/次",
name: "单位/个",
nameTextStyle: {
color: "#fff",
fontSize: 10,

4
src/views/databoard/components/EnergeMonitoringChart.vue
View File

@ -1,7 +1,7 @@
<template>
<div>
<NotMsg v-show="notMsg"/>
<div id="energeMonitoringChart" class="energe-monitoring-chart" style="width:900px;height:370px;" v-show='!notMsg'></div>
<div id="energeMonitoringChart" class="energe-monitoring-chart" style="width:575px;height:370px;" v-show='!notMsg'></div>
</div>
</template>
<script>
@ -135,7 +135,7 @@ export default {
barWidth: 20,
tooltip: {
valueFormatter: function (value) {
return value + ' ml';
return value;
}
},
itemStyle: {

4
src/views/databoard/components/FlueGasChart.vue
View File

@ -131,7 +131,7 @@ export default {
temp2 = temp1?.SO2_float || []
break;
}
case '一氧化氮':{
case '氮氧化物':{
temp2 = temp1?.NOX_float || []
break;
}
@ -186,7 +186,7 @@ export default {
this.chart = echarts.init(document.getElementById('flueGasChart'));
var option = {
color: colors,
grid: { top: 32, right: 12, bottom: 20, left: 48 },
grid: { top: 32, right: 12, bottom: 20, left: 60 },
xAxis: {
type: 'category',
data: xData,

2
src/views/databoard/components/Switcher.vue
View File

@ -50,6 +50,7 @@ export default {
:deep(.el-switch__core) {
border: none;
background-color:#02457e;
height: 18px;
&::after {
background-color: #03233c;
@ -59,6 +60,7 @@ export default {
:deep(.is-checked) {
.el-switch__core {
border: none;
height: 18px;
background-color: rgba(180, 255, 252, 0.71);
&::after {

16
src/views/databoard/components/YieldRateChart.vue
View File

@ -65,8 +65,6 @@ export default {
},
chartTime: {
handler(newVal, oldVal) {
console.log("===================")
console.log(newVal)
this.updateChart()
}
},
@ -111,14 +109,14 @@ export default {
}else{
xData.push((item.dataTime).slice(0,10))
}
dayArr.push((item.day * 100).toFixed(2))
nightArr.push((item.night * 100).toFixed(2))
sumArr.push((item.sum * 100).toFixed(2))
dayArr.push(item.day?(item.day * 100).toFixed(2):null)
nightArr.push(item.night?(item.night * 100).toFixed(2):null)
sumArr.push(item.sum?(item.sum * 100).toFixed(2):null)
})
if (this.chartType) {
seriesData = [{
color: '#ff9e00',
name: 'sum',
name: '总量',
data: sumArr,
type: "line",
areaStyle: {
@ -138,7 +136,7 @@ export default {
},
{
color: '#08d8cd',
name: 'day',
name: '白班',
data: dayArr,
type: "line",
areaStyle: {
@ -158,7 +156,7 @@ export default {
},
{
color: '#0b58ff',
name: 'night',
name: '夜班',
data: nightArr,
type: "line",
areaStyle: {
@ -179,7 +177,7 @@ export default {
}else{
seriesData = [{
color: '#ff9e00',
name: 'sum',
name: '总量',
data: sumArr,
type: "line",
areaStyle: {

6
src/views/databoard/deepProcessing/BottomTwo.vue
View File

@ -8,7 +8,7 @@
display: grid;
grid-template-rows: 462px;
">
<EnergyMonitoring />
<WorkOrderMonitoring />
</div>
</div>
<div class="right-side" style="flex: 1">
@ -25,10 +25,10 @@
<script>
import NumRate from './NumRate';
import EnergyMonitoring from './EnergyMonitoring';
import WorkOrderMonitoring from './WorkOrderMonitoring';
export default {
name: 'BottomTwo',
components: { NumRate, EnergyMonitoring },
components: { NumRate, WorkOrderMonitoring },
props: {},
data() {
return {};

2
src/views/databoard/deepProcessing/DefectSum.vue
View File

@ -26,7 +26,7 @@ export default {
evenRowBGC: 'rgba(14, 32, 62, 0.8)',
columnWidth: [60],
align: ['center'],
data: [[1, 'Y61', '磨边','100','气泡']],
data: [[1, 'Y61', '破损','10','气泡']],
rowNum: 10
}
}

22
src/views/databoard/deepProcessing/EqAlarm.vue
View File

@ -24,19 +24,19 @@ export default {
headerBGC: 'rgba(32, 55, 96, 0.8)',
oddRowBGC: 'rgba(32, 55, 96, 0.8)',
evenRowBGC: 'rgba(14, 32, 62, 0.8)',
columnWidth: [60],
columnWidth: [60, 150, 190],
align: ['center'],
data: [
[1, '设备1', '行1列3', '', ''],
[2, '设备2', '行2列3', '', ''],
[3, '设备3', '行3列3', '', ''],
[4, '设备4', '行4列3', '', ''],
[5, '设备5', '行5列3', '', ''],
[6, '设备6', '行6列3', '', ''],
[7, '设备7', '行7列3', '', ''],
[8, '设备8', '行8列3', '', ''],
[9, '设备9', '行9列3', '', ''],
[10, '设备10', '行10列3', '', '']
[1, '四大线3小线铺纸机', 'EQ20240110130909000255', '正常', '否'],
[2, '四大线2小线铺纸机', 'EQ20240110130848000254', '正常', '否'],
[3, '四大线1小线铺纸机', 'EQ20240110130832000253', '正常', '否'],
[4, '12线下片台', 'EQ20240110130817000252', '正常', '否'],
[5, '11线下片台', ' EQ20240110130743000250', '正常', '否'],
[6, '10线下片台', ' EQ20240110130743000250', '正常', '否'],
[7, '4大线五区自动连线柜', 'EQ20240110130731000249', '正常', '否'],
[8, '四大线四区2小线清洗机', 'EQ20240110112716000248', '正常', '否'],
[9, '四大线四区1小线清洗机', 'EQ20240110112700000247', '正常', '否'],
[10, '4大线四区自动连线柜', 'EQ20240110112646000246', '正常', '否']
],
rowNum: 10
}

6
src/views/databoard/deepProcessing/TopThree.vue
View File

@ -26,19 +26,19 @@
display: grid;
grid-template-rows: 462px;
">
<WorkOrderMonitoring />
<EnergyMonitoring />
</div>
</div>
</div>
</template>
<script>
import WorkOrderMonitoring from './WorkOrderMonitoring';
import EqAlarm from './EqAlarm'
import DefectSum from './DefectSum'
import EnergyMonitoring from './EnergyMonitoring';
export default {
name: 'TopThree',
components: { EqAlarm, DefectSum, WorkOrderMonitoring },
components: { EqAlarm, DefectSum, EnergyMonitoring },
props: {},
data() {
return {};

136
src/views/databoard/deepProcessing/WorkOrderMonitoring.vue
View File

@ -1,27 +1,13 @@
<template>
<Container name="工单监控" size="middle" style="">
<div style="padding: 5px 10px;" class="WOMonitoring">
<!-- <dv-scroll-board :config="config" style="width:575px;height:380px" ref='worderScrollBoard'/> -->
<el-table
:data="tableData"
style="width: 575px"
max-height="380"
:header-cell-style="{ background:'rgba(32, 55, 96, 0.8)', color: '#fff', height: '35px', padding: 0 }"
:row-style="rowStyle">
<el-table-column fixed type="index" :index="indexMethod" label="序号" width="55"></el-table-column>
<el-table-column fixed prop="name" show-overflow-tooltip label="工单名称" width="150"></el-table-column>
<el-table-column prop="specifications" show-overflow-tooltip label="规格" width="150"></el-table-column>
<el-table-column prop="lines" show-overflow-tooltip label="产线" width="70"></el-table-column>
<el-table-column prop="status" show-overflow-tooltip label="工单状态" width="100"></el-table-column>
<el-table-column prop="planFinishTime" show-overflow-tooltip label="计划完成时间" width="140"></el-table-column>
<el-table-column prop="planQuantity" show-overflow-tooltip label="计划产量" width="110"></el-table-column>
<el-table-column prop="planAssignQuantity" show-overflow-tooltip label="实际产量" width="110"></el-table-column>
</el-table>
<dv-scroll-board :config="config" style="width:900px;height:380px" ref='worderScrollBoard'/>
</div>
</Container>
</template>
<script>
import Container from '../components/Container.vue';
import { formatDate } from '@/utils'
export default {
name: 'WorkOrderMonitoring',
components: { Container },
@ -32,99 +18,37 @@ export default {
},
data() {
return {
tableData: [
{name: '1111111111111111', specifications: '22222', lines: 'Y65', status: '已完成',planFinishTime:"2023-12-23 12:12:12"},
{name: '11111', specifications: '22222'},
{name: '11111', specifications: '22222'},
{name: '11111', specifications: '22222'},
{name: '11111', specifications: '22222'},
{name: '11111'},
{name: '11111'},
{name: '11111'},
{name: '11111'},
{name: '11111'},
{name: '11111'},
{name: '11111'}
]
config: {
header: ['序号', '工单名称', '规格','产线','工单状态', '计划完成时间','计划产量','实际产量'],
headerBGC: 'rgba(32, 55, 96, 0.8)',
oddRowBGC: 'rgba(32, 55, 96, 0.8)',
evenRowBGC: 'rgba(14, 32, 62, 0.8)',
columnWidth: [60, 120, 120, 60, 100, 150],
align: ['center'],
data: [],
rowNum:10
}
}
},
methods:{
rowStyle(v){
if (v.rowIndex % 2 === 0) {
return {
background: 'rgba(14, 32, 62, 0.8)',
color: '#fff',
height: '35px',
lineHeight:'35px',
padding: 0,
fontSize:'12px'
}
} else {
return {
background: 'rgba(32, 55, 96, 0.8)',
color: '#fff',
height: '35px',
lineHeight:'35px',
padding: 0,
fontSize:'12px'
}
}
},
indexMethod(index) {
return index+1;
}
},
// watch:{
// order: {
// handler(newVal, oldVal) {
// console.log(newVal)
// this.tableData = this.order
// }
// }
// }
watch:{
order: {
handler(newVal, oldVal) {
let outArr = this.order.map((item, index) => [
index+1,
item.name,
item.specifications,
item.lines,
['等待','已下发','已完成'][item.status],
formatDate(item.planFinishTime),
item.planQuantity,
item.planAssignQuantity
]);
this.config.data = outArr
this.$refs['worderScrollBoard'].updateRows(outArr)
}
}
}
}
</script>
<style lang='scss'>
.WOMonitoring {
.el-table {
background-color: transparent;
tr {
background-color: transparent;
}
}
.el-table tbody tr {
pointer-events:none;
}
.el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
border-bottom: none;
border-right: 1px solid #0d1728;
}
.el-table td.el-table__cell:last-child, .el-table th.el-table__cell.is-leaf:last-child {
border-right: none;
}
.el-table--medium .el-table__cell {
padding: 0;
}
// 滚动条
::-webkit-scrollbar-track-piece {
background-color:#14305F;
}
::-webkit-scrollbar-corner {
background-color:#14305F;
}
::-webkit-scrollbar-track {
background: #14305F;
}
::-webkit-scrollbar-thumb {
background-color: #118CA2;
cursor: pointer;
}
::-webkit-scrollbar-thumb:hover {
background-color: #06214B;
}
}
</style>

12
src/views/databoard/kiln/GasHandle.vue
View File

@ -16,7 +16,7 @@
style="
font-size: 20px;
line-height: 1.24;
flex: 1.2;
flex: 1;
text-align: right;
padding-right: 8px;
letter-spacing: 3px;
@ -30,12 +30,12 @@
style="
font-size: 20px;
line-height: 1.5;
flex: 1.2;
flex: 1;
text-align: right;
padding-right: 8px;
letter-spacing: 3px;
">
<p style="margin: 0; line-height: inherit">一氧化氮</p>
<p style="margin: 0; line-height: inherit">氮氧化物</p>
<p style="margin: 0; line-height: inherit">排放浓度</p>
</div>
<span style="font-size: 20px; line-height: 1.24; flex: 1">{{exhaustGasInfo?.NOX_float ? (Number(exhaustGasInfo.NOX_float)).toFixed(2) : ''}}mg/m³</span>
@ -46,7 +46,7 @@
style="
font-size: 20px;
line-height: 1.5;
flex: 1.2;
flex: 1;
text-align: right;
padding-right: 8px;
letter-spacing: 3px;
@ -62,7 +62,7 @@
style="
font-size: 20px;
line-height: 1.24;
flex: 1.2;
flex: 1;
text-align: right;
padding-right: 8px;
letter-spacing: 1px;
@ -95,7 +95,7 @@
justify-content: space-between;
">
<SelectorBtnGroup
:options="['氧气含量', '二氧化硫', '一氧化氮', '颗粒物']" @emitFun='toggleType' :active='chartType'/>
:options="['氧气含量', '二氧化硫', '氮氧化物', '颗粒物']" @emitFun='toggleType' :active='chartType'/>
<SelectorBtnGroup :options="['日', '周', '月', '年']" @emitFun='toggleDate' :active='chartTime' />
</div>
<div class="chart" style="height: 250px;margin-top: 10px;">

2
src/views/databoard/wholePlant/OrderStatus.vue
View File

@ -22,12 +22,10 @@ export default {
return {
config: {
header: ['上线时间', '客户名称', '规格','完成度'],
// headerHeight: '17',
headerBGC: 'rgba(32, 55, 96, 0.8)',
oddRowBGC: 'rgba(32, 55, 96, 0.8)',
evenRowBGC: 'rgba(14, 32, 62, 0.8)',
columnWidth: [155, 180, 150],
align: ['center'],
data: [],
rowNum: 6
}

1
src/views/databoard/wholePlant/YieldRate.vue
View File

@ -51,7 +51,6 @@ export default {
oddRowBGC: 'rgba(32, 55, 96, 0.8)',
evenRowBGC: 'rgba(14, 32, 62, 0.8)',
columnWidth: [60],
align: ['center'],
data: [],
rowNum: 5
},