新增分析

salesPanel/dataOverview/Clue/NewAnalysisAdded.js

@@ -4,6 +4,11 @@ Component({
     options: {
         addGlobalClass: true
     },
+    properties: {
+        idname: {
+            type: [String, Number]
+        }
+    },
     lifetimes: {
         attached: function () {
             getApp().globalData.Language.getLanguagePackage(this)
@@ -34,7 +39,7 @@ Component({
             content.where.isleave = isleave;
 
             _Http.basic({
-                "id": 20231015123304,
+                "id": this.data.idname,
                 content
             }).then(res => {
                 if (res.code != '1') return wx.showToast({
@@ -52,21 +57,21 @@ Component({
                 series = [{
                         name: getMapText('去年同期新增'),
                         type: 'bar',
-                        data: data.histogram.filter(v => v.type == '去年同期新增').map(v => v.value),
+                        data: data.histogram.filter(v => v.type == '去年同期新增' || v.key == '去年同期新增').map(v => v.value),
                         smooth: true
                     },
                     {
                         name: getMapText('本期新增'),
                         type: 'bar',
                         yAxisIndex: 1,
-                        data: data.histogram.filter(v => v.type == '本期新增').map(v => v.value),
+                        data: data.histogram.filter(v => v.type == '本期新增' || v.key == '本期新增').map(v => v.value),
                         smooth: true
                     },
                     {
                         name: getMapText('同比增长率'),
                         type: 'line',
                         yAxisIndex: 2,
-                        data: data.lineChart.map(v => (v.value * 100).toFixed(2)),
+                        data: data.lineChart.map(v => v.value),
                         smooth: true
                     }
                 ]

salesPanel/dataOverview/Clue/followUpAnalysis.js

@@ -60,21 +60,21 @@ Component({
                 series = [{
                         name: getMapText('去年同期跟进'),
                         type: 'bar',
-                        data: data.followup.filter(v => v.key == '去年同期跟进').map(v => v.value),
+                        data: data.followup.filter(v => v.key == '去年同期跟进' || v.type == '去年同期跟进').map(v => v.value),
                         smooth: true
                     },
                     {
                         name: getMapText('本期跟进'),
                         type: 'bar',
                         yAxisIndex: 1,
-                        data: data.followup.filter(v => v.key == '本期跟进').map(v => v.value),
+                        data: data.followup.filter(v => v.key == '本期跟进' || v.type == '本期跟进').map(v => v.value),
                         smooth: true
                     },
                     {
                         name: getMapText('同比增长率'),
                         type: 'line',
                         yAxisIndex: 2,
-                        data: data.tbzzl.map(v => v.value),
+                        data: data.tbzzl.map(v => this.data.idname == 20231015123304 ? (v.value * 100).toFixed(2) : v.value),
                         smooth: true
                     }
                 ]

salesPanel/dataOverview/list/Clue.wxml

@@ -1,7 +1,7 @@
 <Yl_FunTabs id='Yl_FunTabs' safety='{{false}}' list='{{tabsList}}' mode='buts' active='{{tabsActive}}' bind:onChenge="tabsChange">
     <DataOverview slot='数据概况' id='DataOverview' />
-    <NewAnalysisAdded  slot='近12月线索新增分析' id='NewAnalysisAdded' />
-    <AnalysisOfLeadConversion  slot='近12月线索转化分析' id='AnalysisOfLeadConversion' />
+    <NewAnalysisAdded slot='近12月线索新增分析' idname='20231015123304' id='NewAnalysisAdded' />
+    <AnalysisOfLeadConversion slot='近12月线索转化分析' id='AnalysisOfLeadConversion' />
     <followUpAnalysis slot='近12月线索跟进分析' idname='20231015124504' id='followUpAnalysis' />
-    
+
 </Yl_FunTabs>

salesPanel/dataOverview/list/Project.js

@@ -25,8 +25,10 @@ Component({
         }, {
             label: "近12月项目跟进分析",
             model: "#followUpAnalysis"
+        }, {
+            label: "近12月项目新增分析",
+            model: "#NewAnalysisAdded"
         }],
-        init: false
     },
     methods: {
         getList() {

salesPanel/dataOverview/list/Project.json

@@ -3,6 +3,7 @@
     "usingComponents": {
         "DataOverview": "../Project/dataOverview",
         "ProjectQuotationQuantity": "../Project/ProjectQuotationQuantity",
+        "NewAnalysisAdded": "../Clue/NewAnalysisAdded",
         "followUpAnalysis": "../Clue/followUpAnalysis"
     }
 }

salesPanel/dataOverview/list/Project.wxml

@@ -2,4 +2,5 @@
     <DataOverview slot='数据概况' id='DataOverview' />
     <ProjectQuotationQuantity slot='近12月项目报价分析' id='ProjectQuotationQuantity' />
     <followUpAnalysis slot='近12月项目跟进分析' idname='20231018163004' id='followUpAnalysis' />
+    <NewAnalysisAdded slot='近12月项目新增分析' idname='20231018155804' id='NewAnalysisAdded' />
 </Yl_FunTabs>

salesPanel/dataOverview/list/client.js

@@ -25,6 +25,9 @@ Component({
         }, {
             label: "近12月客户报价分析",
             model: "#ClientQuotationQuantity"
+        }, {
+            label: "近12月客户新增分析",
+            model: "#NewAnalysisAdded"
         }],
         init: false
     },

salesPanel/dataOverview/list/client.json

@@ -3,6 +3,7 @@
     "usingComponents": {
         "DataOverview": "../Client/dataOverview",
         "ClientQuotationQuantity": "../Client/ClientQuotationQuantity",
+        "NewAnalysisAdded": "../Clue/NewAnalysisAdded",
         "followUpAnalysis": "../Clue/followUpAnalysis"
     }
 }

salesPanel/dataOverview/list/client.wxml

@@ -2,4 +2,5 @@
     <DataOverview slot='数据概况' id='DataOverview' />
     <ClientQuotationQuantity slot='近12月客户报价分析' id='ClientQuotationQuantity' />
     <followUpAnalysis slot='近12月客户跟进分析' idname='20231017152704' id='followUpAnalysis' />
+    <NewAnalysisAdded slot='近12月客户新增分析' idname='20231015202504' id='NewAnalysisAdded' />
 </Yl_FunTabs>