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

This commit is contained in:
wangjiahao 2022-03-11 16:32:43 +08:00
commit 74404e2b8d
2 changed files with 3 additions and 3 deletions

View File

@ -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) {

View File

@ -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 {