Merge branch 'guoqiang' into develop

src/views/PerformanceData/index.vue

@@ -24,7 +24,7 @@
     export default {
         data() {
             return {
-                opinionData: [0, 0, 0, 0, 15904960, 0, 0, 0, 0],
+                opinionData: [],
                 year_count_order_money: '',
                 money_count_order_money: '',
                 order_goods_num: '',
@@ -44,7 +44,6 @@
         methods: {
             async getData() {
                 this.opinionData = []
-                // let data = new Date()
                 let month = new Date().getMonth() + 1;
                 const res = await data.earningReport();
                 let list = res.data.month_list_money_count
@@ -83,7 +82,7 @@
                     xAxis: {
                         type: 'category',
                         boundaryGap: false,
-                        data: ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"]
+                        data:["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"]
                     },
                     yAxis: {
                         type: 'value'
@@ -125,11 +124,10 @@
                         right: '3%',
                         bottom: '3%',
                         containLabel: true,
-
                     },
                     xAxis: [{
                         type: 'category',
-                        data: ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"],
+                        data: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"],
                         axisLine: { // 改变x轴颜色
                             lineStyle: {
                                 color: '#c1c1c1',

src/views/cityDistribution/index.vue

@@ -36,15 +36,10 @@
         name: 'cityDistribution',
         data() {
             return {
-                chinachart: null,
-                chartOption: null,
                 poxy_sum: '',
                 city: {},
                 cityName: '广东',
                 cityInfo: [],
-                rankArea: [],
-                selectArea: [],
-                regions: [],
                 chartBar: null,
             }
         },
@@ -55,7 +50,6 @@
         },
         async mounted() {
             await this.getData()
-            // return
             this.drawarea();
             this.statistical(this.cityInfo)
         },
@@ -64,7 +58,7 @@
                 const res = await data.dataDistribution();
                 this.poxy_sum = res.data.poxy_sum
                 this.city = res.data.city
-                console.log(this.city, '---this.city[this.cityName]');
+                this.cityName = this.city[0].name
                 this.cityInfo.push({
                     value: this.city[0].num.level_id_1,
                     name: 'vip'
@@ -157,7 +151,7 @@
                                     }
                                 }
                             }, {
-                                name: "广东",
+                                name: this.city[0].name,
                                 selected: true,
                             }],
                             itemStyle: {