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

'1'

Browse Source
This commit is contained in:
gtz 2024-01-12 10:02:58 +08:00
commit ec3b6100b3
38 changed files with 610 additions and 319 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.dev
View File

@ -1,7 +1,7 @@
###
# @Author: Do not edit
# @Date: 2023-08-29 09:40:39
# @LastEditTime: 2024-01-09 16:27:57
# @LastEditTime: 2024-01-11 10:20:21
# @LastEditors: zhp
# @Description:
###

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'
# socket地址

BIN
src/assets/img/eqStatus.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 99 KiB

4
src/main.js
View File

@ -9,7 +9,7 @@ import store from './store';
import router from './router';
import directive from './directive'; // directive
import plugins from './plugins'; // plugins
// import { scrollBoard } from '@jiaminghi/data-view'
import { scrollBoard } from '@jiaminghi/data-view'
import './assets/icons'; // icon
import './permission'; // permission control
@ -79,7 +79,7 @@ Vue.use(CodeBrickZj)
Vue.use(directive);
Vue.use(plugins);
Vue.use(VueMeta);
// Vue.use(scrollBoard)
Vue.use(scrollBoard)
// Vue.use(hljs.vuePlugin);
import scroll from 'vue-seamless-scroll'
Vue.use(scroll)

18
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-09 15:34:00
* @LastEditTime: 2024-01-11 15:54:50
* @Description:
-->
<template>
@ -78,23 +78,23 @@
</base-container>
</el-col>
<el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="14">
<base-container :height="318 + 338 + 16" :size="'middle'" :title="'设备状态监控'" :title-icon="'eqMonitoring'">
<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 />
</div> -->
<!-- 像下面这样表格里的limit值，也许可以用js动态计算出来 -->
<el-col :span="6">
<h4 style="margin: 5px 0 5px 0;">融化风机</h4>
<el-col :span="6" style="">
<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" />
</el-col>
<el-col :span="6">
<h4 style="margin: 5px 0 5px 0;">退火风机</h4>
<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" />
</el-col>
<el-col :span="12" style="float: right;">
<h4 style="margin: 5px 0 5px 0;">产线设备</h4>
<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" />
</el-col>
@ -668,25 +668,27 @@ export default {
width: 100%;
background: url('../../assets/img/OperationalOverview/title.png') no-repeat;
background-size: 100% 100%;
color: #ffffff;
color: rgba(0, 255, 247, 1);
text-align: center;
.unit {
position: absolute;
left: 260px;
top: 25px;
color: rgba(255, 255, 255, 0.80);
font-size: 20px;
}
.time {
position: absolute;
left: 1360px;
color: rgba(255, 255, 255, 0.80);
top: 25px;
font-size: 20px;
}
.title-button {
color: #ffffff;
color: rgba(255, 255, 255, 0.80);
font-size: 20px;
position: absolute;
}

12
src/views/OperationalOverview/components/baseContainer/index.vue
View File

@ -2,7 +2,7 @@
* @Author: gtz
* @Date: 2022-01-19 15:58:17
* @LastEditors: zhp
* @LastEditTime: 2024-01-08 16:03:05
* @LastEditTime: 2024-01-11 15:54:37
* @Description: file content
* @FilePath: \mt-bus-fe\src\views\OperationalOverview\components\baseContainer\index.vue
-->
@ -24,7 +24,7 @@
<div class="bar-item">
<div v-if="title" class="bar-title">
<span>
<svg-icon :icon-class="titleIcon" style="font-size: 1.5em; position: relative; top: .08em" />
<svg-icon :icon-class="titleIcon" style="font-size: 1em; position: relative; top: .08em" />
{{ title }}
</span>
</div>
@ -129,6 +129,10 @@ export default {
background-size: 100% 100%;
// background-position: 0 0;
}
&__eqStatus {
background: url(../../../../assets/img/eqStatus.png) no-repeat;
background-size: 100% 100%;
}
// border-radius: 40px 0px 40px 0px;
// border-image: linear-gradient(360deg, rgba(157, 246, 254, 0.05), rgba(100, 233, 252, 0.9)) 2 2;
// .line {
@ -192,12 +196,12 @@ export default {
.bar-title {
width: 100%;
color: #ffffff;
font-size: 1.6em;
font-size: 24px;
padding: 0.67em;
}
.bar-content {
padding: 1em;
// padding: 1em;
flex: 1 auto;
}

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

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-09-21 09:06:28
* @LastEditTime: 2024-01-09 14:42:02
* @LastEditTime: 2024-01-11 15:52:09
* @LastEditors: zhp
* @Description:
-->
@ -271,7 +271,7 @@ export default {
// show: true,
// lineStyle: {
// color: colors[1]
// }
// }jik078u7uut9890999999999999999999999999999999999999999999999999999999999999995u8
// },
}
],

102
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-08 16:06:49
* @LastEditTime: 2024-01-12 09:59:58
* @Description:
-->
<template>
@ -30,8 +30,10 @@
<el-row :style="{ padding: '0 ' + 9 + 'px' }" :gutter="15" type="flex" class="flex-1" style="height: 50%;">
<el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="8" height="100%">
<base-container :title="'设备报警'" :size="'small'" :height="318" :title-icon="'eqAlarm'">
<!-- <base-table1 :page="1" :limit="999" :show-index="false" :table-config="qualityYearTableProps"
:table-data="equipmentList" /> -->
<base-table1 :page="1" :limit="999" :show-index="false" :table-config="qualityYearTableProps"
:table-data="equipmentList" />
:table-data="qualityYearList" />
</base-container>
</el-col>
@ -39,6 +41,8 @@
<base-container :title="'各工序缺陷汇总'" :size="'small'" :title-icon="'scrap'">
<base-table1 :page="1" :limit="999" :show-index="false" :table-config="qualityMonthTableProps"
:table-data="qualityMonthList" />
<!-- <base-table1 :page="1" :limit="999" :show-index="false" :table-config="qualityMonthTableProps"
:table-data="qualityMonthList" /> -->
</base-container>
</el-col>
@ -418,21 +422,21 @@ const qualityYearTableProps = [
]
const qualityYearList = [
{ eqName: '钢化炉', eqCode: '21321312', level: 1, content: 'Temperature high' },
{ eqName: '磨边机', eqCode: '32323232', level: 4, content: 'Device warning/alarm' },
{ eqName: '镀膜机', eqCode: '32213213', level: 3, content: 'Temperature high' },
{ eqName: '钢化清洗机', eqCode: '21321323', level: 1, content: 'P030: JET: Note: Transportation subsequent machine is not running' },
{ eqName: '固化机', eqCode: '21321321', level: 2, content: 'P040' },
{ eqName: '磨边清洗机', eqCode: '21321321', level: 2, content: 'M4033.6' },
{ eqName: '预热机', eqCode: '21321321', level: 2, content: 'M4033.6' },
{ eqName: '下片机', eqCode: '21321321', level: 3, content: 'P040' },
{ name: '钢化炉', code: '21321312', status: '运行', error: '否' },
{ name: '磨边机', code: '32323232', status: '运行', error: '否' },
{ name: '镀膜机', code: '32213213', status: '运行', error: '否' },
{ name: '钢化清洗机', code: '21321323', status: '运行', error: '否' },
{ name: '固化机', code: '21321321', status: '运行', error: '否' },
{ name: '磨边清洗机', code: '21321321', status: '运行', error: '否' },
{ name: '预热机', code: '21321321', status: '故障', error: '是' },
{ name: '下片机', code: '21321321', status: '运行', error: '否' },
{
eqName: '冷却机', eqCode: '21321321', level: 4, content: 'P0xx: Pos. number exhaust UVnumber: Reserve' },
name: '冷却机', code: '21321321', status: '运行', error: '否' },
{
eqName: 'A储片机106', eqCode: '21321321', level: 1, content: 'P0xx: Pos. number exhaust UVnumber: Reserve' },
{ eqName: '二次清洗机', eqCode: '21321321', level: 2, content: 'Temperature high' },
{ eqName: '二次磨边机', eqCode: '21321321', level: 2, content: 'Temperature high' },
{ eqName: '测试设备', eqCode: '21321321', level: 2, content: 'Temperature high' }
name: 'A储片机106', code: '21321321', status: '运行', error: '否' },
{ name: '二次清洗机', code: '21321321', status: '运行', error: '否' },
{ name: '二次磨边机', code: '21321321', status: '故障', error: '是' },
{ name: '测试设备', code: '21321321', status: '运行', error: '否' }
]
const qualityMonthTableProps = [
@ -453,7 +457,50 @@ const qualityMonthTableProps = [
label: '缺陷类型'
},
]
const qualityMonthList = [
{
productionLineName: 'Y61',
sectionName: '成型',
count: '199片',
inspectionTypeName: '细长泡'
},
{
productionLineName: 'Y62',
sectionName: '组合落板',
count: '123片',
inspectionTypeName: '细长泡'
},
{
productionLineName: 'Y61',
sectionName: '磨边',
count: '212片',
inspectionTypeName: '开口泡'
},
{
productionLineName: 'Y63',
sectionName: '清洗',
count: '33片',
inspectionTypeName: '结石'
},
{
productionLineName: 'Y64',
sectionName: '打孔',
count: '332片',
inspectionTypeName: '结石'
},
{
productionLineName: 'Y63',
sectionName: '成型',
count: '432片',
inspectionTypeName: '开口泡'
},
{
productionLineName: 'Y61',
sectionName: '上片',
count: '200片',
inspectionTypeName: '结石'
}
]
const orderProcessList = [
{
id: '1', outRate: '.8', name: '凯盛0322'
@ -509,7 +556,7 @@ export default {
// orderProcessList: [],
orderProcessList,
qualityTableProps1,
qualityMonthList:[],
qualityMonthList,
qualityMonthTableProps,
modelMonth: '',
qualityList1,
@ -559,6 +606,9 @@ export default {
this.initWebSocket()
this.SJGInitWebSocket()
this.getTimes()
this.$refs.EnergyMonitoringChart.initChart(['Y61', 'Y62', 'Y63', 'Y64', 'Y65',], [3134, 2323, 3232, 3233, 2321])
this.$refs.productLineChart.initChart(['Y61', 'Y62', 'Y63', 'Y64', 'Y65',], ['98', '97', '98.7', '98.5', '98.3',], ['4532', '1223', '3442', '4343', '2232'])
const _this = this;
_this.beilv2 = document.documentElement.clientWidth / 1920
window.onresize = () => {
@ -601,13 +651,13 @@ export default {
// console.log('11111', res);
this.productLineList = res.data
})
this.$axios.get(
'base/quality-inspection-record/dayStatistics',
'get',
).then((res) => {
// console.log('11111', res);
this.qualityMonthList = res.data ? res.data : []
})
// this.$axios.get(
// 'base/quality-inspection-record/dayStatistics',
// 'get',
// ).then((res) => {
// // console.log('11111', res);
// this.qualityMonthList = res.data ? res.data : []
// })
},
getTimes() {
setInterval(this.getTimesInterval, 1000);
@ -741,7 +791,7 @@ export default {
// console.log(this.EnergyMonitoringNameList)
// console.log(this.EnergyMonitoringList)
// this.$nextTick(() => {
this.$refs.productLineChart.initChart(Array.from(new Set(nameList)), passRateList, outputNumList)
// this.$refs.productLineChart.initChart(Array.from(new Set(nameList)), passRateList, outputNumList)
}
},
// 数据发送
@ -789,7 +839,7 @@ export default {
// console.log(this.EnergyMonitoringNameList)
// console.log(this.EnergyMonitoringList)
// this.$nextTick(() => {
this.$refs.EnergyMonitoringChart.initChart(this.EnergyMonitoringNameList, this.EnergyMonitoringList)
// this.$refs.EnergyMonitoringChart.initChart(this.EnergyMonitoringNameList, this.EnergyMonitoringList)
// })
}
},

6
src/views/core/mixins/basic-page.js
View File

@ -1,8 +1,8 @@
/*
* @Author: zwq
* @Date: 2022-08-24 11:19:43
* @LastEditors: DY
* @LastEditTime: 2023-09-21 16:02:07
* @LastEditors: zhp
* @LastEditTime: 2024-01-10 10:29:29
* @Description:
*/
export default {
@ -92,7 +92,7 @@ export default {
this.$refs.addOrUpdate.init(val.data.id);
});
} else if (val.type === "delete") {
this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex)
this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex,val.data)
} else if (val.type === "change") {
this.changeStatus(val.data.id)
} else {

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

@ -1,19 +1,25 @@
<template>
<div class="defect-chart"></div>
<div>
<NotMsg v-show="notMsg"/>
<div id="defectChart" style="width:600px;height:238px;" v-show="!notMsg"></div>
</div>
</template>
<script>
import * as echarts from 'echarts';
import resize from './../mixins/resize'
import NotMsg from './../components/NotMsg'
export default {
name: 'DefectChart',
mixins: [resize],
components:{ NotMsg },
props: {
chartTime: ''
},
data() {
return {
chart: null,
tempData: []
tempData: [],
notMsg:false
}
},
computed: {
@ -65,6 +71,26 @@ export default {
this.updateChart()
}
}
},
chartTime: {// 监听类型变化，更新图
handler(newVal, oldVal) {
switch(this.chartTime){
case '日':
this.tempData = this.israDayStatistic
break;
case '周':
this.tempData = this.israWeekStatistic
break;
case '月':
this.tempData = this.israMonthStatistic
break;
case '年':
this.tempData = this.israYearStatistic
break;
default:
}
this.updateChart()
}
}
},
mounted() {
@ -75,6 +101,12 @@ export default {
},
methods: {
updateChart() {
if (!this.tempData || this.tempData.length == 0) {
this.notMsg = true
return
} else {
this.notMsg = false
}
if (
this.chart !== null &&
this.chart !== '' &&
@ -82,7 +114,7 @@ export default {
) {
this.chart.dispose()
}
this.chart = echarts.init(this.$el);
this.chart = echarts.init(document.getElementById('defectChart'));
let xData = []
let seriesData = []
for (let i = 0;i < this.israCheckType.length; i++) {
@ -95,12 +127,25 @@ export default {
obj.name = this.israCheckType[i]
obj.barWidth = 12
obj.data = []
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
for (let k = 0; k < this.tempData[j].data.length; k++) {
if (this.israCheckType[i] === this.tempData[j].data[k].checkType) {
obj.data.push(this.tempData[j].data[k].checkNum)
num++
}
}
if (num === 0) {
obj.data.push(0)
}
}
seriesData.push(obj)
}
@ -110,10 +155,10 @@ export default {
})
var option = {
color: ["#2760FF", "#8167F6", "#5B9BFF", "#99D66C", "#FFD160", "#FF8A40"],
grid: { top: 80, right: 12, bottom: 20, left: 48 },
grid: { top: 90, right: 12, bottom: 20, left: 70 },
legend: {
top: 10,
left: 80,
top: 0,
left: 100,
padding: 5,
itemWidth: 12,
itemHeight: 12,
@ -179,12 +224,6 @@ export default {
}
}
</script>
<style scoped lang="scss">
.defect-chart {
width: 100%;
height: 100%;
}
</style>
<style>
.defect-chart-tooltip {
background: #0a2b4f77 !important;

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

@ -1,18 +1,24 @@
<template>
<div class="defect-class-chart"></div>
<div>
<NotMsg v-show="notMsg"/>
<div id="defectClassChart" class="defect-class-chart" style="width:600px;height:390px;" v-show='!notMsg'></div>
</div>
</template>
<script>
import * as echarts from 'echarts';
import resize from './../mixins/resize'
import NotMsg from './../components/NotMsg'
export default {
name: 'DefectClassChart',
mixins: [resize],
components:{ NotMsg },
props: {
chartType: ''
},
data() {
return {
chart: null
chart: null,
notMsg:false
}
},
computed: {
@ -43,6 +49,12 @@ export default {
},
methods: {
updateChart() {
if (!this.israDayStatistic || this.israDayStatistic.length == 0) {
this.notMsg = true
return
} else {
this.notMsg = false
}
if (
this.chart !== null &&
this.chart !== '' &&
@ -50,7 +62,7 @@ export default {
) {
this.chart.dispose()
}
this.chart = echarts.init(this.$el);
this.chart = echarts.init(document.getElementById('defectClassChart'));
let tempData = []
let xData = []
let yData = []
@ -66,28 +78,14 @@ export default {
})
var option = {
color: ['#2760FF','#5B9BFF','#FFD160','#8167F6', '#99D66C', '#FF8A40'],
grid: { top: 40, right: 12, bottom: 80, left: 60 },
// legend: {
// top: 10,
// left: 80,
// padding: 5,
// itemWidth: 12,
// itemHeight: 12,
// itemGap: 12,
// height: 12,
// textStyle: {
// color: "#DFF1FE",
// fontSize: 12,
// },
// data:['a','b','c','d','e'],
// },
grid: { top: 40, right: 12, bottom: 65, left: 70 },
xAxis: {
type: "category",
data: xData,
axisLabel: {
color: "#fffc",
fontSize: 12,
rotate: 45
rotate: 25
},
axisTick: { show: false },
axisLine: {
@ -98,7 +96,7 @@ export default {
},
},
yAxis: {
name: "单位/次",
name: "单位/个",
nameTextStyle: {
color: "#fff",
fontSize: 10,
@ -136,7 +134,9 @@ export default {
barWidth: 12,
label: {
show: true,
position: 'top'
position: 'top',
distance: 10,
color: "#fffc"
},
itemStyle: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [

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

@ -1,15 +1,21 @@
<template>
<div class="energe-monitoring-chart"></div>
<div>
<NotMsg v-show="notMsg"/>
<div id="energeMonitoringChart" class="energe-monitoring-chart" style="width:575px;height:370px;" v-show='!notMsg'></div>
</div>
</template>
<script>
import * as echarts from 'echarts';
import resize from './../mixins/resize'
import NotMsg from './../components/NotMsg'
export default {
name: 'EnergeMonitoringChart',
mixins: [resize],
components:{ NotMsg },
data() {
return {
chart: null
chart: null,
notMsg:true
}
},
computed: {
@ -42,16 +48,22 @@ export default {
) {
this.chart.dispose()
}
this.chart = echarts.init(this.$el);
this.chart = echarts.init(document.getElementById('energeMonitoringChart'));
let xData = []
let yData = []
this.energyMonitoring && this.energyMonitoring.length > 0 && this.energyMonitoring.map(item => {
xData.push(item.lineName)
yData.push(item.useQuantity)
})
var option = option = {
if (yData.length === 0) {
this.notMsg = true
return
} else {
this.notMsg = false
}
var option = {
// color: ['#FF8A40','#FFD160','#99D66C','#5B9BFF','#8167F6','#2760FF'],
grid: { top: 32, right: 12, bottom: 20, left: 60 },
grid: { top: 32, right: 12, bottom: 20, left: 90 },
tooltip: {
trigger: 'axis',
axisPointer: {
@ -91,11 +103,13 @@ export default {
],
yAxis: [
{
name: '单位kwh',
nameTextStyle: {
color: '#fff',
fontSize: 10,
align: 'right',
},
type: 'value',
name: '单位',
// min: 0,
// max: 250,
// interval: 50,
axisLabel: {
color: "#fff",
fontSize: 12,
@ -121,7 +135,7 @@ export default {
barWidth: 20,
tooltip: {
valueFormatter: function (value) {
return value + ' ml';
return value;
}
},
itemStyle: {

42
src/views/databoard/components/FlueGas.vue → src/views/databoard/components/FlueGasChart.vue
View File

@ -1,15 +1,19 @@
<template>
<div class="gas-chart"></div>
<div>
<NotMsg v-show="notMsg"/>
<div id='flueGasChart' class="flue-gas-chart" style="width:600px;height:250px;" v-show='!notMsg'></div>
</div>
</template>
<script>
import * as echarts from 'echarts';
import resize from './../mixins/resize'
import NotMsg from './../components/NotMsg'
export default {
name: 'GasChart',
name: 'FlueGasChart',
mixins: [resize],
components: {},
components:{ NotMsg },
props: {
chartType: '',
chartTime: ''
@ -26,7 +30,8 @@ export default {
'#2aa1ff',
];
return {
chart: null
chart: null,
notMsg:false
};
},
computed: {
@ -126,7 +131,7 @@ export default {
temp2 = temp1?.SO2_float || []
break;
}
case '一氧化氮':{
case '氮氧化物':{
temp2 = temp1?.NOX_float || []
break;
}
@ -136,7 +141,13 @@ export default {
}
default:
}
temp2.length > 0 && temp2.map(i => {
if (temp2.length === 0) {
this.notMsg = true
return
} else {
this.notMsg = false
}
temp2.map(i => {
xData.push(i.time)
yData.push(i.value)
})
@ -172,10 +183,10 @@ export default {
) {
this.chart.dispose() // 页面多次刷新会出现警告，Dom已经初始化了一个实例，这是销毁实例
}
this.chart = echarts.init(this.$el);
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,
@ -192,7 +203,7 @@ export default {
},
},
yAxis: {
name: '单位m³/h',
name: this.chartType === '氧气含量' ? '单位%':'单位mg/m³',
nameTextStyle: {
color: '#fff',
fontSize: 10,
@ -218,6 +229,7 @@ export default {
series: seriesData,
tooltip: {
trigger: 'axis',
className: "gas-chart-tooltip"
},
}
option && this.chart.setOption(option)
@ -227,8 +239,18 @@ export default {
</script>
<style scoped lang="scss">
.gas-chart {
.flue-gas-chart {
width: 100%;
height: 100%;
}
</style>
<style>
.gas-chart-tooltip {
background: #0a2b4f77 !important;
border: none !important;
backdrop-filter: blur(12px);
}
.gas-chart-tooltip * {
color: #fff !important;
}
</style>

28
src/views/databoard/components/GasChart.vue
View File

@ -1,22 +1,19 @@
<!--
filename: GasChart.vue
author: liubin
date: 2023-12-12 10:53:49
description:
-->
<template>
<div class="gas-chart"></div>
<div>
<NotMsg v-show="notMsg"/>
<div id='gasChart' class="gas-chart" style="width:600px;height:200px;" v-show='!notMsg'></div>
</div>
</template>
<script>
import * as echarts from 'echarts';
import resize from './../mixins/resize'
import NotMsg from './../components/NotMsg'
export default {
name: 'GasChart',
mixins: [resize],
components: {},
components:{ NotMsg },
props: {
chartType: '', // 能源类型
chartTime: ''
@ -33,7 +30,8 @@ export default {
'#2aa1ff',
];
return {
chart: null
chart: null,
notMsg:false
};
},
computed: {
@ -142,6 +140,12 @@ export default {
yData = this.gasChartMsg.sumGas2ForYear || []
}
xData = this.getXdata()
}
if (yData.length === 0) {
this.notMsg = true
return
} else {
this.notMsg = false
}
if (yData.length == 0) {
seriesData = []
@ -175,7 +179,7 @@ export default {
) {
this.chart.dispose() // 页面多次刷新会出现警告，Dom已经初始化了一个实例，这是销毁实例
}
this.chart = echarts.init(this.$el);
this.chart = echarts.init(document.getElementById('gasChart'));
var option = {
color: colors,
grid: { top: 32, right: 12, bottom: 20, left: 60 },
@ -195,7 +199,7 @@ export default {
},
},
yAxis: {
name: '单位m³/h',
name: this.chartType === '电耗能'?'单位kwh':'单位Nm³',
nameTextStyle: {
color: '#fff',
fontSize: 10,

93
src/views/databoard/components/ISRAChart.vue
View File

@ -1,56 +1,28 @@
<template>
<div class="isra-chart"></div>
<div>
<NotMsg v-show="notMsg"/>
<div id="israChart" class="isra-chart" style="width:600px;height:390px;" v-show='!notMsg'></div>
</div>
</template>
<script>
import * as echarts from 'echarts';
import resize from './../mixins/resize'
import NotMsg from './../components/NotMsg'
export default {
name: 'ISRAChart',
mixins: [resize],
components: {},
components:{ NotMsg },
props: {},
data() {
return {
chart: null,
notMsg:true,
colors:['#2760ff', '#518eec', '#0ee8e4', '#ddb523'],
chartData: [],
option: {
tooltip: {
trigger: 'item',
},
legend: {
bottom: '3%',
left: 'center',
icon: 'circle',
textStyle: {
color: '#fff'
}
},
title: {
text: 0,
subtext: '总数',
top: '43%',
left: '49%',
textAlign: 'center',
textStyle: {
fontSize: 32,
lineHeight: 16,
color: '#fff',
},
subtextStyle: {
fontSize: 16,
color: '#fff00',
},
},
series: []
},
chartData: []
};
},
mounted() {
this.initChart();
},
activated() {
},
computed: {
@ -61,23 +33,33 @@ export default {
watch: {
israChartMsg: {
handler(newVal, oldVal) {
this.chartData = newVal
this.chartData = newVal || []
this.updateChart()
}
}
},
methods: {
initChart() {
this.chart = echarts.init(this.$el);
this.chart.setOption(this.option);
},
updateChart() {
console.log('update')
let num = 0
this.chartData && this.chartData.length > 0 && this.chartData.map(i => {
num+=i.num
})
this.chart.setOption({
if (
this.chart !== null &&
this.chart !== '' &&
this.chart !== undefined
) {
this.chart.dispose()
}
if (this.chartData && this.chartData.length > 0) {
this.notMsg = false
} else {
this.notMsg = true
return
}
this.chart = echarts.init(document.getElementById('israChart'));
var option = {
title:{
text: num,
subtext: '总数',
@ -94,6 +76,14 @@ export default {
color: '#fff00',
},
},
legend: {
bottom: '3%',
left: 'center',
icon: 'circle',
textStyle: {
color: '#fff'
}
},
series:[{
name: 'ISRA缺陷检测',
type: 'pie',
@ -126,8 +116,13 @@ export default {
]
}
}
}))}]
})
}))}],
tooltip: {
trigger: 'item',
className: "isra-chart-tooltip"
},
}
this.chart.setOption(option);
}
},
};
@ -139,3 +134,13 @@ export default {
height: 100%;
}
</style>
<style>
.isra-chart-tooltip {
background: #0a2b4f77 !important;
border: none !important;
backdrop-filter: blur(12px);
}
.isra-chart-tooltip * {
color: #fff !important;
}
</style>

27
src/views/databoard/components/NotMsg.vue Normal file
View File

@ -0,0 +1,27 @@
<template>
<div class="notmsg">暂无数据</div>
</template>
<script>
export default {
name: 'NotMsg',
components: {},
data() {
return {
};
},
computed: {
},
methods: {
},
};
</script>
<style scoped lang="scss">
.notmsg {
padding-top: 72px;
color: rgba(255, 255, 255, 0.4);
text-align: center;
font-size: 24px;
}
</style>

46
src/views/databoard/components/NumRateChart.vue
View File

@ -1,15 +1,21 @@
<template>
<div class="num-rate-chart"></div>
<div>
<NotMsg v-show="notMsg"/>
<div id="numRateChart" class="num-rate-chart" style="width:900px;height:370px;" v-show='!notMsg'></div>
</div>
</template>
<script>
import * as echarts from 'echarts';
import resize from './../mixins/resize'
import NotMsg from './../components/NotMsg'
export default {
name: 'NumRateChart',
mixins: [resize],
components:{ NotMsg },
data() {
return {
chart: null
chart: null,
notMsg:true
}
},
computed: {
@ -23,7 +29,7 @@ export default {
if (newVal === oldVal) {
return false
}
this.updateChart()
// this.updateChart()
}
}
},
@ -35,14 +41,12 @@ export default {
},
methods: {
updateChart() {
if (
this.chart !== null &&
this.chart !== '' &&
this.chart !== undefined
) {
this.chart.dispose()
if (this.productline && this.productline.length > 0) {
this.notMsg = false
} else {
this.notMsg = true
return
}
this.chart = echarts.init(this.$el);
let xData = []
let outputNum = []
let passRate = []
@ -51,6 +55,14 @@ export default {
outputNum.push(item.outputNum)
passRate.push(item.passRate*100)
})
if (
this.chart !== null &&
this.chart !== '' &&
this.chart !== undefined
) {
this.chart.dispose()
}
this.chart = echarts.init(document.getElementById('numRateChart'));
var option = {
grid: { top: 32, right: 60, bottom: 20, left: 60 },
tooltip: {
@ -61,7 +73,7 @@ export default {
className: "num-rate-chart-tooltip"
},
legend: {
data: ['产线产量', '合格率'],
data: ['产线产量', '良品率'],
textStyle: {
color: "#DFF1FE",
fontSize: 12,
@ -91,6 +103,11 @@ export default {
{
type: 'value',
name: '产量/片',
nameTextStyle: {
color: '#fff',
fontSize: 10,
align: 'right',
},
axisLabel: {
color: "#fff",
fontSize: 12,
@ -111,6 +128,11 @@ export default {
{
type: 'value',
name: '良品率',
nameTextStyle: {
color: '#fff',
fontSize: 10,
align: 'LEFT',
},
axisLabel: {
color: "#fff",
fontSize: 12,
@ -148,7 +170,7 @@ export default {
data: outputNum
},
{
name: '合格率',
name: '良品率',
type: 'line',
yAxisIndex: 1,
tooltip: {

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

@ -49,16 +49,18 @@ export default {
.switcher {
:deep(.el-switch__core) {
border: none;
background-color:rgba(3, 35, 60, 1);
background-color:#02457e;
height: 18px;
&::after {
background-color: #02457e;
background-color: #03233c;
}
}
: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 {};

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

@ -1,6 +1,6 @@
<template>
<div style="flex: 1;">
<Container name="各工序缺陷汇总" size="small" style="">
<Container name="各工序缺陷汇总" size="middle" style="">
<div style="padding: 5px 10px;">
<dv-scroll-board :config="config" style="width:575px;height:380px" ref='defectScrollBoard'/>
</div>
@ -21,13 +21,12 @@ 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: [60],
align: ['center'],
data: [],
data: [[1, 'Y61', '破损','10','气泡']],
rowNum: 10
}
}

4
src/views/databoard/deepProcessing/EnergyMonitoring.vue
View File

@ -1,11 +1,9 @@
<template>
<div style="flex: 1;">
<Container name="能源监控" size="small" style="">
<Container name="能源监控" size="large" style="">
<div class="chart" style="height: 370px; margin-top: 8px;">
<EnergeMonitoringChart/>
</div>
</Container>
</div>
</template>
<script>
import Container from '../components/Container.vue';

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

@ -1,6 +1,6 @@
<template>
<div style="flex: 1;">
<Container name="设备报警" size="small" style="">
<Container name="设备报警" size="middle" style="">
<div style="padding: 5px 10px;">
<dv-scroll-board :config="config" style="width:575px;height:380px" ref='eqScrollBoard'/>
</div>
@ -19,26 +19,24 @@ export default {
},
data() {
return {
// config:{}
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: [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
}
@ -46,20 +44,20 @@ export default {
},
mounted(){
},
watch:{
sjgEquipment: {
handler(newVal, oldVal) {
let outArr = this.sjgEquipment.map((item, index) => [
index+1,
item.name,
item.code,
item.status,
item.error? '是': '否'
]);
this.config.data = outArr
this.$refs['eqScrollBoard'].updateRows(outArr)
}
}
}
// watch:{
// sjgEquipment: {
// handler(newVal, oldVal) {
// let outArr = this.sjgEquipment.map((item, index) => [
// index+1,
// item.name,
// item.code,
// item.status,
// item.error? '是': '否'
// ]);
// this.config.data = outArr
// this.$refs['eqScrollBoard'].updateRows(outArr)
// }
// }
// }
}
</script>

4
src/views/databoard/deepProcessing/NumRate.vue
View File

@ -1,11 +1,9 @@
<template>
<div style="flex: 1;">
<Container name="产线产量及良品率" size="small" style="">
<Container name="产线产量及良品率" size="large" style="">
<div class="chart" style="height: 370px; margin-top: 8px;">
<NumRateChart />
</div>
</Container>
</div>
</template>
<script>
import Container from '../components/Container';

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 {};

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

@ -1,14 +1,13 @@
<template>
<div style="flex: 1;">
<Container name="工单监控" size="small" style="">
<div style="padding: 5px 10px;">
<dv-scroll-board :config="config" style="width:575px;height:380px" ref='worderScrollBoard'/>
<Container name="工单监控" size="middle" style="">
<div style="padding: 5px 10px;" class="WOMonitoring">
<dv-scroll-board :config="config" style="width:900px;height:380px" ref='worderScrollBoard'/>
</div>
</Container>
</div>
</template>
<script>
import Container from '../components/Container.vue';
import { formatDate } from '@/utils'
export default {
name: 'WorkOrderMonitoring',
components: { Container },
@ -21,28 +20,18 @@ 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: [60, 120, 80, 60, 80, 120, 120, 120],
columnWidth: [60, 120, 120, 60, 100, 150],
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', '', '','','','']
],
data: [],
rowNum:10
}
}
},
methods:{
},
watch:{
order: {
handler(newVal, oldVal) {
@ -51,8 +40,8 @@ export default {
item.name,
item.specifications,
item.lines,
item.status,
item.planFinishTime,
['等待','已下发','已完成'][item.status],
formatDate(item.planFinishTime),
item.planQuantity,
item.planAssignQuantity
]);

11
src/views/databoard/kiln/EnergeTop.vue
View File

@ -11,7 +11,7 @@
style="
flex: 1;
display: grid;
grid-template-columns: 1fr 1fr 1fr;
grid-template-columns: 2fr 3fr 3fr;
grid-template-rows: auto;
gap: 8px;
padding: 4px;
@ -34,6 +34,7 @@
line-height: 1.55;
text-align: center;
letter-spacing: 1px;
color: #3ce8ff
">
{{energyInfo.elecQty1}}kwh
</span>
@ -51,7 +52,7 @@
">
<p style="margin: 0; line-height: inherit">水耗量</p>
</div>
<span style="font-size: 16px; line-height: 1.24; flex: 1">{{energyInfo.waterQty}}m³</span>
<span style="font-size: 16px; line-height: 1.24; flex: 1.3;color: #3ce8ff">{{energyInfo.waterQty}}m³</span>
</ShadowRect>
<ShadowRect>
@ -66,7 +67,7 @@
">
<p style="margin: 0; line-height: inherit">天然气I</p>
</div>
<span style="font-size: 16px; line-height: 1.24; flex: 1">{{sumGasInfo.sumGas1Now}}</span>
<span style="font-size: 16px; line-height: 1.24; flex: 1.3;color: #3ce8ff">{{sumGasInfo.sumGas1Now}}</span>
</ShadowRect>
<ShadowRect>
@ -81,7 +82,7 @@
">
<p style="margin: 0; line-height: inherit">电耗量</p>
</div>
<span style="font-size: 16px; line-height: 1.24; flex: 1">{{energyInfo.elecQty2}}kwh</span>
<span style="font-size: 16px; line-height: 1.24; flex: 1.3;color: #3ce8ff">{{energyInfo.elecQty2}}kwh</span>
</ShadowRect>
<ShadowRect>
@ -96,7 +97,7 @@
">
<p style="margin: 0; line-height: inherit">天然气II</p>
</div>
<span style="font-size: 16px; line-height: 1.24; flex: 1">{{sumGasInfo.sumGas2Now}}</span>
<span style="font-size: 16px; line-height: 1.24; flex: 1.3;color: #3ce8ff">{{sumGasInfo.sumGas2Now}}</span>
</ShadowRect>
</div>
</template>

18
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,11 +95,11 @@
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;">
<FlueGas :chartType='chartType' :chartTime='chartTime'/>
<FlueGasChart :chartType='chartType' :chartTime='chartTime'/>
</div>
</div>
</Container>
@ -112,7 +112,7 @@ import ShadowRect from '../components/ShadowRect.vue';
import KilnLine from '../components/line';
// import Switcher from '../components/Switcher';
import SelectorBtnGroup from '../components/SelectorBtnGroup';
import FlueGas from '../components/FlueGas';
import FlueGasChart from '../components/FlueGasChart';
export default {
name: 'GasHandle',
@ -121,7 +121,7 @@ export default {
ShadowRect,
KilnLine,
SelectorBtnGroup,
FlueGas,
FlueGasChart,
},
props: {},
data() {

6
src/views/databoard/wholePlant/DefectClass.vue
View File

@ -1,12 +1,10 @@
<template>
<div style="flex: 1;">
<Container name="产线当日缺陷分类" size="small">
<Container name="产线当日缺陷分类" size="middle">
<SelectorBtnGroup class="typeToggle" :options="['Y61', 'Y62', 'Y63', 'Y64', 'Y65']" @emitFun='toggleType' :active='chartType' />
<div class="chart" style="height: 370px; margin-top: 8px;">
<div class="chart" style="height: 375px; margin-top: 8px;">
<DefectClassChart :chartType='chartType'/>
</div>
</Container>
</div>
</template>
<script>
import Container from '../components/Container';

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

@ -1,5 +1,5 @@
<template>
<div style="flex: 1;">
<div style="flex: 1;" class="orderContainer">
<Container name="订单完成情况" size="small" style="">
<div style="padding: 5px 10px;">
<dv-scroll-board :config="config" style="width:575px;height:230px" ref='orderScrollBoard'/>
@ -9,6 +9,7 @@
</template>
<script>
import Container from '../components/Container'
import { formatDate } from '@/utils'
export default {
name: 'OrderStatus',
components: { Container },
@ -21,36 +22,30 @@ 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: [60],
align: ['center'],
data: [
['2023-12-01', '客户1', '行1列3', ''],
['2023-12-01', '客户2', '行2列3', ''],
['2023-12-01', '客户3', '行3列3', ''],
['2023-12-01', '客户4', '行4列3', ''],
['2023-12-01', '客户5', '行5列3', ''],
['2023-12-01', '客户6', '行6列3', ''],
['2023-12-01', '客户7', '行7列3', ''],
['2023-12-01', '客户8', '行8列3', ''],
['2023-12-01', '客户9', '行9列3', ''],
['2023-12-01', '客户10', '行10列3', '']
],
columnWidth: [155, 180, 150],
data: [],
rowNum: 6
}
}
},
mounted() {},
watch:{
order: {
handler(newVal, oldVal) {
let outArr = this.order.map((item) => [
item.startProduceTime,
item.name,
item.specifications,
item.completeRate
formatDate(item.planStartTime) || '',
`<span title=${item.customerName || ''}>${item.customerName || ''}</span>`,
`<span title=${item.specifications || ''}>${item.specifications || ''}</span>`,
`<span style="display:inline-block;width:40px;">${item.completeRate?(item.completeRate*100).toFixed(2)+'%':'0%'}</span>
<div class="box" style="display:inline-block;">
<div class="bg"></div>
<div class="rount" style="-webkit-transform:rotate(${(item.completeRate?(item.completeRate*100).toFixed(2):0)<=50?3.6*item.completeRate*100:180}deg)"></div>
<div class="bg2"></div>
<div style="${item.completeRate*100>50?'display:block;-webkit-transform:rotate('+3.6*(item.completeRate*100-50)+'deg)':'display:none;'}" class="rount2"></div>
</div>`
]);
this.config.data = outArr
this.$refs['orderScrollBoard'].updateRows(outArr)
@ -59,3 +54,13 @@ export default {
}
}
</script>
<style lang='scss'>
.orderContainer {
.box{width:16px;height:12px;margin:1px auto;position:relative;}
.box div{position:absolute;top:0;left:0;border-radius:50%;height:16px;width:16px;-webkit-transition:all .2s ease-in-out;-moz-transition:all .2s ease-in-out;}
.box .bg{border:silver 4px solid}
.box .bg2{border:silver 4px solid;clip:rect(0,8px,20px,0);}
.box .rount{border:#47FF27 4px solid;clip:rect(0,8px,24px,0);-webkit-transform:rotate(0deg);}
.box .rount2{border:#47FF27 4px solid;clip:rect(0,40px,40px,8px);-webkit-transform:rotate(0deg);display:none}
}
</style>

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

@ -1,6 +1,5 @@
<template>
<div style="flex: 2;">
<Container name="本日生产良品率" size="small">
<Container name="本日生产良品率" size="large">
<div style="padding: 5px 10px;">
<dv-scroll-board :config="config" style="width:575px;height:230px" ref='yieldRateScrollBoard'/>
</div>
@ -27,7 +26,6 @@
</div>
</div>
</Container>
</div>
</template>
<script>
import Container from '../components/Container'
@ -53,14 +51,7 @@ export default {
oddRowBGC: 'rgba(32, 55, 96, 0.8)',
evenRowBGC: 'rgba(14, 32, 62, 0.8)',
columnWidth: [60],
align: ['center'],
data: [
[1, '产线1', '49%', '', ''],
[2, '产线2', '49%', '', ''],
[3, '产线3', '49%', '', ''],
[4, '产线4', '49%', '', ''],
[5, '产线5', '49%', '', '']
],
data: [],
rowNum: 5
},
chartType:false,
@ -72,10 +63,10 @@ export default {
handler(newVal, oldVal) {
let outArr = this.yieldRateTable.map((item) => [
item.lineName,
item.first,
item.second,
item.product,
item.waste
item.first?(item.first*100).toFixed(2)+'%':'0.00%',
item.second?(item.second*100).toFixed(2)+'%':'0.00%',
item.product?(item.product*100).toFixed(2)+'%':'0.00%',
item.waste?(item.waste*100).toFixed(2)+'%':'0.00%'
]);
this.config.data = outArr
this.$refs['yieldRateScrollBoard'].updateRows(outArr)

20
src/views/quality/base/basicData/qualityInspectionBoxBtn/index.vue
View File

@ -156,6 +156,26 @@ export default {
};
this.resetForm('form');
},
deleteHandle(id, name, index, data) {
this.$confirm(`确认要删除产线名为${data.productionLineName}的数据项?`, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.urlOptions.deleteURL(id).then(({ data }) => {
this.$message({
message: "操作成功",
type: "success",
duration: 1500,
onClose: () => {
this.getDataList();
},
});
});
})
.catch(() => { });
},
buttonClick(val) {
switch (val.btnName) {
case 'search':

20
src/views/quality/base/qualityHotMaterial/index.vue
View File

@ -157,6 +157,26 @@ export default {
this.dataListLoading = false;
});
},
deleteHandle(id, name, index, data) {
this.$confirm(`确认要删除序号为${index}的数据项?`, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.urlOptions.deleteURL(id).then(({ data }) => {
this.$message({
message: "操作成功",
type: "success",
duration: 1500,
onClose: () => {
this.getDataList();
},
});
});
})
.catch(() => { });
},
async getDict() {
// 物料列表
const res = await getHotMaterialAllList();

20
src/views/quality/base/qualityScrapDet/index.vue
View File

@ -150,6 +150,26 @@ export default {
// 物料列表
const res = await getList();
this.formConfig[1].selectOptions = res.data;
},
deleteHandle(id, name, index,data) {
this.$confirm(`确认要删除报废原因名为${data.content}的数据项?`, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.urlOptions.deleteURL(id).then(({ data }) => {
this.$message({
message: "操作成功",
type: "success",
duration: 1500,
onClose: () => {
this.getDataList();
},
});
});
})
.catch(() => { });
},
buttonClick(val) {
switch (val.btnName) {

20
src/views/quality/base/qualityScrapLog/index.vue
View File

@ -143,6 +143,26 @@ export default {
});
}
},
deleteHandle(id, name, index, data) {
this.$confirm(`确认要删除序号为${index}的数据项?`, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.urlOptions.deleteURL(id).then(({ data }) => {
this.$message({
message: "操作成功",
type: "success",
duration: 1500,
onClose: () => {
this.getDataList();
},
});
});
})
.catch(() => { });
},
// 获取数据列表
getDict() {
getWorkOrderList().then((res) => {

20
src/views/quality/base/qualityScrapType/index.vue
View File

@ -134,6 +134,26 @@ export default {
this.listQuery.total = response.data.total;
this.dataListLoading = false;
});
},
deleteHandle(id, name, index) {
this.$confirm(`确认要删除报废类型名为${name}的数据项?`, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.urlOptions.deleteURL(id).then(({ data }) => {
this.$message({
message: "操作成功",
type: "success",
duration: 1500,
onClose: () => {
this.getDataList();
},
});
});
})
.catch(() => { });
},
buttonClick(val) {
switch (val.btnName) {

20
src/views/quality/monitoring/qualityInspectionRecord/index.vue
View File

@ -311,6 +311,26 @@ export default {
},
methods: {
/** 获取搜索栏的产线列表 */
deleteHandle(id, name, index, data) {
this.$confirm(`确认要删除序号为${index}的数据项?`, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.urlOptions.deleteURL(id).then(({ data }) => {
this.$message({
message: "操作成功",
type: "success",
duration: 1500,
onClose: () => {
this.getDataList();
},
});
});
})
.catch(() => { });
},
getProductLineList() {
this.$axios('/base/core-work-order/listbyfilter').then((response) => {
this.searchBarFormConfig[0].selectOptions = response.data.map(

2
src/websocket/websocket.js
View File

@ -94,7 +94,7 @@ export function WsConnect(url, agentData, successCallback, errCallback) {
};
const onWsMessage = (event) => {
const jsonStr = event.data;
writeToScreen("onWsMessage接收到服务器的数据: ", jsonStr);
// writeToScreen("onWsMessage接收到服务器的数据: ", jsonStr);
this.messageCallback(jsonStr);
};
const onWsClose = (event) => {