Merge branch 'master' of http://192.168.1.22:3000/frontend/admin-sjzx

src/api/Business/index.ts

@@ -24,3 +24,33 @@ export function delNode(data: any) {
         params: { id: data }
     })
 }
+//终端台账树
+export function getTerminalTree() {
+    return createAxios({
+        url: '/device-boot/terminalTree/getTerminalTree',
+        method: 'get'
+    })
+}
+//查询节点内容
+export function queryTerminal(data: any) {
+    return createAxios({
+        url: `/device-boot/device/queryTerminal`,
+        method: 'get',
+        params: data
+    })
+}
+//删除设备
+export function delTerminal(data: any) {
+    return createAxios({
+        url: `/device-boot/device/delTerminal`,
+        method: 'delete',
+        params: data
+    })
+}
+//获取前置机
+export function nodeAllList() {
+    return createAxios({
+        url: '/device-boot/node/nodeAllList',
+        method: 'get'
+    })
+}

src/api/system-boot/dicData.ts

@@ -25,10 +25,18 @@ export function dictDataGetTypeIdData(data: any) {
 }
 
 
-export function dictDataAdd(data) {
+export function dictDataAdd(data:any) {
     return request({
         url: '/system-boot/dictData/add',
         method: 'post',
         data: data
     })
+}
+
+export function areaTree(data:any) {
+    return request({
+        url: '/system-boot/area/areaTree',
+        method: 'post',
+        params: data
+    })
 }

src/components/table/index.vue

@@ -176,4 +176,9 @@ defineExpose({
     border-right: 1px solid #e4e7e9;
     border-bottom: 1px solid #e4e7e9;
 }
+::v-deep .el-pagination__sizes {
+    .el-select {
+        min-width: 128px;
+    }
+}
 </style>

src/components/tree/pms/Terminal.vue

@@ -0,0 +1,74 @@
+<template>
+    <Tree ref="treRef" :data="tree" :expanded="expanded" />
+</template>
+
+<script lang="ts" setup>
+import { ref, nextTick } from 'vue'
+import Tree from './index.vue'
+
+import { getTerminalTree } from '@/api/Business/index.ts'
+import { useConfig } from '@/stores/config'
+defineOptions({
+    name: 'govern/deviceTree'
+})
+const emit = defineEmits(['init'])
+const config = useConfig()
+const expanded:any = ref([])
+const tree = ref()
+const treRef = ref()
+getTerminalTree().then(res => {
+    // let arr: any[] = []
+    res.data.forEach((item: any) => {
+        item.icon = 'el-icon-Menu'
+        item.level = 0
+        item.children.forEach((item2: any) => {
+            item2.icon = 'el-icon-HomeFilled'
+            item2.level = 100
+            expanded.value.push(item2.id)
+            item2.children.forEach((item3: any) => {
+                item3.icon = 'el-icon-CollectionTag'
+                item3.level = 200
+                item3.children.forEach((item4: any) => {
+                    item4.icon = 'el-icon-Flag'
+                    item4.level = 300
+                    // arr.push(item4)
+                    item4.children.forEach((item5: any) => {
+                        item5.icon = 'el-icon-OfficeBuilding'
+                        item5.level = 400
+                        item5.children.forEach((item6: any) => {
+                            item6.icon = 'el-icon-Film'
+                            item6.level = 500
+                            item6.children.forEach((item7: any) => {
+                                item7.icon = 'el-icon-Share'
+                                item7.level = 600
+                                item7.children.forEach((item8: any) => {
+                                    item8.icon = 'el-icon-Location'
+                                    item8.level = 700
+                                })
+                            })
+                        })
+                    })
+                })
+            })
+        })
+    })
+    tree.value = res.data
+    nextTick(() => {
+        // if (arr.length) {
+        //     treRef.value.treeRef.setCurrentKey(arr[0].id)
+        //     // 注册父组件事件
+        //     emit('init', {
+        //         level: 2,
+        //         ...arr[0]
+        //     })
+        // } else {
+        //     emit('init')
+        // }
+    })
+})
+</script>
+<style lang="scss" scoped>
+.el-tree {
+    background: #efeff0;
+}
+</style>

src/components/tree/pms/index.vue

@@ -0,0 +1,116 @@
+<template>
+    <div :style="{ width: menuCollapse ? '40px' : props.width }" style="transition: all 0.3s; overflow: hidden">
+        <Icon
+            v-show="menuCollapse"
+            @click="onMenuCollapse"
+            :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
+            :class="menuCollapse ? 'unfold' : ''"
+            size="18"
+            class="fold ml10 mt20 menu-collapse"
+            style="cursor: pointer"
+        />
+        <div class="cn-tree" :style="{ opacity: menuCollapse ? 0 : 1 }">
+            <div style="display: flex; align-items: center" class="mb10">
+                <el-input v-model="filterText" placeholder="请输入内容" clearable>
+                    <template #prefix>
+                        <Icon name="el-icon-Search" style="font-size: 16px" />
+                    </template>
+                </el-input>
+                <Icon
+                    @click="onMenuCollapse"
+                    :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
+                    :class="menuCollapse ? 'unfold' : ''"
+                    size="18"
+                    class="fold ml10 menu-collapse"
+                    style="cursor: pointer"
+                />
+            </div>
+            <el-tree
+                style="flex: 1; overflow: auto"
+                ref="treeRef"
+                :props="defaultProps"
+                v-bind="$attrs"
+                highlight-current
+                :default-expanded-keys="expanded"
+                :filter-node-method="filterNode"
+                node-key="id"
+            >
+                <template #default="{ node, data }">
+                    <span class="custom-tree-node">
+                        <Icon
+                            :name="data.icon"
+                            style="font-size: 16px"
+                            :style="{ color: data.color }"
+                            v-if="data.icon"
+                        />
+                        <span style="margin-left: 4px">{{ node.label }}</span>
+                    </span>
+                </template>
+            </el-tree>
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import useCurrentInstance from '@/utils/useCurrentInstance'
+import { ElTree } from 'element-plus'
+import { ref, watch } from 'vue'
+
+defineOptions({
+    name: 'govern/tree'
+})
+interface Props {
+    width?: string,
+    expanded?: any
+}
+
+const props = withDefaults(defineProps<Props>(), {
+    width: '280px',
+    expanded:[]
+})
+const { proxy } = useCurrentInstance()
+const menuCollapse = ref(false)
+const filterText = ref('')
+const defaultProps = {
+    label: 'name',
+    value: 'id'
+}
+watch(filterText, val => {
+    treeRef.value!.filter(val)
+})
+const onMenuCollapse = () => {
+    menuCollapse.value = !menuCollapse.value
+    proxy.eventBus.emit('cnTreeCollapse', menuCollapse)
+}
+const filterNode = (value: string, data: any) => {
+    if (!value) return true
+    return data.name.includes(value)
+}
+const treeRef = ref<InstanceType<typeof ElTree>>()
+defineExpose({ treeRef })
+</script>
+
+<style lang="scss" scoped>
+.cn-tree {
+    flex-shrink: 0;
+    display: flex;
+    flex-direction: column;
+    box-sizing: border-box;
+    padding: 10px;
+    height: 100%;
+    width: 100%;
+    :deep(.el-tree) {
+        border: 1px solid var(--el-border-color);
+    }
+    :deep(.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content) {
+        background-color: var(--el-color-primary-light-7);
+    }
+    .menu-collapse {
+        color: var(--el-color-primary);
+    }
+}
+.custom-tree-node {
+    display: flex;
+    align-items: center;
+}
+</style>

src/views/pms/BusinessAdministrator/TerminalManagement/FrontManagement.vue

@@ -78,7 +78,7 @@ import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 defineOptions({
-    name: 'govern/log/debug'
+    name: 'FrontManagement'
 })
 
 const fontdveoption: any = ref([