Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-mes into dev

src/views/home/index.vue

@@ -1,7 +1,13 @@
 <template>
   <div class="ele-body">
     <el-row :gutter="15">
-      <el-col :span="16" style="height: 57%">
+      <el-col :span="16" style="height: calc(57% - 51px)">
+        <el-radio-group v-model="form.timeType" @change="timeTypeChange">
+          <el-radio-button label="1">企业</el-radio-button>
+          <el-radio-button label="2">工厂</el-radio-button>
+          <el-radio-button label="3">班组</el-radio-button>
+          <el-radio-button label="4">产线</el-radio-button>
+        </el-radio-group>
         <div style="height: 20%" class="item">
           <div v-for="item in arr" :key="item" :style="{ color: item.color }">
             <img :src="item.imgUrl" />
@@ -19,15 +25,6 @@
         <el-card class="box-card" style="height: calc(80% - 15px)">
           <div slot="header" class="clearfix">
             <span>工单完成统计</span>
-            <el-radio-group
-              style="margin-left: 0.7vw"
-              v-model="form.timeType"
-              @change="timeTypeChange"
-            >
-              <el-radio-button label="1">工厂</el-radio-button>
-              <el-radio-button label="2">班组</el-radio-button>
-              <el-radio-button label="3">工序</el-radio-button>
-            </el-radio-group>
           </div>
           <v-chart ref="barRef" style="height: 100%" :option="barOption" />
         </el-card>
@@ -106,19 +103,19 @@ export default {
           name: '在制工单计划生产数',
           num: '188',
           imgUrl: require('../../assets/Group2.png'),
-          unit: '件'
+          unit: 'pcs'
         },
         {
           name: '在制工单已入库数',
           num: '188',
           imgUrl: require('../../assets/Group3.png'),
-          unit: '件'
+          unit: 'pcs'
         },
         {
           name: '在制工单延期生产数',
           num: '188',
           imgUrl: require('../../assets/Group4.png'),
-          unit: '件',
+          unit: 'pcs',
           color: '#f97876'
         }
       ],
@@ -195,6 +192,7 @@ export default {
   width: 100%;
   display: flex;
   margin-bottom: 15px;
+  margin-top: 15px;
   > div {
     border-radius: 4px;
     flex: 1;