Merge branch 'yuanfeng' into '20210819'

Yuanfeng

See merge request vue-project/liangXing/frontEnd!41

runner @ 5062daaf

-Subproject commit 7b0245cf9cc57dfcee6ccb2874c3fce8d43e3c4e
+Subproject commit 5062daaf93d45b37fe0a4d04f12cd410d4a28fb2

src/components/echarts/PieChart.vue

@@ -62,7 +62,7 @@ export default {
             const defSeriesOpts = {
                 name: '学历情况',
                 type: 'pie',
-                center: ['38%', '50%'],
+                center: ['38%', '52%'],
                 radius: ['58%', '78%'],
                 avoidLabelOverlap: false,
                 itemStyle: {

src/pages/index/Right.vue

@@ -430,7 +430,7 @@ export default {
                                 axisLabel: {
                                     color: '#fff',
                                     align: 'left',
-                                    padding: [0, 0, 0, -60]
+                                    padding: [0, 0, 0, -55]
                                 },
                                 data: yData
                             }, {

static/styles/layoutMain.less

@@ -5,12 +5,14 @@
 }
 #layoutMain {
     height: 1080px;
-    .left {
-        padding-right: 0px;
+    .layout-main__left {
+        padding-left: 20px;
+        padding-right: 10px;
         background: url('../images/index/leftBg.png') no-repeat right top;
     }
-    .right {
-        padding-left: 0px;
+    .layout-main__right {
+        padding-left: 10px;
+        padding-right: 20px;
         background: url('../images/index/rightBg.png') no-repeat left top;
     }
 }