From 3a4e0e2208a48c43639cdd4a7ef883a11e747fbf Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期四, 02 十一月 2023 16:51:16 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/bulletin-board-style1 into wn
---
src/views/dashboard/index.vue | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 09b7532..51c7ff8 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -41,8 +41,8 @@
</div>
</template>
<template #rightBlock2>
- <DeviceStatusInfo :device="device" :type="1"></DeviceStatusInfo>
- <DeviceStatusInfo :device="device" :type="2"></DeviceStatusInfo>
+ <DeviceStatusInfo :plc="plcStore.plcInfo" :type="1"></DeviceStatusInfo>
+ <DeviceStatusInfo :device="deviceStore.deviceInfo" :type="2"></DeviceStatusInfo>
<DeviceNumberInfo></DeviceNumberInfo>
</template>
<template #rightBlock3>
@@ -53,7 +53,7 @@
</DashboardLayout>
</template>
<script setup lang="ts">
-import { computed, ref } from 'vue'
+import { computed, ref, watch, onUnmounted } from 'vue'
import ChannelCollapse from '@/views/dashboard/components/ChannelCollapse.vue'
import type { Worker, Order, Task } from '@/api/task'
import type { PLCResponse } from '@/api/plc'
@@ -75,6 +75,8 @@
import TaskControl from '@/views/dashboard/components/TaskControl.vue'
import SubTitle from '@/views/dashboard/components/SubTitle.vue'
import DashboardTitle from '@/views/dashboard/components/DashboardTitle.vue'
+import { usePLCStore } from '@/stores/plc'
+import { useDevicesStore } from '@/stores/devices'
defineOptions({
name: 'DashboardView'
@@ -131,6 +133,13 @@
function reloadAllData(task: Task) {
tasksStore.reload(task.Channel)
}
+
+const plcStore = usePLCStore()
+// 鍚姩plc 杞
+plcStore.startPollingPLC()
+
+const deviceStore = useDevicesStore()
+deviceStore.startPollingDevice()
</script>
<style scoped lang="scss">
--
Gitblit v1.8.0