看板调整

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

@@ -68,7 +68,7 @@ export default {
             //data: [320, 332, 301, 334, 390, 330, 320]
           },*/
           {
-            name: '产出',
+            name: '线体产出',
             type: 'bar',
             barWidth: 20,
             stack: 'Ad',
@@ -82,7 +82,7 @@ export default {
             //data: [220, 232, 221, 234, 290, 230, 220]
           },
           {
-            name: '不良',
+            name: '计划剩余',
             type: 'bar',
             stack: 'Ad',
             barWidth: 10,
@@ -92,12 +92,12 @@ export default {
               focus: 'series'
             },
             itemStyle: {
-              color: '#ff7261'  //fac858
+              color: '#FFE900'  //fac858
             },
 
           },
           {
-            name: '良率%',
+            name: '计划达成率%',
             type: 'line',
             data:[],
             yAxisIndex: 1,

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

@@ -80,7 +80,25 @@ export default {
                 show: true,
                 position: 'left',
                 offset: [5, -10],
-                fontWeight: "bold"
+                formatter: (params) => {
+                  let value = `${params.value}`;
+                  if (value < 98) {
+                    return '{ng|' + value + '}';
+                  } else {
+                    return '{pass|' + value + '}';
+                  }
+                },
+                rich: {
+                  pass: {
+                    color: 'green',    //插件测试≥98%、成品测试≥98%、老化试验≥98% ,小于这个值红色#f81413
+                    fontWeight: "bold",
+                  },
+                  ng: {
+                    color: 'red',
+                    fontWeight: "bold",
+                  }
+                },
+
               },
 
               itemStyle: {

src/components/echart/centerRight/centerRightChart/index.vue

@@ -78,6 +78,7 @@ export default {
                           const element = dataList[index];
                           let obj = new Object();
                           obj.name = element.name;
+                          //插件测试≥98%、成品测试≥98%、老化试验≥98% ,小于这个值红色#f81413
                           obj.max = 100;
                           indicatorData.push(obj);
                           //数据

src/views/bottomLeft2.vue

@@ -6,7 +6,7 @@
           <icon name="chart-bar" class="text-icon"></icon>
         </span>
         <div class="d-flex">
-          <span class="fs-xl text mx-2">当日线体产出及良率</span>
+          <span class="fs-xl text mx-2">当日线体产出及计划达成统计</span>
         </div>
       </div>
       <div>

src/views/bottomRight.vue

@@ -23,7 +23,7 @@
       <div class="bg-color-black">
        <div class="d-flex pt-2 pl-2">
           <div class="d-flex">
-            <span class="fs-xl text mx-2">线体不良统计</span>
+            <span class="fs-xl text mx-2">当日线体不良统计</span>
           </div>
         </div>
         <div>

src/views/bottomRight2.vue

@@ -12,9 +12,9 @@
       <div class="d-flex jc-center body-box">
         <dv-scroll-board class="dv-scr-board" :config="config" ref="scroll-board" />
       </div>
-      <div class="d-flex jc-center body-box2">
+      <!--<div class="d-flex jc-center body-box2">
         <dv-scroll-board class="dv-scr-board" :config="config2" ref="scroll-board2" />
-      </div>
+      </div>-->
     </div>
   </div>
 </template>
@@ -26,7 +26,7 @@ export default {
       config: {
         header: ['线别','测试数','不良数', '良率%'],
         data: [],
-        rowNum: 4, //表格行数
+        rowNum: 8, //表格行数
         headerHeight: 35,
         headerBGC: '#0f1325', //表头
         oddRowBGC: '#0f1325', //奇数行
@@ -68,7 +68,11 @@ export default {
                       item.push(element.linecode);
                       item.push("<span  class='colorGrass'>" + element.testqty + "</span>");
                       item.push("<span  class='colorGrass'>" + element.ngqty + "</span>");
-                      item.push("<span  class='colorGrass'>" + element.value + "</span>");
+                      if(element.value<98) {  //98%
+                        item.push("<span  class='colorRed'>" + element.value + "</span>");
+                      }else {
+                        item.push("<span  class='colorGrass'>" + element.value + "</span>");
+                      }
                       resultList.push(item);
                     }
                     const scrollBoard = this.$refs['scroll-board'];
@@ -79,7 +83,7 @@ export default {
                     }
           );
       //低于98%
-      await this.$http.get("kanban/datalist.action?caller=ATERATE2&_noc=1&page=1&pageSize=100&condition=1=1")
+     /* await this.$http.get("kanban/datalist.action?caller=ATERATE2&_noc=1&page=1&pageSize=100&condition=1=1")
               .then((result)=>{
                         let dataList = JSON.parse(result.data.data);
                         let resultList = new Array();
@@ -98,7 +102,7 @@ export default {
                       },(result)=>{
                         console.error(result)
                       }
-              );
+              );*/
     }
   }
 }
@@ -126,7 +130,7 @@ $box-width: 310px;
     overflow: hidden;
     .dv-scr-board {
       width: 285px;
-      height: 200px;
+      height: 350px;
     }
   }
   .body-box2 {

src/views/center.vue

@@ -37,7 +37,16 @@ export default {
       ranking: {
         data: [],
         carousel: 'single',
-        rowNum:4
+        rowNum:4,
+        valueFormatter ({ name,value }) {
+          console.warn(arguments);
+          ///插件≥98%（包含误测）、组装≥99.2%、老化≥99%、包装≥98%（包含误测
+          if((name == '插件' && value<98) || (name == '组装' && value<99.2) || (name == '老化' && value<99) || (name == '包装' && value<98)) {
+            return '<div style ="color:red">' + value + ' </div>';
+          }else{
+            return value;
+          }
+        }
       },
       water: {
         data: [],//[24, 66],
@@ -95,8 +104,11 @@ export default {
                         let dataList = JSON.parse(result.data.data);
                         let datas = new Array();
                         for (let index = 0; index < dataList.length; index++) {
-                          //组装和包装高于99显示绿色，插件测试高于96 显示绿色 否则显示红色
+                          //插件≥98%（包含误测）、组装≥99.2%、老化≥99%、包装≥98%（包含误测）
                           const element = dataList[index];
+                         /* if(element.value<element.bzvalue){
+
+                          }*/
                           datas.push({
                             name:element.name ,
                             value:element.value,

src/views/centerOldData.vue

@@ -54,7 +54,11 @@ export default {
                       item.push(element.linecode);
                       item.push("<span  class='colorGrass'>"+element.qty+"</span>");
                       item.push("<span  class='colorGrass'>"+element.ngqty+"</span>");
-                      item.push("<span  class='colorGrass'>"+element.value+"</span>");
+                      if(element.value<99) {  //99%
+                        item.push("<span  class='colorRed'>" + element.value + "</span>");
+                      }else {
+                        item.push("<span  class='colorGrass'>" + element.value + "</span>");
+                      }
                       resultList.push(item);
                     }
                     const scrollBoard = this.$refs['scroll-board'];

src/views/centerRight1.vue

@@ -21,7 +21,7 @@ export default {
   data() {
     return {
       config: {
-        //线别，产出，不良，良率
+        //线别，产出，不良，良率PLANQTY 计划数  GETRATE  达成率
         header: ['线别', '产出', '不良','良率%'],
         data: [],
         rowNum: 9, //表格行数
@@ -55,7 +55,11 @@ export default {
                       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>");
+                      if(element.okrate<98) {  //98%
+                        item.push("<span  class='colorRed'>" + element.okrate + "</span>");
+                      }else {
+                        item.push("<span  class='colorGrass'>" + element.okrate + "</span>");
+                      }
                       resultList.push(item);
                     }
                     const scrollBoard = this.$refs['scroll-board'];