Commit fd6917132c84f40616f3ac263d515b440cafd480

Authored by zhangzzzz
1 parent c217de95

去除计划任务-设备信息;

src/mes/scheduledTasks/machineTasks/index.js
@@ -564,7 +564,7 @@ const MachineTasks = baseProps => { @@ -564,7 +564,7 @@ const MachineTasks = baseProps => {
564 }, 564 },
565 tableBtnsWidth: "190px", 565 tableBtnsWidth: "190px",
566 // fixedHeight: "535px" 566 // fixedHeight: "535px"
567 - fixedHeight: "calc(100vh - 460px)" 567 + fixedHeight: "calc(100vh - 285px)"
568 }; 568 };
569 // 全部按钮事件 569 // 全部按钮事件
570 const tableAll = () => { 570 const tableAll = () => {
@@ -716,7 +716,7 @@ const MachineTasks = baseProps => { @@ -716,7 +716,7 @@ const MachineTasks = baseProps => {
716 </div> 716 </div>
717 </Col> 717 </Col>
718 </Row> */} 718 </Row> */}
719 - <Row gutter={[15, 0]} className={`tasksBg marginTop taskInfo`}> 719 + {/* <Row gutter={[15, 0]} className={`tasksBg marginTop taskInfo`}>
720 <h2>设备信息</h2> 720 <h2>设备信息</h2>
721 <Col span={4} className="taskInfoBox"> 721 <Col span={4} className="taskInfoBox">
722 <div className={"leftBox"}> 722 <div className={"leftBox"}>
@@ -778,7 +778,7 @@ const MachineTasks = baseProps =&gt; { @@ -778,7 +778,7 @@ const MachineTasks = baseProps =&gt; {
778 </div> 778 </div>
779 </div> 779 </div>
780 </Col> 780 </Col>
781 - </Row> 781 + </Row> */}
782 <TaskConfirmModal {...props} /> 782 <TaskConfirmModal {...props} />
783 </div> 783 </div>
784 ); 784 );
src/mes/scheduledTasks/machineTasks/index.less
@@ -43,12 +43,12 @@ @@ -43,12 +43,12 @@
43 43
44 .tasksTable { 44 .tasksTable {
45 // height: 670px; 45 // height: 670px;
46 - height: calc(100vh - 335px); 46 + height: calc(100vh - 135px);
47 border-radius: @border-radius; 47 border-radius: @border-radius;
48 48
49 .table { 49 .table {
50 // height: 575px; 50 // height: 575px;
51 - height: calc(100% - 60px); 51 + height: calc(100% - 80px);
52 52
53 .operate-bar { 53 .operate-bar {
54 .flex(center, center); 54 .flex(center, center);