fix:解决冲突
This commit is contained in:
@@ -454,44 +454,6 @@
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<!-- option -->
|
||||
<div v-if="isTimeSeries(chartConfig.type)">
|
||||
<div class="form__sub-title">
|
||||
<span>{{$t('dashboard.dashboard.chartForm.option')}}</span>
|
||||
</div>
|
||||
<div
|
||||
class="form-items--half-width-group"
|
||||
>
|
||||
<!--lineWidth-->
|
||||
<el-form-item
|
||||
v-if="chartConfig.type!=='point'"
|
||||
:label="$t('dashboard.dashboard.chartForm.lineWidth')"
|
||||
class="form-item--half-width"
|
||||
prop="param.option.lineWidth"
|
||||
>
|
||||
<el-input-number
|
||||
size="small"
|
||||
:controls="false"
|
||||
@change="change"
|
||||
show-word-limit
|
||||
v-model="chartConfig.param.option.lineWidth"/>
|
||||
</el-form-item>
|
||||
<!--pointSize-->
|
||||
<el-form-item
|
||||
:label="$t('dashboard.dashboard.chartForm.pointSize')"
|
||||
class="form-item--half-width"
|
||||
prop="param.option.pointSize"
|
||||
>
|
||||
<el-input-number
|
||||
size="small"
|
||||
:controls="false"
|
||||
@change="change"
|
||||
show-word-limit
|
||||
v-model="chartConfig.param.option.pointSize"/>
|
||||
</el-form-item>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Right Y Axis -->
|
||||
<div v-if="isTimeSeries(chartConfig.type)">
|
||||
<div class="form__sub-title">
|
||||
@@ -1352,9 +1314,6 @@ export default {
|
||||
minStep () {
|
||||
return this.nzDefaultConfig.minStep
|
||||
},
|
||||
lineOption () {
|
||||
return this.nzDefaultConfig.option
|
||||
}
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
@@ -1449,8 +1408,7 @@ export default {
|
||||
min: undefined,
|
||||
max: undefined
|
||||
},
|
||||
dataLink: this.chartConfig.param.dataLink,
|
||||
option: this.lineOption
|
||||
dataLink: this.chartConfig.param.dataLink
|
||||
}
|
||||
this.$nextTick(() => {
|
||||
this.chartConfig.param.thresholds.push({ value: undefined, color: randomcolor() })
|
||||
|
||||
Reference in New Issue
Block a user