{:__('Real time')}
-
{:__('News count')}
+ {:__('Picture count')}
-
5302
-
-
{:__('Comment count')}
+
{$picturenums}
+
+ {:__('Picture nums')}
-
8205
-
-
{:__('Like count')}
+
{$picturesize|format_bytes=###,'',0}
+
+ {:__('Picture size')}
@@ -385,12 +400,3 @@
-
-
-
diff --git a/application/common.php b/application/common.php
index 43b53a30..67bf8e02 100755
--- a/application/common.php
+++ b/application/common.php
@@ -33,15 +33,16 @@ if (!function_exists('format_bytes')) {
* 将字节转换为可读文本
* @param int $size 大小
* @param string $delimiter 分隔符
+ * @param int $precision 小数位数
* @return string
*/
- function format_bytes($size, $delimiter = '')
+ function format_bytes($size, $delimiter = '', $precision = 2)
{
$units = array('B', 'KB', 'MB', 'GB', 'TB', 'PB');
for ($i = 0; $size >= 1024 && $i < 6; $i++) {
$size /= 1024;
}
- return round($size, 2) . $delimiter . $units[$i];
+ return round($size, $precision) . $delimiter . $units[$i];
}
}
diff --git a/public/assets/js/backend/dashboard.js b/public/assets/js/backend/dashboard.js
index 078d1def..ab8409c2 100755
--- a/public/assets/js/backend/dashboard.js
+++ b/public/assets/js/backend/dashboard.js
@@ -11,11 +11,19 @@ define(['jquery', 'bootstrap', 'backend', 'addtabs', 'table', 'echarts', 'echart
text: '',
subtext: ''
},
+ color: [
+ "#18d1b1",
+ "#3fb1e3",
+ "#626c91",
+ "#a0a7e6",
+ "#c4ebad",
+ "#96dee8"
+ ],
tooltip: {
trigger: 'axis'
},
legend: {
- data: [__('Sales'), __('Orders')]
+ data: [__('Register user')]
},
toolbox: {
show: false,
@@ -27,7 +35,7 @@ define(['jquery', 'bootstrap', 'backend', 'addtabs', 'table', 'echarts', 'echart
xAxis: {
type: 'category',
boundaryGap: false,
- data: Orderdata.column
+ data: Config.column
},
yAxis: {},
grid: [{
@@ -37,7 +45,7 @@ define(['jquery', 'bootstrap', 'backend', 'addtabs', 'table', 'echarts', 'echart
bottom: 30
}],
series: [{
- name: __('Sales'),
+ name: __('Register user'),
type: 'line',
smooth: true,
areaStyle: {
@@ -48,55 +56,13 @@ define(['jquery', 'bootstrap', 'backend', 'addtabs', 'table', 'echarts', 'echart
width: 1.5
}
},
- data: Orderdata.paydata
- },
- {
- name: __('Orders'),
- type: 'line',
- smooth: true,
- areaStyle: {
- normal: {}
- },
- lineStyle: {
- normal: {
- width: 1.5
- }
- },
- data: Orderdata.createdata
- }]
+ data: Config.userdata
+ }]
};
// 使用刚指定的配置项和数据显示图表。
myChart.setOption(option);
- //动态添加数据，可以通过Ajax获取数据然后填充
- setInterval(function () {
- Orderdata.column.push((new Date()).toLocaleTimeString().replace(/^\D*/, ''));
- var amount = Math.floor(Math.random() * 200) + 20;
- Orderdata.createdata.push(amount);
- Orderdata.paydata.push(Math.floor(Math.random() * amount) + 1);
-
- //按自己需求可以取消这个限制
- if (Orderdata.column.length >= 20) {
- //移除最开始的一条数据
- Orderdata.column.shift();
- Orderdata.paydata.shift();
- Orderdata.createdata.shift();
- }
- myChart.setOption({
- xAxis: {
- data: Orderdata.column
- },
- series: [{
- name: __('Sales'),
- data: Orderdata.paydata
- },
- {
- name: __('Orders'),
- data: Orderdata.createdata
- }]
- });
- }, 2000);
$(window).resize(function () {
myChart.resize();
});