0324

hb_client/src/views/bigScreen/bottomLeft.vue

@@ -31,67 +31,33 @@
       return {
         options: {},
         cdata: {
-          category: [
-            "JH5jhx463-1",
-            "JH5jhx463-2",
-            "JH5jhx463-3",
-            "JH5jhx463-4",
-            "JH5jhx463-5",
-            "JH5jhx463-6",
-            "JH5jhx463-7",
-            "JH5jhx463-8",
-            "JH5jhx463-9",
-            "JH5jhx463-10",
-            "JH5jhx463-11",
-            "JH5jhx463-12",
-            "JH5jhx463-13",
-            "JH5jhx463-14",
-            "JH5jhx463-15"
-          ],
-          planData: [
-            18092,
-            20728,
-            24045,
-            28348,
-            32808,
-            36097,
-            39867,
-            18092,
-            20728,
-            24045,
-            28348,
-            32808,
-            36097,
-            39867,
-            44715,
-          ],
-          barData: [
-            9600,
-            19000,
-            19500,
-            20500,
-            19500,
-            28500,
-            31900,
-            12500,
-            14000,
-            21500,
-            23200,
-            24450,
-            25250,
-            33300,
-            40715
-          ],
           rateData: []
         }
       };
     },
-    mounted() {
+    props:{
-      this.setData();
+      category:{
+        type:Array,
+        default:()=>{
+          return []
+        }
       },
-    watch: {
+      planData:{
-      cdata: {
+        type:Array,
-        handler(newData) {
+        default:()=>{
+          return []
+        }
+      },
+      realData:{
+        type:Array,
+        default:()=>{
+          return []
+        }
+      }
+    },
+    mounted() {
+      let that=this;
+      this.setData();
       this.options = {
         /*tooltip: {
           trigger: "axis",
@@ -143,7 +109,7 @@
           }
         },*/
         legend: {
-              data: ["已完成", "计划完成"],
+          data: [" 计划完成", " 已完成 "],
           textStyle: {
             color: "#B4B4B4"
           },
@@ -155,7 +121,7 @@
           y: "4%"
         },
         xAxis: {
-              data: newData.category,
+          data: that.category,
           axisLine: {
             lineStyle: {
               color: "#B4B4B4"
@@ -167,7 +133,10 @@
         },
         yAxis:{
           splitLine: {
-                show: false
+            type:"dashed",
+            color: "#B4B4B4",
+            width:"1",
+            // show: true,
           },
           axisLine: {
             lineStyle: {
@@ -192,7 +161,7 @@
                 ])
               }
             },
-                data: newData.barData
+            data: that.realData
           },
           {
             name: "计划完成",
@@ -210,22 +179,18 @@
               }
             },
             z: -12,
-                data: newData.planData
+            data: that.planData
           }
         ]
       }
     },
-        immediate: true,
-        deep: true
-      },
-    },
     methods: {
       // 根据自己的业务情况修改
       setData() {
-        for (let i = 0; i < this.cdata.barData.length - 1; i++) {
+        /*for (let i = 0; i < this.cdata.realData.length - 1; i++) {
-          let rate = this.cdata.barData[i] / this.cdata.planData[i];
+          let rate = this.cdata.realData[i] / this.cdata.planData[i];
           this.cdata.rateData.push(rate.toFixed(2));
-        }
+        }*/
       },
     }
   }

hb_client/src/views/bigScreen/index.vue

@@ -104,6 +104,9 @@
             <dv-border-box-13>
               <bottomLeft
                 v-if="limitedTwo"
+                :category="category"
+                :planData="planData"
+                :realData="realData"
               />
             </dv-border-box-13>
           </div>
@@ -126,7 +129,7 @@
   import bottomRight from './bottomRight'
   import {getPlanGantt} from "@/api/srm";
   import {getProductionplanList} from "@/api/pm";
-  import {getProcessYield, productCount, getProcessNow, planCount, orderCount} from "@/api/srm";
+  import {getProcessYield, productCount, getProcessNow} from "@/api/srm";
   import {getContractList, getOrderList} from "@/api/sam";
   import {getArticles} from "@/api/cms";
 
@@ -139,10 +142,11 @@
         dateDay: null,
         dateYear: null,
         dateWeek: null,
-        planGanttList: [],
         numberShow: false,
         processRate: false,
         listUser: false,
+        listNews: false,
+        listProcess: false,
         create_time_start: '',
         titleItem: [
           {
@@ -428,7 +432,10 @@
           // columnWidth: [50],
           align: ['center']
         },
-        weekday: ['周日', '周一', '周二', '周三', '周四', '周五', '周六']
+        weekday: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
+        category:[],
+        planData:[],
+        realData:[],
       }
     },
     components: {
@@ -480,16 +487,6 @@
           this.dateWeek = this.weekday[new Date().getDay()]
         }, 1000)
       },
-      getPageData() {
-        let that = this;
-        getPlanGantt({type: 'big_screen'}).then(res => {
-          if (res.code === 200) {
-            this.planGanttList = res.data.results;
-          } else {
-            that.$message.error(res.msg);
-          }
-        })
-      },
       cancelLoading() {
         setTimeout(() => {
           this.loading = false
@@ -676,6 +673,7 @@
       //企业资讯
       getArticle() {
         let that = this;
+        that.listNews = false;
         getArticles({type: 'big_screen', page: 0}).then((response) => {
           if (response.data) {
             // this.configArticle = response.data;
@@ -694,11 +692,28 @@
               data.push(obj)
             });
             that.configArticle.data = data;
+            that.listNews = true;
           }
         });
       },
-
       //任务完成进度
+      getPageData() {
+        let that = this;
+        that.listNews = false;
+        getPlanGantt({type: 'big_screen'}).then(res => {
+          if (res.code === 200) {
+            let list = res.data.results;
+            list.forEach(item=>{
+              that.category.push(item.number);
+              that.planData.push(item.count);
+              that.realData.push(item.count_ok);
+            })
+            that.listNews = true;
+          } else {
+            that.$message.error(res.msg);
+          }
+        })
+      },
     }
   }
 </script>