diff --git a/ruoyi-admin/src/main/resources/static/css/autoscroll-table.css b/ruoyi-admin/src/main/resources/static/css/autoscroll-table.css index d8194b1..030103d 100644 --- a/ruoyi-admin/src/main/resources/static/css/autoscroll-table.css +++ b/ruoyi-admin/src/main/resources/static/css/autoscroll-table.css @@ -95,6 +95,7 @@ .autoscroll-table td { font-size: 0.75vw; + white-space:nowrap; } .autoscroll-table caption { diff --git a/ruoyi-admin/src/main/resources/templates/broad/box.html b/ruoyi-admin/src/main/resources/templates/broad/box.html index 3c0cb08..fe6ce52 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%','35%', '12%', '12%', '11%', '20%']}) + const planWorkOrderTable = new AutoScrollTable(document.getElementById("plan-work-order"), planWorkOrderColumns, {width: ['10%','40%', '10%', '10%', '10%', '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: "生产计划统计", @@ -495,7 +495,6 @@ //formatter: '{b1}: {c1}', }, legend: { - show: true, show: true, top: 0, textStyle: {