修改测试bug
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
<div class="realtrend" v-loading="loading">
|
||||
<div class="select" v-if="!loading">
|
||||
<div class="mr10">谐波次数 </div>
|
||||
<el-select v-model="selectValue" style="width: 100px">
|
||||
<el-select v-model="selectValue" style="width: 100px" @change="selectChange">
|
||||
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
|
||||
</el-select>
|
||||
</div>
|
||||
@@ -29,16 +29,17 @@
|
||||
</div> -->
|
||||
<div class="realtrend_table" v-if="Object.keys(tableData).length != 0">
|
||||
<div class="thead_left">
|
||||
<p>次数</p>
|
||||
<p style=" font-weight: 700; background-color: #F3F6F9;">次数(次)</p>
|
||||
<p>{{ item.groupName }}{{ item.unit ? '(' + item.unit + ')' : '' }}</p>
|
||||
<p>国标限值{{ item.unit ? '(' + item.unit + ')' : '' }}</p>
|
||||
</div>
|
||||
<div class="thead_right">
|
||||
<div class="right_cell" v-for="(value, key, index) in tableData" :key="index">
|
||||
<p v-if="item.groupName.includes('间谐波')">
|
||||
{{ Number(String(key).replace('data', ' ')) - 0.5 }}次
|
||||
<p v-if="item.groupName.includes('间谐波')" style="background-color: #F3F6F9;">
|
||||
{{ Number(String(key).replace('data', ' ')) - 0.5 }}
|
||||
</p>
|
||||
<p v-else>
|
||||
<span>{{ String(key).replace('data', ' ') }}次</span>
|
||||
<p v-else style="background-color: #F3F6F9;">
|
||||
<span>{{ String(key).replace('data', ' ') }}</span>
|
||||
</p>
|
||||
<p>
|
||||
<span v-if="
|
||||
@@ -49,8 +50,20 @@
|
||||
{{ value }}
|
||||
</span>
|
||||
</p>
|
||||
<p>
|
||||
<span v-if="
|
||||
String(key).includes('data') &&
|
||||
String(key) != 'dataLevel' &&
|
||||
String(key) != 'dataTime'
|
||||
">
|
||||
{{ gbData[index]?.value || '/' }}
|
||||
</span>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="tab_info" v-if="Object.keys(tableData).length != 0">
|
||||
@@ -157,7 +170,7 @@ const chartsYxiasData: any = ref([])
|
||||
|
||||
const echartsData: any = ref()
|
||||
const barCharts = ref()
|
||||
|
||||
const gbData = ref([])
|
||||
//加载echarts
|
||||
const init = () => {
|
||||
let trendData: any = []
|
||||
@@ -168,17 +181,17 @@ const init = () => {
|
||||
count: String(key).replace('data', '')
|
||||
})
|
||||
}
|
||||
let gbData: any = []
|
||||
gbData.value = []
|
||||
for (let key in limitData.value) {
|
||||
gbData.push({
|
||||
gbData.value.push({
|
||||
name: key,
|
||||
value: limitData.value[key]
|
||||
})
|
||||
}
|
||||
if (selectValue.value == '1') {
|
||||
gbData = gbData.filter((_, index: number) => index % 2 !== 0)
|
||||
gbData.value = gbData.value.filter((_, index: number) => index % 2 !== 0)
|
||||
} else if (selectValue.value == '2') {
|
||||
gbData = gbData.filter((_, index: number) => index % 2 == 0)
|
||||
gbData.value = gbData.value.filter((_, index: number) => index % 2 == 0)
|
||||
}
|
||||
let xAxisList: any = []
|
||||
chartsData.value.map((item: any, index: any) => {
|
||||
@@ -207,14 +220,15 @@ const init = () => {
|
||||
series: []
|
||||
}
|
||||
let list: any = [
|
||||
gbData.map((item: any) => {
|
||||
return item.value
|
||||
}),
|
||||
trendData.map((item: any) => {
|
||||
return item.value
|
||||
})
|
||||
}),
|
||||
gbData.value.map((item: any) => {
|
||||
return item.value
|
||||
}),
|
||||
|
||||
]
|
||||
let legendList = ['国标限值', tabsList.value[activeName.value]?.groupName]
|
||||
let legendList = [tabsList.value[activeName.value]?.groupName, '国标限值',]
|
||||
// echartsData.value.legend.data = legendList
|
||||
list.map((item: any, index: any) => {
|
||||
echartsData.value.series.push({
|
||||
@@ -298,6 +312,12 @@ const setRealTrendData = (val: any) => {
|
||||
emit('changeTrendType', activeName.value)
|
||||
}
|
||||
}
|
||||
const selectChange=(val:any)=>{
|
||||
loading.value=true
|
||||
// setTimeout(() => {
|
||||
// loading.value=false
|
||||
// },3000)
|
||||
}
|
||||
//获取国标限值
|
||||
const limitData: any = ref()
|
||||
const setOverLimitData = (val: any) => {
|
||||
@@ -397,7 +417,7 @@ defineExpose({ open, setRealTrendData, setOverLimitData })
|
||||
display: flex;
|
||||
border: 2px solid #eee;
|
||||
cursor: pointer;
|
||||
|
||||
font-size: 13px;
|
||||
.thead_left {
|
||||
width: 150px;
|
||||
height: 100%;
|
||||
@@ -406,7 +426,7 @@ defineExpose({ open, setRealTrendData, setOverLimitData })
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
line-height: 50px;
|
||||
font-weight: 800;
|
||||
|
||||
padding-bottom: 5px;
|
||||
|
||||
p {
|
||||
@@ -414,7 +434,7 @@ defineExpose({ open, setRealTrendData, setOverLimitData })
|
||||
height: 100%;
|
||||
text-align: center;
|
||||
border: 1px solid #eee;
|
||||
line-height: 50px;
|
||||
line-height: 38px;
|
||||
margin: 0 !important;
|
||||
}
|
||||
}
|
||||
@@ -438,7 +458,7 @@ defineExpose({ open, setRealTrendData, setOverLimitData })
|
||||
height: 100%;
|
||||
text-align: center;
|
||||
border: 1px solid #eee;
|
||||
line-height: 50px;
|
||||
line-height: 38px;
|
||||
margin: 0 !important;
|
||||
}
|
||||
|
||||
|
||||
@@ -37,7 +37,9 @@ const tableStore: any = new TableStore({
|
||||
method: 'POST',
|
||||
column: [
|
||||
// { width: '60', type: 'checkbox', fixed: 'left' },
|
||||
{ title: '序号', type: 'seq', width: 80 },
|
||||
{ title: '序号', width: 80,formatter: (row: any) => {
|
||||
return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
|
||||
} },
|
||||
{ field: 'startTime', title: '发生时刻', minWidth: 170 },
|
||||
{ field: 'showName', title: '事件描述', minWidth: 170 },
|
||||
{
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<div class="view" v-loading="loading">
|
||||
<el-collapse v-model="activeNames">
|
||||
<el-collapse-item title="仪表盘" name="1">
|
||||
<el-collapse-item title="基础数据" name="1">
|
||||
<div class="view_top">
|
||||
<!-- 左侧仪表盘 -->
|
||||
<div class="view_top_left">
|
||||
|
||||
@@ -14,11 +14,16 @@
|
||||
:value="item.id"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="值类型">
|
||||
<el-select style="min-width: 120px !important" v-model="searchForm.dataLevel">
|
||||
<el-form-item >
|
||||
<!-- <el-select style="min-width: 120px !important" v-model="searchForm.dataLevel">
|
||||
<el-option value="Primary" label="一次值"></el-option>
|
||||
<el-option value="Secondary" label="二次值"></el-option>
|
||||
</el-select>
|
||||
</el-select> -->
|
||||
<el-radio-group v-model="searchForm.dataLevel" @change="init()">
|
||||
<el-radio-button label="一次值" value="Primary" />
|
||||
<el-radio-button label="二次值" value="Secondary" />
|
||||
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item label="统计类型">
|
||||
<el-select style="min-width: 120px !important" placeholder="请选择" v-model="searchForm.valueType">
|
||||
@@ -81,7 +86,7 @@ const num = ref(0)
|
||||
//值类型
|
||||
const pageHeight = ref(mainHeight(290))
|
||||
const loading = ref(true)
|
||||
const searchForm = ref({})
|
||||
const searchForm:any = ref({})
|
||||
const tableHeaderRef = ref()
|
||||
const typeOptions = [
|
||||
{
|
||||
@@ -251,7 +256,7 @@ const init = async () => {
|
||||
// orient: 'vertical', // 垂直排列
|
||||
top: 5,
|
||||
right: 70,
|
||||
width: 550,
|
||||
// width: 550,
|
||||
// height: 50
|
||||
},
|
||||
grid: {
|
||||
|
||||
Reference in New Issue
Block a user