diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index a79dee8..27dcf90 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -16,7 +16,7 @@ ruoyi: # 开发环境配置 server: # 服务器的HTTP端口,默认为80 - port: 80 + port: 8080 servlet: # 应用的访问路径 context-path: / diff --git a/ruoyi-admin/src/main/resources/templates/broad/box.html b/ruoyi-admin/src/main/resources/templates/broad/box.html index f3fd47e..fe40f19 100644 --- a/ruoyi-admin/src/main/resources/templates/broad/box.html +++ b/ruoyi-admin/src/main/resources/templates/broad/box.html @@ -336,7 +336,7 @@
-
+
@@ -351,11 +351,11 @@ let demo = [] demo.push([1, 2, 3, 4, 5]) const planWorkOrderTable = new AutoScrollTable(document.getElementById("plan-work-order"), planWorkOrderColumns, {width: ['30%', null, null, null, '17%']}) - 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: "生产计划统计", - scrollInfo: demo - }) + // 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: "生产计划统计", + // scrollInfo: demo + // }) const inventoryInfoDataMerger = new DataMerger({ defaultValue: 0, @@ -448,11 +448,11 @@ }) }) - autoUpdate('/system/UShellMes/getPlanStats', INTERVAL, data => { - planTable.loadData(data, null, { - includeHead: true, - }); - }) + // autoUpdate('/system/UShellMes/getPlanStats', INTERVAL, data => { + // planTable.loadData(data, null, { + // includeHead: true, + // }); + // }) }) const shiftBlocks = []