Merge remote-tracking branch 'origin/master'

This commit is contained in:
2024-12-07 14:01:52 +08:00

View File

@@ -50,14 +50,14 @@
<el-tab-pane label="无功功率" name="2" class="mt10"> <el-tab-pane label="无功功率" name="2" class="mt10">
<MyEChart :options="options2" /> <MyEChart :options="options2" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="谐波电流幅值" name="3" class="mt10"> <el-tab-pane label="谐波电流幅值" name="3" class="mt10" style="position: relative;">
<div style="position: relative; height: 32px">
<el-select v-model="harmonicValue" style="position: absolute; right: 0px; width: 200px" <el-select v-model="harmonicValue" style="position: absolute;z-index:99;top:-10px; right: 185px; width: 80px"
placeholder="请选择谐波"> placeholder="请选择谐波" @change="onSubmit">
<el-option v-for="item in harmonic" :key="item.value" :label="item.label" <el-option v-for="item in harmonic" :key="item.value" :label="item.label"
:value="item.value"></el-option> :value="item.value"></el-option>
</el-select> </el-select>
</div>
<MyEChart :options="options3" /> <MyEChart :options="options3" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="首端电压模型参数" name="4"> <el-tab-pane label="首端电压模型参数" name="4">
@@ -326,18 +326,18 @@ const setEChart = (val: any, data: any, text: string, name: string) => {
max: Math.ceil(Math.max(...data.map(item => item.value))), max: Math.ceil(Math.max(...data.map(item => item.value))),
min: Math.floor(Math.min(...data.map(item => item.value))) min: Math.floor(Math.min(...data.map(item => item.value)))
}, },
legend: { // legend: {
data: ['A', 'B', 'C'] // data: ['A', 'B', 'C']
// selectedMode: false, // // selectedMode: false,
}, // },
grid: { grid: {
top: '30px', top: '30px',
left: '30px' left: '30px'
}, },
color: ['#FFCC33', '#00CC00', '#CC0000'], color: ['#FFCC00', '#009900', '#CC0000'],
series: [ series: [
{ {
name: 'A', name: 'A',
type: 'line', type: 'line',
// smooth: true, // smooth: true,
symbol: 'none', symbol: 'none',
@@ -346,7 +346,7 @@ const setEChart = (val: any, data: any, text: string, name: string) => {
.map(item => (item.value == 3.1415926 ? '' : item.value.toFixed(3))) .map(item => (item.value == 3.1415926 ? '' : item.value.toFixed(3)))
}, },
{ {
name: 'B', name: 'B',
type: 'line', type: 'line',
// smooth: true, // smooth: true,
symbol: 'none', symbol: 'none',
@@ -355,7 +355,7 @@ const setEChart = (val: any, data: any, text: string, name: string) => {
.map(item => (item.value == 3.1415926 ? '' : item.value.toFixed(3))) .map(item => (item.value == 3.1415926 ? '' : item.value.toFixed(3)))
}, },
{ {
name: 'C', name: 'C',
type: 'line', type: 'line',
// smooth: true, // smooth: true,
symbol: 'none', symbol: 'none',
@@ -579,4 +579,7 @@ const handleNodeClick = (data: any, node: any) => {
margin-top: 5px; margin-top: 5px;
color: blue; color: blue;
} }
.el-select {
min-width: 80px;
}
</style> </style>