Skip to content
Merged

pull #12

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,16 @@ import * as filters from './filters' // global filters

/**
* If you don't want to use mock-server
* you want to use mockjs for request interception
* you can execute:
* you want to use MockJs for mock api
* you can execute: mockXHR()
*
* import { mockXHR } from '../mock'
* mockXHR()
* Currently MockJs will be used in the production environment,
* please remove it before going online! ! !
*/
import { mockXHR } from '../mock'
if (process.env.NODE_ENV === 'production') {
mockXHR()
}

Vue.use(Element, {
size: Cookies.get('size') || 'medium' // set element-ui default size
Expand Down
4 changes: 0 additions & 4 deletions src/styles/sidebar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,6 @@
margin-left: 54px;
}

.svg-icon {
margin-right: 0px;
}

.submenu-title-noDropdown {
padding: 0 !important;
position: relative;
Expand Down
4 changes: 3 additions & 1 deletion src/views/dashboard/admin/components/BarChart.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ export default {
}
},
mounted() {
this.initChart()
this.$nextTick(() => {
this.initChart()
})
this.__resizeHandler = debounce(() => {
if (this.chart) {
this.chart.resize()
Expand Down
5 changes: 4 additions & 1 deletion src/views/dashboard/admin/components/LineChart.vue
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,10 @@ export default {
}
},
mounted() {
this.initChart()
this.$nextTick(() => {
this.initChart()
})

if (this.autoResize) {
this.__resizeHandler = debounce(() => {
if (this.chart) {
Expand Down
39 changes: 37 additions & 2 deletions src/views/dashboard/admin/components/PanelGroup.vue
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,11 @@ export default {
<style lang="scss" scoped>
.panel-group {
margin-top: 18px;
.card-panel-col{

.card-panel-col {
margin-bottom: 32px;
}

.card-panel {
height: 108px;
cursor: pointer;
Expand All @@ -86,61 +88,94 @@ export default {
background: #fff;
box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
border-color: rgba(0, 0, 0, .05);

&:hover {
.card-panel-icon-wrapper {
color: #fff;
}

.icon-people {
background: #40c9c6;
background: #40c9c6;
}

.icon-message {
background: #36a3f7;
}

.icon-money {
background: #f4516c;
}

.icon-shopping {
background: #34bfa3
}
}

.icon-people {
color: #40c9c6;
}

.icon-message {
color: #36a3f7;
}

.icon-money {
color: #f4516c;
}

.icon-shopping {
color: #34bfa3
}

.card-panel-icon-wrapper {
float: left;
margin: 14px 0 0 14px;
padding: 16px;
transition: all 0.38s ease-out;
border-radius: 6px;
}

.card-panel-icon {
float: left;
font-size: 48px;
}

.card-panel-description {
float: right;
font-weight: bold;
margin: 26px;
margin-left: 0px;

.card-panel-text {
line-height: 18px;
color: rgba(0, 0, 0, 0.45);
font-size: 16px;
margin-bottom: 12px;
}

.card-panel-num {
font-size: 20px;
}
}
}
}

@media (max-width:550px) {
.card-panel-description {
display: none;
}

.card-panel-icon-wrapper {
float: none !important;
width: 100%;
height: 100%;
margin: 0 !important;

.svg-icon {
display: block;
margin: 14px auto !important;
float: none !important;
}
}
}
</style>
5 changes: 3 additions & 2 deletions src/views/dashboard/admin/components/PieChart.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ export default {
}
},
mounted() {
this.initChart()
this.$nextTick(() => {
this.initChart()
})
this.__resizeHandler = debounce(() => {
if (this.chart) {
this.chart.resize()
Expand Down Expand Up @@ -58,7 +60,6 @@ export default {
bottom: '10',
data: ['Industries', 'Technology', 'Forex', 'Gold', 'Forecasts']
},
calculable: true,
series: [
{
name: 'WEEKLY WRITE ARTICLES',
Expand Down
4 changes: 3 additions & 1 deletion src/views/dashboard/admin/components/RaddarChart.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ export default {
}
},
mounted() {
this.initChart()
this.$nextTick(() => {
this.initChart()
})
this.__resizeHandler = debounce(() => {
if (this.chart) {
this.chart.resize()
Expand Down
6 changes: 6 additions & 0 deletions src/views/dashboard/admin/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -115,4 +115,10 @@ export default {
margin-bottom: 32px;
}
}

@media (max-width:1024px) {
.chart-wrapper {
padding: 8px;
}
}
</style>