添加页面补招功能

2025-04-30 16:00:26 +08:00
parent dabb960d09
commit 81726cde2d
15 changed files with 7778 additions and 576 deletions
--- a/src/components/table/index.vue
+++ b/src/components/table/index.vue
@@ -1,23 +1,43 @@
 <template>
    <div :style="{ height: tableStore.table.height }">
-        <vxe-table ref="tableRef" height="auto" :data="tableStore.table.data" v-loading="tableStore.table.loading"
-            v-bind="Object.assign({}, defaultAttribute, $attrs)" @checkbox-all="selectChangeEvent"
-            @checkbox-change="selectChangeEvent" :showOverflow="showOverflow" @sort-change="handleSortChange">
+        <vxe-table
+            ref="tableRef"
+            height="auto"
+            :data="tableStore.table.data"
+            v-loading="tableStore.table.loading"
+            v-bind="Object.assign({}, defaultAttribute, $attrs)"
+            @checkbox-all="selectChangeEvent"
+            @checkbox-change="selectChangeEvent"
+            :showOverflow="showOverflow"
+            @sort-change="handleSortChange"
+        >
            <!-- Column 组件内部是 el-table-column -->
            <template v-if="isGroup">
                <GroupColumn :column="tableStore.table.column" />
            </template>
            <template v-else>
-                <Column :attr="item" :key="key + '-column'" v-for="(item, key) in tableStore.table.column"
-                    :tree-node="item.treeNode">
+                <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 +
+                        <FieldRender
+                            :field="item"
+                            :row="scope.row"
+                            :column="scope.column"
+                            :index="scope.rowIndex"
+                            :key="
+                                key +
                                '-' +
                                item.render +
                                '-' +
                                (item.field ? '-' + item.field + '-' + scope.row[item.field] : '')
-                            " />
+                            "
+                        />
                    </template>
                </Column>
            </template>
@@ -26,11 +46,16 @@
    </div>

    <div v-if="tableStore.showPage" class="table-pagination">
-        <el-pagination :currentPage="tableStore.table.params!.pageNum" :page-size="tableStore.table.params!.pageSize"
-            :page-sizes="pageSizes" background
+        <el-pagination
+            :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"></el-pagination>
+            :total="tableStore.table.total"
+            @size-change="onTableSizeChange"
+            @current-change="onTableCurrentChange"
+        ></el-pagination>
    </div>
    <slot name="footer"></slot>
 </template>
@@ -112,26 +137,24 @@ const handleSortChange = ({ column, order }: { column: TableColumn; order: 'asc'
 watch(
    () => tableStore.table.allFlag,
    newVal => {
-
-
        if (tableStore.table.allFlag) {
-
            tableRef.value?.exportData({
-                filename:tableStore.table.filename|| document.querySelectorAll('.ba-nav-tab.active')[0].textContent || '', // 文件名字
+                filename:
+                    tableStore.table.filename || document.querySelectorAll('.ba-nav-tab.active')[0].textContent || '', // 文件名字
                sheetName: 'Sheet1',
                type: 'xlsx', //导出文件类型 xlsx 和 csv
                useStyle: true,
                data: tableStore.table.allData, // 数据源 // 过滤那个字段导出
                columnFilterMethod: function (column: any) {
- 
-                    return !(column.column.title === undefined || column.column.title === '序号' || column.column.title === '操作')
+                    return !(
+                        column.column.title === undefined ||
+                        column.column.title === '序号' ||
+                        column.column.title === '操作'
+                    )
                }
            })
            tableStore.table.allFlag = false
-
        }
-
-
    }
 )
 watch(
@@ -169,6 +192,5 @@ defineExpose({
    border-right: 1px solid #e4e7e9;
    border-bottom: 1px solid #e4e7e9;
 }
-
 </style>
 <!-- @/components/table/column/GroupColumn.vue@/components/table/column/GroupColumn.vue -->
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -94,10 +94,7 @@ export function formatTime(time: Date | number | string, fmt: string) {
        }
        for (const k in o) {
            if (new RegExp('(' + k + ')').test(fmt)) {
-        fmt = fmt.replace(
-          RegExp.$1,
-          RegExp.$1.length === 1 ? o[k] : ('00' + o[k]).substr(('' + o[k]).length)
-        )
+                fmt = fmt.replace(RegExp.$1, RegExp.$1.length === 1 ? o[k] : ('00' + o[k]).substr(('' + o[k]).length))
            }
        }
        return fmt
@@ -120,7 +117,7 @@ export function toAnyString() {
 * 首字母大写
 */
 export function firstUpperCase(str: string) {
-  return str.toLowerCase().replace(/( |^)[a-z]/g, (L) => L.toUpperCase())
+    return str.toLowerCase().replace(/( |^)[a-z]/g, L => L.toUpperCase())
 }

 export const generateUUID = () => {
@@ -131,17 +128,14 @@ export const generateUUID = () => {
        if (typeof crypto.getRandomValues === 'function' && typeof Uint8Array === 'function') {
            const callback = (c: any) => {
                const num = Number(c)
-        return (num ^ (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (num / 4)))).toString(
-          16
-        )
+                return (num ^ (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (num / 4)))).toString(16)
            }
            return '10000000-1000-4000-8000-100000000000'.replace(/[018]/g, callback)
        }
    }
    let timestamp = new Date().getTime()
-  let performanceNow =
-    (typeof performance !== 'undefined' && performance.now && performance.now() * 1000) || 0
-  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (c) => {
+    let performanceNow = (typeof performance !== 'undefined' && performance.now && performance.now() * 1000) || 0
+    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
        let random = Math.random() * 16
        if (timestamp > 0) {
            random = (timestamp + random) % 16 | 0
@@ -180,7 +174,7 @@ export const fileSizeFormatter = (row, column, cellValue) => {
 export const copyValueToTarget = (target: any, source: any) => {
    const newObj = Object.assign({}, target, source)
    // 删除多余属性
-  Object.keys(newObj).forEach((key) => {
+    Object.keys(newObj).forEach(key => {
        // 如果不是target中的属性则删除
        if (Object.keys(target).indexOf(key) === -1) {
            delete newObj[key]
@@ -435,3 +429,24 @@ export const areaReplace = (areaName: string) => {
        .replace('自治区', '')
        .replace('省', '')
 }
+/**
+ * bes64解密函数
+ *
+ * @param areaName 地区名称
+ */
+//
+export const decryptFromBase64 = (base64Str: string) => {
+    try {
+        const binaryStr = atob(base64Str)
+        const encodedStr = binaryStr
+            .split('')
+            .map(char => {
+                return '%' + ('00' + char.charCodeAt(0).toString(16)).slice(-2)
+            })
+            .join('')
+        return decodeURIComponent(encodedStr)
+    } catch (error) {
+        console.error('解密出错:', error)
+        return null
+    }
+}
--- a/src/views/pqs/business/terminal/FrontManagement/index.vue
+++ b/src/views/pqs/business/terminal/FrontManagement/index.vue
@@ -338,7 +338,7 @@ const change = val => {
    treeRef.value!.filter(filterText.value)
 }
 const edit = (data: any) => {
-    console.log('🚀 ~ edit ~ data:', data)
+    // console.log('🚀 ~ edit ~ data:', data)
    processNo.value = data.processNo
    processId.value = data.id
    popUps.value = true
--- a/src/views/pqs/business/terminal/deviceter/index.vue
+++ b/src/views/pqs/business/terminal/deviceter/index.vue
@@ -552,7 +552,7 @@
                                                    ></el-option>
                                                </el-select>
                                            </el-form-item>
-                                            <el-form-item
+                                            <!-- <el-form-item
                                                class="form-item"
                                                label="进程号:"
                                                :prop="'deviceParam.' + index + '.processNum'"
@@ -579,7 +579,7 @@
                                                        :value="item"
                                                    ></el-option>
                                                </el-select>
-                                            </el-form-item>
+                                            </el-form-item> -->
                                            <el-form-item
                                                class="form-item"
                                                label="召唤标志:"
--- a/src/views/pqs/harmonicMonitoring/area/SteadyState/index.vue
+++ b/src/views/pqs/harmonicMonitoring/area/SteadyState/index.vue
@@ -81,7 +81,7 @@
                <el-tab-pane :name="0" :lazy="true" label="稳态指标符合性占比表格">
                    <Table
                        ref="tableRef"
-                        :tree-config="{ transform: true, parentField: 'pid' }"
+                        :tree-config="{ transform: true, parentField: 'uPid', rowField: 'uId'  }"
                        :scroll-y="{ enabled: true }"
                        v-if="activeName == 0"
                    />
@@ -197,10 +197,9 @@ const tableStore = new TableStore({
    ],

    loadCallback: () => {
-        let treeData = []
-        treeData = tree2List(tableStore.table.data)
+        tableStore.table.data = tree2List(tableStore.table.data, Math.random() * 1000)
        tableStore.table.column[0].title = tableStore.table.params.statisticalType.name
-        tableStore.table.data = JSON.parse(JSON.stringify(treeData))
+      
        chartsRef.value && chartsRef.value.getTableStoreParams(tableStore.table.params)
        setTimeout(() => {
            activeName.value == 0 && tableRef.value && tableRef.value.getRef().setAllTreeExpand(true)
@@ -214,18 +213,18 @@ tableStore.table.params.manufacturer = []
 tableStore.table.params.loadType = []
 tableStore.table.params.serverName = 'harmonicBoot'
 provide('tableStore', tableStore)
-const tree2List = (list: any, pid?: string) => {
+const tree2List = (list: any, id?: string) => {
    //存储结果的数组
    let arr: any = []
    // 遍历 tree 数组
    list.forEach((item: any) => {
-        // item.comFlag = item.comFlag == null ? 3 : item.comFlag
+        item.uPid = id
+        item.uId = Math.random() * 1000
        item.valueOver == 3.14159 ? 0 : item.valueOver >= 90 ? 1 : item.valueOver && item.valueOver < 90 ? 2 : 3
-        item.pid = pid
        // 判断item是否存在children
        if (!item.children) return arr.push(item)
        // 函数递归，对children数组进行tree2List的转换
-        const children = tree2List(item.children, item.id)
+        const children = tree2List(item.children, item.uId)
        // 删除item的children属性
        delete item.children
        // 把item和children数组添加至结果数组
@@ -235,6 +234,7 @@ const tree2List = (list: any, pid?: string) => {
    // 返回结果数组
    return arr
 }
+
 onMounted(() => {
    tableStore.index()
 })
--- a/src/views/pqs/harmonicMonitoring/area/getIntegrityData/index.vue
+++ b/src/views/pqs/harmonicMonitoring/area/getIntegrityData/index.vue
@@ -103,6 +103,9 @@
                        </el-select>
                    </el-form-item>
                </template>
+                <template #operation>
+                    <el-button type="primary" icon="el-icon-Download" @click="makeUp">补招</el-button>
+                </template>
            </TableHeader>
        </div>
        <div class="online_main">
@@ -110,7 +113,8 @@
                <el-tab-pane :name="0" :lazy="true" label="数据完整性列表">
                    <Table
                        ref="tableRef"
-                        :tree-config="{ transform: true, parentField: 'pid' }"
+                        :tree-config="{ transform: true, parentField: 'uPid', rowField: 'uId' }"
+                        :checkbox-config="{ labelField: 'name', }"
                        :scroll-y="{ enabled: true }"
                        v-if="activeName == 0"
                    />
@@ -183,7 +187,6 @@ const handleClick = (tab: any, e: any) => {
    // }
 }

-// const datePickerRef = ref()
 const tableHeaderRef = ref()
 const tableStore = new TableStore({
    publicHeight: 60,
@@ -195,8 +198,13 @@ const tableStore = new TableStore({
            title: formData.value.statisticalType.name,
            field: 'name',
            align: 'left',
+            type: 'checkbox',
            treeNode: true,
            width: 350,
+            formatter: function (row) {
+                console.log("🚀 ~ row:", row)
+                return 123//row.cellValue ? row.cellValue : '/'
+            }
        },
        {
            title: '网络参数',
@@ -291,9 +299,8 @@ const tableStore = new TableStore({
        // tableStore.table.params.searchEndTime =  tableHeaderRef.value.datePickerRef.timeValue[1]
    },
    loadCallback: () => {
-        let treeData = []
-        treeData = tree2List(tableStore.table.data)
-        tableStore.table.data = JSON.parse(JSON.stringify(treeData))
+        tableStore.table.data = tree2List(tableStore.table.data, Math.random() * 1000)
+
        tableStore.table.column[0].title = formData.value.statisticalType.name
        chartsRef.value && chartsRef.value.getTableStoreParams(tableStore.table.params)
        setTimeout(() => {
@@ -301,22 +308,20 @@ const tableStore = new TableStore({
        }, 0)
    }
 })
-const handleSearch = () => {
-    formData.value.searchBeginTime = datePickerRef.value.timeValue[0]
-    formData.value.searchEndTime = datePickerRef.value.timeValue[1]
-}
+
 tableStore.table.params.deptIndex = ''
 tableStore.table.params.statisticalType = []
 tableStore.table.params.scale = []
 tableStore.table.params.manufacturer = []
 tableStore.table.params.loadType = []
 provide('tableStore', tableStore)
-const tree2List = (list: any, pid?: string) => {
+const tree2List = (list: any, id?: string) => {
    //存储结果的数组
    let arr: any = []
    // 遍历 tree 数组
    list.forEach((item: any) => {
-        // item.comFlag = item.comFlag == null ? 3 : item.comFlag
+        item.uPid = id
+        item.uId = Math.random() * 1000
        item.valueOver =
            item.integrityData == 3.14159
                ? 0
@@ -325,11 +330,10 @@ const tree2List = (list: any, pid?: string) => {
                : item.integrityData >= 60 && item.integrityData < 90
                ? 2
                : 3
-        item.pid = pid
        // 判断item是否存在children
        if (!item.children) return arr.push(item)
        // 函数递归，对children数组进行tree2List的转换
-        const children = tree2List(item.children, item.id)
+        const children = tree2List(item.children, item.uId)
        // 删除item的children属性
        delete item.children
        // 把item和children数组添加至结果数组
@@ -340,7 +344,11 @@ const tree2List = (list: any, pid?: string) => {
    return arr
 }
 onMounted(() => {})
-
+// 补招
+const makeUp = () => {
+    tableRef.value && tableRef.value.getRef().getCheckboxRecords()
+    console.log("🚀 ~ makeUp ~ tableRef.value.getRef().getCheckboxRecords():", tableRef.value.getRef().getCheckboxRecords())
+}
 watch(
    () => treeData.value,
    (val, oldVal) => {
--- a/src/views/pqs/harmonicMonitoring/area/harmonicDistortionRate/index.vue
+++ b/src/views/pqs/harmonicMonitoring/area/harmonicDistortionRate/index.vue
@@ -75,7 +75,12 @@
                    </el-form-item>
                    <el-form-item label="电网标志">
                        <el-select v-model="tableStore.table.params.powerFlag" placeholder="请选择电网标志">
-                        <el-option v-for="item in sign" :key="item.id" :label="item.name" :value="item.algoDescribe" />
+                            <el-option
+                                v-for="item in sign"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.algoDescribe"
+                            />
                        </el-select>
                    </el-form-item>
                </template>
@@ -86,7 +91,7 @@
                <el-tab-pane :name="0" :lazy="true" label="谐波畸变率统计表">
                    <Table
                        ref="tableRef"
-                        :tree-config="{ transform: true, parentField: 'pid' }"
+                        :tree-config="{ transform: true, parentField: 'uPid', rowField: 'uId' }"
                        :scroll-y="{ enabled: true }"
                        v-if="activeName == 0"
                    />
@@ -195,10 +200,8 @@ const tableStore = new TableStore({
    ],

    loadCallback: () => {
-        let treeData = []
-        treeData = tree2List(tableStore.table.data)
+        tableStore.table.data = tree2List(tableStore.table.data, Math.random() * 1000)
        tableStore.table.column[0].title = tableStore.table.params.statisticalType.name
-        tableStore.table.data = JSON.parse(JSON.stringify(treeData))
        chartsRef.value && chartsRef.value.getTableStoreParams(tableStore.table.params)
        setTimeout(() => {
            activeName.value == 0 && tableRef.value && tableRef.value.getRef().setAllTreeExpand(true)
@@ -213,18 +216,18 @@ tableStore.table.params.loadType = []
 tableStore.table.params.powerFlag = sign[0]?.algoDescribe || 0
 tableStore.table.params.serverName = 'harmonicBoot'
 provide('tableStore', tableStore)
-const tree2List = (list: any, pid?: string) => {
+const tree2List = (list: any, id?: string) => {
    //存储结果的数组
    let arr: any = []
    // 遍历 tree 数组
    list.forEach((item: any) => {
-        // item.comFlag = item.comFlag == null ? 3 : item.comFlag
+        item.uPid = id
+        item.uId = Math.random() * 1000
        item.valueOver == 3.14159 ? 0 : item.valueOver >= 90 ? 1 : item.valueOver && item.valueOver < 90 ? 2 : 3
-        item.pid = pid
        // 判断item是否存在children
        if (!item.children) return arr.push(item)
        // 函数递归，对children数组进行tree2List的转换
-        const children = tree2List(item.children, item.id)
+        const children = tree2List(item.children, item.uId)
        // 删除item的children属性
        delete item.children
        // 把item和children数组添加至结果数组
@@ -234,6 +237,7 @@ const tree2List = (list: any, pid?: string) => {
    // 返回结果数组
    return arr
 }
+
 onMounted(() => {
    tableStore.index()
 })
--- a/src/views/pqs/harmonicMonitoring/area/onlinerate/index.vue
+++ b/src/views/pqs/harmonicMonitoring/area/onlinerate/index.vue
@@ -110,7 +110,7 @@
                <el-tab-pane :name="0" :lazy="true" label="终端在线率列表">
                    <Table
                        ref="tableRef"
-                        :tree-config="{ transform: true, parentField: 'pid' }"
+                        :tree-config="{ transform: true, parentField: 'uPid', rowField: 'uId' }"
                        :scroll-y="{ enabled: true }"
                        v-if="activeName == 0"
                    />
@@ -193,7 +193,7 @@ const tableStore = new TableStore({
            field: 'name',
            align: 'left',
            treeNode: true,
-            width: 350,
+            width: 350
        },
        {
            title: '网络参数',
@@ -255,7 +255,7 @@ const tableStore = new TableStore({
            title: '评估',
            field: 'valueOver',
            align: 'center',
-            effect:"dark",
+            effect: 'dark',
            render: 'tag',
            custom: {
                null: 'info',
@@ -289,9 +289,10 @@ const tableStore = new TableStore({
        // tableStore.table.params.searchEndTime =  tableHeaderRef.value.datePickerRef.timeValue[1]
    },
    loadCallback: () => {
-        let treeData = []
-        treeData = tree2List(tableStore.table.data)
-        tableStore.table.data = JSON.parse(JSON.stringify(treeData))
+        // let treeData = []
+        // treeData = tree2List(tableStore.table.data)
+        // tableStore.table.data = JSON.parse(JSON.stringify(treeData))
+        tableStore.table.data = tree2List(tableStore.table.data, Math.random() * 1000)
        chartsRef.value && chartsRef.value.getTableStoreParams(tableStore.table.params)
        setTimeout(() => {
            activeName.value == 0 && tableRef.value && tableRef.value.getRef().setAllTreeExpand(true)
@@ -305,18 +306,18 @@ tableStore.table.params.scale = []
 tableStore.table.params.manufacturer = []
 tableStore.table.params.loadType = []
 provide('tableStore', tableStore)
-const tree2List = (list: any, pid?: string) => {
+const tree2List = (list: any, id?: string) => {
    //存储结果的数组
    let arr: any = []
    // 遍历 tree 数组
    list.forEach((item: any) => {
-        // item.comFlag = item.comFlag == null ? 3 : item.comFlag
+        item.uPid = id
+        item.uId = Math.random() * 1000
        item.valueOver == 3.14159 ? 0 : item.valueOver >= 90 ? 1 : item.valueOver && item.valueOver < 90 ? 2 : 3
-        item.pid = pid
        // 判断item是否存在children
        if (!item.children) return arr.push(item)
        // 函数递归，对children数组进行tree2List的转换
-        const children = tree2List(item.children, item.id)
+        const children = tree2List(item.children, item.uId)
        // 删除item的children属性
        delete item.children
        // 把item和children数组添加至结果数组
@@ -325,6 +326,7 @@ const tree2List = (list: any, pid?: string) => {
    })
    // 返回结果数组
    return arr
+   
 }
 onMounted(() => {})

@@ -342,6 +344,4 @@ watch(
    }
 )
 </script>
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>
--- a/src/views/pqs/harmonicMonitoring/area/qualifiedRate/index.vue
+++ b/src/views/pqs/harmonicMonitoring/area/qualifiedRate/index.vue
@@ -86,7 +86,7 @@
                <el-tab-pane :name="0" :lazy="true" label="稳态合格率统计表">
                    <Table
                        ref="tableRef"
-                        :tree-config="{ transform: true, parentField: 'pid' }"
+                        :tree-config="{ transform: true, parentField: 'uPid', rowField: 'uId' }"
                        :scroll-y="{ enabled: true }"
                        v-if="activeName == 0"
                    />
@@ -253,10 +253,9 @@ const tableStore = new TableStore({
    ],

    loadCallback: () => {
-        let treeData = []
-        treeData = tree2List(tableStore.table.data)
+        tableStore.table.data = tree2List(tableStore.table.data, Math.random() * 1000)
        tableStore.table.column[0].title = tableStore.table.params.statisticalType.name
-        tableStore.table.data = JSON.parse(JSON.stringify(treeData))
+      
        chartsRef.value && chartsRef.value.getTableStoreParams(tableStore.table.params)
        setTimeout(() => {
            activeName.value == 0 && tableRef.value && tableRef.value.getRef().setAllTreeExpand(true)
@@ -271,18 +270,39 @@ tableStore.table.params.loadType = []
 tableStore.table.params.serverName = 'harmonicBoot'
 tableStore.table.params.powerFlag = sign[0]?.algoDescribe || 0
 provide('tableStore', tableStore)
-const tree2List = (list: any, pid?: string) => {
+// const tree2List = (list: any, pid?: string) => {
+//     //存储结果的数组
+//     let arr: any = []
+//     // 遍历 tree 数组
+//     list.forEach((item: any) => {
+//         // item.comFlag = item.comFlag == null ? 3 : item.comFlag
+//         item.valueOver == 3.14159 ? 0 : item.valueOver >= 90 ? 1 : item.valueOver && item.valueOver < 90 ? 2 : 3
+//         item.pid = pid
+//         // 判断item是否存在children
+//         if (!item.children) return arr.push(item)
+//         // 函数递归，对children数组进行tree2List的转换
+//         const children = tree2List(item.children, item.id)
+//         // 删除item的children属性
+//         delete item.children
+//         // 把item和children数组添加至结果数组
+//         //..children: 意思是把children数组展开
+//         arr.push(item, ...children)
+//     })
+//     // 返回结果数组
+//     return arr
+// }
+const tree2List = (list: any, id?: string) => {
    //存储结果的数组
    let arr: any = []
    // 遍历 tree 数组
    list.forEach((item: any) => {
-        // item.comFlag = item.comFlag == null ? 3 : item.comFlag
+        item.uPid = id
+        item.uId = Math.random() * 1000
        item.valueOver == 3.14159 ? 0 : item.valueOver >= 90 ? 1 : item.valueOver && item.valueOver < 90 ? 2 : 3
-        item.pid = pid
        // 判断item是否存在children
        if (!item.children) return arr.push(item)
        // 函数递归，对children数组进行tree2List的转换
-        const children = tree2List(item.children, item.id)
+        const children = tree2List(item.children, item.uId)
        // 删除item的children属性
        delete item.children
        // 把item和children数组添加至结果数组
--- a/src/views/pqs/harmonicMonitoring/area/terminalonlinerate/index.vue
+++ b/src/views/pqs/harmonicMonitoring/area/terminalonlinerate/index.vue
@@ -178,7 +178,7 @@
                    </div>
                    <Table
                        ref="tableRef"
-                        :tree-config="{ transform: true, parentField: 'pid' }"
+                        :tree-config="{ transform: true,parentField: 'uPid', rowField: 'uId'  }"
                        :scroll-y="{ enabled: true }"
                        v-if="activeName == 0"
                    />
@@ -345,10 +345,9 @@ const tableStore = new TableStore({
        // tableStore.table.params.searchEndTime =  tableHeaderRef.value.datePickerRef.timeValue[1]
    },
    loadCallback: () => {
-        let treeData = []
-        treeData = tree2List(tableStore.table.data)
+        tableStore.table.data = tree2List(tableStore.table.data, Math.random() * 1000)
        tableStore.table.column[0].title = formData.value.statisticalType.name
-        tableStore.table.data = JSON.parse(JSON.stringify(treeData))
+
        chartsRef.value&&chartsRef.value.getTableStoreParams(tableStore.table.params)
        setTimeout(() => {
            activeName.value == 0 && tableRef.value && tableRef.value.getRef().setAllTreeExpand(true)
@@ -365,18 +364,18 @@ tableStore.table.params.scale = []
 tableStore.table.params.manufacturer = []
 tableStore.table.params.loadType = []
 provide('tableStore', tableStore)
-const tree2List = (list: any, pid?: string) => {
+const tree2List = (list: any, id?: string) => {
    //存储结果的数组
    let arr: any = []
    // 遍历 tree 数组
    list.forEach((item: any) => {
-        // item.comFlag = item.comFlag == null ? 3 : item.comFlag
+        item.uPid = id
+        item.uId = Math.random() * 1000
        item.valueOver == 3.14159 ? 0 : item.valueOver >= 90 ? 1 : item.valueOver && item.valueOver < 90 ? 2 : 3
-        item.pid = pid
        // 判断item是否存在children
        if (!item.children) return arr.push(item)
        // 函数递归，对children数组进行tree2List的转换
-        const children = tree2List(item.children, item.id)
+        const children = tree2List(item.children, item.uId)
        // 删除item的children属性
        delete item.children
        // 把item和children数组添加至结果数组
@@ -386,6 +385,7 @@ const tree2List = (list: any, pid?: string) => {
    // 返回结果数组
    return arr
 }
+
 onMounted(() => {})

 watch(
--- a/src/views/pqs/harmonicMonitoring/detailed/harmonicStatistics/index.vue
+++ b/src/views/pqs/harmonicMonitoring/detailed/harmonicStatistics/index.vue
@@ -209,7 +209,7 @@ const histogram = (res: any) => {
                var tips = ''
                for (var i = 0; i < params.length; i++) {
                    tips += params[i].name + '</br/>'
-                    tips += '监测点数' + ':' + '&nbsp' + '&nbsp' + (params[i].value == 0.14159 ? '暂无数据' : params[i].value) + '</br/>'
+                    tips += '超标监测点占比' + ':' + '&nbsp' + '&nbsp' + (params[i].value == 0.14159 ? '暂无数据' : params[i].value) + '</br/>'
                }
                return tips
            }
@@ -220,7 +220,7 @@ const histogram = (res: any) => {
            data: res.map((item: any) => item.name)
        },
        yAxis: {
-            name: '等级',// 给X轴加单位
+            name: '超标占比',// 给X轴加单位
            min: 0,
            max: 100,

--- a/src/views/pqs/panorama/components/boundary.ts
+++ b/src/views/pqs/panorama/components/boundary.ts
--- a/src/views/pqs/panorama/components/map.vue
+++ b/src/views/pqs/panorama/components/map.vue
@@ -225,7 +225,7 @@ const inputQuery: any = ref('')
 const QueryList: any = ref([])
 const activeName: any = ref(0)

-const zoomMap = ref(8.8)
+const zoomMap = ref(9.8)
 const colorKey = ref('')
 const showCollapse: any = ref(true)
 const showWrap: any = ref(false)
@@ -237,30 +237,100 @@ const imgUrl0 = new URL('@/assets/img/BDZ-ZS.png', import.meta.url).href
 const imgUrl1 = new URL('@/assets/img/ZD-ZS.png', import.meta.url).href
 const imgUrl2 = new URL('@/assets/img/JCD-ZS.png', import.meta.url).hre
 const boundaryList: any = ref([
+    // {
+    //     orgName: '唐山',
+    //     LngLat: [118.335849137, 39.7513593355],
+    //     boundary: mapJson.tsJSON
+    // },
+    // {
+    //     orgName: '张家口',
+    //     LngLat: [115.032504679, 40.8951549951],
+    //     boundary: mapJson.zjkJSON
+    // },
+    // {
+    //     orgName: '秦皇岛',
+    //     LngLat: [119.185113833, 40.1179119754],
+    //     boundary: mapJson.qhdJSON
+    // },
+    // {
+    //     orgName: '承德',
+    //     LngLat: [117.548498365, 41.3775890632],
+    //     boundary: mapJson.cdJSON
+    // },
+    // {
+    //     orgName: '廊坊',
+    //     LngLat: [116.628004129, 39.0589378611],
+    //     boundary: mapJson.lfJSON
+    // }
    {
-        orgName: '唐山',
-        LngLat: [118.335849137, 39.7513593355],
-        boundary: mapJson.tsJSON
+        orgName: '大连',
+        LngLat: [122.060077, 39.635794],
+        boundary: mapJson['大连']
    },
    {
-        orgName: '张家口',
-        LngLat: [115.032504679, 40.8951549951],
-        boundary: mapJson.zjkJSON
+        orgName: '抚顺',
+        LngLat: [124.354599, 41.88962],
+        boundary: mapJson['抚顺']
    },
    {
-        orgName: '秦皇岛',
-        LngLat: [119.185113833, 40.1179119754],
-        boundary: mapJson.qhdJSON
+        orgName: '沈阳',
+        LngLat: [123.0389, 41.992993],
+        boundary: mapJson['沈阳']
    },
    {
-        orgName: '承德',
-        LngLat: [117.548498365, 41.3775890632],
-        boundary: mapJson.cdJSON
+        orgName: '丹东',
+        LngLat: [124.585661, 40.645967],
+        boundary: mapJson['丹东']
    },
    {
-        orgName: '廊坊',
-        LngLat: [116.628004129, 39.0589378611],
-        boundary: mapJson.lfJSON
+        orgName: '营口',
+        LngLat: [122.225226, 40.433551],
+        boundary: mapJson['营口']
+    },
+    {
+        orgName: '盘锦',
+        LngLat: [121.875362, 41.075416],
+        boundary: mapJson['盘锦']
+    },
+    {
+        orgName: '铁岭',
+        LngLat: [124.229492, 42.731873],
+        boundary: mapJson['铁岭']
+    },
+    {
+        orgName: '朝阳',
+        LngLat: [121.42, 41.58],
+        boundary: mapJson['朝阳']
+    },
+    {
+        orgName: '葫芦岛',
+        LngLat: [119.850873, 40.728517],
+        boundary: mapJson['葫芦岛']
+    },
+    {
+        orgName: '锦州',
+        LngLat: [119.140944, 41.39657],
+        boundary: mapJson['锦州']
+    },
+    {
+        orgName: '阜新',
+        LngLat: [121.658585, 42.350951],
+        boundary: mapJson['阜新']
+    },
+    {
+        orgName: '本溪',
+        LngLat: [124.390785, 41.197021],
+        boundary: mapJson['本溪']
+    },
+    {
+        orgName: '辽阳',
+        LngLat: [123.090785, 41.297021],
+        boundary: mapJson['辽阳']
+    },
+    {
+        orgName: '鞍山',
+        LngLat: [122.808845, 40.840049],
+        boundary: mapJson['鞍山']
    }
 ])

@@ -270,8 +340,8 @@ const siteList = ref<any>([])
 const polyline = ref<any>([])
 const lineId = ref('')
 const center = ref({
-    lng: 116.84428600000001,
-    lat: 40.57707185292256
+    lng: 122.42588,
+    lat: 41.210977
 })
 const infoWindowPoint = ref<anyObj>({
    lng: 0,
@@ -464,6 +534,7 @@ const grids = (row: any) => {

        getGridDiagramAreaData({ ...form, deptIndex: deptIndex.value }).then((res: any) => {
            AreaData.value = res.data
+            console.log('🚀 ~ getGridDiagramAreaData ~  AreaData.value:', AreaData.value)
            GridDiagramArea()
        })
        // if (powerManageGridMap.value) powerLoad()
--- a/src/views/pqs/runManage/alarmCleaning/components/alarm.vue
+++ b/src/views/pqs/runManage/alarmCleaning/components/alarm.vue
@@ -145,6 +145,7 @@
                                </span>
                            </template>
                        </vxe-column>
+                        <vxe-column field="manufacturer" title="终端厂家"></vxe-column>
                        <vxe-column field="devName" title="所属终端名称">
                            <template #default="{ row }">
                                <span class="table_name">
@@ -152,6 +153,11 @@
                                </span>
                            </template>
                        </vxe-column>
+                        <vxe-column field="ip" title="IP">
+                            <template #default="{ row }">
+                                {{ decryptFromBase64(row.ip) }}
+                            </template>
+                        </vxe-column>
                        <vxe-column field="stationName" title="所属电站">
                            <template #default="{ row }">
                                <span class="table_name">
@@ -196,7 +202,7 @@ import MyEchart from '@/components/echarts/MyEchart.vue'
 import alarmDetails from './alarmDetails.vue'
 import { getMonitorLimitDataDay } from '@/api/device-boot/dataVerify'
 import { queryFirstNode } from '@/api/auth'
-
+import { decryptFromBase64 } from '@/utils/index'
 const alarmDetailsRef = ref()
 const dictData = useDictData()
 //字典获取监督对象类型
--- a/src/views/pqs/runManage/cleaning/components/abnormal.vue
+++ b/src/views/pqs/runManage/cleaning/components/abnormal.vue
@@ -169,6 +169,7 @@
                                </span>
                            </template>
                        </vxe-column>
+                        <vxe-column field="manufacturer" title="终端厂家"></vxe-column>
                        <vxe-column field="devName" title="所属终端名称">
                            <template #default="{ row }">
                                <span class="table_name">
@@ -176,6 +177,11 @@
                                </span>
                            </template>
                        </vxe-column>
+                        <vxe-column field="ip" title="IP">
+                            <template #default="{ row }">
+                                {{ decryptFromBase64(row.ip) }}
+                            </template>
+                        </vxe-column>
                        <vxe-column field="stationName" title="所属电站">
                            <template #default="{ row }">
                                <span class="table_name">
@@ -219,6 +225,7 @@ import MyEchart from '@/components/echarts/MyEchart.vue'
 import anomalyDetails from './anomalyDetails.vue'
 import { getMonitorVerifyDay } from '@/api/device-boot/dataVerify'
 import { queryFirstNode } from '@/api/auth'
+import { decryptFromBase64 } from '@/utils/index'

 const anomalyDetailsRef = ref()
 const dictData = useDictData()