Przeglądaj źródła

优化溢出换行

yhluo 4 miesięcy temu
rodzic
commit
d6e5ff6a49
2 zmienionych plików z 13 dodań i 6 usunięć
  1. 6 5
      src/views/makeprocess/index.vue
  2. 7 1
      src/views/makeprocess/list.vue

+ 6 - 5
src/views/makeprocess/index.vue

@@ -34,14 +34,14 @@
             
             <span style="text-align: right;width: 100%; font-size: 50px; font-weight: bold;letter-spacing: .3em;">产线计划未完成订单明细</span>
           </div>
-          <div class="d-flex aside-width">
+          <div class="d-flex aside-width" style="width: 45%">
             <div class="react-right bg-color-r mr-3">
               <el-button type="text" class="text" style="width:50% ;font-size: 21px; color: #000000 !important;font-weight: bold;" @click="fullScreen" ref="fullScreen"
                          v-show=!isFullScreen >全屏</el-button>
               <el-button type="text" class="text" style="width:50% ;font-size: 21px; color: #000000 !important;font-weight: bold;" @click="exitFullScreen" ref="exitFullScreen" v-show=isFullScreen>退出全屏</el-button>
             </div>
-            <div class="react-right mr-4 react-l-s" style="width: 900px">
-              <span class="react-after"></span>
+            <div class="react-right mr-4 react-l-s" style="width: 90%">
+              <!-- <span class="react-after"></span> -->
               <el-dropdown class="dropdown">
                 <span class="el-dropdown-link" ref="echarType">
                   生产进度看板<i class="el-icon-arrow-down el-icon--right"></i>&nbsp;&nbsp;&nbsp;&nbsp;
@@ -63,8 +63,9 @@
                     :value="item.LI_CODE"
                 ></el-option>
               </el-select>
-              <span class="text">&nbsp;&nbsp;</span>
-              <span class="text datetext">{{ dateYear }} {{ dateWeek }} {{ dateDay }}</span>
+              <div class="text datetext">
+                {{ dateYear }} {{ dateWeek }} {{ dateDay }}
+              </div>
             </div>
           </div>
         </div>

+ 7 - 1
src/views/makeprocess/list.vue

@@ -18,7 +18,7 @@ export default {
       config: {
         header:[],
         data: [],
-        rowNum: 14, //表格行数
+        rowNum: 10, //表格行数
         headerHeight: 50,
         headerBGC: '#FFFFFF', //表头
         oddRowBGC: '#FFFFFF', //奇数行
@@ -139,9 +139,15 @@ $box-width: 100%;
         .row-item {
           font-size: 26px !important;
           color: #000000 !important;
+          // height: 83.5px !important;
+          // line-height: 83px !important;
           >.ceil{
             border: 1px solid #000000;
           }
+          >.ceil:last-child{
+            line-height:normal;
+            white-space: pre-wrap;
+          }
         }
         /* .ceil {
            border-right: 1px solid #000000 !important;