src/views/material-manage/cockpit/components/baseTable.vue

@@ -9,7 +9,7 @@
   <div class="visual-base-table-container">
     <el-table
       v-loading="isLoading"
-      :header-cell-style="{background:'rgba(32, 55, 96, 0.8)',color:'#fff',height: 28 * beilv + 'px',lineHeight: 28 * beilv + 'px',padding: 0,fontSize: 12 * beilv + 'px'}"
+      :header-cell-style="{background:'rgba(79,114,136,0.29)',color:'#fff',height: 28 * beilv + 'px',lineHeight: 28 * beilv + 'px',padding: 0,fontSize: 12 * beilv + 'px'}"
       :row-style="setRowStyle"
       :data="renderData"
       border
@@ -111,7 +111,7 @@ export default {
     setRowStyle(v) {
       if (v.rowIndex % 2 === 0) {
         return {
-          background: 'rgba(14, 32, 62, 0.8)',
+          background: 'rgba(76,97,123,0.2)',
           color: 'rgba(255,255,255,0.5)',
           height: 26 * this.beilv + 'px',
           lineHeight: 26 * this.beilv + 'px',
@@ -120,7 +120,7 @@ export default {
         }
       } else {
         return {
-          background: 'rgba(32, 55, 96, 0.8)',
+          background: 'rgba(79,114,136,0.29)',
           color: 'rgba(255,255,255,0.5)',
           height: 26 * this.beilv + 'px',
           lineHeight: 26 * this.beilv + 'px',

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

@@ -15,11 +15,11 @@
       <el-button
         type="text"
         class="title-button"
-        :style="{ right: 0, top: 37 * beilv + 'px' }"
+        :style="{ right: 33 * beilv + 'px', top: 37 * beilv + 'px' }"
         @click="changeFullScreen"
       >
-        <svg-icon v-if="isFullScreen" icon-class="unFullScreenView" :style="{fontSize: 33 * beilv + 'px'}" />
+        <svg-icon v-if="isFullScreen" icon-class="unFullScreenView" />
-        <svg-icon v-else icon-class="fullScreenView" :style="{fontSize: 33 * beilv + 'px'}" />
+        <svg-icon v-else icon-class="fullScreenView" />
       </el-button>
     </el-row>
     <el-row class="container-main" :style="{ padding: '0 ' + 16 * beilv + 'px' }" :gutter="16 * beilv">

src/views/orderManage/orderManagerCockpit/cockpit.vue

@@ -15,7 +15,7 @@
       <el-button
         type="text"
         class="title-button"
-        :style="{ right: 0, top: 37 * beilv + 'px' }"
+        :style="{ right: 33 * beilv + 'px', top: 37 * beilv + 'px' }"
         @click="changeFullScreen"
       >
         <svg-icon v-if="isFullScreen" icon-class="unFullScreenView" :style="{fontSize: 33 * beilv + 'px'}" />

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

@@ -9,7 +9,7 @@
   <div class="visual-base-table-container">
     <el-table
       v-loading="isLoading"
-      :header-cell-style="{background:'rgba(32, 55, 96, 0.8)',color:'#fff',height: 28 * beilv + 'px',lineHeight: 28 * beilv + 'px',padding: 0,fontSize: 12 * beilv + 'px'}"
+      :header-cell-style="{background:'rgba(79,114,136,0.29)',color:'#fff',height: 28 * beilv + 'px',lineHeight: 28 * beilv + 'px',padding: 0,fontSize: 12 * beilv + 'px'}"
       :row-style="setRowStyle"
       :data="renderData"
       border
@@ -111,7 +111,7 @@ export default {
     setRowStyle(v) {
       if (v.rowIndex % 2 === 0) {
         return {
-          background: 'rgba(14, 32, 62, 0.8)',
+          background: 'rgba(76,97,123,0.2)',
           color: 'rgba(255,255,255,0.5)',
           height: 26 * this.beilv + 'px',
           lineHeight: 26 * this.beilv + 'px',
@@ -120,7 +120,7 @@ export default {
         }
       } else {
         return {
-          background: 'rgba(32, 55, 96, 0.8)',
+          background: 'rgba(79,114,136,0.29)',
           color: 'rgba(255,255,255,0.5)',
           height: 26 * this.beilv + 'px',
           lineHeight: 26 * this.beilv + 'px',

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

@@ -1,13 +1,7 @@
 <template>
   <div class="order-box" :style="{ padding: '0 ' + 16 * beilv + 'px', fontSize: 14 * beilv + 'px'}">
     <!-- 小块 -->
-    <div
+    <div v-for="(item,index) in orderMsg" :key="index" :style="{ padding: 10 * beilv + 'px' + ' 20px ' + 16 * beilv + 'px' + ' 16px'}" class="box">
-      v-for="(item,index) in orderMsg"
-      :key="index"
-      :style="{ padding: 10 * beilv + 'px ' + 20 * beilv + 'px ' + 16 * beilv + 'px ' + 16 * beilv
-        + 'px', height: 168 * beilv + 'px'}"
-      class="box"
-    >
       <p class="line1">
         <span>工单编号：<span class="light-color">{{ item.code }}</span></span>
         <span class="fr">
@@ -19,7 +13,7 @@
         <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 class="light-color" style="margin-right: 25px">{{ item.line }}</span>
         </span>
       </p>
       <p :style="{ paddingLeft: 15 * beilv + 'px'}">
@@ -61,11 +55,11 @@ export default {
   justify-content: space-between;
   .box {
     width: 49.5%;
+    height: 49.5%;
     margin-bottom: 8px;
     background-image: url('../../../../assets/img/cockpit/module-back.png');
     background-repeat: no-repeat;
     background-size: 100% 100%;
-    overflow: auto;
     .light-color {
       opacity: 0.5;
     }