From 25c75703a84a46fc480a695f0ce1a9ee51a8c23d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com> Date: Fri, 15 Jul 2022 16:36:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E8=AF=B7?= =?UTF-8?q?=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...gentRefrigeratorInterconnectionFactory.css | 8 +- ...igentRefrigeratorInterconnectionFactory.js | 8 +- .../main/resources/static/js/echartsCommon.js | 76 +++++++++---------- .../main/resources/templates/broad/box.html | 8 +- 4 files changed, 50 insertions(+), 50 deletions(-) diff --git a/ruoyi-admin/src/main/resources/static/css/board/intelligentRefrigeratorInterconnectionFactory.css b/ruoyi-admin/src/main/resources/static/css/board/intelligentRefrigeratorInterconnectionFactory.css index daa9394..caf233b 100644 --- a/ruoyi-admin/src/main/resources/static/css/board/intelligentRefrigeratorInterconnectionFactory.css +++ b/ruoyi-admin/src/main/resources/static/css/board/intelligentRefrigeratorInterconnectionFactory.css @@ -52,8 +52,8 @@ body { background-image: url(../../img/board/intelligentRefrigeratorInterconnectionFactory/info.png); background-size: 100% 100%; position: absolute; - width: 17.6%; - height: 15.2%; + width: 14.8%; + height: 17%; top: 8.6%; left: 80.7%; } @@ -70,8 +70,8 @@ body { background-image: url(../../img/board/intelligentRefrigeratorInterconnectionFactory/info.png); background-size: 100% 100%; position: absolute; - width: 14.8%; - height: 17%; + width: 17.6%; + height: 15.2%; top: 5.2%; left: 0.7%; } \ 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 index 8be726d..6f69218 100644 --- a/ruoyi-admin/src/main/resources/static/js/board/intelligentRefrigeratorInterconnectionFactory.js +++ b/ruoyi-admin/src/main/resources/static/js/board/intelligentRefrigeratorInterconnectionFactory.js @@ -32,9 +32,7 @@ const moduleTitle = () => { } const infoOne = () => { const html = ` - 世界领先的个性化大规模定制冷柜智能工厂 - 世界领先的使用机器人最多的冷柜智能工厂 - 世界领先的人均效率最高的冷柜智能化工厂 + 工厂拥有8条智能化生产线、36台机器人，采用MES系统，可同时实现8个系列208种产品的自动混合生产，单班定员162人，日产能4200台，人均每日13台，人均效率是原工厂的2.2倍。通过与O2O销售平台、TMS系统的连接实现用户的个性化定制 ` $('#infoOne').append(html) } @@ -46,7 +44,9 @@ const infoTwo = () => { } const infoThree = () => { const html = ` - 工厂拥有8条智能化生产线、36台机器人，采用MES系统，可同时实现8个系列208种产品的自动混合生产，单班定员162人，日产能4200台，人均每日13台，人均效率是原工厂的2.2倍。通过与O2O销售平台、TMS系统的连接实现用户的个性化定制 + 世界领先的个性化大规模定制冷柜智能工厂 + 世界领先的使用机器人最多的冷柜智能工厂 + 世界领先的人均效率最高的冷柜智能化工厂 ` $('#infoThree').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 b16d586..ea83dcf 100644 --- a/ruoyi-admin/src/main/resources/static/js/echartsCommon.js +++ b/ruoyi-admin/src/main/resources/static/js/echartsCommon.js @@ -1887,24 +1887,7 @@ const multipleVerticalBarChart = function (data, id) { show: true, position: "top", textStyle: { - color: { - x: 0, - y: 0, - x2: 0, - y2: 1, - type: 'linear', - global: false, - colorStops: [ - { - offset: 0, - color: 'rgb(21, 148, 244)', - }, - { - offset: 1, - color: 'rgb(13, 48, 243)', - }, - ], - }, + color: "#a8aab0", fontStyle: "normal", fontFamily: "微软雅黑", fontSize: 0.75 * vw, @@ -1915,7 +1898,24 @@ const multipleVerticalBarChart = function (data, id) { //图形样式 normal: { barBorderRadius: [5, 5, 0, 0], - color: "rgba(127, 128, 225, 0.7)" + color: { + x: 0, + y: 0, + x2: 0, + y2: 1, + type: 'linear', + global: false, + colorStops: [ + { + offset: 0, + color: 'rgb(21, 148, 244)', + }, + { + offset: 1, + color: 'rgb(13, 48, 243)', + }, + ], + }, }, }, }, @@ -1931,24 +1931,7 @@ const multipleVerticalBarChart = function (data, id) { show: true, position: "top", textStyle: { - color: { - x: 0, - y: 0, - x2: 0, - y2: 1, - type: 'linear', - global: false, - colorStops: [ - { - offset: 0, - color: '#0DCEB1', - }, - { - offset: 1, - color: '#14A15A', - }, - ], - }, + color: "#a8aab0", fontStyle: "normal", fontFamily: "微软雅黑", fontSize: 0.75 * vw, @@ -1959,7 +1942,24 @@ const multipleVerticalBarChart = function (data, id) { //图形样式 normal: { barBorderRadius: [5, 5, 0, 0], - color: "rgba(226, 99, 74, 0.7)", + color: { + x: 0, + y: 0, + x2: 0, + y2: 1, + type: 'linear', + global: false, + colorStops: [ + { + offset: 0, + color: '#0DCEB1', + }, + { + offset: 1, + color: '#14A15A', + }, + ], + }, }, }, }, diff --git a/ruoyi-admin/src/main/resources/templates/broad/box.html b/ruoyi-admin/src/main/resources/templates/broad/box.html index 9e50764..5020f39 100644 --- a/ruoyi-admin/src/main/resources/templates/broad/box.html +++ b/ruoyi-admin/src/main/resources/templates/broad/box.html @@ -355,7 +355,7 @@ const planWorkOrderColumns = [ "序号", "型号","计划数量", "完成数量", "完成率", "时间", ] - const planWorkOrderTable = new AutoScrollTable(document.getElementById("plan-work-order"), planWorkOrderColumns, {width: ['10%','30%', null, null, null, '17%']}) + const planWorkOrderTable = new AutoScrollTable(document.getElementById("plan-work-order"), planWorkOrderColumns, {width: ['10%','30%', '13%', '13%', '13%', '20%']}) // const planTable = new AutoScrollTable(document.getElementById("plan-table"), [], { // width: ['15%', '5%', null, null, null, null, null, null, null, null, null, null, null, null, null, null, "5%", "5%", "5%"], // caption: "生产计划统计", @@ -390,7 +390,7 @@ let url = '/broad/box' //生产计划工单 autoUpdate(url+"/getProductPlanInfo ", INTERVAL, data => { - planWorkOrderTable.loadData(data.map((value,index) => [index,value.plan_code, value.plan_number, value.actual_number, value.rate, value.day]), Object.keys(planWorkOrderColumns)) + planWorkOrderTable.loadData(data.map((value,index) => [index+1,value.plan_name, value.plan_number, value.actual_number, value.rate, value.day]), Object.keys(planWorkOrderColumns)) }) autoUpdate(url + '/selectStock/S001', INTERVAL, data => { @@ -474,7 +474,7 @@ /*班组统计*/ autoUpdate('/broad/box/planCompletion', INTERVAL, data => { - updateSplitBlocks(data.plan_shift, shiftBlocks) + // updateSplitBlocks(data.plan_shift, shiftBlocks) updateSplitBlocks(data.planned_number, planBlocks) updateSplitBlocks(data.quantity_number, actualBlocks) updateSplitBlocks(data.planned_number - data.quantity_number, deltaBlocks) @@ -870,7 +870,7 @@ function resize() { planWorkOrderTable.resize() inventoryStocking.resize() - planTable.resize() + // planTable.resize() statByType.resize() statByHour.resize() }