柯赛看板调整，仓库、品质看板调整

src/assets/scss/indexwarehouse.scss

@@ -136,7 +136,7 @@
       .bottom-box {
         // margin-top: 10px;
         display: grid;
-        grid-template-columns: 1.2fr 1fr 0.8fr;
+        grid-template-columns: 1.2fr 1.8fr;
       }
     }
   }

src/components/warehousechart/bottom1Chart/index.vue

@@ -86,75 +86,6 @@ export default {
             }
           ],
           series: newData.series
-          /*  [
-          {
-            name: '线体产出',
-            type: 'bar',
-            barWidth: 20,
-            emphasis: {
-              focus: 'series'
-            },
-            data:[],
-            label: {
-              show: true,
-              position: 'top',
-              fontSize:14,
-              fontWeight: "bold",
-              color:"inherit",
-            },
-            itemStyle: {
-              normal: {
-                color:  "rgb(174,228,187)"
-              }
-            },
-          },
-          {
-            name: '计划剩余',
-            type: 'bar',
-            barWidth: 20,
-            stack: 'Ad',
-            emphasis: {
-              focus: 'series'
-            },
-            data:[],
-            label: {
-              show: true,
-              position: 'top',
-              fontSize:14,
-              fontWeight: "bold",
-              color:"inherit",
-            },
-            itemStyle: {
-              normal: {
-                color:  "rgb(251,234,78)"
-              }
-            },
-          },
-          {
-             name: '计划达成率%',
-             type: 'line',
-             data:[],
-             yAxisIndex: 1,
-             symbolSize: 4,
-             tooltip: {
-               valueFormatter: function (value) {
-                 return value + '%';
-               }
-             },
-             lineStyle: {
-               width: 3
-             },
-             itemStyle: {
-               normal: {
-                 barBorderRadius: 6,
-                 color:  "rgb(42,87,42)"
-               }
-             },
-             emphasis: {
-               focus: 'series'
-             }
-           }
-        ]*/
         }
       },
       immediate: true,

src/components/warehousechart/bottom3Chart/chart.vue

@@ -1,97 +0,0 @@
-<template>
-  <div>
-    <Echart
-        :options="options"
-        id="bottom3Chart"
-        height="420px"
-        width="100%"
-    ></Echart>
-  </div>
-</template>
-
-<script>
-import Echart from '@/common/echart'
-export default {
-  data () {
-    return {
-      options: {},
-    };
-  },
-  components: {
-    Echart,
-  },
-  props: {
-    cdata: {
-      type: Object,
-      default: () => ({})
-    },
-  },
-  watch: {
-    cdata: {
-      handler (newData) {
-        this.options = {
-          color: [
-            "#37a2da",
-            "#32c5e9",
-            "#37a2da",
-            "#32c5e9",
-            "#ff9f7f",
-            "#fb7293",
-            "#e7bcf3",
-            "#8378ea"
-          ],
-          tooltip: {
-            trigger: "item",
-            formatter: "{b} : {c} ({d}%)"
-          },
-          toolbox: {
-            show: true
-          },
-          legend: {
-            orient: "vertical",
-            icon: "circle",
-            bottom: 40,
-            left: "center",
-            x: "center",
-            formatter: function(name){
-              let data = newData.data;
-              var total = 0;
-              var target;
-              for (var i = 0, l = data.length; i < l; i++) {
-                total += data[i].value;
-                if (data[i].name == name) {
-                  target = data[i].value;
-                }
-              }
-              return name + ' : ' + target+" ("+((target/total)*100).toFixed(2) + '%)';
-            },
-            textStyle: {
-              color: "#fff",
-              fontSize: 18,
-            },
-          },
-          calculable: true,
-          series: [
-            {
-              type: "pie",
-              radius: '50%',
-              center: ['50%', '45%'],
-              data: newData.data,
-              label: {
-                fontSize: 18,
-                fontWeight:"bold",
-                color: "#d3d6dd",
-              },
-            },
-          ]
-        }
-      },
-      immediate: true,
-      deep: true
-    }
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-</style>

src/components/warehousechart/bottom3Chart/index.vue

@@ -1,75 +0,0 @@
-<template>
-  <div>
-    <Chart :cdata="cdata" />
-  </div>
-</template>
-
-<script>
-import Chart from './chart.vue';
-import {mapState} from "vuex";
-
-export default {
-  computed: {
-    ...mapState(['factory']),
-  },
-  data () {
-    return {
-      timing :null,
-      cdata: {
-        xData:[],
-        data:[],
-      }
-    }
-  },
-  components: {
-    Chart,
-  },
-  mounted () {
-    console.log('23');
-    this.refreshdata();
-  },
-  beforeDestroy () {
-    clearInterval(this.timing);
-    this.chart.dispose()
-    this.chart.clear()
-    this.chart=null
-  },
-  methods: {
-    refreshdata() {
-      this.getdata();
-      this.timing = setInterval(() => {
-        this.getdata(); //获取-数据
-      }, 10000);
-    },
-    async getdata() {
-      //工单发料完成比例
-      var caller = 'KB!WHMAKEFLRATE';
-      console.log('23');
-      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);
-            let data1 = new Array();
-            for (let index = 0; index < dataList.length; index++) {
-              const element = dataList[index];
-              let ob = new Object();
-              ob.value = element.v_qty;
-              ob.name = element.v_name;
-              data1.push(ob);
-            }
-            console.log(data1);
-            this.cdata.data = data1;
-          },(result)=>{
-            console.error(result)
-          }
-      );
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-</style>

src/views/quality/bottom1.vue

@@ -2,35 +2,41 @@
   <div id="bottom1">
     <div class="bg-color-black">
       <div class="d-flex flex-column body-box">
-        <div class ="ditem1">
-          <div class="d-flex pt-1 pl-2 pb-5 jc-center">
-            <span class="fs-xxl text mx-2 fw-b">重点不良订单</span>
-          </div>
-          <div class="d-flex jc-center">
-            <dv-scroll-board :config="config" ref="scroll-board" />
-          </div>
-        </div>
-
         <div class ="ditem mt-5">
           <div class="d-flex pt-1 pl-2 pb-3 jc-center">
-            <span class="fs-xxl text mx-2 fw-b ">当日首件制作数</span>
+            <span class="fs-xxl text mx-2 fw-b ">当日首件制作状况</span>
           </div>
           <div class="flexup">
             <div class="item">
-              <p class="ml-3 colorBlue fw-b fs-xl">首件数</p>
+              <p class="ml-3 colorBlue fw-b fs-xxl">首件数</p>
               <div class="dv-dig-flop ml-1 mt-2 pl-3 colorGrass"> {{ firstdata.v_sjqty }}
               </div>
             </div>
             <div class="item">
-              <p class="ml-3 colorBlue fw-b fs-xl">合格数</p>
+              <p class="ml-3 colorBlue fw-b fs-xxl">合格数</p>
               <div class="dv-dig-flop ml-1 mt-2 pl-3 colorGrass"> {{ firstdata.v_okqty }}
               </div>
             </div>
             <div class="item">
-              <p class="ml-3 colorBlue fw-b fs-xl">合格率</p>
+              <p class="ml-3 colorBlue fw-b fs-xxl">合格率</p>
               <div class="dv-dig-flop ml-1 mt-2 pl-3 colorGrass"> {{ firstdata.v_okrate }}
               </div>
             </div>
+            <div class="item">
+              <p class="ml-3 colorBlue fw-b fs-xxl">不合格数</p>
+              <div class="dv-dig-flop ml-1 mt-2 pl-3 colorGrass"> {{ firstdata.v_ngqty }}
+              </div>
+            </div>
+            <div class="item">
+              <p class="ml-3 colorBlue fw-b fs-xxl">待确认数</p>
+              <div class="dv-dig-flop ml-1 mt-2 pl-3 colorGrass"> {{ firstdata.v_needcqty }}
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class ="ditem1">
+          <div class="d-flex jc-center">
+            <dv-scroll-board :config="config" ref="scroll-board" />
           </div>
         </div>
       </div>
@@ -50,20 +56,22 @@ export default {
     return {
       timing:null,
       config: {
-        header: ['订单号','不良现象', '不良数量'],
+        header: ['SO订单号','料号','状态','当前处理人'],
         data: [],
         rowNum: 7, //表格行数
         headerHeight: 35,
         headerBGC: 'rgba(15,19,37,0.1)', //表头
         oddRowBGC: 'rgba(15,19,37,0.1)', //奇数行
         evenRowBGC: 'rgba(23,28,51,0.1)', //偶数行
-        columnWidth: [150,300,110],
-        align: ['center','center','center']
+        columnWidth: [150,170,110],
+        align: ['center','center','center','center']
       },
       firstdata:{
         v_sjqty:0,
         v_okqty:0,
         v_okrate:'0%',
+        v_ngqty:0,
+        v_needcqty:0
       },
     }
   },
@@ -82,8 +90,8 @@ export default {
       }, 10000);
     },
     async settestdata() {
-      //重点不良订单
-      var caller = 'KB!QualityPointBadData';
+      //首件制作状态
+      var caller = 'KB!QualityFirstDetail';
       await this.$http.get("kanban/datalist.action?caller="+caller+"&_noc=1&page=1&pageSize=100",{
         params: {
           condition: "1=1",
@@ -95,8 +103,9 @@ export default {
                 const element = dataList[index];
                 let item = new Array();
                 item.push("<span  class='colorGrass fs-xl'>" + element.v_sacode + "</span>");
-                item.push("<span  class='colorRemind fs-xl'>" + element.v_remark + "</span>");
-                item.push("<span  class='colorGrass fs-xl'>" + element.v_qty + "</span>");
+                item.push("<span  class='colorGrass fs-xl'>" + element.v_prodcode + "</span>");
+                item.push("<span  class='colorGrass fs-xl'>" + element.v_status + "</span>");
+                item.push("<span  class='colorGrass fs-xl'>" + element.v_manname + "</span>");
                 resultList.push(item);
               }
               const scrollBoard = this.$refs['scroll-board'];
@@ -150,7 +159,7 @@ $box-width: 100%;
     overflow: hidden;
     height: 100%;
     .ditem1{
-      height:66.7%;
+      height:60%;
       ::v-deep  .dv-scroll-board .header {
         font-size: 22px;
       }
@@ -160,7 +169,7 @@ $box-width: 100%;
       }
     }
     .ditem {
-      height:33.3%;
+      height:40%;
       .flexup {
         display: flex;
         flex-wrap: wrap;
@@ -168,7 +177,7 @@ $box-width: 100%;
           border-radius: 6px;
           padding-top: 8px;
           margin-top: 8px;
-          width: 33.3%;
+          width: 20%;
           height: 80px;
           .dv-dig-flop {
             width: 100%;

src/views/quality/bottom2.vue

@@ -2,7 +2,7 @@
   <div id="bottom2">
     <div class="bg-color-black">
       <div class="d-flex pt-1 pl-2 jc-center">
-        <span class="fs-xxl text mx-2 fw-b">近30天产线直通率趋势图</span>
+        <span class="fs-xxl text mx-2 fw-b">近15天产线直通率趋势图</span>
       </div>
       <div class="body-box">
         <div class="pt-2 " >
@@ -83,8 +83,8 @@ export default {
               se.data = new Array();
               seriesdata.push(se);
             }
-            //30天内
-            for (let i =29 ;i>=0;i--){
+            //15天内
+            for (let i =14 ;i>=0;i--){
               let formattedDate;
               if(i == 0){
                 formattedDate = this.$moment().format('MM/DD');

src/views/quality/up1.vue

@@ -67,7 +67,7 @@ export default {
               }
             }
             //获取最小值
-            if(v_mindata<100 && v_mindata>10 ){
+            if(v_mindata<=100 && v_mindata>10 ){
               v_mindata = v_mindata - 10;
             }
             this.ranking.data = datas;

src/views/total/up2.vue

@@ -8,7 +8,7 @@
               v-for="item in titleItem"
               :key="item.title"
           >
-            <p class="ml-3 colorY fw-b fs-xl mb-4">{{ item.title }}</p>
+            <p class="ml-3 colorY fw-b fs-xxxl mb-4">{{ item.title }}</p>
             <div>
               <dv-digital-flop
                   class="dv-dig-flop ml-1 mt-2 pl-3"
@@ -22,7 +22,7 @@
               v-for="item in datadown"
               :key="item.title"
           >
-            <p class="colorY fw-b fs-xl mb-3 " >{{ item.title }} {{ item.value }}</p>
+            <p class="fw-b fs-xl mb-3 " >{{ item.title }} {{ item.value }}</p>
           </div>
         </div>
       </div>
@@ -156,7 +156,7 @@ $box-width: 100%;
         }
 
         .colorY, .colorY:hover {
-          color: #00a11a !important
+          color: #11ee35 !important
         }
       }
     }

src/views/warehouse/bottom1.vue

@@ -2,7 +2,7 @@
   <div id="bottom2">
     <div class="bg-color-black">
       <div class="d-flex pt-1 pl-2 jc-center">
-        <span class="fs-xxl text mx-2 fw-b">近7天来料合格率</span>
+        <span class="fs-xxxl text mx-2 fw-b">近7天来料合格率</span>
       </div>
       <div class="body-box">
         <div class="pt-2 " >
@@ -26,6 +26,76 @@ export default {
   },
   data() {
     return {
+      colorList: {
+        linearYtoG: {
+          type: 'linear',
+          x: 0,
+          y: 0,
+          x2: 1,
+          y2: 1,
+          colorStops: [
+            {
+              offset: 0,
+              color: '#f5b44d'
+            },
+            {
+              offset: 1,
+              color: '#28f8de'
+            }
+          ]
+        },
+        linearGtoB: {
+          type: 'linear',
+          x: 0,
+          y: 0,
+          x2: 1,
+          y2: 0,
+          colorStops: [
+            {
+              offset: 0,
+              color: '#43dfa2'
+            },
+            {
+              offset: 1,
+              color: '#28f8de'
+            }
+          ]
+        },
+        linearBtoG: {
+          type: 'linear',
+          x: 0,
+          y: 0,
+          x2: 1,
+          y2: 0,
+          colorStops: [
+            {
+              offset: 0,
+              color: '#1c98e8'
+            },
+            {
+              offset: 1,
+              color: '#28f8de'
+            }
+          ]
+        },
+        areaBtoG: {
+          type: 'linear',
+          x: 0,
+          y: 0,
+          x2: 0,
+          y2: 1,
+          colorStops: [
+            {
+              offset: 0,
+              color: 'rgba(35,184,210,.2)'
+            },
+            {
+              offset: 1,
+              color: 'rgba(35,184,210,0)'
+            }
+          ]
+        }
+      },
       linedata :{
         series : null,
         xAxiss  :null,
@@ -92,7 +162,10 @@ export default {
               data: ndata,
               symbolSize: 4,
               lineStyle: {
-                width: 4
+                normal: {
+                  color: this.colorList.linearBtoG,
+                  width: 4
+                }
               },
               label: {
                 show: true,
@@ -103,7 +176,12 @@ export default {
               },
               emphasis: {
                 focus: 'series'
-              }
+              },
+              areaStyle: {
+                normal: {
+                  color: this.colorList.areaBtoG
+                }
+              },
             });
             this.linedata.series = series;
             this.linedata.xAxiss = xAxis0;

src/views/warehouse/bottom2.vue

@@ -1,33 +1,111 @@
 <template>
   <div id="bottom2">
     <div class="bg-color-black">
-      <div class="d-flex jc-center pt-1 pl-2 mb-3">
-        <span class="fs-xxl text mx-2 fw-b">工单备料完成进度</span>
+      <div class="d-flex pt-2 pl-2 jc-center pb-2 mb-2">
+        <span class="fs-xxxl text mx-2 fw-b">工单备料完成进度</span>
       </div>
-      <div>
-        <Bottom2Chart />
+      <div class="d-flex jc-center body-box">
+        <dv-scroll-board :config="config" ref="scroll-board" />
       </div>
     </div>
   </div>
 </template>
 
 <script>
-import Bottom2Chart from '@/components/warehousechart/bottom2Chart';
 export default {
   components: {
-    Bottom2Chart
+  },
+  data() {
+    return {
+      config: {
+        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: [200,220, 150,180,160,160],
+        align: ['center','center','center','center','center','center']
+      },
+      timing: null,
+    }
+  },
+  mounted() {
+    this.refreshdata()
+  },
+  beforeDestroy() {
+    clearInterval(this.timing)
+  },
+  methods: {
+    refreshdata() {
+      this.getdata(); //获取-数据
+      this.timing = setInterval(() => {
+        this.getdata(); //获取--数据
+      }, 10000);
+    },
+
+    async getdata() {
+      var caller = 'KB!WHMAKEBL';
+      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);
+                let resultList = new Array();
+                for (let index = 0; index < dataList.length; index++) {
+                  const element = dataList[index];
+                  let item = new Array();
+                  item.push("<span  class='colorGrass fs-xl'>" + element.ma_code + "</span>");
+                  item.push("<span  class='colorGrass fs-xl'>" + element.ma_prodcode + "</span>");
+                  item.push("<span  class='colorGrass fs-xl'>" + element.ma_qty + "</span>");
+                  item.push("<span  class='colorGrass fs-xl'>" + element.v_status + "</span>");
+                  item.push("<span  class='colorGrass fs-xl'>" + element.v_haveqty + "</span>");
+                  item.push("<span  class='colorGrass fs-xl'>" + element.v_unqty + "</span>");
+                  resultList.push(item);
+                }
+                this.config.data = resultList;
+                this.config = { ...this.config };
+              }, (result) => {
+                console.error(result)
+              }
+          );
+    }
   }
-}
+};
 </script>
 
-<style lang="scss" scoped>
-$box-height: 520px;
+<style lang="scss" class>
+$box-height: 475px;
 $box-width: 100%;
 #bottom2 {
-  padding: 15px 10px;
+  padding: 13px;
   height: $box-height;
   width: $box-width;
   border-radius: 5px;
+  .bg-color-black {
+    border-radius: 10px;
+    height: $box-height - 25px;
+    padding: 5px;
+  }
+
+  .text {
+    color: #c3cbde;
+    //font-size: 15px;
+  }
+
+  .body-box {
+    width: $box-width;
+
+    .dv-scroll-board .header {
+      font-size: 20px;
+    }
+
+    .dv-scroll-board {
+      height: $box-height - 70px;
+    }
+  }
 
 }
-</style>
+</style>

src/views/warehouse/bottom2Old.vue

@@ -0,0 +1,33 @@
+<template>
+  <div id="bottom2">
+    <div class="bg-color-black">
+      <div class="d-flex jc-center pt-1 pl-2 mb-3">
+        <span class="fs-xxl text mx-2 fw-b">工单备料完成进度</span>
+      </div>
+      <div>
+        <Bottom2Chart />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Bottom2Chart from '../../components/warehousechart/bottom2OldChart';
+export default {
+  components: {
+    Bottom2Chart
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+$box-height: 520px;
+$box-width: 100%;
+#bottom2 {
+  padding: 15px 10px;
+  height: $box-height;
+  width: $box-width;
+  border-radius: 5px;
+
+}
+</style>

src/views/warehouse/bottom3.vue

@@ -1,66 +0,0 @@
-<template>
-  <div id="up1">
-    <div class="bg-color-black">
-      <div class="d-flex pt-1 pl-2 jc-center">
-        <span class="fs-xxl text mx-2 fw-b">当日维修分析表</span>
-      </div>
-      <div class="body-box">
-        <Bottom3Chart />
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-
-import {mapState} from "vuex";
-import Bottom3Chart from '@/components/warehousechart/bottom3Chart';
-export default {
-  computed: {
-    //数组写法
-    ...mapState(['user','factoryoptions','factory']),
-  },
-  data() {
-    return {
-      timing:null,
-    }
-  },
-  components: {Bottom3Chart},
-  mounted() {
-     //this.refreshdata();
-  },
-  beforeDestroy () {
-    clearInterval(this.timing)
-  },
-  methods: {
-    refreshdata() {
-      this.settestdata(); //获取数据
-      this.timing = setInterval(() => {
-        this.settestdata(); //获取-主题词
-      }, 10000);
-    },
-
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-$box-height: 475px;
-$box-width: 100%;
-#up1 {
-  padding: 13px;
-  height: $box-height;
-  // font-size: 32px;
-  width: $box-width;
-  border-radius: 5px;
-  .bg-color-black {
-    height: $box-height - 25px;
-    border-radius: 10px;
-    padding: 5px;
-    width: $box-width;
-    .body-box {
-      padding-top: 25px;
-    }
-  }
-}
-</style>

src/views/warehouse/index.vue

@@ -86,9 +86,6 @@
             <dv-border-box-12>
               <bottom2 />
             </dv-border-box-12>
-            <dv-border-box-12>
-              <bottom3 />
-            </dv-border-box-12>
           </div>
         </div>
       </div>
@@ -105,7 +102,6 @@ import up2 from './up2.vue';
 import up3 from './up3.vue';
 import bottom1 from  './bottom1.vue'
 import bottom2 from  './bottom2.vue'
-import bottom3 from  './bottom3.vue'
 import {mapMutations, mapState} from "vuex"
 
 export default {
@@ -129,7 +125,7 @@ export default {
     }
   },
   components: {
-    up1,up2,up3, bottom1,bottom2, bottom3
+    up1,up2,up3, bottom1,bottom2
   },
   created() {
     // this.getuldata();

src/views/warehouse/up1.vue

@@ -2,7 +2,7 @@
   <div id="up1">
     <div class="bg-color-black">
       <div class="d-flex pt-1 pl-2 jc-center">
-        <span class="fs-xxl text mx-2 fw-b">来料检验数据</span>
+        <span class="fs-xxxl text mx-2 fw-b">来料检验数据</span>
       </div>
       <div class="jc-center body-box">
         <Up1Chart/>

src/views/warehouse/up2.vue

@@ -3,7 +3,7 @@
     <div class="bg-color-black">
       <div class="up mt-4">
         <div class="d-flex pt-1 pl-2 jc-center mb-5">
-          <span class="fs-xxl text mx-2 fw-b">备料完工情况</span>
+          <span class="fs-xxl text mx-2 fw-b">出入库情况</span>
         </div>
         <div class="body-box d-flex">
           <div class="item d-flex jc-center flex-column">

src/views/warehouse/up3.vue

@@ -2,7 +2,7 @@
   <div id="up3">
     <div class="bg-color-black">
       <div class="d-flex pt-2 pl-2 jc-center pb-2 mb-2">
-        <span class="fs-xxl text mx-2 fw-b">仓库预警信息</span>
+        <span class="fs-xxxl text mx-2 fw-b">仓库预警信息</span>
       </div>
       <div class="d-flex jc-center body-box">
         <dv-scroll-board :config="config" ref="scroll-board" />