Merge branch 'master' into lb

src/views/material-manage/cockpit/index.vue

@@ -262,6 +262,7 @@ export default {
   .box-padding {
     padding: 0 16px 16px;
     height: 100%;
+    opacity: 0.8;
   }
 }
 </style>

src/views/orderManage/orderManagerCockpit/cockpit.vue

@@ -319,6 +319,7 @@ export default {
   .box-padding {
     padding: 0 16px;
     height: 100%;
+    opacity: 0.8;
   }
 }
 </style>

src/views/orderManage/orderManagerCockpit/components/orderStatus.vue

@@ -46,6 +46,6 @@ export default {
 </script>
 <style scoped>
 .state-box {
-  height: 15px;
+  height: calc(15px * var(--beilv))
 }
 </style>

src/views/orderManage/orderManagerCockpit/components/workOrder.vue

@@ -15,17 +15,17 @@
           <span class="state">{{ item.state }}</span>
         </span>
       </p>
-      <p :style="{ paddingLeft: 15 * beilv + 'px'}">
+      <p style="paddingLeft: 15px">
         <span>产品名称：<span class="light-color">{{ item.name }}</span></span>
         <span class="fr">
           产线：
           <span class="light-color" :style="{marginRight: 25 * beilv + 'px'}">{{ item.line }}</span>
         </span>
       </p>
-      <p :style="{ paddingLeft: 15 * beilv + 'px'}">
+      <p style="paddingLeft: 15px">
         <span>所属订单编号：<span class="light-color">{{ item.workCode }}</span></span>
       </p>
-      <div :style="{ paddingLeft: 15 * beilv + 'px'}">
+      <div style="paddingLeft: 15px">
         <span v-if="item.percentage === '100%'" class="blue-color">√ 订单进度</span>
         <span v-else class="light-color">订单进度</span>
         <span class="light-color fr">{{ item.percentage }}</span>
@@ -78,10 +78,10 @@ export default {
       display: inline-block;
       content: "";
       width: 4px;
-      height: 14px;
+      height: calc(14px * var(--beilv));
       border-radius: 2px;
       margin-right: 8px;
-      vertical-align: middle;
+      vertical-align: top;
       background-color: #4BFFC8;
     }
     .state {