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..7d93abf 100644 --- a/ruoyi-admin/src/main/resources/static/css/board/intelligentRefrigeratorInterconnectionFactory.css +++ b/ruoyi-admin/src/main/resources/static/css/board/intelligentRefrigeratorInterconnectionFactory.css @@ -52,26 +52,26 @@ 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%; + left: 82.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%; + height: 6%; + top: 3.6%; + left: 50%; + transform: translateX(-50%); } .infoThree{ background-image: url(../../img/board/intelligentRefrigeratorInterconnectionFactory/info.png); background-size: 100% 100%; position: absolute; - width: 14.8%; - height: 17%; - top: 5.2%; + width: 17.6%; + height: 15.2%;; + top: 8.6%; 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..f753a94 100644 --- a/ruoyi-admin/src/main/resources/static/js/echartsCommon.js +++ b/ruoyi-admin/src/main/resources/static/js/echartsCommon.js @@ -1854,7 +1854,7 @@ const multipleVerticalBarChart = function (data, id) { yAxis: { type: "value", splitNumber: 5, - max: 15, + max: Math.max(...data['yDataOne'],...data['yDataTwo'],...data['yDataThree']) + 5, axisLabel: { show: true, color: '#fff' @@ -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/static/js/scrollTable.js b/ruoyi-admin/src/main/resources/static/js/scrollTable.js index 9520df9..381f1e4 100644 --- a/ruoyi-admin/src/main/resources/static/js/scrollTable.js +++ b/ruoyi-admin/src/main/resources/static/js/scrollTable.js @@ -255,4 +255,9 @@ const tableAnimation = (el) => { $(this).remove(); }); }, 2000); +} +const flip = (el,time = 2000) => { + $(el + '>.table>.tbody').animate({ + scrollTop: $(el + '>.table>.tbody').scrollTop() + $(el + '>.table>.tbody').outerHeight(true) + },time) } \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/broad/box.html b/ruoyi-admin/src/main/resources/templates/broad/box.html index 9e50764..5ee7739 100644 --- a/ruoyi-admin/src/main/resources/templates/broad/box.html +++ b/ruoyi-admin/src/main/resources/templates/broad/box.html @@ -174,8 +174,8 @@ width: 15%; height: 5.6%; position: absolute; - top: 10.5%; - left: 9.6%; + top: 10.2%; + left: 10.4%; letter-spacing: 1px; font-size: 12%; } @@ -314,10 +314,10 @@ -