diff --git a/ui/dasadmin/src/views/backend/WindBlower/index.vue b/ui/dasadmin/src/views/backend/WindBlower/index.vue index df23cd75..b768583e 100644 --- a/ui/dasadmin/src/views/backend/WindBlower/index.vue +++ b/ui/dasadmin/src/views/backend/WindBlower/index.vue @@ -1008,6 +1008,7 @@ const createRealTimeData = async () => { { type138: [], type140: [], type199: [] }, ] modelList.forEach((item: any) => { + const realVal = realData[item.attributeCode.toLowerCase()] let val = getCutDecimalsValue(realVal) if (enumStore.keys.includes(item.attributeCode)) { @@ -1113,7 +1114,7 @@ const realTimeForSubSystem = reactive({ }) const curSubSystem = ref('type1') const subSystemDataList = computed(() => { - const type = dialogradioactiveName.value === 138 ? 'type138' : 'type140' + const type = dialogradioactiveName.value === 138 ? 'type138' : dialogradioactiveName.value === 140 ? 'type140' : 'type199' return realTimeForSubSystem[curSubSystem.value][type] }) @@ -1373,7 +1374,6 @@ const sendManualCommand = (type: 1 | 0) => { const getAlarmList = () => { const start = dayjs().subtract(3, 'day').startOf('day').toDate().getTime() const end = dayjs().endOf('day').toDate().getTime() - console.log(route.query.name) getAlarmListReq({ startTime: start, diff --git a/ui/dasadmin/src/views/backend/WindBlower/overview.vue b/ui/dasadmin/src/views/backend/WindBlower/overview.vue index 844b3b2c..9f107782 100644 --- a/ui/dasadmin/src/views/backend/WindBlower/overview.vue +++ b/ui/dasadmin/src/views/backend/WindBlower/overview.vue @@ -39,8 +39,6 @@ const props = withDefaults(defineProps<{ visible: boolean; type: string; type138 }) const showData = computed(() => { - console.log(props); - let data = props.type === '138' ? props.type138 : props.type === '140' ? props.type140 : props.type199 return data.slice((pageSetting.current - 1) * pageSetting.pageSize, pageSetting.current * pageSetting.pageSize) }) @@ -60,11 +58,13 @@ watch( () => props.type, () => { pageSetting.current = 1 - pageSetting.total = props.type === '138' ? props.type138.length : props.type140.length + pageSetting.total = + props.type === '138' ? props.type138.length : (pageSetting.total = props.type === '140' ? props.type140.length : props.type199.length) } ) onMounted(() => { - pageSetting.total = props.type === '138' ? props.type138.length : props.type140.length + pageSetting.total = + props.type === '138' ? props.type138.length : (pageSetting.total = props.type === '140' ? props.type140.length : props.type199.length) }) diff --git a/ui/dasadmin/src/views/backend/node/protocol.vue b/ui/dasadmin/src/views/backend/node/protocol.vue index fb04c198..dd301ad9 100644 --- a/ui/dasadmin/src/views/backend/node/protocol.vue +++ b/ui/dasadmin/src/views/backend/node/protocol.vue @@ -21,6 +21,14 @@ :disabled="props.disabled" class="formInput" > +