소스 검색

no message

DESKTOP-70VPDLK\Administrator 1 년 전
부모
커밋
1a9207c263
3개의 변경된 파일28개의 추가작업 그리고 15개의 파일을 삭제
  1. 14 13
      pages/statistics/components/general_stat.vue
  2. 1 1
      pages/statistics/module/stat_age_chart.vue
  3. 13 1
      pages/statistics/module/stat_industry.vue

+ 14 - 13
pages/statistics/components/general_stat.vue

@@ -12,6 +12,8 @@
       <StatCapital :leftColor="1" :rightColor="2" :leftText="'在途资金汇总'" :tabulate-data="sysCapitalMoney"></StatCapital>
 <!--			<StatRanking :is_margin_top="false" :is_type="2" :leftText="'个人业绩排行'"></StatRanking>-->
 		</view>
+    <stat-industry></stat-industry>
+    <stat-age-chart></stat-age-chart>
 <!--		<StatSituation :type="1"></StatSituation>-->
 	</view>
 </template>
@@ -22,10 +24,12 @@
 	import StatCapital from "../module/stat_capital.vue"
 	import StatSituation from "../module/stat_situation.vue"
   import HeadData from "@/pages/statistics/module/head_data.vue";
-  import {getSysCashier,getSysPassage,getCapitalMoney} from "@/api/statistics";
+  import {getSysCashier,getSysPassage,getCapitalMoney,getSysIndustry} from "@/api/statistics";
   import Stat_finance_chart from "@/pages/statistics/module/stat_finance_chart.vue";
   import StatFinance from "@/pages/statistics/module/stat_finance.vue";
   import md5 from 'js-md5'
+  import StatIndustry from "@/pages/statistics/module/stat_industry.vue";
+  import StatAgeChart from "@/pages/statistics/module/stat_age_chart.vue";
 
 	export default {
     props:{
@@ -42,6 +46,8 @@
       }
     },
 		components: {
+      StatAgeChart,
+      StatIndustry,
       StatFinance,
       Stat_finance_chart,
       HeadData,
@@ -84,6 +90,7 @@
           pledge_ratio: 0,
           list:[{name: "", ratio: 0, value: 0, labelText: ""},{name: "", ratio: 0, value: 0, labelText: ""}]
         },
+        industryList:{},
         sendMd5:''
       };
 		},
@@ -100,6 +107,7 @@
             this.getSysCashier()
             this.getSysPassage()
             this.getCapitalMoney()
+            this.getSysIndustry()
           }
         }
       },
@@ -142,21 +150,14 @@
       getSysIndustry(){
         getSysIndustry(this.selectData).then((res)=>{
           if(res.code === 1){
+            this.industryList=res.data
             // let ret = {
-            //   categories:res.data.titles,
-            //   series:[{ name: "总业绩(万元)",data:res.data.oneMoney}]
+            //   series:[{data:res.data.roseData}]
             // }
-            // this.$refs.chartsAdminTwo.show = true
-            // this.$refs.chartsAdminTwo.chartData3 = JSON.parse(JSON.stringify(ret))
-            let ret = {
-              series:[{data:res.data.roseData}]
-            }
-            this.$refs.chartsRose.show = true
-            this.$refs.chartsRose.chartData2 = JSON.parse(JSON.stringify(ret))
-
+            // this.$refs.chartsRose.show = true
+            // this.$refs.chartsRose.chartData2 = JSON.parse(JSON.stringify(ret))
           }else{
-            // this.$refs.chartsAdminTwo.setNoList()
-            this.$refs.chartsRose.setNoList()
+            // this.$refs.chartsRose.setNoList()
           }
         })
       },

+ 1 - 1
pages/statistics/module/stat_age_chart.vue

@@ -14,7 +14,7 @@
 	import StatisticsTitle from "./statistics_title.vue";
 
 	export default {
-		name: 'stat_age_chart',
+		name: 'stat-age-chart',
 		components: {
 			PeakChart,
 			StatisticsTitle

+ 13 - 1
pages/statistics/module/stat_industry.vue

@@ -27,11 +27,23 @@
 	import StatisticsTitle from "./statistics_title.vue";
 
 	export default {
-		name: 'stat_industry',
+		name: 'stat-industry',
 		components: {
 			CircleChart,
 			StatisticsTitle
 		},
+    props:{
+      'industryList':{
+        default:()=>{
+          return {
+            oneMoney: [],
+            oneNum: [],
+            roseData: [],
+            titles: [],
+          }
+        }
+      }
+    },
 		data() {
 			return {
 				list: [{