55

src/views/produce/components/produceOrder.vue

@@ -2,8 +2,8 @@
   <div>
     <ele-pro-table
       ref="table"
-      :height="internalIsFullscreen ? '400px' : '300px'"
       :columns="columns"
+      height="calc(100vh - 280px)"
       width="100%"
       :datasource="datasource"
       :selection.sync="selection"
@@ -306,8 +306,5 @@
 </script>
 
 <style lang="scss" scoped>
-  .table {
-    min-height: calc((100vh - 70px - 50px - 80px - 20px) / 2);
-    max-height: 68vh;
-  }
+
 </style>

src/views/produce/index.vue

@@ -26,9 +26,9 @@
               @rowClick="rowClick"
             ></produceOrder>
           </div>
-          <div class="bottom">
+          <!-- <div class="bottom">
             <productionResource :BomObj="BomObj"></productionResource>
-          </div>
+          </div> -->
         </div>
 
         <template v-slot:content>
@@ -312,15 +312,15 @@
 
     .top {
       width: 100%;
-      min-height: calc((100vh - 70px - 50px - 80px - 20px) / 2);
+      height: 100%;
       overflow: hidden;
     }
 
-    .bottom {
-      width: 100%;
-      min-height: calc((100vh - 70px - 50px - 80px - 20px) / 2);
-      overflow: hidden;
-    }
+    // .bottom {
+    //   width: 100%;
+    //   min-height: calc((100vh - 70px - 50px - 80px - 20px) / 2);
+    //   overflow: hidden;
+    // }
   }
 
   .right_main {