Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

车间中间大屏显示

Browse Source
This commit is contained in:
ICEC
2020-07-17 14:44:17 +08:00
parent c85976385c
commit f777591f2a
2 changed files with 86 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
ruoyi-ui/src/views/fx_dashboard/dashboard_current_show.vue
View File

@ -30,13 +30,18 @@
</el-row> </el-row>
<el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;"> <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
<el-col :xs="24" :sm="11" :lg="11">
<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">
<div class="ibox "> <div class="ibox ">
<div class="ibox-title"> <div class="ibox-title">
<b>当班信息</b> <b>当班信息</b>
</div> </div>
<div class="ibox-content"> <div class="ibox-content">
<el-table <el-table
:data="tableDataCurrentGroup" :data="tableDataCurrentGroup"
stripe stripe
@ -50,17 +55,26 @@
prop="已完成箱数" prop="已完成箱数"
label="已完成箱数"> label="已完成箱数">
</el-table-column> </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>
<el-col :xs="24" :sm="1" :lg="1">
<h1></h1> <el-col :xs="24" :sm="24" :lg="24">
</el-col>
<el-col :xs="24" :sm="11" :lg="11">
<div class="ibox "> <div class="ibox ">
<div class="ibox-title"> <div class="ibox-title">
@ -99,6 +113,37 @@
</div> </div>
</el-col> </el-col>
</el-row> </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>
</div>
</el-col>
</el-row>
<el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;"> <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
@ -199,7 +244,12 @@
return { return {
tableData: [], tableData: [],
tableDataCurrentGroup: [], tableDataCurrentGroup: [],
tableDataLastGroup: [] tableDataLastGroup: [],
tableDataLastGroup2: [],
url: 'https://tfs.intco.cn:11288/filesever/MRP/PersonPhoto/M0647.jpg',
url2: 'https://tfs.intco.cn:11288/filesever/MRP/PersonPhoto/M1246.jpg'
} }
}, },
@ -218,6 +268,10 @@ this.Refresh()
},60000*10); //这就是 一分钟 },60000*10); //这就是 一分钟
}, },
getData() { getData() {
var d_zhenpin=0;
var d_midu=0;
var d_channeng=0;
getcurrent().then(response => { getcurrent().then(response => {
@ -294,6 +348,22 @@ this.Refresh()
option_energy_avg.series[0].data[0].value = (avg_energy_avg / data_ajax.length * 100).toFixed(0); 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); 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);
currentBoxAndGroupMonitor().then(response => {
for (var i = 0; i < response.data.length; i++) {
this.tableDataCurrentGroup.push({
已完成箱数: response.data[i].SUMBOX,
班长: response.data[i].NAME,
产能达标率: d_channeng+'%',
正品率: d_zhenpin+'%',
平均密度: d_midu,
})
}
})
}) })
getDensityGroup().then(response => { getDensityGroup().then(response => {
@ -304,6 +374,8 @@ this.Refresh()
} }
option_change_moulding_time.series[0].data[0].value = (avg_density / response.data.length).toFixed(3); option_change_moulding_time.series[0].data[0].value = (avg_density / response.data.length).toFixed(3);
chart_density.setOption(option_change_moulding_time, true); chart_density.setOption(option_change_moulding_time, true);
d_midu=(avg_density / response.data.length).toFixed(3);
}) })
@ -325,14 +397,7 @@ this.Refresh()
}) })
currentBoxAndGroupMonitor().then(response => {
for (var i = 0; i < response.data.length; i++) {
this.tableDataCurrentGroup.push({
已完成箱数: response.data[i].SUMBOX,
班长: response.data[i].NAME,
})
}
})
} }
} }

7
ruoyi/src/main/java/com/ruoyi/db/mssql/DB_Ajax_DashBoard_48102.java
View File

@ -253,7 +253,9 @@ public class DB_Ajax_DashBoard_48102 {
Connection conn = getSQLConnection(); Connection conn = getSQLConnection();
String sql = "SELECT\n" + String sql = "SELECT\n" +
"\t( SELECT SUM ( Quantity ) FROM MouldingDisplayBoardOperation WHERE deleted = 0 and OperateTime >= dbo.GetWorkShiftStartDate ( GETDATE( ) ) ) AS SUMBOX,\n" + "\t( SELECT SUM ( Quantity ) FROM MouldingDisplayBoardOperation WHERE deleted = 0 and OperateTime >= dbo.GetWorkShiftStartDate ( GETDATE( ) ) ) AS SUMBOX,\n" +
"\t( SELECT MAX ( OperatePersonName ) FROM MouldingDisplayBoardOperationPerson WHERE line = '班长#' AND OperateTime >= dbo.GetWorkShiftStartDate ( GETDATE( ) ) ) AS NAME"; "\t( SELECT MAX ( OperatePersonName ) FROM MouldingDisplayBoardOperationPerson WHERE line = '班长#' AND OperateTime >= dbo.GetWorkShiftStartDate ( GETDATE( ) ) ) AS NAME,"+
"\t( SELECT MAX ( OperatePersonCode ) FROM MouldingDisplayBoardOperationPerson WHERE line = '班长#' AND OperateTime >= dbo.GetWorkShiftStartDate ( GETDATE( ) ) ) AS PersonCode";
Statement stmt = conn.createStatement();// Statement stmt = conn.createStatement();//
@ -287,7 +289,8 @@ public class DB_Ajax_DashBoard_48102 {
"\t( SELECT AVG ( sum_box_meter / sum_device_meter * avg_currentcapacity / avg_normalcapacity ) FROM [V_chen_Dashboard_上个班组] ) AS capacity,\n" + "\t( SELECT AVG ( sum_box_meter / sum_device_meter * avg_currentcapacity / avg_normalcapacity ) FROM [V_chen_Dashboard_上个班组] ) AS capacity,\n" +
"\t( SELECT AVG ( sum_box_meter / sum_device_meter ) FROM [V_chen_Dashboard_上个班组] ) AS yield,\n" + "\t( SELECT AVG ( sum_box_meter / sum_device_meter ) FROM [V_chen_Dashboard_上个班组] ) AS yield,\n" +
"\t( SELECT SUM ( Quantity ) FROM MouldingDisplayBoardOperation WHERE deleted = 0 AND OperateTime > dbo.GetWorkShiftStartDate ( GETDATE( ) - 0.5 ) AND OperateTime < dbo.GetWorkShiftendDate ( GETDATE( ) - 0.5 ) ) AS SUMBOX,\n" + "\t( SELECT SUM ( Quantity ) FROM MouldingDisplayBoardOperation WHERE deleted = 0 AND OperateTime > dbo.GetWorkShiftStartDate ( GETDATE( ) - 0.5 ) AND OperateTime < dbo.GetWorkShiftendDate ( GETDATE( ) - 0.5 ) ) AS SUMBOX,\n" +
"\t( SELECT MAX ( OperatePersonName ) FROM MouldingDisplayBoardOperationPerson WHERE line = '班长#' AND OperateTime > dbo.GetWorkShiftStartDate ( GETDATE( ) - 0.5 ) AND OperateTime < dbo.GetWorkShiftendDate ( GETDATE( ) - 0.5 ) ) AS NAME"; "\t( SELECT MAX ( OperatePersonName ) FROM MouldingDisplayBoardOperationPerson WHERE line = '班长#' AND OperateTime > dbo.GetWorkShiftStartDate ( GETDATE( ) - 0.5 ) AND OperateTime < dbo.GetWorkShiftendDate ( GETDATE( ) - 0.5 ) ) AS NAME,\n" +
"\t\t( SELECT MAX ( OperatePersonCode ) FROM MouldingDisplayBoardOperationPerson WHERE line = '班长#' AND OperateTime > dbo.GetWorkShiftStartDate ( GETDATE( ) - 0.5 ) AND OperateTime < dbo.GetWorkShiftendDate ( GETDATE( ) - 0.5 ) ) AS PersonCode";
Statement stmt = conn.createStatement();// Statement stmt = conn.createStatement();//