From 02210703bcc691681870dedfe51dc5abcd8b15bc Mon Sep 17 00:00:00 2001
From: ICEC <414933307@qq.com>
Date: Fri, 17 Jul 2020 14:49:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E4=B8=AD=E9=97=B4=E5=A4=A7?=
=?UTF-8?q?=E5=B1=8F=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../fx_dashboard/dashboard_current_show.vue | 222 +++++++++---------
1 file changed, 108 insertions(+), 114 deletions(-)
diff --git a/ruoyi-ui/src/views/fx_dashboard/dashboard_current_show.vue b/ruoyi-ui/src/views/fx_dashboard/dashboard_current_show.vue
index 48d6504ab..96bc6d5bd 100644
--- a/ruoyi-ui/src/views/fx_dashboard/dashboard_current_show.vue
+++ b/ruoyi-ui/src/views/fx_dashboard/dashboard_current_show.vue
@@ -31,118 +31,114 @@
<el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
- <el-col :xs="24" :sm="12" :lg="12">
+ <el-col :xs="24" :sm="12" :lg="12">
- <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
- <el-col :xs="24" :sm="24" :lg="24">
+ <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
+ <el-col :xs="24" :sm="24" :lg="24">
- <div class="ibox ">
- <div class="ibox-title">
- <b>当班信息</b>
- </div>
- <div class="ibox-content">
+ <div class="ibox ">
+ <div class="ibox-title">
+ <b>当班信息</b>
+ </div>
+ <div class="ibox-content">
- <el-table
- :data="tableDataCurrentGroup"
- stripe
- border
- style="width: 100%">
- <el-table-column
- prop="班长"
- label="班长">
- </el-table-column>
- <el-table-column
- prop="已完成箱数"
- label="已完成箱数">
- </el-table-column>
- <el-table-column
- prop="正品率"
- label="正品率">
- </el-table-column>
- <el-table-column
- prop="产能达标率"
- label="产能达标率">
- </el-table-column>
- <el-table-column
- prop="平均密度"
- label="平均密度">
- </el-table-column>
+ <el-table
+ :data="tableDataCurrentGroup"
+ stripe
+ border
+ style="width: 100%">
+ <el-table-column
+ prop="班长"
+ label="班长">
+ </el-table-column>
+ <el-table-column
+ prop="已完成箱数"
+ label="已完成箱数">
+ </el-table-column>
+ <el-table-column
+ prop="正品率"
+ label="正品率">
+ </el-table-column>
+ <el-table-column
+ prop="产能达标率"
+ label="产能达标率">
+ </el-table-column>
+ <el-table-column
+ prop="平均密度"
+ label="平均密度">
+ </el-table-column>
- </el-table>
+ </el-table>
- </div>
- </div>
+ </div>
+ </div>
+ </el-col>
+
+ <el-col :xs="24" :sm="24" :lg="24">
+
+ <div class="ibox ">
+ <div class="ibox-title">
+ <b>上个班组汇总 </b>
+ </div>
+ <div class="ibox-content">
+ <el-table
+ :data="tableDataLastGroup"
+ stripe
+ border
+ style="width: 100%">
+ <el-table-column
+ prop="班长"
+ label="班长">
+ </el-table-column>
+ <el-table-column
+ prop="已完成箱数"
+ label="完成箱数">
+ </el-table-column>
+ <el-table-column
+ prop="正品率"
+ label="正品率">
+ </el-table-column>
+ <el-table-column
+ prop="产能达标率"
+ label="产能达标率">
+ </el-table-column>
+ <el-table-column
+ prop="平均密度"
+ label="平均密度">
+ </el-table-column>
+
+
+ </el-table>
+ </div>
+ </div>
+ </el-col>
+ </el-row>
</el-col>
- <el-col :xs="24" :sm="24" :lg="24">
-
- <div class="ibox ">
- <div class="ibox-title">
- <b>上个班组汇总 </b>
- </div>
- <div class="ibox-content">
- <el-table
- :data="tableDataLastGroup"
- stripe
- border
- style="width: 100%">
- <el-table-column
- prop="班长"
- label="班长">
- </el-table-column>
- <el-table-column
- prop="已完成箱数"
- label="完成箱数">
- </el-table-column>
- <el-table-column
- prop="正品率"
- label="正品率">
- </el-table-column>
- <el-table-column
- prop="产能达标率"
- label="产能达标率">
- </el-table-column>
- <el-table-column
- prop="平均密度"
- label="平均密度">
- </el-table-column>
-
-
- </el-table>
- </div>
- </div>
- </el-col>
- </el-row>
- </el-col>
-
- <el-col :xs="24" :sm="6" :lg="6">
-
-
- <div class="ibox">
- <el-image
- :align="center"
- style="width: 180px; height: 180px"
- :src="url"
- :fit=fill>
- </el-image> <h2 style="margin-top: 0px;">B班班长-陈亮</h2>
- </div>
-
- </el-col>
-
-
<el-col :xs="24" :sm="6" :lg="6">
-
-
<div class="ibox">
<el-image
:align="center"
style="width: 180px; height: 180px"
:src="url2"
:fit=fill>
- </el-image> <h2 style="margin-top: 0px;">A班班长-陈忠维</h2>
+ </el-image>
+ <h2 style="margin-top: 0px;">A班班长-陈忠维</h2>
</div>
-
</el-col>
+ <el-col :xs="24" :sm="6" :lg="6">
+ <div class="ibox">
+ <el-image
+ :align="center"
+ style="width: 180px; height: 180px"
+ :src="url"
+ :fit=fill>
+ </el-image>
+ <h2 style="margin-top: 0px;">B班班长-陈亮</h2>
+ </div>
+ </el-col>
+
+
</el-row>
@@ -228,7 +224,7 @@
require('echarts/theme/macarons') // echarts theme
import resize from '../dashboard/mixins/resize'
- import {getcurrent,DoGetLastGroupReporterData,currentBoxAndGroupMonitor} from '@/api/dashboard/fxdashboard'
+ import {getcurrent, DoGetLastGroupReporterData, currentBoxAndGroupMonitor} from '@/api/dashboard/fxdashboard'
import {getDensityGroup} from '@/api/dashboard/density'
@@ -259,19 +255,18 @@
},
mounted() {
-this.Refresh()
+ this.Refresh()
},
methods: {
- Refresh(){
- setTimeout(function(){
+ Refresh() {
+ setTimeout(function () {
window.location.reload(true);
- },60000*10); //这就是 一分钟
+ }, 60000 * 10); //这就是 一分钟
},
getData() {
- var d_zhenpin=0;
- var d_midu=0;
- var d_channeng=0;
-
+ var d_zhenpin = 0;
+ var d_midu = 0;
+ var d_channeng = 0;
getcurrent().then(response => {
@@ -348,8 +343,8 @@ this.Refresh()
option_energy_avg.series[0].data[0].value = (avg_energy_avg / data_ajax.length * 100).toFixed(0);
chart_energy_avg.setOption(option_energy_avg, true);
- d_zhenpin=(avg_zhengpin_avg / k * 100).toFixed(0);
- d_channeng=(avg_energy_avg / data_ajax.length * 100).toFixed(0);
+ d_zhenpin = (avg_zhengpin_avg / k * 100).toFixed(0);
+ d_channeng = (avg_energy_avg / data_ajax.length * 100).toFixed(0);
currentBoxAndGroupMonitor().then(response => {
@@ -357,8 +352,8 @@ this.Refresh()
this.tableDataCurrentGroup.push({
已完成箱数: response.data[i].SUMBOX,
班长: response.data[i].NAME,
- 产能达标率: d_channeng+'%',
- 正品率: d_zhenpin+'%',
+ 产能达标率: d_channeng + '%',
+ 正品率: d_zhenpin + '%',
平均密度: d_midu,
})
}
@@ -374,7 +369,7 @@ this.Refresh()
}
option_change_moulding_time.series[0].data[0].value = (avg_density / response.data.length).toFixed(3);
chart_density.setOption(option_change_moulding_time, true);
- d_midu=(avg_density / response.data.length).toFixed(3);
+ d_midu = (avg_density / response.data.length).toFixed(3);
})
@@ -386,9 +381,9 @@ this.Refresh()
this.tableDataLastGroup.push({
- 产能达标率: ((response.data[i].capacity)*1).toFixed(2)*100 + '%',
- 正品率: ((response.data[i].yield)*1).toFixed(2)*100 + '%',
- 平均密度: ((response.data[i].avg_density)*1).toFixed(2),
+ 产能达标率: ((response.data[i].capacity) * 1).toFixed(2) * 100 + '%',
+ 正品率: ((response.data[i].yield) * 1).toFixed(2) * 100 + '%',
+ 平均密度: ((response.data[i].avg_density) * 1).toFixed(2),
已完成箱数: response.data[i].SUMBOX,
班长: response.data[i].NAME,
@@ -397,7 +392,6 @@ this.Refresh()
})
-
}
}