明确需求、隐形需求

src/components/analysis/analysis/analysisHome.vue

@@ -55,14 +55,20 @@
           <el-row class="header-title" style="height: 100%;">
             <el-col>
               <span class="title-two">明确需求</span>
-              <div id="c1" style="height:400px;"></div>
             </el-col>
+            <el-col :span="6"><div id="c4-1" style="height: 400px;"></div></el-col>
+            <el-col :span="6"><div id="c4-2" style="height: 400px;"></div></el-col>
+            <el-col :span="6"><div id="c4-3" style="height: 400px;"></div></el-col>
+            <el-col :span="6"><div id="c4-4" style="height: 400px;"></div></el-col>
           </el-row>
           <el-row class="header-title" style="height: 100%;">
             <el-col>
               <span class="title-two">隐形需求</span>
-              <div id="c1" style="height:400px;"></div>
             </el-col>
+            <el-col :span="6"><div id="c5-1" style="height: 400px;"></div></el-col>
+            <el-col :span="6"><div id="c5-2" style="height: 400px;"></div></el-col>
+            <el-col :span="6"><div id="c5-3" style="height: 400px;"></div></el-col>
+            <el-col :span="6"><div id="c5-4" style="height: 400px;"></div></el-col>
           </el-row>
         </div>
       </div>
@@ -116,11 +122,6 @@ export default {
     init () {
       this.getFilter()
       this.getSalesChart()
-      // 利润图表
-      // this.c31()
-      // this.c32()
-      // this.c33()
-      // this.c34()
     },
 
     getSalesChart () {
@@ -132,6 +133,14 @@ export default {
           this.c3('c3-2', res.chars.salesAchievements.child.chartSalesArchievementProfits)
           this.c3('c3-3', res.chars.salesAchievements.child.chartSalesArchievementProjects)
           this.c3('c3-4', res.chars.salesAchievements.child.chartSalesArchievementProfitRate)
+          this.c3('c4-1', res.chars.salesOpportunities.child.chartSalesOpportunityJournalAccount)
+          this.c3('c4-2', res.chars.salesOpportunities.child.chartSalesOpportunityProfits)
+          this.c3('c4-3', res.chars.salesOpportunities.child.chartSalesOpportunityProjects)
+          this.c3('c4-4', res.chars.salesOpportunities.child.chartSalesOpportunityProfitRate)
+          this.c3('c5-1', res.chars.salesRecessiveProjects.child.chartSalesRecessiveJournalAccount)
+          this.c3('c5-2', res.chars.salesRecessiveProjects.child.chartSalesRecessiveProfits)
+          this.c3('c5-3', res.chars.salesRecessiveProjects.child.chartSalesRecessiveProjects)
+          this.c3('c5-4', res.chars.salesRecessiveProjects.child.chartSalesRecessiveProfitRate)
         })
     },
 

src/components/analysis/analysis/salesAchievements.js

@@ -47,9 +47,17 @@ export default {
             if (_x === '平均') {
               ret += `<b>${_x}</b><br/>${this.point.stackTotal}`
             } else {
-              ret += `<b>${this.series.name}</b><br/>
-              项目名称：${this.series.userOptions.projectName}<br/>
-              商机金额：${this.series.userOptions.money}`
+              ret += `<b>${this.series.name}</b><br/>`
+              if (this.series.userOptions.title) {
+                ret += `项目名称：<b>${this.series.userOptions.title}</b><br/>`
+              }
+              if (this.series.userOptions.budget) {
+                ret += `商机金额：${this.series.userOptions.budget}元<br/>`
+              }
+              if (this.series.userOptions.bargain_date) {
+                ret += `成交日期：${this.series.userOptions.bargain_date}<br/>`
+              }
+              ret += `商机批注：${this.series.userOptions.comment}`
             }
             return ret
       		}