Ver código fonte

看板调整

xiaost 2 anos atrás
pai
commit
b685c9f394

+ 1 - 1
src/assets/scss/indexpackage.scss

@@ -130,7 +130,7 @@
       //下方区域的布局
       .content-box {
         display: grid;
-        grid-template-columns: 2fr 3fr 5fr 3fr 2fr;
+        grid-template-columns: 2fr 3fr 5fr 5fr;
       }
 
       // 底部数据

+ 1 - 1
src/components/packageechart/centerLeft/centerLeft1Chart/chart.vue

@@ -4,7 +4,7 @@
       :options="options"
       id="centreLeft1Chart"
       height="350px"
-      width="300px"
+      width="315px"
     ></Echart>
   </div>
 </template>

+ 1 - 2
src/components/smtechart/bottom/bottom1Chart/chart.vue

@@ -192,7 +192,7 @@
                             top: '60%'*/
                             left: '5%',
                             right: '4%',
-                            bottom: '3%',
+                            bottom: 25,
                         },
                         xAxis: {
                             type: 'category',
@@ -216,7 +216,6 @@
                             max:newData.maxData,
                             splitNumber: 4,
                             min:newData.minData,
-
                             axisLine: {
                                 lineStyle: {
                                     opacity: 0

+ 1 - 1
src/views/package/centerLeft1.vue

@@ -122,7 +122,7 @@ export default {
 
 <style lang="scss" scoped>
 $box-height: 410px;
-$box-width: 340px;
+$box-width: 350px;
 
 #centerLeft1 {
   padding: 5px;

+ 9 - 8
src/views/package/centerRight1.vue

@@ -21,18 +21,15 @@ export default {
   data() {
     return {
       config: {
-        //header: ['组件', '分支', '覆盖率'],
-        header: ['线别',  '产量'],
-        data: [/*
-          ['组件1', 'dev-1', "<span  class='colorGrass'>↑75%</span>"],*/
+        header:  ['线别', '产出', '不良','良率%','计划数','达成率%'],
+        data: [
         ],
         rowNum: 7, //表格行数
         headerHeight: 35,
         headerBGC: '#0f1325', //表头
         oddRowBGC: '#0f1325', //奇数行
         evenRowBGC: '#171c33', //偶数行
-        index: true,
-        columnWidth: [50,130],
+        columnWidth: [120,110,90,110,110,90],
         align: ['center']
       }
     }
@@ -68,6 +65,10 @@ export default {
                       let item = new Array();
                       item.push(element.linecode);
                       item.push("<span  class='colorGrass'>"+element.value+"</span>");
+                      item.push("<span  class='colorGrass'>"+element.ngqty+"</span>");
+                      item.push("<span  class='colorGrass'>" + element.okrate + "</span>");
+                      item.push("<span  class='colorGrass'>"+element.planqty+"</span>");
+                      item.push("<span  class='colorGrass'>"+element.getrate+"</span>");
                       resultList.push(item);
                     }
                     const scrollBoard = this.$refs['scroll-board'];
@@ -84,7 +85,7 @@ export default {
 
 <style lang="scss" scoped>
 $box-height: 410px;
-$box-width: 300px;
+$box-width: 640px;
 #centerRight1 {
   padding: 16px;
   padding-top: 20px;
@@ -103,7 +104,7 @@ $box-width: 300px;
     border-radius: 10px;
     overflow: hidden;
     .dv-scr-board {
-      width: 270px;
+      width: 600px;
       height: 340px;
     }
   }

+ 9 - 9
src/views/package/index.vue

@@ -72,24 +72,26 @@
             </div>
             <!-- 中间 -->
             <div>
-              <center />
+              <dv-border-box-12>
+                 <center />
+              </dv-border-box-12>
             </div>
             <!-- 中间 -->
-            <div>
+           <!-- <div>
               <centerRight2 />
-            </div>
+            </div>-->
             <div>
-              <dv-border-box-13>
+              <dv-border-box-12>
                 <centerRight1/>
-              </dv-border-box-13>
+              </dv-border-box-12>
             </div>
           </div>
 
           <!-- 第四行数据 -->
           <div class="bottom-box">
-            <dv-border-box-13>
+            <dv-border-box-12>
               <bottomLeft2 />
-            </dv-border-box-13>
+            </dv-border-box-12>
             <dv-border-box-12>
               <bottomRight />
             </dv-border-box-12>
@@ -106,7 +108,6 @@ import { formatTime } from '../../utils/index.js'
 import centerLeft1 from './centerLeft1'
 import centerLeft_two from './centerLeft_two'
 import centerRight1 from './centerRight1'
-import centerRight2 from './centerRight2'
 import center from './center'
 import bottomLeft2 from './bottomLeft2'
 import bottomRight from './bottomRight'
@@ -133,7 +134,6 @@ export default {
     centerLeft1,
     centerLeft_two,
     centerRight1,
-    centerRight2,
     center,
     bottomLeft2,
     bottomRight

+ 1 - 1
src/views/smt/bottom1.vue

@@ -7,7 +7,7 @@
             <icon name="chart-area" class="text-icon"></icon>
           </span>
                     <div class="d-flex">
-                        <span class="fs-xl text mx-2">质量趋势分析</span>
+                        <span class="fs-xl text mx-2">7日质量趋势分析</span>
                         <div class="decoration2">
                             <dv-decoration-2 :reverse="true" style="width:5px;height:6rem;" />
                         </div>