选择二次值问题修改

This commit is contained in:
zhujiyan
2024-09-26 14:59:55 +08:00
parent 1c9e53869c
commit f664da96b6

View File

@@ -86,6 +86,9 @@
dataSet.indexOf('_event') == -1
"
>
<el-form-item label="日期" v-show="dataSet.indexOf('_history') != -1">
<DatePicker ref="datePickerRef"></DatePicker>
</el-form-item>
<el-form-item label="指标">
<el-input
style="width: 160px"
@@ -95,9 +98,6 @@
placeholder="请输入关键词"
></el-input>
</el-form-item>
<el-form-item label="日期" v-show="dataSet.indexOf('_history') != -1">
<DatePicker ref="datePickerRef"></DatePicker>
</el-form-item>
<el-form-item label="值类型">
<el-select v-model="formInline.dataLevel" :disabled="dataLevel == 'Primary'">
<el-option value="Primary" label="一次值"></el-option>
@@ -226,7 +226,11 @@
></el-pagination>
<!-- 趋势数据 -->
<div style="height:calc(100vh - 340px)" v-if="dataSet.indexOf('_trenddata') != -1" v-loading="tableLoading">
<div
style="height: calc(100vh - 340px)"
v-if="dataSet.indexOf('_trenddata') != -1"
v-loading="tableLoading"
>
<Trend ref="trendRef"></Trend>
</div>
<!-- 实时数据 -->
@@ -258,7 +262,11 @@
></harmonicSpectrum>
</div>
<!-- 暂态事件 -->
<div style="height:calc(100vh - 340px)" v-if="dataSet.indexOf('_event') != -1" v-loading="tableLoading">
<div
style="height: calc(100vh - 340px)"
v-if="dataSet.indexOf('_event') != -1"
v-loading="tableLoading"
>
<Event ref="eventRef"></Event>
</div>
<div v-if="!tableData" style="height: 42px"></div>
@@ -328,7 +336,7 @@ const formInline = reactive({
endTime: '',
id: '',
lineId: '',
dataLevel: 'dataLevel'
dataLevel: 'Secondary'
})
const detail = ref<any>(null)
//是否显示实时数据默认内容
@@ -408,6 +416,7 @@ const nodeClick = async (e: anyObj) => {
formInline.lineId = e.id
await getDeviceData(e.pid, 'history', e.id)
.then((res: any) => {
console.log(res.data, '++++++++++++++++++420')
deviceData.value = res.data
formInline.dataLevel = res.data.dataLevel
dataLevel.value = res.data.dataLevel
@@ -437,6 +446,10 @@ const nodeClick = async (e: anyObj) => {
item.id = item.id + '_event'
}
})
//便携式设备默认二次值
if (deviceType.value == '1') {
formInline.dataLevel = 'Secondary'
}
dataSet.value = res.data.dataSetList[0].id
handleClick()
}
@@ -454,6 +467,8 @@ const deviceType = ref('0')
const pointTypeChange = (val: any, obj: any) => {
deviceType.value = val
nodeClick(obj)
formInline.dataLevel = 'Secondary'
console.log(formInline, '????????????????????????????466')
}
const realTimeRef: any = ref()
const intRealTime = async (val: any) => {
@@ -474,7 +489,7 @@ const timer: any = ref()
//tab点击事件
const handleClick = async (tab?: any) => {
tableLoading.value = true
formInline.dataLevel = 'Secondary'
// formInline.dataLevel = 'Secondary'
// loading.value = true
//点击tab时更新dataSet最新值
if (tab && tab.props && tab.props.name && dataSet.value != tab.props.name) {
@@ -729,4 +744,10 @@ onMounted(() => {})
margin-right: 5px;
}
}
.el-form {
width: 100%;
height: auto;
display: flex;
flex-wrap: wrap;
}
</style>