Merge remote-tracking branch 'origin/dev' into dev

frontend/src/views/chart/components/senior/dialog/AssistLineEdit.vue

@@ -58,7 +58,7 @@ export default {
         name: '辅助线',
         field: '0', // 固定值
         axis: 'y', // 主轴
-        value: 0,
+        value: '0',
         lineType: 'solid',
         color: '#ff0000'
       },
@@ -81,7 +81,7 @@ export default {
       this.lineArr = JSON.parse(JSON.stringify(this.line))
     },
     addLine() {
-      this.lineArr.push(this.lineObj)
+      this.lineArr.push(JSON.parse(JSON.stringify(this.lineObj)))
       this.changeAssistLine()
     },
     removeLine(index) {

frontend/src/views/chart/view/ChartEdit.vue

@@ -2560,7 +2560,7 @@ export default {
 
   .tab-header > > > .el-tabs__item {
     font-size: 12px;
-    padding: 0 40px !important;
+    padding: 0 20px !important;
   }
 
   .blackTheme .tab-header > > > .el-tabs__item {