695593266@qq.com 11 месяцев назад
Родитель
Сommit
987d692866
2 измененных файлов с 17 добавлено и 11 удалено
  1. 1 0
      src/views/produce/components/feeding/index.vue
  2. 16 11
      src/views/produceOrder/workReport.vue

+ 1 - 0
src/views/produce/components/feeding/index.vue

@@ -37,6 +37,7 @@
         <div v-for="(item, index) in List" :key="index" class="card_box">
           <div class="title_box rx-bc">
             <div class="name" v-if="!taskObj.isOrderListData">工单信息 </div>
+            <div class="name" v-else> </div>
 
             <div class="rx-bc">
               <el-button

+ 16 - 11
src/views/produceOrder/workReport.vue

@@ -51,13 +51,13 @@
               "
             >
               <div>
-                <b style="margin-right: 50px; font-size: 16px"
+                <b style="margin-right: 50px; font-size: 14px"
                   >当前工序:{{ title }}</b
                 >
-                <b style="font-size: 16px">下道工序:{{ title1 }}</b>
+                <b style="font-size: 14px">下道工序:{{ title1 }}</b>
               </div>
 
-              <b style="font-weight: blod; font-size: 16px">
+              <b style="font-weight: blod; font-size: 14px">
                 操作员:{{ info.name }}
               </b>
 
@@ -65,14 +65,14 @@
                 <el-button
                   icon="el-icon-full-screen"
                   type="text"
-                  style="color: #fff; font-size: 16px"
+                  style="color: #fff; font-size: 14px"
                   @click="handleFull"
                   >{{ isFullscreen ? '全屏' : '缩小' }}</el-button
                 >
                 <el-button
                   icon="el-icon-circle-close"
                   type="text"
-                  style="color: #fff; font-size: 16px"
+                  style="color: #fff; font-size: 14px"
                   @click="handleClose"
                   >关闭</el-button
                 >
@@ -863,7 +863,7 @@
   };
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
   // .content_box {
   // display: flex;
   // }
@@ -943,6 +943,7 @@
 <style lang="scss" scoped>
   .seek-list {
     display: flex;
+    height: 42px;
     justify-content: space-between;
     align-items: center;
     padding: 10px 10px;
@@ -975,7 +976,7 @@
     width: 100%;
     min-width: 1280px;
 
-    // height: calc(100vh - 242px);
+    height: calc(100vh - 234px);
     display: flex;
     justify-content: space-between;
   }
@@ -1014,13 +1015,13 @@
   .right_main {
     width: 100%;
     padding-bottom: 12px;
-    height: calc((100vh - 230px));
+    height: calc((100vh - 234px));
     background: #f0f3f3;
     border: 1px solid rgb(207, 215, 207);
   }
 
   .drawer_content {
-    margin: 5px 20px;
+    margin: 5px 10px;
     box-sizing: border-box;
 
     .taskTitle {
@@ -1029,9 +1030,9 @@
       align-items: center;
       flex-direction: row;
       justify-content: center;
-      font-size: 18px;
+      font-size: 16px;
       color: green;
-      margin-bottom: 10px;
+      margin-bottom: 5px;
       font-weight: bold;
     }
   }
@@ -1052,4 +1053,8 @@
     border-color: #ffa929;
     color: #ffffff; /* 图标文字颜色 */
   }
+
+  ::v-deep .el-step__title {
+    line-height: 30px;
+  }
 </style>