diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/IntelligentRefrigeratorInterconnectionFactoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/IntelligentRefrigeratorInterconnectionFactoryController.java new file mode 100644 index 0000000..4672f87 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/IntelligentRefrigeratorInterconnectionFactoryController.java @@ -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"; + } + + +} diff --git a/ruoyi-admin/src/main/resources/static/css/board/beforeLibrary.css b/ruoyi-admin/src/main/resources/static/css/board/beforeLibrary.css index f628300..58591c9 100644 --- a/ruoyi-admin/src/main/resources/static/css/board/beforeLibrary.css +++ b/ruoyi-admin/src/main/resources/static/css/board/beforeLibrary.css @@ -26,6 +26,14 @@ body { left: 35%; } +.statisticOfAttribute{ + position: absolute; + width: 30%; + height: 21%; + top: 15%; + left: 66.5%; +} + .FinishedGoodsWarehousingStatisticsByHour{ position: absolute; width: 93%; diff --git a/ruoyi-admin/src/main/resources/static/css/board/intelligentRefrigeratorInterconnectionFactory.css b/ruoyi-admin/src/main/resources/static/css/board/intelligentRefrigeratorInterconnectionFactory.css new file mode 100644 index 0000000..f8f4de3 --- /dev/null +++ b/ruoyi-admin/src/main/resources/static/css/board/intelligentRefrigeratorInterconnectionFactory.css @@ -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%; +} \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/backgroundImg.jpg b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/backgroundImg.jpg new file mode 100644 index 0000000..fbd9693 Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/backgroundImg.jpg differ diff --git a/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/btnOne.png b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/btnOne.png new file mode 100644 index 0000000..fed4805 Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/btnOne.png differ diff --git a/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/btnOneClick.png b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/btnOneClick.png new file mode 100644 index 0000000..70db3c1 Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/btnOneClick.png differ diff --git a/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/btnTwo.png b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/btnTwo.png new file mode 100644 index 0000000..92dee69 Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/btnTwo.png differ diff --git a/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/btnTwoClick.png b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/btnTwoClick.png new file mode 100644 index 0000000..f5a9c82 Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/btnTwoClick.png differ diff --git a/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/info.png b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/info.png new file mode 100644 index 0000000..60b8a12 Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/info.png differ diff --git a/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/layerOne.png b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/layerOne.png new file mode 100644 index 0000000..437d98d Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/layerOne.png differ diff --git a/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/layerTwo.png b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/layerTwo.png new file mode 100644 index 0000000..aa5d59f Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/layerTwo.png differ diff --git a/ruoyi-admin/src/main/resources/static/js/board/beforeLibrary.js b/ruoyi-admin/src/main/resources/static/js/board/beforeLibrary.js index 797daa3..7c1a057 100644 --- a/ruoyi-admin/src/main/resources/static/js/board/beforeLibrary.js +++ b/ruoyi-admin/src/main/resources/static/js/board/beforeLibrary.js @@ -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 = ` - 订单详情 - 当日订单数量达成率 - 质量统计 - 成品入库统计 - 成品质量详情 - 产线不良类型分布 + 泡前库数据展示平台 + 订单详情 + 当日订单数量达成率 + 质量统计 + 成品入库统计 + 成品质量详情 + 产线不良类型分布 ` $('body').append(html) } diff --git a/ruoyi-admin/src/main/resources/static/js/board/finalAssemblyProductionData.js b/ruoyi-admin/src/main/resources/static/js/board/finalAssemblyProductionData.js index 751e3d1..fc22a06 100644 --- a/ruoyi-admin/src/main/resources/static/js/board/finalAssemblyProductionData.js +++ b/ruoyi-admin/src/main/resources/static/js/board/finalAssemblyProductionData.js @@ -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)) }) -}) \ No newline at end of file +}) +const LOSS = () => { + const html = ` + 123.32 + 123秒 + ` + $('body').append(html) +} +const moduleTitle = () => { + const html = ` + 总装生产数据及质量数据 + 产量 + 一次装配不合格率 + LOSS分类 + 追踪事件 + ` + $('body').append(html) +} \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/static/js/board/intelligentRefrigeratorInterconnectionFactory.js b/ruoyi-admin/src/main/resources/static/js/board/intelligentRefrigeratorInterconnectionFactory.js new file mode 100644 index 0000000..9299896 --- /dev/null +++ b/ruoyi-admin/src/main/resources/static/js/board/intelligentRefrigeratorInterconnectionFactory.js @@ -0,0 +1,12 @@ +$(() => { + moduleTitle() + // 公共请求地址 + let url = '/broad/box' + +}) +const moduleTitle = () => { + const html = ` + 智能冷柜互联工厂 + ` + $('body').append(html) +} \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/static/js/echartsCommon.js b/ruoyi-admin/src/main/resources/static/js/echartsCommon.js index 6708236..0f810bf 100644 --- a/ruoyi-admin/src/main/resources/static/js/echartsCommon.js +++ b/ruoyi-admin/src/main/resources/static/js/echartsCommon.js @@ -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, }, }, diff --git a/ruoyi-admin/src/main/resources/templates/broad/beforeLibrary.html b/ruoyi-admin/src/main/resources/templates/broad/beforeLibrary.html index be70df2..876f9ff 100644 --- a/ruoyi-admin/src/main/resources/templates/broad/beforeLibrary.html +++ b/ruoyi-admin/src/main/resources/templates/broad/beforeLibrary.html @@ -34,9 +34,12 @@
-
+
+
+ +
diff --git a/ruoyi-admin/src/main/resources/templates/broad/finalAssemblyProductionData.html b/ruoyi-admin/src/main/resources/templates/broad/finalAssemblyProductionData.html index 35f9ebc..8c6c570 100644 --- a/ruoyi-admin/src/main/resources/templates/broad/finalAssemblyProductionData.html +++ b/ruoyi-admin/src/main/resources/templates/broad/finalAssemblyProductionData.html @@ -31,7 +31,8 @@
-
+
diff --git a/ruoyi-admin/src/main/resources/templates/broad/intelligentRefrigeratorInterconnectionFactory.html b/ruoyi-admin/src/main/resources/templates/broad/intelligentRefrigeratorInterconnectionFactory.html new file mode 100644 index 0000000..adaa8aa --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/broad/intelligentRefrigeratorInterconnectionFactory.html @@ -0,0 +1,38 @@ + + + + + + 箱壳成型数据监控平台 + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + +