diff --git a/src/mes/scheduledTasks/machineTasks/index.js b/src/mes/scheduledTasks/machineTasks/index.js index 2d8cf60..044a4f2 100644 --- a/src/mes/scheduledTasks/machineTasks/index.js +++ b/src/mes/scheduledTasks/machineTasks/index.js @@ -564,7 +564,7 @@ const MachineTasks = baseProps => { }, tableBtnsWidth: "190px", // fixedHeight: "535px" - fixedHeight: "calc(100vh - 460px)" + fixedHeight: "calc(100vh - 285px)" }; // 全部按钮事件 const tableAll = () => { @@ -716,7 +716,7 @@ const MachineTasks = baseProps => { */} - + {/*

设备信息

@@ -778,7 +778,7 @@ const MachineTasks = baseProps => {
-
+
*/} ); diff --git a/src/mes/scheduledTasks/machineTasks/index.less b/src/mes/scheduledTasks/machineTasks/index.less index c43e86e..e7d8e17 100644 --- a/src/mes/scheduledTasks/machineTasks/index.less +++ b/src/mes/scheduledTasks/machineTasks/index.less @@ -43,12 +43,12 @@ .tasksTable { // height: 670px; - height: calc(100vh - 335px); + height: calc(100vh - 135px); border-radius: @border-radius; .table { // height: 575px; - height: calc(100% - 60px); + height: calc(100% - 80px); .operate-bar { .flex(center, center);