修改看板取数

src/views/quality/up1.vue

@@ -127,70 +127,75 @@ export default {
           condition: cond
         }
       }).then((result)=>{
-            let dataList = JSON.parse(result.data.data);
-            let series = new Array();
-            let xAxis0 = new Array();
-            let mindata = 100;
-
-            //7天内
-            let ndata = new Array();
-            for (let i =6 ;i>=0;i--){
-              let formattedDate;
-              if(i == 0){
-                formattedDate = this.$moment().format('MM/DD');
-              }else{
-                formattedDate = this.$moment().subtract(i, 'days').format('MM/DD')
-              }
-              xAxis0.push(formattedDate);
-              //获取分组当天数据
-              let dataall = dataList;
-              let data0 = '-';
-              if(null != dataall) {
-                let datam = dataall.filter(item => item.v_ymd == formattedDate);
-                if(datam.length>0){
-                  data0 = datam[0].v_okrate;
-                  if(mindata>data0){
-                    mindata = data0;
-                  }
-                }
-              }
-              ndata.push(data0);
+        let dataList = JSON.parse(result.data.data);
+        let series = new Array();
+        let xAxis0 = new Array();
+        let mindata = 100;
+        let ndata = new Array();
+        for (let index = 0; index < dataList.length; index++) {
+          const element = dataList[index];
+          xAxis0.push(element.v_ymd);
+          ndata.push(element.v_okrate);
+        }
+        //7天内
+        /* let ndata = new Array();
+         for (let i =6 ;i>=0;i--){
+           let formattedDate;
+           if(i == 0){
+             formattedDate = this.$moment().format('MM/DD');
+           }else{
+             formattedDate = this.$moment().subtract(i, 'days').format('MM/DD')
+           }
+           xAxis0.push(formattedDate);
+           //获取分组当天数据
+           let dataall = dataList;
+           let data0 = '-';
+           if(null != dataall) {
+             let datam = dataall.filter(item => item.v_ymd == formattedDate);
+             if(datam.length>0){
+               data0 = datam[0].v_okrate;
+               if(mindata>data0){
+                 mindata = data0;
+               }
+             }
+           }
+           ndata.push(data0);
+         }*/
+        series.push({
+          name: '合格率',
+          type: 'line',
+          data: ndata,
+          symbolSize: 4,
+          lineStyle: {
+            normal: {
+              color: this.colorList.linearBtoG,
+              width: 4
+            }
+          },
+          label: {
+            show: true,
+            position: 'top',
+            fontSize:15,
+            color:'inherit',
+            fontWeight: "bold"
+          },
+          emphasis: {
+            focus: 'series'
+          },
+          areaStyle: {
+            normal: {
+              color: this.colorList.areaBtoG
             }
-            series.push({
-              name: '合格率',
-              type: 'line',
-              data: ndata,
-              symbolSize: 4,
-              lineStyle: {
-                normal: {
-                  color: this.colorList.linearBtoG,
-                  width: 4
-                }
-              },
-              label: {
-                show: true,
-                position: 'top',
-                fontSize:15,
-                color:'inherit',
-                fontWeight: "bold"
-              },
-              emphasis: {
-                focus: 'series'
-              },
-              areaStyle: {
-                normal: {
-                  color: this.colorList.areaBtoG
-                }
-              },
-            });
-            this.linedata.series = series;
-            this.linedata.xAxiss = xAxis0;
-            //最小值往下取整10的倍数，然后减20
-            mindata = Math.floor(mindata/10)*10 - 20;
-            mindata = mindata<0?0:mindata;
-            this.linedata.min = mindata;
-            //分7个数据，6段
-            this.linedata.interval = Math.ceil((100-mindata)/7);
+          },
+        });
+        this.linedata.series = series;
+        this.linedata.xAxiss = xAxis0;
+        //最小值往下取整10的倍数，然后减20
+        mindata = Math.floor(mindata/10)*10 - 20;
+        mindata = mindata<0?0:mindata;
+        this.linedata.min = mindata;
+        //分7个数据，6段
+        this.linedata.interval = Math.ceil((100-mindata)/7);
           },(result)=>{
             console.error(result)
           }

src/views/warehouse/bottom1.vue

@@ -131,9 +131,14 @@ export default {
             let series = new Array();
             let xAxis0 = new Array();
             let mindata = 100;
-
-            //7天内
             let ndata = new Array();
+            for (let index = 0; index < dataList.length; index++) {
+               const element = dataList[index];
+               xAxis0.push(element.v_ymd);
+               ndata.push(element.v_okrate);
+            }
+            //7天内
+           /* let ndata = new Array();
             for (let i =6 ;i>=0;i--){
               let formattedDate;
               if(i == 0){
@@ -155,7 +160,7 @@ export default {
                 }
               }
               ndata.push(data0);
-            }
+            }*/
             series.push({
               name: '合格率',
               type: 'line',

src/views/warehouse/up2.vue

@@ -34,8 +34,9 @@
       <div class="down">
         <div class="body-box">
           <div class="d-flex jc-center fs-xxl fw-b rate flex-column">
-            <div>需备料单据数：{{finishQty}} </div>
+            <div>需备料物料数：{{finishQty}} </div>
             <div class="mt-3">已完成备料数：{{unfinishQty}}</div>
+            <div class="mt-3">备料完成比例：{{finishrate}}</div>
           </div>
         </div>
       </div>
@@ -53,6 +54,7 @@ export default {
       timing:null,
       finishQty:0,
       unfinishQty:0,
+      finishrate:'',
       inQty:10000,
       outQty:10000,
     }
@@ -77,7 +79,7 @@ export default {
       this.unfinishQty = 0;
       this.inQty = 0;
       this.outQty = 0;
-
+      this.finishrate="";
       //备料完成情况
       caller = 'KB!WHPREMADEData1';
       await this.$http.get("kanban/datalist.action?caller="+caller+"&_noc=1&page=1&pageSize=100",{
@@ -106,6 +108,7 @@ export default {
             if(dataList.length>0){
               this.finishQty = dataList[0].finishqty;
               this.unfinishQty = dataList[0].unfinishqty;
+              this.finishrate = dataList[0].finishrate;
             }
           }, (result) => {
             console.error(result)

src/views/warehouse/up3.vue

@@ -7,6 +7,13 @@
       <div class="d-flex jc-center body-box">
         <dv-scroll-board :config="config" ref="scroll-board" />
       </div>
+      <div class="down">
+        <div class="body-box">
+          <div class="d-flex jc-center fs-xxl fw-b rate flex-column">
+            <div class="mt-3">入库完成比例：{{finishrate}}</div>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
@@ -18,15 +25,15 @@ export default {
   data() {
     return {
       config: {
-        header: ['物料种类','送检数量','入库数量','入库比例'],
+        header: ['物料编号','物料名称','送检数量','入库数量'],
         data: [],
         rowNum: 10, //表格行数
         headerHeight: 40,
         headerBGC: 'rgba(15,19,37,0.1)', //表头
         oddRowBGC: 'rgba(15,19,37,0.1)', //奇数行
         evenRowBGC: 'rgba(23,28,51,0.1)', //偶数行
-        columnWidth: [150,135, 150,100],
-        align: ['center','center','center']
+        columnWidth: [200,135, 100,100],
+        align: ['center','center','center','center']
       },
       timing: null,
     }
@@ -57,10 +64,10 @@ export default {
                 for (let index = 0; index < dataList.length; index++) {
                   const element = dataList[index];
                   let item = new Array();
-                  item.push("<span  class='colorGrass fs-xl'>" + element.pr_kind + "</span>");
+                  item.push("<span  class='colorGrass fs-xl'>" + element.pr_code + "</span>");
+                  item.push("<span  class='colorGrass fs-xl'>" + element.pr_detail + "</span>");
                   item.push("<span  class='colorGrass fs-xl'>" + element.送检数量 + "</span>");
-                  item.push("<span  class='colorGrass fs-xl'>" + element.已入库数量 + "</span>");
-                  item.push("<span  class='colorGrass fs-xl'>" + element.入库比例 + "</span>");
+                  item.push("<span  class='colorGrass fs-xl'>" + element.入库数量 + "</span>");
                   resultList.push(item);
                 }
                 this.config.data = resultList;
@@ -69,6 +76,22 @@ export default {
                 console.error(result)
               }
           );
+
+      caller = 'KB!WHPREMADERate';
+      await this.$http.get("kanban/datalist.action?caller="+caller+"&_noc=1&page=1&pageSize=100",{
+        params: {
+          condition: "1=1"
+        }
+      }).then((result) => {
+            let dataList = JSON.parse(result.data.data);
+            if(dataList.length>0){
+              this.finishrate = dataList[0].finishrate;
+            }
+          }, (result) => {
+            console.error(result)
+          }
+      );
+
     }
   }
 };
@@ -93,6 +116,14 @@ $box-width: 100%;
     //font-size: 15px;
   }
 
+  .down {
+    width: 100%;
+    .rate{
+      justify-content: center; /* 水平居中 */
+      align-items: center;
+    }
+  }
+
   .body-box {
     width: $box-width;
 
@@ -101,7 +132,7 @@ $box-width: 100%;
     }
 
     .dv-scroll-board {
-      height: $box-height - 70px;
+      height: $box-height - 140px;
     }
   }
 

src/views/zz/bottom1.vue

@@ -60,21 +60,37 @@ export default {
                 for (let index = 0; index < dataList.length; index++) {
                   const element = dataList[index];
                   let item = new Array();
-                  item.push("<span  class='colorGrass fs-xxl'>" + element.v_linecode + "</span>");
-                  item.push("<span  class='colorGrass fs-xxl'>" + element.v_sacode + "</span>");
-                  item.push("<span  class='colorGrass fs-xxl'>" + element.v_sellername + "</span>");
-                  item.push("<span  class='colorGrass fs-xxl'>" + element.v_jitype + "</span>");
-                  item.push("<span  class='colorGrass fs-xxl'>" + element.v_qty + "</span>");
-                  if (element.v_blstatus == '未领料') {  //98%
-                    item.push("<span  class='colorRemind fs-xxl'>" + element.v_blstatus + "</span>");
-                  } else {
-                    item.push("<span  class='colorGrass fs-xxl'>" + element.v_blstatus + "</span>");
+                  if(null !=element.v_remark1 && ""!= element.v_remark1){
+                    item.push("<span  class='colorRed fs-xxl'>" + element.v_licode + "</span>");
+                    item.push("<span  class='colorRed fs-xxl'>" + element.v_sacode + "</span>");
+                    item.push("<span  class='colorRed fs-xxl'>" + element.v_seller + "</span>");
+                    item.push("<span  class='colorRed fs-xxl'>" + element.v_jitype + "</span>");
+                    item.push("<span  class='colorRed fs-xxl'>" + element.v_qty + "</span>");
+                    item.push("<span  class='colorRed fs-xxl'>" + element.v_blstatus + "</span>");
+                    item.push("<span  class='colorRed fs-xxl'>" + element.v_planoutqty + "</span>");
+                    item.push("<span  class='colorRed fs-xxl'>" + element.v_madeqty + "</span>");
+                    item.push("<span  class='colorRed fs-xxl'>" + element.v_madejd + "</span>");
+                    item.push("<span  class='colorRed fs-xxl'>" + element.v_remark + "</span>");
+                    item.push("<span  class='colorRed fs-xxl'>" + element.v_remark1 + "</span>");
+                    item.push("<span  class='colorRed fs-xxl'>" + element.v_yc + "</span>");
+                  }else{
+                    item.push("<span  class='colorGrass fs-xxl'>" + element.v_licode + "</span>");
+                    item.push("<span  class='colorGrass fs-xxl'>" + element.v_sacode + "</span>");
+                    item.push("<span  class='colorGrass fs-xxl'>" + element.v_seller + "</span>");
+                    item.push("<span  class='colorGrass fs-xxl'>" + element.v_jitype + "</span>");
+                    item.push("<span  class='colorGrass fs-xxl'>" + element.v_qty + "</span>");
+                    if (element.v_blstatus == '加工中') {  //98%
+                      item.push("<span  class='colorRemind fs-xxl'>" + element.v_blstatus + "</span>");
+                    } else {
+                      item.push("<span  class='colorGrass fs-xxl'>" + element.v_blstatus + "</span>");
+                    }
+                    item.push("<span  class='colorGrass fs-xxl'>" + element.v_planoutqty + "</span>");
+                    item.push("<span  class='colorGrass fs-xxl'>" + element.v_madeqty + "</span>");
+                    item.push("<span  class='colorGrass fs-xxl'>" + element.v_madejd + "</span>");
+                    item.push("<span  class='colorRemind fs-xxl'>" + element.v_remark + "</span>");
+                    item.push("<span  class='colorGrass fs-xxl'>" + element.v_remark1 + "</span>");
+                    item.push("<span  class='colorRemind fs-xxl'>" + element.v_yc + "</span>");
                   }
-                  item.push("<span  class='colorGrass fs-xxl'>" + element.v_planoutqty + "</span>");
-                  item.push("<span  class='colorGrass fs-xxl'>" + element.v_madeqty + "</span>");
-                  item.push("<span  class='colorGrass fs-xxl'>" + element.v_madejd + "</span>");
-                  item.push("<span  class='colorRemind fs-xxl'>" + element.v_remark + "</span>");
-                  item.push("<span  class='colorRemind fs-xxl'>" + element.v_yc + "</span>");
                   resultList.push(item);
                 }
                 const scrollBoard = this.$refs['scroll-board'];

src/views/zz/up2.vue

@@ -94,7 +94,7 @@ export default {
       this.finishRate = 0;
       this.unfinishRate = 0;
       //比例,用的是总看板的达成比例caller，如果不一样，自行修改caller
-      caller = 'KB!TOTALMonthMakeRate';
+      caller = 'KB!TOTALDayMakeRate';
       await this.$http.get("kanban/datalist.action?caller="+caller+"&_noc=1&page=1&pageSize=100",{
         params: {
           condition: "1=1"