From 5fe4e659f0f94cca679109d4826e412292c8df4c 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:22:33 +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 | 28 +++- ...igentRefrigeratorInterconnectionFactory.js | 25 +++- .../main/resources/static/js/echartsCommon.js | 124 +++++++++++------- .../main/resources/templates/broad/box.html | 27 ++-- .../main/resources/templates/broad/fp.html | 51 ++++++- ...entRefrigeratorInterconnectionFactory.html | 4 +- 6 files changed, 186 insertions(+), 73 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 c67e78d..daa9394 100644 --- a/ruoyi-admin/src/main/resources/static/css/board/intelligentRefrigeratorInterconnectionFactory.css +++ b/ruoyi-admin/src/main/resources/static/css/board/intelligentRefrigeratorInterconnectionFactory.css @@ -11,7 +11,7 @@ body { } .btnOne { - background-image: url(../../img/board/intelligentRefrigeratorInterconnectionFactory/btnOneClick.png); + background-image: url(../../img/board/intelligentRefrigeratorInterconnectionFactory/btnOne.png); background-size: 100% 100%; position: absolute; width: 7.6%; @@ -20,7 +20,7 @@ body { left: 36.1%; } .btnTwo { - background-image: url(../../img/board/intelligentRefrigeratorInterconnectionFactory/btnTwo.png); + background-image: url(../../img/board/intelligentRefrigeratorInterconnectionFactory/btnTwoClick.png); background-size: 100% 100%; position: absolute; width: 7.6%; @@ -36,7 +36,7 @@ body { height: 65.2%; top: 20.1%; left: 4.3%; - display: block; + display: none; } .layerTwo{ background-image: url(../../img/board/intelligentRefrigeratorInterconnectionFactory/layerTwo.png); @@ -46,9 +46,9 @@ body { height: 72.6%; top: 13%; left: 0.7%; - display: none; + display: block; } -.info{ +.infoOne{ background-image: url(../../img/board/intelligentRefrigeratorInterconnectionFactory/info.png); background-size: 100% 100%; position: absolute; @@ -56,4 +56,22 @@ body { height: 15.2%; top: 8.6%; left: 80.7%; +} +.infoTwo{ + background-image: url(../../img/board/intelligentRefrigeratorInterconnectionFactory/info.png); + background-size: 100% 100%; + position: absolute; + width: 35.6%; + height: 6.2%; + top: 6.6%; + left: 30.7%; +} +.infoThree{ + background-image: url(../../img/board/intelligentRefrigeratorInterconnectionFactory/info.png); + background-size: 100% 100%; + position: absolute; + width: 14.8%; + height: 17%; + 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 9d26faf..8be726d 100644 --- a/ruoyi-admin/src/main/resources/static/js/board/intelligentRefrigeratorInterconnectionFactory.js +++ b/ruoyi-admin/src/main/resources/static/js/board/intelligentRefrigeratorInterconnectionFactory.js @@ -1,6 +1,8 @@ $(() => { moduleTitle() - info() + infoOne() + infoTwo() + infoThree() // 公共请求地址 let url = '/broad/box' @@ -28,10 +30,23 @@ const moduleTitle = () => { ` $('body').append(html) } -const info = () => { +const infoOne = () => { const html = ` - xxx名称 - + + + ` - $('#info').append(html) + $('#infoOne').append(html) +} +const infoTwo = () => { + const html = ` + + ` + $('#infoTwo').append(html) +} +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 941f7ac..b16d586 100644 --- a/ruoyi-admin/src/main/resources/static/js/echartsCommon.js +++ b/ruoyi-admin/src/main/resources/static/js/echartsCommon.js @@ -32,9 +32,9 @@ const horizontalRoundedBarChartWithBackground = function (data, id) { axisPointer: { type: "none", }, - textStyle:{ - fontSize:0.8*vw - }, + textStyle: { + fontSize: 0.8 * vw + }, formatter: function (params) { return ( params[0].name + @@ -102,7 +102,7 @@ const horizontalRoundedBarChartWithBackground = function (data, id) { color: "#fff", fontSize: 0.75 * vw }, - formatter:'{c}%' + formatter: '{c}%' }, }, { @@ -152,8 +152,8 @@ const barChartAndLineChart = function (data, id) { } let option = { tooltip: { - textStyle:{ - fontSize:0.8*vw + textStyle: { + fontSize: 0.8 * vw } }, grid: { @@ -368,8 +368,8 @@ const pieChart = function (data, id) { tooltip: { trigger: "item", formatter: "{b} : {c} ({d}%)", - textStyle:{ - fontSize:0.8*vw + textStyle: { + fontSize: 0.8 * vw } }, @@ -396,14 +396,14 @@ const pieChart = function (data, id) { b: { color: "rgb(98,137,169)", fontSize: 0.75 * vw, - height: 1.5*vw, + height: 1.5 * vw, }, }, }, }, - emphasis:{ - label:{ - fontSize:0.75 * vw + emphasis: { + label: { + fontSize: 0.75 * vw } }, labelLine: { @@ -449,8 +449,8 @@ const verticalBarChart = function (data, id) { } let option = { tooltip: { - textStyle:{ - fontSize:0.8*vw + textStyle: { + fontSize: 0.8 * vw } }, grid: { @@ -473,14 +473,14 @@ const verticalBarChart = function (data, id) { }, axisLabel: { color: "#fff", - fontSize: 0.8* vw, + fontSize: 0.8 * vw, interval: 0, }, }, yAxis: { nameTextStyle: { color: "#fff", - fontSize: 0.8*vw, + fontSize: 0.8 * vw, }, axisLine: { lineStyle: { @@ -489,7 +489,7 @@ const verticalBarChart = function (data, id) { }, axisLabel: { color: "#fff", - fontSize: 0.8*vw, + fontSize: 0.8 * vw, }, splitLine: { show: false, @@ -1851,31 +1851,29 @@ const multipleVerticalBarChart = function (data, id) { }, }, ], - yAxis: [ - { - type: "value", - splitNumber: 5, - max:50, - axisLabel: { - show: true, - color: '#fff' - }, - axisLine: { - show: false, - }, - axisTick: { - show: false, - }, - splitLine: { - show: true, - lineStyle: { - type: 'dashed', - color: '#777777', - opacity: 0.3, - }, + yAxis: { + type: "value", + splitNumber: 5, + max: 15, + axisLabel: { + show: true, + color: '#fff' + }, + axisLine: { + show: false, + }, + axisTick: { + show: false, + }, + splitLine: { + show: true, + lineStyle: { + type: 'dashed', + color: '#777777', + opacity: 0.3, }, }, - ], + }, series: [ { name: data.yDataOneName, @@ -1889,7 +1887,24 @@ const multipleVerticalBarChart = function (data, id) { show: true, position: "top", textStyle: { - color: "#a8aab0", + 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)', + }, + ], + }, fontStyle: "normal", fontFamily: "微软雅黑", fontSize: 0.75 * vw, @@ -1916,7 +1931,24 @@ const multipleVerticalBarChart = function (data, id) { show: true, position: "top", textStyle: { - color: "#a8aab0", + color: { + x: 0, + y: 0, + x2: 0, + y2: 1, + type: 'linear', + global: false, + colorStops: [ + { + offset: 0, + color: '#0DCEB1', + }, + { + offset: 1, + color: '#14A15A', + }, + ], + }, fontStyle: "normal", fontFamily: "微软雅黑", fontSize: 0.75 * vw, @@ -1961,18 +1993,18 @@ const multipleVerticalBarChart = function (data, id) { ], }; - if (data?.xName?.length >= 6) { + if (data?.xName?.length >= 4) { option.dataZoom.push({ show: true, type: 'slider', - bottom : '0%', + bottom: '0%', xAxisIndex: 0, height: 12, start: 0, - end: 1 / (data.xName.length / 6) * 100, + end: 1 / (data.xName.length / 4) * 100, textStyle: { fontSize: 0, - color:'rgba(0,0,0,0)' + color: 'rgba(0,0,0,0)' } }) option.grid.bottom = '7%' diff --git a/ruoyi-admin/src/main/resources/templates/broad/box.html b/ruoyi-admin/src/main/resources/templates/broad/box.html index 28e707c..9e50764 100644 --- a/ruoyi-admin/src/main/resources/templates/broad/box.html +++ b/ruoyi-admin/src/main/resources/templates/broad/box.html @@ -164,11 +164,18 @@ } #info-2 { - width: 13%; + /*width: 13%;*/ + /*height: 5.6%;*/ + /*position: absolute;*/ + /*top: 10.5%;*/ + /*left: 10%;*/ + /*letter-spacing: 1px;*/ + /*font-size: 12%;*/ + width: 15%; height: 5.6%; position: absolute; top: 10.5%; - left: 10%; + left: 9.6%; letter-spacing: 1px; font-size: 12%; } @@ -308,10 +315,10 @@