Browse Source

次元看板--车间看板增加全部 调整

xiaost 1 year ago
parent
commit
35ff06f6e9

+ 8 - 2
src/components/shopechart/bottom1Chart/chart.vue

@@ -175,11 +175,17 @@ export default {
       }, 30000);
     },
     async getdata() {
+      let wccode = sessionStorage.getItem('wc_code');
       var caller = 'KB!ShopPlanFinishInfo';
+      var cond = "V_OUTLINE='"+this.factory+"'";
+      if(wccode =='全部') {
+        caller +='!ALL'
+      }else{
+        cond +=" AND v_wccode='"+sessionStorage.getItem('wc_code')+"'" ;
+      }
       await this.$http.get("kanban/datalist.action?caller="+caller+"&_noc=1&page=1&pageSize=100",{
         params: {
-          condition:  "V_OUTLINE='"+this.factory+"'"+
-              " AND v_wccode='"+sessionStorage.getItem('wc_code')+"'"
+          condition: cond
         }
       }).then((result)=>{
             let dataList = JSON.parse(result.data.data);

+ 8 - 2
src/components/shopechart/bottom2Chart/chart.vue

@@ -228,11 +228,17 @@ export default {
       }, 30000);
     },
     async getdata() {
+      let wccode = sessionStorage.getItem('wc_code');
       var caller = 'KB!ShopHourQTY';
+      var cond = "V_OUTLINE='"+this.factory+"'";
+      if(wccode =='全部') {
+        caller +='!ALL'
+      }else{
+        cond +=" AND v_wccode='"+sessionStorage.getItem('wc_code')+"'" ;
+      }
       await this.$http.get("kanban/datalist.action?caller="+caller+"&_noc=1&page=1&pageSize=100",{
         params: {
-          condition: "V_OUTLINE='"+this.factory+"'"+
-              " AND v_wccode='"+sessionStorage.getItem('wc_code')+"'"
+          condition: cond
         }
       }).then((result)=>{
             let dataList = JSON.parse(result.data.data);

+ 8 - 2
src/components/shopechart/up4Chart/index.vue

@@ -42,12 +42,18 @@ export default {
     },
     async getdata() {
       //20220211 -+formatDate(new Date()
+      let wccode = sessionStorage.getItem('wc_code');
       var caller = 'KB!ShopTopFiveBad';
+      var cond = "V_OUTLINE='"+this.factory+"'";
+      if(wccode =='全部') {
+        caller +='!ALL'
+      }else{
+        cond +=" AND v_wccode='"+sessionStorage.getItem('wc_code')+"'" ;
+      }
       await this.$http.get("kanban/datalist.action?caller="+caller+"&_noc=1&page=1&pageSize=100",
               {
                 params: {
-                  condition: "V_OUTLINE='"+this.factory+"'"+
-                      " AND v_wccode='"+sessionStorage.getItem('wc_code')+"'"
+                  condition: cond
                 }
               }).then((result)=>{
                         let dataList = JSON.parse(result.data.data);

+ 2 - 2
src/views/shop/bottom2.vue

@@ -38,9 +38,9 @@ import Bottom2Chart from "@/components/shopechart/bottom2Chart";
     methods: {
       refreshdata() {
         this.getdata(); //获取-数据
-        this.timing = setInterval(() => {
+        /*this.timing = setInterval(() => {
           this.getdata(); //获取--数据
-        }, 10000);
+        }, 10000);*/
       },
       async getdata() {
       }

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

@@ -192,7 +192,7 @@ export default {
       this.$http.get("kanban/getAllWorkCenter.action").then(
               (res)=>{
                 if(res.data.centerdata) {
-                  const data = res.data.centerdata;
+                  const data = res.data.centerdata.concat({'WC_CODE':'全部','WC_NAME':'全部'});
                   if(this.$cookie.get("SHOP_WC_CODE") && data.some(item => item.WC_CODE === this.$cookie.get("SHOP_WC_CODE")) ){
                     sessionStorage.setItem('wc_code', this.$cookie.get("SHOP_WC_CODE"));
                   }else {

+ 8 - 2
src/views/shop/up1.vue

@@ -49,11 +49,17 @@ export default {
 
     async setdata() {
       //当前工单
+      let wccode = sessionStorage.getItem('wc_code');
       var caller = 'KB!ShopLinePlan';
+      var cond = "V_OUTLINE='"+this.factory+"'";
+      if(wccode =='全部') {
+        caller +='!ALL'
+      }else{
+        cond +=" AND v_wccode='"+sessionStorage.getItem('wc_code')+"'" ;
+      }
       await this.$http.get("kanban/datalist.action?caller="+caller+"&_noc=1&page=1&pageSize=100",{
         params: {
-          condition: "V_OUTLINE='"+this.factory+"'"+
-                      " AND v_wccode='"+sessionStorage.getItem('wc_code')+"'" ,
+          condition: cond,
         }
       }).then((result)=>{
             let dataList = JSON.parse(result.data.data);

+ 8 - 2
src/views/shop/up2.vue

@@ -49,11 +49,17 @@ export default {
 
     async setdata() {
       //本月计划达成统计
+      let wccode = sessionStorage.getItem('wc_code');
       var caller = 'KB!ShopLineMonthPlan';
+      var cond = "V_OUTLINE='"+this.factory+"'";
+      if(wccode =='全部') {
+        caller +='!ALL'
+      }else{
+        cond +=" AND v_wccode='"+sessionStorage.getItem('wc_code')+"'" ;
+      }
       await this.$http.get("kanban/datalist.action?caller="+caller+"&_noc=1&page=1&pageSize=100",{
         params: {
-          condition: "V_OUTLINE='"+this.factory+"'"+
-              " AND v_wccode='"+sessionStorage.getItem('wc_code')+"'"
+          condition: cond
         }
       }).then((result)=>{
             let dataList = JSON.parse(result.data.data);

+ 8 - 2
src/views/shop/up3.vue

@@ -45,12 +45,18 @@ export default {
     },
     async settestdata() {
       //单工序良率
+      let wccode = sessionStorage.getItem('wc_code');
       var caller = 'KB!ShopKeyStepRate';
+      var cond = "V_OUTLINE='"+this.factory+"'";
+      if(wccode =='全部') {
+        caller +='!ALL'
+      }else{
+        cond +=" AND v_wccode='"+sessionStorage.getItem('wc_code')+"'" ;
+      }
       //关键单工序良率
       await this.$http.get("kanban/datalist.action?caller="+caller+"&_noc=1&page=1&pageSize=100",{
         params: {
-          condition: "V_OUTLINE='"+this.factory+"'"+
-              " AND v_wccode='"+sessionStorage.getItem('wc_code')+"'"
+          condition: cond
         }
       }).then((result)=>{
             let dataList = JSON.parse(result.data.data);

+ 8 - 2
src/views/shop/up4.vue

@@ -70,11 +70,17 @@ export default {
     },
 
     async getdata() {
+      let wccode = sessionStorage.getItem('wc_code');
       var caller = 'KB!SHOPDPLANTOUTPUT';
+      var cond = "V_OUTLINE='"+this.factory+"'";
+      if(wccode =='全部') {
+        caller +='!ALL'
+      }else{
+        cond +=" AND v_wccode='"+sessionStorage.getItem('wc_code')+"'" ;
+      }
       await this.$http.get("kanban/datalist.action?caller="+caller+"&_noc=1&page=1&pageSize=100", {
         params: {
-          condition: "V_OUTLINE='"+this.factory+"'"+
-              " AND v_wccode='"+sessionStorage.getItem('wc_code')+"'"
+          condition: cond
         }
       })
           .then((result)=>{