build

src/components/newResults/company-month.vue

@@ -104,22 +104,37 @@ export default {
     this.isEmpty = this.cp_companies.length === 0;
     if (this.isEmpty) return;
 
-    this.cp_companies = this.cp_companies.map(item => {
+    let allIndex = -1;
+    let wanYuIndex = -1;
+    this.cp_companies = this.cp_companies.map((item,index) => {
       let label = '';
+      
+      if (item.label === '所有公司') {
+        allIndex = index;
+        label = '所有公司'
+      }
+
+
+      if (item.label === '北京万宇恒通国际科贸有限公司') {
+        wanYuIndex = index;
+        label = '平台公司: 万宇'
+      }
+
 
-      if (item.label === '所有公司') label = '所有公司'
-      if (item.label === '北京万宇恒通国际科贸有限公司') label = '平台公司: 万宇'
       if (item.label === "普润&锦兴&知事") label = `业务公司: 普润&锦兴&知事`
       if (label === '') label = `业务公司: ${mapCompany[item.label]}`;
+      return ({ ...item, label })
+    })
 
 
-      return ({
-        ...item,
-        label
-      })
-    })
+    if(allIndex !== -1) {
+      this.companyNo = this.cp_companies[allIndex].value;
+    } else if(wanYuIndex !== -1){
+      this.companyNo = this.cp_companies[wanYuIndex].value;
+    }else {
+      this.companyNo = this.cp_companies[0].value;
+    }
 
-    this.companyNo = this.cp_companies[0].value;
     this.daytime = this.transformTime();
     this.requestData();
   },

src/components/newResults/company.vue

@@ -175,18 +175,37 @@ export default {
     this.isEmpty = this.cp_companies.length === 0;
     if (this.isEmpty) return;
 
-    console.log(this.cp_companies, '---');
-
-    this.cp_companies = this.cp_companies.map(item => {
+    let allIndex = -1;
+    let wanYuIndex = -1;
+    this.cp_companies = this.cp_companies.map((item,index) => {
       let label = '';
-      if (item.label === '所有公司') label = '所有公司'
-      if (item.label === '北京万宇恒通国际科贸有限公司') label = '平台公司: 万宇'
+      
+      if (item.label === '所有公司') {
+        allIndex = index;
+        label = '所有公司'
+      }
+
+
+      if (item.label === '北京万宇恒通国际科贸有限公司') {
+        wanYuIndex = index;
+        label = '平台公司: 万宇'
+      }
+
+
       if (item.label === "普润&锦兴&知事") label = `业务公司: 普润&锦兴&知事`
       if (label === '') label = `业务公司: ${mapCompany[item.label]}`;
       return ({ ...item, label })
     })
 
-    this.companyNo = this.cp_companies[0].value;
+
+    if(allIndex !== -1) {
+      this.companyNo = this.cp_companies[allIndex].value;
+    } else if(wanYuIndex !== -1){
+      this.companyNo = this.cp_companies[wanYuIndex].value;
+    }else {
+      this.companyNo = this.cp_companies[0].value;
+    }
+
     this.daytime = this.transformTime();
     this.requestData();
   },
@@ -211,7 +230,7 @@ export default {
 
       return {
         companyName: '普润\n锦兴\n知事',
-        cost_tips: Number(addition(c1.cost_tips, c2.cost_tips)).toFixed(2),
+        cost_tips: Number(c1.cost_tips).toFixed(2),
         total_tips: Number(c1.total_tips).toFixed(2),
         monthinfo: c1.monthinfo.map((item, index) => ({
           mcgd_th_total: Number(addition(item.mcgd_th_total, c2.monthinfo[index].mcgd_th_total)).toFixed(2),

src/components/newResults/department.vue

@@ -147,11 +147,19 @@ export default {
   mounted() {
     this.isEmpty = this.companies.length === 0;
     if (this.isEmpty) return;
-    this.companyNo = this.companies[0].value;
     this.cp_companies = this.companies.map(item => ({
       ...item,
       label: mapCompany[item.label] === '万宇' ? `平台公司: 万宇` : `业务公司: ${mapCompany[item.label]}`
     }))
+
+
+    const wuYuIndex =  this.cp_companies.findIndex(item => item.label === '平台公司: 万宇')
+    if(wuYuIndex !== -1) {
+      this.companyNo = this.companies[wuYuIndex].value;
+    } else {
+      this.companyNo = this.companies[0].value;
+    }
+
     this.daytime = this.transformTime();
     this.requestData();
   },