From a605cbe83aee47c5c2cadda95fbd7960a1157805 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=B2=E4=B9=88=E4=BA=86?= <zhongchunyang@rocan.com.cn>
Date: Fri, 29 Dec 2023 13:23:11 +0800
Subject: [PATCH 1/3] rsetcallback

---
 src/components/form/area/index.vue            |  2 +-
 src/utils/tableStore.ts                       | 11 ++++-
 .../sags/operationsManagement/index.vue       | 44 ++++++++++++++-----
 types/table.d.ts                              |  2 +
 4 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/src/components/form/area/index.vue b/src/components/form/area/index.vue
index b747c2d..b227610 100644
--- a/src/components/form/area/index.vue
+++ b/src/components/form/area/index.vue
@@ -14,7 +14,7 @@ const cascaderProps = {
     label: 'name',
     value: 'id',
     checkStrictly: true,
-    showAllLevels: false
+    emitPath: false
 }
 const dictData = useDictData()
 const options = dictData.state.area
diff --git a/src/utils/tableStore.ts b/src/utils/tableStore.ts
index 0af14bb..45e839c 100644
--- a/src/utils/tableStore.ts
+++ b/src/utils/tableStore.ts
@@ -9,7 +9,9 @@ interface TableStoreParams {
     column: TableColumn[]
     params?: anyObj
     method?: Method
-    isWebPaging?: boolean // 是否前端分页   
+    isWebPaging?: boolean // 是否前端分页
+    resetCallback?: () => void
+    loadCallback?: () => void
 }
 
 export default class TableStore {
@@ -29,7 +31,9 @@ export default class TableStore {
             pageSize: 20
         },
         loading: true,
-        column: []
+        column: [],
+        loadCallback: null,
+        resetCallback: null
     })
 
     constructor(public options: TableStoreParams) {
@@ -38,6 +42,7 @@ export default class TableStore {
         this.isWebPaging = options.isWebPaging || false
         this.method = options.method || 'GET'
         this.table.column = options.column
+        this.table.resetCallback = options.resetCallback || null
         Object.assign(this.table.params, options.params)
     }
 
@@ -61,6 +66,7 @@ export default class TableStore {
                 this.table.webPagingData = window.XEUtils.chunk(this.table.data, this.table.params.pageSize)
                 this.table.data = this.table.webPagingData[this.table.params.pageNum - 1]
             }
+            this.table.loadCallback && this.table.loadCallback()
             this.table.loading = false
         })
     }
@@ -85,6 +91,7 @@ export default class TableStore {
                     delete this.initData.pageSize
                     Object.assign(this.table.params, this.initData)
                     this.index()
+                    this.table.resetCallback && this.table.resetCallback()
                 }
             ],
             [
diff --git a/src/views/voltage/sags/operationsManagement/index.vue b/src/views/voltage/sags/operationsManagement/index.vue
index 6d90b52..4743290 100644
--- a/src/views/voltage/sags/operationsManagement/index.vue
+++ b/src/views/voltage/sags/operationsManagement/index.vue
@@ -6,24 +6,20 @@
                     <Area v-model='tableStore.table.params.deptIndex' />
                 </el-form-item>
                 <el-form-item label='终端状态'>
-                    <el-select v-model='tableStore.table.params.runFlag'
-                               placeholder='请选择'>
+                    <el-select v-model='form.runFlag' placeholder='请选择' @change='onRunFlagChange'>
                         <el-option label='投运' value='0' />
                         <el-option label='热备用' value='1' />
                         <el-option label='停运' value='2' />
                     </el-select>
                 </el-form-item>
                 <el-form-item label='通讯状态'>
-                    <el-select v-model='tableStore.table.params.comFlag'
-                               placeholder='请选择'>
+                    <el-select v-model='form.comFlag' placeholder='请选择' @change='onComFlagChange'>
                         <el-option label='正常' value='1' />
                         <el-option label='中断' value='0' />
                     </el-select>
                 </el-form-item>
                 <el-form-item label='厂家'>
-                    <el-select v-model='tableStore.table.params.manufacturer'
-                               placeholder='请选择'
-                    >
+                    <el-select v-model='form.manufacturer' placeholder='请选择' @change='onManufacturerChange'>
                         <el-option
                             v-for='item in manufacturer'
                             :key='item.id'
@@ -33,7 +29,8 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label='筛选数据'>
-                    <el-input v-model='tableStore.table.params.searchValue'  placeholder='请输入' />
+                    <el-input v-model='tableStore.table.params.searchValue'
+                              placeholder='根据变电站,终端编号,型号或网络参数查询' style='width:300px' />
                 </el-form-item>
             </template>
         </TableHeader>
@@ -41,7 +38,7 @@
     </div>
 </template>
 <script setup lang='tsx'>
-import { ref, onMounted, provide } from 'vue'
+import { ref, onMounted, provide, reactive } from 'vue'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
@@ -101,12 +98,24 @@ const tableStore = new TableStore({
                 }
             }
         }
-    ]
+    ],
+    resetCallback: () => {
+        form.runFlag = ''
+        form.comFlag = ''
+        form.manufacturer = ''
+    }
 })
-tableStore.table.params.deptIndex = '5699e5916a18a6381e1ac92da5bd2628'
+const form = reactive({
+    runFlag: '',
+    comFlag: '',
+    manufacturer: ''
+})
+tableStore.table.params.deptIndex = dictData.state.area[0].id
 tableStore.table.params.runFlag = []
 tableStore.table.params.comFlag = []
 tableStore.table.params.manufacturer = []
+tableStore.table.params.statisticalType = {}
+tableStore.table.params.serverName = 'event-boot'
 tableStore.table.params.searchValue = ''
 provide('tableStore', tableStore)
 
@@ -114,6 +123,19 @@ onMounted(() => {
     tableStore.index()
 })
 
+const onRunFlagChange = (val: any) => {
+    tableStore.table.params.runFlag = [val]
+}
+const onComFlagChange = (val: any) => {
+    tableStore.table.params.comFlag = [val]
+}
+const onManufacturerChange = (val: any) => {
+    let obj = manufacturer.find(item => item.id === val) as any
+    obj.label = obj.name
+    obj.value = obj.id
+    tableStore.table.params.manufacturer = [obj]
+}
+
 const addMenu = () => {
 }
 </script>
diff --git a/types/table.d.ts b/types/table.d.ts
index 7de31df..331044b 100644
--- a/types/table.d.ts
+++ b/types/table.d.ts
@@ -23,6 +23,8 @@ declare global {
             pageSize: number
             [key: string]: any
         }
+        loadCallback: () => void | null
+        resetCallback: () => void | null
     }
 
     /* 表格行 */

From 526d541cc2ce135f7bea6d1085ec4eb196b387ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=B2=E4=B9=88=E4=BA=86?= <zhongchunyang@rocan.com.cn>
Date: Fri, 29 Dec 2023 14:46:20 +0800
Subject: [PATCH 2/3] cion

---
 package.json                                  |   1 +
 pnpm-lock.yaml                                |   9 +
 src/App.vue                                   |  15 +-
 .../baInput/components/iconSelector.vue       | 159 ++++++++++--------
 src/components/table/header/index.vue         |   5 +-
 src/components/table/index.vue                |   1 +
 src/layouts/admin/components/navMenus.vue     |   2 +-
 src/layouts/admin/index.vue                   |  47 ++++--
 src/main.ts                                   |   2 +-
 src/styles/var.scss                           |  30 ++--
 src/utils/iconfont.ts                         |  64 +++++++
 src/utils/tableStore.ts                       |   1 +
 .../sags/operationsManagement/index.vue       |   2 +-
 .../sags/operationsManagement/point.vue       | 141 ++++++++++++++++
 types/table.d.ts                              |   4 +-
 15 files changed, 372 insertions(+), 111 deletions(-)
 create mode 100644 src/views/voltage/sags/operationsManagement/point.vue

diff --git a/package.json b/package.json
index 7070677..3839c9d 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
   },
   "dependencies": {
     "@element-plus/icons-vue": "^2.3.1",
+    "@fortawesome/fontawesome-free": "^6.5.1",
     "@vueuse/core": "^10.7.0",
     "axios": "^1.6.2",
     "crypto-js": "^4.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 10bcb55..029a350 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -4,6 +4,9 @@ dependencies:
   '@element-plus/icons-vue':
     specifier: ^2.3.1
     version: 2.3.1(vue@3.3.13)
+  '@fortawesome/fontawesome-free':
+    specifier: ^6.5.1
+    version: 6.5.1
   '@vueuse/core':
     specifier: ^10.7.0
     version: 10.7.0(vue@3.3.13)
@@ -586,6 +589,12 @@ packages:
     resolution: {integrity: sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A==, tarball: https://registry.npmmirror.com/@floating-ui/utils/-/utils-0.1.6.tgz}
     dev: false
 
+  /@fortawesome/fontawesome-free@6.5.1:
+    resolution: {integrity: sha512-CNy5vSwN3fsUStPRLX7fUYojyuzoEMSXPl7zSLJ8TgtRfjv24LOnOWKT2zYwaHZCJGkdyRnTmstR0P+Ah503Gw==}
+    engines: {node: '>=6'}
+    requiresBuild: true
+    dev: false
+
   /@jridgewell/gen-mapping@0.3.3:
     resolution: {integrity: sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==}
     engines: {node: '>=6.0.0'}
diff --git a/src/App.vue b/src/App.vue
index cc3445a..701d362 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,22 +1,19 @@
 <template>
-    <el-config-provider :locale="zhCn">
+    <el-config-provider :locale='zhCn'>
         <router-view></router-view>
     </el-config-provider>
 </template>
 
-<script lang="ts" setup>
+<script lang='ts' setup>
 import { computed, ref } from 'vue'
 import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
 import { useConfig } from '@/stores/config'
-import { useElementPlusTheme } from "use-element-plus-theme"
+import { useElementPlusTheme } from 'use-element-plus-theme'
+
 const configStore = useConfig()
 useElementPlusTheme(configStore.getColorVal('elementUiPrimary'))
-// document.documentElement.style.setProperty('--el-color-primary', configStore.getColorVal('elementUiPrimary'));
 </script>
 
-<style lang="scss">
-// $primaryColor: v-bind('configStore.getColorVal("elementUiPrimary")');
-// :root {
-//     --el-color-primary: $primaryColor !important;
-// }
+<style lang='scss'>
+
 </style>
diff --git a/src/components/baInput/components/iconSelector.vue b/src/components/baInput/components/iconSelector.vue
index 23d3770..4d95eaf 100644
--- a/src/components/baInput/components/iconSelector.vue
+++ b/src/components/baInput/components/iconSelector.vue
@@ -1,55 +1,53 @@
 <template>
     <el-popover
-        :placement="placement"
-        trigger="focus"
-        :hide-after="0"
-        :width="state.selectorWidth"
-        :visible="state.popoverVisible"
+        :placement='placement'
+        trigger='focus'
+        :hide-after='0'
+        :width='state.selectorWidth'
+        :visible='state.popoverVisible'
     >
         <div
-            @mouseover.stop="state.iconSelectorMouseover = true"
-            @mouseout.stop="state.iconSelectorMouseover = false"
-            class="icon-selector"
+            @mouseover.stop='state.iconSelectorMouseover = true'
+            @mouseout.stop='state.iconSelectorMouseover = false'
+            class='icon-selector'
         >
-            <transition name="el-zoom-in-center">
-                <div class="icon-selector-box">
-                    <div class="selector-header">
-                        <div class="selector-title">{{ title ? title : '请选择图标' }}</div>
-                        <!-- <div class="selector-tab">
+            <transition name='el-zoom-in-center'>
+                <div class='icon-selector-box'>
+                    <div class='selector-header'>
+                        <div class='selector-title'>{{ title ? title : '请选择图标' }}</div>
+                        <div class='selector-tab'>
                             <span
                                 :title="'Element Puls ' + 'utils.Icon'"
                                 @click="onChangeTab('ele')"
                                 :class="state.iconType == 'ele' ? 'active' : ''"
-                                >ele</span
-                            >
+                            >ele</span>
                             <span
                                 :title="'Font Awesome ' + 'utils.Icon'"
                                 @click="onChangeTab('awe')"
                                 :class="state.iconType == 'awe' ? 'active' : ''"
-                                >awe</span
-                            >
-                            <span :title="'utils.Ali iconcont Icon'" @click="onChangeTab('ali')" :class="state.iconType == 'ali' ? 'active' : ''"
-                                >ali</span
-                            >
-                            <span
-                                :title="'utils.Local icon title'"
-                                @click="onChangeTab('local')"
-                                :class="state.iconType == 'local' ? 'active' : ''"
-                                >local</span
-                            >
-                        </div> -->
+                            >awe</span>
+                            <!--                            <span :title="'utils.Ali iconcont Icon'" @click="onChangeTab('ali')"-->
+                            <!--                                  :class="state.iconType == 'ali' ? 'active' : ''"-->
+                            <!--                            >ali</span>-->
+                            <!--                            <span-->
+                            <!--                                :title="'utils.Local icon title'"-->
+                            <!--                                @click="onChangeTab('local')"-->
+                            <!--                                :class="state.iconType == 'local' ? 'active' : ''"-->
+                            <!--                            >local</span-->
+                            <!--                            >-->
+                        </div>
                     </div>
-                    <div class="selector-body">
-                        <el-scrollbar ref="selectorScrollbarRef">
-                            <div v-if="renderFontIconNames.length > 0">
+                    <div class='selector-body'>
+                        <el-scrollbar ref='selectorScrollbarRef'>
+                            <div v-if='renderFontIconNames.length > 0'>
                                 <div
-                                    class="icon-selector-item"
-                                    :title="item"
-                                    @click="onIcon(item)"
-                                    v-for="(item, key) in renderFontIconNames"
-                                    :key="key"
+                                    class='icon-selector-item'
+                                    :title='item'
+                                    @click='onIcon(item)'
+                                    v-for='(item, key) in renderFontIconNames'
+                                    :key='key'
                                 >
-                                    <Icon :name="item" />
+                                    <Icon :name='item' />
                                 </div>
                             </div>
                         </el-scrollbar>
@@ -59,37 +57,37 @@
         </div>
         <template #reference>
             <el-input
-                v-model="state.inputValue"
-                :size="size"
-                :disabled="disabled"
-                placeholder="搜索图标"
-                ref="selectorInput"
-                @focus="onInputFocus"
-                @blur="onInputBlur"
+                v-model='state.inputValue'
+                :size='size'
+                :disabled='disabled'
+                placeholder='搜索图标'
+                ref='selectorInput'
+                @focus='onInputFocus'
+                @blur='onInputBlur'
                 :class="'size-' + size"
             >
                 <template #prepend>
-                    <div class="icon-prepend">
+                    <div class='icon-prepend'>
                         <Icon
                             :key="'icon' + state.iconKey"
-                            :name="state.prependIcon ? state.prependIcon : state.defaultModelValue"
+                            :name='state.prependIcon ? state.prependIcon : state.defaultModelValue'
                         />
-                        <div v-if="showIconName" class="name">
+                        <div v-if='showIconName' class='name'>
                             {{ state.prependIcon ? state.prependIcon : state.defaultModelValue }}
                         </div>
                     </div>
                 </template>
                 <template #append>
-                    <Icon @click="onInputRefresh" name="el-icon-RefreshRight" />
+                    <Icon @click='onInputRefresh' name='el-icon-RefreshRight' />
                 </template>
             </el-input>
         </template>
     </el-popover>
 </template>
 
-<script setup lang="ts">
+<script setup lang='ts'>
 import { reactive, ref, onMounted, nextTick, watch, computed } from 'vue'
-import {  getElementPlusIconfontNames  } from '@/utils/iconfont'
+import { getElementPlusIconfontNames,getAwesomeIconfontNames } from '@/utils/iconfont'
 import { useEventListener } from '@vueuse/core'
 import type { Placement } from 'element-plus'
 
@@ -104,6 +102,7 @@ interface Props {
     modelValue?: string
     showIconName?: boolean
 }
+
 const props = withDefaults(defineProps<Props>(), {
     size: 'default',
     disabled: false,
@@ -111,7 +110,7 @@ const props = withDefaults(defineProps<Props>(), {
     type: 'ele',
     placement: 'bottom',
     modelValue: '',
-    showIconName: false,
+    showIconName: false
 })
 
 const emits = defineEmits<{
@@ -142,7 +141,7 @@ const state: {
     inputValue: '',
     prependIcon: props.modelValue,
     defaultModelValue: props.modelValue || 'fa fa-circle-o',
-    iconKey: 0, // 给icon标签准备个key，以随时使用 h 函数重新生成元素
+    iconKey: 0 // 给icon标签准备个key，以随时使用 h 函数重新生成元素
 })
 
 const onInputFocus = () => {
@@ -158,27 +157,27 @@ const onInputRefresh = () => {
     state.inputValue = ''
     emits('update:modelValue', state.defaultModelValue)
     emits('change', state.defaultModelValue)
-// }
-// const onChangeTab = (name: IconType) => {
-//     state.iconType = name
-//     state.fontIconNames = []
-//     if (name == 'ele') {
-//         getElementPlusIconfontNames().then((res) => {
-//             state.fontIconNames = res
-//         })
-//     } else if (name == 'awe') {
-//         getAwesomeIconfontNames().then((res) => {
-//             state.fontIconNames = res.map((name) => `fa ${name}`)
-//         })
-//     } else if (name == 'ali') {
-//         getIconfontNames().then((res) => {
-//             state.fontIconNames = res.map((name) => `iconfont ${name}`)
-//         })
-//     } else if (name == 'local') {
-//         getLocalIconfontNames().then((res) => {
-//             state.fontIconNames = res
-//         })
-//     }
+}
+const onChangeTab = (name: IconType) => {
+    state.iconType = name
+    state.fontIconNames = []
+    if (name == 'ele') {
+        getElementPlusIconfontNames().then((res) => {
+            state.fontIconNames = res
+        })
+    } else if (name == 'awe') {
+        getAwesomeIconfontNames().then((res) => {
+            state.fontIconNames = res.map((name) => `fa ${name}`)
+        })
+    } else if (name == 'ali') {
+        getIconfontNames().then((res) => {
+            state.fontIconNames = res.map((name) => `iconfont ${name}`)
+        })
+    } else if (name == 'local') {
+        getLocalIconfontNames().then((res) => {
+            state.fontIconNames = res
+        })
+    }
 }
 const onIcon = (icon: string) => {
     state.iconSelectorMouseover = state.popoverVisible = false
@@ -232,35 +231,43 @@ onMounted(() => {
 })
 </script>
 
-<style scoped lang="scss">
+<style scoped lang='scss'>
 .size-small {
     height: 24px;
 }
+
 .size-large {
     height: 40px;
 }
+
 .size-default {
     height: 32px;
 }
+
 .icon-prepend {
     display: flex;
     align-items: center;
     justify-content: center;
+
     .name {
         padding-left: 5px;
     }
 }
+
 .selector-header {
     display: flex;
     align-items: center;
     margin-bottom: 12px;
 }
+
 .selector-tab {
     margin-left: auto;
+
     span {
         padding: 0 5px;
         cursor: pointer;
         user-select: none;
+
         &.active,
         &:hover {
             color: var(--el-color-primary);
@@ -268,9 +275,11 @@ onMounted(() => {
         }
     }
 }
+
 .selector-body {
     height: 250px;
 }
+
 .icon-selector-item {
     display: inline-block;
     padding: 10px 10px 6px 10px;
@@ -279,17 +288,21 @@ onMounted(() => {
     border-radius: var(--el-border-radius-base);
     cursor: pointer;
     font-size: 18px;
+
     .icon {
         height: 18px;
         width: 18px;
     }
+
     &:hover {
         border: 1px solid var(--el-color-primary);
     }
 }
+
 :deep(.el-input-group__prepend) {
     padding: 0 10px;
 }
+
 :deep(.el-input-group__append) {
     padding: 0 10px;
 }
diff --git a/src/components/table/header/index.vue b/src/components/table/header/index.vue
index ee9f291..b1aec2a 100644
--- a/src/components/table/header/index.vue
+++ b/src/components/table/header/index.vue
@@ -15,7 +15,7 @@
         </div>
     </transition>
 
-    <div class='table-header ba-scroll-style'>
+    <div class='table-header ba-scroll-style' v-if='showOperation'>
         <slot name='operation'></slot>
         <!-- 右侧搜索框和工具按钮 -->
         <div class='table-search' v-if='$slots.select'>
@@ -39,11 +39,14 @@ const date = ref([window.XEUtils.toDateString(new Date(), 'yyyy-MM-dd'), window.
 interface Props {
     // 默认展开
     showSelect?: boolean
+    showOperation?: boolean // 是否显示operation
     datePicker?: boolean
+
 }
 
 const props = withDefaults(defineProps<Props>(), {
     showSelect: true,
+    showOperation: true,
     datePicker: false
 })
 if (props.datePicker) {
diff --git a/src/components/table/index.vue b/src/components/table/index.vue
index 968624e..ea85647 100644
--- a/src/components/table/index.vue
+++ b/src/components/table/index.vue
@@ -12,6 +12,7 @@
         v-bind="$attrs"
         :column-config="{resizable: true}"
         :tree-config="{}"
+        :row-config="{isCurrent: true, isHover: true}"
     >
         <!-- Column 组件内部是 el-table-column -->
         <Column
diff --git a/src/layouts/admin/components/navMenus.vue b/src/layouts/admin/components/navMenus.vue
index 51e2ebf..187dc12 100644
--- a/src/layouts/admin/components/navMenus.vue
+++ b/src/layouts/admin/components/navMenus.vue
@@ -54,7 +54,7 @@
             <Icon
                 :color="configStore.getColorVal('headerBarTabColor')"
                 class="nav-menu-icon"
-                name="el-icon-Setting"
+                name="fa fa-cogs"
                 size="18"
             />
         </div>
diff --git a/src/layouts/admin/index.vue b/src/layouts/admin/index.vue
index 36c6e8e..a60a218 100644
--- a/src/layouts/admin/index.vue
+++ b/src/layouts/admin/index.vue
@@ -69,7 +69,7 @@ const init = async () => {
                 title: '控制台',
                 name: 'dashboard',
                 path: 'dashboard',
-                icon: 'el-icon-Platform',
+                icon: 'fa fa-dashboard',
                 menu_type: 'tab',
                 url: '',
                 component: '/src/views/dashboard/index.vue',
@@ -111,31 +111,58 @@ const init = async () => {
             {
                 id: 3,
                 pid: 0,
-                type: 'menu',
+                type: 'menu_dir',
                 title: '电压暂降',
                 name: 'voltage/sags',
                 path: 'voltage/sags',
                 icon: 'el-icon-BellFilled',
                 menu_type: 'tab',
                 url: '',
-                component: '/src/views/dashboard/test.vue',
-                keepalive: 'voltage/sags',
                 extend: 'none',
                 children: [
                     {
                         id: 1,
                         pid: 3,
-                        type: 'menu',
+                        type: 'menu_dir',
                         title: '运行管理',
                         name: 'voltage/sags/operationsManagement',
                         path: 'voltage/sags/operationsManagement',
-                        icon: 'el-icon-Management',
+                        icon: 'fa-solid fa-bars-progress',
                         menu_type: 'tab',
                         url: '',
-                        component: '/src/views/voltage/sags/operationsManagement/index.vue',
-                        keepalive: 'voltage/sags/operationsManagement',
                         extend: 'none',
-                        children: []
+                        children: [
+                            {
+                                id: 1,
+                                pid: 3,
+                                type: 'menu',
+                                title: '终端运行管理',
+                                name: 'voltage/sags/operationsManagement/index',
+                                path: 'voltage/sags/operationsManagement/index',
+                                icon: 'fa-solid fa-recycle',
+                                menu_type: 'tab',
+                                url: '',
+                                component: '/src/views/voltage/sags/operationsManagement/index.vue',
+                                keepalive: 'voltage/sags/operationsManagement/index',
+                                extend: 'none',
+                                children: []
+                            },
+                            {
+                                id: 1,
+                                pid: 3,
+                                type: 'menu',
+                                title: '监测点台账信息',
+                                name: 'voltage/sags/operationsManagement/point',
+                                path: 'voltage/sags/operationsManagement/point',
+                                icon: 'fa-brands fa-square-pinterest',
+                                menu_type: 'tab',
+                                url: '',
+                                component: '/src/views/voltage/sags/operationsManagement/point.vue',
+                                keepalive: 'voltage/sags/operationsManagement/point',
+                                extend: 'none',
+                                children: []
+                            }
+                        ]
                     },
                     {
                         id: 2,
@@ -161,7 +188,7 @@ const init = async () => {
                 title: '权限管理',
                 name: 'auth',
                 path: 'auth',
-                icon: 'el-icon-Tools',
+                icon: 'fa fa-group',
                 menu_type: null,
                 url: '',
                 component: '',
diff --git a/src/main.ts b/src/main.ts
index 23430da..d60335b 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -10,7 +10,7 @@ import 'vxe-table/lib/style.css'
 import ElementPlus from 'element-plus'
 import 'element-plus/dist/index.css'
 import 'element-plus/theme-chalk/display.css'
-// modules import mark, Please do not remove.
+import '@fortawesome/fontawesome-free/css/all.css'
 import '@/styles/index.scss'
 import '@/assets/font/iconfont.css'
 
diff --git a/src/styles/var.scss b/src/styles/var.scss
index f23e6db..a0b2638 100644
--- a/src/styles/var.scss
+++ b/src/styles/var.scss
@@ -8,25 +8,29 @@ $primary-light: #3f6ad8;
 // --ba-background
 $bg-color: () !default;
 $bg-color: map.merge(
-    (
-        '': #f5f5f5,
-        'overlay': #ffffff,
-    ),
-    $bg-color
+                (
+                        '': #f5f5f5,
+                        'overlay': #ffffff,
+                ),
+                $bg-color
 );
 
 // --ba-border-color
 $border-color: () !default;
 $border-color: map.merge(
-    (
-        '': #f6f6f6,
-    ),
-    $border-color
+                (
+                        '': #f6f6f6,
+                ),
+                $border-color
 );
 
 :root {
-    @include set-css-var-value('main-space', $main-space);
-    @include set-css-var-value('color-primary-light', $primary-light);
-    @include set-component-css-var('bg-color', $bg-color);
-    @include set-component-css-var('border-color', $border-color);
+  @include set-css-var-value('main-space', $main-space);
+  @include set-css-var-value('color-primary-light', $primary-light);
+  @include set-component-css-var('bg-color', $bg-color);
+  @include set-component-css-var('border-color', $border-color);
+  --vxe-table-row-current-background-color: var(--el-color-primary-light-7);
+  --vxe-table-row-hover-background-color: var(--el-color-primary-light-9);
+  --vxe-table-row-hover-current-background-color: var(--el-color-primary-light-7);
+  --vxe-table-row-hover-striped-background-color: var(--el-color-primary-light-9);
 }
diff --git a/src/utils/iconfont.ts b/src/utils/iconfont.ts
index b49f38a..1515b90 100644
--- a/src/utils/iconfont.ts
+++ b/src/utils/iconfont.ts
@@ -1,5 +1,7 @@
 import { nextTick } from 'vue'
 import * as elIcons from '@element-plus/icons-vue'
+import { getUrl } from '@/utils/request'
+
 /*
  * 获取element plus 自带的图标
  */
@@ -19,3 +21,65 @@ export function getElementPlusIconfontNames() {
         })
     })
 }
+
+
+/**
+ * 获取Vite开发服务/编译后的样式表内容
+ * @param devID style 标签的 viteDevId，只开发服务有
+ */
+function getStylesFromVite(devId: string) {
+    const sheets = []
+    const styles: StyleSheetList = document.styleSheets
+    if (import.meta.env.MODE == 'production') {
+        const url = getUrl()
+        for (const key in styles) {
+            if (styles[key].href && styles[key].href?.indexOf(url) === 0) {
+                sheets.push(styles[key])
+            }
+        }
+        return sheets
+    }
+    for (const key in styles) {
+        const ownerNode = styles[key].ownerNode as HTMLMapElement
+        if (ownerNode && ownerNode.dataset?.viteDevId && ownerNode.dataset.viteDevId!.indexOf(devId) > -1) {
+            sheets.push(styles[key])
+        }
+    }
+    return sheets
+}
+
+
+/*
+ * 获取 Awesome-Iconfont 的 name 列表
+ */
+export function getAwesomeIconfontNames() {
+    return new Promise<string[]>((resolve, reject) => {
+        nextTick(() => {
+            const iconfonts = []
+            const sheets = getStylesFromVite('all.css')
+            console.log(sheets)
+            for (const key in sheets) {
+                const rules: any = sheets[key].cssRules
+                for (const k in rules) {
+                    if (!rules[k].selectorText || rules[k].selectorText.indexOf('.fa-') !== 0) {
+                        continue
+                    }
+                    if (/^\.fa-(.*)::before$/g.test(rules[k].selectorText)) {
+                        if (rules[k].selectorText.indexOf(', ') > -1) {
+                            const iconNames = rules[k].selectorText.split(', ')
+                            iconfonts.push(`${iconNames[0].substring(1, iconNames[0].length).replace(/\:\:before/gi, '')}`)
+                        } else {
+                            iconfonts.push(`${rules[k].selectorText.substring(1, rules[k].selectorText.length).replace(/\:\:before/gi, '')}`)
+                        }
+                    }
+                }
+            }
+
+            if (iconfonts.length > 0) {
+                resolve(iconfonts)
+            } else {
+                reject('没有样式表')
+            }
+        })
+    })
+}
diff --git a/src/utils/tableStore.ts b/src/utils/tableStore.ts
index 45e839c..be23c56 100644
--- a/src/utils/tableStore.ts
+++ b/src/utils/tableStore.ts
@@ -43,6 +43,7 @@ export default class TableStore {
         this.method = options.method || 'GET'
         this.table.column = options.column
         this.table.resetCallback = options.resetCallback || null
+        this.table.loadCallback = options.loadCallback || null
         Object.assign(this.table.params, options.params)
     }
 
diff --git a/src/views/voltage/sags/operationsManagement/index.vue b/src/views/voltage/sags/operationsManagement/index.vue
index 4743290..836856b 100644
--- a/src/views/voltage/sags/operationsManagement/index.vue
+++ b/src/views/voltage/sags/operationsManagement/index.vue
@@ -1,6 +1,6 @@
 <template>
     <div class='default-main'>
-        <TableHeader date-picker>
+        <TableHeader date-picker :showOperation='false'>
             <template v-slot:select>
                 <el-form-item label='区域'>
                     <Area v-model='tableStore.table.params.deptIndex' />
diff --git a/src/views/voltage/sags/operationsManagement/point.vue b/src/views/voltage/sags/operationsManagement/point.vue
new file mode 100644
index 0000000..836856b
--- /dev/null
+++ b/src/views/voltage/sags/operationsManagement/point.vue
@@ -0,0 +1,141 @@
+<template>
+    <div class='default-main'>
+        <TableHeader date-picker :showOperation='false'>
+            <template v-slot:select>
+                <el-form-item label='区域'>
+                    <Area v-model='tableStore.table.params.deptIndex' />
+                </el-form-item>
+                <el-form-item label='终端状态'>
+                    <el-select v-model='form.runFlag' placeholder='请选择' @change='onRunFlagChange'>
+                        <el-option label='投运' value='0' />
+                        <el-option label='热备用' value='1' />
+                        <el-option label='停运' value='2' />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label='通讯状态'>
+                    <el-select v-model='form.comFlag' placeholder='请选择' @change='onComFlagChange'>
+                        <el-option label='正常' value='1' />
+                        <el-option label='中断' value='0' />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label='厂家'>
+                    <el-select v-model='form.manufacturer' placeholder='请选择' @change='onManufacturerChange'>
+                        <el-option
+                            v-for='item in manufacturer'
+                            :key='item.id'
+                            :label='item.name'
+                            :value='item.id'
+                        />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label='筛选数据'>
+                    <el-input v-model='tableStore.table.params.searchValue'
+                              placeholder='根据变电站,终端编号,型号或网络参数查询' style='width:300px' />
+                </el-form-item>
+            </template>
+        </TableHeader>
+        <Table ref='tableRef' />
+    </div>
+</template>
+<script setup lang='tsx'>
+import { ref, onMounted, provide, reactive } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useDictData } from '@/stores/dictData'
+import Area from '@/components/form/area/index.vue'
+
+defineOptions({
+    name: 'comptroller/list'
+})
+const dictData = useDictData()
+const manufacturer = dictData.getBasicData('Dev_Manufacturers')
+const tableStore = new TableStore({
+    isWebPaging: true,
+    url: '/device-boot/runManage/getRuntimeData',
+    method: 'POST',
+    column: [
+        { title: '序号', type: 'seq', align: 'center', width: 60 },
+        { title: '区域', field: 'areaName', align: 'center', width: 120 },
+        { title: '供电公司', field: 'gdName', align: 'center', width: 120 },
+        { title: '变电站', field: 'bdName', align: 'center', showOverflow: true, minWidth: 100 },
+        { title: '终端编号', field: 'devName', align: 'center', width: 160 },
+        { title: '投运时间', field: 'loginTime', align: 'center', width: 200 },
+        { title: '厂家', field: 'manufacturer', align: 'center', width: 160 },
+        { title: '型号', field: 'devType', align: 'center', width: 200 },
+        { title: '网络参数', field: 'ip', align: 'center', width: 200 },
+        { title: '端口', field: 'port', align: 'center', width: 100 },
+        { title: '终端状态', field: 'runFlag', align: 'center', width: 100 },
+        { title: '通讯状态', field: 'comFlag', align: 'center', width: 100 },
+        { title: '最新数据', field: 'updateTime', align: 'center', width: 200 },
+        {
+            title: '评价',
+            field: 'onlineEvaluate',
+            align: 'center',
+            width: 100,
+            render: 'customRender',
+            customRender: props => {
+                if (props.renderValue == null) {
+                    return <span></span>
+                } else if (props.renderValue * 100 > 90) {
+                    return (
+                        <el-tag effect='dark' type='success'>
+                            优
+                        </el-tag>
+                    )
+                } else if (props.renderValue * 100 > 60) {
+                    return (
+                        <el-tag effect='dark' type='warning'>
+                            良
+                        </el-tag>
+                    )
+                } else {
+                    return (
+                        <el-tag effect='dark' type='danger'>
+                            差
+                        </el-tag>
+                    )
+                }
+            }
+        }
+    ],
+    resetCallback: () => {
+        form.runFlag = ''
+        form.comFlag = ''
+        form.manufacturer = ''
+    }
+})
+const form = reactive({
+    runFlag: '',
+    comFlag: '',
+    manufacturer: ''
+})
+tableStore.table.params.deptIndex = dictData.state.area[0].id
+tableStore.table.params.runFlag = []
+tableStore.table.params.comFlag = []
+tableStore.table.params.manufacturer = []
+tableStore.table.params.statisticalType = {}
+tableStore.table.params.serverName = 'event-boot'
+tableStore.table.params.searchValue = ''
+provide('tableStore', tableStore)
+
+onMounted(() => {
+    tableStore.index()
+})
+
+const onRunFlagChange = (val: any) => {
+    tableStore.table.params.runFlag = [val]
+}
+const onComFlagChange = (val: any) => {
+    tableStore.table.params.comFlag = [val]
+}
+const onManufacturerChange = (val: any) => {
+    let obj = manufacturer.find(item => item.id === val) as any
+    obj.label = obj.name
+    obj.value = obj.id
+    tableStore.table.params.manufacturer = [obj]
+}
+
+const addMenu = () => {
+}
+</script>
diff --git a/types/table.d.ts b/types/table.d.ts
index 331044b..d762a1d 100644
--- a/types/table.d.ts
+++ b/types/table.d.ts
@@ -23,8 +23,8 @@ declare global {
             pageSize: number
             [key: string]: any
         }
-        loadCallback: () => void | null
-        resetCallback: () => void | null
+        loadCallback: (() => void )| null
+        resetCallback: (() => void)| null
     }
 
     /* 表格行 */

From 1a826fb0fa30fa1205dab83bce2f2da899d4b7bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=B2=E4=B9=88=E4=BA=86?= <zhongchunyang@rocan.com.cn>
Date: Fri, 29 Dec 2023 15:45:07 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=9B=91=E6=B5=8B=E7=82=B9=E5=8F=B0?=
 =?UTF-8?q?=E8=B4=A6=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/table/column/index.vue         |   1 +
 src/components/table/fieldRender/index.vue    |   2 +-
 src/components/table/index.vue                | 127 +++++----
 .../sags/operationsManagement/index.vue       |  43 ++-
 .../sags/operationsManagement/point.vue       | 255 ++++++++++++------
 types/table.d.ts                              |   1 +
 6 files changed, 273 insertions(+), 156 deletions(-)

diff --git a/src/components/table/column/index.vue b/src/components/table/column/index.vue
index 4570c32..a241d6a 100644
--- a/src/components/table/column/index.vue
+++ b/src/components/table/column/index.vue
@@ -13,6 +13,7 @@ export default defineComponent({
     },
     setup(props, { slots }) {
         const attr = reactive(props.attr)
+        attr['align'] = attr['align'] ? attr['align'] : 'center'
         attr['column-key'] = attr['column-key'] ? attr['column-key'] : attr.prop || uuid()
         return () => {
             return createVNode(Column, attr, slots.default)
diff --git a/src/components/table/fieldRender/index.vue b/src/components/table/fieldRender/index.vue
index 5135375..3998737 100644
--- a/src/components/table/fieldRender/index.vue
+++ b/src/components/table/fieldRender/index.vue
@@ -31,7 +31,7 @@
 
     <!-- datetime -->
     <div v-if="field.render == 'datetime'">
-        {{ !fieldValue ? '-' : timeFormat(fieldValue, field.timeFormat ?? undefined) }}
+        {{ !fieldValue ? '/' : timeFormat(fieldValue, field.timeFormat ?? undefined) }}
     </div>
 
     <!-- color -->
diff --git a/src/components/table/index.vue b/src/components/table/index.vue
index ea85647..08a9c05 100644
--- a/src/components/table/index.vue
+++ b/src/components/table/index.vue
@@ -1,62 +1,88 @@
 <template>
     <vxe-table
-        ref="tableRef"
-        class="ba-data-table w100"
-        header-cell-class-name="table-header-cell"
-        :data="tableStore.table.data"
-        :border="true"
-        v-loading="tableStore.table.loading"
+        ref='tableRef'
+        class='ba-data-table w100'
+        header-cell-class-name='table-header-cell'
+        :data='tableStore.table.data'
+        :border='true'
+        v-loading='tableStore.table.loading'
         stripe
-        size="small"
-        @checkbox-change="onSelectionChange"
-        v-bind="$attrs"
-        :column-config="{resizable: true}"
-        :tree-config="{}"
-        :row-config="{isCurrent: true, isHover: true}"
+        size='small'
+        @checkbox-change='onSelectionChange'
+        v-bind='$attrs'
+        :column-config='{resizable: true}'
+        :tree-config='{}'
+        :row-config='{isCurrent: true, isHover: true}'
     >
         <!-- Column 组件内部是 el-table-column -->
-        <Column
-            :attr="item"
-            :key="key + '-column'"
-            v-for="(item, key) in tableStore.table.column"
-            :tree-node='item.treeNode'
-        >
-            <!-- tableStore 预设的列 render 方案 -->
-            <template v-if="item.render" #default="scope">
-                <FieldRender
-                    :field="item"
-                    :row="scope.row"
-                    :column="scope.column"
-                    :index="scope.rowIndex"
-                    :key="
-                        key +
-                        '-' +
-                        scope.rowIndex +
-                        '-' +
-                        item.render +
-                        '-' +
-                        (item.field ? '-' + item.field + '-' + scope.row[item.field] : '')
-                    "
-                />
-            </template>
-        </Column>
+        <template v-if='isGroup'>
+            <vxe-table-colgroup
+                v-if='isGroup'
+                v-for='(item, index) in tableStore.table.column'
+                :field='item.field'
+                :title='item.title'
+                :key='index'
+                :min-width='item.width'
+                show-overflow
+                align='center'
+            >
+                <Column
+                    :attr='child'
+                    :key="key + '-column'"
+                    v-for='(child, key) in item.children'
+                    :tree-node='child.treeNode'
+                >
+                    <!-- tableStore 预设的列 render 方案 -->
+                    <template v-if='child.render' #default='scope'>
+                        <FieldRender
+                            :field='child'
+                            :row='scope.row'
+                            :column='scope.column'
+                            :index='scope.rowIndex'
+                            :key='child.field+scope.rowIndex'
+                        />
+                    </template>
+                </Column>
+            </vxe-table-colgroup>
+        </template>
+        <template v-else>
+            <Column
+                :attr='item'
+                :key="key + '-column'"
+                v-for='(item, key) in tableStore.table.column'
+                :tree-node='item.treeNode'
+            >
+                <!-- tableStore 预设的列 render 方案 -->
+                <template v-if='item.render' #default='scope'>
+                    <FieldRender
+                        :field='item'
+                        :row='scope.row'
+                        :column='scope.column'
+                        :index='scope.rowIndex'
+                        :key='item.field+scope.rowIndex'
+                    />
+                </template>
+            </Column>
+
+        </template>
+
     </vxe-table>
-    <div v-if="props.pagination" class="table-pagination">
+    <div v-if='props.pagination' class='table-pagination'>
         <el-pagination
-            :currentPage="tableStore.table.params!.pageNum"
-            :page-size="tableStore.table.params!.pageSize"
-            :page-sizes="pageSizes"
+            :currentPage='tableStore.table.params!.pageNum'
+            :page-size='tableStore.table.params!.pageSize'
+            :page-sizes='pageSizes'
             background
             :layout="config.layout.shrink ? 'prev, next, jumper' : 'sizes,total, ->, prev, pager, next, jumper'"
-            :total="tableStore.table.total"
-            @size-change="onTableSizeChange"
-            @current-change="onTableCurrentChange"
+            :total='tableStore.table.total'
+            @size-change='onTableSizeChange'
+            @current-change='onTableCurrentChange'
         ></el-pagination>
     </div>
-    <slot name="footer"></slot>
+    <slot name='footer'></slot>
 </template>
 
-<script setup lang="ts">
+<script setup lang='ts'>
 import { ref, nextTick, inject, computed } from 'vue'
 import type { ElTable, TableInstance } from 'element-plus'
 import FieldRender from '@/components/table/fieldRender/index.vue'
@@ -70,9 +96,12 @@ const tableStore = inject('tableStore') as TableStoreClass
 
 interface Props extends /* @vue-ignore */ Partial<InstanceType<typeof ElTable>> {
     pagination?: boolean
+    isGroup?: boolean
 }
+
 const props = withDefaults(defineProps<Props>(), {
-    pagination: true
+    pagination: true,
+    isGroup: false
 })
 
 const onTableSizeChange = (val: number) => {
@@ -110,16 +139,18 @@ defineExpose({
 })
 </script>
 
-<style scoped lang="scss">
+<style scoped lang='scss'>
 .ba-data-table :deep(.el-button + .el-button) {
     margin-left: 6px;
 }
+
 .ba-data-table :deep(.table-header-cell) .cell {
     color: var(--el-text-color-primary);
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
 }
+
 .table-pagination {
     box-sizing: border-box;
     width: 100%;
diff --git a/src/views/voltage/sags/operationsManagement/index.vue b/src/views/voltage/sags/operationsManagement/index.vue
index 836856b..95218ae 100644
--- a/src/views/voltage/sags/operationsManagement/index.vue
+++ b/src/views/voltage/sags/operationsManagement/index.vue
@@ -6,20 +6,23 @@
                     <Area v-model='tableStore.table.params.deptIndex' />
                 </el-form-item>
                 <el-form-item label='终端状态'>
-                    <el-select v-model='form.runFlag' placeholder='请选择' @change='onRunFlagChange'>
+                    <el-select multiple clearable collapse-tags v-model='tableStore.table.params.runFlag'
+                               placeholder='请选择'>
                         <el-option label='投运' value='0' />
                         <el-option label='热备用' value='1' />
                         <el-option label='停运' value='2' />
                     </el-select>
                 </el-form-item>
                 <el-form-item label='通讯状态'>
-                    <el-select v-model='form.comFlag' placeholder='请选择' @change='onComFlagChange'>
+                    <el-select multiple clearable collapse-tags v-model='tableStore.table.params.comFlag'
+                               placeholder='请选择'>
                         <el-option label='正常' value='1' />
                         <el-option label='中断' value='0' />
                     </el-select>
                 </el-form-item>
                 <el-form-item label='厂家'>
-                    <el-select v-model='form.manufacturer' placeholder='请选择' @change='onManufacturerChange'>
+                    <el-select multiple clearable collapse-tags v-model='manufacturerForm' placeholder='请选择'
+                               @change='onManufacturerChange'>
                         <el-option
                             v-for='item in manufacturer'
                             :key='item.id'
@@ -50,6 +53,7 @@ defineOptions({
 })
 const dictData = useDictData()
 const manufacturer = dictData.getBasicData('Dev_Manufacturers')
+const manufacturerForm = ref<string[]>([])
 const tableStore = new TableStore({
     isWebPaging: true,
     url: '/device-boot/runManage/getRuntimeData',
@@ -100,16 +104,9 @@ const tableStore = new TableStore({
         }
     ],
     resetCallback: () => {
-        form.runFlag = ''
-        form.comFlag = ''
-        form.manufacturer = ''
+        manufacturerForm.value = []
     }
 })
-const form = reactive({
-    runFlag: '',
-    comFlag: '',
-    manufacturer: ''
-})
 tableStore.table.params.deptIndex = dictData.state.area[0].id
 tableStore.table.params.runFlag = []
 tableStore.table.params.comFlag = []
@@ -123,19 +120,15 @@ onMounted(() => {
     tableStore.index()
 })
 
-const onRunFlagChange = (val: any) => {
-    tableStore.table.params.runFlag = [val]
-}
-const onComFlagChange = (val: any) => {
-    tableStore.table.params.comFlag = [val]
-}
-const onManufacturerChange = (val: any) => {
-    let obj = manufacturer.find(item => item.id === val) as any
-    obj.label = obj.name
-    obj.value = obj.id
-    tableStore.table.params.manufacturer = [obj]
-}
-
-const addMenu = () => {
+const onManufacturerChange = () => {
+    tableStore.table.params.manufacturer = manufacturer.filter(item => {
+        return manufacturerForm.value.includes(item.id)
+    }).map(item => {
+        return {
+            ...item,
+            label: item.name,
+            value: item.id
+        }
+    })
 }
 </script>
diff --git a/src/views/voltage/sags/operationsManagement/point.vue b/src/views/voltage/sags/operationsManagement/point.vue
index 836856b..aba6f2e 100644
--- a/src/views/voltage/sags/operationsManagement/point.vue
+++ b/src/views/voltage/sags/operationsManagement/point.vue
@@ -5,36 +5,43 @@
                 <el-form-item label='区域'>
                     <Area v-model='tableStore.table.params.deptIndex' />
                 </el-form-item>
-                <el-form-item label='终端状态'>
-                    <el-select v-model='form.runFlag' placeholder='请选择' @change='onRunFlagChange'>
-                        <el-option label='投运' value='0' />
-                        <el-option label='热备用' value='1' />
-                        <el-option label='停运' value='2' />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label='通讯状态'>
-                    <el-select v-model='form.comFlag' placeholder='请选择' @change='onComFlagChange'>
-                        <el-option label='正常' value='1' />
-                        <el-option label='中断' value='0' />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label='厂家'>
-                    <el-select v-model='form.manufacturer' placeholder='请选择' @change='onManufacturerChange'>
+                <el-form-item label='干扰源类型'>
+                    <el-select multiple clearable collapse-tags v-model='interferenceSourceForm' placeholder='请选择'
+                               @change='onLoadTypeChange'>
                         <el-option
-                            v-for='item in manufacturer'
+                            v-for='item in interferenceSource'
                             :key='item.id'
                             :label='item.name'
                             :value='item.id'
                         />
                     </el-select>
                 </el-form-item>
+                <el-form-item label='电压等级'>
+                    <el-select multiple clearable collapse-tags v-model='scaleForm' placeholder='请选择'
+                               @change='onScaleChange'
+                    >
+                        <el-option
+                            v-for='item in level'
+                            :key='item.id'
+                            :label='item.name'
+                            :value='item.id'
+                        />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label='通讯状态'>
+                    <el-select multiple clearable collapse-tags v-model='tableStore.table.params.comFlag'
+                               placeholder='请选择'>
+                        <el-option label='正常' value='1' />
+                        <el-option label='中断' value='0' />
+                    </el-select>
+                </el-form-item>
                 <el-form-item label='筛选数据'>
                     <el-input v-model='tableStore.table.params.searchValue'
                               placeholder='根据变电站,终端编号,型号或网络参数查询' style='width:300px' />
                 </el-form-item>
             </template>
         </TableHeader>
-        <Table ref='tableRef' />
+        <Table isGroup ref='tableRef' />
     </div>
 </template>
 <script setup lang='tsx'>
@@ -49,71 +56,148 @@ defineOptions({
     name: 'comptroller/list'
 })
 const dictData = useDictData()
-const manufacturer = dictData.getBasicData('Dev_Manufacturers')
+const interferenceSource = dictData.getBasicData('Interference_Source')
+const level = dictData.getBasicData('Dev_Voltage_Stand')
+const interferenceSourceForm = ref<string[]>([])
+const scaleForm = ref<string[]>([])
 const tableStore = new TableStore({
     isWebPaging: true,
-    url: '/device-boot/runManage/getRuntimeData',
+    url: '/device-boot/runManage/getLineLedger',
     method: 'POST',
     column: [
-        { title: '序号', type: 'seq', align: 'center', width: 60 },
-        { title: '区域', field: 'areaName', align: 'center', width: 120 },
-        { title: '供电公司', field: 'gdName', align: 'center', width: 120 },
-        { title: '变电站', field: 'bdName', align: 'center', showOverflow: true, minWidth: 100 },
-        { title: '终端编号', field: 'devName', align: 'center', width: 160 },
-        { title: '投运时间', field: 'loginTime', align: 'center', width: 200 },
-        { title: '厂家', field: 'manufacturer', align: 'center', width: 160 },
-        { title: '型号', field: 'devType', align: 'center', width: 200 },
-        { title: '网络参数', field: 'ip', align: 'center', width: 200 },
-        { title: '端口', field: 'port', align: 'center', width: 100 },
-        { title: '终端状态', field: 'runFlag', align: 'center', width: 100 },
-        { title: '通讯状态', field: 'comFlag', align: 'center', width: 100 },
-        { title: '最新数据', field: 'updateTime', align: 'center', width: 200 },
+        { field: 'areaName', title: '省公司', width: 120 },
+        { field: 'gdName', title: '市公司', width: 120 },
+        { field: 'scale', title: '监测点电压等级', width: 150 },
+        { field: 'lineName', title: '监测点名称', width: 120 },
+        { field: 'bdName', title: '所属变电站', width: 120 },
+        { field: 'loadType', title: '干扰源类型', width: 120 },
+        { field: 'objName', title: '监测对象名称', width: 180 },
         {
-            title: '评价',
-            field: 'onlineEvaluate',
-            align: 'center',
-            width: 100,
-            render: 'customRender',
-            customRender: props => {
-                if (props.renderValue == null) {
-                    return <span></span>
-                } else if (props.renderValue * 100 > 90) {
-                    return (
-                        <el-tag effect='dark' type='success'>
-                            优
-                        </el-tag>
-                    )
-                } else if (props.renderValue * 100 > 60) {
-                    return (
-                        <el-tag effect='dark' type='warning'>
-                            良
-                        </el-tag>
-                    )
-                } else {
-                    return (
-                        <el-tag effect='dark' type='danger'>
-                            差
-                        </el-tag>
-                    )
+            field: 'shortCapacity', title: '最小短路容量(MVA)', width: 190
+        },
+        {
+            field: 'devCapacity', title: '供电设备容量(MVA )', width: 190
+        },
+        {
+            field: 'dealCapacity', title: '用户协议容量(MVA)', width: 190
+        },
+        { field: 'comFlag', title: '通讯状态 ', width: 120 },
+        { field: 'id', title: '监测点序号', width: 120 },
+        { field: 'devName', title: '监测终端编号 ', width: 140 },
+        { field: 'ptType', title: '监测终端接线方式', width: 160 },
+        {
+            field: 'voltageDev', title: '电压偏差上限(%)', width: 160
+        },
+        {
+            field: 'uvoltageDev', title: '电压偏差下限(%)', width: 160
+        },
+        {
+            field: 'limitValue',
+            title: '限值',
+            children: [{ field: 'freqDev', title: '频率(Hz)', width: 120 }, {
+                field: 'ubalance',
+                title: '三相电压不平衡度(%)',
+                width: 190
+
+            }, { field: 'ineg', title: '负序电流(A)', width: 120 }, {
+                field: 'flicker',
+                title: '长时间闪变',
+                width: 120
+
+            }, {
+                field: 'uaberrance', title: '电压总谐波畸变率(%)', width: 190
+
+            },
+                {
+                    field: 'oddHarm',
+                    title: '奇数次谐波电压(%)',
+                    width: 180
+
+                },
+                {
+                    field: 'evenHarm',
+                    title: '偶数次谐波电压(%)',
+                    width: 180
+
                 }
-            }
+            ]
+        },
+        {
+            field: 'evaluate',
+            title: '电流限值',
+            children: [
+                { field: 'iharm2', title: '2次谐波(A)', width: 120 },
+                { field: 'iharm3', title: '3次谐波(A)', width: 120 },
+                { field: 'iharm4', title: '4次谐波(A)', width: 120 },
+                { field: 'iharm5', title: '5次谐波(A)', width: 120 },
+                { field: 'iharm6', title: '6次谐波(A)', width: 120 },
+                { field: 'iharm7', title: '7次谐波(A)', width: 120 },
+                { field: 'iharm8', title: '8次谐波(A)', width: 120 },
+                { field: 'iharm9', title: '9次谐波(A)', width: 120 },
+                { field: 'iharm10', title: '10次谐波(A)', width: 140 },
+                {
+                    field: 'iharm11', title: '11次谐波(A)', width: 140
+                },
+                {
+                    field: 'iharm12', title: '12次谐波(A)', width: 140
+                },
+                {
+                    field: 'iharm13', title: '13次谐波(A)', width: 140
+                },
+                {
+                    field: 'iharm14', title: '14次谐波(A)', width: 140
+                },
+                {
+                    field: 'iharm15', title: '15次谐波(A)', width: 140
+                },
+                {
+                    field: 'iharm16', title: '16次谐波(A)', width: 140
+                },
+                {
+                    field: 'iharm17', title: '17次谐波(A)', width: 140
+                },
+                {
+                    field: 'iharm18', title: '18次谐波(A)', width: 140
+                },
+                {
+                    field: 'iharm19', title: '19次谐波(A)', width: 140
+                },
+                {
+                    field: 'iharm10', title: '20次谐波(A)', width: 140
+                },
+                {
+                    field: 'iharm21', title: '21次谐波(A)', width: 140
+                },
+                {
+                    field: 'iharm22', title: '22次谐波(A)', width: 140
+                },
+                {
+                    field: 'iharm23', title: '23次谐波(A)', width: 140
+                },
+                {
+                    field: 'iharm24', title: '24次谐波(A)', width: 140
+                },
+                {
+                    field: 'iharm25', title: '25次谐波(A)', width: 140
+                },
+                {
+                    field: 'inUharm', title: '0.5-1.5次间谐波(A)', width: 180
+                },
+                {
+                    field: 'inUharm16', title: '2.5-15.5次间谐波(A)', width: 190
+                }
+            ]
         }
     ],
     resetCallback: () => {
-        form.runFlag = ''
-        form.comFlag = ''
-        form.manufacturer = ''
+        interferenceSourceForm.value = []
+        scaleForm.value = []
     }
 })
-const form = reactive({
-    runFlag: '',
-    comFlag: '',
-    manufacturer: ''
-})
 tableStore.table.params.deptIndex = dictData.state.area[0].id
-tableStore.table.params.runFlag = []
+tableStore.table.params.scale = []
 tableStore.table.params.comFlag = []
-tableStore.table.params.manufacturer = []
+tableStore.table.params.loadType = []
 tableStore.table.params.statisticalType = {}
 tableStore.table.params.serverName = 'event-boot'
 tableStore.table.params.searchValue = ''
@@ -123,19 +207,26 @@ onMounted(() => {
     tableStore.index()
 })
 
-const onRunFlagChange = (val: any) => {
-    tableStore.table.params.runFlag = [val]
+const onLoadTypeChange = () => {
+    tableStore.table.params.loadType = interferenceSource.filter(item => {
+        return interferenceSourceForm.value.includes(item.id)
+    }).map(item => {
+        return {
+            ...item,
+            label: item.name,
+            value: item.id
+        }
+    })
 }
-const onComFlagChange = (val: any) => {
-    tableStore.table.params.comFlag = [val]
-}
-const onManufacturerChange = (val: any) => {
-    let obj = manufacturer.find(item => item.id === val) as any
-    obj.label = obj.name
-    obj.value = obj.id
-    tableStore.table.params.manufacturer = [obj]
-}
-
-const addMenu = () => {
+const onScaleChange = () => {
+    tableStore.table.params.scale = level.filter(item => {
+        return scaleForm.value.includes(item.id)
+    }).map(item => {
+        return {
+            ...item,
+            label: item.name,
+            value: item.id
+        }
+    })
 }
 </script>
diff --git a/types/table.d.ts b/types/table.d.ts
index d762a1d..7df7351 100644
--- a/types/table.d.ts
+++ b/types/table.d.ts
@@ -67,6 +67,7 @@ declare global {
             column: VxeColumnProps,
             index: number
         ) => string
+        children?: TableColumn[]
     }
 
     /* 表格右侧操作按钮 */