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

修改bug

Browse Source
This commit is contained in:
‘937886381’ 2024-01-25 16:10:31 +08:00
parent c1ca2db161
commit 459d9268a0
3 changed files with 63 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-07-19 15:18:30
* @LastEditors: zhp
* @LastEditTime: 2024-01-24 17:07:01
* @LastEditTime: 2024-01-25 14:18:42
* @Description:
-->
<template>
@ -82,7 +82,7 @@
</base-container>
</el-col>
<el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="14">
<base-container :no-content-padding="true" :no-padding="true" :height="318 + 338 + 16" :size="'eqStatus'"
<base-container :height="318 + 338 + 16" :size="'eqStatus'"
:title="'设备状态监控'" :title-icon="'eqMonitoring'">
<!-- <div style="width: 45%;position: absolute; top: 3em; right: 3em;">
<top-radio-group />
@ -92,21 +92,21 @@
<div style="font-size:20px;margin: 5px 0 10px 0">融化风机</div>
<!-- <base-table1 :page="1" :limit="999" :show-index="false" :table-config="EqMonitoringPropsFun"
:table-data="funList" /> -->
<dv-scroll-board :config="funConfig" style="width:100%;height:350px" ref='funScrollBoard' />
<dv-scroll-board :config="funConfig" style="width:100%;height:310px" ref='funScrollBoard' />
</el-col>
<span class="eqLine"></span>
<el-col :span="6">
<div style="font-size:20px;margin: 5px 0 10px 0;">退火风机</div>
<!-- <base-table1 :page="1" :limit="999" :show-index="false" :table-config="EqMonitoringPropsFun"
:table-data="annealFunList" /> -->
<dv-scroll-board :config="annealFunConfig" style="width:100%;height:350px" ref='annealFunScrollBoard' />
<dv-scroll-board :config="annealFunConfig" style="width:100%;height:310px" ref='annealFunScrollBoard' />
</el-col>
<span class="eqLineTwo"></span>
<el-col :span="12" style="float: right;">
<div style="font-size:20px;margin: 5px 0 10px 0;">产线设备</div>
<!-- <base-table1 :page="1" :limit="999" :show-index="false" :table-config="EqMonitoringProps"
:table-data="realEqList" /> -->
<dv-scroll-board :config="realEqConfig" style="width:100%;height:350px" ref='realEqScrollBoard' />
<dv-scroll-board :config="realEqConfig" style="width:100%;height:310px" ref='realEqScrollBoard' />
</el-col>
<!-- <double-y-chart :id="'doubleYChart'" :name-list="cxNameList" :data-list="cxDataList" :height="359"
@ -133,6 +133,7 @@
<script>
import baseContainer from './components/baseContainer'
import baseTable1 from './components/baseTable'
// import baseContainer1 from './components/baseContainer/indexcopy'
// import baseTable2 from './components/baseTable'
// import baseTable3 from './components/baseTable'
import TopRadioGroup from './components/topRadioGroup'
@ -258,7 +259,8 @@ export default {
pileBarChart,
TopRadioGroup,
doubleYChart,
LinearBarChart
LinearBarChart,
// baseContainer1
// pieChart1,
// pieChart2
// pieChart3
@ -281,7 +283,7 @@ export default {
headerBGC: 'rgba(32, 55, 96, 0.8)',
oddRowBGC: 'rgba(32, 55, 96, 0.8)',
evenRowBGC: 'rgba(14, 32, 62, 0.8)',
columnWidth: [70,70, 130, 150, 110,110,90],
columnWidth: [60,60, 132, 142, 105,105,90],
align: ['center'],
data: [],
// index:true,
@ -442,6 +444,45 @@ export default {
// removeEventListener('resize', resizeFun)
// },
methods: {
formatTime(time, option) {
// if (('' + time).length === 10) {
// time = parseInt(time) * 1000
// } else {
// time = +time
// }
console.log(time);
const d = new Date(time)
// const now = Date.now()
// console.log(time);
// const diff = (now - d) / 1000
// if (diff < 30) {
// return '刚刚'
// } else if (diff < 3600) {
// // less 1 hour
// return Math.ceil(diff / 60) + '分钟前'
// } else if (diff < 3600 * 24) {
// return Math.ceil(diff / 3600) + '小时前'
// } else if (diff < 3600 * 24 * 2) {
// return '1天前'
// }
// if (option) {
// return parseTime(time, option)
// } else {
return (
d.getMonth() +
1 +
'月' +
d.getDate() +
'日' +
d.getHours() +
'时'
// +
// d.getMinutes() +
// '分'
)
// }
},
// getList() {
// // this.loading = true;
// // 执行查询
@ -584,7 +625,7 @@ export default {
])
}
this.annealFunConfig.data = arr
this.$refs['annealFanScrollBoard'].updateRows(arr)
this.$refs['annealFunScrollBoard'].updateRows(arr)
}
if (this.funWsData.type === 'FanInfo') {
let arr = []
@ -652,7 +693,7 @@ export default {
`
<span style="color:rgba(255,255,255,0.5)" >${item.lineName || ''}
</span>`,
`<span style="color:rgba(255,255,255,0.5)">${formatDate(item.time) || ''}</span>`,
`<span style="color:rgba(255,255,255,0.5)">${this.formatTime(item.time) || ''}</span>`,
`<span style="color:rgba(255,255,255,0.5)">${this.getSize(item.size) || ''}</span>`,
`<span style="color:rgba(255,255,255,0.5)">${item.productArea + '㎡' || ''}</span>`,
`<span style="color:rgba(255,255,255,0.5)">${item.wasteArea + '㎡' || ''}</span>`,

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

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-12-27 13:54:52
* @LastEditTime: 2024-01-22 16:04:18
* @LastEditTime: 2024-01-25 14:08:27
* @LastEditors: zhp
* @Description:
-->
@ -103,6 +103,7 @@ export default {
// itemStyle: {
color: '#0fdedb',
// },
// barCategoryGap: '10%',
barWidth: 10,
data: passRateList
},
@ -110,8 +111,9 @@ export default {
type: 'bar',
stack: 'total',
name: '废品',
// barCategoryGap: '10%',
data: wasteList,
barWidth: 10,
// barWidth: 10,
// barWidth: 15,
// label: {
// position: [10, 10],
@ -145,7 +147,7 @@ export default {
right: '4%',
// bottom: '3%',
width: 'auto',
height: 'auto',
height: '300',
containLabel: true
},
yAxis: [

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

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-07-19 15:18:30
* @LastEditors: zhp
* @LastEditTime: 2024-01-24 17:10:28
* @LastEditTime: 2024-01-25 10:13:51
* @Description:
-->
<template>
@ -131,6 +131,7 @@
<script>
import baseContainer from './components/baseContainer'
import baseTable1 from './components/baseTable'
// import baseTable2 from './components/baseTable'
// import baseTable3 from './components/baseTable'
@ -828,21 +829,18 @@ export default {
if (item.id == ele.productionLineId) {
if (item.name.substr(0, 1) == "D") {
nameList.push(item.name)
outputNumList.push(ele.outputNum)
passRateList.push(ele.passRate * 100)
}
}
})
})
// progressRateList = EnergyNameList
// let EnergyDataList = []
this.SJGWsData.detData.forEach((ele) => {
passRateList.push(ele.passRate *100
)
})
this.SJGWsData.detData.forEach((ele) => {
outputNumList.push(ele.outputNum
)
})
// this.SJGWsData.detData.forEach((ele) => {
// })
// this.SJGWsData.detData.forEach((ele) => {
// })
// console.log(this.EnergyMonitoringNameList)
// console.log(this.EnergyMonitoringList)
// this.$nextTick(() => {