Bläddra i källkod

调整dip看板

yhluo 6 dagar sedan
förälder
incheckning
d368305627

+ 72 - 106
src/components/dipechart/bottom/bottomRightChart/index.vue

@@ -7,7 +7,7 @@
 <script>
 import Chart from './chart.vue'
 export default {
-  data () {
+  data() {
     return {
       drawTiming: null,
       cdata: {
@@ -19,25 +19,25 @@ export default {
         minData: 100,
         weekMaxData: [],
         weekLineData: [],
-        goalData :0,  //目标值
+        goalData: 0,  //目标值
       }
     }
   },
   components: {
     Chart,
   },
-  mounted () {
+  mounted() {
     this.drawTimingFn();
   },
-  beforeDestroy () {
+  beforeDestroy() {
     clearInterval(this.drawTiming);
     clearInterval(this.intervalId);
     this.chart.dispose()
     this.chart.clear()
-    this.chart=null
+    this.chart = null
   },
   methods: {
-    drawTimingFn () {
+    drawTimingFn() {
       this.setData();
       if (this.intervalId !== null) {
         clearInterval(this.intervalId);
@@ -46,7 +46,7 @@ export default {
         this.setData();
       }, 20000);
     },
-    async setData () {
+    async setData() {
       // 清空轮询数据
       /*this.cdata.weekCategory = [];
       this.cdata.weekMaxData = [];
@@ -57,118 +57,84 @@ export default {
       let dateBase = new Date();
       this.cdata.year = dateBase.getFullYear();
       this.cdata.nowdate = (dateBase.getMonth() + 1 < 10 ? "0" + (dateBase.getMonth() + 1) : dateBase.getMonth() + 1)
-              +"/"
-              +(dateBase.getDate()  < 10 ? "0" + (dateBase.getDate()) : dateBase.getDate() );
+        + "/"
+        + (dateBase.getDate() < 10 ? "0" + (dateBase.getDate()) : dateBase.getDate());
 
       //良率直通图
       var caller1 = 'DIP!DAYTURNOUT';
-      if (sessionStorage.getItem('li_code') == '所有'){
+      if (sessionStorage.getItem('li_code') == '所有') {
         caller1 = 'DIP!DAYTURNOUT!ALL';
       }
-      await this.$http.get("kanban/datalist.action?caller="+caller1+"&_noc=1&page=1&pageSize=100",{
+      await this.$http.get("kanban/datalist.action?caller=" + caller1 + "&_noc=1&page=1&pageSize=100", {
         params: {
           condition: "1=1",
         }
-      }).then((result)=>{
-                        let dataList = JSON.parse(result.data.data);
-                        let weekCategory = new Array();
-                        let weekLineData = new Array();
-                        let goaldata ;
-                        let minDa = dataList[0].v_okrate ;
-                        for (let index = 0; index < dataList.length; index++) {
-                          const element = dataList[index];
-                          //this.cdata.weekMaxData.push(this.cdata.maxData);
-                          //x轴数据日期
-                          weekCategory.push(element.v_md);
-                          //y轴数据
-                          weekLineData.push(element.v_okrate);
-                          if(element.v_okrate<minDa){
-                            minDa = element.v_okrate;
-                          }
-                          if(index == 0){
-                            goaldata = element.v_ligoaldata;
-                          }
-                        }
-                        //获取最小值,取整十的数
-                        minDa = Math.floor(minDa/10)*10;
-                        this.cdata.minData = minDa;
-                        this.cdata.weekCategory = weekCategory;
-                        this.cdata.weekLineData = weekLineData;
-                        this.cdata.goalData = goaldata;
-                      },(result)=>{
-                        console.error(result)
-                      }
-              );
-       //雷达图:
+      }).then((result) => {
+        let dataList = JSON.parse(result.data.data);
+        let weekCategory = new Array();
+        let weekLineData = new Array();
+        let goaldata;
+        let minDa = dataList[0].v_okrate;
+        for (let index = 0; index < dataList.length; index++) {
+          const element = dataList[index];
+          //this.cdata.weekMaxData.push(this.cdata.maxData);
+          //x轴数据日期
+          weekCategory.push(element.v_md);
+          //y轴数据
+          weekLineData.push(element.v_okrate);
+          if (element.v_okrate < minDa) {
+            minDa = element.v_okrate;
+          }
+          if (index == 0) {
+            goaldata = element.v_ligoaldata;
+          }
+        }
+        //获取最小值,取整十的数
+        minDa = Math.floor(minDa / 10) * 10;
+        this.cdata.minData = minDa;
+        this.cdata.weekCategory = weekCategory;
+        this.cdata.weekLineData = weekLineData;
+        this.cdata.goalData = goaldata;
+      }, (result) => {
+        console.error(result)
+      }
+      );
+      //雷达图:
       var caller2 = 'RadiusBadDutyDIP';
-      if (sessionStorage.getItem('li_code') == '所有'){
+      if (sessionStorage.getItem('li_code') == '所有') {
         caller2 = 'RadiusBadDutyDIP!ALL';
       }
-      await this.$http.get("kanban/datalist.action?caller="+caller2+"&_noc=1&page=1&pageSize=100&condition=1=1")
-              .then((result)=>{
-                        let dataList = JSON.parse(result.data.data);
-                        let radarData = new Array();
-                        let radarAvgData = new Array();
-                        const element = dataList[0];
-                        //来料不良
-                        radarData.push(element.v_llrate);
-                        //制程不良
-                        radarData.push(element.v_zcrate);
-                        //设计不良
-                        radarData.push(element.v_sjrate);
-                        //其它
-                        radarData.push(element.v_othrate);
-                        this.cdata.radarData=radarData;
-                        //来料不良
-                        radarAvgData.push(element.v_llavgrate);
-                        //制程不良
-                        radarAvgData.push(element.v_zcavgrate);
-                        //设计不良
-                        radarAvgData.push(element.v_sjavgrate);
-                        //其它
-                        radarAvgData.push(element.v_othavgrate);
-                        this.cdata.radarDataAvg=radarAvgData;
-                      },(result)=>{
-                        console.error(result)
-                      }
-              );
-      // 周数据
-      /*for (let i = 0; i < 7; i++) {
-        // 日期
-        let date = new Date();
-        this.cdata.weekCategory.unshift([date.getMonth() + 1, date.getDate()-i].join("/"));
-
-        // 折线图数据
-        this.cdata.weekMaxData.push(this.cdata.maxData);
-        let distance = Math.round(Math.random() * 11000 + 500);
-        this.cdata.weekLineData.push(distance);
-
-        // 雷达图数据
-        // 我的指标
-        let averageSpeed = +(Math.random() * 5 + 3).toFixed(3);
-        let maxSpeed = averageSpeed + +(Math.random() * 3).toFixed(2);
-        let hour = +(distance / 1000 / averageSpeed).toFixed(1);
-        let radarDayData = [distance, averageSpeed, maxSpeed, hour];
-        this.cdata.radarData.unshift(radarDayData);
-
-        // 平均指标
-        let distanceAvg = Math.round(Math.random() * 8000 + 4000);
-        let averageSpeedAvg = +(Math.random() * 4 + 4).toFixed(3);
-        let maxSpeedAvg = averageSpeedAvg + +(Math.random() * 2).toFixed(2);
-        let hourAvg = +(distance / 1000 / averageSpeed).toFixed(1);
-        let radarDayDataAvg = [
-          distanceAvg,
-          averageSpeedAvg,
-          maxSpeedAvg,
-          hourAvg
-        ];
-        this.cdata.radarDataAvg.unshift(radarDayDataAvg);
-      }*/
-
+      await this.$http.get("kanban/datalist.action?caller=" + caller2 + "&_noc=1&page=1&pageSize=100&condition=1=1")
+        .then((result) => {
+          let dataList = JSON.parse(result.data.data);
+          let radarData = new Array();
+          let radarAvgData = new Array();
+          const element = dataList[0];
+          //来料不良
+          radarData.push(element.v_llrate);
+          //制程不良
+          radarData.push(element.v_zcrate);
+          //设计不良
+          radarData.push(element.v_sjrate);
+          //其它
+          radarData.push(element.v_othrate);
+          this.cdata.radarData = radarData;
+          //来料不良
+          radarAvgData.push(element.v_llavgrate);
+          //制程不良
+          radarAvgData.push(element.v_zcavgrate);
+          //设计不良
+          radarAvgData.push(element.v_sjavgrate);
+          //其它
+          radarAvgData.push(element.v_othavgrate);
+          this.cdata.radarDataAvg = radarAvgData;
+        }, (result) => {
+          console.error(result)
+        }
+        );
     }
   }
 };
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>

+ 39 - 112
src/views/dip/center.vue

@@ -1,20 +1,5 @@
 <template>
   <div id="center">
-    <!--  <div class="up">
-        <div
-          class="bg-color-black 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>-->
     <div class="down">
       <div class="ranking bg-color-black">
         <span>
@@ -23,27 +8,6 @@
         <span class="fs-xl text mx-2 mb-1 pl-3">当前时段生产明细</span>
         <dv-scroll-board class="dv-scr-board" :config="config" ref="scroll-board" />
       </div>
-      <!-- <div class="percent">
-         <div class="item bg-color-black">
-           <span>首检合格率</span>
-           <CenterChart
-             :id="rate[0].id"
-             :tips="rate[0].tips"
-             :colorObj="rate[0].colorData"
-           />
-         </div>
-         <div class="item bg-color-black">
-           <span>巡检合格率</span>
-           <CenterChart
-             :id="rate[1].id"
-             :tips="rate[1].tips"
-             :colorObj="rate[1].colorData"
-           />
-         </div>
-         <div class="water">
-           <dv-water-level-pond class="dv-wa-le-po" :config="water" />
-         </div>
-       </div>-->
     </div>
   </div>
 </template>
@@ -55,7 +19,7 @@ export default {
   data() {
     return {
       config: {
-        header:  ['工单号','工序', '当前小时数量'],
+        header: ['工单号', '工序', '当前小时数量'],
         data: [
         ],
         rowNum: 7, //表格行数
@@ -63,106 +27,56 @@ export default {
         headerBGC: '#0f1325', //表头
         oddRowBGC: '#0f1325', //奇数行
         evenRowBGC: '#171c33', //偶数行
-        columnWidth: [130,80,110],
+        columnWidth: [130, 80, 110],
         align: ['center']
       },
-      timing : null,
+      timing: null,
     }
   },
   components: {
     // CenterChart
   },
-  mounted () {
+  mounted() {
     this.drawTimingFn();
   },
-  beforeDestroy () {
+  beforeDestroy() {
     clearInterval(this.timing)
   },
   methods: {
-    drawTimingFn () {
+    drawTimingFn() {
       this.setData();
       this.timing = setInterval(() => {
         this.setData(); //获取-数据
       }, 30000);
     },
-    async setData () {
-      // 首检任务数,完成数,合格数,巡检任务数,完成数,巡检合格数  name value
-      /*  await this.$http.get("kanban/datalist.action?caller=CheckData&_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++) {
-                            const element = dataList[index];
-                            titleitems.push({
-                              title: element.name,
-                              number: {
-                                number: [element.value],
-                                toFixed: 1,
-                                textAlign: 'left',
-                                content: '{nt}',
-                                style: {
-                                  fontSize: 26
-                                }
-                              }
-                            });
-                          }
-                          this.titleItem = titleitems;
-                        },(result)=>{
-                          console.error(result)
-                        }
-                );*/
+    async setData() {
       var caller = 'DIP!KeyStepRate';
-      if (sessionStorage.getItem('li_code') == '所有'){
+      if (sessionStorage.getItem('li_code') == '所有') {
         caller = 'DIP!KeyStepRate!ALL';
       }
       //关键工序直通率
-      await this.$http.get("kanban/datalist.action?caller="+caller+"&_noc=1&page=1&pageSize=100",{
+      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'>"+element.makecode+"</span>");
-              item.push("<span  class='colorGrass'>"+element.stepcode+"</span>");
-              item.push("<span  class='colorGrass'>"+element.value+"</span>");
-              resultList.push(item);
-            }
-            const scrollBoard = this.$refs['scroll-board'];
-            //刷新数据
-            scrollBoard.updateRows(resultList);
-          },(result)=>{
-            console.error(result)
-          }
+      }).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'>" + element.makecode + "</span>");
+          item.push("<span  class='colorGrass'>" + element.stepcode + "</span>");
+          item.push("<span  class='colorGrass'>" + element.value + "</span>");
+          resultList.push(item);
+        }
+        const scrollBoard = this.$refs['scroll-board'];
+        //刷新数据
+        scrollBoard.updateRows(resultList);
+      }, (result) => {
+        console.error(result)
+      }
       );
-      //饼图pie,首检合格率,巡检合格率
-      /* await this.$http.get("kanban/datalist.action?caller=PieCheckRate&_noc=1&page=1&pageSize=100&condition=1=1")
-               .then((result)=>{
-                         let dataList = JSON.parse(result.data.data);
-                         this.rate[0].tips = dataList[0].firstcheckrate;
-                         this.rate[0].tips = dataList[0].xcheckrate;
-                       },(result)=>{
-                         console.error(result)
-                       }
-               );*/
-      //水波图,首检合格率,巡检合格率
-      /* await this.$http.get("kanban/datalist.action?caller=WaterCheckRate&_noc=1&page=1&pageSize=100&condition=1=1")
-               .then((result)=>{
-                         let dataList = JSON.parse(result.data.data);
-                         let waterdatas = new Array();
-                         waterdatas.push(dataList[0].firstcheckrate);
-                         waterdatas.push(dataList[0].xcheckrate);
-                          this.water = { data: waterdatas }
-                       },(result)=>{
-                         console.error(result)
-                       }
-               );*/
     }
   }
 }
@@ -170,26 +84,31 @@ export default {
 
 <style lang="scss" scoped>
 $box-height: 420px;
+
 #center {
   display: flex;
   flex-direction: column;
+
   .up {
     width: 100%;
     display: flex;
     flex-wrap: wrap;
     justify-content: space-around;
+
     .item {
       border-radius: 6px;
       padding-top: 8px;
       margin-top: 8px;
       width: 32%;
       height: 70px;
+
       .dv-dig-flop {
         width: 150px;
         height: 30px;
       }
     }
   }
+
   .down {
     padding: 6px 4px;
     padding-bottom: 0;
@@ -197,24 +116,30 @@ $box-height: 420px;
     display: flex;
     height: $box-height;
     justify-content: space-between;
+
     .bg-color-black {
       border-radius: 5px;
       height: $box-height - 15px;
     }
+
     .ranking {
       padding: 10px;
       width: 100%;
+
       .dv-scr-rank-board {
         height: 370px;
       }
     }
+
     .percent {
       width: 40%;
       display: flex;
       flex-wrap: wrap;
+
       .item {
         width: 50%;
         height: 120px;
+
         span {
           margin-top: 8px;
           font-size: 14px;
@@ -222,8 +147,10 @@ $box-height: 420px;
           justify-content: center;
         }
       }
+
       .water {
         width: 100%;
+
         .dv-wa-le-po {
           height: 120px;
         }

+ 15 - 24
src/views/dip/centerLeft1.vue

@@ -11,26 +11,8 @@
         </div>
       </div>
       <div class="d-flex jc-center">
-         <CenterLeft1Chart />
+        <CenterLeft1Chart />
       </div>
-      <!-- 4个主要的数据
-      <div class="bottom-data">
-        <div
-          class="item-box mt-2"
-          v-for="(item, index) in numberData"
-          :key="index"
-        >
-          <div class="d-flex">
-            <span class="coin">¥</span>
-            <dv-digital-flop class="dv-digital-flop" :config="item.number" />
-          </div>
-          <p class="text" style="text-align: center;">
-            {{ item.text }}
-            <span class="colorYellow">(件)</span>
-          </p>
-        </div>
-      </div>
-      -->
     </div>
   </div>
 </template>
@@ -96,13 +78,13 @@ export default {
     CenterLeft1Chart
   },
   mounted() {
-   // this.changeTiming()
+    // this.changeTiming()
   },
-  beforeDestroy () {
-   clearInterval(this.intervalId)
+  beforeDestroy() {
+    clearInterval(this.intervalId)
     this.chart.dispose()
     this.chart.clear()
-    this.chart=null
+    this.chart = null
   },
   methods: {
     changeTiming() {
@@ -123,20 +105,24 @@ export default {
 <style lang="scss" scoped>
 $box-height: 420px;
 $box-width: 400px;
+
 #centerLeft1 {
   padding: 5px;
   height: $box-height;
   font-size: 32px;
   width: $box-width;
   border-radius: 5px;
+
   .bg-color-black {
     height: $box-height - 10px;
     border-radius: 10px;
     padding: 5px;
   }
+
   .text {
     color: #FFE900;
   }
+
   .dv-dec-3 {
     position: relative;
     width: 100px;
@@ -146,18 +132,21 @@ $box-width: 400px;
 
   .bottom-data {
     .item-box {
-      & > div {
+      &>div {
         padding-right: 5px;
       }
+
       font-size: 14px;
       float: right;
       position: relative;
       width: 50%;
       color: #d3d6dd;
+
       .dv-digital-flop {
         width: 120px;
         height: 30px;
       }
+
       // 金币
       .coin {
         position: relative;
@@ -165,9 +154,11 @@ $box-width: 400px;
         font-size: 20px;
         color: #ffc107;
       }
+
       .colorYellow {
         color: yellowgreen;
       }
+
       p {
         text-align: center;
       }

+ 29 - 63
src/views/dip/centerLeft_two.vue

@@ -11,7 +11,7 @@
         <div class="up">
           <div class="item">
             <p class="ml-3 colorBlue fw-b fs-xl">工单号</p>
-            <div class="dv-dig-flop ml-1 mt-2 pl-3"> {{ upitem.sp_makecode }}
+            <div class="dv-dig-flop ml-1 mt-2 pl-3" style="font-size: 18px;"> {{ upitem.sp_makecode }}
             </div>
           </div>
           <div class="item">
@@ -40,22 +40,7 @@
             </div>
           </div>
         </div>
-       <!-- <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 class="dv-dig-flop ml-1 mt-2 pl-3"> {{ item.number }}
-             &lt;!&ndash; <dv-digital-flop
-                      class="dv-dig-flop ml-1 mt-2 pl-3"
-                      :config="item.number"
-              />&ndash;&gt;
-            </div>
-          </div>
-        </div>-->
-         <span class="fs-xl text mx-2">工序投产良率分析</span>
+        <span class="fs-xl text mx-2">工序投产良率分析</span>
         <centerRight2Chart1 />
       </div>
     </div>
@@ -68,8 +53,8 @@ import centerRight2Chart1 from '@/components/dipechart/centerRight/centerRightCh
 export default {
   data() {
     return {
-      titleItem:[],
-      upitem:{}
+      titleItem: [],
+      upitem: {}
     }
   },
   components: { centerRight2Chart1 },
@@ -83,79 +68,58 @@ export default {
         this.settestdata(); //获取-主题词
       }, 30000);
     },
-    async settestdata(){
-      var caller = 'DIP!MAKEQTY';
-      if (sessionStorage.getItem('li_code') == '所有'){
+    async settestdata() {
+      var caller = 'WO_DETAILANDCURRDAY';
+      if (sessionStorage.getItem('li_code') == '所有') {
         caller = 'DIP!MAKEQTY!ALL';
       }
       //完成工单数统计
-      await this.$http.get("kanban/datalist.action?caller="+caller+"&_noc=1&page=1&pageSize=100",{
+      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 titleitems = new Array();
-                      for (let index = 0; index < dataList.length; index++) {
-                        const element = dataList[index];
-                        this.upitem = element;
-                       /* if(element.name =='工单达成率'){
-                          titleitems.push({
-                            title: element.name,
-                            number: element.value +'%'/!*{
-                              number: [element.value],
-                              textAlign: 'left',
-                              toFixed: 2,
-                              content: '{nt}%',
-                              style: {
-                                fontSize: 26
-                              }
-                            }*!/
-                          });
-                        }else {
-                          titleitems.push({
-                            title: element.name,
-                            number:element.value /!*{
-                              number: [element.value],
-                              textAlign: 'left',
-                              content: '{nt}',
-                              style: {
-                                fontSize: 26
-                              }
-                            }*!/
-                          });
-                        }*/
-                      }
-                      this.titleItem = titleitems;
-                      },(result)=>{
-                        console.error(result)
-                      }
-              );
+      }).then((result) => {
+        let dataList = JSON.parse(result.data.data);
+        let titleitems = new Array();
+        for (let index = 0; index < dataList.length; index++) {
+          const element = dataList[index];
+          this.upitem = element;
+        }
+        this.titleItem = titleitems;
+      }, (result) => {
+        console.error(result)
+      }
+      );
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-  $box-width: 400px;
-  $box-height: 420px;
+$box-width: 400px;
+$box-height: 420px;
+
 #centerLeft1 {
   padding: 5px;
   height: $box-height;
   width: $box-width;
   border-radius: 5px;
+
   .bg-color-black {
     height: $box-height - 10px;
     width: $box-width;
     border-radius: 10px;
     padding: 0px 5px 0px 0px;
   }
+
   .text {
     color: #c3cbde;
   }
+
   .body-box {
     border-radius: 10px;
     overflow: hidden;
+
     /*.dv-cap-chart {
       width: 100%;
       height: 160px;
@@ -167,6 +131,7 @@ export default {
       flex-wrap: wrap;
       //justify-content: space-around;
       height: 180px;
+
       //margin-bottom: 7px;
       .item {
         border-radius: 6px;
@@ -174,6 +139,7 @@ export default {
         margin-top: 8px;
         width: 50%;
         height: 52px;
+
         .dv-dig-flop {
           width: 100%;
           height: 30px;

+ 33 - 38
src/views/dip/centerRight1.vue

@@ -21,7 +21,7 @@ export default {
   data() {
     return {
       config: {
-        header:  ['线别', '投入','产出', '不良','良率%','计划数','达成率%'],
+        header: ['线别', '投入', '产出', '不良', '良率%', '计划数', '达成率%'],
         data: [
         ],
         rowNum: 7, //表格行数
@@ -29,7 +29,7 @@ export default {
         headerBGC: '#0f1325', //表头
         oddRowBGC: '#0f1325', //奇数行
         evenRowBGC: '#171c33', //偶数行
-        columnWidth: [150,90,100,80,90,90,90],
+        columnWidth: [150, 90, 100, 80, 90, 90, 90],
         align: ['center']
       }
     }
@@ -40,52 +40,42 @@ export default {
   methods: {
     refreshdata() {
       this.getdata(); //获取-数据
-     /* this.$http.get("kanban/login.action?username=zhongyl&password=asd&sob=N_MES_TEST").then(
-           (result)=>{
-              console.info(result.data);
-              var res = result.data;
-              //登录成功返回session
-              sessionStorage.setItem('x-access-token',res.token);
-            },(result)=>{
-              console.error(result)
-         });*/
-
       setInterval(() => {
         this.getdata(); //获取--数据
       }, 30000);
     },
     async getdata() {
       var caller = 'DIP!DPLANTOUTPUT';
-      if (sessionStorage.getItem('li_code') == '所有'){
+      if (sessionStorage.getItem('li_code') == '所有') {
         caller = 'DIP!DPLANTOUTPUT!ALL';
       }
-    //  const {data} = await this.$http.get("kanban/panelView/parseData/2B247DC439B3?index=0&kanbanCode=2B23AC00BCFB");
-      await this.$http.get("kanban/datalist.action?caller="+caller+"&_noc=1&page=1&pageSize=100",{
+      //  const {data} = await this.$http.get("kanban/panelView/parseData/2B247DC439B3?index=0&kanbanCode=2B23AC00BCFB");
+      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(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'];
-                    //刷新数据
-                    scrollBoard.updateRows(resultList);
-                },(result)=>{
-                    console.error(result)
-                    }
-          );
+      }).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(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'];
+        //刷新数据
+        scrollBoard.updateRows(resultList);
+      }, (result) => {
+        console.error(result)
+      }
+      );
     }
   }
 }
@@ -94,23 +84,28 @@ export default {
 <style lang="scss" scoped>
 $box-height: 420px;
 $box-width: 640px;
+
 #centerRight1 {
   padding: 16px;
   padding-top: 20px;
   height: $box-height;
   width: $box-width;
   border-radius: 5px;
+
   .bg-color-black {
     height: $box-height - 30px;
     border-radius: 10px;
   }
+
   .text {
     color: #c3cbde;
-  //  font-size: 15px;
+    //  font-size: 15px;
   }
+
   .body-box {
     border-radius: 10px;
     overflow: hidden;
+
     .dv-scr-board {
       width: 600px;
       height: 340px;

+ 3 - 3
src/views/dip/index.vue

@@ -41,10 +41,10 @@
               <span class="react-after"></span>
               <el-dropdown class="dropdown">
                 <span class="el-dropdown-link" ref="echarType">
-                  DIP<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>&nbsp;&nbsp;&nbsp;&nbsp;
+                  DIP车间<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>&nbsp;&nbsp;&nbsp;&nbsp;
                 </span>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item><router-link to="smt"> SMT </router-link></el-dropdown-item>
+                  <el-dropdown-item><router-link to="smt"> SMT车间 </router-link></el-dropdown-item>
                   <el-dropdown-item><router-link to="iqc"> 品质IQC </router-link></el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
@@ -182,7 +182,7 @@ export default {
       this.$router.push('/assembly');
     },
     getLines() {
-      this.$http.get("kanban/getLinesByWorkCenter.action?wccode=笔电组装车间").then(
+      this.$http.get("kanban/getLinesByWorkCenter.action?wccode=DIP").then(
         (res) => {
           if (res.data.linedata) {
             const data = res.data.linedata.concat({ 'LI_CODE': '所有', 'LI_NAME': '所有' });

+ 2 - 2
src/views/quality/index.vue

@@ -43,8 +43,8 @@
                     class="el-icon-arrow-down el-icon&#45;&#45;right"></i>&nbsp;&nbsp;&nbsp;&nbsp;
                 </span>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item><router-link to="smt"> SMT </router-link></el-dropdown-item>
-                  <el-dropdown-item><router-link to="dip"> DIP </router-link></el-dropdown-item>
+                  <el-dropdown-item><router-link to="smt"> SMT车间 </router-link></el-dropdown-item>
+                  <el-dropdown-item><router-link to="dip"> DIP车间 </router-link></el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
               <span class="text">&nbsp;&nbsp;&nbsp;&nbsp;</span>

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

@@ -56,7 +56,7 @@
                   SMT车间<i class="el-icon-arrow-down el-icon--right"></i>&nbsp;&nbsp;&nbsp;&nbsp;
                 </span>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item class="dropdownitem"><router-link to="smt"> SMT </router-link></el-dropdown-item>
+                  <el-dropdown-item class="dropdownitem"><router-link to="smt"> DIP车间 </router-link></el-dropdown-item>
                   <el-dropdown-item class="dropdownitem"><router-link to="iqc"> 品质IQC </router-link></el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>