pengchanglu il y a 3 ans
Parent
commit
46a5ad9404

+ 15 - 0
application/admin/view/dashboard/index.html

@@ -217,6 +217,21 @@
                 </div>
 
                 <div class="row">
+<div class="col-lg-8  connectedSortable">
+                    <div class="nav-tabs-custom charts-custom">
+            <!-- Tabs within a box -->
+            <ul class="nav nav-tabs pull-right">
+                <li class="active"><a href="#pie-chart" data-toggle="tab">今天</a></li>
+                <li><a href="#bar-chart" data-toggle="tab">七天</a></li>
+                <li class="pull-left header"><i class="fa fa-inbox"></i> 访问记录</li>
+            </ul>
+            <div class="tab-content no-padding">
+                <!-- Morris chart - Sales -->
+                <div class="chart tab-pane active" id="pie-chart" style="position: relative; height: 300px;"></div>
+                <div class="chart tab-pane" id="bar-chart" style="position: relative; height: 300px;"></div>
+            </div>
+        </div>
+</div>
                     <div class="col-lg-8">
                         <div id="echart" class="btn-refresh" style="height:300px;width:100%;"></div>
                     </div>

+ 1 - 1
application/config.php

@@ -272,7 +272,7 @@ return [
         //是否开启IP变动检测
         'loginip_check'         => true,
         //登录页默认背景图
-        'login_background'      => "",
+        'login_background'      => "/assets/img/login1.jpg",
         //是否启用多级菜单导航
         'multiplenav'           => false,
         //是否开启多选项卡(仅在开启多级菜单时起作用)

BIN
public/assets/img/login1.jpg


+ 76 - 0
public/assets/js/backend/dashboard.js

@@ -76,6 +76,82 @@ define(['jquery', 'bootstrap', 'backend', 'addtabs', 'table', 'echarts', 'echart
 
             // 使用刚指定的配置项和数据显示图表。
             myChart.setOption(option);
+            //饼图
+         
+            var barChart = Echarts.init(document.getElementById('bar-chart'), 'walden');
+            option = {
+                legend: {},
+                tooltip: {},
+                dataset: {
+                    source: [
+                        ['产品销售', '2015', '2016', '2017'],
+                        ['风扇', 43.3, 85.8, 93.7],
+                        ['电视机', 83.1, 73.4, 55.1],
+                        ['空调', 86.4, 65.2, 82.5],
+                        ['冰箱', 72.4, 53.9, 39.1]
+                    ]
+                },
+                xAxis: {type: 'category'},
+                yAxis: {},
+                // Declare several bar series, each will be mapped
+                // to a column of dataset.source by default.
+                series: [
+                    {type: 'bar'},
+                    {type: 'bar'},
+                    {type: 'bar'}
+                ]
+            };
+            // 使用刚指定的配置项和数据显示图表。
+            barChart.setOption(option);
+
+            //饼图
+            var pieChart = Echarts.init(document.getElementById('pie-chart'), 'walden');
+            var option = {
+                tooltip: {
+                    trigger: 'item',
+                    formatter: '{a} <br/>{b}: {c} ({d}%)'
+                },
+                legend: {
+                    orient: 'vertical',
+                    left: 10,
+                    data: ['直接访问', '邮件营销', '联盟广告', '视频广告', '搜索引擎']
+                },
+                series: [
+                    {
+                        name: '访问来源',
+                        type: 'pie',
+                        radius: ['50%', '70%'],
+                        avoidLabelOverlap: false,
+                        label: {
+                            normal: {
+                                show: false,
+                                position: 'center'
+                            },
+                            emphasis: {
+                                show: true,
+                                textStyle: {
+                                    fontSize: '30',
+                                    fontWeight: 'bold'
+                                }
+                            }
+                        },
+                        labelLine: {
+                            normal: {
+                                show: false
+                            }
+                        },
+                        data: [
+                            {value: 335, name: '直接访问'},
+                            {value: 310, name: '邮件营销'},
+                            {value: 234, name: '联盟广告'},
+                            {value: 135, name: '视频广告'},
+                            {value: 1548, name: '搜索引擎'}
+                        ]
+                    }
+                ]
+            };
+            // 使用刚指定的配置项和数据显示图表。
+            pieChart.setOption(option);
 
             $(window).resize(function () {
                 myChart.resize();