fix:解决冲突

This commit is contained in:
zyh
2023-09-07 10:12:44 +08:00
13 changed files with 471 additions and 99 deletions

View File

@@ -447,8 +447,46 @@
</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="isShowRightYAxis(chartConfig.type)">
<div v-if="isTimeSeries(chartConfig.type)">
<div class="form__sub-title">
<span>{{$t('dashboard.dashboard.chartForm.rightYAxis')}}</span>
<el-switch
@@ -1397,7 +1435,11 @@ export default {
min: undefined,
max: undefined
},
dataLink: this.chartConfig.param.dataLink
dataLink: this.chartConfig.param.dataLink,
option: {
lineWidth: 1,
pointSize: 6
}
}
this.$nextTick(() => {
this.chartConfig.param.thresholds.push({ value: undefined, color: randomcolor() })