明细

src/main/vue/src/views/Dashboard.vue

@@ -136,7 +136,7 @@ export default {
                 ];
                 this.layout2 = [
                     { x: 6, y: 0, w: 12, h: 12, i: '10', name: 'OtherStatistic' },
-                    { x: 6, y: 12, w: 12, h: 12, i: '11', name: 'Detail' }
+                    { x: 6, y: 12, w: 12, h: 15, i: '11', name: 'Detail' }
                 ];
             } else {
                 this.layout = [

src/main/vue/src/widgets/Detail.vue

@@ -26,6 +26,18 @@
             </div>
         </div> -->
         <div class="chart-box">
+            <div class="table">
+                <el-table :data="order" border style="width: 100%">
+                    <el-table-column align="center" prop="domainOrder" label="元域名"> </el-table-column>
+                    <el-table-column align="center" prop="photoAsset" label="星图"> </el-table-column>
+                    <el-table-column align="center" prop="auction" label="易拍"> </el-table-column>
+                    <el-table-column align="center" prop="saas" label="saas"> </el-table-column>
+                    <el-table-column align="center" prop="serviceCharge" label="技术服务费"> </el-table-column>
+                    <el-table-column align="center" prop="royalties" label="版权费"> </el-table-column>
+                    <el-table-column align="center" prop="recharge" label="充值"> </el-table-column>
+                    <el-table-column align="center" prop="withdraw" label="提现"> </el-table-column>
+                </el-table>
+            </div>
             <canvas ref="chart" class="chart"></canvas>
         </div>
     </widget-card>
@@ -48,7 +60,7 @@ export default {
                 { label: 'last', value: 'last' },
                 { label: 'yesterday', value: 'yesterday' }
             ],
-            order: {}
+            order: []
         };
     },
     mixins: [acc],
@@ -59,7 +71,7 @@ export default {
         setTimeout(() => {
             this.$nextTick(() => {
                 this.$refs.chart.width = this.$refs.container.$el.offsetWidth - 20;
-                this.$refs.chart.height = this.$refs.container.$el.offsetHeight - this.$refs.top.offsetHeight - 100;
+                this.$refs.chart.height = this.$refs.container.$el.offsetHeight - this.$refs.top.offsetHeight - 420;
                 this.init();
             });
         }, 500);
@@ -68,24 +80,25 @@ export default {
     methods: {
         init() {
             this.$http.get('/statistic/statisticDetail').then(res => {
-                this.order = res.today;
+                this.order = [{ ...res.today, auction: 0 }];
                 this.myChart = new Chart(this.$refs.chart.getContext('2d'), {
                     type: 'bar',
                     data: {
-                        labels: ['手续费', '充值', 'saas', '版权', '星图', '提现', '域名'],
+                        labels: ['元域名', '星图', '易拍', 'saas', '技术服务费', '版权费', '充值', '提现'],
                         datasets: [
                             {
                                 label: '流水(元)',
                                 borderColor: '#409EFF',
                                 backgroundColor: '#409EFF',
                                 data: [
-                                    this.order.serviceCharge,
-                                    this.order.recharge,
-                                    this.order.saas,
-                                    this.order.royalties,
-                                    this.order.photoAsset,
-                                    this.order.withdraw,
-                                    this.order.domainOrder
+                                    this.order[0].domainOrder,
+                                    this.order[0].photoAsset,
+                                    0,
+                                    this.order[0].saas,
+                                    this.order[0].serviceCharge,
+                                    this.order[0].royalties,
+                                    this.order[0].recharge,
+                                    this.order[0].withdraw
                                 ]
                             }
                         ]
@@ -165,4 +178,8 @@ export default {
         }
     }
 }
+
+.table {
+    margin-bottom: 20px;
+}
 </style>