diff --git a/src/api/management.js b/src/api/management.js new file mode 100644 index 00000000..6be800b3 --- /dev/null +++ b/src/api/management.js @@ -0,0 +1,13 @@ +import axios from 'axios'; +import qs from 'qs'; +if (process.env.NODE_ENV === 'development') { + axios.defaults.baseURL = '/'; +} else if (process.env.NODE_ENV === 'production') { + axios.defaults.baseURL = '/'; +} +//获取所有账号数据接口 +export const getZhanghData = params => { + return axios.get('api/GetZhangh', { + params + }); +}; diff --git a/src/components/chart/barChart.vue b/src/components/chart/barChart.vue index c9b9398d..f65e9667 100644 --- a/src/components/chart/barChart.vue +++ b/src/components/chart/barChart.vue @@ -1,16 +1,14 @@ - + \ No newline at end of file +}; + diff --git a/src/components/chart/lineChart.vue b/src/components/chart/lineChart.vue index 55a3ef27..68b84b8d 100644 --- a/src/components/chart/lineChart.vue +++ b/src/components/chart/lineChart.vue @@ -72,7 +72,7 @@ export default { lineHeight: '30' } }, - legend:{}, + legend: {}, grid: { left: '2%', right: '4%', @@ -265,7 +265,7 @@ export default { } if (this.$refs.lineChart) { this.$nextTick(() => { - this.drawLine(); + // this.drawLine(); }); } } diff --git a/src/components/chart/pieChart.vue b/src/components/chart/pieChart.vue index 06ba3757..7fc2d8fc 100644 --- a/src/components/chart/pieChart.vue +++ b/src/components/chart/pieChart.vue @@ -1,15 +1,15 @@ - + - \ No newline at end of file + diff --git a/src/views/IdManagement.vue b/src/views/IdManagement.vue index 239d0471..bd89e5cd 100644 --- a/src/views/IdManagement.vue +++ b/src/views/IdManagement.vue @@ -1,118 +1,113 @@ \ No newline at end of file + diff --git a/src/views/bounced/dataBoard.vue b/src/views/bounced/dataBoard.vue index ec725325..bf705e56 100644 --- a/src/views/bounced/dataBoard.vue +++ b/src/views/bounced/dataBoard.vue @@ -3,11 +3,15 @@ -
+
-
+
- + @@ -506,7 +500,7 @@ export default { /deep/ .el-scrollbar__view { display: inline-block !important; - width: 100% + width: 100%; } /deep/ .el-scrollbar__wrap { @@ -520,7 +514,6 @@ export default { .dataBoard { height: 100%; } - } .dataBoard .region, @@ -610,4 +603,4 @@ export default { .active { transition: all 0.5s linear; } - \ No newline at end of file +