|
|
@@ -4,27 +4,29 @@
|
|
|
<el-col :span="8">
|
|
|
<el-card shadow="hover" class="mgb20" style="height:252px;">
|
|
|
<div class="user-info">
|
|
|
- <img src="../../assets/img/img.jpg" class="user-avator" alt="">
|
|
|
+ <img src="../../assets/img/img.jpg" class="user-avator" alt />
|
|
|
<div class="user-info-cont">
|
|
|
<div class="user-info-name">{{name}}</div>
|
|
|
<div>{{role}}</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="user-info-list">上次登录时间：<span>2018-01-01</span></div>
|
|
|
- <div class="user-info-list">上次登录地点：<span>东莞</span></div>
|
|
|
+ <div class="user-info-list">
|
|
|
+ 上次登录时间：
|
|
|
+ <span>2019-11-01</span>
|
|
|
+ </div>
|
|
|
+ <div class="user-info-list">
|
|
|
+ 上次登录地点：
|
|
|
+ <span>东莞</span>
|
|
|
+ </div>
|
|
|
</el-card>
|
|
|
<el-card shadow="hover" style="height:252px;">
|
|
|
<div slot="header" class="clearfix">
|
|
|
<span>语言详情</span>
|
|
|
- </div>
|
|
|
- Vue
|
|
|
- <el-progress :percentage="71.3" color="#42b983"></el-progress>
|
|
|
- JavaScript
|
|
|
- <el-progress :percentage="24.1" color="#f1e05a"></el-progress>
|
|
|
- CSS
|
|
|
- <el-progress :percentage="3.7"></el-progress>
|
|
|
- HTML
|
|
|
- <el-progress :percentage="0.9" color="#f56c6c"></el-progress>
|
|
|
+ </div>Vue
|
|
|
+ <el-progress :percentage="71.3" color="#42b983"></el-progress>JavaScript
|
|
|
+ <el-progress :percentage="24.1" color="#f1e05a"></el-progress>CSS
|
|
|
+ <el-progress :percentage="13.7"></el-progress>HTML
|
|
|
+ <el-progress :percentage="5.9" color="#f56c6c"></el-progress>
|
|
|
</el-card>
|
|
|
</el-col>
|
|
|
<el-col :span="16">
|
|
|
@@ -68,7 +70,7 @@
|
|
|
<span>待办事项</span>
|
|
|
<el-button style="float: right; padding: 3px 0" type="text">添加</el-button>
|
|
|
</div>
|
|
|
- <el-table :data="todoList" :show-header="false" height="304" style="width: 100%;font-size:14px;">
|
|
|
+ <el-table :show-header="false" :data="todoList" style="width:100%;">
|
|
|
<el-table-column width="40">
|
|
|
<template slot-scope="scope">
|
|
|
<el-checkbox v-model="scope.row.status"></el-checkbox>
|
|
|
@@ -76,11 +78,14 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column>
|
|
|
<template slot-scope="scope">
|
|
|
- <div class="todo-item" :class="{'todo-item-del': scope.row.status}">{{scope.row.title}}</div>
|
|
|
+ <div
|
|
|
+ class="todo-item"
|
|
|
+ :class="{'todo-item-del': scope.row.status}"
|
|
|
+ >{{scope.row.title}}</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column width="60">
|
|
|
- <template slot-scope="scope">
|
|
|
+ <template>
|
|
|
<i class="el-icon-edit"></i>
|
|
|
<i class="el-icon-delete"></i>
|
|
|
</template>
|
|
|
@@ -92,12 +97,12 @@
|
|
|
<el-row :gutter="20">
|
|
|
<el-col :span="12">
|
|
|
<el-card shadow="hover">
|
|
|
- <schart ref="bar" class="schart" canvasId="bar" :data="data" type="bar" :options="options"></schart>
|
|
|
+ <schart ref="bar" class="schart" canvasId="bar" :options="options"></schart>
|
|
|
</el-card>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-card shadow="hover">
|
|
|
- <schart ref="line" class="schart" canvasId="line" :data="data" type="line" :options="options2"></schart>
|
|
|
+ <schart ref="line" class="schart" canvasId="line" :options="options2"></schart>
|
|
|
</el-card>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -105,239 +110,267 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
- import Schart from 'vue-schart';
|
|
|
- import bus from '../common/bus';
|
|
|
- export default {
|
|
|
- name: 'dashboard',
|
|
|
- data() {
|
|
|
- return {
|
|
|
- name: localStorage.getItem('ms_username'),
|
|
|
- todoList: [{
|
|
|
- title: '今天要修复100个bug',
|
|
|
- status: false,
|
|
|
- },
|
|
|
- {
|
|
|
- title: '今天要修复100个bug',
|
|
|
- status: false,
|
|
|
- },
|
|
|
+import Schart from 'vue-schart';
|
|
|
+import bus from '../common/bus';
|
|
|
+export default {
|
|
|
+ name: 'dashboard',
|
|
|
+ data() {
|
|
|
+ return {
|
|
|
+ name: localStorage.getItem('ms_username'),
|
|
|
+ todoList: [
|
|
|
+ {
|
|
|
+ title: '今天要修复100个bug',
|
|
|
+ status: false
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '今天要修复100个bug',
|
|
|
+ status: false
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '今天要写100行代码加几个bug吧',
|
|
|
+ status: false
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '今天要修复100个bug',
|
|
|
+ status: false
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '今天要修复100个bug',
|
|
|
+ status: true
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '今天要写100行代码加几个bug吧',
|
|
|
+ status: true
|
|
|
+ }
|
|
|
+ ],
|
|
|
+ data: [
|
|
|
+ {
|
|
|
+ name: '2018/09/04',
|
|
|
+ value: 1083
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: '2018/09/05',
|
|
|
+ value: 941
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: '2018/09/06',
|
|
|
+ value: 1139
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: '2018/09/07',
|
|
|
+ value: 816
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: '2018/09/08',
|
|
|
+ value: 327
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: '2018/09/09',
|
|
|
+ value: 228
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: '2018/09/10',
|
|
|
+ value: 1065
|
|
|
+ }
|
|
|
+ ],
|
|
|
+ options: {
|
|
|
+ type: 'bar',
|
|
|
+ title: {
|
|
|
+ text: '最近一周各品类销售图'
|
|
|
+ },
|
|
|
+ xRorate: 25,
|
|
|
+ labels: ['周一', '周二', '周三', '周四', '周五'],
|
|
|
+ datasets: [
|
|
|
{
|
|
|
- title: '今天要写100行代码加几个bug吧',
|
|
|
- status: false,
|
|
|
- }, {
|
|
|
- title: '今天要修复100个bug',
|
|
|
- status: false,
|
|
|
+ label: '家电',
|
|
|
+ data: [234, 278, 270, 190, 230]
|
|
|
},
|
|
|
{
|
|
|
- title: '今天要修复100个bug',
|
|
|
- status: true,
|
|
|
+ label: '百货',
|
|
|
+ data: [164, 178, 190, 135, 160]
|
|
|
},
|
|
|
{
|
|
|
- title: '今天要写100行代码加几个bug吧',
|
|
|
- status: true,
|
|
|
+ label: '食品',
|
|
|
+ data: [144, 198, 150, 235, 120]
|
|
|
}
|
|
|
- ],
|
|
|
- data: [{
|
|
|
- name: '2018/09/04',
|
|
|
- value: 1083
|
|
|
- },
|
|
|
- {
|
|
|
- name: '2018/09/05',
|
|
|
- value: 941
|
|
|
- },
|
|
|
- {
|
|
|
- name: '2018/09/06',
|
|
|
- value: 1139
|
|
|
- },
|
|
|
- {
|
|
|
- name: '2018/09/07',
|
|
|
- value: 816
|
|
|
- },
|
|
|
+ ]
|
|
|
+ },
|
|
|
+ options2: {
|
|
|
+ type: 'line',
|
|
|
+ title: {
|
|
|
+ text: '最近几个月各品类销售趋势图'
|
|
|
+ },
|
|
|
+ labels: ['6月', '7月', '8月', '9月', '10月'],
|
|
|
+ datasets: [
|
|
|
{
|
|
|
- name: '2018/09/08',
|
|
|
- value: 327
|
|
|
+ label: '家电',
|
|
|
+ data: [234, 278, 270, 190, 230]
|
|
|
},
|
|
|
{
|
|
|
- name: '2018/09/09',
|
|
|
- value: 228
|
|
|
+ label: '百货',
|
|
|
+ data: [164, 178, 150, 135, 160]
|
|
|
},
|
|
|
{
|
|
|
- name: '2018/09/10',
|
|
|
- value: 1065
|
|
|
+ label: '食品',
|
|
|
+ data: [74, 118, 200, 235, 90]
|
|
|
}
|
|
|
- ],
|
|
|
- options: {
|
|
|
- title: '最近七天每天的用户访问量',
|
|
|
- showValue: false,
|
|
|
- fillColor: 'rgb(45, 140, 240)',
|
|
|
- bottomPadding: 30,
|
|
|
- topPadding: 30
|
|
|
- },
|
|
|
- options2: {
|
|
|
- title: '最近七天用户访问趋势',
|
|
|
- fillColor: '#FC6FA1',
|
|
|
- axisColor: '#008ACD',
|
|
|
- contentColor: '#EEEEEE',
|
|
|
- bgColor: '#F5F8FD',
|
|
|
- bottomPadding: 30,
|
|
|
- topPadding: 30
|
|
|
- }
|
|
|
- }
|
|
|
- },
|
|
|
- components: {
|
|
|
- Schart
|
|
|
- },
|
|
|
- computed: {
|
|
|
- role() {
|
|
|
- return this.name === 'admin' ? '超级管理员' : '普通用户';
|
|
|
- }
|
|
|
- },
|
|
|
- created(){
|
|
|
- this.handleListener();
|
|
|
- this.changeDate();
|
|
|
- },
|
|
|
- activated(){
|
|
|
- this.handleListener();
|
|
|
- },
|
|
|
- deactivated(){
|
|
|
- window.removeEventListener('resize', this.renderChart);
|
|
|
- bus.$off('collapse', this.handleBus);
|
|
|
- },
|
|
|
- methods: {
|
|
|
- changeDate(){
|
|
|
- const now = new Date().getTime();
|
|
|
- this.data.forEach((item, index) => {
|
|
|
- const date = new Date(now - (6 - index) * 86400000);
|
|
|
- item.name = `${date.getFullYear()}/${date.getMonth()+1}/${date.getDate()}`
|
|
|
- })
|
|
|
- },
|
|
|
- handleListener(){
|
|
|
- bus.$on('collapse', this.handleBus);
|
|
|
- // 调用renderChart方法对图表进行重新渲染
|
|
|
- window.addEventListener('resize', this.renderChart)
|
|
|
- },
|
|
|
- handleBus(msg){
|
|
|
- setTimeout(() => {
|
|
|
- this.renderChart()
|
|
|
- }, 300);
|
|
|
- },
|
|
|
- renderChart(){
|
|
|
- this.$refs.bar.renderChart();
|
|
|
- this.$refs.line.renderChart();
|
|
|
+ ]
|
|
|
}
|
|
|
+ };
|
|
|
+ },
|
|
|
+ components: {
|
|
|
+ Schart
|
|
|
+ },
|
|
|
+ computed: {
|
|
|
+ role() {
|
|
|
+ return this.name === 'admin' ? '超级管理员' : '普通用户';
|
|
|
}
|
|
|
+ },
|
|
|
+ // created() {
|
|
|
+ // this.handleListener();
|
|
|
+ // this.changeDate();
|
|
|
+ // },
|
|
|
+ // activated() {
|
|
|
+ // this.handleListener();
|
|
|
+ // },
|
|
|
+ // deactivated() {
|
|
|
+ // window.removeEventListener('resize', this.renderChart);
|
|
|
+ // bus.$off('collapse', this.handleBus);
|
|
|
+ // },
|
|
|
+ methods: {
|
|
|
+ changeDate() {
|
|
|
+ const now = new Date().getTime();
|
|
|
+ this.data.forEach((item, index) => {
|
|
|
+ const date = new Date(now - (6 - index) * 86400000);
|
|
|
+ item.name = `${date.getFullYear()}/${date.getMonth() + 1}/${date.getDate()}`;
|
|
|
+ });
|
|
|
+ }
|
|
|
+ // handleListener() {
|
|
|
+ // bus.$on('collapse', this.handleBus);
|
|
|
+ // // 调用renderChart方法对图表进行重新渲染
|
|
|
+ // window.addEventListener('resize', this.renderChart);
|
|
|
+ // },
|
|
|
+ // handleBus(msg) {
|
|
|
+ // setTimeout(() => {
|
|
|
+ // this.renderChart();
|
|
|
+ // }, 200);
|
|
|
+ // },
|
|
|
+ // renderChart() {
|
|
|
+ // this.$refs.bar.renderChart();
|
|
|
+ // this.$refs.line.renderChart();
|
|
|
+ // }
|
|
|
}
|
|
|
-
|
|
|
+};
|
|
|
</script>
|
|
|
|
|
|
|
|
|
<style scoped>
|
|
|
- .el-row {
|
|
|
- margin-bottom: 20px;
|
|
|
- }
|
|
|
+.el-row {
|
|
|
+ margin-bottom: 20px;
|
|
|
+}
|
|
|
|
|
|
- .grid-content {
|
|
|
- display: flex;
|
|
|
- align-items: center;
|
|
|
- height: 100px;
|
|
|
- }
|
|
|
+.grid-content {
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ height: 100px;
|
|
|
+}
|
|
|
|
|
|
- .grid-cont-right {
|
|
|
- flex: 1;
|
|
|
- text-align: center;
|
|
|
- font-size: 14px;
|
|
|
- color: #999;
|
|
|
- }
|
|
|
+.grid-cont-right {
|
|
|
+ flex: 1;
|
|
|
+ text-align: center;
|
|
|
+ font-size: 14px;
|
|
|
+ color: #999;
|
|
|
+}
|
|
|
|
|
|
- .grid-num {
|
|
|
- font-size: 30px;
|
|
|
- font-weight: bold;
|
|
|
- }
|
|
|
+.grid-num {
|
|
|
+ font-size: 30px;
|
|
|
+ font-weight: bold;
|
|
|
+}
|
|
|
|
|
|
- .grid-con-icon {
|
|
|
- font-size: 50px;
|
|
|
- width: 100px;
|
|
|
- height: 100px;
|
|
|
- text-align: center;
|
|
|
- line-height: 100px;
|
|
|
- color: #fff;
|
|
|
- }
|
|
|
-
|
|
|
- .grid-con-1 .grid-con-icon {
|
|
|
- background: rgb(45, 140, 240);
|
|
|
- }
|
|
|
+.grid-con-icon {
|
|
|
+ font-size: 50px;
|
|
|
+ width: 100px;
|
|
|
+ height: 100px;
|
|
|
+ text-align: center;
|
|
|
+ line-height: 100px;
|
|
|
+ color: #fff;
|
|
|
+}
|
|
|
|
|
|
- .grid-con-1 .grid-num {
|
|
|
- color: rgb(45, 140, 240);
|
|
|
- }
|
|
|
+.grid-con-1 .grid-con-icon {
|
|
|
+ background: rgb(45, 140, 240);
|
|
|
+}
|
|
|
|
|
|
- .grid-con-2 .grid-con-icon {
|
|
|
- background: rgb(100, 213, 114);
|
|
|
- }
|
|
|
+.grid-con-1 .grid-num {
|
|
|
+ color: rgb(45, 140, 240);
|
|
|
+}
|
|
|
|
|
|
- .grid-con-2 .grid-num {
|
|
|
- color: rgb(45, 140, 240);
|
|
|
- }
|
|
|
+.grid-con-2 .grid-con-icon {
|
|
|
+ background: rgb(100, 213, 114);
|
|
|
+}
|
|
|
|
|
|
- .grid-con-3 .grid-con-icon {
|
|
|
- background: rgb(242, 94, 67);
|
|
|
- }
|
|
|
+.grid-con-2 .grid-num {
|
|
|
+ color: rgb(45, 140, 240);
|
|
|
+}
|
|
|
|
|
|
- .grid-con-3 .grid-num {
|
|
|
- color: rgb(242, 94, 67);
|
|
|
- }
|
|
|
+.grid-con-3 .grid-con-icon {
|
|
|
+ background: rgb(242, 94, 67);
|
|
|
+}
|
|
|
|
|
|
- .user-info {
|
|
|
- display: flex;
|
|
|
- align-items: center;
|
|
|
- padding-bottom: 20px;
|
|
|
- border-bottom: 2px solid #ccc;
|
|
|
- margin-bottom: 20px;
|
|
|
- }
|
|
|
+.grid-con-3 .grid-num {
|
|
|
+ color: rgb(242, 94, 67);
|
|
|
+}
|
|
|
|
|
|
- .user-avator {
|
|
|
- width: 120px;
|
|
|
- height: 120px;
|
|
|
- border-radius: 50%;
|
|
|
- }
|
|
|
+.user-info {
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ padding-bottom: 20px;
|
|
|
+ border-bottom: 2px solid #ccc;
|
|
|
+ margin-bottom: 20px;
|
|
|
+}
|
|
|
|
|
|
- .user-info-cont {
|
|
|
- padding-left: 50px;
|
|
|
- flex: 1;
|
|
|
- font-size: 14px;
|
|
|
- color: #999;
|
|
|
- }
|
|
|
+.user-avator {
|
|
|
+ width: 120px;
|
|
|
+ height: 120px;
|
|
|
+ border-radius: 50%;
|
|
|
+}
|
|
|
|
|
|
- .user-info-cont div:first-child {
|
|
|
- font-size: 30px;
|
|
|
- color: #222;
|
|
|
- }
|
|
|
+.user-info-cont {
|
|
|
+ padding-left: 50px;
|
|
|
+ flex: 1;
|
|
|
+ font-size: 14px;
|
|
|
+ color: #999;
|
|
|
+}
|
|
|
|
|
|
- .user-info-list {
|
|
|
- font-size: 14px;
|
|
|
- color: #999;
|
|
|
- line-height: 25px;
|
|
|
- }
|
|
|
+.user-info-cont div:first-child {
|
|
|
+ font-size: 30px;
|
|
|
+ color: #222;
|
|
|
+}
|
|
|
|
|
|
- .user-info-list span {
|
|
|
- margin-left: 70px;
|
|
|
- }
|
|
|
+.user-info-list {
|
|
|
+ font-size: 14px;
|
|
|
+ color: #999;
|
|
|
+ line-height: 25px;
|
|
|
+}
|
|
|
|
|
|
- .mgb20 {
|
|
|
- margin-bottom: 20px;
|
|
|
- }
|
|
|
+.user-info-list span {
|
|
|
+ margin-left: 70px;
|
|
|
+}
|
|
|
|
|
|
- .todo-item {
|
|
|
- font-size: 14px;
|
|
|
- }
|
|
|
+.mgb20 {
|
|
|
+ margin-bottom: 20px;
|
|
|
+}
|
|
|
|
|
|
- .todo-item-del {
|
|
|
- text-decoration: line-through;
|
|
|
- color: #999;
|
|
|
- }
|
|
|
+.todo-item {
|
|
|
+ font-size: 14px;
|
|
|
+}
|
|
|
|
|
|
- .schart {
|
|
|
- width: 100%;
|
|
|
- height: 300px;
|
|
|
- }
|
|
|
+.todo-item-del {
|
|
|
+ text-decoration: line-through;
|
|
|
+ color: #999;
|
|
|
+}
|
|
|
|
|
|
+.schart {
|
|
|
+ width: 100%;
|
|
|
+ height: 300px;
|
|
|
+}
|
|
|
</style>
|
林鑫