设备监控

src/components/form/datePicker/index.vue

@@ -182,7 +182,7 @@ const next = () => {
     var presentM = now.getMonth() + 1
     // 获取当前日期
     var presentD = now.getDate()
-    if (interval == 3) {
+    if (interval.value == 3) {
         if (month == 12) {
             year = year + 1
             // 年份进位后，大于当前的年份，是不科学的
@@ -255,7 +255,7 @@ const next = () => {
                 }
             }
         }
-    } else if (interval == 2) {
+    } else if (interval.value == 2) {
         // 前进需要年份进位
         if (month == 10) {
             year = year + 1
@@ -351,8 +351,8 @@ const next = () => {
                 }
             }
         }
-    } else if (interval == 5) {
-    } else if (interval == 4) {
+    } else if (interval.value == 5) {
+    } else if (interval.value == 4) {
         //根据开始时间推
         var start = new Date(year, month - 1, date)
         start.setDate(start.getDate() + 7)

src/components/table/header/index.vue

@@ -16,7 +16,7 @@
                     :label-width="90"
                 >
                     <el-form-item label="日期" v-if="datePicker" style="grid-column: span 2; max-width: unset">
-                        <DatePicker ref="Picker"></DatePicker>
+                        <DatePicker ref="datePickerRef"></DatePicker>
                     </el-form-item>
                     <slot name="select"></slot>
                 </el-form>
@@ -43,11 +43,7 @@ import { mainHeight } from '@/utils/layout'
 
 const tableStore = inject('tableStore') as TableStore
 const tableHeader = ref()
-const Picker = ref()
-const date = ref([
-    window.XEUtils.toDateString(new Date(), 'yyyy-MM-dd'),
-    window.XEUtils.toDateString(new Date(), 'yyyy-MM-dd')
-])
+const datePickerRef = ref()
 
 interface Props {
     datePicker?: boolean
@@ -56,10 +52,6 @@ interface Props {
 const props = withDefaults(defineProps<Props>(), {
     datePicker: false
 })
-if (props.datePicker) {
-    // tableStore.table.params.searchBeginTime = Picker.value.timeValue[0]
-    // tableStore.table.params.searchEndTime = Picker.value.timeValue[1]
-}
 // 动态计算table高度
 const resizeObserver = new ResizeObserver(entries => {
     for (const entry of entries) {
@@ -69,9 +61,9 @@ const resizeObserver = new ResizeObserver(entries => {
 const showUnfoldButton = ref(false)
 onMounted(() => {
     if (props.datePicker) {
-        tableStore.table.params.searchBeginTime = Picker.value.timeValue[0]
-        tableStore.table.params.searchEndTime = Picker.value.timeValue[1]
-        tableStore.table.params.timeFlag = Picker.value.timeFlag
+        tableStore.table.params.searchBeginTime = datePickerRef.value.timeValue[0]
+        tableStore.table.params.searchEndTime = datePickerRef.value.timeValue[1]
+        tableStore.table.params.timeFlag = datePickerRef.value.timeFlag
     }
     nextTick(() => {
         resizeObserver.observe(tableHeader.value)
@@ -105,9 +97,9 @@ const showSelectChange = () => {
 }
 const onComSearch = async () => {
     if (props.datePicker) {
-        tableStore.table.params.searchBeginTime = Picker.value.timeValue[0]
-        tableStore.table.params.searchEndTime = Picker.value.timeValue[1]
-        tableStore.table.params.timeFlag = Picker.value.timeFlag
+        tableStore.table.params.searchBeginTime = datePickerRef.value.timeValue[0]
+        tableStore.table.params.searchEndTime = datePickerRef.value.timeValue[1]
+        tableStore.table.params.timeFlag = datePickerRef.value.timeFlag
     }
 
     await tableStore.onTableAction('search', {})

src/components/tree/govern/deviceTree.vue

@@ -1,17 +1,19 @@
 <template>
-    <Tree :data="tree" />
+    <Tree ref="treRef" :data="tree" />
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue'
-import Tree from './index.vue'
+import { ref, nextTick } from 'vue'
+import Tree from '../index.vue'
 import { getDeviceTree } from '@/api/cs-device-boot/csLedger'
 import { useConfig } from '@/stores/config'
 defineOptions({
     name: 'govern/deviceTree'
 })
+const emit = defineEmits(['init'])
 const config = useConfig()
 const tree = ref()
+const treRef = ref()
 getDeviceTree().then(res => {
     let arr: any[] = []
     res.data.forEach((item: any) => {
@@ -31,5 +33,13 @@ getDeviceTree().then(res => {
         })
     })
     tree.value = res.data
+    nextTick(() => {
+        treRef.value.treeRef.setCurrentKey(arr[0].id)
+        // 注册父组件事件
+        emit('init', {
+            level: 2,
+            ...arr[0]
+        })
+    })
 })
 </script>

src/components/tree/govern/pointTree.vue

@@ -0,0 +1,48 @@
+<template>
+    <Tree ref="treRef" :data="tree" />
+</template>
+
+<script lang="ts" setup>
+import { ref, nextTick } from 'vue'
+import Tree from '../index.vue'
+import { getLineTree } from '@/api/cs-device-boot/csLedger'
+import { useConfig } from '@/stores/config'
+defineOptions({
+    name: 'govern/deviceTree'
+})
+const emit = defineEmits(['init'])
+const config = useConfig()
+const tree = ref()
+const treRef = ref()
+getLineTree().then(res => {
+    let arr: any[] = []
+    res.data.forEach((item: any) => {
+        item.icon = 'el-icon-HomeFilled'
+        item.color = config.getColorVal('elementUiPrimary')
+        item.children.forEach((item2: any) => {
+            item2.icon = 'el-icon-List'
+            item.color = config.getColorVal('elementUiPrimary')
+            item2.children.forEach((item3: any) => {
+                item3.icon = 'el-icon-Platform'
+                item3.color = config.getColorVal('elementUiPrimary')
+                if (item3.comFlag === 1) {
+                    item3.color = '#e26257 !important'
+                }
+                item3.children.forEach((item4: any) => {
+                    item4.icon = 'el-icon-LocationFilled'
+                    arr.push(item4)
+                })
+            })
+        })
+    })
+    tree.value = res.data
+    nextTick(() => {
+        treRef.value.treeRef.setCurrentKey(arr[0].id)
+        // 注册父组件事件
+        emit('init', {
+            level: 2,
+            ...arr[0]
+        })
+    })
+})
+</script>

src/components/tree/index.vue

@@ -6,13 +6,14 @@
             </template>
         </el-input>
         <el-tree
-            style="flex: 1"
+            style="flex: 1;overflow: auto;"
             ref="treeRef"
             :props="defaultProps"
             v-bind="$attrs"
             highlight-current
             default-expand-all
             :filter-node-method="filterNode"
+            node-key="id"
         >
             <template #default="{ node, data }">
                 <span class="custom-tree-node">
@@ -43,6 +44,7 @@ const filterNode = (value: string, data: any) => {
     if (!value) return true
     return data.name.includes(value)
 }
+defineExpose({ treeRef })
 </script>
 <style lang="scss" scoped>
 .cn-tree {