修改bug

This commit is contained in:
zhujiyan
2024-10-30 15:02:25 +08:00
parent 038b5275ea
commit 45942b3205
15 changed files with 57 additions and 483 deletions

View File

@@ -349,13 +349,12 @@ import { mainHeight } from '@/utils/layout'
import { queryByCode, queryByid, queryCsDictTree } from '@/api/system-boot/dictTree'
import {
getDeviceData,
getTabsDataByType,
getBasicRealData,
getHarmRealData,
getOverLimitData
} from '@/api/cs-device-boot/EquipmentDelivery'
import { deviceHisData, deviceRtData, getGroup } from '@/api/cs-device-boot/csGroup'
import { ref, reactive, nextTick, onMounted, watch, onUnmounted, inject } from 'vue'
import { deviceHisData, deviceRtData } from '@/api/cs-device-boot/csGroup'
import { ref, reactive, onMounted, onUnmounted, inject, nextTick } from 'vue'
import { ElMessage } from 'element-plus'
import DatePicker from '@/components/form/datePicker/index.vue'
import Trend from './tabs/trend.vue' //趋势数据
@@ -367,20 +366,7 @@ import offLineDataImport from './offLineDataImport/index.vue'
import Event from './tabs/event.vue'
import { useRouter } from 'vue-router'
import TableHeader from '@/components/table/header/index.vue'
import { defineConfig, loadEnv } from 'vite'
import type { UserConfig, ConfigEnv } from 'vite'
import {
Platform,
Histogram,
TrendCharts,
DataLine,
ArrowLeft,
DataAnalysis,
Odometer,
Monitor,
Timer,
Back
} from '@element-plus/icons-vue'
import { Histogram, TrendCharts, DataLine, DataAnalysis, Odometer, Monitor, Timer, Back } from '@element-plus/icons-vue'
import analysisList from './analysisList/index.vue'
import mqtt from 'mqtt'
defineOptions({
@@ -858,22 +844,24 @@ const handleClick = async (tab?: any) => {
//查询历史指标
if (dataSet.value.includes('_history')) {
formInline.startTime = datePickerRef.value && datePickerRef.value.timeValue[0]
formInline.endTime = datePickerRef.value && datePickerRef.value.timeValue[1]
formInline.id = dataSet.value.replace('_history', '')
await deviceHisData(formInline)
.then((res: any) => {
tableData.value = res.data.records
formInline.total = res.data.total
setTimeout(() => {
tableLoading.value = false
}, 1500)
})
.catch(e => {
setTimeout(() => {
tableLoading.value = false
}, 1500)
})
await nextTick(() => {
formInline.startTime = datePickerRef.value && datePickerRef.value.timeValue[0]
formInline.endTime = datePickerRef.value && datePickerRef.value.timeValue[1]
formInline.id = dataSet.value.replace('_history', '')
deviceHisData(formInline)
.then((res: any) => {
tableData.value = res.data.records
formInline.total = res.data.total
setTimeout(() => {
tableLoading.value = false
}, 1500)
})
.catch(e => {
setTimeout(() => {
tableLoading.value = false
}, 1500)
})
})
}
//查询趋势数据
if (dataSet.value.includes('_trenddata')) {