修改页面

src/components/statistics/marriage.vue

@@ -93,7 +93,7 @@
                     </div>
                     <el-row :gutter="80" style="height: 100%;">
                         <el-col :span="24" style="height: 100%;">
-                            <marriageChart :chartData="chartData" :strArr="strArr"/>
+                            <marriageChart v-if="isShow" :chartData="chartData" :strArr="strArr"/>
                         </el-col>
                     </el-row>
                 </el-card>
@@ -103,7 +103,7 @@
                     <div slot="header" class="clearfix">
                         <span>购物统计<span class="font-size-12">（按平均计算）</span></span>
                     </div>
-                    <marriageLineChart :chartData="shopChartData" :strArr="strArr"/>
+                    <marriageLineChart v-if="isShow" :chartData="shopChartData" :strArr="strArr"/>
                 </el-card>
             </el-col>
         </el-row>
@@ -114,14 +114,17 @@
                         <span>数据说明</span>
                     </div>
                     <div class="sjsm">
-                        <div v-for="(item, index) in 9" :key="index">
+                        <div v-for="(item, index) in dataList" :key="index">
                             <div class="left">
-                                <img v-if="item.Sex === 1" src="../../assets/img/tongji/man1.png" alt="">
-                                <img v-else src="../../assets/img/tongji/woman1.png" alt="">
-                                <span class="font-size-12">{{item.SexStr}}士</span>
+                                <img v-if="item.Marriage === 1" src="../../assets/img/tongji/yihun.png" alt="">
+                                <img v-if="item.Marriage === 2" src="../../assets/img/tongji/woman1.png" alt="">
+                                <img v-if="item.Marriage === 3" src="../../assets/img/tongji/weihun.png" alt="">
+                                <img v-if="item.Marriage === 4" src="../../assets/img/tongji/yihun.png" alt="">
+                                <img v-if="item.Marriage === 5" src="../../assets/img/tongji/yihun.png" alt="">
+                                <span class="font-size-12">{{item.MarriageName}}</span>
                             </div>
                             <div class="right">
-                                <p>累计报名<span class="hight-font">{{item.SexCount}}</span>人，关联购物金额<span class="hight-font">{{item.ShopMoney}}</span>万，报名均价为<span class="hight-font">{{item.Unit_Price}}</span>元</p>
+                                <p>累计报名<span class="hight-font">{{item.MarriageCount}}</span>人，关联购物金额<span class="hight-font">{{item.TotalMoney}}</span>万，报名均价为<span class="hight-font">{{item.Unit_Price}}</span>元</p>
                                 <p>最喜爱产品<span class="hight-font">《{{item.LtName}}》</span></p>
                             </div>
                         </div>
@@ -176,23 +179,25 @@ export default {
         return {
             discussID: 1,
             drawer: false,
-            chartData: [67.62, 5.04, 25.76, 1.32, 0.25],
-            shopChartData: [67.62, 5.04, 25.76, 1.32, 0.25],
+            chartData: [],
+            shopChartData: [],
             SexOrder: [],
             loading: false,
             strArr: [],
             BbsList: [],
+            isShow:false,
+            orders:[],
+            dataList:[]
         };
     },watch:{
         
     },
     mounted() {
-        this.initData()
+        this.initData();
     },
     methods: {
         initData() {
             this.apipost("/api/Statistic/GetMarriageShopList", {}, res => {
-                console.log(res,'ressss');
                  if(res.data.resultCode==1){
                     this.strArr=[];
                     let data=res.data.data;
@@ -211,16 +216,32 @@ export default {
                     })
                     this.chartData=chartData;
                     this.shopChartData = shopChartData;
-                    console.log(this.strArr,'this.strArr');
-                    console.log(this.chartData,'chartDate');
-                    console.log(this.shopChartData,'shopChartData');
-
-                    // this.orders=res.data.data;
+                    this.isShow=true;
+                    this.orders=res.data.data;
+                    this.initOrders(this.orders);
                 }else{
                     this.$message.error(res.data.message);
                 }
             });
         },
+        initOrders(orders) {
+            this.apipost("/api/Statistic/GetMarriageOrderList", {}, res => {
+                if(res.data.resultCode==1){
+                    let data=res.data.data;
+                    orders.forEach(x=>{
+                        data.forEach(y=>{
+                            if(x.Marriage==y.Marriage){
+                                x.LtName=y.LtName;
+                                x.Unit_Price=y.Unit_Price;
+                            }
+                        })
+                    })
+                    this.dataList = orders;
+                }else{
+                    this.$message.error(res.data.message);
+                }
+            });
+        }
     }
 }
 </script>
\ No newline at end of file