看板- 组装调整样式跟包装一样

src/assets/scss/indexassembly.scss

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

src/components/assemblyechart/bottom/bottomLeft2Chart/chart.vue

@@ -24,7 +24,13 @@ export default {
             type: 'shadow'
           }
         },
-        legend: {},
+        legend: {
+          textStyle: {
+            fontSize: 18
+          },
+          itemWidth: 29,
+          itemHeight: 19
+        },
         grid: {
           left: '3%',
           right: '4%',
@@ -34,13 +40,19 @@ export default {
         xAxis: [
           {
             type: 'category',
-            data:[]
-            //data: ['插件-01', '插件-02', '插件-03', '插件-04', '插件-05', '插件-06', '插件-07'],
+            data:[],
+            axisLabel: {
+              fontSize: 16,
+              fontWeight: "bold"
+            }
           }
         ],
         yAxis: [
           {
             type: 'value',
+            axisLabel: {
+              fontSize: 16
+            }
           },
           {
             type: 'value',
@@ -48,8 +60,12 @@ export default {
             min: 0,
             max: 100,
             interval: 20,
+            nameTextStyle: {
+              fontSize: 20
+            },
             axisLabel: {
-              formatter: '{value}%'
+              formatter: '{value}%',
+              fontSize: 16
             }
           }
 
@@ -62,8 +78,13 @@ export default {
             emphasis: {
               focus: 'series'
             },
-            data:[]
-            //data: [320, 332, 301, 334, 390, 330, 320]
+            data:[],
+            label: {
+              show: true,
+              position: 'top',
+              fontSize:14,
+              fontWeight: "bold"
+            },
           },
           {
             name: '产出',
@@ -73,8 +94,13 @@ export default {
             emphasis: {
               focus: 'series'
             },
-            data:[]
-            //data: [220, 232, 221, 234, 290, 230, 220]
+            data:[],
+            label: {
+              show: true,
+              position: 'inside',
+              fontSize:14,
+              fontWeight: "bold"
+            },
           },
           {
             name: '不良',
@@ -92,20 +118,29 @@ export default {
             type: 'line',
             data:[],
             yAxisIndex: 1,
-            //data: [92, 92,92, 72, 82, 62, 62],
+            symbolSize: 8,
+            label: {
+              show: true,
+              position: 'top',
+              color:'#fff'
+            },
             tooltip: {
               valueFormatter: function (value) {
                 return value + '%';
               }
             },
+            lineStyle: {
+              width: 4
+            },
             itemStyle: {
               normal: {
-                barBorderRadius: 5,
-                color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                barBorderRadius: 6,
+                color:  "rgba(156,107,211,0.8)"
+               /* color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
                   { offset: 0, color: "rgba(156,107,211,0.8)" },
                   { offset: 0.2, color: "rgba(156,107,211,0.5)" },
                   { offset: 1, color: "rgba(156,107,211,0.2)" }
-                ])
+                ])*/
               }
             },
             emphasis: {

src/components/assemblyechart/bottom/bottomRightChart/chart.vue

@@ -4,7 +4,7 @@
       :options="options"
       id="bottomRightChart"
       height="480px"
-      width="628px"
+      width="913px"
     ></Echart>
   </div>
 </template>
@@ -111,7 +111,7 @@ export default {
             subtext: newData.year + '/' + newData.nowdate,
             subtextStyle: {
               color: '#fff',
-              fontSize: 16
+              fontSize: 18
             },
             top: 50,
             left: 80
@@ -121,12 +121,12 @@ export default {
             left: 80,
             orient: 'vertical',
             itemGap: 15,
-            itemWidth: 12,
-            itemHeight: 12,
+            itemWidth: 14,
+            itemHeight: 14,
             data: ['实际','平均'],
             textStyle: {
               color: '#fff',
-              fontSize: 14
+              fontSize: 16
             }
           },
           tooltip: {
@@ -136,7 +136,8 @@ export default {
             center: ['68%', '27%'],
             radius: '40%',
             name: {
-              color: '#fff'
+              color: '#fff',
+              fontSize:16
             },
             splitNumber: 8,
             axisLine: {
@@ -192,7 +193,7 @@ export default {
             axisLine: true,
             axisLabel: {
               color: 'rgba(255,255,255,.8)',
-              fontSize: 12
+              fontSize: 15
             },
             data: newData.weekCategory
           },
@@ -223,7 +224,7 @@ export default {
             },
             axisLabel: {
               color: 'rgba(255,255,255,.8)',
-              fontSize: 12
+              fontSize: 14
             }
           },
           series: [
@@ -305,6 +306,11 @@ export default {
                 }
               },
               data: newData.weekLineData,
+              label: {
+                show: true,
+                position: 'top',
+                fontSize:14,
+              },
               lineSmooth: true,
               markLine: {
                 silent: true,
@@ -322,6 +328,7 @@ export default {
                 },
                 lineStyle: {
                   normal: {
+                    fontSize: 16,
                     color: 'rgba(248,211,81,.7)'
                   }
                 }

src/components/assemblyechart/centerLeft/centerLeft1Chart/chart.vue

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

src/components/assemblyechart/centerLeft/centerLeft1Chart/index.vue

@@ -47,7 +47,7 @@ export default {
       await this.$http.get("kanban/datalist.action?caller=NGREASONF!ZZ&_noc=1&page=1&pageSize=100",
               {
                 params: {
-                  condition: "mb_ymd="+formatDate(new Date()),
+                  condition: "mb_ymd="+formatDate(new Date())
                 }
               }) .then((result)=>{
                         let dataList = JSON.parse(result.data.data);

src/components/packageechart/centerRight/centerRightChart/chart.vue

@@ -92,40 +92,6 @@ export default {
                 }
               }
             },
-            /*{
-              name: "上海",
-              type: "radar",
-              lineStyle: lineStyle,
-              data: newData.dataSH,
-              symbol: "none",
-              itemStyle: {
-                normal: {
-                  color: "#B3E4A1"
-                }
-              },
-              areaStyle: {
-                normal: {
-                  opacity: 0.05
-                }
-              }
-            },
-            {
-              name: "广州",
-              type: "radar",
-              lineStyle: lineStyle,
-              data: newData.dataGZ,
-              symbol: "none",
-              itemStyle: {
-                normal: {
-                  color: "rgb(238, 197, 102)"
-                }
-              },
-              areaStyle: {
-                normal: {
-                  opacity: 0.05
-                }
-              }
-            } */
           ]
         }
       },

src/components/smtechart/up/up3Chart/chart.vue

@@ -56,6 +56,7 @@ export default {
             data: newData.cdata,
             textStyle: {
               color: "#fff",
+              fontSize: 16
             },
           },
           series: [

src/views/assembly/bottomRight.vue

@@ -30,7 +30,7 @@ export default {
 
 <style lang="scss" class>
 $box-height: 520px;
-$box-width: 628px; //100%;
+$box-width: 100%;
 #bottomRight {
   padding: 14px 16px;
   height: $box-height;

src/views/assembly/center.vue

@@ -116,8 +116,11 @@ export default {
     },
     async setData () {
       // 首检任务数，完成数，合格数，巡检任务数，完成数，巡检合格数  name value
-      await this.$http.get("kanban/datalist.action?caller=CheckData!ZZ&_noc=1&page=1&pageSize=100&condition=1=1")
-              .then((result)=>{
+      await this.$http.get("kanban/datalist.action?caller=CheckData!ZZ&_noc=1&page=1&pageSize=100",{
+      params: {
+        condition: "1=1",
+      }
+    }).then((result)=>{
                         let dataList = JSON.parse(result.data.data);
                         let titleitems = new Array();
                         for (let index = 0; index < dataList.length; index++) {

src/views/assembly/centerLeft1.vue

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

src/views/assembly/centerLeft_two.vue

@@ -8,7 +8,21 @@
         <span class="fs-xl text mx-2">完成工单数统计</span>
       </div>
       <div class="d-flex ai-center flex-column body-box">
-        <dv-capsule-chart class="dv-cap-chart" :config="config" />
+        <div class="up">
+          <div
+                  class="item"
+                  v-for="item in titleItem"
+                  :key="item.title"
+          >
+            <p class="ml-3 colorBlue fw-b fs-xl">{{ item.title }}</p>
+            <div>
+              <dv-digital-flop
+                      class="dv-dig-flop ml-1 mt-2 pl-3"
+                      :config="item.number"
+              />
+            </div>
+          </div>
+        </div>
          <span class="fs-xl text mx-2">工序投产良率分析</span>
         <centerRight2Chart1 />
       </div>
@@ -22,9 +36,7 @@ import centerRight2Chart1 from '@/components/assemblyechart/centerRight/centerRi
 export default {
   data() {
     return {
-      config: {
-        data: [{name:'客户',value:90}]
-      }
+      titleItem:[],
     }
   },
   components: { centerRight2Chart1 },
@@ -45,17 +57,38 @@ export default {
           condition: "1=1",
         }
       }).then((result)=>{
-                        let dataList = JSON.parse(result.data.data);
-                        let makeData = new Array();
-                        for (let index = 0; index < dataList.length; index++) {
-                          const element = dataList[index];
-                          let item = new Object();
-                          item.name = element.name;
-                          item.value = element.value ;
-                          makeData.push(item);
+                      let dataList = JSON.parse(result.data.data);
+                      let titleitems = new Array();
+                      for (let index = 0; index < dataList.length; index++) {
+                        const element = dataList[index];
+                        if(element.name =='工单达成率'){
+                          titleitems.push({
+                            title: element.name,
+                            number: {
+                              number: [element.value],
+                              textAlign: 'left',
+                              toFixed: 2,
+                              content: '{nt}%',
+                              style: {
+                                fontSize: 26
+                              }
+                            }
+                          });
+                        }else {
+                          titleitems.push({
+                            title: element.name,
+                            number: {
+                              number: [element.value],
+                              textAlign: 'left',
+                              content: '{nt}',
+                              style: {
+                                fontSize: 26
+                              }
+                            }
+                          });
                         }
-                        this.config.data = makeData;
-                        this.config = { ...this.config };
+                      }
+                      this.titleItem = titleitems;
                       },(result)=>{
                         console.error(result)
                       }
@@ -85,10 +118,29 @@ export default {
   .body-box {
     border-radius: 10px;
     overflow: hidden;
-    .dv-cap-chart {
+    /*.dv-cap-chart {
       width: 100%;
       height: 160px;
       text-align:left;
+    }*/
+    .up {
+      width: 95%;
+      display: flex;
+      flex-wrap: wrap;
+      //justify-content: space-around;
+      height: 140px;
+      margin-bottom: 7px;
+      .item {
+        border-radius: 6px;
+        padding-top: 8px;
+        margin-top: 8px;
+        width: 50%;
+        height: 60px;
+        .dv-dig-flop {
+          width: 100px;
+          height: 30px;
+        }
+      }
     }
   }
 }

src/views/assembly/centerRight1.vue

@@ -21,19 +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: [110,100,100,80,90,100,90],
         align: ['center']
       }
     }
@@ -71,7 +67,12 @@ export default {
                       const element = dataList[index];
                       let item = new Array();
                       item.push(element.linecode);
+                      item.push("<span  class='colorGrass'>"+element.inqty+"</span>");
                       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'];
@@ -88,7 +89,7 @@ export default {
 
 <style lang="scss" scoped>
 $box-height: 410px;
-$box-width: 300px;
+$box-width: 640px;
 #centerRight1 {
   padding: 16px;
   padding-top: 20px;
@@ -107,7 +108,7 @@ $box-width: 300px;
     border-radius: 10px;
     overflow: hidden;
     .dv-scr-board {
-      width: 270px;
+      width: 600px;
       height: 340px;
     }
   }

src/views/assembly/index.vue

@@ -80,30 +80,29 @@
             </div>
             <!-- 中间 -->
             <div>
-              <center />
+              <dv-border-box-12>
+                <center />
+              </dv-border-box-12>
             </div>
             <!-- 中间 -->
+            <!-- <div>
+               <centerRight2 />
+             </div>-->
             <div>
-              <centerRight2 />
-            </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>
-            <dv-border-box-13>
-              <bottomRight2 />
-            </dv-border-box-13>
           </div>
         </div>
       </div>
@@ -117,11 +116,9 @@ 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'
-import bottomRight2 from './bottomRight2'
 
 export default {
   mixins: [ drawMixin ],
@@ -140,11 +137,9 @@ export default {
     centerLeft1,
     centerLeft_two,
     centerRight1,
-    centerRight2,
     center,
     bottomLeft2,
     bottomRight,
-    bottomRight2
   },
   created() {
     this.linedata = this.$store.getters.user.linedata;

src/views/package/centerLeft_two.vue

@@ -89,7 +89,6 @@ export default {
                         }
                       }
                       this.titleItem = titleitems;
-                      console.log(titleitems);
                       },(result)=>{
                         console.error(result)
                       }

src/views/smt/bottom1.vue

@@ -153,7 +153,14 @@
                 padding-top: 5px;
                 .dv-scr-board {
                     height: 205px;
+                    .header{
+                        font-size: 18px;
+                    }
+                    .rows .row-item{
+                        font-size: 17px;
+                    }
                 }
+
             }
         }
     }