Merge remote-tracking branch 'gitee/master'

master
wangh 4 years ago
commit 54c6606771

@ -0,0 +1,35 @@
package com.ruoyi.web.controller.broad;
import com.alibaba.fastjson.JSONArray;
import com.ruoyi.system.domain.BoxOutput;
import com.ruoyi.system.domain.OrderInfo;
import com.ruoyi.system.domain.QualityInfo;
import com.ruoyi.system.service.IBroadDataService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.List;
/**
*
*/
@Controller
@RequestMapping("/broad/intelligentRefrigeratorInterconnectionFactory")
@ApiOperation("泡前库")
public class IntelligentRefrigeratorInterconnectionFactoryController {
@Autowired
private IBroadDataService service;
@GetMapping()
public String box() {
return "broad/intelligentRefrigeratorInterconnectionFactory";
}
}

@ -26,6 +26,14 @@ body {
left: 35%;
}
.statisticOfAttribute{
position: absolute;
width: 30%;
height: 21%;
top: 15%;
left: 66.5%;
}
.FinishedGoodsWarehousingStatisticsByHour{
position: absolute;
width: 93%;

@ -0,0 +1,30 @@
body {
height: auto;
width: auto;
background: url(../../img/board/intelligentRefrigeratorInterconnectionFactory/backgroundImg.jpg) no-repeat center fixed;
-webkit-background-size: cover;
-moz-background-size: cover;
-o-background-size: cover;
background-size: 100% 100%;
color: rgba(255, 255, 255, .95);
font: normal 100% Arial, sans-serif;
}
.btnOne {
background-image: url(../../img/board/intelligentRefrigeratorInterconnectionFactory/btnOne.png);
background-size: 100% 100%;
position: absolute;
width: 7.6%;
height: 8.5%;
top: 89.1%;
left: 36.1%;
}
.btnTwo {
background-image: url(../../img/board/intelligentRefrigeratorInterconnectionFactory/btnTwo.png);
background-size: 100% 100%;
position: absolute;
width: 7.6%;
height: 8.5%;
top: 89.1%;
left: 56.2%;
}

@ -3,27 +3,11 @@ $(() => {
// 公共请求地址
let url = '/broad/beforeLibrary'
// 表格头
const planWorkOrderColumns = [
"编号", "计划数量", "完成数量", "差异值", "时间",
]
// 订单详情
const orderDetailsTable = new AutoScrollTable(document.getElementById("orderDetails"), ["编号", "计划数量", "完成数量", "差异值", "时间",], {width: ['30%', null, null, null, '17%']})
// 成品入库统计
const PropertyInsuranceOneDayOrderInfoTable = new AutoScrollTable(document.getElementById("PropertyInsuranceOneDayOrderInfo"), [
"物料条码", "检测项", "质量缺陷", "标志", "时间",
], {width: ['30%', null, null, null, '17%']})
// 当日订单数量达成率
horizontalRoundedBarChartWithBackground(null, document.getElementById("orderQuantityFulfillmentRateOfTheDay"));
// 质量统计
barChartAndLineChart(null, document.getElementById("FinishedGoodsWarehousingStatisticsByHour"));
// 产线不良类型分布
pieChart(null, document.getElementById("distributionOfBadTypesInProductionLineByDay"));
// 成品质量详情
const PropertyInsuranceOneDayOrderInfoTable = new AutoScrollTable(document.getElementById("PropertyInsuranceOneDayOrderInfo"), ["物料条码", "检测项", "质量缺陷", "标志", "时间"], {width: ['30%', null, null, null, '17%']})
//订单详情轮询 + 当日订单数量达成率轮询
autoUpdate(url + "/selectOrderInfo ", INTERVAL, data => {
@ -34,7 +18,8 @@ $(() => {
xDataName: "达成率",
}, document.getElementById("orderQuantityFulfillmentRateOfTheDay"))
})
//质量统计轮询
//成品入库统计轮询
autoUpdate(url + "/selectProductInStore ", INTERVAL, data => {
barChartAndLineChart({
xName: data.map(value => value.name),
@ -42,31 +27,41 @@ $(() => {
yDataTwoName: "成品数量",
}, document.getElementById("FinishedGoodsWarehousingStatisticsByHour"));
})
//成品入库统计轮询
//成品质量详情轮询
autoUpdate(url + "/selectQualityInfo ", INTERVAL, data => {
PropertyInsuranceOneDayOrderInfoTable.loadData(data.map(value => [value.code, value.item, value.qa, value.state, value.day]), Object.keys(planWorkOrderColumns))
})
//产线不良类型分布轮询
//产线不良类型分布 + 质量统计轮询
autoUpdate(url + "/selectQualityItem ", INTERVAL, data => {
let params = data.map(val => {
return{
name:val.name,
value:val.qty
pieChart(data.map(val => {
return {
name: val.name,
value: val.qty
}
})
pieChart(params, document.getElementById("distributionOfBadTypesInProductionLineByDay"));
}), document.getElementById("distributionOfBadTypesInProductionLineByDay"));
barChartAndLineChart(data.map(val => {
return {
xName: val.name,
yDataTwo: val.qty,
yDataTwoName: "质量",
}
}), document.getElementById("FinishedGoodsWarehousingStatisticsByHour"));
})
})
const moduleTitle = () => {
const html = `
<span style="position: absolute;top: 9.6%;left: 5.5%;color: #CFD2D0;font-size: 1.3vw">订单详情</span>
<span style="position: absolute;top: 9.6%;left: 37%;color: #CFD2D0;font-size: 1.3vw">当日订单数量达成率</span>
<span style="position: absolute;top: 9.6%;left: 68.5%;color: #CFD2D0;font-size: 1.3vw">质量统计</span>
<span style="position: absolute;top: 39%;left: 5.5%;color: #CFD2D0;font-size: 1.3vw">成品入库统计</span>
<span style="position: absolute;top: 69%;left: 5.5%;color: #CFD2D0;font-size: 1.3vw">成品质量详情</span>
<span style="position: absolute;top: 69%;left: 68.6%;color: #CFD2D0;font-size: 1.3vw">产线不良类型分布</span>
<span style="position: absolute;top: 0%;left: 50%;color: #CFD2D0;font-size: 2vw;transform: translateX(-50%)">泡前库数据展示平台</span>
<span style="position: absolute;top: 10%;left: 5.5%;color: #CFD2D0;font-size: 1.0vw">订单详情</span>
<span style="position: absolute;top: 10%;left: 37%;color: #CFD2D0;font-size: 1.0vw">当日订单数量达成率</span>
<span style="position: absolute;top: 10%;left: 68.5%;color: #CFD2D0;font-size: 1.0vw">质量统计</span>
<span style="position: absolute;top: 40%;left: 5.5%;color: #CFD2D0;font-size: 1.0vw">成品入库统计</span>
<span style="position: absolute;top: 69.5%;left: 5.5%;color: #CFD2D0;font-size: 1.0vw">成品质量详情</span>
<span style="position: absolute;top: 69.5%;left: 68.6%;color: #CFD2D0;font-size: 1.0vw">产线不良类型分布</span>
`
$('body').append(html)
}

@ -1,5 +1,6 @@
$(() => {
moduleTitle()
LOSS()
// 公共请求地址
let url = '/broad/box'
@ -25,4 +26,21 @@ $(() => {
autoUpdate(url+"/getProductPlanInfo ", INTERVAL, data => {
orderDetailsTable.loadData(data.map(value => [value.plan_code, value.plan_number, value.actual_number, value.plan_number-value.actual_number, value.day]), Object.keys(planWorkOrderColumns))
})
})
})
const LOSS = () => {
const html = `
<span style="position: absolute;top: 13%;left: 66.5%;color: #CFD2D0;font-size: 2vw;transform: translateX(-50%)">123.32</span>
<span style="position: absolute;top: 12.5%;left: 90%;color: #CFD2D0;font-size: 2vw;transform: translateX(-50%)">123</span>
`
$('body').append(html)
}
const moduleTitle = () => {
const html = `
<span style="position: absolute;top: 0%;left: 50%;color: #CFD2D0;font-size: 2vw;transform: translateX(-50%)">总装生产数据及质量数据</span>
<span style="position: absolute;top: 10%;left: 5.5%;color: #CFD2D0;font-size: 1.0vw">产量</span>
<span style="position: absolute;top: 54.3%;left: 5.5%;color: #CFD2D0;font-size: 1.0vw">一次装配不合格率</span>
<span style="position: absolute;top: 24.8%;left: 53%;color: #CFD2D0;font-size: 1.0vw">LOSS分类</span>
<span style="position: absolute;top: 54.3%;left: 53%;color: #CFD2D0;font-size: 1.0vw">追踪事件</span>
`
$('body').append(html)
}

@ -0,0 +1,12 @@
$(() => {
moduleTitle()
// 公共请求地址
let url = '/broad/box'
})
const moduleTitle = () => {
const html = `
<span style="position: absolute;top: 0%;left: 50%;color: #CFD2D0;font-size: 2vw;transform: translateX(-50%)">智能冷柜互联工厂</span>
`
$('body').append(html)
}

@ -120,20 +120,20 @@ const horizontalRoundedBarChartWithBackground = function (data, id) {
},
],
};
if (data.xData?.length >= 3) {
option.dataZoom.push({
show: true,
type: 'slider',
yAxisIndex: 0,
width: 0.75 * vw,
start: 0,
end: 1 / (data.xData.length / 4) * 100,
textStyle: {
fontSize: 0,
color: 'rgba(0,0,0,0)'
}
})
}
// if (data.xData?.length >= 3) {
// option.dataZoom.push({
// show: true,
// type: 'slider',
// yAxisIndex: 0,
// width: 0.75 * vw,
// start: 0,
// end: 1 / (data.xData.length / 4) * 100,
// textStyle: {
// fontSize: 0,
// color: 'rgba(0,0,0,0)'
// }
// })
// }
charts.setOption(option);
$(window).resize(charts.resize);
}
@ -386,7 +386,7 @@ const pieChart = function (data, id) {
roseType: "radius",
label: {
normal: {
formatter: ["{c|{c}次}", "{b|{b}}"].join("\n"),
formatter: "{b|{b}} {c|{c}次}",
rich: {
c: {
color: "rgb(241,246,104)",
@ -412,7 +412,7 @@ const pieChart = function (data, id) {
color: "rgb(98,137,169)",
},
smooth: true,
length: 5,
length: 0,
length2: 10,
},
},

@ -34,9 +34,12 @@
<div class="orderQuantityFulfillmentRateOfTheDay" id="orderQuantityFulfillmentRateOfTheDay"></div>
<!--质量统计-->
<div class="FinishedGoodsWarehousingStatisticsByHour" id="FinishedGoodsWarehousingStatisticsByHour"></div>
<div class="statisticOfAttribute" id="statisticOfAttribute"></div>
<!--成品入库统计-->
<div class="FinishedGoodsWarehousingStatisticsByHour" id="FinishedGoodsWarehousingStatisticsByHour"></div>
<!--成品质量详情-->
<div class="PropertyInsuranceOneDayOrderInfo" id="PropertyInsuranceOneDayOrderInfo"></div>
<!--产线不良类型分布-->

@ -31,7 +31,8 @@
<div class="yield" id="yield"></div>
<!--LOSS(分类)-->
<div class="LOSSClassify" id="LOSSClassify"></div>
<div class="
" id="LOSSClassify"></div>
<!--一次装配不合格率-->
<div class="fractionDefective" id="fractionDefective"></div>

@ -0,0 +1,38 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="UTF-8">
<meta content="width=device-width,initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0,user-scalable=no"
name="viewport">
<title>箱壳成型数据监控平台</title>
<meta content="箱壳成型数据监控平台" name="description">
<link href="../../static/css/board/intelligentRefrigeratorInterconnectionFactory.css" rel="stylesheet" th:href="@{/css/board/intelligentRefrigeratorInterconnectionFactory.css}"/>
<link href="../../static/css/materialdesignicons.min.css" rel="stylesheet"
th:href="@{/css/materialdesignicons.min.css}"/>
<link href="../../static/css/autoscroll-table.css" rel="stylesheet" th:href="@{/css/autoscroll-table.css}">
<!-- 360浏览器急速模式 -->
<meta content="webkit" name="renderer">
<!-- 避免IE使用兼容模式 -->
<meta content="IE=edge" http-equiv="X-UA-Compatible">
<script src="../../static/js/jquery.min.js" th:src="@{/js/jquery.min.js}"></script>
<th:block th:include="include :: footer"/>
<th:block th:include="include :: echarts-js"/>
<script src="../../static/js/date-time-common.js" th:src="@{/js/date-time-common.js}"></script>
<script src="../../static/js/autoscroll-table.js" th:src="@{/js/autoscroll-table.js}"></script>
<script src="../../static/js/echartsCommon.js" th:src="@{/js/echartsCommon.js}"></script>
<script src="../../static/js/update-split-blocks.js" th:src="@{/js/update-split-blocks.js}"></script>
<script src="../../static/js/auto-update.js" th:src="@{/js/auto-update.js}"></script>
<script src="../../static/js/data-merger.js" th:src="@{/js/data-merger.js}"></script>
</head>
<body style="display:flex;">
<!--按钮一-->
<div class="btnOne" id="btnOne"></div>
<!--按钮二-->
<div class="btnTwo" id="btnTwo"></div>
</body>
<script src="../../static/js/board/intelligentRefrigeratorInterconnectionFactory.js" th:src="@{/js/board/intelligentRefrigeratorInterconnectionFactory.js}"></script>
<script>
</script>
</html>
Loading…
Cancel
Save