修改测试bug
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
<!-- @init="nodeClick" -->
|
||||
<PointTree @node-click="nodeClick" @pointTypeChange="pointTypeChange"></PointTree>
|
||||
<div class="device-control-right" v-if="deviceData">
|
||||
<el-descriptions title="设备基本信息" class="mb10" :column="3" border>
|
||||
<el-descriptions title="监测点信息" class="mb10" :column="3" border>
|
||||
<template #extra>
|
||||
<!-- <el-button v-if="deviceType == '1'" type="primary" @click="handleDownLoadTemplate">
|
||||
模版下载
|
||||
@@ -90,26 +90,34 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="值类型" v-if="!dataSet.includes('_items')">
|
||||
<el-select style="min-width: 120px !important" v-model="formInline.dataLevel"
|
||||
<el-form-item v-if="!dataSet.includes('_items')">
|
||||
<!-- <el-select style="min-width: 120px !important" v-model="formInline.dataLevel"
|
||||
:disabled="dataLevel == 'Primary' && deviceType == '0'">
|
||||
<el-option value="Primary" label="一次值"></el-option>
|
||||
<el-option value="Secondary" label="二次值"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="筛选" v-if="!dataSet.includes('_')">
|
||||
<el-input style="width: 160px" v-model="searchValue" autocomplete="off" clearable
|
||||
@input="handleSearch" placeholder="请输入关键词"></el-input>
|
||||
</el-select> -->
|
||||
<el-radio-group v-model="formInline.dataLevel" @change="handleClick">
|
||||
<el-radio-button label="一次值" value="Primary" />
|
||||
<el-radio-button label="二次值" value="Secondary" />
|
||||
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="谐波次数" v-show="oddAndEvenFlag && !dataSet.includes('_')">
|
||||
<el-select v-model="oddAndEven" style="min-width: 120px !important">
|
||||
<el-option v-for="item in oddAndEvenList" :key="item.value" :label="item.label"
|
||||
:value="item.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="关键字" v-if="!dataSet.includes('_')">
|
||||
<el-input style="width: 160px" v-model="searchValue" autocomplete="off" clearable
|
||||
@input="handleSearch" placeholder="请输入关键词"></el-input>
|
||||
</el-form-item>
|
||||
</template>
|
||||
<template #operation>
|
||||
<el-button type="primary" icon="el-icon-Search" @click="handleClick">查询</el-button>
|
||||
<el-button type="primary"
|
||||
:icon="dataSet.indexOf('_realtimedata') != -1 ? 'el-icon-Refresh' : 'el-icon-Search'"
|
||||
@click="handleClick">{{ dataSet.indexOf('_realtimedata') != -1 ? '刷新' : '查询' }}</el-button>
|
||||
<el-button type="primary" :disabled="tableLoading" v-if="realTimeFlag" :icon="DataLine"
|
||||
@click="handleTrend">
|
||||
谐波频谱
|
||||
@@ -146,17 +154,19 @@
|
||||
></div> -->
|
||||
<!-- v-loading="tableLoading" -->
|
||||
<div :style="{ height: tableHeight }" v-loading="tableLoading" v-if="!dataSet.includes('_')">
|
||||
<div style="overflow: auto" :style="{ height: tableHeight }" v-loading="tableLoading" v-if="
|
||||
<div style="overflow: auto" :style="{ height: tableHeight }" v-if="
|
||||
dataSet.indexOf('_trenddata') == -1 &&
|
||||
dataSet.indexOf('_realtimedata') == -1 &&
|
||||
dataSet.indexOf('_event') == -1 &&
|
||||
tableData.length != 0
|
||||
">
|
||||
<div class="mb5 mt5" v-if="dataSet.indexOf('_history') == -1">
|
||||
<div class="mb5 mt5" v-if="dataSet.indexOf('_history') == -1"
|
||||
style="font-weight: 800;font-size: 16px;text-align: center">
|
||||
统计时间：{{ tableData[0]?.time || '' }}
|
||||
</div>
|
||||
|
||||
<nearRealTimeData ref="nearRealTimeDataRef" v-if="dataSet.indexOf('_history') == -1" />
|
||||
<nearRealTimeData ref="nearRealTimeDataRef" v-if="dataSet.indexOf('_history') == -1"
|
||||
:style="{ height: tableHeightBox, overflow: 'auto' }" />
|
||||
|
||||
|
||||
<!-- 循环渲染的card 最新数据/历史数据显示 -->
|
||||
@@ -346,7 +356,7 @@
|
||||
<el-empty v-else description="请选择设备" class="device-control-right" />
|
||||
<Detail ref="detailRef" :detail="detail" @close="detail = null" :dataLevel="dataLevel" v-if="detail"></Detail>
|
||||
<!-- 离线数据导入组件 -->
|
||||
<offLineDataImport ref="offLineDataImportRef"></offLineDataImport>
|
||||
<!-- <offLineDataImport ref="offLineDataImportRef"></offLineDataImport> -->
|
||||
<!-- 补召日志 -->
|
||||
<analysisList ref="analysisListRef"></analysisList>
|
||||
</div>
|
||||
@@ -399,7 +409,7 @@ const devTypeOptions = ref([])
|
||||
const devModelOptions = ref([])
|
||||
const tableData = ref<any[]>([])
|
||||
const tableHeight = mainHeight(290).height
|
||||
const tableHeightBox = mainHeight(310).height
|
||||
const tableHeightBox = mainHeight(330).height
|
||||
const searchValue = ref('')
|
||||
const TrendList = ref({})
|
||||
const oddAndEven = ref('1')
|
||||
@@ -631,7 +641,8 @@ const deviceId: any = ref('')
|
||||
const lineId: any = ref('')
|
||||
const dataLevel: any = ref('')
|
||||
const nodeClick = async (e: anyObj) => {
|
||||
console.log("🚀 ~ nodeClick ~ e:", e)
|
||||
// console.log("🚀 ~ nodeClick ~ e:", e)
|
||||
if (e.level == 2) return
|
||||
searchValue.value = ''
|
||||
await queryDictType({
|
||||
lineId: e?.id,
|
||||
@@ -642,7 +653,7 @@ const nodeClick = async (e: anyObj) => {
|
||||
formInline.targetType = res.data[0].id
|
||||
})
|
||||
|
||||
if (e.level == 2) return
|
||||
|
||||
deviceId.value = e?.pid
|
||||
lineId.value = e?.id
|
||||
TrendList.value = e
|
||||
@@ -915,6 +926,10 @@ const getRealDataMqttMsg = async () => {
|
||||
ElMessage.success('装置应答失败')
|
||||
tableLoading.value = false
|
||||
}
|
||||
}).catch(e => {
|
||||
setTimeout(() => {
|
||||
tableLoading.value = false
|
||||
}, 0)
|
||||
})
|
||||
}
|
||||
//tab点击事件
|
||||
@@ -1018,29 +1033,29 @@ const handleClick = async (tab?: any) => {
|
||||
}
|
||||
//测试项记录
|
||||
if (dataSet.value.includes('_items')) {
|
||||
setTimeout(() => {
|
||||
formInline.startTime = datePickerRef.value && datePickerRef.value?.timeValue[0]
|
||||
formInline.endTime = datePickerRef.value && datePickerRef.value?.timeValue[1]
|
||||
formInline.id = dataSet.value
|
||||
getTestData(formInline)
|
||||
.then((res: any) => {
|
||||
tableData.value = res.data
|
||||
formInline.total = res.data.total
|
||||
tableLoading.value = false
|
||||
setTimeout(() => { //targetType
|
||||
testItemRecordsRef.value?.setData(res.data,)
|
||||
}, 500)
|
||||
setTimeout(() => {
|
||||
|
||||
loading.value = false
|
||||
}, 1500)
|
||||
})
|
||||
.catch(e => {
|
||||
setTimeout(() => {
|
||||
setTimeout(() => {
|
||||
formInline.startTime = datePickerRef.value && datePickerRef.value?.timeValue[0]
|
||||
formInline.endTime = datePickerRef.value && datePickerRef.value?.timeValue[1]
|
||||
formInline.id = dataSet.value
|
||||
getTestData(formInline)
|
||||
.then((res: any) => {
|
||||
tableData.value = res.data
|
||||
formInline.total = res.data.total
|
||||
tableLoading.value = false
|
||||
}, 1500)
|
||||
})
|
||||
},100)
|
||||
setTimeout(() => { //targetType
|
||||
testItemRecordsRef.value?.setData(res.data,)
|
||||
}, 500)
|
||||
setTimeout(() => {
|
||||
|
||||
loading.value = false
|
||||
}, 1500)
|
||||
})
|
||||
.catch(e => {
|
||||
setTimeout(() => {
|
||||
tableLoading.value = false
|
||||
}, 1500)
|
||||
})
|
||||
}, 100)
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user