修改测试bug 优化页面

修改组件管理时间线配置

src/api/cs-device-boot/csLedger.ts

@@ -15,6 +15,13 @@ export function getLineTree() {
         method: 'POST'
     })
 }
+// 监测点列表治理
+export function objTree() {
+    return createAxios({
+        url: '/cs-device-boot/csLedger/objTree',
+        method: 'POST'
+    })
+}
 
 
 //云设备录入树

src/api/cs-harmonic-boot/datatrend.ts

@@ -1,22 +1,31 @@
-import createAxios from '@/utils/request'
-
-// 查询设备数据趋势
-export function getDeviceDataTrend(data: any) {
-    return createAxios({
-        url: '/cs-harmonic-boot/datatrend/querydatatrend',
-        method: 'POST',
-        data
-    })
-}
-
-
-
-// 波形下载
-export function getFileZip(params: any) {
-    return createAxios({
-        url: '/cs-harmonic-boot/event/getFileZip',
-        method: 'get',
-        params,
-        responseType: 'blob'
-    })
-}
+import createAxios from '@/utils/request'
+
+// 查询设备数据趋势
+export function getDeviceDataTrend(data: any) {
+    return createAxios({
+        url: '/cs-harmonic-boot/datatrend/querydatatrend',
+        method: 'POST',
+        data
+    })
+}
+
+
+
+// 波形下载
+export function getFileZip(params: any) {
+    return createAxios({
+        url: '/cs-harmonic-boot/event/getFileZip',
+        method: 'get',
+        params,
+        responseType: 'blob'
+    })
+}
+
+export function exportModel(data: any) {
+    return createAxios({
+        url: '/cs-harmonic-boot/exportmodel/exportModel',
+        method: 'post',
+        data: data,
+        responseType: 'blob'
+    })
+}

src/api/cs-harmonic-boot/mxgraph.ts

@@ -1,50 +1,67 @@
-import createAxios from '@/utils/request'
-
-//新增组态项目
-export function add(data: any) {
-    return createAxios({
-        url: '/cs-harmonic-boot/csconfiguration/add',
-        method: 'post',
-        data
-    })
-}
-//组态项目分页查询
-export function coFqueryPage(data: any) {
-    return createAxios({
-        url: '/cs-harmonic-boot/csconfiguration/queryPage',
-        method: 'post',
-        data
-    })
-}
-//修改组态项目
-export function audit(data: any) {
-    return createAxios({
-        url: '/cs-harmonic-boot/csconfiguration/audit',
-        method: 'post',
-        data
-    })
-}
-//组态页面分页查询
-export function queryPageData(data: any) {
-    return createAxios({
-        url: '/cs-harmonic-boot/cspage/queryPage',
-        method: 'post',
-        data
-    })
-}
-//查询工程列表
-export function deviceTree(data: any) {
-    return createAxios({
-        url: '/cs-device-boot/csLedger/deviceTree',
-        method: 'post',
-        data
-    })
-}
-
-//三层设备树(项目层根节点为治理设备和便携式设备组态)
-export function getztProjectTree() {
-    return createAxios({
-        url: '/cs-device-boot/csLedger/getztProjectTree',
-        method: 'post',
-    })
-}
+import createAxios from '@/utils/request'
+
+//新增组态项目
+export function add(data: any) {
+    return createAxios({
+        url: '/cs-harmonic-boot/csconfiguration/add',
+        method: 'post',
+        data
+    })
+}
+//组态项目分页查询
+export function coFqueryPage(data: any) {
+    return createAxios({
+        url: '/cs-harmonic-boot/csconfiguration/queryPage',
+        method: 'post',
+        data
+    })
+}
+//修改组态项目
+export function audit(data: any) {
+    return createAxios({
+        url: '/cs-harmonic-boot/csconfiguration/audit',
+        method: 'post',
+        data
+    })
+}
+//组态页面分页查询
+export function queryPageData(data: any) {
+    return createAxios({
+        url: '/cs-harmonic-boot/cspage/queryPage',
+        method: 'post',
+        data
+    })
+}
+//查询工程列表
+export function deviceTree(data: any) {
+    return createAxios({
+        url: '/cs-device-boot/csLedger/deviceTree',
+        method: 'post',
+        data
+    })
+}
+
+//三层设备树(项目层根节点为治理设备和便携式设备组态)
+export function getztProjectTree() {
+    return createAxios({
+        url: '/cs-device-boot/csLedger/getztProjectTree',
+        method: 'post',
+    })
+}
+
+//根据用户id获取组件信息
+export function getByUserId(data: any) {
+    return createAxios({
+        url: '/cs-harmonic-boot/cspage/getByUserId',
+        method: 'post',
+        params: data
+    })
+}
+//c保存组态界面与用户的关系
+export function savePageIdWithUser(data: any) {
+    return createAxios({
+        url: '/cs-harmonic-boot/cspage/savePageIdWithUser',
+        method: 'post',
+        params: data
+    })
+}

src/api/cs-harmonic-boot/recruitment.ts

@@ -1,27 +1,36 @@
-import createAxios from '@/utils/request'
-
-// 获取设备补召页面数据
-export function getMakeUpData(data: any) {
-    return createAxios({
-        url: '/cs-harmonic-boot/offlineDataUpload/makeUpData?lineId='+data,
-        method: 'POST'
-    })
-}
-
-//查询装置目录-文件
-export function getAskDirOrFile(data: any) {
-    return createAxios({
-        url: `/cs-harmonic-boot/offlineDataUpload/askDirOrFile?fileType=${data.fileType}&nDid=${data.nDid}&path=${data.path}&prjName=${data.prjName}`,
-        method: 'POST'
-    })
-}
-
-//设备补召操作
-// 获取设备补召页面数据
-export function offlineDataUploadMakeUp(data: any) {
-    return createAxios({
-        url: '/cs-harmonic-boot/offlineDataUpload/makeUp',
-        method: 'POST',
-        data
-    })
-}
+import createAxios from '@/utils/request'
+
+// 获取设备补召页面数据
+export function getMakeUpData(data: any) {
+    return createAxios({
+        url: '/cs-harmonic-boot/offlineDataUpload/makeUpData?lineId='+data,
+        method: 'POST'
+    })
+}
+
+//查询装置目录-文件
+export function getAskDirOrFile(data: any) {
+    return createAxios({
+        url: `/cs-harmonic-boot/offlineDataUpload/askDirOrFile?fileType=${data.fileType}&nDid=${data.nDid}&path=${data.path}&prjName=${data.prjName}`,
+        method: 'POST'
+    })
+}
+
+//设备补召操作
+// 获取设备补召页面数据
+export function offlineDataUploadMakeUp(data: any) {
+    return createAxios({
+        url: '/cs-harmonic-boot/offlineDataUpload/makeUp',
+        method: 'POST',
+        data
+    })
+}
+//设备补召操作
+// 根据id集合获取敏感负荷用户列表
+export function getListByIds() {
+    return createAxios({
+        url: '/cs-harmonic-boot/pqSensitiveUser/getListByIds',
+        method: 'POST',
+        
+    })
+}

src/api/harmonic-boot/cockpit/cockpit.ts

@@ -261,4 +261,13 @@ export function getSimpleLine() {
 }
 
 
+export function getLineExport(data:any) {
+    return request({
+        url: '/cs-harmonic-boot/eventReport/getLineExport',
+        method: 'post',
+        data: data,
+        responseType: 'blob'
+    })
+}
+
 

src/api/system-boot/csDictData.ts

@@ -1,118 +1,126 @@
-import request from '@/utils/request'
-// 新增字典数据
-export const addCsDictData = (data: any) => {
-    return request({
-        url: '/system-boot/csDictData/add',
-        method: 'post',
-        data: data
-    })
-}
-
-// 查询字典数据
-export const queryCsDictDataPage = (data: any) => {
-    return request({
-        url: '/system-boot/csDictData/list',
-        method: 'post',
-        data: Object.assign(
-            {
-                orderBy: '',
-                pageNum: 0,
-                pageSize: 0,
-                searchBeginTime: '',
-                searchEndTime: '',
-                searchState: 0,
-                searchValue: '',
-                dataType: '',
-                sortBy: ''
-            },
-            data
-        )
-    })
-}
-
-//删除字典数据
-export const delCsDictData = (id: string) => {
-    let form = new FormData()
-    form.append('id', id)
-    return request({
-        url: '/system-boot/csDictData/delete',
-        method: 'post',
-        data: form,
-        headers: {
-            'Content-Type': 'application/x-www-form-urlencoded'
-        }
-    })
-}
-
-// 修改字典数据
-export const updateCsDictData = (data: any) => {
-    return request({
-        url: '/system-boot/csDictData/update',
-        method: 'post',
-        data: data
-    })
-}
-
-// 执行算法
-export const timerRun = (params: any) => {
-    return request({
-        url: '/system-boot/timer/run',
-        method: 'GET',
-        params
-    })
-}
-// 任务表达式
-export const getActionClasses = () => {
-    return request({
-        url: '/system-boot/timer/getActionClasses',
-        method: 'GET'
-    })
-}
-// 新增任务
-export const addTimer = (data: any) => {
-    return request({
-        url: '/system-boot/timer/add',
-        method: 'POST',
-        data
-    })
-}
-// 修改任务
-export const updateTimer = (data: any) => {
-    return request({
-        url: '/system-boot/timer/update',
-        method: 'POST',
-        data
-    })
-}
-// 补招配置
-export const runTimer = (data: any) => {
-    return request({
-        url: '/system-boot/timer/run',
-        method: 'GET',
-        params: data
-    })
-}
-// 删除任务
-export const deleteTimer = (data: any) => {
-    return request({
-        url: '/system-boot/timer/delete',
-        method: 'POST',
-        data: data
-    })
-}
-// 关闭任务
-export const stop = (params: any) => {
-    return request({
-        url: '/system-boot/timer/stop',
-        method: 'get',
-        params
-    })
-}
-// 启动任务
-export const start = (params: any) => {
-    return request({
-        url: '/system-boot/timer/start',
-        method: 'get',
-        params
-    })
+import request from '@/utils/request'
+// 新增字典数据
+export const addCsDictData = (data: any) => {
+    return request({
+        url: '/system-boot/csDictData/add',
+        method: 'post',
+        data: data
+    })
+}
+
+// 查询字典数据
+export const queryCsDictDataPage = (data: any) => {
+    return request({
+        url: '/system-boot/csDictData/list',
+        method: 'post',
+        data: Object.assign(
+            {
+                orderBy: '',
+                pageNum: 0,
+                pageSize: 0,
+                searchBeginTime: '',
+                searchEndTime: '',
+                searchState: 0,
+                searchValue: '',
+                dataType: '',
+                sortBy: ''
+            },
+            data
+        )
+    })
+}
+
+//删除字典数据
+export const delCsDictData = (id: string) => {
+    let form = new FormData()
+    form.append('id', id)
+    return request({
+        url: '/system-boot/csDictData/delete',
+        method: 'post',
+        data: form,
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded'
+        }
+    })
+}
+
+// 修改字典数据
+export const updateCsDictData = (data: any) => {
+    return request({
+        url: '/system-boot/csDictData/update',
+        method: 'post',
+        data: data
+    })
+}
+
+// 执行算法
+export const timerRun = (params: any) => {
+    return request({
+        url: '/system-boot/timer/run',
+        method: 'GET',
+        params
+    })
+}
+// 任务表达式
+export const getActionClasses = () => {
+    return request({
+        url: '/system-boot/timer/getActionClasses',
+        method: 'GET'
+    })
+}
+// 新增任务
+export const addTimer = (data: any) => {
+    return request({
+        url: '/system-boot/timer/add',
+        method: 'POST',
+        data
+    })
+}
+// 修改任务
+export const updateTimer = (data: any) => {
+    return request({
+        url: '/system-boot/timer/update',
+        method: 'POST',
+        data
+    })
+}
+// 补招配置
+export const runTimer = (data: any) => {
+    return request({
+        url: '/system-boot/timer/run',
+        method: 'GET',
+        params: data
+    })
+}
+// 删除任务
+export const deleteTimer = (data: any) => {
+    return request({
+        url: '/system-boot/timer/delete',
+        method: 'POST',
+        data: data
+    })
+}
+// 关闭任务
+export const stop = (params: any) => {
+    return request({
+        url: '/system-boot/timer/stop',
+        method: 'get',
+        params
+    })
+}
+// 启动任务
+export const start = (params: any) => {
+    return request({
+        url: '/system-boot/timer/start',
+        method: 'get',
+        params
+    })
+}
+// 查询监测对象类型
+export const getDicDataByTypeCode = (params: any) => {
+    return request({
+        url: '/system-boot/dictData/getDicDataByTypeCode',
+        method: 'get',
+        params
+    })
 }

src/api/system-boot/csstatisticalset.ts

@@ -54,6 +54,14 @@ export const activatePage = (params: any) => {
         params
     })
 }
+// 全局的驾驶舱页面
+export const scopePage = (params: any) => {
+    return createAxios({
+        url: '/system-boot/dashboard/scopePage',
+        method: 'post',
+        params
+    })
+}
 // 查询激活的驾驶舱页面
 export const queryActivatePage = () => {
     return createAxios({

src/components/cockpit/F47Curve/index.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
         <!--F47曲线 -->
-        <TableHeader :showReset="false" @selectChange="selectChange" datePicker v-if="fullscreen"></TableHeader>
+        <TableHeader ref="TableHeaderRef" :showReset="false"  :timeKeyList="prop.timeKey" @selectChange="selectChange" datePicker v-if="fullscreen"></TableHeader>
         <el-descriptions class="mt2" direction="vertical" :column="4" border>
             <el-descriptions-item align="center" label="名称">{{ data.name }}</el-descriptions-item>
             <el-descriptions-item align="center" label="事件总数">{{ data.gs }}</el-descriptions-item>
@@ -22,7 +22,6 @@
         <el-dialog v-model="isWaveCharts" v-if="isWaveCharts" draggable :title="dialogTitle" append-to-body width="70%">
             <waveFormAnalysis
                 v-loading="loading"
-              
                 ref="waveFormAnalysisRef"
                 @handleHideCharts="isWaveCharts = false"
                 :wp="wp"
@@ -38,15 +37,20 @@ import waveFormAnalysis from '@/views/govern/device/control/tabs/components/wave
 import TableHeader from '@/components/table/header/index.vue'
 import { analyseWave } from '@/api/common'
 import { ElMessage } from 'element-plus'
+import { getTime } from '@/utils/formatTime'
+
 const prop = defineProps({
     w: { type: [String, Number] },
     h: { type: [String, Number] },
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-    timeKey: { type: [String, Number] },
-    timeValue: { type: Object }
+   timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
 
+const TableHeaderRef = ref()
+
 const headerHeight = ref(57)
 
 const dialogTitle = ref('波形分析')
@@ -100,8 +104,7 @@ const tableStore: any = new TableStore({
 
     column: [],
     beforeSearchFun: () => {
-        tableStore.table.params.searchBeginTime = tableStore.table.params.searchBeginTime || prop.timeValue?.[0]
-        tableStore.table.params.searchEndTime = tableStore.table.params.searchEndTime || prop.timeValue?.[1]
+        setTime()
     },
     loadCallback: () => {
         const gongData = gongfunction(tableStore.table.data)
@@ -238,6 +241,25 @@ const tableRef = ref()
 provide('tableRef', tableRef)
 provide('tableStore', tableStore)
 
+const setTime = () => {
+    const time = getTime(
+        (TableHeaderRef.value?.datePickerRef.interval || prop.interval) ?? 0,
+        prop.timeKey,
+        fullscreen.value
+            ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+            : prop.timeValue
+    )
+
+    if (Array.isArray(time)) {
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
+        TableHeaderRef.value?.setInterval(time[2] - 0)
+        TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
+    }
+}
+
 function gongfunction(arr: any) {
     let standI = 0
     let unstandI = 0
@@ -424,7 +446,7 @@ const handleTolerableEventClick = async (row: any) => {
     nextTick(() => {
         if (waveFormAnalysisRef.value) {
             //waveFormAnalysisRef.value.setHeight(false, 360)
-            waveFormAnalysisRef.value.setHeight(999, 130, 1.6666666)
+            // waveFormAnalysisRef.value.setHeight(999, 130, 1.6666666)
         }
     })
    const messageInstance = ElMessage.info(`正在加载，请稍等...`)
@@ -452,6 +474,7 @@ const handleTolerableEventClick = async (row: any) => {
         })
 
     nextTick(() => {
+        waveFormAnalysisRef.value &&  waveFormAnalysisRef.value.setHeight(999, 130, 1.6666666)
         waveFormAnalysisRef.value && waveFormAnalysisRef.value.getWpData(wp.value, boxoList.value, true)
     })
 }

src/components/cockpit/crossingTime/index.vue

@@ -0,0 +1,308 @@
+<template>
+    <div>
+        <!--暂态越限时间分布 -->
+        <TableHeader
+            ref="TableHeaderRef"
+            :timeKeyList="prop.timeKey"
+            :showReset="false"
+            @selectChange="selectChange"
+            datePicker
+            v-if="fullscreen"
+        ></TableHeader>
+        <my-echart
+            class="tall"
+            :options="echartList1"
+            :style="{
+                width: prop.width,
+                height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px)`
+            }"
+        />
+        <!-- <my-echart
+            class="mt10"
+            :options="echartList1"
+            :style="{
+                width: prop.width,
+                height: `calc(${prop.height} / 2  - ${headerHeight / 2}px + ${fullscreen ? 0 : 28}px )`
+            }"
+        /> -->
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, reactive, watch } from 'vue'
+import TableStore from '@/utils/tableStore'
+import MyEchart from '@/components/echarts/MyEchart.vue'
+import { useConfig } from '@/stores/config'
+import TableHeader from '@/components/table/header/index.vue'
+import { getTime } from '@/utils/formatTime'
+
+const prop = defineProps({
+    w: { type: [String, Number] },
+    h: { type: [String, Number] },
+    width: { type: [String, Number] },
+    height: { type: [String, Number] },
+    timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
+})
+
+const TableHeaderRef = ref()
+
+const headerHeight = ref(57)
+
+const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
+    headerHeight.value = height
+
+    if (datePickerValue && datePickerValue.timeValue) {
+        // 更新时间参数
+        tableStore.table.params.searchBeginTime = datePickerValue.timeValue[0]
+        tableStore.table.params.searchEndTime = datePickerValue.timeValue[1]
+    }
+}
+
+// 计算是否全屏展示
+const fullscreen = computed(() => {
+    const w = Number(prop.w)
+    const h = Number(prop.h)
+    if (!isNaN(w) && !isNaN(h) && w === 12 && h === 6) {
+        // 执行相应逻辑
+        return true
+    } else {
+        return false
+    }
+})
+
+const config = useConfig()
+
+const echartList = ref({})
+
+const echartList1 = ref({})
+
+const processDataForChart = (rawData: any[]) => {
+    // 将后端返回的扁平数据转换为 ECharts 需要的三维坐标格式 [x, y, z]
+    const chartData = rawData.map(item => [item.x, item.y, item.z])
+
+    return chartData
+}
+
+const tableStore: any = new TableStore({
+    url: '/cs-harmonic-boot/csevent/getEventCoords',
+    method: 'POST',
+    showPage: false,
+    column: [],
+    beforeSearchFun: () => {
+        setTime()
+    },
+    loadCallback: () => {
+        const processedData = processDataForChart(tableStore.table.data.innerList || [])
+        const trendList = tableStore.table.data.trendList || []
+        const xlist = tableStore.table.data.xlist || []
+
+        // 处理趋势图数据
+        const seriesData = trendList.map((item: any) => {
+            // 根据接口返回的name字段确定系列名称和颜色
+            let name = ''
+            let color = ''
+
+            switch (item.name) {
+                case 'Evt_Sys_DipStr':
+                    name = '电压暂降'
+                    color = '#FFBF00'
+                    break
+                case 'Evt_Sys_IntrStr':
+                    name = '电压中断'
+                    color = '#FF9100'
+                    break
+                case 'Evt_Sys_SwlStr':
+                    name = '电压暂升'
+                    color = config.layout.elementUiPrimary[0]
+                    break
+                default:
+                    name = item.name
+                    color = '#000000'
+            }
+
+            return {
+                name: name,
+                type: 'line',
+                showSymbol: false,
+                color: color,
+                data: item.trendList?.map((value: number, index: number) => [xlist[index], value]) || []
+            }
+        })
+
+        // 获取x轴和y轴的标签值
+        const xLabels = [
+            '0-10%',
+            '10%-20%',
+            '20%-30%',
+            '30%-40%',
+            '40%-50%',
+            '50%-60%',
+            '60%-70%',
+            '70%-80%',
+            '80%-90%',
+            '90%-100%'
+        ]
+        const yLabels = ['0-0.01s', '0.01s-0.1s', '0.1s-1s', '1s-10s', '10s']
+
+        echartList.value = {
+            options: {
+                xAxis: null,
+                yAxis: null,
+                dataZoom: null,
+                backgroundColor: '#fff',
+                tooltip: {
+                    textStyle: {
+                        color: '#fff',
+                        fontStyle: 'normal',
+                        opacity: 0.35,
+                        fontSize: 14
+                    },
+                    backgroundColor: 'rgba(0,0,0,0.55)',
+                    borderWidth: 0,
+                    formatter: function (params: any) {
+                        var tips = ''
+                        tips += '持续时间: ' + yLabels[params.value[1]] + '</br>'
+                        tips += '特征幅值: ' + xLabels[params.value[0]] + '</br>'
+                        tips += '事件次数: ' + params.value[2] + '</br>'
+                        return tips
+                    }
+                },
+                title: {
+                    text: '暂态事件概率分布',
+                    x: 'center'
+                },
+                visualMap: {
+                    max: 500,
+                    show: false,
+                    inRange: {
+                        color: ['#313695', '#00BB00', '#ff8000', '#a50026']
+                    }
+                },
+                xAxis3D: {
+                    type: 'category',
+                    name: '特征幅值',
+                    data: xLabels,
+                    nameGap: 40
+                },
+                yAxis3D: {
+                    type: 'category',
+                    name: '持续时间',
+                    data: yLabels,
+                    nameGap: 40,
+
+                    splitLine: {
+                        lineStyle: {
+                            type: 'dashed',
+                            opacity: 0.5
+                        }
+                    }
+                },
+                zAxis3D: {
+                    type: 'value',
+                    minInterval: 10,
+                    name: '暂态事件次数',
+                    nameGap: 30
+                },
+                grid3D: {
+                    viewControl: {
+                        projection: 'perspective',
+                        distance: 260
+                    },
+                    boxWidth: 200,
+                    boxDepth: 80,
+                    light: {
+                        main: {
+                            intensity: 1.2
+                        },
+                        ambient: {
+                            intensity: 0.3
+                        }
+                    }
+                },
+                series: [
+                    {
+                        type: 'bar3D',
+                        data: processedData,
+                        shading: 'realistic',
+                        label: {
+                            show: false,
+                            textStyle: {
+                                fontSize: 16,
+                                borderWidth: 1
+                            }
+                        }
+                    }
+                ]
+            }
+        }
+
+        echartList1.value = {
+            title: {
+                text: '暂态越限时间概率分布'
+            },
+            xAxis: {
+                type: 'category',
+                data: xlist,
+                axisLabel: {
+                    formatter: '{value}'
+                }
+            },
+            yAxis: {
+                name: '次'
+            },
+            grid: {
+                left: '10px',
+                right: '20px'
+            },
+            series: seriesData
+        }
+    }
+})
+
+const tableRef = ref()
+provide('tableRef', tableRef)
+
+provide('tableStore', tableStore)
+
+onMounted(() => {
+    tableStore.index()
+})
+
+const setTime = () => {
+    const time = getTime(
+        (TableHeaderRef.value?.datePickerRef.interval || prop.interval) ?? 0,
+        prop.timeKey,
+        fullscreen.value
+            ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+            : prop.timeValue
+    )
+
+    if (Array.isArray(time)) {
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
+        TableHeaderRef.value?.setInterval(time[2] - 0)
+        TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
+    }
+}
+
+watch(
+    () => prop.timeKey,
+    val => {
+        tableStore.index()
+    }
+)
+
+watch(
+    () => prop.timeValue,
+    (newVal, oldVal) => {
+        tableStore.index()
+    },
+    {
+        deep: true
+    }
+)
+</script>
+<style lang="scss" scoped></style>

src/components/cockpit/directionStatistics/index.vue

@@ -1,35 +1,42 @@
 <template>
     <div>
         <!--暂降方向统计 -->
-        <TableHeader :showReset="false" @selectChange="selectChange" datePicker v-if="fullscreen"></TableHeader>
-        <my-echart class="tall" :options="echartList" :style="{ width: prop.width, height: `calc(${prop.height} )` }" />
+        <TableHeader
+            ref="TableHeaderRef"
+            :showReset="false"
+            @selectChange="selectChange"
+            datePicker
+             :timeKeyList="prop.timeKey"
+            v-if="fullscreen"
+        ></TableHeader>
+        <my-echart
+            v-loading="tableStore.table.loading"
+            class="tall"
+            :options="echartList"
+            :style="{ width: prop.width, height: `calc(${prop.height} )` }"
+        />
     </div>
 </template>
 <script setup lang="ts">
 import { ref, onMounted, provide, reactive, watch, h } from 'vue'
 import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
 import MyEchart from '@/components/echarts/MyEchart.vue'
-import { useDictData } from '@/stores/dictData'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getTimeOfTheMonth } from '@/utils/formatTime'
 import TableHeader from '@/components/table/header/index.vue'
-import { useRoute } from 'vue-router'
-import { useTimeCacheStore } from '@/stores/timeCache'
+import { getTime } from '@/utils/formatTime'
 
 const prop = defineProps({
     w: { type: [String, Number] },
     h: { type: [String, Number] },
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-    timeKey: { type: [String, Number] },
-    timeValue: { type: Object }
+   timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
 
 const headerHeight = ref(57)
 
-const route = useRoute()
-const timeCacheStore = useTimeCacheStore()
+const TableHeaderRef = ref()
 
 const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
     headerHeight.value = height
@@ -53,85 +60,99 @@ const fullscreen = computed(() => {
     }
 })
 
-const data = [
-    {
-        name: '来自电网',
-        value: 4
-    },
-    {
-        name: '来自负荷',
-        value: 41
-    }
-]
-const echartList = ref({
-    title: {},
+const echartList = ref({})
 
-    tooltip: {
-        trigger: 'item'
-    },
-    legend: {
-        orient: 'vertical',
-        top: 'center',
-        right: '5%',
-        formatter: function (e: any) {
-            return e + '   ' + data.filter(item => item.name == e)[0].value + '次'
-        }
-    },
-    xAxis: {
-        show: false
-    },
-    yAxis: {
-        show: false
-    },
-    grid: {
-        left: '10px',
-        right: '20px'
-    },
+// const data = [
+//     {
+//         name: '来自电网',
+//         value: 4
+//     },
+//     {
+//         name: '来自负荷',
+//         value: 41
+//     }
+// ]
 
-    options: {
-        dataZoom: null,
-        title: [
-            {
-                text: '暂降方向统计',
-                left: 'center'
-            },
-            {
-                text: data[0].value + data[1].value + '次',
-                left: 'center',
-                top: 'center'
-            }
-        ],
-        series: [
-            {
-                type: 'pie',
-                center: 'center',
-                radius: ['55%', '75%'],
-                label: {
-                    show: false,
-                    position: 'outside',
-                    textStyle: {
-                        //数值样式
-                    }
-                },
-                name: '事件统计',
-                data: data
-            }
-        ]
-    }
-})
 const OverLimitDetailsRef = ref()
 const tableStore: any = new TableStore({
-    url: '/user-boot/dept/deptTree',
+    url: '/cs-harmonic-boot/csevent/getEventDirectionData',
     method: 'POST',
-
     showPage: false,
-
     column: [],
     beforeSearchFun: () => {
-        tableStore.table.params.searchBeginTime = tableStore.table.params.searchBeginTime || prop.timeValue?.[0]
-        tableStore.table.params.searchEndTime = tableStore.table.params.searchEndTime || prop.timeValue?.[1]
+        setTime()
     },
-    loadCallback: () => {}
+    loadCallback: () => {
+        if (!tableStore.table.data || !Array.isArray(tableStore.table.data)) {
+            return []
+        }
+        const chartData = ref(
+            tableStore.table.data.map((item: any) => ({
+                name: item.source === 'load' ? '来自负荷' : '来自电网',
+                value: item.times
+            }))
+        )
+
+        const total = chartData.value.reduce((sum: any, item: any) => sum + item.value, 0)
+
+        echartList.value = {
+            title: {},
+
+            tooltip: {
+                trigger: 'item'
+            },
+            legend: {
+                orient: 'vertical',
+                top: '50',
+                right: '10',
+                formatter: function (name: string) {
+                    const item = chartData.value.find((i: any) => i.name === name)
+                    return item ? `${name}   ${item.value}次` : name
+                }
+            },
+            xAxis: {
+                show: false
+            },
+            yAxis: {
+                show: false
+            },
+            grid: {
+                left: '10px',
+                right: '20px'
+            },
+
+            options: {
+                dataZoom: null,
+                title: [
+                    {
+                        text: '暂降方向统计',
+                        left: 'center'
+                    },
+                    {
+                        text: total + '次',
+                        left: 'center',
+                        top: 'center'
+                    }
+                ],
+                series: [
+                    {
+                        type: 'pie',
+                        center: 'center',
+                        radius: ['55%', '75%'],
+                        label: {
+                            show: false,
+                            position: 'outside',
+                            textStyle: {
+                                //数值样式
+                            }
+                        },
+                        name: '事件统计',
+                        data: chartData.value
+                    }
+                ]
+            }
+        }
+    }
 })
 
 const tableRef = ref()
@@ -139,10 +160,28 @@ provide('tableRef', tableRef)
 
 provide('tableStore', tableStore)
 
+const setTime = () => {
+    const time = getTime(
+        (TableHeaderRef.value?.datePickerRef.interval || prop.interval) ?? 0,
+        prop.timeKey,
+        fullscreen.value
+            ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+            : prop.timeValue
+    )
+
+    if (Array.isArray(time)) {
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
+        TableHeaderRef.value?.setInterval(time[2] - 0)
+        TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
+    }
+}
+
 // 点击行
 const cellClickEvent = ({ row, column }: any) => {
     if (column.field != 'name') {
-        console.log(row)
         OverLimitDetailsRef.value.open(row)
     }
 }
@@ -159,12 +198,7 @@ watch(
 watch(
     () => prop.timeValue,
     (newVal, oldVal) => {
-        // 当外部时间值变化时，更新表格的时间参数
-        if (newVal && (!oldVal || newVal[0] !== oldVal[0] || newVal[1] !== oldVal[1])) {
-            tableStore.table.params.searchBeginTime = newVal[0]
-            tableStore.table.params.searchEndTime = newVal[1]
-            tableStore.index()
-        }
+        tableStore.index()
     },
     {
         deep: true

src/components/cockpit/exceedanceLevel/components/dailyTrendChart.vue

@@ -17,7 +17,7 @@ import { yMethod } from '@/utils/echartMethod'
 const prop = defineProps({
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-    timeKey: { type: [String, Number] },
+   timeKey: { type: Array as () => string[] },
     timeValue: { type: Object }
 })
 

src/components/cockpit/exceedanceLevel/index.vue

@@ -1,7 +1,14 @@
 <template>
     <div>
         <!--指标越限程度 -->
-        <TableHeader :showReset="false" @selectChange="selectChange" datePicker v-if="fullscreen"></TableHeader>
+        <TableHeader
+            ref="TableHeaderRef"
+            :showReset="false"
+            @selectChange="selectChange"
+            datePicker
+             :timeKeyList="prop.timeKey"
+            v-if="fullscreen"
+        ></TableHeader>
         <my-echart
             class="tall"
             :options="echartList"
@@ -25,18 +32,20 @@ import TableHeader from '@/components/table/header/index.vue'
 import MyEchart from '@/components/echarts/MyEchart.vue'
 import { getTimeOfTheMonth } from '@/utils/formatTime'
 import DailyTrendChart from '@/components/cockpit/exceedanceLevel/components/dailyTrendChart.vue'
-import { useRoute } from 'vue-router'
-import { useTimeCacheStore } from '@/stores/timeCache'
+import { getTime } from '@/utils/formatTime'
 
 const prop = defineProps({
     w: { type: [String, Number] },
     h: { type: [String, Number] },
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-    timeKey: { type: [String, Number] },
-    timeValue: { type: Object }
+   timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
 
+const TableHeaderRef = ref()
+
 const headerHeight = ref(57)
 
 const dialogTrendChart = ref(false)
@@ -89,7 +98,7 @@ const tableStore: any = new TableStore({
         {
             title: '越限最大值',
             field: 'maxValue',
-            minWidth: '60',
+            minWidth: '70',
             render: 'customTemplate',
             customTemplate: (row: any) => {
                 const extentValue =
@@ -107,7 +116,7 @@ const tableStore: any = new TableStore({
         {
             title: '越限程度(%)',
             field: 'extent',
-            minWidth: '60',
+            minWidth: '70',
             render: 'customTemplate',
             customTemplate: (row: any) => {
                 // 保留两个小数
@@ -146,8 +155,7 @@ const tableStore: any = new TableStore({
         }
     ],
     beforeSearchFun: () => {
-        tableStore.table.params.searchBeginTime = tableStore.table.params.searchBeginTime || prop.timeValue?.[0]
-        tableStore.table.params.searchEndTime = tableStore.table.params.searchEndTime || prop.timeValue?.[1]
+        setTime()
     },
     loadCallback: () => {
         // 定义 x 轴标签顺序
@@ -207,6 +215,25 @@ const cellClickEvent = ({ row, column }: any) => {
     }
 }
 
+const setTime = () => {
+    const time = getTime(
+        (TableHeaderRef.value?.datePickerRef.interval || prop.interval) ?? 0,
+        prop.timeKey,
+        fullscreen.value
+            ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+            : prop.timeValue
+    )
+
+    if (Array.isArray(time)) {
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
+        TableHeaderRef.value?.setInterval(time[2] - 0)
+        TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
+    }
+}
+
 onMounted(() => {
     tableStore.index()
 })
@@ -219,12 +246,7 @@ watch(
 watch(
     () => prop.timeValue,
     (newVal, oldVal) => {
-        // 当外部时间值变化时，更新表格的时间参数
-        if (newVal && (!oldVal || newVal[0] !== oldVal[0] || newVal[1] !== oldVal[1])) {
-            tableStore.table.params.searchBeginTime = newVal[0]
-            tableStore.table.params.searchEndTime = newVal[1]
-            tableStore.index()
-        }
+        tableStore.index()
     },
     {
         deep: true

src/components/cockpit/governanceReport/index.vue

@@ -1,21 +1,21 @@
 <template>
     <div>
         <!--治理效果报表 -->
-        <TableHeader :showReset="false" datePicker @selectChange="selectChange" v-if="fullscreen">
+        <TableHeader :showReset="false"  :timeKeyList="prop.timeKey" ref="TableHeaderRef" datePicker @selectChange="selectChange" v-if="fullscreen">
             <template v-slot:select>
                 <el-form-item label="报表模板">
-                    <el-select v-model="tableStore.table.params.tempId" placeholder="请选择报表模板" clearable>
+                    <el-select filterable v-model="tableStore.table.params.tempId" placeholder="请选择报表模板" clearable>
                         <el-option v-for="item in templateList" :key="item.id" :label="item.name" :value="item.id" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="监测对象">
-                    <el-select v-model="tableStore.table.params.sensitiveUserId" placeholder="请选择监测对象" clearable>
+                    <el-select filterable v-model="tableStore.table.params.sensitiveUserId" placeholder="请选择监测对象" clearable>
                         <el-option v-for="item in idList" :key="item.id" :label="item.name" :value="item.id" />
                     </el-select>
                 </el-form-item>
             </template>
             <template v-slot:operation>
-                <el-button @click="downloadExcel" class="" type="primary" icon="el-icon-Download">导出excel</el-button>
+                <el-button @click="downloadExcel" class="" type="primary" icon="el-icon-Download">导出</el-button>
             </template>
         </TableHeader>
         <div style="display: flex">
@@ -36,17 +36,20 @@ import { exportExcel } from '@/views/govern/reportForms/export.js'
 import TableHeader from '@/components/table/header/index.vue'
 import { getTemplateList } from '@/api/harmonic-boot/luckyexcel'
 import { getListByIds } from '@/api/harmonic-boot/cockpit/cockpit'
-import Json from './index.json'
+import { getTime } from '@/utils/formatTime'
 
 const prop = defineProps({
     w: { type: [String, Number] },
     h: { type: [String, Number] },
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-    timeKey: { type: [String, Number] },
-    timeValue: { type: Object }
+   timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
 
+const TableHeaderRef = ref()
+
 // 报表模板列表
 const templateList = ref()
 
@@ -69,7 +72,7 @@ const initListByIds = () => {
 
 const templateListData = () => {
     getTemplateList({}).then(res => {
-        templateList.value = res.data
+        templateList.value = res.data.filter(item => item.name === '稳态治理报表')
         if (!tableStore.table.params.tempId && templateList.value?.length > 0) {
             tableStore.table.params.tempId = templateList.value[0].id
         }
@@ -114,8 +117,7 @@ const tableStore: any = new TableStore({
     exportName: '治理效果报表',
     column: [],
     beforeSearchFun: () => {
-        tableStore.table.params.searchBeginTime = tableStore.table.params.searchBeginTime || prop.timeValue?.[0]
-        tableStore.table.params.searchEndTime = tableStore.table.params.searchEndTime || prop.timeValue?.[1]
+        setTime()
         if (!tableStore.table.params.sensitiveUserId && idList.value?.length > 0) {
             tableStore.table.params.sensitiveUserId = idList.value[0].id
         }
@@ -142,6 +144,27 @@ provide('tableRef', tableRef)
 
 provide('tableStore', tableStore)
 
+const setTime = () => {
+    const time = getTime(
+        (TableHeaderRef.value?.datePickerRef.interval || prop.interval) ?? 0,
+        prop.timeKey,
+        fullscreen.value
+            ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+            : prop.timeValue
+    )
+
+    if (Array.isArray(time)) {
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
+        tableStore.table.params.startTime = time[0]
+        tableStore.table.params.endTime = time[1]
+        TableHeaderRef.value?.setInterval(time[2] - 0)
+        TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
+    }
+}
+
 watch(
     () => prop.timeKey,
     val => {
@@ -151,12 +174,7 @@ watch(
 watch(
     () => prop.timeValue,
     (newVal, oldVal) => {
-        // 当外部时间值变化时，更新表格的时间参数
-        if (newVal && (!oldVal || newVal[0] !== oldVal[0] || newVal[1] !== oldVal[1])) {
-            tableStore.table.params.searchBeginTime = newVal[0]
-            tableStore.table.params.searchEndTime = newVal[1]
-            tableStore.index()
-        }
+        tableStore.index()
     },
     {
         deep: true

src/components/cockpit/gridSideStatistics/components/harmonicRatio‌.vue

@@ -16,6 +16,7 @@
                             v-model="searchForm.index"
                             placeholder="请选择统计指标"
                             @change="onIndexChange($event)"
+                            filterable
                         >
                             <el-option
                                 v-for="item in indexOptions"
@@ -36,6 +37,7 @@
                             style="min-width: 120px !important"
                             placeholder="请选择"
                             v-model="searchForm.valueType"
+                            filterable
                         >
                             <el-option value="max" label="最大值"></el-option>
                             <el-option value="min" label="最小值"></el-option>
@@ -59,6 +61,7 @@
                                 placeholder="请选择谐波次数"
                                 style="width: 100px"
                                 class="mr20"
+                                filterable
                             >
                                 <el-option
                                     v-for="vv in item.countOptions"

src/components/cockpit/gridSideStatistics/components/overLimitDetails.vue

@@ -9,6 +9,7 @@
                             v-model="tableStore.table.params.lineId"
                             placeholder="请选择监测点"
                             style="width: 150px"
+                            filterable
                         >
                             <el-option
                                 v-for="item in options"
@@ -48,7 +49,7 @@ const loop50 = (key: string) => {
         list.push({
             title: i + '次',
             field: key + i + 'Overtime',
-            width: '80',
+            width: '60',
             render: 'customTemplate',
             customTemplate: (row: any) => {
                 return `<span style='cursor: pointer;text-decoration: underline;'>${row[key + i + 'Overtime']}</span>`
@@ -86,7 +87,7 @@ const tableStore: any = new TableStore({
         {
             title: '闪变越限(%)',
             field: 'flickerOvertime',
-            width: '80',
+            width: '90',
             render: 'customTemplate',
             customTemplate: (row: any) => {
                 return `<span style='cursor: pointer;text-decoration: underline;'>${row.flickerOvertime}</span>`

src/components/cockpit/gridSideStatistics/index.vue

@@ -1,7 +1,13 @@
 <template>
     <div>
         <!--电网侧指标越限统计 -->
-        <TableHeader :showReset="false" @selectChange="selectChange" datePicker v-if="fullscreen"></TableHeader>
+        <TableHeader
+            :showReset="false"
+            ref="TableHeaderRef"
+            @selectChange="selectChange"
+            datePicker  :timeKeyList="prop.timeKey"
+            v-if="fullscreen"
+        ></TableHeader>
         <my-echart
             class="tall"
             :options="echartList"
@@ -27,23 +33,25 @@ import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import MyEchart from '@/components/echarts/MyEchart.vue'
 import OverLimitDetails from '@/components/cockpit/gridSideStatistics/components/overLimitDetails.vue'
-import { useRoute } from 'vue-router'
-import { useTimeCacheStore } from '@/stores/timeCache'
 import { gridSideLimitStatisticsData } from '@/api/harmonic-boot/cockpit/cockpit'
+import { getTime } from '@/utils/formatTime'
 
 const prop = defineProps({
     w: { type: [String, Number] },
     h: { type: [String, Number] },
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-    timeKey: { type: [String, Number] },
-    timeValue: { type: Object }
+   timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
 
 const headerHeight = ref(57)
 
 const echartList = ref({})
 
+const TableHeaderRef = ref()
+
 const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
     headerHeight.value = height
 
@@ -188,8 +196,7 @@ const tableStore: any = new TableStore({
         }
     ],
     beforeSearchFun: () => {
-        tableStore.table.params.searchBeginTime = tableStore.table.params.searchBeginTime || prop.timeValue?.[0]
-        tableStore.table.params.searchEndTime = tableStore.table.params.searchEndTime || prop.timeValue?.[1]
+        setTime()
     },
     loadCallback: () => {
         tableStore.table.height = `calc(${prop.height} - 80px)`
@@ -216,6 +223,25 @@ const cellClickEvent = ({ row, column }: any) => {
 onMounted(() => {
     tableStore.index()
 })
+
+const setTime = () => {
+    const time = getTime(
+        (TableHeaderRef.value?.datePickerRef.interval || prop.interval) ?? 0,
+        prop.timeKey,
+        fullscreen.value
+            ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+            : prop.timeValue
+    )
+
+    if (Array.isArray(time)) {
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
+        TableHeaderRef.value?.setInterval(time[2] - 0)
+        TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
+    }
+}
 watch(
     () => prop.timeKey,
     val => {
@@ -226,12 +252,7 @@ watch(
 watch(
     () => prop.timeValue,
     (newVal, oldVal) => {
-        // 当外部时间值变化时，更新表格的时间参数
-        if (newVal && (!oldVal || newVal[0] !== oldVal[0] || newVal[1] !== oldVal[1])) {
-            tableStore.table.params.searchBeginTime = newVal[0]
-            tableStore.table.params.searchEndTime = newVal[1]
-            tableStore.index()
-        }
+        tableStore.index()
     },
     {
         deep: true

src/components/cockpit/indicatorCrossingTime/index.vue

@@ -0,0 +1,463 @@
+<template>
+    <div>
+        <!--指标越限时间分布
+         -->
+        <TableHeader :showReset="false"  :timeKeyList="prop.timeKey" ref="TableHeaderRef" @selectChange="selectChange" datePicker v-if="fullscreen">
+            <template v-slot:select>
+                <el-form-item label="监测点">
+                    <el-select size="small" filterable v-model="tableStore.table.params.lineId">
+                        <el-option
+                            v-for="item in lineList"
+                            :key="item.lineId"
+                            :label="item.name"
+                            :value="item.lineId"
+                        />
+                    </el-select>
+                </el-form-item>
+            </template>
+        </TableHeader>
+        <div v-loading="tableStore.table.loading">
+            <my-echart
+                class="tall"
+                :options="echartList1"
+                :style="{
+                    width: prop.width,
+                      height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px)`
+                }"
+            />
+            <!-- <my-echart
+                class="mt10"
+                :options="echartList1"
+                :style="{
+                    width: prop.width,
+                    height: `calc(${prop.height} / 2 - ${headerHeight / 2}px + ${fullscreen ? 0 : 28}px )`
+                }"
+            /> -->
+        </div>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, reactive, watch, h } from 'vue'
+import TableStore from '@/utils/tableStore'
+import TableHeader from '@/components/table/header/index.vue'
+import MyEchart from '@/components/echarts/MyEchart.vue'
+import { limitProbabilityData, cslineList } from '@/api/harmonic-boot/cockpit/cockpit'
+import { getTime } from '@/utils/formatTime'
+
+const prop = defineProps({
+    w: { type: [String, Number] },
+    h: { type: [String, Number] },
+    width: { type: [String, Number] },
+    height: { type: [String, Number] },
+   timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
+})
+
+// const options = ref(JSON.parse(window.localStorage.getItem('lineIdList') || '[]'))
+
+const lineList = ref()
+
+const headerHeight = ref(57)
+
+const TableHeaderRef = ref()
+
+const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
+    headerHeight.value = height
+
+    if (datePickerValue && datePickerValue.timeValue) {
+        // 更新时间参数
+        tableStore.table.params.searchBeginTime = datePickerValue.timeValue[0]
+        tableStore.table.params.searchEndTime = datePickerValue.timeValue[1]
+    }
+}
+
+// 计算是否全屏展示
+const fullscreen = computed(() => {
+    const w = Number(prop.w)
+    const h = Number(prop.h)
+    if (!isNaN(w) && !isNaN(h) && w === 12 && h === 6) {
+        // 执行相应逻辑
+        return true
+    } else {
+        return false
+    }
+})
+
+const echartList = ref()
+
+const echartList1 = ref()
+
+const probabilityData = ref()
+
+const initLineList = async () => {
+    cslineList({}).then(res => {
+        lineList.value = res.data
+        tableStore.table.params.lineId = lineList.value[0].lineId
+        tableStore.index()
+    })
+}
+
+// 越限程度概率分布
+const initProbabilityData = () => {
+    // 只有当 lineList 已加载且有数据时才设置默认 lineId
+    if (!tableStore.table.params.lineId && lineList.value && lineList.value.length > 0) {
+        tableStore.table.params.lineId = lineList.value[0].lineId
+    }
+    const params = {
+        searchBeginTime: tableStore.table.params.searchBeginTime || prop.timeValue?.[0],
+        searchEndTime: tableStore.table.params.searchEndTime || prop.timeValue?.[1],
+        lineId: tableStore.table.params.lineId
+    }
+    limitProbabilityData(params).then((res: any) => {
+        probabilityData.value = res.data
+
+        // 处理接口返回的数据，转换为图表所需格式
+        if (res.data && Array.isArray(res.data)) {
+            // 定义指标类型顺序
+            const indicatorOrder = ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相电压不平衡度', '频率偏差']
+            // 按照指定顺序排序数据
+            const sortedData = [...res.data].sort((a, b) => {
+                return indicatorOrder.indexOf(a.indexName) - indicatorOrder.indexOf(b.indexName)
+            })
+
+            // 构造 series 数据
+            const seriesData: any = []
+            let maxValue: any = 0 // 用于存储数据中的最大值
+            // 遍历每个越限程度区间（0-20%, 20-40%, 40-60%, 60-80%, 80-100%）
+            for (let xIndex = 0; xIndex < 5; xIndex++) {
+                // 遍历每个指标类型
+                sortedData.forEach((item, yIndex) => {
+                    // 从 extentGrades 中获取对应区间的值
+                    const extentGrade = item.extentGrades[xIndex]
+                    const value = extentGrade ? (Object.values(extentGrade)[0] as number) : 0
+                    seriesData.push([xIndex, yIndex, value])
+
+                    // 更新最大值
+                    if (value > maxValue) {
+                        maxValue = value
+                    }
+                })
+            }
+
+            // 计算 z 轴最大值（最大值加 5）
+            const zAxisMax = Math.ceil(maxValue) + 5
+            // 构造 yAxis 数据（指标类型名称）
+            const yAxisData = sortedData.map(item => item.indexName)
+
+            echartList.value = {
+                options: {
+                    backgroundColor: '#fff',
+                    tooltip: {
+                        textStyle: {
+                            color: '#fff',
+                            fontStyle: 'normal',
+                            opacity: 0.35,
+                            fontSize: 14
+                        },
+                        backgroundColor: 'rgba(0,0,0,0.55)',
+                        borderWidth: 0,
+                        formatter: function (params: any) {
+                            var yIndex = params.value[1] //获取y轴索引
+                            var tips = ''
+                            tips += '指标类型: ' + yAxisData[yIndex] + '</br>'
+                            tips += '越限程度: ' + params.seriesName + '</br>'
+                            tips += '越限次数: ' + params.value[2] + '</br>'
+                            return tips
+                        }
+                    },
+                    title: {
+                        text: '指标越限概率分布',
+                        x: 'center',
+                        textStyle: {
+                            fontSize: 16,
+                            fontWeight: 'normal'
+                        }
+                    },
+                    // 移除或隐藏 visualMap 组件
+                    visualMap: {
+                        show: false, // 设置为 false 隐藏右侧颜色条
+                        min: 0,
+                        // max: 100,
+                        max: zAxisMax, // 使用计算出的最大值加5
+                        inRange: {
+                            color: ['#313695', '#00BB00', '#ff8000', '#d73027', '#a50026']
+                        }
+                    },
+                    // 添加 legend 配置并设置为不显示
+                    legend: {
+                        show: false // 隐藏图例
+                    },
+                    xAxis3D: {
+                        type: 'category',
+                        name: '越限程度',
+                        nameLocation: 'middle',
+                        nameGap: 50,
+                        data: ['0-20%', '20-40%', '40-60%', '60-80%', '80-100%']
+                    },
+                    yAxis3D: {
+                        type: 'category',
+                        name: '指标类型',
+                        nameLocation: 'middle',
+                        nameGap: 50,
+                        data: yAxisData,
+
+                        splitLine: {
+                            lineStyle: {
+                                type: 'dashed',
+                                opacity: 0.5
+                            }
+                        }
+                    },
+                    zAxis3D: {
+                        type: 'value',
+                        name: '越限次数',
+                        nameLocation: 'middle',
+                        nameGap: 30,
+                        minInterval: 10
+
+                        // max: 100
+                    },
+                    grid3D: {
+                        viewControl: {
+                            projection: 'perspective',
+                            distance: 260,
+                            rotateSensitivity: 10,
+                            zoomSensitivity: 2
+                        },
+                        boxWidth: 150,
+                        boxDepth: 100,
+                        boxHeight: 100,
+                        light: {
+                            main: {
+                                intensity: 1.2
+                            },
+                            ambient: {
+                                intensity: 0.4
+                            }
+                        }
+                    },
+                    series: [
+                        {
+                            type: 'bar3D',
+                            name: '0-20%',
+                            data: seriesData.filter((item: any) => item[0] === 0),
+                            shading: 'realistic',
+                            label: {
+                                show: false
+                            },
+                            itemStyle: {
+                                opacity: 0.9
+                            },
+                            emphasis: {
+                                label: {
+                                    show: true,
+                                    textStyle: {
+                                        fontSize: 14,
+                                        color: '#000'
+                                    }
+                                },
+                                itemStyle: {
+                                    color: '#ff8000'
+                                }
+                            }
+                        },
+                        {
+                            type: 'bar3D',
+                            name: '20-40%',
+                            data: seriesData.filter((item: any) => item[0] === 1),
+                            shading: 'realistic',
+                            label: {
+                                show: false
+                            },
+                            itemStyle: {
+                                opacity: 0.9
+                            },
+                            emphasis: {
+                                label: {
+                                    show: true,
+                                    textStyle: {
+                                        fontSize: 14,
+                                        color: '#000'
+                                    }
+                                },
+                                itemStyle: {
+                                    color: '#ff8000'
+                                }
+                            }
+                        },
+                        {
+                            type: 'bar3D',
+                            name: '40-60%',
+                            data: seriesData.filter((item: any) => item[0] === 2),
+                            shading: 'realistic',
+                            label: {
+                                show: false
+                            },
+                            itemStyle: {
+                                opacity: 0.9
+                            },
+                            emphasis: {
+                                label: {
+                                    show: true,
+                                    textStyle: {
+                                        fontSize: 14,
+                                        color: '#000'
+                                    }
+                                },
+                                itemStyle: {
+                                    color: '#ff8000'
+                                }
+                            }
+                        },
+                        {
+                            type: 'bar3D',
+                            name: '60-80%',
+                            data: seriesData.filter((item: any) => item[0] === 3),
+                            shading: 'realistic',
+                            label: {
+                                show: false
+                            },
+                            itemStyle: {
+                                opacity: 0.9
+                            },
+                            emphasis: {
+                                label: {
+                                    show: true,
+                                    textStyle: {
+                                        fontSize: 14,
+                                        color: '#000'
+                                    }
+                                },
+                                itemStyle: {
+                                    color: '#ff8000'
+                                }
+                            }
+                        },
+                        {
+                            type: 'bar3D',
+                            name: '80-100%',
+                            data: seriesData.filter((item: any) => item[0] === 4),
+                            shading: 'realistic',
+                            label: {
+                                show: false
+                            },
+                            itemStyle: {
+                                opacity: 0.9
+                            },
+                            emphasis: {
+                                label: {
+                                    show: true,
+                                    textStyle: {
+                                        fontSize: 14,
+                                        color: '#000'
+                                    }
+                                },
+                                itemStyle: {
+                                    color: '#ff8000'
+                                }
+                            }
+                        }
+                    ]
+                }
+            }
+        }
+    })
+}
+
+const tableStore: any = new TableStore({
+    url: '/cs-harmonic-boot/limitRateDetailD/limitTimeProbabilityData',
+    method: 'POST',
+    showPage: false,
+    column: [],
+    beforeSearchFun: () => {
+        setTime()
+        // 只有当 lineList 已加载且有数据时才设置默认 lineId
+        if (!tableStore.table.params.lineId && lineList.value && lineList.value.length > 0) {
+            tableStore.table.params.lineId = lineList.value[0].lineId
+        }
+    },
+    loadCallback: () => {
+        // 处理返回的数据，将其转换为图表所需格式
+        const indexNames: any = [...new Set(tableStore.table.data.map((item: any) => item.indexName))]
+        const timePeriods = [...new Set(tableStore.table.data.map((item: any) => item.timePeriod))]
+
+        // 构建系列数据
+        const seriesData = indexNames.map((indexName: string) => {
+            const dataIndex = tableStore.table.data.filter((item: any) => item.indexName === indexName)
+            return {
+                name: indexName,
+                type: 'line',
+                symbol: 'none',
+                data: dataIndex.map((item: any) => [item.timePeriod, item.times])
+            }
+        })
+
+        echartList1.value = {
+            title: {
+                text: '指标越限时间概率分布'
+            },
+            tooltip: {
+                trigger: 'axis'
+            },
+            legend: {
+                data: indexNames
+            },
+            xAxis: {
+                type: 'category',
+                name: '时间段',
+                data: timePeriods
+            },
+            yAxis: {
+                type: 'value'
+                // name: '次数'
+            },
+            series: seriesData
+        }
+        initProbabilityData()
+    }
+})
+
+provide('tableStore', tableStore)
+
+onMounted(() => {
+    initLineList()
+})
+
+const setTime = () => {
+    const time = getTime(
+        (TableHeaderRef.value?.datePickerRef.interval || prop.interval) ?? 0,
+        prop.timeKey,
+        fullscreen.value
+            ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+            : prop.timeValue
+    )
+
+    if (Array.isArray(time)) {
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
+        TableHeaderRef.value?.setInterval(time[2] - 0)
+        TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
+    }
+}
+watch(
+    () => prop.timeKey,
+    val => {
+        tableStore.index()
+    }
+)
+watch(
+    () => prop.timeValue,
+    (newVal, oldVal) => {
+        tableStore.index()
+    },
+    {
+        deep: true
+    }
+)
+
+const addMenu = () => {}
+</script>
+<style lang="scss" scoped></style>

src/components/cockpit/indicatorDetails/index.vue

@@ -5,9 +5,9 @@
             :showReset="false"
             ref="TableHeaderRef"
             @selectChange="selectChange"
-            datePicker
+            datePicker 
             v-if="fullscreen"
-            :timeCacheFlag="false"
+            :timeKeyList="prop.timeKey"
         ></TableHeader>
         <el-calendar
             v-model="value"
@@ -32,7 +32,7 @@
                         <template #content>
                             <span v-html="getTextForDate(data.day)"></span>
                         </template>
-                        <div class="details" v-html="getTextForDate(data.day)"></div>
+                         <div class="details" v-html="fullscreen ? getTextForDate(data.day) : '有越限'"></div>
                     </el-tooltip>
                 </div>
             </template>
@@ -44,14 +44,16 @@ import { ref, onMounted, provide, reactive, watch, h } from 'vue'
 import TableStore from '@/utils/tableStore'
 import TableHeader from '@/components/table/header/index.vue'
 import { dayjs } from 'element-plus'
+import { getTime } from '@/utils/formatTime'
 
 const prop = defineProps({
     w: { type: [String, Number] },
     h: { type: [String, Number] },
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-    timeKey: { type: [String, Number] },
-    timeValue: { type: Object }
+   timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
 
 const headerHeight = ref(57)
@@ -96,10 +98,7 @@ const tableStore: any = new TableStore({
     showPage: false,
     column: [],
     beforeSearchFun: () => {
-        if (!fullscreen.value && prop.timeValue && Array.isArray(prop.timeValue)) {
-            tableStore.table.params.searchBeginTime = prop.timeValue[0]
-            tableStore.table.params.searchEndTime = prop.timeValue[1]
-        }
+        setTime()
     },
     loadCallback: () => {
         value.value = tableStore.table.params.searchBeginTime
@@ -144,35 +143,34 @@ provide('tableStore', tableStore)
 
 onMounted(() => {
     nextTick(() => {
-        if (TableHeaderRef.value && typeof TableHeaderRef.value.setDatePicker === 'function') {
-            TableHeaderRef.value.setDatePicker([{ label: '月份', value: 3 }])
-        }
-        if (fullscreen.value) {
-            TableHeaderRef.value.setInterval(3)
-        }
         tableStore.index()
     })
 })
-watch(
-    () => prop.timeKey,
-    val => {
-        tableStore.index()
+
+const setTime = () => {
+    const time = getTime(
+        (TableHeaderRef.value?.datePickerRef.interval || prop.interval) ?? 0,
+        prop.timeKey,
+        fullscreen.value
+            ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+            : prop.timeValue
+    )
+    if (Array.isArray(time)) {
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
+        TableHeaderRef.value?.setInterval(time[2] - 0)
+        TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
     }
-)
+}
+
+
 watch(
     () => prop.timeValue,
-    // (newVal, oldVal) => {
-    //     // 当外部时间值变化时，更新表格的时间参数
-    //     if (newVal && (!oldVal || newVal[0] !== oldVal[0] || newVal[1] !== oldVal[1])) {
-    //         tableStore.table.params.searchBeginTime = newVal[0]
-    //         tableStore.table.params.searchEndTime = newVal[1]
-    //         tableStore.index()
-    //     }
-    // },
-    val => {
+    (newVal, oldVal) => {
         tableStore.index()
     },
-
     {
         deep: true
     }

src/components/cockpit/indicatorDistribution/index.vue

@@ -1,10 +1,10 @@
 <template>
     <div>
         <!--指标越限概率分布 -->
-        <TableHeader :showReset="false" @selectChange="selectChange" datePicker v-if="fullscreen">
+        <TableHeader :showReset="false"  :timeKeyList="prop.timeKey" ref="TableHeaderRef" @selectChange="selectChange" datePicker v-if="fullscreen">
             <template v-slot:select>
                 <el-form-item label="监测点">
-                    <el-select size="small" v-model="tableStore.table.params.lineId">
+                    <el-select size="small" filterable v-model="tableStore.table.params.lineId">
                         <el-option
                             v-for="item in lineList"
                             :key="item.lineId"
@@ -21,17 +21,17 @@
                 :options="echartList"
                 :style="{
                     width: prop.width,
-                    height: `calc(${prop.height} / 2 - ${headerHeight / 2}px + ${fullscreen ? 0 : 28}px )`
+                      height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px)`
                 }"
             />
-            <my-echart
+            <!-- <my-echart
                 class="mt10"
                 :options="echartList1"
                 :style="{
                     width: prop.width,
                     height: `calc(${prop.height} / 2 - ${headerHeight / 2}px + ${fullscreen ? 0 : 28}px )`
                 }"
-            />
+            /> -->
         </div>
     </div>
 </template>
@@ -41,14 +41,16 @@ import TableStore from '@/utils/tableStore'
 import TableHeader from '@/components/table/header/index.vue'
 import MyEchart from '@/components/echarts/MyEchart.vue'
 import { limitProbabilityData, cslineList } from '@/api/harmonic-boot/cockpit/cockpit'
+import { getTime } from '@/utils/formatTime'
 
 const prop = defineProps({
     w: { type: [String, Number] },
     h: { type: [String, Number] },
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-    timeKey: { type: [String, Number] },
-    timeValue: { type: Object }
+   timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
 
 // const options = ref(JSON.parse(window.localStorage.getItem('lineIdList') || '[]'))
@@ -57,6 +59,8 @@ const lineList = ref()
 
 const headerHeight = ref(57)
 
+const TableHeaderRef = ref()
+
 const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
     headerHeight.value = height
 
@@ -187,43 +191,18 @@ const initProbabilityData = () => {
                         type: 'category',
                         name: '越限程度',
                         nameLocation: 'middle',
-                        nameGap: 30,
-                        data: ['0-20%', '20-40%', '40-60%', '60-80%', '80-100%'],
-                        axisLine: {
-                            lineStyle: {
-                                color: '#111'
-                            }
-                        },
-                        axisLabel: {
-                            color: '#111',
-                            margin: 15
-                        },
-                        nameTextStyle: {
-                            color: '#111'
-                        }
+                        nameGap: 50,
+                        data: ['0-20%', '20-40%', '40-60%', '60-80%', '80-100%']
                     },
                     yAxis3D: {
                         type: 'category',
                         name: '指标类型',
                         nameLocation: 'middle',
-                        nameGap: 30,
+                        nameGap: 50,
                         data: yAxisData,
-                        nameTextStyle: {
-                            color: '#111'
-                        },
-                        axisLine: {
-                            show: true,
-                            lineStyle: {
-                                color: '#111'
-                            }
-                        },
-                        axisLabel: {
-                            color: '#111',
-                            margin: 15
-                        },
+
                         splitLine: {
                             lineStyle: {
-                                color: ['#111'],
                                 type: 'dashed',
                                 opacity: 0.5
                             }
@@ -234,25 +213,14 @@ const initProbabilityData = () => {
                         name: '越限次数',
                         nameLocation: 'middle',
                         nameGap: 30,
-                        nameTextStyle: {
-                            color: '#111'
-                        },
-                        axisLine: {
-                            lineStyle: {
-                                color: '#111'
-                            }
-                        },
-                        axisLabel: {
-                            color: '#111'
-                        },
-                        min: 0,
-                        max: zAxisMax // 使用计算出的最大值加5
+                        minInterval: 10
+
                         // max: 100
                     },
                     grid3D: {
                         viewControl: {
                             projection: 'perspective',
-                            distance: 250,
+                            distance: 260,
                             rotateSensitivity: 10,
                             zoomSensitivity: 2
                         },
@@ -402,8 +370,7 @@ const tableStore: any = new TableStore({
     showPage: false,
     column: [],
     beforeSearchFun: () => {
-        tableStore.table.params.searchBeginTime = tableStore.table.params.searchBeginTime || prop.timeValue?.[0]
-        tableStore.table.params.searchEndTime = tableStore.table.params.searchEndTime || prop.timeValue?.[1]
+        setTime()
         // 只有当 lineList 已加载且有数据时才设置默认 lineId
         if (!tableStore.table.params.lineId && lineList.value && lineList.value.length > 0) {
             tableStore.table.params.lineId = lineList.value[0].lineId
@@ -427,7 +394,7 @@ const tableStore: any = new TableStore({
 
         echartList1.value = {
             title: {
-                text: '越限时间概率分布'
+                text: '指标越限时间概率分布'
             },
             tooltip: {
                 trigger: 'axis'
@@ -455,6 +422,25 @@ provide('tableStore', tableStore)
 onMounted(() => {
     initLineList()
 })
+
+const setTime = () => {
+    const time = getTime(
+        (TableHeaderRef.value?.datePickerRef.interval || prop.interval) ?? 0,
+        prop.timeKey,
+        fullscreen.value
+            ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+            : prop.timeValue
+    )
+
+    if (Array.isArray(time)) {
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
+        TableHeaderRef.value?.setInterval(time[2] - 0)
+        TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
+    }
+}
 watch(
     () => prop.timeKey,
     val => {
@@ -464,12 +450,7 @@ watch(
 watch(
     () => prop.timeValue,
     (newVal, oldVal) => {
-        // 当外部时间值变化时，更新表格的时间参数
-        if (newVal && (!oldVal || newVal[0] !== oldVal[0] || newVal[1] !== oldVal[1])) {
-            tableStore.table.params.searchBeginTime = newVal[0]
-            tableStore.table.params.searchEndTime = newVal[1]
-            tableStore.index()
-        }
+        tableStore.index()
     },
     {
         deep: true

src/components/cockpit/indicatorFittingChart/components/harmonicRatio‌.vue

@@ -16,6 +16,7 @@
                             v-model="searchForm.index"
                             placeholder="请选择统计指标"
                             @change="onIndexChange($event)"
+                            filterable
                         >
                             <el-option
                                 v-for="item in indexOptions"
@@ -36,6 +37,7 @@
                             style="min-width: 120px !important"
                             placeholder="请选择"
                             v-model="searchForm.valueType"
+                            filterable
                         >
                             <el-option value="max" label="最大值"></el-option>
                             <el-option value="min" label="最小值"></el-option>
@@ -59,6 +61,7 @@
                                 placeholder="请选择谐波次数"
                                 style="width: 100px"
                                 class="mr20"
+                                filterable
                             >
                                 <el-option
                                     v-for="vv in item.countOptions"

src/components/cockpit/indicatorFittingChart/components/overLimitDetails.vue

@@ -9,6 +9,7 @@
                             v-model="tableStore.table.params.lineId"
                             placeholder="请选择监测点"
                             style="width: 150px"
+                            filterable
                         >
                             <el-option
                                 v-for="item in options"
@@ -53,7 +54,7 @@ const loop50 = (key: string) => {
         list.push({
             title: i + '次',
             field: key + i + 'Overtime',
-            width: '80',
+            width: '60',
             render: 'customTemplate',
             customTemplate: (row: any) => {
                 return `<span style='cursor: pointer;text-decoration: underline;'>${row[key + i + 'Overtime']}</span>`
@@ -91,7 +92,7 @@ const tableStore: any = new TableStore({
         {
             title: '闪变越限(分钟)',
             field: 'flickerOvertime',
-            width: '80',
+            width: '90',
             render: 'customTemplate',
             customTemplate: (row: any) => {
                 return `<span style='cursor: pointer;text-decoration: underline;'>${row.flickerOvertime}</span>`

src/components/cockpit/indicatorFittingChart/index.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
         <!--主要监测点列表 -->
-        <TableHeader :showReset="false" @selectChange="selectChange" v-if="fullscreen" datePicker ref="tableHeaderRef">
+        <TableHeader :showReset="false"  :timeKeyList="prop.timeKey" @selectChange="selectChange" v-if="fullscreen" datePicker ref="TableHeaderRef">
             <template v-slot:select>
                 <el-form-item label="关键词">
                     <el-input v-model="tableStore.table.params.keywords" clearable placeholder="请输关键字" />
@@ -22,19 +22,19 @@ import { ref, onMounted, provide, reactive, watch, nextTick } from 'vue'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
-import { getTimeOfTheMonth } from '@/utils/formatTime'
+import { getTime } from '@/utils/formatTime'
 import OverLimitDetails from '@/components/cockpit/indicatorFittingChart/components/overLimitDetails.vue'
 import { useRoute } from 'vue-router'
 import { useTimeCacheStore } from '@/stores/timeCache'
-import { log } from 'console'
 
 const prop = defineProps({
     w: { type: [String, Number] },
     h: { type: [String, Number] },
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-    timeKey: { type: [String, Number] },
-    timeValue: { type: Object }
+   timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
 const OverLimitDetailsRef = ref()
 const headerHeight = ref(57)
@@ -42,7 +42,7 @@ const headerHeight = ref(57)
 const route = useRoute()
 const timeCacheStore = useTimeCacheStore()
 
-const tableHeaderRef = ref()
+const TableHeaderRef = ref()
 
 // 计算是否全屏展示
 const fullscreen = computed(() => {
@@ -104,8 +104,7 @@ const tableStore: any = new TableStore({
         { title: '主要存在的电能质量问题', field: 'problems', minWidth: '150', showOverflow: true }
     ],
     beforeSearchFun: () => {
-        tableStore.table.params.searchBeginTime = tableStore.table.params.searchBeginTime || prop.timeValue?.[0]
-        tableStore.table.params.searchEndTime = tableStore.table.params.searchEndTime || prop.timeValue?.[1]
+       setTime()
     },
     loadCallback: () => {
         tableStore.table.height = `calc(${prop.height} - 80px)`
@@ -128,25 +127,34 @@ const cellClickEvent = ({ row, column }: any) => {
     }
 }
 
+const setTime = () => {
+    const time = getTime(
+        (TableHeaderRef.value?.datePickerRef.interval || prop.interval) ?? 0,
+        prop.timeKey,
+        fullscreen.value
+            ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+            : prop.timeValue
+    )
+
+    if (Array.isArray(time)) {
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
+        // TableHeaderRef.value?.setInterval(time[2] - 0)
+        // TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
+    }
+}
+
 // 在组件挂载时设置缓存值到 DatePicker
 onMounted(() => {
     tableStore.index()
 })
-watch(
-    () => prop.timeKey,
-    val => {
-        tableStore.index()
-    }
-)
+
 watch(
     () => prop.timeValue,
     (newVal, oldVal) => {
-        // 当外部时间值变化时，更新表格的时间参数
-        if (newVal && (!oldVal || newVal[0] !== oldVal[0] || newVal[1] !== oldVal[1])) {
-            tableStore.table.params.searchBeginTime = newVal[0]
-            tableStore.table.params.searchEndTime = newVal[1]
-            tableStore.index()
-        }
+        tableStore.index()
     },
     {
         deep: true

src/components/cockpit/listOfMainMonitoringPoints/index.vue

@@ -1,10 +1,16 @@
 <template>
     <div>
         <!--指标拟合图 -->
-        <TableHeader datePicker @selectChange="selectChange" v-if="fullscreen">
+        <TableHeader
+            datePicker
+            @selectChange="selectChange"
+            v-if="fullscreen"
+            ref="TableHeaderRef" 
+            :timeKeyList="prop.timeKey"
+        >
             <template v-slot:select>
                 <el-form-item label="监测点">
-                    <el-select v-model="tableStore.table.params.lineId" placeholder="请选择监测点" clearable>
+                    <el-select filterable v-model="tableStore.table.params.lineId" placeholder="请选择监测点" clearable>
                         <el-option
                             v-for="item in lineList"
                             :key="item.lineId"
@@ -14,7 +20,12 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="用户功率">
-                    <el-select v-model="tableStore.table.params.power" placeholder="请选择用户功率" clearable>
+                    <el-select
+                        filterable
+                        v-model="tableStore.table.params.power"
+                        placeholder="请选择用户功率"
+                        clearable
+                    >
                         <el-option v-for="item in powerList" :key="item.id" :label="item.name" :value="item.id" />
                     </el-select>
                 </el-form-item>
@@ -23,6 +34,7 @@
                         style="min-width: 120px !important"
                         placeholder="请选择"
                         v-model="tableStore.table.params.valueType"
+                        filterable
                     >
                         <el-option value="max" label="最大值"></el-option>
                         <el-option value="min" label="最小值"></el-option>
@@ -31,7 +43,12 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="电能质量指标">
-                    <el-select v-model="tableStore.table.params.indicator" placeholder="请选择电能质量指标" clearable>
+                    <el-select
+                        filterable
+                        v-model="tableStore.table.params.indicator"
+                        placeholder="请选择电能质量指标"
+                        clearable
+                    >
                         <el-option v-for="item in indicatorList" :key="item.id" :label="item.name" :value="item.id" />
                     </el-select>
                 </el-form-item>
@@ -42,6 +59,7 @@
                             v-model="tableStore.table.params.harmonicCount"
                             placeholder="请选择谐波次数"
                             style="min-width: 80px !important"
+                            filterable
                         >
                             <el-option
                                 v-for="num in harmonicCountOptions"
@@ -75,24 +93,26 @@ import { useConfig } from '@/stores/config'
 import { cslineList, fittingData } from '@/api/harmonic-boot/cockpit/cockpit'
 import { queryByCode, queryCsDictTree } from '@/api/system-boot/dictTree'
 import { ElMessage } from 'element-plus'
+import { getTime } from '@/utils/formatTime'
 
 const prop = defineProps({
     w: { type: [String, Number] },
     h: { type: [String, Number] },
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-    timeKey: { type: [String, Number] },
-    timeValue: { type: Object }
+   timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
 
+const TableHeaderRef = ref()
+
 const config = useConfig()
 
 const lineList: any = ref()
 
 const powerList: any = ref()
 
-const countData: any = ref([])
-
 const chartsList = ref<any>([])
 
 // 计算是否全屏展示
@@ -131,7 +151,6 @@ const echartList = ref()
 const headerHeight = ref(57)
 const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
     headerHeight.value = height
-
     if (datePickerValue && datePickerValue.timeValue) {
         // 更新时间参数
         tableStore.table.params.searchBeginTime = datePickerValue.timeValue[0]
@@ -149,6 +168,30 @@ const setEchart = () => {
         title: {
             text: `${indicatorName}与${powerName}负荷曲线拟合图`
         },
+        tooltip: {
+            trigger: 'axis',
+            formatter: function (params: any) {
+                let result = params[0].name
+                params.forEach((item: any) => {
+                    if (item.seriesName === indicatorName) {
+                        // 对于电能质量指标，格式化Y轴值显示
+                        let valueText = ''
+                        if (item.value[1] == 0) {
+                            valueText = '不越限'
+                        } else if (item.value[1] == 1) {
+                            valueText = '越限'
+                        } else {
+                            valueText = item.value[1]
+                        }
+                        result += `<br/>${item.marker}${item.seriesName}: ${valueText}`
+                    } else {
+                        // 对于功率数据，正常显示数值
+                        result += `<br/>${item.marker}${item.seriesName}: ${item.value[1]}`
+                    }
+                })
+                return result
+            }
+        },
         xAxis: {
             type: 'time',
             axisLabel: {
@@ -159,7 +202,25 @@ const setEchart = () => {
                 }
             }
         },
-        yAxis: [{}, {}],
+        yAxis: [
+            {},
+            indicatorName
+                ? {
+                      min: 0,
+                      max: 1,
+                      axisLabel: {
+                          formatter: function (value: number) {
+                              if (value === 0) {
+                                  return '不越限'
+                              } else if (value === 1) {
+                                  return '越限'
+                              }
+                              return value
+                          }
+                      }
+                  }
+                : {}
+        ],
         grid: {
             left: '10px',
             right: '20px'
@@ -186,6 +247,7 @@ const setEchart = () => {
                 {
                     name: indicatorName, // 动态设置指标名称
                     type: 'line',
+                    step: 'end',
                     showSymbol: false,
                     // smooth: true,
                     data: [],
@@ -255,6 +317,7 @@ const initCode = () => {
             tableStore.table.params.power = powerList.value[0].id
             tableStore.table.params.indicator = indicatorList.value[0].id
             nextTick(() => {
+                // setTime()
                 tableStore.index()
             })
         })
@@ -268,10 +331,7 @@ const tableStore: any = new TableStore({
     exportName: '主要监测点列表',
     column: [],
     beforeSearchFun: () => {
-        // 设置时间参数
-        tableStore.table.params.searchBeginTime = tableStore.table.params.searchBeginTime || prop.timeValue?.[0]
-        tableStore.table.params.searchEndTime = tableStore.table.params.searchEndTime || prop.timeValue?.[1]
-
+        setTime()
         // 只有当 lineList 已加载且有数据时才设置默认 lineId
         if (!tableStore.table.params.lineId && lineList.value && lineList.value.length > 0) {
             tableStore.table.params.lineId = lineList.value[0].lineId
@@ -377,28 +437,41 @@ onMounted(() => {
         initCode()
     })
 })
+
 watch(
     () => prop.timeKey,
     val => {
         tableStore.index()
     }
 )
+const setTime = () => {
+    const time = getTime(
+        (TableHeaderRef.value?.datePickerRef.interval || prop.interval) ?? 0,
+        prop.timeKey,
+        fullscreen.value
+            ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+            : prop.timeValue
+    )
+
+    if (Array.isArray(time)) {
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
+        TableHeaderRef.value?.setInterval(time[2] - 0)
+        TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
+    }
+}
+
 watch(
     () => prop.timeValue,
     (newVal, oldVal) => {
-        // 当外部时间值变化时，更新表格的时间参数
-        if (newVal && (!oldVal || newVal[0] !== oldVal[0] || newVal[1] !== oldVal[1])) {
-            tableStore.table.params.searchBeginTime = newVal[0]
-            tableStore.table.params.searchEndTime = newVal[1]
-            tableStore.index()
-        }
+        tableStore.index()
     },
     {
         deep: true
     }
 )
-
-const addMenu = () => {}
 </script>
 <style lang="scss" scoped>
 // :deep(.el-select) {

src/components/cockpit/monitoringPointList/components/overLimitDetails.vue

@@ -9,6 +9,7 @@
                             v-model="tableStore.table.params.lineId"
                             placeholder="请选择监测点"
                             style="width: 150px"
+                            filterable
                         >
                             <el-option
                                 v-for="item in options"
@@ -48,7 +49,7 @@ const loop50 = (key: string) => {
         list.push({
             title: i + '次',
             field: key + i + 'Overtime',
-            width: '80',
+            width: '60',
             render: 'customTemplate',
             customTemplate: (row: any) => {
                 return `<span style='cursor: pointer;text-decoration: underline;'>${row[key + i + 'Overtime']}</span>`
@@ -86,7 +87,7 @@ const tableStore: any = new TableStore({
         {
             title: '闪变越限(%)',
             field: 'flickerOvertime',
-            width: '80',
+            width: '90',
             render: 'customTemplate',
             customTemplate: (row: any) => {
                 return `<span style='cursor: pointer;text-decoration: underline;'>${row.flickerOvertime}</span>`

src/components/cockpit/monitoringPointList/index.vue

@@ -1,7 +1,13 @@
 <template>
     <div>
         <!-- 监测点列表 -->
-        <TableHeader :showReset="false" @selectChange="selectChange" datePicker v-if="fullscreen"></TableHeader>
+        <TableHeader
+            ref="TableHeaderRef"
+            :showReset="false"
+            @selectChange="selectChange"
+            datePicker
+            v-if="fullscreen"  :timeKeyList="prop.timeKey"
+        ></TableHeader>
         <Table
             ref="tableRef"
             @cell-click="cellClickEvent"
@@ -46,18 +52,22 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import OverLimitDetails from '@/components/cockpit/monitoringPointList/components/overLimitDetails.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import { uploadReport, getReportUrl } from '@/api/harmonic-boot/cockpit/cockpit'
+import { getTime } from '@/utils/formatTime'
 
 const prop = defineProps({
     w: { type: [String, Number] },
     h: { type: [String, Number] },
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-    timeKey: { type: [String, Number] },
-    timeValue: { type: Object }
+   timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
 
 const headerHeight = ref(57)
 
+const TableHeaderRef = ref()
+
 // 上传相关
 const uploadDialogVisible = ref(false)
 const currentUploadRow = ref<any>(null)
@@ -101,51 +111,42 @@ const tableStore: any = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        {
-            title: '治理对象',
-            field: 'sensitiveUser',
-            minWidth: '80'
-        },
-
-        {
-            title: '电压等级',
-            field: 'volGrade',
-            minWidth: '70'
-        },
-        {
-            title: '是否治理',
-            field: 'govern',
-            minWidth: '70'
-        },
-
-        // {
-        //     title: '治理前报告',
-        //     field: 'reportFileName',
-        //     minWidth: '80',
-        //     render: 'customTemplate',
-        //     customTemplate: (row: any) => {
-        //         return `<span style='cursor: pointer;text-decoration: underline;'>${row.reportFileName}</span>`
-        //     }
-        // },
         {
             title: '监测点名称',
             field: 'lineName',
-            minWidth: '70',
+            minWidth: '120',
             render: 'customTemplate',
             customTemplate: (row: any) => {
                 return `<span style='cursor: pointer;text-decoration: underline;'>${row.lineName}</span>`
             }
         },
-        { title: '监测类型', field: 'position', minWidth: '60' },
+        { title: '监测类型', field: 'position', minWidth: '80' },
         {
             title: '监测点状态',
             field: 'runStatus',
-            minWidth: '60',
+            minWidth: '90',
             render: 'customTemplate',
             customTemplate: (row: any) => {
                 return `<span style='color: ${row.runStatus === '中断' ? '#FF0000' : ''}'>${row.runStatus}</span>`
             }
         },
+        {
+            title: '治理对象',
+            field: 'sensitiveUser',
+            minWidth: '90'
+        },
+
+        {
+            title: '电压等级',
+            field: 'volGrade',
+            minWidth: '80'
+        },
+        {
+            title: '是否治理',
+            field: 'govern',
+            minWidth: '80'
+        },
+
         {
             title: '最新数据时间',
             field: 'latestTime',
@@ -161,7 +162,7 @@ const tableStore: any = new TableStore({
         },
         {
             title: '操作',
-            minWidth: 120,
+            minWidth: 80,
             // fixed: 'right',
             render: 'buttons',
             buttons: [
@@ -209,8 +210,7 @@ const tableStore: any = new TableStore({
         }
     ],
     beforeSearchFun: () => {
-        tableStore.table.params.searchBeginTime = tableStore.table.params.searchBeginTime || prop.timeValue?.[0]
-        tableStore.table.params.searchEndTime = tableStore.table.params.searchEndTime || prop.timeValue?.[1]
+        setTime()
     },
     loadCallback: () => {
         tableStore.table.height = `calc(${prop.height} - 80px)`
@@ -222,6 +222,25 @@ provide('tableRef', tableRef)
 tableStore.table.params.keywords = ''
 provide('tableStore', tableStore)
 
+const setTime = () => {
+    const time = getTime(
+        (TableHeaderRef.value?.datePickerRef.interval || prop.interval) ?? 0,
+        prop.timeKey,
+        fullscreen.value
+            ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+            : prop.timeValue
+    )
+
+    if (Array.isArray(time)) {
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
+        TableHeaderRef.value?.setInterval(time[2] - 0)
+        TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
+    }
+}
+
 // 点击行
 const cellClickEvent = ({ row, column }: any) => {
     if (column.field == 'lineName') {
@@ -326,12 +345,7 @@ watch(
 watch(
     () => prop.timeValue,
     (newVal, oldVal) => {
-        // 当外部时间值变化时，更新表格的时间参数
-        if (newVal && (!oldVal || newVal[0] !== oldVal[0] || newVal[1] !== oldVal[1])) {
-            tableStore.table.params.searchBeginTime = newVal[0]
-            tableStore.table.params.searchEndTime = newVal[1]
-            tableStore.index()
-        }
+        tableStore.index()
     },
     {
         deep: true

src/components/cockpit/overLimitStatistics/components/harmonicRatio‌.vue

@@ -16,6 +16,7 @@
                             v-model="searchForm.index"
                             placeholder="请选择统计指标"
                             @change="onIndexChange($event)"
+                            filterable
                         >
                             <el-option
                                 v-for="item in indexOptions"
@@ -36,6 +37,7 @@
                             style="min-width: 120px !important"
                             placeholder="请选择"
                             v-model="searchForm.valueType"
+                            filterable
                         >
                             <el-option value="max" label="最大值"></el-option>
                             <el-option value="min" label="最小值"></el-option>
@@ -59,6 +61,7 @@
                                 placeholder="请选择谐波次数"
                                 style="width: 100px"
                                 class="mr20"
+                                filterable
                             >
                                 <el-option
                                     v-for="vv in item.countOptions"

src/components/cockpit/overLimitStatistics/components/overLimitDetails.vue

@@ -9,6 +9,7 @@
                             v-model="tableStore.table.params.lineId"
                             placeholder="请选择监测点"
                             style="width: 150px"
+                            filterable
                         >
                             <el-option
                                 v-for="item in options"
@@ -48,7 +49,7 @@ const loop50 = (key: string) => {
         list.push({
             title: i + '次',
             field: key + i + 'Overtime',
-            width: '80',
+            width: '60',
             render: 'customTemplate',
             customTemplate: (row: any) => {
                 return `<span style='cursor: pointer;text-decoration: underline;'>${row[key + i + 'Overtime']}</span>`
@@ -86,7 +87,7 @@ const tableStore: any = new TableStore({
         {
             title: '闪变越限(%)',
             field: 'flickerOvertime',
-            width: '80',
+            width: '90',
             render: 'customTemplate',
             customTemplate: (row: any) => {
                 return `<span style='cursor: pointer;text-decoration: underline;'>${row.flickerOvertime}</span>`

src/components/cockpit/overLimitStatistics/index.vue

@@ -1,7 +1,13 @@
 <template>
     <div>
         <!--总体指标越限统计 -->
-        <TableHeader :showReset="false" @selectChange="selectChange" datePicker v-if="fullscreen"></TableHeader>
+        <TableHeader
+            :showReset="false"
+            ref="TableHeaderRef"
+            @selectChange="selectChange"
+            datePicker
+            v-if="fullscreen"  :timeKeyList="prop.timeKey"
+        ></TableHeader>
         <my-echart
             class="tall"
             :options="echartList"
@@ -30,20 +36,21 @@ import OverLimitDetails from '@/components/cockpit/overLimitStatistics/component
 import { useRoute } from 'vue-router'
 import { useTimeCacheStore } from '@/stores/timeCache'
 import { totalLimitStatisticsData } from '@/api/harmonic-boot/cockpit/cockpit'
+import { getTime } from '@/utils/formatTime'
 
 const prop = defineProps({
     w: { type: [String, Number] },
     h: { type: [String, Number] },
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-    timeKey: { type: [String, Number] },
-    timeValue: { type: Object }
+   timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
 
 const headerHeight = ref(57)
 
-const route = useRoute()
-const timeCacheStore = useTimeCacheStore()
+const TableHeaderRef = ref()
 
 const echartList = ref({})
 
@@ -191,8 +198,7 @@ const tableStore: any = new TableStore({
         }
     ],
     beforeSearchFun: () => {
-        tableStore.table.params.searchBeginTime = tableStore.table.params.searchBeginTime || prop.timeValue?.[0]
-        tableStore.table.params.searchEndTime = tableStore.table.params.searchEndTime || prop.timeValue?.[1]
+        setTime()
     },
     loadCallback: () => {
         tableStore.table.height = `calc(${prop.height} - 80px)`
@@ -219,6 +225,26 @@ const cellClickEvent = ({ row, column }: any) => {
 onMounted(() => {
     tableStore.index()
 })
+
+const setTime = () => {
+    const time = getTime(
+        (TableHeaderRef.value?.datePickerRef.interval || prop.interval) ?? 0,
+        prop.timeKey,
+        fullscreen.value
+            ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+            : prop.timeValue
+    )
+
+    if (Array.isArray(time)) {
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
+        TableHeaderRef.value?.setInterval(time[2] - 0)
+        TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
+    }
+}
+
 watch(
     () => prop.timeKey,
     val => {
@@ -229,12 +255,7 @@ watch(
 watch(
     () => prop.timeValue,
     (newVal, oldVal) => {
-        // 当外部时间值变化时，更新表格的时间参数
-        if (newVal && (!oldVal || newVal[0] !== oldVal[0] || newVal[1] !== oldVal[1])) {
-            tableStore.table.params.searchBeginTime = newVal[0]
-            tableStore.table.params.searchEndTime = newVal[1]
-            tableStore.index()
-        }
+         tableStore.index()
     },
     {
         deep: true

src/components/cockpit/sensitiveLoad/index.vue

@@ -1,8 +1,19 @@
 <template>
     <div>
         <!--敏感负荷列表 -->
-        <TableHeader :showReset="false" @selectChange="selectChange" datePicker v-if="fullscreen"></TableHeader>
-        <Table ref="tableRef" @cell-click="cellClickEvent" :height="`calc(${prop.height} - ${headerHeight}px + ${fullscreen ? -58 : 56}px  )`" isGroup></Table>
+        <TableHeader
+            ref="TableHeaderRef"
+            :showReset="false"
+            @selectChange="selectChange"
+            datePicker
+            v-if="fullscreen"  :timeKeyList="prop.timeKey"
+        ></TableHeader>
+        <Table
+            ref="tableRef"
+            @cell-click="cellClickEvent"
+            :height="`calc(${prop.height} - ${headerHeight}px + ${fullscreen ? -58 : 56}px  )`"
+            isGroup
+        ></Table>
     </div>
 </template>
 <script setup lang="ts">
@@ -10,24 +21,25 @@ import { ref, onMounted, provide, reactive, watch, h } from 'vue'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
-import { useRoute } from 'vue-router'
-import { useTimeCacheStore } from '@/stores/timeCache'
 import { useDictData } from '@/stores/dictData'
+import { getTime } from '@/utils/formatTime'
 
 const prop = defineProps({
-    w: { type:  [String, Number]},
-    h: { type:  [String, Number]},
-    width: { type:  [String, Number]},
-    height: { type:  [String, Number]},
-    timeKey: { type:  [String, Number]},
-    timeValue: { type: Object }
+    w: { type: [String, Number] },
+    h: { type: [String, Number] },
+    width: { type: [String, Number] },
+    height: { type: [String, Number] },
+   timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
 
 const headerHeight = ref(57)
 
-const dictData = useDictData()
-const sensitiveUserType = dictData.getBasicData('Sensitive_User_Type')
+const TableHeaderRef = ref()
 
+const dictData = useDictData()
+const sensitiveUserType = dictData.getBasicData('Interference_Source')
 
 const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
     headerHeight.value = height
@@ -51,7 +63,6 @@ const fullscreen = computed(() => {
     }
 })
 
-
 const OverLimitDetailsRef = ref()
 const tableStore: any = new TableStore({
     url: '/cs-harmonic-boot/pqSensitiveUser/getList',
@@ -76,7 +87,7 @@ const tableStore: any = new TableStore({
             title: '敏感负荷类型',
             field: 'loadType',
             minWidth: '70',
-             formatter: row => {
+            formatter: row => {
                 return sensitiveUserType.filter(item => item.id == row.cellValue)[0]?.name
             }
         },
@@ -92,12 +103,10 @@ const tableStore: any = new TableStore({
         }
     ],
     beforeSearchFun: () => {
-        tableStore.table.params.searchBeginTime = tableStore.table.params.searchBeginTime || prop.timeValue?.[0]
-        tableStore.table.params.searchEndTime = tableStore.table.params.searchEndTime || prop.timeValue?.[1]
+        setTime()
     },
 
-    loadCallback: () => {
-    }
+    loadCallback: () => {}
 })
 
 const tableRef = ref()
@@ -113,6 +122,25 @@ const cellClickEvent = ({ row, column }: any) => {
     }
 }
 
+const setTime = () => {
+    const time = getTime(
+        (TableHeaderRef.value?.datePickerRef.interval || prop.interval) ?? 0,
+        prop.timeKey,
+        fullscreen.value
+            ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+            : prop.timeValue
+    )
+
+    if (Array.isArray(time)) {
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
+        TableHeaderRef.value?.setInterval(time[2] - 0)
+        TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
+    }
+}
+
 onMounted(() => {
     setTimeout(() => {
         tableStore.index()
@@ -127,17 +155,11 @@ watch(
 watch(
     () => prop.timeValue,
     (newVal, oldVal) => {
-        // 当外部时间值变化时，更新表格的时间参数
-        if (newVal && (!oldVal || newVal[0] !== oldVal[0] || newVal[1] !== oldVal[1])) {
-            tableStore.table.params.searchBeginTime = newVal[0]
-            tableStore.table.params.searchEndTime = newVal[1]
-            tableStore.index()
-        }
+        tableStore.index()
     },
     {
         deep: true
     }
 )
-
 </script>
 <style lang="scss" scoped></style>

src/components/cockpit/transientDetails/components/transientList.vue

@@ -132,7 +132,7 @@ const tableStore: any = new TableStore({
         },
         {
             title: '波形',
-            width: '100',
+            minWidth: '100',
             render: 'buttons',
             buttons: [
                 {

src/components/cockpit/transientDetails/index.vue

@@ -7,7 +7,7 @@
             @selectChange="selectChange"
             datePicker
             v-if="fullscreen"
-            :timeCacheFlag="false"
+             :timeKeyList="prop.timeKey"
         ></TableHeader>
         <el-calendar
             v-model="value"
@@ -43,9 +43,15 @@
                             v-for="item in list?.filter((item:any) => item.name == data.day)"
                             @click="descentClick(item)"
                         >
-                            <div>电压暂降:{{ item.eventDown || 0 }}</div>
-                            <div>电压中断:{{ item.eventOff || 0 }}</div>
-                            <div>电压暂升:{{ item.eventUp || 0 }}</div>
+                            <!-- <div>电压暂降:{{ item.eventDown || 0 }}</div>
+                                <div>电压中断:{{ item.eventOff || 0 }}</div>
+                                <div>电压暂升:{{ item.eventUp || 0 }}</div> -->
+                            <template v-if="fullscreen">
+                                <div>电压暂降:{{ item.eventDown || 0 }}</div>
+                                <div>电压中断:{{ item.eventOff || 0 }}</div>
+                                <div>电压暂升:{{ item.eventUp || 0 }}</div>
+                            </template>
+                            <template v-else>暂态事件</template>
                         </div>
                     </el-tooltip>
                 </div>
@@ -61,14 +67,16 @@ import TableStore from '@/utils/tableStore'
 import { dayjs } from 'element-plus'
 import TransientList from './components/transientList.vue'
 import TableHeader from '@/components/table/header/index.vue'
+import { getTime } from '@/utils/formatTime'
 
 const prop = defineProps({
     w: { type: [String, Number] },
     h: { type: [String, Number] },
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-    timeKey: { type: [String, Number] },
-    timeValue: { type: Object }
+   timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
 
 const headerHeight = ref(57)
@@ -119,10 +127,7 @@ const tableStore: any = new TableStore({
     column: [],
 
     beforeSearchFun: () => {
-        if (!fullscreen.value && prop.timeValue && Array.isArray(prop.timeValue)) {
-            tableStore.table.params.searchBeginTime = prop.timeValue[0]
-            tableStore.table.params.searchEndTime = prop.timeValue[1]
-        }
+        setTime()
     },
 
     loadCallback: () => {
@@ -148,42 +153,41 @@ provide('tableStore', tableStore)
 
 onMounted(() => {
     nextTick(() => {
-        if (TableHeaderRef.value && typeof TableHeaderRef.value.setDatePicker === 'function') {
-            TableHeaderRef.value.setDatePicker([{ label: '月份', value: 3 }])
-        }
-        if (fullscreen.value) {
-            TableHeaderRef.value.setInterval(3)
-        }
         tableStore.index()
     })
 })
-watch(
-    () => prop.timeKey,
-    val => {
-        tableStore.index()
+
+const setTime = () => {
+    const time = getTime(
+        (TableHeaderRef.value?.datePickerRef.interval || prop.interval) ?? 0,
+        prop.timeKey,
+        fullscreen.value
+            ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+            : prop.timeValue
+    )
+
+    if (Array.isArray(time)) {
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
+        TableHeaderRef.value?.setInterval(time[2] - 0)
+        TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
     }
-)
+}
+
 watch(
     () => prop.timeValue,
-    // (newVal, oldVal) => {
-    //     // 当外部时间值变化时，更新表格的时间参数
-    //     if (newVal && (!oldVal || newVal[0] !== oldVal[0] || newVal[1] !== oldVal[1])) {
-    //         tableStore.table.params.searchBeginTime = newVal[0]
-    //         tableStore.table.params.searchEndTime = newVal[1]
-    //         tableStore.index()
-    //     }
-    // },
-    val => {
+    (newVal, oldVal) => {
         tableStore.index()
     },
-
     {
         deep: true
     }
 )
 
 // 电压暂降点击事件
-const descentClick = (item:any) => {
+const descentClick = (item: any) => {
     transientListRef.value.open(item.name)
 }
 </script>

src/components/cockpit/transientDistribution/index.vue

@@ -1,23 +1,30 @@
 <template>
     <div>
         <!--暂态事件概率分布 -->
-        <TableHeader :showReset="false" @selectChange="selectChange" datePicker v-if="fullscreen"></TableHeader>
+        <TableHeader
+            ref="TableHeaderRef"
+            :timeKeyList="prop.timeKey"
+            :showReset="false"
+            @selectChange="selectChange"
+            datePicker
+            v-if="fullscreen"
+        ></TableHeader>
         <my-echart
             class="tall"
             :options="echartList"
             :style="{
                 width: prop.width,
-                height: `calc(${prop.height} / 2 - ${headerHeight / 2}px + ${fullscreen ? 0 : 28}px )`
+                height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px)`
             }"
         />
-        <my-echart
+        <!-- <my-echart
             class="mt10"
             :options="echartList1"
             :style="{
                 width: prop.width,
                 height: `calc(${prop.height} / 2  - ${headerHeight / 2}px + ${fullscreen ? 0 : 28}px )`
             }"
-        />
+        /> -->
     </div>
 </template>
 <script setup lang="ts">
@@ -26,16 +33,20 @@ import TableStore from '@/utils/tableStore'
 import MyEchart from '@/components/echarts/MyEchart.vue'
 import { useConfig } from '@/stores/config'
 import TableHeader from '@/components/table/header/index.vue'
+import { getTime } from '@/utils/formatTime'
 
 const prop = defineProps({
     w: { type: [String, Number] },
     h: { type: [String, Number] },
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-    timeKey: { type: [String, Number] },
-    timeValue: { type: Object }
+    timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
 
+const TableHeaderRef = ref()
+
 const headerHeight = ref(57)
 
 const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
@@ -66,135 +77,6 @@ const echartList = ref({})
 
 const echartList1 = ref({})
 
-// const echartList1 = ref({
-//     title: {
-//         text: '越限时间概率分布'
-//     },
-
-//     xAxis: {
-//         // name: '时间',
-//         // data: ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡']
-//         type: 'time',
-//         axisLabel: {
-//             formatter: {
-//                 day: '{MM}-{dd}',
-//                 month: '{MM}',
-//                 year: '{yyyy}'
-//             }
-//         }
-//     },
-
-//     yAxis: {
-//         name: '次' // 给X轴加单位
-//     },
-//     grid: {
-//         left: '10px',
-//         right: '20px'
-//     },
-//     options: {
-//         series: [
-//             {
-//                 type: 'line',
-//                 showSymbol: false,
-//                 // smooth: true,
-//                 name: '电压中断',
-//                 color: '#FF9100',
-//                 data: [
-//                     ['2025-10-16 07:00:00', 10],
-//                     ['2025-10-16 07:15:00', 10],
-//                     ['2025-10-16 07:30:00', 10],
-//                     ['2025-10-16 07:45:00', 10],
-//                     ['2025-10-16 08:00:00', 30],
-//                     ['2025-10-16 08:15:00', 50],
-//                     ['2025-10-16 08:30:00', 60],
-//                     ['2025-10-16 08:45:00', 70],
-//                     ['2025-10-16 09:00:00', 100],
-//                     ['2025-10-16 09:15:00', 120],
-//                     ['2025-10-16 09:30:00', 130],
-//                     ['2025-10-16 09:45:00', 140],
-//                     ['2025-10-16 10:00:00', 160],
-//                     ['2025-10-16 10:15:00', 160],
-//                     ['2025-10-16 10:30:00', 130],
-//                     ['2025-10-16 10:45:00', 120],
-//                     ['2025-10-16 11:00:00', 140],
-//                     ['2025-10-16 11:15:00', 80],
-//                     ['2025-10-16 11:30:00', 70],
-//                     ['2025-10-16 11:45:00', 90],
-//                     ['2025-10-16 12:00:00', 60],
-//                     ['2025-10-16 12:15:00', 60],
-//                     ['2025-10-16 12:30:00', 60],
-//                     ['2025-10-16 12:45:00', 60]
-//                 ]
-//             },
-//             {
-//                 type: 'line',
-//                 showSymbol: false,
-//                 // smooth: true,
-//                 color: '#FFBF00',
-//                 name: '电压暂降',
-//                 data: [
-//                     ['2025-10-16 07:00:00', 1],
-//                     ['2025-10-16 07:15:00', 1],
-//                     ['2025-10-16 07:30:00', 1],
-//                     ['2025-10-16 07:45:00', 1],
-//                     ['2025-10-16 08:00:00', 3],
-//                     ['2025-10-16 08:15:00', 5],
-//                     ['2025-10-16 08:30:00', 6],
-//                     ['2025-10-16 08:45:00', 7],
-//                     ['2025-10-16 09:00:00', 10],
-//                     ['2025-10-16 09:15:00', 12],
-//                     ['2025-10-16 09:30:00', 13],
-//                     ['2025-10-16 09:45:00', 14],
-//                     ['2025-10-16 10:00:00', 16],
-//                     ['2025-10-16 10:15:00', 16],
-//                     ['2025-10-16 10:30:00', 13],
-//                     ['2025-10-16 10:45:00', 12],
-//                     ['2025-10-16 11:00:00', 14],
-//                     ['2025-10-16 11:15:00', 8],
-//                     ['2025-10-16 11:30:00', 7],
-//                     ['2025-10-16 11:45:00', 9],
-//                     ['2025-10-16 12:00:00', 6],
-//                     ['2025-10-16 12:15:00', 6],
-//                     ['2025-10-16 12:30:00', 6],
-//                     ['2025-10-16 12:45:00', 6]
-//                 ]
-//             },
-//             {
-//                 type: 'line',
-//                 showSymbol: false,
-//                 // smooth: true,
-//                 name: '电压暂升',
-//                 color: config.layout.elementUiPrimary[0],
-//                 data: [
-//                     ['2025-10-16 07:00:00', 19],
-//                     ['2025-10-16 07:15:00', 19],
-//                     ['2025-10-16 07:30:00', 19],
-//                     ['2025-10-16 07:45:00', 19],
-//                     ['2025-10-16 08:00:00', 39],
-//                     ['2025-10-16 08:15:00', 59],
-//                     ['2025-10-16 08:30:00', 69],
-//                     ['2025-10-16 08:45:00', 79],
-//                     ['2025-10-16 09:00:00', 109],
-//                     ['2025-10-16 09:15:00', 129],
-//                     ['2025-10-16 09:30:00', 139],
-//                     ['2025-10-16 09:45:00', 149],
-//                     ['2025-10-16 10:00:00', 169],
-//                     ['2025-10-16 10:15:00', 169],
-//                     ['2025-10-16 10:30:00', 139],
-//                     ['2025-10-16 10:45:00', 129],
-//                     ['2025-10-16 11:00:00', 149],
-//                     ['2025-10-16 11:15:00', 89],
-//                     ['2025-10-16 11:30:00', 79],
-//                     ['2025-10-16 11:45:00', 99],
-//                     ['2025-10-16 12:00:00', 69],
-//                     ['2025-10-16 12:15:00', 69],
-//                     ['2025-10-16 12:30:00', 69],
-//                     ['2025-10-16 12:45:00', 69]
-//                 ]
-//             }
-//         ]
-//     }
-// })
 const processDataForChart = (rawData: any[]) => {
     // 将后端返回的扁平数据转换为 ECharts 需要的三维坐标格式 [x, y, z]
     const chartData = rawData.map(item => [item.x, item.y, item.z])
@@ -208,8 +90,7 @@ const tableStore: any = new TableStore({
     showPage: false,
     column: [],
     beforeSearchFun: () => {
-        tableStore.table.params.searchBeginTime = tableStore.table.params.searchBeginTime || prop.timeValue?.[0]
-        tableStore.table.params.searchEndTime = tableStore.table.params.searchEndTime || prop.timeValue?.[1]
+        setTime()
     },
     loadCallback: () => {
         const processedData = processDataForChart(tableStore.table.data.innerList || [])
@@ -302,34 +183,16 @@ const tableStore: any = new TableStore({
                     type: 'category',
                     name: '特征幅值',
                     data: xLabels,
-                    axisLine: {
-                        lineStyle: {
-                            color: '#111'
-                        }
-                    },
-                    axisLabel: {
-                        color: '#111'
-                    }
+                    nameGap: 40
                 },
                 yAxis3D: {
                     type: 'category',
                     name: '持续时间',
                     data: yLabels,
-                    nameTextStyle: {
-                        color: '#111'
-                    },
-                    axisLine: {
-                        show: true,
-                        lineStyle: {
-                            color: '#111'
-                        }
-                    },
-                    axisLabel: {
-                        color: '#111'
-                    },
+                    nameGap: 40,
+
                     splitLine: {
                         lineStyle: {
-                            color: ['#111'],
                             type: 'dashed',
                             opacity: 0.5
                         }
@@ -337,25 +200,28 @@ const tableStore: any = new TableStore({
                 },
                 zAxis3D: {
                     type: 'value',
-                    splitNumber: 10,
                     minInterval: 10,
-                    name: '暂态事件次数'
+                    name: '暂态事件次数',
+                    nameGap: 30
                 },
                 grid3D: {
                     viewControl: {
-                        projection: 'perspective',
-                        distance: 250
-                    },
-                    boxWidth: 200,
-                    boxDepth: 80,
-                    light: {
-                        main: {
-                            intensity: 1.2
+                            projection: 'perspective',
+                            distance: 260,
+                            rotateSensitivity: 10,
+                            zoomSensitivity: 2
                         },
-                        ambient: {
-                            intensity: 0.3
+                        boxWidth: 150,
+                        boxDepth: 100,
+                        boxHeight: 100,
+                        light: {
+                            main: {
+                                intensity: 1.2
+                            },
+                            ambient: {
+                                intensity: 0.4
+                            }
                         }
-                    }
                 },
                 series: [
                     {
@@ -368,20 +234,6 @@ const tableStore: any = new TableStore({
                                 fontSize: 16,
                                 borderWidth: 1
                             }
-                        },
-                        itemStyle: {
-                            opacity: 1
-                        },
-                        emphasis: {
-                            label: {
-                                textStyle: {
-                                    fontSize: 20,
-                                    color: '#900'
-                                }
-                            },
-                            itemStyle: {
-                                color: '#900'
-                            }
                         }
                     }
                 ]
@@ -419,26 +271,41 @@ provide('tableStore', tableStore)
 onMounted(() => {
     tableStore.index()
 })
+
+const setTime = () => {
+    const time = getTime(
+        (TableHeaderRef.value?.datePickerRef.interval || prop.interval) ?? 0,
+        prop.timeKey,
+        fullscreen.value
+            ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+            : prop.timeValue
+    )
+
+    if (Array.isArray(time)) {
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
+        TableHeaderRef.value?.setInterval(time[2] - 0)
+        TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
+    }
+}
+
 watch(
     () => prop.timeKey,
     val => {
         tableStore.index()
     }
 )
+
 watch(
     () => prop.timeValue,
     (newVal, oldVal) => {
-        // 当外部时间值变化时，更新表格的时间参数
-        if (newVal && (!oldVal || newVal[0] !== oldVal[0] || newVal[1] !== oldVal[1])) {
-            tableStore.table.params.searchBeginTime = newVal[0]
-            tableStore.table.params.searchEndTime = newVal[1]
-            tableStore.index()
-        }
+        tableStore.index()
     },
     {
         deep: true
     }
 )
-const addMenu = () => {}
 </script>
 <style lang="scss" scoped></style>

src/components/cockpit/transientStatistics/components/transientStatisticsDetail.vue

@@ -5,12 +5,12 @@
             <TableHeader datePicker showExport :showReset="false" ref="tableHeaderRef" @selectChange="selectChange">
                 <template v-slot:select>
                     <el-form-item label="监测点">
-                        <el-select v-model="tableStore.table.params.lineId" placeholder="请选择监测点名称">
+                        <el-select filterable v-model="tableStore.table.params.lineId" placeholder="请选择监测点名称">
                             <el-option
                                 v-for="item in options"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value"
+                                :key="item.lineId"
+                                :label="item.name"
+                                :value="item.lineId"
                             />
                         </el-select>
                     </el-form-item>
@@ -58,9 +58,9 @@ const boxoList: any = ref({})
 const tableHeaderRef = ref()
 
 const options = ref()
-const heightRef = ref(mainHeight(168, 2.1).height)
+const heightRef = ref(mainHeight(168, 2.2).height)
 const selectChange = (flag: boolean, h: any) => {
-    heightRef.value = mainHeight(h, 2.1).height
+    heightRef.value = mainHeight(h, 2.2).height
 }
 
 const getSimpleLineList = async () => {
@@ -68,7 +68,6 @@ const getSimpleLineList = async () => {
     options.value = res.data
 }
 
-
 const tableStore: any = new TableStore({
     url: '/cs-harmonic-boot/event/pageEvent',
     method: 'POST',
@@ -86,27 +85,27 @@ const tableStore: any = new TableStore({
         {
             title: '暂态时间',
             field: 'startTime',
-            minWidth: '150'
+            minWidth: '180'
         },
         {
             title: '测点名称',
             field: 'lineName',
-            width: '150'
+            minWidth: '150'
         },
         {
             title: '暂态类型',
             field: 'tag',
-            width: '100'
+            minWidth: '100'
         },
         {
             title: '特征幅值(%)',
             field: 'amplitude',
-            width: '100'
+            minWidth: '100'
         },
         {
             title: '暂降深度(%)',
             field: 'depth',
-            width: '100',
+            minWidth: '100',
             formatter: (row: any) => {
                 // 当暂态类型不是电压暂升时，计算暂降深度 = 100 - 特征幅值
                 if (row.row.tag !== '电压暂升') {
@@ -124,16 +123,16 @@ const tableStore: any = new TableStore({
         {
             title: '持续时间(S)',
             field: 'persistTime',
-            width: '100'
+            minWidth: '100'
         },
         {
             title: '严重度',
             field: 'severity',
-            width: '80'
+            minWidth: '80'
         },
         {
             title: '波形',
-            width: '100',
+            width: '90',
             render: 'buttons',
             buttons: [
                 {
@@ -192,7 +191,7 @@ const tableStore: any = new TableStore({
                     icon: 'el-icon-DataLine',
                     render: 'basicButton',
                     disabled: row => {
-                        return !(!row.wavePath && row.evtParamTm < 20)
+                        return !!row.wavePath
                     }
                 }
             ]

src/components/cockpit/transientStatistics/index.vue

@@ -1,7 +1,13 @@
 <template>
     <div>
         <!--暂态事件统计 -->
-        <TableHeader :showReset="false" @selectChange="selectChange" datePicker v-if="fullscreen"></TableHeader>
+        <TableHeader
+            ref="TableHeaderRef"
+            :showReset="false"
+            @selectChange="selectChange"
+            datePicker
+            v-if="fullscreen"  :timeKeyList="prop.timeKey"
+        ></TableHeader>
         <my-echart
             class="tall"
             :options="echartList"
@@ -28,18 +34,23 @@ import { useConfig } from '@/stores/config'
 import TransientStatisticsDetail from '@/components/cockpit/transientStatistics/components/transientStatisticsDetail.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import { netEventEcharts } from '@/api/harmonic-boot/cockpit/cockpit'
+import { getTime } from '@/utils/formatTime'
 
 const prop = defineProps({
     w: { type: [String, Number] },
     h: { type: [String, Number] },
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-    timeKey: { type: [String, Number] },
-    timeValue: { type: Object }
+   timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
 
+const TableHeaderRef = ref()
+
 const headerHeight = ref(57)
 
+
 const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
     headerHeight.value = height
 
@@ -96,8 +107,8 @@ const eventEcharts = () => {
             },
             legend: {
                 orient: 'vertical',
-                top: 'center',
-                right: '5%',
+                top: '50',
+                right: '10',
                 formatter: function (e: any) {
                     return e + '   ' + data.value.filter((item: any) => item.name == e)[0].value + '次'
                 }
@@ -199,8 +210,7 @@ const tableStore: any = new TableStore({
         }
     ],
     beforeSearchFun: () => {
-        tableStore.table.params.searchBeginTime = tableStore.table.params.searchBeginTime || prop.timeValue?.[0]
-        tableStore.table.params.searchEndTime = tableStore.table.params.searchEndTime || prop.timeValue?.[1]
+        setTime()
     },
     loadCallback: () => {
         eventEcharts()
@@ -223,6 +233,25 @@ const cellClickEvent = ({ row, column }: any) => {
     }
 }
 
+const setTime = () => {
+    const time = getTime(
+        (TableHeaderRef.value?.datePickerRef.interval || prop.interval) ?? 0,
+        prop.timeKey,
+        fullscreen.value
+            ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+            : prop.timeValue
+    )
+
+    if (Array.isArray(time)) {
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
+        TableHeaderRef.value?.setInterval(time[2] - 0)
+        TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
+    }
+}
+
 onMounted(() => {
     setTimeout(() => {
         tableStore.index()
@@ -237,12 +266,7 @@ watch(
 watch(
     () => prop.timeValue,
     (newVal, oldVal) => {
-        // 当外部时间值变化时，更新表格的时间参数
-        if (newVal && (!oldVal || newVal[0] !== oldVal[0] || newVal[1] !== oldVal[1])) {
-            tableStore.table.params.searchBeginTime = newVal[0]
-            tableStore.table.params.searchEndTime = newVal[1]
-            tableStore.index()
-        }
+        tableStore.index()
     },
     {
         deep: true

src/components/cockpit/trendComparison/index.vue

@@ -1,10 +1,22 @@
 <template>
     <div>
         <!--趋势对比 -->
-        <TableHeader datePicker :showReset="false" @selectChange="selectChange" v-if="fullscreen">
+        <TableHeader
+            datePicker
+            ref="TableHeaderRef"
+            :timeKeyList="prop.timeKey"
+            :showReset="false"
+            @selectChange="selectChange"
+            v-if="fullscreen"
+        >
             <template v-slot:select>
                 <el-form-item label="监测对象">
-                    <el-select v-model="tableStore.table.params.sensitiveUserId" placeholder="请选择监测对象" clearable>
+                    <el-select
+                        filterable
+                        v-model="tableStore.table.params.sensitiveUserId"
+                        placeholder="请选择监测对象"
+                        clearable
+                    >
                         <el-option v-for="item in idList" :key="item.id" :label="item.name" :value="item.id" />
                     </el-select>
                 </el-form-item>
@@ -77,26 +89,23 @@ import TableStore from '@/utils/tableStore'
 import TableHeader from '@/components/table/header/index.vue'
 import MyEchart from '@/components/echarts/MyEchart.vue'
 import { useConfig } from '@/stores/config'
-import { useRoute } from 'vue-router'
-import { useTimeCacheStore } from '@/stores/timeCache'
 import { queryByCode, queryCsDictTree } from '@/api/system-boot/dictTree'
 import { getListByIds } from '@/api/harmonic-boot/cockpit/cockpit'
+import { getTime } from '@/utils/formatTime'
 
 const prop = defineProps({
     w: { type: [String, Number] },
     h: { type: [String, Number] },
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-    timeKey: { type: [String, Number] },
-    timeValue: { type: Object }
+    timeKey: { type: Array as () => string[] },
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
 
-const route = useRoute()
-const timeCacheStore = useTimeCacheStore()
+const TableHeaderRef = ref()
 const config = useConfig()
 
-const lineIdList = ref(JSON.parse(window.localStorage.getItem('lineIdList') || '[]'))
-
 // 计算是否全屏展示
 const fullscreen = computed(() => {
     const w = Number(prop.w)
@@ -231,7 +240,7 @@ const setEchart = () => {
             data: afterGroupedByPhase[phase],
             itemStyle: {
                 normal: {
-                    color:color
+                    color: color
                 }
             },
             lineStyle: {
@@ -324,8 +333,7 @@ const tableStore: any = new TableStore({
     exportName: '趋势对比',
     column: [],
     beforeSearchFun: () => {
-        tableStore.table.params.searchBeginTime = tableStore.table.params.searchBeginTime || prop.timeValue?.[0]
-        tableStore.table.params.searchEndTime = tableStore.table.params.searchEndTime || prop.timeValue?.[1]
+        setTime()
         if (!tableStore.table.params.sensitiveUserId && idList.value?.length > 0) {
             tableStore.table.params.sensitiveUserId = idList.value[0].id
         }
@@ -356,7 +364,7 @@ const tableStore: any = new TableStore({
             chartsListBefore.value = tableStore.table.data.before
             chartsListAfter.value = tableStore.table.data.after
             setEchart()
-        } 
+        }
     }
 })
 
@@ -370,6 +378,25 @@ onMounted(() => {
     initListByIds()
 })
 
+const setTime = () => {
+    const time = getTime(
+        (TableHeaderRef.value?.datePickerRef.interval || prop.interval) ?? 0,
+        prop.timeKey,
+        fullscreen.value
+            ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+            : prop.timeValue
+    )
+
+    if (Array.isArray(time)) {
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
+        TableHeaderRef.value?.setInterval(time[2] - 0)
+        TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
+    }
+}
+
 // 判断是否应该显示谐波次数选择框
 const shouldShowHarmonicCount = () => {
     if (!tableStore.table.params.indicator || !indicatorList.value) return false
@@ -405,12 +432,7 @@ watch(
 watch(
     () => prop.timeValue,
     (newVal, oldVal) => {
-        // 当外部时间值变化时，更新表格的时间参数
-        if (newVal && (!oldVal || newVal[0] !== oldVal[0] || newVal[1] !== oldVal[1])) {
-            tableStore.table.params.searchBeginTime = newVal[0]
-            tableStore.table.params.searchEndTime = newVal[1]
-            tableStore.index()
-        }
+        tableStore.index()
     },
     {
         deep: true
@@ -432,8 +454,6 @@ watch(
         }
     }
 )
-
-const addMenu = () => {}
 </script>
 <style lang="scss" scoped>
 // :deep(.el-select) {

src/components/echarts/rmsWorker.js

@@ -252,50 +252,56 @@ self.onmessage = function (e) {
         let titles = ''
         if (boxoList.systemType == 'pms') {
             titles =
-                '变电站名称：' +
+                '变电站名称:' +
                 boxoList.powerStationName +
-                ' 监测点名称：' +
+                '　监测点名称:' +
                 boxoList.measurementPointName +
-                ' 发生时刻：' +
+                '　发生时刻:' +
                 boxoList.startTime +
-                ' 残余电压：' +
+                '　暂降(骤升)幅值:' +
                 (boxoList.featureAmplitude * 100).toFixed(2) +
-                '% 持续时间：' +
+                '% 　持续时间:' +
                 boxoList.duration +
                 's'
         } else if (boxoList.systemType == 'ZL') {
             titles =
-                ' 监测点名称：' +
+                (boxoList.engineeringName == undefined ? '' : ' 项目名称:' + boxoList.engineeringName) +
+                '　项目名称:' +
+                boxoList.engineeringName +
+                '　监测点名称:' +
                 boxoList.equipmentName +
-                ' 发生时刻：' +
+                '　发生时刻:' +
                 boxoList.startTime +
-                ' 残余电压：' +
+                '　暂降(骤升)幅值:' +
                 boxoList.evtParamVVaDepth +
-                ' 持续时间：' +
+                '%　持续时间:' +
                 boxoList.evtParamTm +
                 's'
         } else if (boxoList.systemType == 'YPT') {
             titles =
-                ' 监测点名称：' +
+                (boxoList.engineeringName == undefined ? '' : ' 项目名称:' + boxoList.engineeringName) +
+                '　项目名称:' +
+                boxoList.engineeringName +
+                '　监测点名称:' +
                 boxoList.lineName +
-                ' 发生时刻：' +
+                '　发生时刻:' +
                 boxoList.startTime +
-                ' 残余电压：' +
+                '　暂降(骤升)幅值:' +
                 (boxoList.featureAmplitude * 100).toFixed(2) +
-                '% 持续时间：' +
+                '%　持续时间:' +
                 boxoList.persistTime +
                 's'
         } else {
             titles =
-                '变电站名称：' +
+                '变电站名称:' +
                 boxoList.subName +
-                ' 监测点名称：' +
+                ' 监测点名称:' +
                 boxoList.lineName +
-                ' 发生时刻：' +
+                ' 发生时刻:' +
                 boxoList.startTime +
-                ' 残余电压：' +
+                ' 暂降(骤升)幅值:' +
                 (boxoList.featureAmplitude * 100).toFixed(2) +
-                '% 持续时间：' +
+                '% 持续时间:' +
                 boxoList.duration +
                 's'
         }

src/components/echarts/rmsboxi.vue

@@ -109,7 +109,7 @@ const myChartess5 = ref<echarts.ECharts | null>(null)
 
 const vh = computed(() => {
     if (props.parentHeight == 999) {
-        return '310px'
+        return `calc((60vh - 150px) / 2 )`
     } else if (props.parentHeight != 0) {
         return mainHeight(props.parentHeight, 2).height
     }
@@ -600,7 +600,7 @@ const initWave = (
             $(`#${rmsId}`).css('height', picHeight).css('width', vw.value)
         }
     } else {
-        titleText = `变电站名称：${subName.value} 监测点名称：${lineName.value} 发生时刻：${time} 残余电压：${(
+        titleText = `变电站名称：${subName.value} 监测点名称：${lineName.value} 发生时刻：${time} 暂降(骤升)幅值：${(
             Number(eventValue.value) * 1
         ).toFixed(0)}% 持续时间：${persistTime.value}s`
     }
@@ -837,7 +837,7 @@ const initWave = (
                 data: rmscu
             },
             {
-                name: '最小残余电压',
+                name: '最小暂降(骤升)幅值',
                 type: 'scatter',
                 symbol: 'image://' + url2,
                 itemStyle: { width: 45, height: 45 },

src/components/echarts/shuWorker.js

@@ -125,50 +125,52 @@ self.addEventListener('message', function (e) {
     let titles = ''
     if (boxoList.systemType == 'pms') {
         titles =
-            '变电站名称：' +
+            '变电站名称:' +
             boxoList.powerStationName +
-            ' 监测点名称：' +
+            ' 监测点名称:' +
             boxoList.measurementPointName +
-            ' 发生时刻：' +
+            ' 发生时刻:' +
             boxoList.startTime +
-            ' 残余电压：' +
+            ' 暂降(骤升)幅值:' +
             (boxoList.featureAmplitude * 100).toFixed(2) +
-            '% 持续时间：' +
+            '% 持续时间:' +
             boxoList.duration +
             's'
     } else if (boxoList.systemType == 'ZL') {
         titles =
-            ' 监测点名称：' +
+            (boxoList.engineeringName == undefined ? '' : ' 项目名称:' + boxoList.engineeringName) +
+            '　监测点名称:' +
             boxoList.equipmentName +
-            ' 发生时刻：' +
+            ' 发生时刻:' +
             boxoList.startTime +
-            ' 残余电压：' +
+            ' 暂降(骤升)幅值:' +
             boxoList.evtParamVVaDepth +
-            ' 持续时间：' +
+            '% 持续时间:' +
             boxoList.evtParamTm +
             's'
     } else if (boxoList.systemType == 'YPT') {
         titles =
-            ' 监测点名称：' +
+            (boxoList.engineeringName == undefined ? '' : ' 项目名称:' + boxoList.engineeringName) +
+            '　监测点名称:' +
             boxoList.lineName +
-            ' 发生时刻：' +
+            '　发生时刻:' +
             boxoList.startTime +
-            ' 残余电压：' +
+            '　暂降(骤升)幅值:' +
             (boxoList.featureAmplitude * 100).toFixed(2) +
-            '% 持续时间：' +
+            '%　持续时间:' +
             boxoList.persistTime +
             's'
     } else {
         titles =
-            '变电站名称：' +
+            '变电站名称:' +
             boxoList.subName +
-            ' 监测点名称：' +
+            '　监测点名称:' +
             boxoList.lineName +
-            ' 发生时刻：' +
+            '　发生时刻:' +
             boxoList.startTime +
-            ' 残余电压：' +
+            '　暂降(骤升)幅值:' +
             (boxoList.featureAmplitude * 100).toFixed(2) +
-            '% 持续时间：' +
+            '%　持续时间:' +
             boxoList.duration +
             's'
     }

src/components/echarts/shushiboxi.vue

@@ -88,7 +88,7 @@ const myChartess5 = ref<echarts.ECharts | null>(null)
 
 const vh = computed(() => {
     if (props.parentHeight == 999) {
-        return '310px'
+        return `calc((60vh - 150px) / 2 )`
     } else if (props.parentHeight != 0) {
         return mainHeight(props.parentHeight, 2).height
     }
@@ -334,7 +334,7 @@ const initWave = (
             $(`#${waveId}`).css('height', picHeight).css('width', vw.value)
         }
     } else {
-        titleText = `变电站名称：${subName.value} 监测点名称：${lineName.value} 发生时刻：${time} 残余电压：${(
+        titleText = `变电站名称：${subName.value} 监测点名称：${lineName.value} 发生时刻：${time} 暂降(骤升)幅值：${(
             Number(eventValue.value) * 1
         ).toFixed(0)}% 持续时间：${persistTime.value}s`
     }

src/components/form/datePicker/index.vue

@@ -5,7 +5,7 @@
             style="min-width: 90px; width: 90px; margin-right: 10px"
             @change="timeChange"
         >
-            <el-option v-for="item in timeOptions" :key="item.value" :label="item.label" :value="item.value" />
+            <el-option v-for="item in filteredTimeOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
         <el-date-picker
             v-model.trim="timeValue"
@@ -20,6 +20,7 @@
             value-format="YYYY-MM-DD"
             :shortcuts="shortcuts"
         />
+
         <el-button :disabled="backDisabled" type="primary" :icon="DArrowLeft" @click="preClick"></el-button>
         <el-button type="primary" :icon="VideoPause" @click="nowTime">当前</el-button>
         <el-button :disabled="preDisabled" type="primary" :icon="DArrowRight" @click="next"></el-button>
@@ -35,13 +36,15 @@ interface Props {
     theCurrentTime?: boolean
     initialInterval?: number
     initialTimeValue?: any
+    timeKeyList?: string[] //日期下拉
 }
 
 const props = withDefaults(defineProps<Props>(), {
     nextFlag: false,
     theCurrentTime: true,
     initialInterval: 3,
-    initialTimeValue: undefined
+    initialTimeValue: undefined,
+    timeKeyList: () => []
 })
 
 const emit = defineEmits(['change'])
@@ -89,6 +92,16 @@ const shortcuts = [
         }
     }
 ]
+
+// 计算过滤后的 timeOptions
+const filteredTimeOptions = computed(() => {
+    if (!props.timeKeyList || props.timeKeyList.length === 0) {
+        return timeOptions.value
+    }
+
+    return timeOptions.value.filter((option: any) => props.timeKeyList.includes(option.value.toString()))
+})
+
 onMounted(() => {
     // 使用传入的初始值
     if (props.initialInterval !== undefined) {
@@ -113,9 +126,13 @@ const checkInitialButtonStatus = () => {
         const endTime = timeValue.value[1]
         const currentDate = window.XEUtils.toDateString(new Date(), 'yyyy-MM-dd')
 
-        // 如果结束时间小于当前日期，则不禁用"下一个"按钮
-        if (new Date(endTime + ' 00:00:00').getTime() < new Date(currentDate + ' 00:00:00').getTime()) {
-            preDisabled.value = false
+        // 只有当 props.nextFlag 为 false 时才应用限制
+        if (!props.nextFlag) {
+            // 如果结束时间早于当前日期，则按钮可用（preDisabled = false）
+            // 如果结束时间晚于或等于当前日期，则按钮禁用（preDisabled = true）
+            const endDateTime = new Date(endTime).getTime()
+            const currentDateTime = new Date(currentDate).getTime()
+            preDisabled.value = endDateTime >= currentDateTime
         }
     }
 }
@@ -164,30 +181,15 @@ const timeChange = (e: number) => {
         timeFlag.value = 1
     }
 
-    // 检查按钮状态
-    checkButtonStatus()
+   nextTick(() => {
+        // 检查按钮状态
+    checkInitialButtonStatus()
+   })
 
     // 触发 change 事件
     emitChange()
 }
 
-// 添加按钮状态检查方法
-const checkButtonStatus = () => {
-    if (timeValue.value && timeValue.value.length >= 2) {
-        const endTime = timeValue.value[1]
-        const currentDate = window.XEUtils.toDateString(new Date(), 'yyyy-MM-dd')
-
-        // 如果结束时间大于等于当前日期，且 nextFlag 为 false，则禁用"下一个"按钮
-        if (!props.nextFlag) {
-            if (new Date(endTime + ' 00:00:00').getTime() >= new Date(currentDate + ' 00:00:00').getTime()) {
-                preDisabled.value = true
-            } else {
-                preDisabled.value = false
-            }
-        }
-    }
-}
-
 // 当前
 const nowTime = () => {
     // console.log(interval.value, '000000000')

src/components/table/header/index.vue

@@ -15,6 +15,7 @@
                         :nextFlag="nextFlag"
                         :theCurrentTime="theCurrentTime"
                         @change="handleDatePickerChange"
+                        :timeKeyList="props.timeKeyList"
                     ></DatePicker>
                 </el-form-item>
 
@@ -89,6 +90,7 @@ interface Props {
     showReset?: boolean //是否显示重置
     showExport?: boolean //导出控制
     timeCacheFlag?: boolean //是否取缓存时间
+    timeKeyList?: string[] //日期下拉列表
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -99,7 +101,8 @@ const props = withDefaults(defineProps<Props>(), {
     theCurrentTime: true,
     showReset: true,
     showExport: false,
-    timeCacheFlag: true
+    timeCacheFlag: true,
+    timeKeyList: () => ['1', '2', '3', '4', '5'] // 修改为箭头函数返回空数组
 })
 
 // 处理 DatePicker 值变化事件

src/components/tree/allocation.vue

@@ -0,0 +1,187 @@
+<template>
+    <div :style="{ width: menuCollapse ? '40px' : props.width }" style="transition: all 0.3s; overflow: hidden">
+        <div class="mt15 mr10" style="display: flex; justify-content: end">
+            <el-button type="primary" icon="el-icon-Select" @click="save" :loading="loading">保存</el-button>
+        </div>
+        <Icon
+            v-show="menuCollapse"
+            @click="onMenuCollapse"
+            :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
+            :class="menuCollapse ? 'unfold' : ''"
+            size="18"
+            class="fold ml10 mt20 menu-collapse"
+            style="cursor: pointer"
+        />
+        <div class="cn-tree" :style="{ opacity: menuCollapse ? 0 : 1 }">
+            <div style="display: flex; align-items: center" class="mb10">
+                <el-input maxlength="32" show-word-limit v-model.trim="filterText" placeholder="请输入内容" clearable>
+                    <template #prefix>
+                        <Icon name="el-icon-Search" style="font-size: 16px" />
+                    </template>
+                </el-input>
+                <el-tooltip placement="bottom" :hide-after="0" v-if="props.showPush">
+                    <template #content>
+                        <span>台账推送</span>
+                    </template>
+
+                    <Icon
+                        name="el-icon-Promotion"
+                        size="20"
+                        class="fold ml10 menu-collapse"
+                        style="cursor: pointer"
+                        :style="{ color: config.getColorVal('elementUiPrimary') }"
+                        @click="onAdd"
+                    />
+                </el-tooltip>
+                <!-- <Icon @click='onMenuCollapse' :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'" v-else
+                    :class="menuCollapse ? 'unfold' : ''" size='18' class='fold ml10 menu-collapse'
+                    style='cursor: pointer' v-if='props.canExpand' /> -->
+            </div>
+
+            <el-tree
+                :style="{ height: 'calc(100vh - 235px)' }"
+                style="overflow: auto"
+                ref="treeRef"
+                :props="defaultProps"
+                highlight-current
+                :default-expand-all="false"
+                @check-change="checkTreeNodeChange"
+                :filter-node-method="filterNode"
+                node-key="id"
+                v-bind="$attrs"
+            >
+                <template #default="{ node, data }">
+                    <span class="custom-tree-node">
+                        <Icon
+                            :name="data.icon"
+                            style="font-size: 16px"
+                            :style="{ color: data.color }"
+                            v-if="data.icon"
+                        />
+                        <span style="margin-left: 4px">{{ node.label }}</span>
+                    </span>
+                </template>
+            </el-tree>
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import useCurrentInstance from '@/utils/useCurrentInstance'
+import { ElTree } from 'element-plus'
+import { emit } from 'process'
+import { ref, watch } from 'vue'
+import { t } from 'vxe-table'
+import { useConfig } from '@/stores/config'
+
+defineOptions({
+    name: 'govern/tree'
+})
+
+interface Props {
+    width?: string
+    canExpand?: boolean
+    showPush?: boolean
+}
+const loading = ref(false)
+const props = withDefaults(defineProps<Props>(), {
+    width: '280px',
+    canExpand: true,
+    showPush: false
+})
+const config = useConfig()
+const { proxy } = useCurrentInstance()
+const menuCollapse = ref(false)
+const filterText = ref('')
+const defaultProps = {
+    label: 'name',
+    value: 'id'
+}
+const emit = defineEmits(['checkTreeNodeChange', 'onAdd', 'checkChange'])
+watch(filterText, val => {
+    treeRef.value!.filter(val)
+})
+const onMenuCollapse = () => {
+    menuCollapse.value = !menuCollapse.value
+    proxy.eventBus.emit('cnTreeCollapse', menuCollapse)
+}
+const save = () => {
+    loading.value = true
+    emit('checkChange')
+}
+const filterNode = (value: string, data: any, node: any) => {
+    console.log(value, data, node, 'filterNode')
+    if (!value) return true
+    // return data.name.includes(value)
+    if (data.name) {
+        return chooseNode(value, data, node)
+    }
+}
+
+// 过滤父节点 / 子节点 (如果输入的参数是父节点且能匹配，则返回该节点以及其下的所有子节点；如果参数是子节点，则返回该节点的父节点。name是中文字符，enName是英文字符.
+const chooseNode = (value: string, data: any, node: any) => {
+    if (data.name.indexOf(value) !== -1) {
+        return true
+    }
+    const level = node.level
+    // 如果传入的节点本身就是一级节点就不用校验了
+    if (level === 1) {
+        return false
+    }
+    // 先取当前节点的父节点
+    let parentData = node.parent
+    // 遍历当前节点的父节点
+    let index = 0
+    while (index < level - 1) {
+        // 如果匹配到直接返回，此处name值是中文字符，enName是英文字符。判断匹配中英文过滤
+        if (parentData.data.name.indexOf(value) !== -1) {
+            return true
+        }
+        // 否则的话再往上一层做匹配
+        parentData = parentData.parent
+        index++
+    }
+    // 没匹配到返回false
+    return false
+}
+const checkTreeNodeChange = () => {
+    // console.log(treeRef.value?.getCheckedNodes(), "ikkkkkiisiiisis");
+    emit('checkTreeNodeChange', treeRef.value?.getCheckedNodes())
+}
+
+const onAdd = () => {
+    emit('onAdd')
+}
+
+const treeRef = ref<InstanceType<typeof ElTree>>()
+defineExpose({ treeRef, loading })
+</script>
+
+<style lang="scss" scoped>
+.cn-tree {
+    flex-shrink: 0;
+    display: flex;
+    flex-direction: column;
+    box-sizing: border-box;
+    padding: 10px;
+    height: 100%;
+    width: 100%;
+
+    :deep(.el-tree) {
+        border: 1px solid var(--el-border-color);
+    }
+
+    :deep(.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content) {
+        background-color: var(--el-color-primary-light-7);
+    }
+
+    .menu-collapse {
+        color: var(--el-color-primary);
+    }
+}
+
+.custom-tree-node {
+    display: flex;
+    align-items: center;
+}
+</style>

src/components/tree/cloudDevice.vue

@@ -14,7 +14,7 @@
                     :class="menuCollapse ? 'unfold' : ''" size='18' class='fold ml10 menu-collapse'
                     style='cursor: pointer' v-if='props.canExpand' /> -->
             </div>
-            <el-tree :style="{ height:  'calc(100vh - 110px)' }"
+            <el-tree :style="{ height:  'calc(100vh - 230px)' }"
             style=' overflow: auto;' ref='treeRef' :props='defaultProps' highlight-current :default-expand-all="false"
                 @check-change="checkTreeNodeChange" :filter-node-method='filterNode' node-key='id' v-bind='$attrs'>
                 <template #default='{ node, data }'>
@@ -32,7 +32,6 @@
 <script lang='ts' setup>
 import useCurrentInstance from '@/utils/useCurrentInstance'
 import { ElTree } from 'element-plus'
-import { emit } from 'process';
 import { ref, watch } from 'vue'
 
 defineOptions({

src/components/tree/device.vue

@@ -1,27 +1,48 @@
 <!-- 设备管理使用折叠面板渲染多个tree -->
 <template>
     <div :style="{ width: menuCollapse ? '40px' : props.width }" style="display: flex; overflow: hidden">
-        <Icon v-show="menuCollapse" @click="onMenuCollapse" :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
-            :class="menuCollapse ? 'unfold' : ''" size="18" class="fold ml10 mt20 menu-collapse"
-            style="cursor: pointer" />
+        <Icon
+            v-show="menuCollapse"
+            @click="onMenuCollapse"
+            :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
+            :class="menuCollapse ? 'unfold' : ''"
+            size="18"
+            class="fold ml10 mt20 menu-collapse"
+            style="cursor: pointer"
+        />
         <div class="cn-tree" :style="{ opacity: menuCollapse ? 0 : 1 }">
             <div style="display: flex; align-items: center" class="mb10">
                 <!-- <el-form-item> -->
-                <el-input maxlength="32" show-word-limit v-model.trim="filterText" autocomplete="off"
-                    placeholder="请输入内容" clearable>
+                <el-input
+                    maxlength="32"
+                    show-word-limit
+                    v-model.trim="filterText"
+                    autocomplete="off"
+                    placeholder="请输入内容"
+                    clearable
+                >
                     <template #prefix>
                         <Icon name="el-icon-Search" style="font-size: 16px" />
                     </template>
                 </el-input>
                 <!-- </el-form-item> -->
-                <Icon @click="onMenuCollapse" :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
-                    :class="menuCollapse ? 'unfold' : ''" size="18" class="fold ml10 menu-collapse"
-                    style="cursor: pointer" v-if="props.canExpand" />
+                <Icon
+                    @click="onMenuCollapse"
+                    :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
+                    :class="menuCollapse ? 'unfold' : ''"
+                    size="18"
+                    class="fold ml10 menu-collapse"
+                    style="cursor: pointer"
+                    v-if="props.canExpand"
+                />
             </div>
 
-            <el-collapse :accordion="true" v-model.trim="activeName" style="flex: 1; height: 100%"
-                @change="changeDevice">
-
+            <el-collapse
+                :accordion="true"
+                v-model.trim="activeName"
+                style="flex: 1; height: 100%"
+                @change="changeDevice"
+            >
                 <el-collapse-item title="治理设备" name="0" v-if="zlDeviceData.length != 0">
                     <el-select v-model.trim="process" clearable placeholder="请选择状态" class="mb10">
                         <el-option label="功能调试" value="2"></el-option>
@@ -29,13 +50,30 @@
                         <el-option label="正式投运" value="4"></el-option>
                     </el-select>
                     <el-tree
-                        :style="{ height: bxsDeviceData.length != 0 ? 'calc(100vh - 340px)' : 'calc(100vh - 278px)' }"
-                        ref="treeRef1" :props="defaultProps" highlight-current :filter-node-method="filterNode"
-                        node-key="id" :default-expand-all="false" v-bind="$attrs" :data="zlDevList" style="overflow: auto">
+                        :style="{
+                            height:
+                                bxsDeviceData.length != 0
+                                    ? `calc(100vh - 380px - ${props.height}px)`
+                                    : 'calc(100vh - 278px)'
+                        }"
+                        ref="treeRef1"
+                        :props="defaultProps"
+                        highlight-current
+                        :filter-node-method="filterNode"
+                        node-key="id"
+                        :default-expand-all="false"
+                        v-bind="$attrs"
+                        :data="zlDevList"
+                        style="overflow: auto"
+                    >
                         <template #default="{ node, data }">
                             <span class="custom-tree-node">
-                                <Icon :name="data.icon" style="font-size: 16px" :style="{ color: data.color }"
-                                    v-if="data.icon" />
+                                <Icon
+                                    :name="data.icon"
+                                    style="font-size: 16px"
+                                    :style="{ color: data.color }"
+                                    v-if="data.icon"
+                                />
                                 <span style="margin-left: 4px">{{ node.label }}</span>
                             </span>
                         </template>
@@ -43,14 +81,30 @@
                 </el-collapse-item>
                 <el-collapse-item title="便携式设备" name="1" v-if="bxsDeviceData.length != 0">
                     <el-tree
-                        :style="{ height: zlDeviceData.length != 0 ? 'calc(100vh - 280px)' : 'calc(100vh - 238px)' }"
-                        ref="treeRef2" :props="defaultProps" highlight-current :default-expand-all="false"
-                        :filter-node-method="filterNode" node-key="id" :data="bxsDeviceData" v-bind="$attrs"
-                        style="overflow: auto">
+                        :style="{
+                            height:
+                                zlDeviceData.length != 0
+                                    ? `calc(100vh - 340px - ${props.height}px)`
+                                    : 'calc(100vh - 238px)'
+                        }"
+                        ref="treeRef2"
+                        :props="defaultProps"
+                        highlight-current
+                        :default-expand-all="false"
+                        :filter-node-method="filterNode"
+                        node-key="id"
+                        :data="bxsDeviceData"
+                        v-bind="$attrs"
+                        style="overflow: auto"
+                    >
                         <template #default="{ node, data }">
                             <span class="custom-tree-node">
-                                <Icon :name="data.icon" style="font-size: 16px" :style="{ color: data.color }"
-                                    v-if="data.icon" />
+                                <Icon
+                                    :name="data.icon"
+                                    style="font-size: 16px"
+                                    :style="{ color: data.color }"
+                                    v-if="data.icon"
+                                />
                                 <span style="margin-left: 4px">{{ node.label }}</span>
                             </span>
                         </template>
@@ -58,14 +112,30 @@
                 </el-collapse-item>
                 <el-collapse-item title="在线设备" name="2" v-if="frontDeviceData.length != 0">
                     <el-tree
-                        :style="{ height: zlDeviceData.length != 0 ? 'calc(100vh - 280px)' : 'calc(100vh - 238px)' }"
-                        ref="treeRef3" :props="defaultProps" highlight-current :default-expand-all="false"
-                        :filter-node-method="filterNode" node-key="id" :data="frontDeviceData" v-bind="$attrs"
-                        style="overflow: auto">
+                        :style="{
+                            height:
+                                zlDeviceData.length != 0
+                                    ? `calc(100vh - 340px - ${props.height}px)`
+                                    : 'calc(100vh - 238px)'
+                        }"
+                        ref="treeRef3"
+                        :props="defaultProps"
+                        highlight-current
+                        :default-expand-all="false"
+                        :filter-node-method="filterNode"
+                        node-key="id"
+                        :data="frontDeviceData"
+                        v-bind="$attrs"
+                        style="overflow: auto"
+                    >
                         <template #default="{ node, data }">
                             <span class="custom-tree-node">
-                                <Icon :name="data.icon" style="font-size: 16px" :style="{ color: data.color }"
-                                    v-if="data.icon" />
+                                <Icon
+                                    :name="data.icon"
+                                    style="font-size: 16px"
+                                    :style="{ color: data.color }"
+                                    v-if="data.icon"
+                                />
                                 <span style="margin-left: 4px">{{ node.label }}</span>
                             </span>
                         </template>
@@ -90,13 +160,15 @@ interface Props {
     canExpand?: boolean
     type?: string
     data?: any
+    height?: number
 }
 
 const props = withDefaults(defineProps<Props>(), {
     width: '280px',
     canExpand: true,
     type: '',
-    data: []
+    data: [],
+    height: 0
 })
 const { proxy } = useCurrentInstance()
 const menuCollapse = ref(false)
@@ -124,19 +196,18 @@ watch(
                     item.children.map((vv: any) => {
                         zlDeviceData.value.push(vv)
                     })
-                    zlDevList.value = JSON.parse(JSON.stringify(zlDeviceData.value))    
+                    zlDevList.value = JSON.parse(JSON.stringify(zlDeviceData.value))
                 } else if (item.name == '便携式设备') {
                     bxsDeviceData.value = []
                     item.children.map((vv: any) => {
                         bxsDeviceData.value.push(vv)
                     })
-                }else if (item.name == '在线设备') {
+                } else if (item.name == '在线设备') {
                     frontDeviceData.value = []
 
                     item.children.map((vv: any) => {
                         frontDeviceData.value.push(vv)
                     })
-
                 }
             })
         }
@@ -157,8 +228,9 @@ watch(filterText, val => {
     }
 })
 watch(process, val => {
-    if (val == '') {
+    if (val == '' || val == undefined) {
         zlDevList.value = JSON.parse(JSON.stringify(zlDeviceData.value))
+        console.log('🚀 ~ zlDevList.value:', zlDeviceData.value)
     } else {
         zlDevList.value = filterProcess(JSON.parse(JSON.stringify(zlDeviceData.value)))
     }
@@ -176,7 +248,7 @@ function filterProcess(nodes: any) {
             const children = node.children ? filterProcess(node.children) : []
 
             // 如果当前节点的process=4，或者有子节点满足条件，则保留当前节点
-            if (  node.process == process.value || children.length > 0) {
+            if (node.process == process.value || children.length > 0) {
                 return {
                     ...node,
                     children: children
@@ -283,7 +355,7 @@ const treeRef1 = ref<InstanceType<typeof ElTree>>()
 const treeRef2 = ref<InstanceType<typeof ElTree>>()
 //前置
 const treeRef3 = ref<InstanceType<typeof ElTree>>()
-defineExpose({ treeRef1, treeRef2 })
+defineExpose({ treeRef1, treeRef2, treeRef3 })
 onMounted(() => {
     setTimeout(() => {
         if (zlDeviceData.value.length != 0) {
@@ -293,6 +365,9 @@ onMounted(() => {
         if (zlDeviceData.value.length === 0 && bxsDeviceData.value.length != 0) {
             activeName.value = '1'
         }
+        if (zlDeviceData.value.length === 0 && bxsDeviceData.value.length === 0) {
+            activeName.value = '2'
+        }
         if (!zlDeviceData.value && !bxsDeviceData.value) {
             activeName.value = ''
         }

src/components/tree/govern/cloudDeviceEntryTree.vue

@@ -1,5 +1,5 @@
 <template>
-    <Tree ref="treRef" :width="width" :data="tree" default-expand-all @changePointType="changePointType" @onAdd="onAdd"/>
+    <Tree ref="treRef" :width="width" :showPush="props.showPush"  :data="tree" default-expand-all @changePointType="changePointType" @onAdd="onAdd"/>
 </template>
 
 <script lang="ts" setup>
@@ -12,9 +12,11 @@ import { useDictData } from '@/stores/dictData'
 
 interface Props {
     template?: boolean
+    showPush?: boolean
 }
 const props = withDefaults(defineProps<Props>(), {
-    template: false
+    template: false,
+    showPush: false
 })
 defineOptions({
     name: 'govern/deviceTree'
@@ -95,13 +97,16 @@ const info = (selectedNodeId?: string) => {
                 tree.value = []
             }
             nextTick(() => {
+              
                 if (arr1.length) {
-                    // 安全检查 treRef 和 treeRef1 是否存在
-                    if (treRef.value && treRef.value.treeRef1 && treRef.value.treeRef1.setCurrentKey) {
+                    // 安全检查 treRef 和 treeRef 是否存在
+                        console.log("🚀 ~ info ~ treRef.value && treRef.value.treeRef && treRef.value.treeRef.setCurrentKey:", treRef.value && treRef.value.treeRef1 && treRef.value.treeRef1.setCurrentKey)
+
+                    if (treRef.value && treRef.value.treeRef && treRef.value.treeRef.setCurrentKey) {
                         // 如果传入了要选中的节点ID，则选中该节点，否则选中第一个节点
                         console.log('selectedNodeId:', selectedNodeId);
                         if (selectedNodeId) {
-                            treRef.value.treeRef1.setCurrentKey(selectedNodeId);
+                            treRef.value.treeRef.setCurrentKey(selectedNodeId);
                             // 查找对应的节点数据并触发事件
                             let selectedNode = null;
                             const findNode = (nodes: any[]) => {
@@ -127,7 +132,7 @@ const info = (selectedNodeId?: string) => {
                             }
                         } else {
                             // 初始化选中第一个节点
-                            treRef.value.treeRef1.setCurrentKey(arr1[0].id);
+                            treRef.value.treeRef.setCurrentKey(arr1[0].id);
                             emit('init', {
                                 level: 2,
                                 ...arr1[0]
@@ -153,7 +158,7 @@ const onAdd = () => {
     emit('onAdd')
 }
 if (props.template) {
-    getTemplateByDept({ id: dictData.state.area[0].id })
+    getTemplateByDept({ id: dictData.state.area[0]?.id })
         .then((res: any) => {
             emit('Policy', res.data)
             info()

src/components/tree/govern/cloudDeviceEntryTreeZL.vue

@@ -0,0 +1,106 @@
+<template>
+    <Tree
+        ref="treRef"
+        :width="width"
+        :showPush="props.showPush"
+        :data="tree"
+        default-expand-all
+        @changePointType="changePointType"
+        @onAdd="onAdd"
+    />
+</template>
+
+<script lang="ts" setup>
+import { ref, nextTick, onMounted, defineProps } from 'vue'
+import Tree from '../index.vue'
+import { getLineTree, objTree } from '@/api/cs-device-boot/csLedger'
+import { useConfig } from '@/stores/config'
+import { getTemplateByDept } from '@/api/harmonic-boot/luckyexcel'
+import { useDictData } from '@/stores/dictData'
+
+interface Props {
+    template?: boolean
+    showPush?: boolean
+}
+const props = withDefaults(defineProps<Props>(), {
+    template: false,
+    showPush: false
+})
+defineOptions({
+    name: 'govern/deviceTree'
+})
+
+const emit = defineEmits(['init', 'checkChange', 'pointTypeChange', 'Policy', 'onAdd'])
+const config = useConfig()
+const tree = ref()
+const dictData = useDictData()
+const treRef = ref()
+const width = ref('')
+
+const info = (selectedNodeId?: string) => {
+    tree.value = []
+    let arr1: any[] = []
+    objTree().then(res => {
+        try {
+            res.data.map((item: any) => {
+                item.icon = 'el-icon-HomeFilled'
+                item.level = 1
+                item.color = config.getColorVal('elementUiPrimary')
+                item.children.forEach((item: any) => {
+                    item.icon = 'el-icon-List'
+                    item.level = 2
+                    item.color = config.getColorVal('elementUiPrimary')
+                    item.children.forEach((item2: any) => {
+                        arr1.push(item2)
+                        item2.icon = 'el-icon-Platform'
+                        item2.level = 3
+                        item2.color = config.getColorVal('elementUiPrimary')
+                    })
+                })
+            })
+            tree.value = res.data
+            nextTick(() => {
+                if (arr1.length) {
+                    //初始化选中
+                    treRef.value.treeRef.setCurrentKey(arr1[0].id)
+                    // 注册父组件事件
+                    emit('init', arr1[0])
+                    return
+                } else {
+                    emit('init')
+                    return
+                }
+            })
+        } catch (error) {
+            console.error('Error in processing getCldTree response:', error)
+        }
+    })
+}
+
+const changePointType = (val: any, obj: any) => {
+    emit('pointTypeChange', val, obj)
+}
+
+const onAdd = () => {
+    emit('onAdd')
+}
+if (props.template) {
+    getTemplateByDept({ id: dictData.state.area[0]?.id })
+        .then((res: any) => {
+            emit('Policy', res.data)
+            info()
+        })
+        .catch(err => {
+            info()
+        })
+} else {
+    info()
+}
+
+// 暴露 info 方法给父组件调用
+defineExpose({
+    info
+})
+
+onMounted(() => {})
+</script>

src/components/tree/govern/deviceTree.vue

@@ -5,6 +5,7 @@
         :default-checked-keys="defaultCheckedKeys"
         :show-checkbox="props.showCheckbox"
         :data="tree"
+        :height="props.height"
         @changeDeviceType="changeDeviceType"
     />
 </template>
@@ -21,10 +22,12 @@ const props = withDefaults(
     defineProps<{
         showCheckbox?: boolean
         defaultCheckedKeys?: any
+        height?: number
     }>(),
     {
         showCheckbox: false,
-        defaultCheckedKeys: []
+        defaultCheckedKeys: [],
+        height:0
     }
 )
 const emit = defineEmits(['init', 'checkChange', 'deviceTypeChange'])
@@ -32,7 +35,7 @@ const config = useConfig()
 const tree = ref()
 const treRef = ref()
 const changeDeviceType = (val: any, obj: any) => {
-    console.log("🚀 ~ changeDeviceType ~ val:", val,obj)
+    console.log('🚀 ~ changeDeviceType ~ val:', val, obj)
     emit('deviceTypeChange', val, obj)
 }
 getDeviceTree().then(res => {
@@ -50,7 +53,7 @@ getDeviceTree().then(res => {
                     item2.color = config.getColorVal('elementUiPrimary')
                     item2.children.forEach((item3: any) => {
                         item3.icon = 'el-icon-Platform'
-                         item3.level = 2
+                        item3.level = 2
                         item3.color = config.getColorVal('elementUiPrimary')
                         if (item3.comFlag === 1) {
                             item3.color = '#e26257 !important'
@@ -83,8 +86,8 @@ getDeviceTree().then(res => {
                     // })
                 })
             })
-        }else if (item.name == '在线设备') { 
-                item.children.forEach((item: any) => {
+        } else if (item.name == '在线设备') {
+            item.children.forEach((item: any) => {
                 item.icon = 'el-icon-HomeFilled'
                 item.color = config.getColorVal('elementUiPrimary')
                 item.children.forEach((item2: any) => {
@@ -102,43 +105,42 @@ getDeviceTree().then(res => {
             })
         }
     })
-    console.log("🚀 ~ file: deviceTree.vue ~ line 18 ~ getDeviceTree ~ tree:", arr,arr2,arr3)
+    console.log('🚀 ~ file: deviceTree.vue ~ line 18 ~ getDeviceTree ~ tree:', arr, arr2, arr3)
     tree.value = res.data
-  
+
     nextTick(() => {
-        if (arr.length) {
-            treRef.value.treeRef1.setCurrentKey(arr[0].id)
-            // 注册父组件事件
-            emit('init', {
-                level: 2,
-                ...arr[0]
-            })
-            return
-        }
-        if (arr2.length) {
-            treRef.value.treeRef2.setCurrentKey(arr2[0].id)
-            // 注册父组件事件
-            emit('init', {
-                level: 2,
-                ...arr2[0]
-            })
-            return
-        }
-        console.log("🚀 ~ file: deviceTree.vue ~ line 33 ~ getDeviceTree ~ tree:", arr3.length)
-        if (arr3.length) {
-            console.log("🚀 ~ file: deviceTree.vue ~ line 33 ~ getDeviceTree ~ tree:", arr3)
-            treRef.value.treeRef3.setCurrentKey(arr3[0].id)
-            // 注册父组件事件
-            emit('init', {
-                level: 2,
-                ...arr3[0]
-            })
-            return
-        }
-        else {
-            emit('init')
-            return
-        }
+        setTimeout(() => {
+            if (arr.length > 0) {
+                treRef.value.treeRef1.setCurrentKey(arr[0].id)
+                // 注册父组件事件
+                emit('init', {
+                    level: 2,
+                    ...arr[0]
+                })
+                return
+            } else if (arr2.length > 0) {
+                treRef.value.treeRef2.setCurrentKey(arr2[0].id)
+                // 注册父组件事件
+                emit('init', {
+                    level: 2,
+                    ...arr2[0]
+                })
+                return
+            } else if (arr3.length > 0) {
+                console.log('🚀 ~ arr3:', arr3)
+
+                treRef.value.treeRef3.setCurrentKey(arr3[0].id)
+                // 注册父组件事件
+                emit('init', {
+                    level: 2,
+                    ...arr3[0]
+                })
+                return
+            } else {
+                emit('init')
+                return
+            }
+        }, 500)
     })
 })
 const handleCheckChange = (data: any, checked: any, indeterminate: any) => {

src/components/tree/govern/pointTree.vue

@@ -99,38 +99,38 @@ const info = () => {
         })
         tree.value = res.data
         nextTick(() => {
-            if (arr1.length) {
-                //初始化选中
-                treRef.value.treeRef1.setCurrentKey(arr1[0].id)
-                // 注册父组件事件
-                emit('init', {
-                    level: 2,
-                    ...arr1[0]
-                })
-                return
-            }
-            if (arr2.length) {
-                //初始化选中
-                treRef.value.treeRef2.setCurrentKey(arr2[0].id)
-                // 注册父组件事件
-                emit('init', {
-                    level: 2,
-                    ...arr2[0]
-                })
-                return
-            }
-            if(arr3.length){
-                treRef.value.treeRef3.setCurrentKey(arr3[0].id)
-                emit('init', {
-                    level: 2,
-                    ...arr3[0]
-                })
-                return
-            }
-            else {
-                emit('init')
-                return
-            }
+            setTimeout(() => {
+                if (arr1.length > 0) {
+                    //初始化选中
+                    treRef.value?.treeRef1.setCurrentKey(arr1[0].id)
+                    // 注册父组件事件
+                    emit('init', {
+                        level: 2,
+                        ...arr1[0]
+                    })
+                    return
+                } else if (arr2.length > 0) {
+                    //初始化选中
+                    treRef.value?.treeRef2.setCurrentKey(arr2[0].id)
+                    // 注册父组件事件
+                    emit('init', {
+                        level: 2,
+                        ...arr2[0]
+                    })
+                    return
+                } else if (arr3.length > 0) {
+
+                    treRef.value?.treeRef3?.setCurrentKey(arr3[0].id)
+                    emit('init', {
+                        level: 2,
+                        ...arr3[0]
+                    })
+                    return
+                } else {
+                    emit('init')
+                    return
+                }
+            }, 500)
         })
     })
 }
@@ -138,7 +138,7 @@ const changePointType = (val: any, obj: any) => {
     emit('pointTypeChange', val, obj)
 }
 if (props.template) {
-    getTemplateByDept({ id: dictData.state.area[0].id })
+    getTemplateByDept({ id: dictData.state.area[0]?.id })
         .then((res: any) => {
             emit('Policy', res.data)
             info()

src/components/tree/govern/pointTreeWx.vue

@@ -1,181 +1,196 @@
-<template>
-    <div>
-        <div style="transition: all 0.3s; overflow: hidden; height: 100%">
-
-            <div class="cn-tree">
-                <div style="display: flex; align-items: center" class="mb10">
-                    <el-input maxlength="32" show-word-limit v-model.trim="filterText" placeholder="请输入内容" clearable>
-                        <template #prefix>
-                            <Icon name="el-icon-Search" style="font-size: 16px" />
-                        </template>
-                    </el-input>
-                </div>
-                <el-tree style="flex: 1; overflow: auto" :props="defaultProps" highlight-current
-                    :filter-node-method="filterNode" node-key="id" v-bind="$attrs" default-expand-all :data="tree"
-                    ref="treRef" @node-click="clickNode" :expand-on-click-node="false">
-                    <template #default="{ node, data }">
-                        <span class="custom-tree-node">
-                            <div class="left">
-                                <Icon :name="data.icon" style="font-size: 16px" :style="{ color: data.color }"
-                                    v-if="data.icon" />
-                                <span>{{ node.label }}</span>
-                            </div>
-
-                        </span>
-                    </template>
-                </el-tree>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script lang="ts" setup>
-import { ref, nextTick, watch, defineProps, defineEmits } from 'vue'
-import { getSchemeTree, getTestRecordInfo } from '@/api/cs-device-boot/planData'
-import { useConfig } from '@/stores/config'
-import useCurrentInstance from '@/utils/useCurrentInstance'
-import { ElTree } from 'element-plus'
-import { getTemplateByDept } from '@/api/harmonic-boot/luckyexcel'
-import { useDictData } from '@/stores/dictData'
-defineOptions({
-    name: 'govern/schemeTree'
-})
-
-interface Props {
-    template?: boolean
-
-}
-const dictData = useDictData()
-const props = withDefaults(defineProps<Props>(), {
-    template: false,
-
-})
-const filterText = ref('')
-watch(filterText, val => {
-    treRef.value!.filter(val)
-})
-
-const filterNode = (value: string, data: any, node: any) => {
-    if (!value) return true
-    // return data.name.includes(value)
-    if (data.name) {
-        return chooseNode(value, data, node)
-    }
-}
-const chooseNode = (value: string, data: any, node: any) => {
-    if (data.name.indexOf(value) !== -1) {
-        return true
-    }
-    const level = node.level
-    // 如果传入的节点本身就是一级节点就不用校验了
-    if (level === 1) {
-        return false
-    }
-    // 先取当前节点的父节点
-    let parentData = node.parent
-    // 遍历当前节点的父节点
-    let index = 0
-    while (index < level - 1) {
-        // 如果匹配到直接返回，此处name值是中文字符，enName是英文字符。判断匹配中英文过滤
-        if (parentData.data.name.indexOf(value) !== -1) {
-            return true
-        }
-        // 否则的话再往上一层做匹配
-        parentData = parentData.parent
-        index++
-    }
-    // 没匹配到返回false
-    return false
-}
-/** 树形结构数据 */
-const defaultProps = {
-    children: 'children',
-    label: 'name',
-    value: 'id'
-}
-
-
-const emit = defineEmits(['init', 'checkChange', 'nodeChange', 'editNode', 'getChart', 'Policy'])
-const config = useConfig()
-const tree = ref()
-const treRef = ref()
-const id: any = ref(null)
-const treeData = ref({})
-//获取方案树形数据
-const getTreeList = () => {
-    getSchemeTree().then(res => {
-        let arr: any[] = []
-
-        res.data.forEach((item: any) => {
-            item.icon = 'el-icon-Menu'
-            item.color = config.getColorVal('elementUiPrimary')
-            item?.children.forEach((item2: any) => {
-                item2.icon = 'el-icon-Document'
-                item2.color = config.getColorVal('elementUiPrimary')
-                arr.push(item2)
-            })
-        })
-        tree.value = res.data
-        nextTick(() => {
-            if (arr.length) {
-                treRef.value.setCurrentKey(id.value || arr[0].id)
-                let list = id.value ? arr.find((item: any) => item.id == id.value) : arr[0]
-                // 注册父组件事件
-                emit('init', {
-                    level: 2,
-                    ...list
-                })
-            } else {
-                emit('init')
-            }
-        })
-    })
-}
-
-//方案id
-const planId: any = ref('')
-
-const clickNode = (e: anyObj) => {
-    e?.children ? (planId.value = e.id) : (planId.value = e.pid)
-    id.value = e.id
-    emit('nodeChange', e)
-}
-
-
-if (props.template) {
-    getTemplateByDept({ id: dictData.state.area[0].id }).then((res: any) => {
-        emit('Policy', res.data)
-        getTreeList()
-    }).catch(err => {
-        getTreeList()
-    })
-} else {
-    getTreeList()
-}
-
-</script>
-<style lang="scss" scoped>
-.cn-tree {
-    flex-shrink: 0;
-    display: flex;
-    flex-direction: column;
-    box-sizing: border-box;
-    padding: 10px;
-    height: 100%;
-    width: 100%;
-    height: calc(100vh - 125px);
-    overflow-y: auto;
-
-    :deep(.el-tree) {
-        border: 1px solid var(--el-border-color);
-    }
-
-    :deep(.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content) {
-        background-color: var(--el-color-primary-light-7);
-    }
-
-    .menu-collapse {
-        color: var(--el-color-primary);
-    }
-}
-</style>
+<template>
+    <div>
+        <div style="transition: all 0.3s; overflow: hidden; height: 100%">
+            <div class="cn-tree">
+                <div style="display: flex; align-items: center" class="mb10">
+                    <el-input
+                        maxlength="32"
+                        show-word-limit
+                        v-model.trim="filterText"
+                        placeholder="请输入内容"
+                        clearable
+                    >
+                        <template #prefix>
+                            <Icon name="el-icon-Search" style="font-size: 16px" />
+                        </template>
+                    </el-input>
+                </div>
+                <el-tree
+                    style="flex: 1; overflow: auto"
+                    :props="defaultProps"
+                    highlight-current
+                    :filter-node-method="filterNode"
+                    node-key="id"
+                    v-bind="$attrs"
+                    default-expand-all
+                    :data="tree"
+                    ref="treRef"
+                    @node-click="clickNode"
+                    :expand-on-click-node="false"
+                >
+                    <template #default="{ node, data }">
+                        <span class="custom-tree-node">
+                            <div class="left" style="display: flex; align-items: center">
+                                <Icon
+                                    :name="data.icon"
+                                    style="font-size: 16px"
+                                    :style="{ color: data.color }"
+                                    v-if="data.icon"
+                                />
+                                <span style="margin-left: 5px;">{{ node.label }}</span>
+                            </div>
+                        </span>
+                    </template>
+                </el-tree>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { ref, nextTick, watch, defineProps, defineEmits } from 'vue'
+import { getSchemeTree, getTestRecordInfo } from '@/api/cs-device-boot/planData'
+import { useConfig } from '@/stores/config'
+import useCurrentInstance from '@/utils/useCurrentInstance'
+import { ElTree } from 'element-plus'
+import { getTemplateByDept } from '@/api/harmonic-boot/luckyexcel'
+import { useDictData } from '@/stores/dictData'
+defineOptions({
+    name: 'govern/schemeTree'
+})
+
+interface Props {
+    template?: boolean
+}
+const dictData = useDictData()
+const props = withDefaults(defineProps<Props>(), {
+    template: false
+})
+const filterText = ref('')
+watch(filterText, val => {
+    treRef.value!.filter(val)
+})
+
+const filterNode = (value: string, data: any, node: any) => {
+    if (!value) return true
+    // return data.name.includes(value)
+    if (data.name) {
+        return chooseNode(value, data, node)
+    }
+}
+const chooseNode = (value: string, data: any, node: any) => {
+    if (data.name.indexOf(value) !== -1) {
+        return true
+    }
+    const level = node.level
+    // 如果传入的节点本身就是一级节点就不用校验了
+    if (level === 1) {
+        return false
+    }
+    // 先取当前节点的父节点
+    let parentData = node.parent
+    // 遍历当前节点的父节点
+    let index = 0
+    while (index < level - 1) {
+        // 如果匹配到直接返回，此处name值是中文字符，enName是英文字符。判断匹配中英文过滤
+        if (parentData.data.name.indexOf(value) !== -1) {
+            return true
+        }
+        // 否则的话再往上一层做匹配
+        parentData = parentData.parent
+        index++
+    }
+    // 没匹配到返回false
+    return false
+}
+/** 树形结构数据 */
+const defaultProps = {
+    children: 'children',
+    label: 'name',
+    value: 'id'
+}
+
+const emit = defineEmits(['init', 'checkChange', 'nodeChange', 'editNode', 'getChart', 'Policy'])
+const config = useConfig()
+const tree = ref()
+const treRef = ref()
+const id: any = ref(null)
+const treeData = ref({})
+//获取方案树形数据
+const getTreeList = () => {
+    getSchemeTree().then(res => {
+        let arr: any[] = []
+
+        res.data.forEach((item: any) => {
+            item.icon = 'el-icon-Menu'
+            item.color = config.getColorVal('elementUiPrimary')
+            item?.children.forEach((item2: any) => {
+                item2.icon = 'el-icon-Document'
+                item2.color = config.getColorVal('elementUiPrimary')
+                arr.push(item2)
+            })
+        })
+        tree.value = res.data
+        nextTick(() => {
+            if (arr.length) {
+                treRef.value.setCurrentKey(id.value || arr[0].id)
+                let list = id.value ? arr.find((item: any) => item.id == id.value) : arr[0]
+                // 注册父组件事件
+                emit('init', {
+                    level: 2,
+                    ...list
+                })
+            } else {
+                emit('init')
+            }
+        })
+    })
+}
+
+//方案id
+const planId: any = ref('')
+
+const clickNode = (e: anyObj) => {
+    e?.children ? (planId.value = e.id) : (planId.value = e.pid)
+    id.value = e.id
+    emit('nodeChange', e)
+}
+
+if (props.template) {
+    getTemplateByDept({ id: dictData.state.area[0]?.id })
+        .then((res: any) => {
+            emit('Policy', res.data)
+            getTreeList()
+        })
+        .catch(err => {
+            getTreeList()
+        })
+} else {
+    getTreeList()
+}
+</script>
+<style lang="scss" scoped>
+.cn-tree {
+    flex-shrink: 0;
+    display: flex;
+    flex-direction: column;
+    box-sizing: border-box;
+    padding: 10px;
+    height: 100%;
+    width: 100%;
+    height: calc(100vh - 125px);
+    overflow-y: auto;
+
+    :deep(.el-tree) {
+        border: 1px solid var(--el-border-color);
+    }
+
+    :deep(.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content) {
+        background-color: var(--el-color-primary-light-7);
+    }
+
+    .menu-collapse {
+        color: var(--el-color-primary);
+    }
+}
+</style>

src/components/tree/govern/selectTree.vue

@@ -87,7 +87,7 @@ const handleCheckedNodesChange = (nodes: any[]) => {
 
 
 if (props.template) {
-    getTemplateByDept({ id: dictData.state.area[0].id })
+    getTemplateByDept({ id: dictData.state.area[0]?.id })
         .then((res: any) => {
             emit('Policy', res.data)
             info()

src/components/tree/index.vue

@@ -10,7 +10,7 @@
                         <Icon name='el-icon-Search' style='font-size: 16px' />
                     </template>
                 </el-input>
-                <el-tooltip placement="bottom" :hide-after="0">
+                <el-tooltip placement="bottom" :hide-after="0" v-if="props.showPush">
                         <template #content>
                             <span>台账推送</span>
                         </template>
@@ -23,12 +23,12 @@
                         :style="{ color: config.getColorVal('elementUiPrimary') }" 
                         @click="onAdd" />
                 </el-tooltip>
-                <!-- <Icon @click='onMenuCollapse' :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
+                <!-- <Icon @click='onMenuCollapse' :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'" v-else
                     :class="menuCollapse ? 'unfold' : ''" size='18' class='fold ml10 menu-collapse'
                     style='cursor: pointer' v-if='props.canExpand' /> -->
             </div>
 
-            <el-tree :style="{ height:  'calc(100vh - 200px)' }"
+            <el-tree :style="{ height:  'calc(100vh - 190px)' }"
             style=' overflow: auto;' ref='treeRef' :props='defaultProps' highlight-current :default-expand-all="false"
                 @check-change="checkTreeNodeChange" :filter-node-method='filterNode' node-key='id' v-bind='$attrs'>
                 <template #default='{ node, data }'>
@@ -58,11 +58,13 @@ defineOptions({
 interface Props {
     width?: string
     canExpand?: boolean
+    showPush?: boolean
 }
 
 const props = withDefaults(defineProps<Props>(), {
     width: '280px',
-    canExpand: true
+    canExpand: true,
+    showPush: false
 })
 const config = useConfig()
 const { proxy } = useCurrentInstance()

src/components/tree/point.vue

@@ -1,9 +1,16 @@
 <!-- 设备监控使用折叠面板渲染多个tree -->
 <template>
     <div :style="{ width: menuCollapse ? '40px' : props.width }" style="display: flex; overflow: hidden">
-        <Icon v-show="menuCollapse" @click="onMenuCollapse" :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
-            :class="menuCollapse ? 'unfold' : ''" size="18" class="fold ml10 mt20 menu-collapse" style="cursor: pointer"
-            v-if="route.path != '/admin/govern/reportCore/statistics/index'" />
+        <Icon
+            v-show="menuCollapse"
+            @click="onMenuCollapse"
+            :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
+            :class="menuCollapse ? 'unfold' : ''"
+            size="18"
+            class="fold ml10 mt20 menu-collapse"
+            style="cursor: pointer"
+            v-if="route.path != '/admin/govern/reportCore/statistics/index'"
+        />
         <div class="cn-tree" :style="{ opacity: menuCollapse ? 0 : 1, display: menuCollapse ? 'none' : '' }">
             <div style="display: flex; align-items: center" class="mb10">
                 <el-input maxlength="32" show-word-limit v-model.trim="filterText" placeholder="请输入内容" clearable>
@@ -11,13 +18,23 @@
                         <Icon name="el-icon-Search" style="font-size: 16px" />
                     </template>
                 </el-input>
-                <Icon @click="onMenuCollapse" :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
-                    :class="menuCollapse ? 'unfold' : ''" size="18" class="fold ml10 menu-collapse"
+                <Icon
+                    @click="onMenuCollapse"
+                    :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
+                    :class="menuCollapse ? 'unfold' : ''"
+                    size="18"
+                    class="fold ml10 menu-collapse"
                     style="cursor: pointer"
-                    v-if="props.canExpand && route.path != '/admin/govern/reportCore/statistics/index'" />
+                    v-if="props.canExpand && route.path != '/admin/govern/reportCore/statistics/index'"
+                />
             </div>
-            <el-collapse :accordion="true" v-model.trim="activeName" style="flex: 1; height: 100%"
-                @change="changeDevice">
+
+            <el-collapse
+                :accordion="true"
+                v-model.trim="activeName"
+                style="flex: 1; height: 100%"
+                @change="changeDevice"
+            >
                 <el-collapse-item title="治理设备" name="0" v-if="zlDeviceData.length != 0">
                     <el-select v-model.trim="process" clearable placeholder="请选择状态" class="mb10">
                         <el-option label="功能调试" value="2"></el-option>
@@ -26,14 +43,25 @@
                     </el-select>
 
                     <el-tree
-                        :style="{ height: bxsDeviceData.length != 0 ? 'calc(100vh - 340px)' : 'calc(100vh - 278px)' }"
-                        ref="treeRef1" :props="defaultProps" highlight-current :filter-node-method="filterNode"
-                        node-key="id"  v-bind="$attrs" :data="zlDevList" style="overflow: auto"
-                        :default-expand-all="false">
+                        :style="{ height: bxsDeviceData.length != 0 ? 'calc(100vh - 380px)' : 'calc(100vh - 278px)' }"
+                        ref="treeRef1"
+                        :props="defaultProps"
+                        highlight-current
+                        :filter-node-method="filterNode"
+                        node-key="id"
+                        v-bind="$attrs"
+                        :data="zlDevList"
+                        style="overflow: auto"
+                        :default-expand-all="false"
+                    >
                         <template #default="{ node, data }">
                             <span class="custom-tree-node">
-                                <Icon :name="data.icon" style="font-size: 16px" :style="{ color: data.color }"
-                                    v-if="data.icon" />
+                                <Icon
+                                    :name="data.icon"
+                                    style="font-size: 16px"
+                                    :style="{ color: data.color }"
+                                    v-if="data.icon"
+                                />
                                 <span style="margin-left: 4px">{{ node.label }}</span>
                             </span>
                         </template>
@@ -41,14 +69,25 @@
                 </el-collapse-item>
                 <el-collapse-item title="便携式设备" name="1" v-if="bxsDeviceData.length != 0">
                     <el-tree
-                        :style="{ height: zlDeviceData.length != 0 ? 'calc(100vh - 330px)' : 'calc(100vh - 238px)' }"
-                        ref="treeRef2" :props="defaultProps" highlight-current :default-expand-all="false"
-                        :filter-node-method="filterNode" node-key="id" :data="bxsDeviceData" v-bind="$attrs"
-                        style="overflow: auto" >
+                        :style="{ height: zlDeviceData.length != 0 ? 'calc(100vh - 340px)' : 'calc(100vh - 238px)' }"
+                        ref="treeRef2"
+                        :props="defaultProps"
+                        highlight-current
+                        :default-expand-all="false"
+                        :filter-node-method="filterNode"
+                        node-key="id"
+                        :data="bxsDeviceData"
+                        v-bind="$attrs"
+                        style="overflow: auto"
+                    >
                         <template #default="{ node, data }">
                             <span class="custom-tree-node">
-                                <Icon :name="data.icon" style="font-size: 16px" :style="{ color: data.color }"
-                                    v-if="data.icon" />
+                                <Icon
+                                    :name="data.icon"
+                                    style="font-size: 16px"
+                                    :style="{ color: data.color }"
+                                    v-if="data.icon"
+                                />
                                 <span style="margin-left: 4px">{{ node.label }}</span>
                             </span>
                         </template>
@@ -56,14 +95,25 @@
                 </el-collapse-item>
                 <el-collapse-item title="在线设备" name="2" v-if="yqfDeviceData.length != 0">
                     <el-tree
-                        :style="{ height: zlDeviceData.length != 0 ? 'calc(100vh - 330px)' : 'calc(100vh - 238px)' }"
-                        ref="treeRef3" :props="defaultProps" highlight-current :default-expand-all="false"
-                        :filter-node-method="filterNode" node-key="id" :data="yqfDeviceData" v-bind="$attrs"
-                        style="overflow: auto">
+                        :style="{ height: zlDeviceData.length != 0 ? 'calc(100vh - 340px)' : 'calc(100vh - 238px)' }"
+                        ref="treeRef3"
+                        :props="defaultProps"
+                        highlight-current
+                        :default-expand-all="false"
+                        :filter-node-method="filterNode"
+                        node-key="id"
+                        :data="yqfDeviceData"
+                        v-bind="$attrs"
+                        style="overflow: auto"
+                    >
                         <template #default="{ node, data }">
                             <span class="custom-tree-node">
-                                <Icon :name="data.icon" style="font-size: 16px" :style="{ color: data.color }"
-                                    v-if="data.icon" />
+                                <Icon
+                                    :name="data.icon"
+                                    style="font-size: 16px"
+                                    :style="{ color: data.color }"
+                                    v-if="data.icon"
+                                />
                                 <span style="margin-left: 4px">{{ node.label }}</span>
                             </span>
                         </template>
@@ -118,27 +168,25 @@ watch(
     () => props.data,
     (val, oldVal) => {
         if (val && val.length != 0) {
-            
             val.map((item: any) => {
                 if (item.name == '治理设备') {
                     zlDeviceData.value = []
                     item.children.map((vv: any) => {
                         zlDeviceData.value.push(vv)
                     })
-                zlDevList.value = JSON.parse(JSON.stringify(zlDeviceData.value))    
+                    zlDevList.value = JSON.parse(JSON.stringify(zlDeviceData.value))
                 } else if (item.name == '便携式设备') {
                     bxsDeviceData.value = []
                     item.children.map((vv: any) => {
                         bxsDeviceData.value.push(vv)
                     })
-                }else if (item.name == '在线设备') {
+                } else if (item.name == '在线设备') {
                     yqfDeviceData.value = []
                     item.children.map((vv: any) => {
                         yqfDeviceData.value.push(vv)
                     })
                 }
             })
-
         }
     },
     {
@@ -157,12 +205,10 @@ watch(filterText, val => {
     }
 })
 watch(process, val => {
-    
-    if (val == '') {
+        if (val == '' || val == undefined) {
         zlDevList.value = JSON.parse(JSON.stringify(zlDeviceData.value))
     } else {
         zlDevList.value = filterProcess(JSON.parse(JSON.stringify(zlDeviceData.value)))
-      
     }
 
     setTimeout(() => {
@@ -170,9 +216,8 @@ watch(process, val => {
     }, 0)
 })
 
-
-
 const changeDevice = (val: any) => {
+    console.log('🚀 ~ changeDevice ~ val:', val)
 
     let arr1: any = []
     //zlDeviceData
@@ -263,8 +308,7 @@ function filterProcess(nodes: any) {
             // 1. 如果有满足条件的子节点则保留
             // 2. 如果本身 process 值匹配则保留
             // 3. 如果是叶子节点也保留（监测点通常没有子节点）
-            if (children.length > 0 || node.process == process.value || 
-                (!node.children || node.children.length === 0)) {
+            if (children.length > 0 || node.process == process.value || !node.children || node.children.length === 0) {
                 return {
                     ...node,
                     children: children
@@ -276,7 +320,6 @@ function filterProcess(nodes: any) {
         .filter(Boolean) // 移除null节点
 }
 
-
 // function filterProcess(nodes: any) {
 //     if (process.value == '') {
 //         return nodes
@@ -332,11 +375,9 @@ const treeRef1 = ref<InstanceType<typeof ElTree>>()
 const treeRef2 = ref<InstanceType<typeof ElTree>>()
 //在线
 const treeRef3 = ref<InstanceType<typeof ElTree>>()
-defineExpose({ treeRef1, treeRef2 })
+defineExpose({ treeRef1, treeRef2, treeRef3 })
 onMounted(() => {
-     
     setTimeout(() => {
-       
         if (zlDeviceData.value.length != 0) {
             zlDevList.value = filterProcess(JSON.parse(JSON.stringify(zlDeviceData.value)))
             activeName.value = '0'
@@ -344,8 +385,11 @@ onMounted(() => {
         if (zlDeviceData.value.length === 0 && bxsDeviceData.value.length != 0) {
             activeName.value = '1'
         }
+        if (zlDeviceData.value.length === 0 && bxsDeviceData.value.length === 0) {
+            activeName.value = '2'
+        }
         if (!zlDeviceData.value && !bxsDeviceData.value) {
-            activeName.value = ''
+            activeName.value = '2'
         }
         nextTick(() => {
             changeDevice(activeName.value)

src/layouts/admin/components/navBar/tabs.vue

@@ -1,242 +1,246 @@
-<template>
-    <div class="nav-tabs" ref="tabScrollbarRef">
-        <div
-            v-for="(item, idx) in navTabs.state.tabsView"
-            @click="onTab(item)"
-            @contextmenu.prevent="onContextmenu(item, $event)"
-            class="ba-nav-tab"
-            :class="navTabs.state.activeIndex == idx ? 'active' : ''"
-            :ref="tabsRefs.set"
-            :key="idx"
-        >
-            {{ item.meta.title }}
-            <transition @after-leave="selectNavTab(tabsRefs[navTabs.state.activeIndex])" name="el-fade-in">
-                <Icon
-                    v-if="navTabs.state.tabsView.length > 1"
-                    class="close-icon"
-                    @click.stop="closeTab(item)"
-                    size="15"
-                    name="el-icon-Close"
-                />
-            </transition>
-        </div>
-        <!--        <div :style='activeBoxStyle' class='nav-tabs-active-box'></div>-->
-    </div>
-    <Contextmenu ref="contextmenuRef" :items="state.contextmenuItems" @contextmenuItemClick="onContextmenuItem" />
-</template>
-
-<script setup lang="ts">
-import { nextTick, onMounted, reactive, ref } from 'vue'
-import { useRoute, useRouter, onBeforeRouteUpdate, type RouteLocationNormalized } from 'vue-router'
-import { useConfig } from '@/stores/config'
-import { useNavTabs } from '@/stores/navTabs'
-import { useTemplateRefsList } from '@vueuse/core'
-import type { ContextMenuItem, ContextmenuItemClickEmitArg } from '@/components/contextmenu/interface'
-import useCurrentInstance from '@/utils/useCurrentInstance'
-import Contextmenu from '@/components/contextmenu/index.vue'
-import horizontalScroll from '@/utils/horizontalScroll'
-import { getFirstRoute, routePush } from '@/utils/router'
-import { adminBaseRoutePath } from '@/router/static'
-
-const route = useRoute()
-const router = useRouter()
-const config = useConfig()
-const navTabs = useNavTabs()
-
-const { proxy } = useCurrentInstance()
-const tabScrollbarRef = ref()
-const tabsRefs = useTemplateRefsList<HTMLDivElement>()
-
-const contextmenuRef = ref()
-
-const state: {
-    contextmenuItems: ContextMenuItem[]
-} = reactive({
-    contextmenuItems: [
-        { name: 'refresh', label: '重新加载', icon: 'fa fa-refresh' },
-        { name: 'close', label: '关闭标签', icon: 'fa fa-times' },
-        { name: 'fullScreen', label: '当前标签全屏', icon: 'el-icon-FullScreen' },
-        { name: 'closeOther', label: '关闭其他标签', icon: 'fa fa-minus' },
-        { name: 'closeAll', label: '关闭全部标签', icon: 'fa fa-stop' }
-    ]
-})
-
-const activeBoxStyle = reactive({
-    width: '0',
-    transform: 'translateX(0px)'
-})
-
-const onTab = (menu: RouteLocationNormalized) => {
-    router.push(menu)
-}
-
-const onContextmenu = (menu: RouteLocationNormalized, el: MouseEvent) => {
-    // 禁用刷新
-    state.contextmenuItems[0].disabled = route.path !== menu.path
-    // 禁用关闭其他和关闭全部
-    state.contextmenuItems[4].disabled = state.contextmenuItems[3].disabled =
-        navTabs.state.tabsView.length == 1 ? true : false
-
-    const { clientX, clientY } = el
-    contextmenuRef.value.onShowContextmenu(menu, {
-        x: clientX,
-        y: clientY
-    })
-}
-
-// tab 激活状态切换
-const selectNavTab = function (dom: HTMLDivElement) {
-    if (!dom) {
-        return false
-    }
-    activeBoxStyle.width = dom.clientWidth + 'px'
-    activeBoxStyle.transform = `translateX(${dom.offsetLeft}px)`
-
-    let scrollLeft = dom.offsetLeft + dom.clientWidth - tabScrollbarRef.value.clientWidth
-    if (dom.offsetLeft < tabScrollbarRef.value.scrollLeft) {
-        tabScrollbarRef.value.scrollTo(dom.offsetLeft, 0)
-    } else if (scrollLeft > tabScrollbarRef.value.scrollLeft) {
-        tabScrollbarRef.value.scrollTo(scrollLeft, 0)
-    }
-}
-
-const toLastTab = () => {
-    const lastTab = navTabs.state.tabsView.slice(-1)[0]
-    if (lastTab) {
-        router.push(lastTab)
-    } else {
-        router.push(adminBaseRoutePath)
-    }
-}
-
-const closeTab = (route: RouteLocationNormalized) => {
-    navTabs.closeTab(route)
-    proxy.eventBus.emit('onTabViewClose', route)
-    if (navTabs.state.activeRoute?.path === route.path) {
-        toLastTab()
-    } else {
-        navTabs.setActiveRoute(navTabs.state.activeRoute!)
-        nextTick(() => {
-            selectNavTab(tabsRefs.value[navTabs.state.activeIndex])
-        })
-    }
-
-    contextmenuRef.value.onHideContextmenu()
-}
-
-const closeOtherTab = (menu: RouteLocationNormalized) => {
-    navTabs.closeTabs(menu)
-    navTabs.setActiveRoute(menu)
-    if (navTabs.state.activeRoute?.path !== route.path) {
-        router.push(menu!.path)
-    }
-}
-
-const closeAllTab = (menu: RouteLocationNormalized) => {
-    let firstRoute = getFirstRoute(navTabs.state.tabsViewRoutes)
-    if (firstRoute && firstRoute.path == menu.path) {
-        return closeOtherTab(menu)
-    }
-    if (firstRoute && firstRoute.path == navTabs.state.activeRoute?.path) {
-        return closeOtherTab(navTabs.state.activeRoute)
-    }
-    navTabs.closeTabs(false)
-    if (firstRoute) routePush(firstRoute.path)
-}
-
-const onContextmenuItem = async (item: ContextmenuItemClickEmitArg) => {
-    const { name, menu } = item
-    if (!menu) return
-    switch (name) {
-        case 'refresh':
-            proxy.eventBus.emit('onTabViewRefresh', menu)
-            break
-        case 'close':
-            closeTab(menu)
-            break
-        case 'closeOther':
-            closeOtherTab(menu)
-            break
-        case 'closeAll':
-            closeAllTab(menu)
-            break
-        case 'fullScreen':
-            if (route.path !== menu?.path) {
-                router.push(menu?.path as string)
-            }
-            navTabs.setFullScreen(true)
-            break
-    }
-}
-
-const updateTab = function (newRoute: RouteLocationNormalized) {
-    // 添加tab
-    navTabs.addTab(newRoute)
-    // 激活当前tab
-    navTabs.setActiveRoute(newRoute)
-
-    nextTick(() => {
-        selectNavTab(tabsRefs.value[navTabs.state.activeIndex])
-    })
-}
-
-onBeforeRouteUpdate(async to => {
-   
-
-        updateTab(to)
-   
-})
-
-onMounted(() => {
-    updateTab(router.currentRoute.value)
-    new horizontalScroll(tabScrollbarRef.value)
-})
-</script>
-
-<style scoped lang="scss">
-.dark {
-    .close-icon {
-        color: v-bind('config.getColorVal("headerBarTabColor")') !important;
-    }
-
-    .ba-nav-tab.active {
-        .close-icon {
-            color: v-bind('config.getColorVal("headerBarTabActiveColor")') !important;
-        }
-    }
-}
-
-.nav-tabs {
-    overflow-x: auto;
-    overflow-y: hidden;
-    margin-right: var(--ba-main-space);
-    scrollbar-width: none;
-
-    &::-webkit-scrollbar {
-        height: 5px;
-    }
-
-    //
-    //&::-webkit-scrollbar-thumb {
-    //    background: #eaeaea;
-    //    border-radius: var(--el-border-radius-base);
-    //    box-shadow: none;
-    //    -webkit-box-shadow: none;
-    //}
-    //
-    //&::-webkit-scrollbar-track {
-    //    background: v-bind('config.layout.layoutMode == "Default" ? "none":config.getColorVal("headerBarBackground")');
-    //}
-    //
-    //&:hover {
-    //    &::-webkit-scrollbar-thumb:hover {
-    //        background: #c8c9cc;
-    //    }
-    //}
-}
-
-.ba-nav-tab {
-    white-space: nowrap;
-    height: 40px;
-}
-</style>
+<template>
+    <div class="nav-tabs" ref="tabScrollbarRef">
+        
+        <div
+            v-for="(item, idx) in navTabs.state.tabsView"
+            @click="onTab(item)"
+            @contextmenu.prevent="onContextmenu(item, $event)"
+            class="ba-nav-tab"
+            :class="navTabs.state.activeIndex == idx ? 'active' : ''"
+            :ref="tabsRefs.set"
+            :key="idx"
+        >
+            {{ item.meta.title }}
+            <transition @after-leave="selectNavTab(tabsRefs[navTabs.state.activeIndex])" name="el-fade-in">
+                <Icon
+                    v-if="navTabs.state.tabsView.length > 1"
+                    class="close-icon"
+                    @click.stop="closeTab(item)"
+                    size="15"
+                    name="el-icon-Close"
+                />
+            </transition>
+        </div>
+        <!--        <div :style='activeBoxStyle' class='nav-tabs-active-box'></div>-->
+    </div>
+    <Contextmenu ref="contextmenuRef" :items="state.contextmenuItems" @contextmenuItemClick="onContextmenuItem" />
+</template>
+
+<script setup lang="ts">
+import { nextTick, onMounted, reactive, ref } from 'vue'
+import { useRoute, useRouter, onBeforeRouteUpdate, type RouteLocationNormalized } from 'vue-router'
+import { useConfig } from '@/stores/config'
+import { useNavTabs } from '@/stores/navTabs'
+import { useTemplateRefsList } from '@vueuse/core'
+import type { ContextMenuItem, ContextmenuItemClickEmitArg } from '@/components/contextmenu/interface'
+import useCurrentInstance from '@/utils/useCurrentInstance'
+import Contextmenu from '@/components/contextmenu/index.vue'
+import horizontalScroll from '@/utils/horizontalScroll'
+import { getFirstRoute, routePush } from '@/utils/router'
+import { adminBaseRoutePath } from '@/router/static'
+
+const route = useRoute()
+const router = useRouter()
+const config = useConfig()
+const navTabs = useNavTabs()
+
+const { proxy } = useCurrentInstance()
+const tabScrollbarRef = ref()
+const tabsRefs = useTemplateRefsList<HTMLDivElement>()
+
+const contextmenuRef = ref()
+
+const state: {
+    contextmenuItems: ContextMenuItem[]
+} = reactive({
+    contextmenuItems: [
+        { name: 'refresh', label: '重新加载', icon: 'fa fa-refresh' },
+        { name: 'close', label: '关闭标签', icon: 'fa fa-times' },
+        { name: 'fullScreen', label: '当前标签全屏', icon: 'el-icon-FullScreen' },
+        { name: 'closeOther', label: '关闭其他标签', icon: 'fa fa-minus' },
+        { name: 'closeAll', label: '关闭全部标签', icon: 'fa fa-stop' }
+    ]
+})
+
+const activeBoxStyle = reactive({
+    width: '0',
+    transform: 'translateX(0px)'
+})
+
+const onTab = (menu: RouteLocationNormalized) => {
+    router.push(menu)
+}
+
+const onContextmenu = (menu: RouteLocationNormalized, el: MouseEvent) => {
+    
+    // 禁用刷新
+    state.contextmenuItems[0].disabled = route.path !== menu.path
+  
+    
+    // 禁用关闭其他和关闭全部
+    state.contextmenuItems[4].disabled = state.contextmenuItems[3].disabled =
+        navTabs.state.tabsView.length == 1 ? true : false
+
+    const { clientX, clientY } = el
+    contextmenuRef.value.onShowContextmenu(menu, {
+        x: clientX,
+        y: clientY
+    })
+}
+
+// tab 激活状态切换
+const selectNavTab = function (dom: HTMLDivElement) {
+    if (!dom) {
+        return false
+    }
+    activeBoxStyle.width = dom.clientWidth + 'px'
+    activeBoxStyle.transform = `translateX(${dom.offsetLeft}px)`
+
+    let scrollLeft = dom.offsetLeft + dom.clientWidth - tabScrollbarRef.value.clientWidth
+    if (dom.offsetLeft < tabScrollbarRef.value.scrollLeft) {
+        tabScrollbarRef.value.scrollTo(dom.offsetLeft, 0)
+    } else if (scrollLeft > tabScrollbarRef.value.scrollLeft) {
+        tabScrollbarRef.value.scrollTo(scrollLeft, 0)
+    }
+}
+
+const toLastTab = () => {
+    const lastTab = navTabs.state.tabsView.slice(-1)[0]
+    if (lastTab) {
+        router.push(lastTab)
+    } else {
+        router.push(adminBaseRoutePath)
+    }
+}
+
+const closeTab = (route: RouteLocationNormalized) => {
+    navTabs.closeTab(route)
+    proxy.eventBus.emit('onTabViewClose', route)
+    if (navTabs.state.activeRoute?.path === route.path) {
+        toLastTab()
+    } else {
+        navTabs.setActiveRoute(navTabs.state.activeRoute!)
+        nextTick(() => {
+            selectNavTab(tabsRefs.value[navTabs.state.activeIndex])
+        })
+    }
+
+    contextmenuRef.value.onHideContextmenu()
+}
+
+const closeOtherTab = (menu: RouteLocationNormalized) => {
+    navTabs.closeTabs(menu)
+    navTabs.setActiveRoute(menu)
+    if (navTabs.state.activeRoute?.path !== route.path) {
+        router.push(menu!.path)
+    }
+}
+
+const closeAllTab = (menu: RouteLocationNormalized) => {
+    let firstRoute = getFirstRoute(navTabs.state.tabsViewRoutes)
+    if (firstRoute && firstRoute.path == menu.path) {
+        return closeOtherTab(menu)
+    }
+    if (firstRoute && firstRoute.path == navTabs.state.activeRoute?.path) {
+        return closeOtherTab(navTabs.state.activeRoute)
+    }
+    navTabs.closeTabs(false)
+    if (firstRoute) routePush(firstRoute.path)
+}
+
+const onContextmenuItem = async (item: ContextmenuItemClickEmitArg) => {
+    const { name, menu } = item
+    if (!menu) return
+    switch (name) {
+        case 'refresh':
+            proxy.eventBus.emit('onTabViewRefresh', menu)
+            break
+        case 'close':
+            closeTab(menu)
+            break
+        case 'closeOther':
+            closeOtherTab(menu)
+            break
+        case 'closeAll':
+            closeAllTab(menu)
+            break
+        case 'fullScreen':
+            if (route.path !== menu?.path) {
+                router.push(menu?.path as string)
+            }
+            navTabs.setFullScreen(true)
+            break
+    }
+}
+
+const updateTab = function (newRoute: RouteLocationNormalized) {
+    // 添加tab
+    navTabs.addTab(newRoute)
+    // 激活当前tab
+    navTabs.setActiveRoute(newRoute)
+
+    nextTick(() => {
+        selectNavTab(tabsRefs.value[navTabs.state.activeIndex])
+    })
+}
+
+onBeforeRouteUpdate(async to => {
+   
+
+        updateTab(to)
+   
+})
+
+onMounted(() => {
+    updateTab(router.currentRoute.value)
+    new horizontalScroll(tabScrollbarRef.value)
+})
+</script>
+
+<style scoped lang="scss">
+.dark {
+    .close-icon {
+        color: v-bind('config.getColorVal("headerBarTabColor")') !important;
+    }
+
+    .ba-nav-tab.active {
+        .close-icon {
+            color: v-bind('config.getColorVal("headerBarTabActiveColor")') !important;
+        }
+    }
+}
+
+.nav-tabs {
+    overflow-x: auto;
+    overflow-y: hidden;
+    margin-right: var(--ba-main-space);
+    scrollbar-width: none;
+
+    &::-webkit-scrollbar {
+        height: 5px;
+    }
+
+    //
+    //&::-webkit-scrollbar-thumb {
+    //    background: #eaeaea;
+    //    border-radius: var(--el-border-radius-base);
+    //    box-shadow: none;
+    //    -webkit-box-shadow: none;
+    //}
+    //
+    //&::-webkit-scrollbar-track {
+    //    background: v-bind('config.layout.layoutMode == "Default" ? "none":config.getColorVal("headerBarBackground")');
+    //}
+    //
+    //&:hover {
+    //    &::-webkit-scrollbar-thumb:hover {
+    //        background: #c8c9cc;
+    //    }
+    //}
+}
+
+.ba-nav-tab {
+    white-space: nowrap;
+    height: 40px;
+}
+</style>

src/stores/navTabs.ts

@@ -1,108 +1,169 @@
-import { reactive } from 'vue'
-import { defineStore } from 'pinia'
-import { STORE_TAB_VIEW_CONFIG } from '@/stores/constant/cacheKey'
-import type { NavTabs } from '@/stores/interface/index'
-import type { RouteLocationNormalized, RouteRecordRaw } from 'vue-router'
-import { adminBaseRoutePath } from '@/router/static'
-
-export const useNavTabs = defineStore(
-    'navTabs',
-    () => {
-        const state: NavTabs = reactive({
-            // 激活tab的index
-            activeIndex: 0,
-            // 激活的tab
-            activeRoute: null,
-            // tab列表
-            tabsView: [],
-            // 当前tab是否全屏
-            tabFullScreen: false,
-            // 从后台加载到的菜单路由列表
-            tabsViewRoutes: [],
-            // 按钮权限节点
-            authNode: new Map(),
-        })
-
-        function addTab(route: RouteLocationNormalized) {
-            if (!route.meta.addtab) return
-            for (const key in state.tabsView) {
-                if (state.tabsView[key].path === route.path) {
-                    state.tabsView[key].params = route.params ? route.params : state.tabsView[key].params
-                    state.tabsView[key].query = route.query ? route.query : state.tabsView[key].query
-                    return
-                }
-            }
-            state.tabsView.push(route)
-        }
-
-        function closeTab(route: RouteLocationNormalized) {
-            state.tabsView.map((v, k) => {
-                if (v.path == route.path) {
-                    state.tabsView.splice(k, 1)
-                    return
-                }
-            })
-        }
-
-        /**
-         * 关闭多个标签
-         * @param retainMenu 需要保留的标签，否则关闭全部标签
-         */
-        const closeTabs = (retainMenu: RouteLocationNormalized | false = false) => {
-            if (retainMenu) {
-                state.tabsView = [retainMenu]
-            } else {
-                state.tabsView = []
-            }
-        }
-
-        const setActiveRoute = (route: RouteLocationNormalized): void => {
-            const currentRouteIndex: number = state.tabsView.findIndex((item: RouteLocationNormalized) => {
-                return item.path === route.path
-            })
-            if (currentRouteIndex === -1) return
-            state.activeRoute = route
-            state.activeIndex = currentRouteIndex
-        }
-
-        const setTabsViewRoutes = (data: RouteRecordRaw[]): void => {
-            state.tabsViewRoutes = encodeRoutesURI(data)
-        }
-
-        const setAuthNode = (key: string, data: string[]) => {
-            state.authNode.set(key, data)
-        }
-
-        const fillAuthNode = (data: Map<string, string[]>) => {
-            state.authNode = data
-        }
-
-        const setFullScreen = (fullScreen: boolean): void => {
-            state.tabFullScreen = fullScreen
-        }
-
-        return { state, addTab, closeTab, closeTabs, setActiveRoute, setTabsViewRoutes, setAuthNode, fillAuthNode, setFullScreen }
-    },
-    {
-        persist: {
-            key: STORE_TAB_VIEW_CONFIG,
-            paths: ['state.tabFullScreen'],
-        },
-    }
-)
-
-/**
- * 对iframe的url进行编码
- */
-function encodeRoutesURI(data: RouteRecordRaw[]) {
-    data.forEach((item) => {
-        if (item.meta?.menu_type == 'iframe') {
-            item.path = adminBaseRoutePath + '/iframe/' + encodeURIComponent(item.path)
-        }
-
-        if (item.children && item.children.length) {
-            item.children = encodeRoutesURI(item.children)
-        }
-    })
-    return data
-}
+import { reactive } from 'vue'
+import { defineStore } from 'pinia'
+import { STORE_TAB_VIEW_CONFIG } from '@/stores/constant/cacheKey'
+import type { NavTabs } from '@/stores/interface/index'
+import type { RouteLocationNormalized, RouteRecordRaw } from 'vue-router'
+import { adminBaseRoutePath } from '@/router/static'
+import { set } from 'lodash'
+
+export const useNavTabs = defineStore(
+    'navTabs',
+    () => {
+        const state: NavTabs = reactive({
+            // 激活tab的index
+            activeIndex: 0,
+            // 激活的tab
+            activeRoute: null,
+            // tab列表
+            tabsView: [],
+            // 当前tab是否全屏
+            tabFullScreen: false,
+            // 从后台加载到的菜单路由列表
+            tabsViewRoutes: [],
+            // 按钮权限节点
+            authNode: new Map()
+        })
+
+        function addTab(route: RouteLocationNormalized) {
+            console.log('🚀 ~ addTab ~ route:', route)
+            if (!route.meta.addtab) return
+            for (const key in state.tabsView) {
+                if (state.tabsView[key].path === route.path) {
+                    state.tabsView[key].params = route.params ? route.params : state.tabsView[key].params
+                    state.tabsView[key].query = route.query ? route.query : state.tabsView[key].query
+                    state.tabsView[key].meta = route.query ? route.meta : state.tabsView[key].meta
+                    return
+                }
+            }
+            state.tabsView.push(route)
+        }
+
+        function closeTab(route: RouteLocationNormalized) {
+            state.tabsView.map((v, k) => {
+                if (v.path == route.path) {
+                    state.tabsView.splice(k, 1)
+                    return
+                }
+            })
+        }
+
+        /**
+         * 关闭多个标签
+         * @param retainMenu 需要保留的标签，否则关闭全部标签
+         */
+        const closeTabs = (retainMenu: RouteLocationNormalized | false = false) => {
+            if (retainMenu) {
+                state.tabsView = [retainMenu]
+            } else {
+                state.tabsView = []
+            }
+        }
+
+        const setActiveRoute = (route: RouteLocationNormalized): void => {
+            const currentRouteIndex: number = state.tabsView.findIndex((item: RouteLocationNormalized) => {
+                return item.path === route.path
+            })
+            if (currentRouteIndex === -1) return
+            state.activeRoute = route
+            state.activeIndex = currentRouteIndex
+        }
+
+        const setTabsViewRoutes = (data: RouteRecordRaw[]): void => {
+            state.tabsViewRoutes = encodeRoutesURI(data)
+        }
+
+        const setAuthNode = (key: string, data: string[]) => {
+            state.authNode.set(key, data)
+        }
+
+        const fillAuthNode = (data: Map<string, string[]>) => {
+            state.authNode = data
+        }
+
+        const setFullScreen = (fullScreen: boolean): void => {
+            state.tabFullScreen = fullScreen
+        }
+
+        const refresh = () => {
+            // setTimeout(() => {
+            // console.log(123, state.tabsViewRoutes)
+           
+            let list = matchAndReturnRouteData(state.tabsViewRoutes, state.tabsView)
+             state.tabsView = []
+            list.forEach(item => {
+                addTab(item)
+            })
+            // }, 1000)
+        }
+        return {
+            state,
+            addTab,
+            closeTab,
+            closeTabs,
+            setActiveRoute,
+            setTabsViewRoutes,
+            setAuthNode,
+            fillAuthNode,
+            setFullScreen,
+            refresh
+        }
+    },
+    {
+        persist: {
+            key: STORE_TAB_VIEW_CONFIG,
+            paths: ['state.tabFullScreen']
+        }
+    }
+)
+
+/**
+ * 核心逻辑：
+ * 1. 递归遍历树形菜单，筛选出与routeList中name匹配的节点
+ * 2. 将匹配到的节点格式转换为routeList的结构并返回
+ */
+function matchAndReturnRouteData(tree, routeList) {
+    // 1. 构建路由name映射（name -> 完整路由对象）
+    const routeMap = new Map()
+    routeList.forEach(route => {
+        if (route.name) {
+            routeMap.set(route.name, route)
+        }
+    })
+
+    // 2. 递归遍历树形菜单，收集匹配的节点
+    const matchedNodes = []
+    function recursion(node) {
+        // 匹配当前节点
+        if (routeMap.has(node.name)) {
+            // 深度克隆路由对象，避免修改原数据
+            const matchedRoute = JSON.parse(JSON.stringify(routeMap.get(node.name)))
+            matchedNodes.push(matchedRoute)
+        }
+        // 递归处理子节点
+        if (node.children && node.children.length) {
+            node.children.forEach(child => recursion(child))
+        }
+    }
+
+    // 遍历所有顶级节点
+    tree.forEach(node => recursion(node))
+
+    // 3. 返回匹配后的第二个数据格式（和routeList结构一致）
+    return matchedNodes
+}
+
+/**
+ * 对iframe的url进行编码
+ */
+function encodeRoutesURI(data: RouteRecordRaw[]) {
+    data.forEach(item => {
+        if (item.meta?.menu_type == 'iframe') {
+            item.path = adminBaseRoutePath + '/iframe/' + encodeURIComponent(item.path)
+        }
+
+        if (item.children && item.children.length) {
+            item.children = encodeRoutesURI(item.children)
+        }
+    })
+    return data
+}

src/styles/vxeTable.css

@@ -0,0 +1,58 @@
+.vxe-header--row {
+  background: var(--vxe-table-header-background-color);
+  color: var(--vxe-table-header-font-color);
+}
+
+.is--checked.vxe-checkbox,
+.is--checked.vxe-checkbox .vxe-checkbox--icon,
+.is--checked.vxe-custom--checkbox-option,
+.is--checked.vxe-custom--checkbox-option .vxe-checkbox--icon,
+.is--checked.vxe-export--panel-column-option,
+.is--checked.vxe-export--panel-column-option .vxe-checkbox--icon,
+.is--checked.vxe-table--filter-option,
+.is--checked.vxe-table--filter-option .vxe-checkbox--icon,
+.is--indeterminate.vxe-checkbox,
+.is--indeterminate.vxe-checkbox .vxe-checkbox--icon,
+.is--indeterminate.vxe-custom--checkbox-option,
+.is--indeterminate.vxe-custom--checkbox-option .vxe-checkbox--icon,
+.is--indeterminate.vxe-export--panel-column-option,
+.is--indeterminate.vxe-export--panel-column-option .vxe-checkbox--icon,
+.is--indeterminate.vxe-table--filter-option,
+.is--indeterminate.vxe-table--filter-option .vxe-checkbox--icon,
+.vxe-table--render-default .is--checked.vxe-cell--checkbox,
+.vxe-table--render-default .is--checked.vxe-cell--checkbox .vxe-checkbox--icon,
+.vxe-table--render-default .is--indeterminate.vxe-cell--checkbox,
+.vxe-table--render-default .is--indeterminate.vxe-cell--checkbox .vxe-checkbox--icon,
+.vxe-table--render-default .is--checked.vxe-cell--radio .vxe-radio--icon {
+  color: var(--el-color-primary-light-3);
+}
+
+.vxe-checkbox:not(.is--disabled):hover .vxe-checkbox--icon,
+.vxe-custom--checkbox-option:not(.is--disabled):hover .vxe-checkbox--icon,
+.vxe-export--panel-column-option:not(.is--disabled):hover .vxe-checkbox--icon,
+.vxe-table--filter-option:not(.is--disabled):hover .vxe-checkbox--icon,
+.vxe-table--render-default .vxe-cell--checkbox:not(.is--disabled):hover .vxe-checkbox--icon,
+.vxe-radio:not(.is--disabled):hover .vxe-radio--icon,
+.vxe-custom--radio-option:not(.is--disabled):hover .vxe-radio--icon,
+.vxe-export--panel-column-option:not(.is--disabled):hover .vxe-radio--icon,
+.vxe-table--filter-option:not(.is--disabled):hover .vxe-radio--icon,
+.vxe-table--render-default .vxe-cell--radio:not(.is--disabled):hover .vxe-radio--icon {
+  color: var(--el-color-primary-light-5);
+}
+
+.vxe-table--render-default .vxe-body--row.row--current,
+.vxe-table--render-default .vxe-body--row.row--current:hover {
+  background-color: var(--el-color-primary-light-8);
+}
+
+.vxe-table--tooltip-wrapper {
+  z-index: 10000 !important;
+}
+
+.is--disabled {
+  background-color: var(--vxe-input-disabled-color);
+}
+
+.vxe-modal--wrapper {
+  z-index: 5000 !important;
+}

src/styles/vxeTable.min.css

@@ -0,0 +1 @@
+.vxe-header--row{background:var(--vxe-table-header-background-color);color:var(--vxe-table-header-font-color)}.is--checked.vxe-checkbox,.is--checked.vxe-checkbox .vxe-checkbox--icon,.is--checked.vxe-custom--checkbox-option,.is--checked.vxe-custom--checkbox-option .vxe-checkbox--icon,.is--checked.vxe-export--panel-column-option,.is--checked.vxe-export--panel-column-option .vxe-checkbox--icon,.is--checked.vxe-table--filter-option,.is--checked.vxe-table--filter-option .vxe-checkbox--icon,.is--indeterminate.vxe-checkbox,.is--indeterminate.vxe-checkbox .vxe-checkbox--icon,.is--indeterminate.vxe-custom--checkbox-option,.is--indeterminate.vxe-custom--checkbox-option .vxe-checkbox--icon,.is--indeterminate.vxe-export--panel-column-option,.is--indeterminate.vxe-export--panel-column-option .vxe-checkbox--icon,.is--indeterminate.vxe-table--filter-option,.is--indeterminate.vxe-table--filter-option .vxe-checkbox--icon,.vxe-table--render-default .is--checked.vxe-cell--checkbox,.vxe-table--render-default .is--checked.vxe-cell--checkbox .vxe-checkbox--icon,.vxe-table--render-default .is--indeterminate.vxe-cell--checkbox,.vxe-table--render-default .is--indeterminate.vxe-cell--checkbox .vxe-checkbox--icon,.vxe-table--render-default .is--checked.vxe-cell--radio .vxe-radio--icon{color:var(--el-color-primary-light-3)}.vxe-checkbox:not(.is--disabled):hover .vxe-checkbox--icon,.vxe-custom--checkbox-option:not(.is--disabled):hover .vxe-checkbox--icon,.vxe-export--panel-column-option:not(.is--disabled):hover .vxe-checkbox--icon,.vxe-table--filter-option:not(.is--disabled):hover .vxe-checkbox--icon,.vxe-table--render-default .vxe-cell--checkbox:not(.is--disabled):hover .vxe-checkbox--icon,.vxe-radio:not(.is--disabled):hover .vxe-radio--icon,.vxe-custom--radio-option:not(.is--disabled):hover .vxe-radio--icon,.vxe-export--panel-column-option:not(.is--disabled):hover .vxe-radio--icon,.vxe-table--filter-option:not(.is--disabled):hover .vxe-radio--icon,.vxe-table--render-default .vxe-cell--radio:not(.is--disabled):hover .vxe-radio--icon{color:var(--el-color-primary-light-5)}.vxe-table--render-default .vxe-body--row.row--current,.vxe-table--render-default .vxe-body--row.row--current:hover{background-color:var(--el-color-primary-light-8)}.vxe-table--tooltip-wrapper{z-index:10000 !important}.is--disabled{background-color:var(--vxe-input-disabled-color)}.vxe-modal--wrapper{z-index:5000 !important}

src/styles/vxeTable.scss

@@ -1,84 +1,87 @@
-// .vxe-table--body-wrapper,
-// .boxbx {
-//     &::-webkit-scrollbar {
-//         width: 10px;
-//         height: 10px;
-//     }
-//     &::-webkit-scrollbar-thumb {
-//         border-radius: 5px;
-//         height: 3px;
-//         background-color: var(--el-color-primary) !important;
-//         border-radius: 30px !important;
-//     }
-// }
-
-// .vxe-table--body-wrapper::-webkit-scrollbar-thumb {
-//     border-radius: 5px;
-//     height: 3px;
-//     background-color: var(--el-color-primary) !important;
-//     border-radius: 30px !important;
-// }
-
-.vxe-header--row {
-    background: var(--vxe-table-header-background-color);
-    color: var(--vxe-table-header-font-color);
-}
-
-.is--checked.vxe-checkbox,
-.is--checked.vxe-checkbox .vxe-checkbox--icon,
-.is--checked.vxe-custom--checkbox-option,
-.is--checked.vxe-custom--checkbox-option .vxe-checkbox--icon,
-.is--checked.vxe-export--panel-column-option,
-.is--checked.vxe-export--panel-column-option .vxe-checkbox--icon,
-.is--checked.vxe-table--filter-option,
-.is--checked.vxe-table--filter-option .vxe-checkbox--icon,
-.is--indeterminate.vxe-checkbox,
-.is--indeterminate.vxe-checkbox .vxe-checkbox--icon,
-.is--indeterminate.vxe-custom--checkbox-option,
-.is--indeterminate.vxe-custom--checkbox-option .vxe-checkbox--icon,
-.is--indeterminate.vxe-export--panel-column-option,
-.is--indeterminate.vxe-export--panel-column-option .vxe-checkbox--icon,
-.is--indeterminate.vxe-table--filter-option,
-.is--indeterminate.vxe-table--filter-option .vxe-checkbox--icon,
-.vxe-table--render-default .is--checked.vxe-cell--checkbox,
-.vxe-table--render-default .is--checked.vxe-cell--checkbox .vxe-checkbox--icon,
-.vxe-table--render-default .is--indeterminate.vxe-cell--checkbox,
-.vxe-table--render-default .is--indeterminate.vxe-cell--checkbox .vxe-checkbox--icon,
-.vxe-table--render-default .is--checked.vxe-cell--radio .vxe-radio--icon {
-    color: var(--el-color-primary-light-3);
-}
-
-.vxe-checkbox:not(.is--disabled):hover .vxe-checkbox--icon,
-.vxe-custom--checkbox-option:not(.is--disabled):hover .vxe-checkbox--icon,
-.vxe-export--panel-column-option:not(.is--disabled):hover .vxe-checkbox--icon,
-.vxe-table--filter-option:not(.is--disabled):hover .vxe-checkbox--icon,
-.vxe-table--render-default .vxe-cell--checkbox:not(.is--disabled):hover .vxe-checkbox--icon,
-.vxe-radio:not(.is--disabled):hover .vxe-radio--icon,
-.vxe-custom--radio-option:not(.is--disabled):hover .vxe-radio--icon,
-.vxe-export--panel-column-option:not(.is--disabled):hover .vxe-radio--icon,
-.vxe-table--filter-option:not(.is--disabled):hover .vxe-radio--icon,
-.vxe-table--render-default .vxe-cell--radio:not(.is--disabled):hover .vxe-radio--icon {
-    color: var(--el-color-primary-light-5);
-}
-
-// .vxe-table--render-default .is--disabled.vxe-cell--checkbox .vxe-checkbox--icon{
-//     color: #fff0;
-// }
-.vxe-table--tooltip-wrapper {
-    z-index: 10000 !important;
-}
-.is--disabled {
-    background-color: var(--vxe-input-disabled-color);
-}
-
-.vxe-modal--wrapper {
-    z-index: 5000 !important;
-}
-.vxe-table--body .vxe-body--row:nth-child(even) {
-    background-color: #f9f9f9;
-    // background-color: var(--el-color-primary-light-9);
-}
-
-.vxe-table--body .vxe-body--row:nth-child(odd) {
-    background-color: #ffffff;
-}
+// .vxe-table--body-wrapper,
+// .boxbx {
+//     &::-webkit-scrollbar {
+//         width: 10px;
+//         height: 10px;
+//     }
+//     &::-webkit-scrollbar-thumb {
+//         border-radius: 5px;
+//         height: 3px;
+//         background-color: var(--el-color-primary) !important;
+//         border-radius: 30px !important;
+//     }
+// }
+
+// .vxe-table--body-wrapper::-webkit-scrollbar-thumb {
+//     border-radius: 5px;
+//     height: 3px;
+//     background-color: var(--el-color-primary) !important;
+//     border-radius: 30px !important;
+// }
+
+.vxe-header--row {
+    background: var(--vxe-table-header-background-color);
+    color: var(--vxe-table-header-font-color);
+}
+
+.is--checked.vxe-checkbox,
+.is--checked.vxe-checkbox .vxe-checkbox--icon,
+.is--checked.vxe-custom--checkbox-option,
+.is--checked.vxe-custom--checkbox-option .vxe-checkbox--icon,
+.is--checked.vxe-export--panel-column-option,
+.is--checked.vxe-export--panel-column-option .vxe-checkbox--icon,
+.is--checked.vxe-table--filter-option,
+.is--checked.vxe-table--filter-option .vxe-checkbox--icon,
+.is--indeterminate.vxe-checkbox,
+.is--indeterminate.vxe-checkbox .vxe-checkbox--icon,
+.is--indeterminate.vxe-custom--checkbox-option,
+.is--indeterminate.vxe-custom--checkbox-option .vxe-checkbox--icon,
+.is--indeterminate.vxe-export--panel-column-option,
+.is--indeterminate.vxe-export--panel-column-option .vxe-checkbox--icon,
+.is--indeterminate.vxe-table--filter-option,
+.is--indeterminate.vxe-table--filter-option .vxe-checkbox--icon,
+.vxe-table--render-default .is--checked.vxe-cell--checkbox,
+.vxe-table--render-default .is--checked.vxe-cell--checkbox .vxe-checkbox--icon,
+.vxe-table--render-default .is--indeterminate.vxe-cell--checkbox,
+.vxe-table--render-default .is--indeterminate.vxe-cell--checkbox .vxe-checkbox--icon,
+.vxe-table--render-default .is--checked.vxe-cell--radio .vxe-radio--icon {
+    color: var(--el-color-primary-light-3);
+}
+
+.vxe-checkbox:not(.is--disabled):hover .vxe-checkbox--icon,
+.vxe-custom--checkbox-option:not(.is--disabled):hover .vxe-checkbox--icon,
+.vxe-export--panel-column-option:not(.is--disabled):hover .vxe-checkbox--icon,
+.vxe-table--filter-option:not(.is--disabled):hover .vxe-checkbox--icon,
+.vxe-table--render-default .vxe-cell--checkbox:not(.is--disabled):hover .vxe-checkbox--icon,
+.vxe-radio:not(.is--disabled):hover .vxe-radio--icon,
+.vxe-custom--radio-option:not(.is--disabled):hover .vxe-radio--icon,
+.vxe-export--panel-column-option:not(.is--disabled):hover .vxe-radio--icon,
+.vxe-table--filter-option:not(.is--disabled):hover .vxe-radio--icon,
+.vxe-table--render-default .vxe-cell--radio:not(.is--disabled):hover .vxe-radio--icon {
+    color: var(--el-color-primary-light-5);
+}
+.vxe-table--render-default .vxe-body--row.row--current,
+.vxe-table--render-default .vxe-body--row.row--current:hover {
+    background-color: var(--el-color-primary-light-8);
+}
+// .vxe-table--render-default .is--disabled.vxe-cell--checkbox .vxe-checkbox--icon{
+//     color: #fff0;
+// }
+.vxe-table--tooltip-wrapper {
+    z-index: 10000 !important;
+}
+.is--disabled {
+    background-color: var(--vxe-input-disabled-color);
+}
+
+.vxe-modal--wrapper {
+    z-index: 5000 !important;
+}
+// .vxe-table--body .vxe-body--row:nth-child(even) {
+//     background-color: #f9f9f9;
+//     // background-color: var(--el-color-primary-light-9);
+// }
+
+// .vxe-table--body .vxe-body--row:nth-child(odd) {
+//     background-color: #ffffff;
+// }

src/utils/formatTime.ts

@@ -352,7 +352,9 @@ export function getTimeOfTheMonth(key: any): [string, string] {
             const dayOfWeek = now.getDay() // 0是周日
             const diff = now.getDate() - dayOfWeek + (dayOfWeek === 0 ? -6 : 1) // 调整为周一
             const weekStart = new Date(year, month, diff)
-            return [formatDate(weekStart, 'YYYY-MM-DD'), formatDate(now, 'YYYY-MM-DD')]
+            const weekEnd = new Date(weekStart)
+            weekEnd.setDate(weekEnd.getDate() + 6)
+            return [formatDate(weekStart, 'YYYY-MM-DD'), formatDate(weekEnd, 'YYYY-MM-DD')]
 
         case '5': // 日
             return [formatDate(now, 'YYYY-MM-DD'), formatDate(now, 'YYYY-MM-DD')]
@@ -361,3 +363,23 @@ export function getTimeOfTheMonth(key: any): [string, string] {
             throw new Error('Invalid key')
     }
 }
+
+/**
+ * 获取当月时间
+ * @param interval 组件外部时间 1 年 2 季 3 月 4 周 5 日
+ * @param timeList 驾驶舱里面组件勾选时间 []
+ * @param externalTime //外部传入时间
+ * @param fullscreen // 全屏是否全屏
+ */
+export function getTime(interval: number | 3, timeList: any, externalTime: any) {
+    // console.log('🚀 ~ getTime ~ timeList:', timeList)
+    // 1、先匹配时间
+    // 检查 interval 是否在 timeList 中
+    if (timeList && timeList.includes(interval.toString())) {
+        return [externalTime[0], externalTime[1], interval]
+    } else {
+        if (timeList && timeList.length > 0) {
+            return [...getTimeOfTheMonth(timeList[0]), timeList[0]]
+        }
+    }
+}

src/utils/request.ts

@@ -68,7 +68,12 @@ function createAxios<Data = any, T = ApiPromise<Data>>(
                     config.url == '/harmonic-boot/grid/getAssessOverview' ||
                     config.url == '/harmonic-boot/gridDiagram/getGridDiagramAreaData' ||
                     config.url == '/cs-device-boot/csline/list' ||
-                    config.url == '/cs-harmonic-boot/pqSensitiveUser/getListByIds'
+                    config.url == '/cs-harmonic-boot/pqSensitiveUser/getListByIds'||
+                    config.url == '/cs-harmonic-boot/csevent/getEventCoords'||
+                    config.url == '/cs-harmonic-boot/limitRateDetailD/limitTimeProbabilityData'||
+                    config.url == '/cs-harmonic-boot/limitRateDetailD/limitProbabilityData'||
+                    config.url == '/system-boot/dictTree/queryByCode'||
+                    config.url == '/system-boot/dictTree/query'
                 )
             )
                 removePending(config)
@@ -174,6 +179,8 @@ function createAxios<Data = any, T = ApiPromise<Data>>(
                         setTimeout(() => {
                             ElMessage.error(response.data.message || '未知错误')
                         }, 6000)
+                    }else if (response.config.url == '/cs-harmonic-boot/cspage/getByUserId') {
+                     
                     } else {
                         ElMessage.error(response.data.message || '未知错误')
                     }

src/views/auth/menu/popupMenu.vue

@@ -1,107 +1,108 @@
-<template>
-    <el-dialog class="cn-operate-dialog" width="700px" v-model.trim="dialogVisible" :title="title">
-        <el-scrollbar>
-            <el-form :inline="false" :model="form" label-width="auto" class="form-one">
-                <el-form-item label="上级菜单">
-                    <el-cascader v-model.trim="form.pid" :options="tableStore.table.data" :props="cascaderProps"
-                        style="width: 100%" />
-                </el-form-item>
-                <el-form-item label="菜单名称">
-                    <el-input maxlength="32" show-word-limit v-model.trim="form.name" placeholder="请输入菜单名称" />
-                </el-form-item>
-                <el-form-item label="图标">
-                    <IconSelector v-model.trim="form.icon" placeholder="请选择图标" />
-                </el-form-item>
-                <el-form-item label="菜单路由">
-                    <el-input v-model.trim="form.path" placeholder="请输入菜单名称" />
-                </el-form-item>
-                <el-form-item label="组件路径">
-                    <el-input v-model.trim="form.routeName" placeholder="请输入组件路径，如/src/views/dashboard/index.vue" />
-                </el-form-item>
-                <el-form-item label="排序">
-                    <el-input maxlength="32" show-word-limit-number v-model.trim="form.sort" :min="0" />
-                </el-form-item>
-                <el-form-item label="菜单描述">
-                    <el-input maxlength="300" show-word-limit v-model.trim="form.remark" :rows="2" type="textarea"
-                        placeholder="请输入描述" />
-                </el-form-item>
-            </el-form>
-        </el-scrollbar>
-
-        <template #footer>
-            <span class="dialog-footer">
-                <el-button @click="dialogVisible = false">取消</el-button>
-                <el-button type="primary" @click="submit">确认</el-button>
-            </span>
-        </template>
-    </el-dialog>
-</template>
-<script lang="ts" setup>
-import { ref, inject } from 'vue'
-import { reactive } from 'vue'
-import TableStore from '@/utils/tableStore'
-import IconSelector from '@/components/baInput/components/iconSelector.vue'
-import { updateMenu, addMenu } from '@/api/systerm'
-
-defineOptions({
-    name: 'auth/menu/popupMenu'
-})
-const emits = defineEmits<{
-    (e: 'init'): void
-}>()
-const tableStore = inject('tableStore') as TableStore
-const cascaderProps = {
-    label: 'title',
-    value: 'id',
-    checkStrictly: true,
-    emitPath: false
-}
-const form: any = reactive({
-    code: '',
-    icon: '',
-    id: '',
-    name: '',
-    path: '',
-    pid: '0',
-    remark: '',
-    routeName: '',
-    sort: 100,
-    type: 0
-})
-
-const dialogVisible = ref(false)
-const title = ref('新增菜单')
-const open = (text: string, data: anyObj) => {
-    title.value = text
-    // 重置表单
-    for (let key in form) {
-        form[key] = ''
-    }
-    form.pid = data.pid || '0'
-    form.sort = 100
-    form.type = 0
-
-    if (data.id) {
-        for (let key in form) {
-            form[key] = data[key] ? data[key] : data[key] === 0 ? 0 : ''
-        }
-        form.path = data.routePath || ''
-        form.name = data.title || ''
-    }
-    dialogVisible.value = true
-}
-const submit = async () => {
-    if (form.id) {
-        await updateMenu(form)
-    } else {
-        form.code = 'menu'
-        let obj = JSON.parse(JSON.stringify(form))
-        delete obj.id
-        await addMenu(obj)
-    }
-    emits('init')
-    dialogVisible.value = false
-}
-
-defineExpose({ open })
-</script>
+<template>
+    <el-dialog class="cn-operate-dialog" width="700px" v-model.trim="dialogVisible" :title="title">
+        <el-scrollbar>
+            <el-form :inline="false" :model="form" label-width="auto" class="form-one">
+                <el-form-item label="上级菜单">
+                    <el-cascader v-model.trim="form.pid" :options="tableStore.table.data" :props="cascaderProps" clearable
+                        style="width: 100%" />
+                </el-form-item>
+                <el-form-item label="菜单名称">
+                    <el-input maxlength="32" show-word-limit v-model.trim="form.name" placeholder="请输入菜单名称" />
+                </el-form-item>
+                <el-form-item label="图标">
+                    <IconSelector v-model.trim="form.icon" placeholder="请选择图标" />
+                </el-form-item>
+                <el-form-item label="菜单路由">
+                    <el-input v-model.trim="form.path" placeholder="请输入菜单名称" />
+                </el-form-item>
+                <el-form-item label="组件路径">
+                    <el-input v-model.trim="form.routeName" placeholder="请输入组件路径，如/src/views/dashboard/index.vue" />
+                </el-form-item>
+                <el-form-item label="排序">
+                    <el-input maxlength="32" show-word-limit-number v-model.trim="form.sort" :min="0" />
+                </el-form-item>
+                <el-form-item label="菜单描述">
+                    <el-input maxlength="300" show-word-limit v-model.trim="form.remark" :rows="2" type="textarea"
+                        placeholder="请输入描述" />
+                </el-form-item>
+            </el-form>
+        </el-scrollbar>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="dialogVisible = false">取消</el-button>
+                <el-button type="primary" @click="submit">确认</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+<script lang="ts" setup>
+import { ref, inject } from 'vue'
+import { reactive } from 'vue'
+import TableStore from '@/utils/tableStore'
+import IconSelector from '@/components/baInput/components/iconSelector.vue'
+import { updateMenu, addMenu } from '@/api/systerm'
+
+defineOptions({
+    name: 'auth/menu/popupMenu'
+})
+const emits = defineEmits<{
+    (e: 'init'): void
+}>()
+const tableStore = inject('tableStore') as TableStore
+const cascaderProps = {
+    label: 'title',
+    value: 'id',
+    checkStrictly: true,
+    emitPath: false
+}
+const form: any = reactive({
+    code: '',
+    icon: '',
+    id: '',
+    name: '',
+    path: '',
+    pid: '0',
+    remark: '',
+    routeName: '',
+    sort: 100,
+    type: 0
+})
+
+const dialogVisible = ref(false)
+const title = ref('新增菜单')
+const open = (text: string, data: anyObj) => {
+    title.value = text
+    // 重置表单
+    for (let key in form) {
+        form[key] = ''
+    }
+    form.pid = data.pid || '0'
+    form.sort = 100
+    form.type = 0
+
+    if (data.id) {
+        for (let key in form) {
+            form[key] = data[key] ? data[key] : data[key] === 0 ? 0 : ''
+        }
+        form.path = data.routePath || ''
+        form.name = data.title || ''
+    }
+    dialogVisible.value = true
+}
+const submit = async () => {
+    if (form.id) {
+        form.pid =  form.pid||'0'
+        await updateMenu(form)
+    } else {
+        form.code = 'menu'
+        let obj = JSON.parse(JSON.stringify(form))
+        delete obj.id
+        await addMenu(obj)
+    }
+    emits('init')
+    dialogVisible.value = false
+}
+
+defineExpose({ open })
+</script>

src/views/auth/role/index.vue

@@ -5,7 +5,7 @@
                 <div class="title">角色列表</div>
                 <el-button :icon="Plus" type="primary" @click="addRole" class="ml10">新增</el-button>
             </div>
-            <Table ref="tableRef" @currentChange="currentChange" />
+            <Table ref="tableRef" :row-config="{ isCurrent: true, isHover: true }" @currentChange="currentChange" />
         </div>
         <Tree
             v-if="menuListId"
@@ -13,8 +13,8 @@
             show-checkbox
             width="350px"
             :data="menuTree"
-            :checkStrictly="checkStrictly"
-            @check-change="checkChange"
+            :checkStrictly="false"
+            @checkChange="checkChange"
         ></Tree>
         <el-empty style="width: 350px; padding-top: 300px; box-sizing: border-box" description="请选择角色" v-else />
         <PopupForm ref="popupRef"></PopupForm>
@@ -26,7 +26,7 @@ import { ref, onMounted, provide } from 'vue'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
-import Tree from '@/components/tree/index.vue'
+import Tree from '@/components/tree/allocation.vue'
 import { functionTree } from '@/api/user-boot/function'
 import { getFunctionsByRoleIndex, updateRoleMenu } from '@/api/user-boot/roleFuction'
 import { mainHeight } from '@/utils/layout'
@@ -43,6 +43,7 @@ const height = mainHeight(20).height
 const treeRef = ref()
 const menuTree = ref<treeData[]>([])
 const popupRef = ref()
+const tableRef = ref()
 const checkStrictly = ref(true)
 const menuListId = ref('')
 const tableStore = new TableStore({
@@ -104,7 +105,13 @@ const tableStore = new TableStore({
                 }
             ]
         }
-    ]
+    ],
+    loadCallback: () => {
+        tableRef.value.getRef().setCurrentRow(tableStore.table.data[0])
+        currentChange({
+            row: tableStore.table.data[0]
+        })
+    }
 })
 tableStore.table.params.searchValue = ''
 
@@ -139,21 +146,22 @@ const currentChange = (data: any) => {
 
 const timeout = ref<NodeJS.Timeout>()
 const checkChange = (data: any) => {
-    if (checkStrictly.value) {
-        checkStrictly.value = false
-        return
-    }
-    if (timeout.value) {
-        clearTimeout(timeout.value)
-    }
-    timeout.value = setTimeout(() => {
-        updateRoleMenu({
-            id: menuListId.value,
-            idList: treeRef.value.treeRef.getCheckedNodes(false, true).map((node: any) => node.id)
-        }).then(() => {
+    // if (checkStrictly.value) {
+    //     checkStrictly.value = false
+    //     return
+    // }
+
+    updateRoleMenu({
+        id: menuListId.value,
+        idList: treeRef.value.treeRef.getCheckedNodes(false, true).map((node: any) => node.id)
+    })
+        .then(() => {
             ElMessage.success('操作成功!')
+            treeRef.value.loading = false
+        })
+        .catch(() => {
+            treeRef.value.loading = false
         })
-    }, 1000)
 }
 onMounted(() => {
     tableStore.index()

src/views/govern/alarm/Device.vue

@@ -83,14 +83,14 @@ const tableStore = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        { title: '设备名称', field: 'equipmentName', align: 'center' },
-        { title: '工程名称', field: 'engineeringName', align: 'center' },
-        { title: '项目名称', field: 'projectName', align: 'center' },
-        { title: '发生时刻', field: 'startTime', align: 'center', width: 180, sortable: true },
+        { title: '设备名称', field: 'equipmentName', align: 'center',minWidth: 100 },
+        { title: '工程名称', field: 'engineeringName', align: 'center',minWidth: 100  },
+        { title: '项目名称', field: 'projectName', align: 'center',minWidth: 100  },
+        { title: '发生时刻', field: 'startTime', align: 'center', minWidth: 180, sortable: true },
         {
             title: '模块信息',
             field: 'moduleNo',
-            align: 'center',
+            align: 'center',minWidth: 100 ,
             formatter: (row: any) => {
                 return row.cellValue ? row.cellValue : '/'
             }
@@ -107,7 +107,7 @@ const tableStore = new TableStore({
         },
         {
             title: '事件描述',
-            minWidth: 220,
+            minWidth: 250,
             field: 'showName'
         },
         {

src/views/govern/alarm/Front.vue

@@ -35,10 +35,10 @@ const tableStore = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        { title: '前置服务器名称', field: 'lineId', align: 'center' },
-        { title: '前置服务器ip', field: 'wavePath', align: 'center' },
-        { title: '进程号', field: 'clDid', align: 'center' },
-        { title: '发生时刻', field: 'startTime', align: 'center', minWidth: 80, sortable: true },
+        { title: '前置服务器名称', field: 'lineId', align: 'center' ,minWidth: 120 },
+        { title: '前置服务器ip', field: 'wavePath', align: 'center' ,minWidth: 100 },
+        { title: '进程号', field: 'clDid', align: 'center',minWidth: 60  },
+        { title: '发生时刻', field: 'startTime', align: 'center', minWidth: 180, sortable: true },
        
         {
             title: '事件描述',
@@ -48,7 +48,8 @@ const tableStore = new TableStore({
          {
             title: '告警代码',
             field: 'code',
-            align: 'center',
+            align: 'center',minWidth: 100 ,
+            
 
             formatter: (row: any) => {
                  return row.cellValue ? '\u200B' + row.cellValue : '/'

src/views/govern/alarm/Transient.vue

@@ -128,15 +128,15 @@ const tableStore = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        { title: '设备名称', field: 'equipmentName', align: 'center' },
-        { title: '工程名称', field: 'engineeringName', align: 'center' },
-        { title: '项目名称', field: 'projectName', align: 'center' },
-        { title: '发生时刻', field: 'startTime', align: 'center', width: '240',sortable: true },
-        { title: '监测点名称', field: 'lineName', align: 'center' },
-        { title: '事件描述', field: 'showName', align: 'center' },
-        { title: '事件发生位置', field: 'evtParamPosition', align: 'center' },
-        { title: '相别', field: 'evtParamPhase', align: 'center' },
-        { title: '持续时间(s)', field: 'evtParamTm', align: 'center',sortable: true },
+        { title: '设备名称', field: 'equipmentName', minWidth: 120,align: 'center' },
+        { title: '工程名称', field: 'engineeringName', minWidth: 120,align: 'center' },
+        { title: '项目名称', field: 'projectName', minWidth: 120,align: 'center' },
+        { title: '发生时刻', field: 'startTime', align: 'center', minWidth: 180,sortable: true },
+        { title: '监测点名称', field: 'lineName', minWidth: 120,align: 'center' },
+        { title: '事件描述', field: 'showName', minWidth: 120,align: 'center' },
+        { title: '事件发生位置', field: 'evtParamPosition',minWidth: 150, align: 'center' },
+        { title: '相别', field: 'evtParamPhase',minWidth: 80, align: 'center' },
+        { title: '持续时间(s)', field: 'evtParamTm',minWidth: 80, align: 'center',sortable: true },
         { title: '暂降(聚升)幅值(%)', minWidth: 100, field: 'evtParamVVaDepth', align: 'center',sortable: true },
 
         {
@@ -166,7 +166,7 @@ const tableStore = new TableStore({
                                     boxoList.value = row
                                     boxoList.value.featureAmplitude =
                                         row.evtParamVVaDepth != '-' ? row.evtParamVVaDepth - 0 : null
-                                    boxoList.value.systemType = 'WX'
+                                    boxoList.value.systemType = 'ZL'
                                     wp.value = res.data
                                 }
                                 loading.value = false

src/views/govern/device/control/index.vue

@@ -77,7 +77,6 @@
                 </el-descriptions-item> -->
             </el-descriptions>
             <el-tabs v-model.trim="dataSet" type="border-card" class="device-control-box-card" @tab-click="handleClick">
-               
                 <el-tab-pane
                     lazy
                     :label="item.name"
@@ -87,7 +86,7 @@
                 >
                     <template #label>
                         <span class="custom-tabs-label">
-                            <el-icon>
+                            <!-- <el-icon>
                                 <TrendCharts v-if="item.name == 'APF模块数据'" />
                                 <DataLine v-if="item.name == '历史APF模块数据'" />
                                 <DataAnalysis v-if="item.name.includes('趋势数据')" />
@@ -113,7 +112,7 @@
                                         !item.name.includes('暂态事件')
                                     "
                                 />
-                            </el-icon>
+                            </el-icon> -->
                             <span>{{ item.name }}</span>
                         </span>
                     </template>
@@ -157,7 +156,7 @@
                             </el-select> -->
                             <el-radio-group
                                 v-model.trim="formInline.dataLevel"
-                                v-if="!dataSet.includes('_moduleData')"
+                                v-if="!dataSet.includes('_moduleData') && TrendList?.lineType == 1"
                                 :disabled="TrendList?.lineType != 1"
                                 @change="handleClick"
                             >
@@ -733,14 +732,14 @@ const handleHarmonicSpectrum = async () => {
     // getRealDataMqttMsg()
     await getBasicRealData(lineId.value).then((res: any) => {
         if (res.code == 'A0000') {
-             ElMessage.success('装置应答成功')
+            ElMessage.success('装置应答成功')
             // mqttMessage.value = {}
 
             realDataTimer.value = window.setInterval(() => {
                 if (!dataSet.value.includes('_realtimedata')) return
 
                 getBasicRealData(lineId.value).then((res: any) => {
-                     console.log(res, '获取基础实时数据')
+                    console.log(res, '获取基础实时数据')
                 })
             }, 30000)
         }
@@ -838,7 +837,8 @@ const devData: any = ref({})
 const lineId: any = ref('')
 const dataLevel: any = ref('')
 const dataSource = ref([])
-const nodeClick = async (e: anyObj) => {
+const engineeringName = ref('')
+const nodeClick = async (e: anyObj, node: any) => {
     if (e == undefined || e.level == 2) {
         return (loading.value = false)
     }
@@ -854,6 +854,8 @@ const nodeClick = async (e: anyObj) => {
 
     //选中设备名称后，点击标签页也能查询数据，要求点击设备名称后，点击标签页默认查询第一个监测点数据
     if (e.level == 3 || e.level == 2) {
+        engineeringName.value = node?.parent.parent.data.name
+
         await queryDictType({
             lineId: e?.id,
             conType: e.conType
@@ -979,49 +981,47 @@ const getRealDataMqttMsg = async () => {
                     })
                 }, 30000)
                 mqttRef.value.on('message', (topic: any, message: any) => {
-                    // console.log(
-                    //     '实时数据&实时趋势---mqtt接收到消息',
-                    //     JSON.parse(JSON.stringify(JSON.parse(new TextDecoder().decode(message))))
-                    // )
+                    console.log(
+                        '实时数据&实时趋势---mqtt接收到消息',
+                        JSON.parse(JSON.stringify(JSON.parse(new TextDecoder().decode(message))))
+                    )
                     let obj = JSON.parse(JSON.stringify(JSON.parse(new TextDecoder().decode(message))))
-                  
+
                     if (lineId.value != obj.lineId || adminInfo.userIndex != obj.userId) return
 
                     //处理mqtt数据 1转2除 2转1乘
                     //如果消息返回值是二次值，下拉框是二次值只需要单位换算 除以1000
                     //如果消息返回值是一次值，下拉框是一次值只需要单位换算 除以1000
                     if (obj.dataLevel == formInline.dataLevel) {
-          
                         obj = {
                             ...obj,
                             // 电压有效值
-                            vRmsA: obj.vRmsA ,
-                            vRmsB: obj.vRmsB ,
-                            vRmsC: obj.vRmsC ,
+                            vRmsA: obj.vRmsA,
+                            vRmsB: obj.vRmsB,
+                            vRmsC: obj.vRmsC,
                             //基波电压幅值
-                            v1A: obj.v1A ,
-                            v1B: obj.v1B ,
-                            v1C: obj.v1C ,
+                            v1A: obj.v1A,
+                            v1B: obj.v1B,
+                            v1C: obj.v1C,
                             //有功功率
-                            pA: obj.pA ,
-                            pB: obj.pB ,
-                            pC: obj.pC ,
-                            pTot: obj.pTot ,
+                            pA: obj.pA,
+                            pB: obj.pB,
+                            pC: obj.pC,
+                            pTot: obj.pTot,
                             //无功功率
-                            qA: obj.qA ,
-                            qB: obj.qB ,
-                            qC: obj.qC ,
-                            qTot: obj.qTot ,
+                            qA: obj.qA,
+                            qB: obj.qB,
+                            qC: obj.qC,
+                            qTot: obj.qTot,
                             //视在功率
-                            sA: obj.sA ,
-                            sB: obj.sB ,
-                            sC: obj.sC ,
-                            sTot: obj.sTot 
+                            sA: obj.sA,
+                            sB: obj.sB,
+                            sC: obj.sC,
+                            sTot: obj.sTot
                         }
                     }
                     //如果消息返回值是二次值，下拉框是一次值需要单位换算 除以1000 并且乘以pt ct
                     if (obj.dataLevel == 'Secondary' && formInline.dataLevel == 'Primary') {
-                        
                         obj = {
                             ...obj,
                             // 电压有效值
@@ -1102,9 +1102,11 @@ const getRealDataMqttMsg = async () => {
                     }
                     if (obj.hasOwnProperty('pA') && obj.hasOwnProperty('pB')) {
                         mqttMessage.value = obj
-                    
+
                         //更新实时数据主页面值
-                        realTimeFlag.value && realTimeRef.value && realTimeRef.value.setRealData(mqttMessage.value,formInline.dataLevel)
+                        realTimeFlag.value &&
+                            realTimeRef.value &&
+                            realTimeRef.value.setRealData(mqttMessage.value, formInline.dataLevel)
                         tableLoading.value = false
                         //更新实时趋势折线图数据
                         if (sonTab.value == 2) {
@@ -1228,6 +1230,7 @@ const handleClick = async (tab?: any) => {
         let obj = {
             devId: deviceId.value, //e.id
             lineId: lineId.value, //e.pid
+            engineeringName: engineeringName.value, //e.name
             type: 3,
             list: [
                 {
@@ -1422,9 +1425,7 @@ const echoName = (value: any, arr: any[]) => {
     return value ? arr.find(item => item.value == value)?.label : '/'
 }
 
-onMounted(() => {
-   
-})
+onMounted(() => {})
 onBeforeUnmount(() => {
     clearInterval(realDataTimer.value)
     clearInterval(trendTimer.value)

src/views/govern/device/control/tabs/components/waveFormAnalysis.vue

@@ -139,12 +139,13 @@ const handleBack = () => {
     emit('handleHideCharts')
 }
 const setHeight = (h: any, vh: any, num = 1) => {
+    console.log('🚀 ~ setHeight ~ h:', h)
     if (h != false) {
         parentHeight.value = h
     }
 
     setTimeout(() => {
-        bxecharts.value = mainHeight(vh,num).height
+        bxecharts.value = mainHeight(vh, num).height
     }, 100)
 }
 onMounted(() => {})

src/views/govern/device/control/tabs/event.vue

@@ -2,8 +2,13 @@
     <div class="view">
         <TableHeader datePicker ref="headerRef" v-if="!isWaveCharts" :showReset="false"></TableHeader>
         <Table ref="tableRef" v-if="!isWaveCharts" />
-        <waveFormAnalysis v-loading="loading" v-if="isWaveCharts" ref="waveFormAnalysisRef"
-            @handleHideCharts="isWaveCharts = false" :wp="wp" />
+        <waveFormAnalysis
+            v-loading="loading"
+            v-if="isWaveCharts"
+            ref="waveFormAnalysisRef"
+            @handleHideCharts="isWaveCharts = false"
+            :wp="wp"
+        />
     </div>
 </template>
 <script lang="ts" setup>
@@ -15,7 +20,7 @@ import TableHeader from '@/components/table/header/index.vue'
 import waveFormAnalysis from './components/waveFormAnalysis.vue'
 import { ArrowLeft, Message } from '@element-plus/icons-vue'
 import { ElMessage } from 'element-plus'
-import { analyseWave,getFileByEventId } from '@/api/common'
+import { analyseWave, getFileByEventId } from '@/api/common'
 import { getFileZip } from '@/api/cs-harmonic-boot/datatrend'
 const tableParams: any = ref({})
 const refheader = ref()
@@ -31,12 +36,11 @@ const waveFormAnalysisRef = ref()
 const headerRef = ref()
 
 const props = defineProps({
-  deviceType: {
-    type: String,
-    default: '0'
-  }
-});
-
+    deviceType: {
+        type: String,
+        default: '0'
+    }
+})
 
 const tableStore: any = new TableStore({
     url: '/cs-device-boot/csGroup/deviceDataByType',
@@ -45,7 +49,9 @@ const tableStore: any = new TableStore({
     column: [
         // { width: '60', type: 'checkbox', fixed: 'left' },
         {
-            title: '序号', width: 80, formatter: (row: any) => {
+            title: '序号',
+            width: 80,
+            formatter: (row: any) => {
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
@@ -65,10 +71,11 @@ const tableStore: any = new TableStore({
             title: '持续时间(s)',
             minWidth: 100,
             formatter: (row: any) => {
-                  console.log('row.cellValue', row.cellValue)
+                console.log('row.cellValue', row.cellValue)
                 row.cellValue = row.cellValue ? row.cellValue.toFixed(2) : '/'
                 return row.cellValue
-            }, sortable: true
+            },
+            sortable: true
         },
         {
             field: 'featureAmplitude',
@@ -109,7 +116,9 @@ const tableStore: any = new TableStore({
                                 row.loading1 = false
                                 if (res != undefined) {
                                     boxoList.value = row
-                                    boxoList.value.systemType = 'WX'
+                                    boxoList.value.systemType = 'YPT'
+                                    boxoList.value.engineeringName = tableParams.value.engineeringName
+                                    console.log("🚀 ~ tableParams.value.engineeringName:", tableParams.value.engineeringName)
                                     wp.value = res.data
                                     view.value = false
                                     view2.value = true
@@ -134,7 +143,7 @@ const tableStore: any = new TableStore({
                     icon: 'el-icon-DataLine',
                     render: 'basicButton',
                     disabled: row => {
-                          return  row.showName != '未知';
+                        return row.showName != '未知'
                     }
                 },
                 {
@@ -158,25 +167,24 @@ const tableStore: any = new TableStore({
                             document.body.appendChild(link)
                             link.click() //执行下载
                             document.body.removeChild(link) //释放标签
-
                         })
                     }
                 },
                 {
-                 name: 'edit',
-                 title: '波形补召',
-                 type: 'primary',
-                 icon: 'el-icon-Check',
-                 render: 'basicButton',
-                 disabled: row => {
-                    return props.deviceType === '2' && row.wavePath || row.showName === '未知';
-                },
-                 click: row => {
-                        getFileByEventId(row.id).then(res => { 
+                    name: 'edit',
+                    title: '波形补召',
+                    type: 'primary',
+                    icon: 'el-icon-Check',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return (props.deviceType === '2' && row.wavePath) || row.showName === '未知'
+                    },
+                    click: row => {
+                        getFileByEventId(row.id).then(res => {
                             ElMessage.success(res.message)
                             tableStore.index()
                         })
-                 }   
+                    }
                 }
             ]
         }
@@ -186,9 +194,10 @@ const tableStore: any = new TableStore({
         tableStore.table.params.devId = tableParams.value.devId
         tableStore.table.params.lineId = tableParams.value.lineId
         tableStore.table.params.list = tableParams.value.list
+        console.log('🚀 ~ ableParams.value:', tableParams.value)
         tableStore.table.params.type = 3
     },
-    loadCallback: () => { }
+    loadCallback: () => {}
 })
 provide('tableStore', tableStore)
 const isWaveCharts = ref(false)

src/views/govern/device/control/tabs/trend.vue

@@ -232,6 +232,7 @@ const init = async () => {
     loading.value = true
     // 选择指标的时候切换legend内容和data数据
     let list: any = []
+    echartsData.value={}
     legendDictList.value?.selectedList?.map((item: any) => {
         searchForm.value.index.map((vv: any) => {
             if (item.dataType == vv) {

src/views/govern/device/disposition/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="default-main device-manage" :style="{ height: pageHeight.height }" v-loading="loading">
+    <div class=" device-manage" :style="{ height: pageHeight.height }" v-loading="loading">
         <GetMarketList @node-click="selectUser" @selectUser="selectUser"></GetMarketList>
         <div class="device-manage-right" :style="{ height: pageHeight.height }">
             <el-descriptions title="用户基本信息" class="mb10" :column="2" border>
@@ -65,10 +65,10 @@ import { queryByUseId, add, removeMarketData, queryEnginnerByUseId } from '@/api
 import { ref, onMounted } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 
-const pageHeight = mainHeight(20)
+const pageHeight = mainHeight(60)
 const loading = ref(true)
 
-const tableHeight = mainHeight(135)
+const tableHeight = mainHeight(173)
 const user: any = ref({})
 const tableData = ref([])
 const tableData2 = ref([])

src/views/govern/device/officialUser/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="default-main device-manage" :style="{ height: pageHeight.height }" v-loading="loading">
+  <div class=" device-manage" :style="{ height: pageHeight.height }" v-loading="loading">
     <OfficialUserTree @node-click="selectUser" @selectUser="selectUser"></OfficialUserTree>
     <div class="device-manage-right" :style="{ height: pageHeight.height }">
       <div class="el-descriptions__header">
@@ -134,7 +134,7 @@ import { add, removeUserDev, queryDevByUseId } from '@/api/cs-system-boot/offici
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 
-const pageHeight = mainHeight(20)
+const pageHeight = mainHeight(60)
 const loading = ref(true)
 
 const user: any = ref({})

src/views/govern/device/permission/index.vue

@@ -0,0 +1,22 @@
+<template>
+    <div class="default-main">
+        <el-tabs type="border-card" v-model="activeName">
+            <el-tab-pane label="营销用户" name="1"><Disposition v-if="activeName == '1'" /></el-tab-pane>
+            <el-tab-pane label="正式用户" name="2"><OfficialUser v-if="activeName == '2'" /></el-tab-pane>
+            <el-tab-pane label="游客" name="3"><Tourist v-if="activeName == '3'" /></el-tab-pane>
+        </el-tabs>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive } from 'vue'
+import Disposition from '@/views/govern/device/disposition/index.vue'
+import OfficialUser from '@/views/govern/device/officialUser/index.vue'
+import Tourist from '@/views/govern/device/tourist/index.vue'
+const activeName = ref('1')
+</script>
+<style lang="scss" scoped>
+:deep(.el-tabs--border-card > .el-tabs__content) {
+    padding: 0px;
+}
+</style>

src/views/govern/device/planData/components/transient.vue

@@ -1,191 +1,191 @@
-<template>
-    <div>
-        <Table ref="tableRef" v-if="!isWaveCharts" />
-        <waveFormAnalysis v-loading="loading" v-if="isWaveCharts" ref="waveFormAnalysisRef"
-            @handleHideCharts="isWaveCharts = false" :wp="wp" />
-    </div>
-
-    <!-- <TableHeader :showReset="false">
-       
-    </TableHeader> -->
-
-
-</template>
-<script setup lang='ts'>
-import { ref, provide, onMounted, nextTick } from 'vue'
-import { getEventByItem } from '@/api/cs-device-boot/planData'
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import { ElMessage } from 'element-plus'
-import waveFormAnalysis from '@/views/govern/device/control/tabs/components/waveFormAnalysis.vue';
-import { analyseWave } from '@/api/common'
-import { mainHeight } from '@/utils/layout'
-import { getFileZip } from '@/api/cs-harmonic-boot/datatrend'
-const props = defineProps({
-    activeName: String,
-    activeColName: [Object, String]
-})
-const loading = ref(false)
-const waveFormAnalysisRef = ref()
-const isWaveCharts = ref(false)
-const boxoList: any = ref([])
-const wp = ref({})
-const tableStore = new TableStore({
-    url: '/cs-harmonic-boot/data/getEventByItem',
-    method: 'POST',
-    paramsPOST: true,
-    showPage: false,
-    publicHeight: 355,
-    column: [
-        // { width: '60', type: 'checkbox', fixed: 'left' },
-        {
-            title: '序号', width: 80, formatter: (row: any) => {
-                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-            }
-        },
-        { field: 'startTime', title: '发生时刻', minWidth: 170, sortable: true },
-        { field: 'showName', title: '事件描述', minWidth: 170 },
-        {
-            field: 'phaseType',
-            title: '相别',
-            minWidth: 100,
-            formatter: (row: any) => {
-                row.cellValue = row.cellValue ? row.cellValue : '/'
-                return row.cellValue
-            }
-        },
-        {
-            field: 'persistTime',
-            title: '持续时间(s)',
-            minWidth: 100,
-            formatter: (row: any) => {
-                row.cellValue = row.cellValue ? row.cellValue.toFixed(2) : '/'
-                return row.cellValue
-            }, sortable: true
-        },
-        {
-            field: 'featureAmplitude',
-            title: '暂降(聚升)幅值(%)',
-            minWidth: 100,
-            formatter: (row: any) => {
-                row.cellValue = row.cellValue + '' ? row.cellValue.toFixed(2) : '/'
-                if (String(row.cellValue).split('.')[1] == '00') {
-                    row.cellValue = String(row.cellValue).split('.')[0]
-                }
-                return row.cellValue
-            }, sortable: true
-        },
-        {
-            title: '操作',
-            width: 180,
-            render: 'buttons',
-            fixed: 'right',
-            buttons: [
-                {
-                    name: 'edit',
-                    title: '波形分析',
-                    type: 'primary',
-                    icon: 'el-icon-Check',
-                    render: 'basicButton',
-                    loading: 'loading1',
-                    disabled: row => {
-                        // && row.evtParamTm < 20
-                        return !row.wavePath
-                    },
-                    click: async row => {
-                        row.loading1 = true
-                        loading.value = true
-                        isWaveCharts.value = true
-                        await analyseWave(row.id)
-                            .then(res => {
-                                row.loading1 = false
-                                if (res != undefined) {
-                                    boxoList.value = row
-                                    boxoList.value.systemType = 'WX'
-                                    wp.value = res.data
-
-
-                                }
-                                loading.value = false
-                            })
-                            .catch(() => {
-                                row.loading1 = false
-                                loading.value = false
-                            })
-
-                        nextTick(() => {
-                            waveFormAnalysisRef.value && waveFormAnalysisRef.value.getWpData(wp.value, boxoList.value, true)
-                            setHeight()
-                        })
-                    }
-                },
-                {
-                    name: 'edit',
-                    text: '暂无波形',
-                    type: 'info',
-                    icon: 'el-icon-DataLine',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.wavePath
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '波形下载',
-                    type: 'primary',
-                    loading: 'loading2',
-                    icon: 'el-icon-Check',
-                    render: 'basicButton',
-                    disabled: row => {
-                        // && row.evtParamTm < 20
-                        return !row.wavePath
-                    },
-                    click: row => {
-                        getFileZip({ eventId: row.id }).then(res => {
-                            let blob = new Blob([res], { type: 'application/zip' }) // console.log(blob) // var href = window.URL.createObjectURL(blob); //创建下载的链接
-                            const url = window.URL.createObjectURL(blob)
-                            const link = document.createElement('a') // 创建a标签
-                            link.href = url
-                            link.download = row.wavePath.split('/')[2] || '波形文件' // 设置下载的文件名
-                            document.body.appendChild(link)
-                            link.click() //执行下载
-                            document.body.removeChild(link) //释放标签
-
-                        })
-
-                    }
-                }
-            ]
-        }
-    ],
-
-    loadCallback: () => {
-
-    }
-})
-const setHeight = () => {
-    if (props.activeColName == '0') {
-        waveFormAnalysisRef.value && waveFormAnalysisRef.value.setHeight(350, 485)
-        tableStore.table.height = mainHeight(380).height
-
-    } else {
-        waveFormAnalysisRef.value && waveFormAnalysisRef.value.setHeight(350, 350)
-        tableStore.table.height = mainHeight(240).height
-    }
-}
-provide('tableStore', tableStore)
-const init = () => {
-    tableStore.table.params.id = props.activeName
-    // getEventByItem({ id: props.activeName }).then(res => {
-
-    // })
-    tableStore.index()
-}
-onMounted(() => {
-
-})
-defineExpose({ init, setHeight })
-
-</script>
-<style lang="scss" scoped></style>
+<template>
+    <div>
+        <Table ref="tableRef" v-if="!isWaveCharts" />
+        <waveFormAnalysis v-loading="loading" v-if="isWaveCharts" ref="waveFormAnalysisRef"
+            @handleHideCharts="isWaveCharts = false" :wp="wp" />
+    </div>
+
+    <!-- <TableHeader :showReset="false">
+       
+    </TableHeader> -->
+
+
+</template>
+<script setup lang='ts'>
+import { ref, provide, onMounted, nextTick } from 'vue'
+import { getEventByItem } from '@/api/cs-device-boot/planData'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { ElMessage } from 'element-plus'
+import waveFormAnalysis from '@/views/govern/device/control/tabs/components/waveFormAnalysis.vue';
+import { analyseWave } from '@/api/common'
+import { mainHeight } from '@/utils/layout'
+import { getFileZip } from '@/api/cs-harmonic-boot/datatrend'
+const props = defineProps({
+    activeName: String,
+    activeColName: [Object, String]
+})
+const loading = ref(false)
+const waveFormAnalysisRef = ref()
+const isWaveCharts = ref(false)
+const boxoList: any = ref([])
+const wp = ref({})
+const tableStore = new TableStore({
+    url: '/cs-harmonic-boot/data/getEventByItem',
+    method: 'POST',
+    paramsPOST: true,
+    showPage: false,
+    publicHeight: 355,
+    column: [
+        // { width: '60', type: 'checkbox', fixed: 'left' },
+        {
+            title: '序号', width: 80, formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { field: 'startTime', title: '发生时刻', minWidth: 170, sortable: true },
+        { field: 'showName', title: '事件描述', minWidth: 170 },
+        {
+            field: 'phaseType',
+            title: '相别',
+            minWidth: 100,
+            formatter: (row: any) => {
+                row.cellValue = row.cellValue ? row.cellValue : '/'
+                return row.cellValue
+            }
+        },
+        {
+            field: 'persistTime',
+            title: '持续时间(s)',
+            minWidth: 100,
+            formatter: (row: any) => {
+                row.cellValue = row.cellValue ? row.cellValue.toFixed(2) : '/'
+                return row.cellValue
+            }, sortable: true
+        },
+        {
+            field: 'featureAmplitude',
+            title: '暂降(聚升)幅值(%)',
+            minWidth: 100,
+            formatter: (row: any) => {
+                row.cellValue = row.cellValue + '' ? row.cellValue.toFixed(2) : '/'
+                if (String(row.cellValue).split('.')[1] == '00') {
+                    row.cellValue = String(row.cellValue).split('.')[0]
+                }
+                return row.cellValue
+            }, sortable: true
+        },
+        {
+            title: '操作',
+            width: 180,
+            render: 'buttons',
+            fixed: 'right',
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '波形分析',
+                    type: 'primary',
+                    icon: 'el-icon-Check',
+                    render: 'basicButton',
+                    loading: 'loading1',
+                    disabled: row => {
+                        // && row.evtParamTm < 20
+                        return !row.wavePath
+                    },
+                    click: async row => {
+                        row.loading1 = true
+                        loading.value = true
+                        isWaveCharts.value = true
+                        await analyseWave(row.id)
+                            .then(res => {
+                                row.loading1 = false
+                                if (res != undefined) {
+                                    boxoList.value = row
+                                    boxoList.value.systemType = 'YPT'
+                                    wp.value = res.data
+
+
+                                }
+                                loading.value = false
+                            })
+                            .catch(() => {
+                                row.loading1 = false
+                                loading.value = false
+                            })
+
+                        nextTick(() => {
+                            waveFormAnalysisRef.value && waveFormAnalysisRef.value.getWpData(wp.value, boxoList.value, true)
+                            setHeight()
+                        })
+                    }
+                },
+                {
+                    name: 'edit',
+                    text: '暂无波形',
+                    type: 'info',
+                    icon: 'el-icon-DataLine',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.wavePath
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '波形下载',
+                    type: 'primary',
+                    loading: 'loading2',
+                    icon: 'el-icon-Check',
+                    render: 'basicButton',
+                    disabled: row => {
+                        // && row.evtParamTm < 20
+                        return !row.wavePath
+                    },
+                    click: row => {
+                        getFileZip({ eventId: row.id }).then(res => {
+                            let blob = new Blob([res], { type: 'application/zip' }) // console.log(blob) // var href = window.URL.createObjectURL(blob); //创建下载的链接
+                            const url = window.URL.createObjectURL(blob)
+                            const link = document.createElement('a') // 创建a标签
+                            link.href = url
+                            link.download = row.wavePath.split('/')[2] || '波形文件' // 设置下载的文件名
+                            document.body.appendChild(link)
+                            link.click() //执行下载
+                            document.body.removeChild(link) //释放标签
+
+                        })
+
+                    }
+                }
+            ]
+        }
+    ],
+
+    loadCallback: () => {
+
+    }
+})
+const setHeight = () => {
+    if (props.activeColName == '0') {
+        waveFormAnalysisRef.value && waveFormAnalysisRef.value.setHeight(350, 485)
+        tableStore.table.height = mainHeight(380).height
+
+    } else {
+        waveFormAnalysisRef.value && waveFormAnalysisRef.value.setHeight(350, 350)
+        tableStore.table.height = mainHeight(240).height
+    }
+}
+provide('tableStore', tableStore)
+const init = () => {
+    tableStore.table.params.id = props.activeName
+    // getEventByItem({ id: props.activeName }).then(res => {
+
+    // })
+    tableStore.index()
+}
+onMounted(() => {
+
+})
+defineExpose({ init, setHeight })
+
+</script>
+<style lang="scss" scoped></style>

src/views/govern/device/tourist/index.vue

@@ -1,95 +1,96 @@
-<template>
-    <div class="default-main device-manage" :style="{ height: pageHeight.height }" v-loading="loading">
-        <DeviceTree
-            :showCheckbox="true"
-            :default-checked-keys="defaultCheckedKeys"
-            @checkChange="checkChange"
-        ></DeviceTree>
-        <div class="device-manage-right" :style="{ height: pageHeight.height }">
-            <vxe-table v-bind="defaultAttribute" :data="tableData" height="auto" style="width: 100%">
-                <vxe-column field="enginerName" title="工程名称"></vxe-column>
-                <vxe-column field="projectName" title="项目名称"></vxe-column>
-                <vxe-column field="deviceName" title="装置名称"></vxe-column>
-            </vxe-table>
-        </div>
-    </div>
-</template>
-
-<script setup lang="ts">
-defineOptions({
-    name: 'govern/tourist/index'
-})
-import { defaultAttribute } from '@/components/table/defaultAttribute'
-import DeviceTree from '@/components/tree/govern/deviceTree.vue'
-import { mainHeight } from '@/utils/layout'
-import { getVisitorConfig, updateVisitorConfig } from '@/api/cs-device-boot/user'
-import { ref, onMounted } from 'vue'
-
-const pageHeight = mainHeight(20)
-const loading = ref(true)
-const defaultCheckedKeys: any = ref([])
-const tableData = ref([])
-
-const checkChange = (data: any) => {
-    if (data.data.level === 2) {
-        if (data.checked) {
-            defaultCheckedKeys.value.push(data.data.id)
-        } else {
-            defaultCheckedKeys.value.splice(defaultCheckedKeys.value.indexOf(data.data.id), 1)
-        }
-        loading.value = true
-        updateVisitorConfigs()
-    }
-}
-const updateVisitorConfigs = () => {
-    const result = Array.from(new Set(defaultCheckedKeys.value))
-    updateVisitorConfig(
-        result.map(item => {
-            return {
-                deviceId: item
-            }
-        })
-    ).then((res: any) => {
-        if (res.code === 'A0000') {
-            getVisitorConfigs()
-        }
-    })
-}
-const getVisitorConfigs = () => {
-    getVisitorConfig().then((res:any) => {
-        if (res.code === 'A0000') {
-            tableData.value = res.data
-            loading.value = false
-            if (defaultCheckedKeys.value.length > 0) return
-            defaultCheckedKeys.value = [] // 清空
-            res.data.forEach((item:any) => {
-                defaultCheckedKeys.value.push(item.deviceId)
-            })
-        }
-    })
-}
-
-onMounted(() => {
-    // if (!adminInfo.token) return router.push({ name: 'login' })
-
-    getVisitorConfigs()
-})
-</script>
-
-<style lang="scss">
-.device-manage {
-    display: flex;
-
-    &-right {
-        overflow: hidden;
-        flex: 1;
-        padding: 10px 10px 10px 0;
-        .el-descriptions__header {
-            height: 36px;
-            margin-bottom: 7px;
-            display: flex;
-            align-items: center;
-        }
-    }
-}
-</style>
+<template>
+    <div class=" device-manage" :style="{ height: pageHeight.height }" v-loading="loading">
+        <DeviceTree
+            :showCheckbox="true"
+            :default-checked-keys="defaultCheckedKeys"
+            @checkChange="checkChange"
+            :height="35"
+        ></DeviceTree>
+        <div class="device-manage-right" :style="{ height: pageHeight.height }">
+            <vxe-table v-bind="defaultAttribute" :data="tableData" height="auto" style="width: 100%">
+                <vxe-column field="enginerName" title="工程名称"></vxe-column>
+                <vxe-column field="projectName" title="项目名称"></vxe-column>
+                <vxe-column field="deviceName" title="装置名称"></vxe-column>
+            </vxe-table>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+defineOptions({
+    name: 'govern/tourist/index'
+})
+import { defaultAttribute } from '@/components/table/defaultAttribute'
+import DeviceTree from '@/components/tree/govern/deviceTree.vue'
+import { mainHeight } from '@/utils/layout'
+import { getVisitorConfig, updateVisitorConfig } from '@/api/cs-device-boot/user'
+import { ref, onMounted } from 'vue'
+
+const pageHeight = mainHeight(60)
+const loading = ref(true)
+const defaultCheckedKeys: any = ref([])
+const tableData = ref([])
+
+const checkChange = (data: any) => {
+    if (data.data.level === 2) {
+        if (data.checked) {
+            defaultCheckedKeys.value.push(data.data.id)
+        } else {
+            defaultCheckedKeys.value.splice(defaultCheckedKeys.value.indexOf(data.data.id), 1)
+        }
+        loading.value = true
+        updateVisitorConfigs()
+    }
+}
+const updateVisitorConfigs = () => {
+    const result = Array.from(new Set(defaultCheckedKeys.value))
+    updateVisitorConfig(
+        result.map(item => {
+            return {
+                deviceId: item
+            }
+        })
+    ).then((res: any) => {
+        if (res.code === 'A0000') {
+            getVisitorConfigs()
+        }
+    })
+}
+const getVisitorConfigs = () => {
+    getVisitorConfig().then((res:any) => {
+        if (res.code === 'A0000') {
+            tableData.value = res.data
+            loading.value = false
+            if (defaultCheckedKeys.value.length > 0) return
+            defaultCheckedKeys.value = [] // 清空
+            res.data.forEach((item:any) => {
+                defaultCheckedKeys.value.push(item.deviceId)
+            })
+        }
+    })
+}
+
+onMounted(() => {
+    // if (!adminInfo.token) return router.push({ name: 'login' })
+
+    getVisitorConfigs()
+})
+</script>
+
+<style lang="scss">
+.device-manage {
+    display: flex;
+
+    &-right {
+        overflow: hidden;
+        flex: 1;
+        padding: 10px 10px 10px 0;
+        .el-descriptions__header {
+            height: 36px;
+            margin-bottom: 7px;
+            display: flex;
+            align-items: center;
+        }
+    }
+}
+</style>

src/views/govern/manage/basic/version.vue

@@ -1,165 +1,165 @@
-<template>
-    <div class="default-main">
-        <TableHeader ref="tableHeaderRef">
-            <template #select>
-                <el-form-item label="装置型号:">
-                    <el-select v-model.trim="tableStore.table.params.devType" placeholder="请选择装置型号" clearable>
-                        <el-option v-for="item in DevTypeOptions" :key="item.id" :label="item.name"
-                            :value="item.id"></el-option>
-                    </el-select>
-                </el-form-item>
-            </template>
-            <template #operation>
-                <el-button :icon="Plus" type="primary" @click="addMenu" class="ml10">新增版本</el-button>
-            </template>
-        </TableHeader>
-        <Table ref="tableRef" />
-        <PopupVersion ref="popupVersionRef" v-if="showPopup"></PopupVersion>
-    </div>
-</template>
-<script setup lang="ts">
-import { ref, onMounted, provide } from 'vue'
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import { delCsDictData } from '@/api/system-boot/csDictData'
-import { ElMessage } from 'element-plus'
-import { queryByCode, queryByid } from '@/api/system-boot/dictTree'
-import { useDictData } from '@/stores/dictData'
-import PopupVersion from '@/views/govern/manage/basic/popupVersion.vue'
-import { Plus } from '@element-plus/icons-vue'
-import { auditEdData } from '@/api/cs-device-boot/edData'
-
-defineOptions({
-    name: 'govern/manage/basic/version'
-})
-const popupVersionRef = ref()
-const dictData = useDictData()
-const showPopup = ref(false)
-const DevTypeOptions = ref()
-const tableHeaderRef = ref()
-
-const tableStore = new TableStore({
-    url: '/cs-device-boot/edData/queryEdDataPage',
-    method: 'POST',
-    column: [
-        { title: '装置型号', field: 'devTypeName' },
-        { title: '版本号', field: 'versionNo' },
-        { title: '版本协议', field: 'versionAgreement' },
-        { title: '版本日期', field: 'versionDate' },
-        { title: '归档日期', field: 'updateTime' },
-        { title: '描述', field: 'description' },
-        {
-            title: '状态', field: 'status', render: 'tag',
-            custom: {
-                1: 'error',
-                0: 'success',
-
-            },
-            replaceValue: {
-                1: '禁用',
-                0: '启用',
-
-            }
-        },
-        {
-            title: '操作',
-            align: 'center',
-            width: '180',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'edit',
-                    title: '编辑',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    click: row => {
-                        popupVersionRef.value.open('编辑版本', row)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '启用',
-                    type: 'primary',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.status == 1
-                    },
-                    click: row => {
-                        auditEdData({
-                            id: row.id,
-                            status: 1
-                        }).then((res: any) => {
-                            ElMessage.success('启用成功')
-                            tableStore.index()
-                        })
-                    }
-                },
-                {
-                    name: 'del',
-                    title: '禁用',
-                    type: 'danger',
-                    icon: 'el-icon-SwitchButton',
-                    render: 'confirmButton',
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'danger',
-                        title: '确定禁用吗？'
-                    },
-                    disabled: row => {
-                        return row.status == 0
-                    },
-                    click: row => {
-                        auditEdData({
-                            id: row.id,
-                            status: 0
-                        }).then((res: any) => {
-                            ElMessage.success('禁用成功')
-                            tableStore.index()
-                        })
-                    }
-                }
-            ]
-        }
-    ],
-    loadCallback: () => {
-        tableStore.table.data.forEach((item: any) => {
-            item.statusName = item.status == 1 ? '禁用' : '启用'
-            for (let key in item) {
-                if (typeof item[key] !== 'number') {
-                    item[key] = item[key] || '/'
-                }
-            }
-        })
-    }
-})
-queryByCode('Device_Type').then(res => {
-        const id = res.data.id
-        queryByid(id).then(res1 => {
-            res1.data.map((item: any, index: any) => {
-                if (item.pid == id) {
-                    res1.data.splice(index, 1)
-                }
-            })
-            console.log("🚀 ~ res1.data.map ~ res1.data:", res1.data)
-
-            DevTypeOptions.value = res1.data
-
-        })
-    })
-tableStore.table.params.devType = ''
-provide('tableStore', tableStore)
-onMounted(() => {
-   
-    tableHeaderRef.value.onComSearch()
-})
-const addMenu = () => {
-    showPopup.value = true
-  setTimeout(() => {
-    popupVersionRef.value.open('新增版本')
-  }, 100)
-}
-</script>
+<template>
+    <div class="default-main">
+        <TableHeader ref="tableHeaderRef">
+            <template #select>
+                <el-form-item label="装置型号:">
+                    <el-select v-model.trim="tableStore.table.params.devType" placeholder="请选择装置型号" clearable>
+                        <el-option v-for="item in DevTypeOptions" :key="item.id" :label="item.name"
+                            :value="item.id"></el-option>
+                    </el-select>
+                </el-form-item>
+            </template>
+            <template #operation>
+                <el-button :icon="Plus" type="primary" @click="addMenu" class="ml10">新增版本</el-button>
+            </template>
+        </TableHeader>
+        <Table ref="tableRef" />
+        <PopupVersion ref="popupVersionRef" v-if="showPopup"></PopupVersion>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { delCsDictData } from '@/api/system-boot/csDictData'
+import { ElMessage } from 'element-plus'
+import { queryByCode, queryByid } from '@/api/system-boot/dictTree'
+import { useDictData } from '@/stores/dictData'
+import PopupVersion from '@/views/govern/manage/basic/popupVersion.vue'
+import { Plus } from '@element-plus/icons-vue'
+import { auditEdData } from '@/api/cs-device-boot/edData'
+
+defineOptions({
+    name: 'govern/manage/basic/version'
+})
+const popupVersionRef = ref()
+const dictData = useDictData()
+const showPopup = ref(false)
+const DevTypeOptions = ref()
+const tableHeaderRef = ref()
+
+const tableStore = new TableStore({
+    url: '/cs-device-boot/edData/queryEdDataPage',
+    method: 'POST',
+    column: [
+        { title: '装置型号', field: 'devTypeName' },
+        { title: '版本号', field: 'versionNo' },
+        { title: '版本协议', field: 'versionAgreement' },
+        { title: '版本日期', field: 'versionDate' },
+        { title: '归档日期', field: 'updateTime' },
+        { title: '描述', field: 'description' },
+        {
+            title: '状态', field: 'status', render: 'tag',
+            custom: {
+                0: 'error',
+                1: 'success',
+
+            },
+            replaceValue: {
+                0: '禁用',
+                1: '启用',
+
+            }
+        },
+        {
+            title: '操作',
+            align: 'center',
+            width: '180',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        popupVersionRef.value.open('编辑版本', row)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '启用',
+                    type: 'primary',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.status == 1
+                    },
+                    click: row => {
+                        auditEdData({
+                            id: row.id,
+                            status: 1
+                        }).then((res: any) => {
+                            ElMessage.success('启用成功')
+                            tableStore.index()
+                        })
+                    }
+                },
+                {
+                    name: 'del',
+                    title: '禁用',
+                    type: 'danger',
+                    icon: 'el-icon-SwitchButton',
+                    render: 'confirmButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定禁用吗？'
+                    },
+                    disabled: row => {
+                        return row.status == 0
+                    },
+                    click: row => {
+                        auditEdData({
+                            id: row.id,
+                            status: 0
+                        }).then((res: any) => {
+                            ElMessage.success('禁用成功')
+                            tableStore.index()
+                        })
+                    }
+                }
+            ]
+        }
+    ],
+    loadCallback: () => {
+        tableStore.table.data.forEach((item: any) => {
+            item.statusName = item.status == 1 ? '禁用' : '启用'
+            for (let key in item) {
+                if (typeof item[key] !== 'number') {
+                    item[key] = item[key] || '/'
+                }
+            }
+        })
+    }
+})
+queryByCode('Device_Type').then(res => {
+        const id = res.data.id
+        queryByid(id).then(res1 => {
+            res1.data.map((item: any, index: any) => {
+                if (item.pid == id) {
+                    res1.data.splice(index, 1)
+                }
+            })
+            console.log("🚀 ~ res1.data.map ~ res1.data:", res1.data)
+
+            DevTypeOptions.value = res1.data
+
+        })
+    })
+tableStore.table.params.devType = ''
+provide('tableStore', tableStore)
+onMounted(() => {
+   
+    tableHeaderRef.value.onComSearch()
+})
+const addMenu = () => {
+    showPopup.value = true
+  setTimeout(() => {
+    popupVersionRef.value.open('新增版本')
+  }, 100)
+}
+</script>

src/views/govern/monitorRecall/eventRecall.vue

@@ -6,7 +6,7 @@
                 <el-button type="primary" :icon="Setting" @click="recall2">波形补召</el-button>
             </template>
         </TableHeader>
-        <Table ref="tableRef"  />
+        <Table ref="tableRef" />
     </div>
 </template>
 
@@ -16,17 +16,16 @@ import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import { Setting } from '@element-plus/icons-vue'
-import {eventRecall,fileRecall,logRecall} from '@/api/cs-device-boot/recall'
+import { eventRecall, fileRecall, logRecall } from '@/api/cs-device-boot/recall'
 import { ElMessage } from 'element-plus'
 import { el } from 'element-plus/es/locale'
 
-
 const props = defineProps({
     checkedNodes: {
         type: Array,
         default: () => []
     }
-});
+})
 
 const tableStore: any = new TableStore({
     url: '/cs-device-boot/csTerminalReply/bzLogs',
@@ -34,14 +33,16 @@ const tableStore: any = new TableStore({
     method: 'POST',
     column: [
         {
-            title: '序号', width: 80, formatter: (row: any) => {
+            title: '序号',
+            width: 80,
+            formatter: (row: any) => {
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-         {
+        {
             field: 'engineeringName',
             title: '项目名称',
-        
+            width: 120,
             formatter: row => {
                 return row.cellValue ? row.cellValue : '/'
             }
@@ -49,23 +50,23 @@ const tableStore: any = new TableStore({
         {
             field: 'projectName',
             title: '工程名称',
-       
+            width: 120,
             formatter: row => {
                 return row.cellValue ? row.cellValue : '/'
             }
         },
-         {
+        {
             field: 'deviceName',
             title: '设备名称',
-      
+            width: 120,
             formatter: row => {
                 return row.cellValue ? row.cellValue : '/'
             }
         },
-         {
+        {
             field: 'lineName',
             title: '监测点名称',
-     
+            width: 120,
             formatter: row => {
                 return row.cellValue ? row.cellValue : '/'
             }
@@ -73,23 +74,23 @@ const tableStore: any = new TableStore({
         {
             field: 'logTime',
             title: '补召时间',
-       
+            width: 160,
             formatter: row => {
                 return row.cellValue ? row.cellValue : '/'
             }
         },
-         {
+        {
             field: 'log',
             title: '类型',
-      
+            width: 80,
             formatter: row => {
                 return row.cellValue ? row.cellValue : '/'
             }
         },
-         {
+        {
             field: 'status',
             title: '状态',
-       
+            width: 80,
             formatter: row => {
                 return row.cellValue ? row.cellValue : '/'
             }
@@ -97,25 +98,22 @@ const tableStore: any = new TableStore({
         {
             field: 'result',
             title: '结果',
-     
+
             formatter: row => {
                 return row.cellValue ? row.cellValue : '/'
             }
-        },
-     
+        }
     ],
     beforeSearchFun: () => {
         if (!nodeClick.value || nodeClick.value.level !== 3) {
             ElMessage.warning('请先选中监测点')
-            return  // 阻止查询
+            return // 阻止查询
         }
         if (nodeClick.value) {
             tableStore.table.params.searchValue = nodeClick.value.id
         }
     },
-    loadCallback: () => {
-       
-    }
+    loadCallback: () => {}
 })
 
 provide('tableStore', tableStore)
@@ -127,19 +125,18 @@ const handleTreeNodeClick = (node: any) => {
     if (tableStore && tableStore.index) {
         // 判断当前节点是否为监测点层级
         if (node) {
-            if (node.level !== 3) { 
+            if (node.level !== 3) {
                 ElMessage.warning('请先选中监测点')
                 return
             }
-        }else {
-             ElMessage.warning('请先选中监测点')
-             return
+        } else {
+            ElMessage.warning('请先选中监测点')
+            return
         }
         tableStore.index()
     }
 }
 
-
 const recall1 = async () => {
     if (!props.checkedNodes || props.checkedNodes.length === 0) {
         ElMessage.warning('请先勾选监测点')
@@ -163,13 +160,12 @@ const recall2 = async () => {
     await fileRecall({
         startTime: tableStore.table.params.startTime,
         endTime: tableStore.table.params.endTime,
-        lineList: props.checkedNodes.map((node: any) => node.id) 
+        lineList: props.checkedNodes.map((node: any) => node.id)
     }).then((res: any) => {
         ElMessage.success('补召波形成功')
     })
 }
 
-
 // 暴露方法给父组件调用
 defineExpose({
     handleTreeNodeClick
@@ -194,4 +190,4 @@ defineExpose({
 .view :deep(.el-table) {
     height: calc(100% - 56px);
 }
-</style>
+</style>

src/views/govern/mxgraph/graphList/components/popup.vue

@@ -1,214 +1,229 @@
-<template>
-    <el-dialog
-        draggable
-        :title="title"
-        v-model.trim="dialogVisible"
-        width="500px"
-        :before-close="handleClose"
-        :close-on-click-modal="false"
-    >
-        <el-form ref="formRef" :rules="rules" :model="form" label-width="90px" class="form">
-            <el-form-item label="项目名称:" prop="name">
-                <el-input
-                    maxlength="32"
-                    show-word-limit
-                    v-model.trim="form.name"
-                    placeholder="请输入项目名称"
-                ></el-input>
-            </el-form-item>
-            <el-form-item label="工程项目:" class="top" prop="projectIds">
-                <el-tree-select
-                    v-model.trim="form.projectIds"
-                    default-expand-all
-                    show-checkbox
-                    node-key="id"
-                    :props="defaultProps"
-                    multiple
-                    :data="Engineering"
-                    collapse-tags
-                    style="width: 100%"
-                />
-                <!-- <el-cascader v-model.trim="form.projectIds" :options="Engineering" :props="defaultProps"
-                    :show-all-levels="false" collapse-tags collapse-tags-tooltip clearable  style="width: 100%;"/> -->
-            </el-form-item>
-            <el-form-item label="项目排序:" prop="orderBy">
-                <el-input
-                    maxlength="32"
-                    show-word-limit-number
-                    v-model.trim="form.orderBy"
-                    :min="0"
-                    :step="1"
-                    step-strictly
-                    style="width: 100%"
-                />
-            </el-form-item>
-
-            <el-form-item label="备注:" class="top">
-                <el-input
-                    maxlength="300"
-                    show-word-limit
-                    type="textarea"
-                    :rows="2"
-                    placeholder="请输入内容"
-                    v-model.trim="form.remark"
-                ></el-input>
-            </el-form-item>
-        </el-form>
-
-        <template #footer>
-            <span class="dialog-footer">
-                <el-button @click="dialogVisible = false">取 消</el-button>
-                <el-button type="primary" @click="addFn">确定</el-button>
-            </span>
-        </template>
-    </el-dialog>
-</template>
-<script setup lang="ts">
-import { ref, reactive } from 'vue'
-import { deviceTree, add, audit, getztProjectTree } from '@/api/cs-harmonic-boot/mxgraph'
-import { ElMessage, ElMessageBox } from 'element-plus'
-const title = ref('')
-const formRef = ref()
-const Engineering = ref([])
-const dialogVisible = ref(false)
-const emit = defineEmits(['submit'])
-const defaultProps = {
-    children: 'children',
-    value: 'id',
-    label: 'name',
-    multiple: true,
-    expandTrigger: 'hover' as const
-}
-const form: any = reactive({
-    name: '',
-    projectIds: [],
-    orderBy: '100',
-    remark: ''
-})
-const rules = {
-    name: [{ required: true, message: '请输入项目名称', trigger: 'blur' }],
-    projectIds: [{ required: true, message: '请选择工程项目', trigger: 'change' }],
-    orderBy: [{ required: true, message: '请输入排序', trigger: 'blur' }]
-}
-const addFn = () => {
-    console.log('🚀 ~ add ~ form:', form)
-
-    formRef.value.validate((valid: boolean) => {
-        if (valid) {
-            if (title.value == '新增项目') {
-                add(form).then((res: any) => {
-                    ElMessage.success('新增项目成功!')
-                    dialogVisible.value = false
-                    emit('submit')
-                })
-            } else {
-                audit(form).then((res: any) => {
-                    ElMessage.success('修改项目成功!')
-                    dialogVisible.value = false
-                    emit('submit')
-                })
-            }
-        }
-    })
-}
-const handleTree = (data: any) => {
-    if (data && data.length != 0) {
-        data.map((item: any) => {
-            if (item.level != 2) {
-                item.disabled = true
-            } else {
-                item.disabled = false
-            }
-        })
-    }
-}
-const open = ref((row: any) => {
-    formRef.value?.resetFields()
-    // deviceTree({}).then((res: any) => {
-    //     res.data.forEach((item: any) => {
-    //         item.children.forEach((child: any) => {
-    //             child.children = []
-    //         })
-    //     })
-    //     Engineering.value = res.data
-    // })
-    getztProjectTree().then((res: any) => {
-        res.data.forEach((item: any, index: any) => {
-            if (!item.children || item.children.length == 0) {
-                res.data.splice(index, 1)
-                return
-            }
-            item.newList = []
-            item.children.forEach((vv: any, vvs: any) => {
-                vv.children.forEach((ss: any, ssIndex: any) => {
-                    if (ss.level == 1) {
-                        item.newList.push(ss)
-                    }
-                })
-            })
-            item.disabled = true
-            if (item.children && item.children.length != 0) {
-                item.children.forEach((vv: any, vvs: any) => {
-                    vv.disabled = true
-                    if (item.name.includes('治理')) {
-                        if (vv.level === 0) {
-                            vv.disabled = true
-                        } else {
-                            vv.disabled = false
-                        }
-                        // item.children = item.newList
-                    }
-                    if (item.name.includes('便携式')) {
-                        if (vv.level === 1) {
-                            vv.disabled = false
-                        } else {
-                            vv.disabled = true
-                        }
-                    }
-                    if (vv.children && vv.children.length != 0) {
-                        vv.children.forEach((kk: any, kks: any) => {
-                            if (item.name.includes('便携式') && kk.level === 2) {
-                                kk.disabled = true
-                                vv.children.splice(kks, 1)
-                            }
-                            // else {
-                            //     kk.disabled = true
-                            // }
-                        })
-                    }
-                })
-            }
-        })
-        Engineering.value = removeData(res.data)
-    })
-    title.value = row.title
-    dialogVisible.value = true
-    if (row.title == '新增项目') {
-        form.name = ''
-        form.projectIds = []
-        form.orderBy = '100'
-        form.remark = ''
-    } else {
-        for (let key in form) {
-            form[key] = row.row[key] || ''
-        }
-        form.id = row.row.id
-    }
-})
-const removeData = arr => {
-    return arr
-        .map(item => {
-            if (item.children) {
-                item.children = removeData(item.children)
-            }
-            return item.level <= 1 ? item : {}
-        })
-        .filter(item => Object.keys(item).length > 0)
-}
-
-const handleClose = () => {
-    dialogVisible.value = false
-}
-defineExpose({ open })
-</script>
-<style lang="scss" scoped></style>
+<template>
+    <el-dialog
+        draggable
+        :title="title"
+        v-model.trim="dialogVisible"
+        width="500px"
+        :before-close="handleClose"
+        :close-on-click-modal="false"
+    >
+        <el-form ref="formRef" :rules="rules" :model="form" label-width="90px" class="form-one">
+            <el-form-item label="项目名称:" prop="name">
+                <el-input
+                    maxlength="32"
+                    show-word-limit
+                    v-model.trim="form.name"
+                    placeholder="请输入项目名称"
+                ></el-input>
+            </el-form-item>
+            <el-form-item label="是否全局:" class="top" v-if="hasAdmin">
+                <el-switch
+                    v-model="form.scope"
+                    inline-prompt
+                    width="60px"
+                    :active-value="1"
+                    :inactive-value="0"
+                    active-text="是  "
+                    inactive-text="否  "
+                />
+            </el-form-item>
+            <el-form-item label="工程项目:" class="top" prop="projectIds" v-if="!hasAdmin || form.scope == 0">
+                <el-tree-select
+                    v-model.trim="form.projectIds"
+                    default-expand-all
+                    show-checkbox
+                    node-key="id"
+                    :props="defaultProps"
+                    multiple
+                    :data="Engineering"
+                    collapse-tags
+                    style="width: 100%"
+                />
+            </el-form-item>
+            <el-form-item label="项目排序:" prop="orderBy">
+                <el-input
+                    maxlength="32"
+                    show-word-limit-number
+                    v-model.trim="form.orderBy"
+                    :min="0"
+                    :step="1"
+                    step-strictly
+                    style="width: 100%"
+                />
+            </el-form-item>
+
+            <el-form-item label="备注:" class="top">
+                <el-input
+                    maxlength="300"
+                    show-word-limit
+                    type="textarea"
+                    :rows="2"
+                    placeholder="请输入内容"
+                    v-model.trim="form.remark"
+                ></el-input>
+            </el-form-item>
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="dialogVisible = false">取 消</el-button>
+                <el-button type="primary" @click="addFn">确定</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+<script setup lang="ts">
+import { ref, reactive } from 'vue'
+import { deviceTree, add, audit, getztProjectTree } from '@/api/cs-harmonic-boot/mxgraph'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { useAdminInfo } from '@/stores/adminInfo'
+const adminInfo = useAdminInfo()
+const hasAdmin = adminInfo.roleCode.some(item => item.includes('operation_manager')|| item.includes('root'))
+const title = ref('')
+const formRef = ref()
+const Engineering = ref([])
+const dialogVisible = ref(false)
+const emit = defineEmits(['submit'])
+const defaultProps = {
+    children: 'children',
+    value: 'id',
+    label: 'name',
+    multiple: true,
+    expandTrigger: 'hover' as const
+}
+const form: any = reactive({
+    name: '',
+    projectIds: [],
+    scope: 1,
+    orderBy: '100',
+    remark: ''
+})
+const rules = {
+    name: [{ required: true, message: '请输入项目名称', trigger: 'blur' }],
+    projectIds: [{ required: true, message: '请选择工程项目', trigger: 'change' }],
+    orderBy: [{ required: true, message: '请输入排序', trigger: 'blur' }]
+}
+const addFn = () => {
+    console.log('🚀 ~ add ~ form:', form)
+
+    formRef.value.validate((valid: boolean) => {
+        if (valid) {
+            if (title.value == '新增项目') {
+                add({ ...form, projectIds: form.scope == 1 ? ['WIRELESS_PROJECT_ID'] : form.projectIds }).then(
+                    (res: any) => {
+                        ElMessage.success('新增项目成功!')
+                        dialogVisible.value = false
+                        emit('submit')
+                    }
+                )
+            } else {
+                audit({ ...form, projectIds: form.scope == 1 ? ['WIRELESS_PROJECT_ID'] : form.projectIds }).then((res: any) => {
+                    ElMessage.success('修改项目成功!')
+                    dialogVisible.value = false
+                    emit('submit')
+                })
+            }
+        }
+    })
+}
+const handleTree = (data: any) => {
+    if (data && data.length != 0) {
+        data.map((item: any) => {
+            if (item.level != 2) {
+                item.disabled = true
+            } else {
+                item.disabled = false
+            }
+        })
+    }
+}
+const open = ref((row: any) => {
+    formRef.value?.resetFields()
+    // deviceTree({}).then((res: any) => {
+    //     res.data.forEach((item: any) => {
+    //         item.children.forEach((child: any) => {
+    //             child.children = []
+    //         })
+    //     })
+    //     Engineering.value = res.data
+    // })
+    getztProjectTree().then((res: any) => {
+        res.data.forEach((item: any, index: any) => {
+            if (!item.children || item.children.length == 0) {
+                res.data.splice(index, 1)
+                return
+            }
+            item.newList = []
+            item.children.forEach((vv: any, vvs: any) => {
+                vv.children.forEach((ss: any, ssIndex: any) => {
+                    if (ss.level == 1) {
+                        item.newList.push(ss)
+                    }
+                })
+            })
+            item.disabled = true
+            if (item.children && item.children.length != 0) {
+                item.children.forEach((vv: any, vvs: any) => {
+                    vv.disabled = true
+                    if (item.name.includes('治理')) {
+                        if (vv.level === 0) {
+                            vv.disabled = true
+                        } else {
+                            vv.disabled = false
+                        }
+                        // item.children = item.newList
+                    }
+                    if (item.name.includes('便携式')) {
+                        if (vv.level === 1) {
+                            vv.disabled = false
+                        } else {
+                            vv.disabled = true
+                        }
+                    }
+                    if (vv.children && vv.children.length != 0) {
+                        vv.children.forEach((kk: any, kks: any) => {
+                            if (item.name.includes('便携式') && kk.level === 2) {
+                                kk.disabled = true
+                                vv.children.splice(kks, 1)
+                            }
+                            // else {
+                            //     kk.disabled = true
+                            // }
+                        })
+                    }
+                })
+            }
+        })
+        Engineering.value = removeData(res.data)
+    })
+    title.value = row.title
+    dialogVisible.value = true
+    if (row.title == '新增项目') {
+        form.name = ''
+        form.projectIds = []
+        form.orderBy = '100'
+        form.remark = ''
+    } else {
+        for (let key in form) {
+            form[key] = row.row[key] || ''
+        }
+        form.id = row.row.id
+    }
+})
+const removeData = arr => {
+    return arr
+        .map(item => {
+            if (item.children) {
+                item.children = removeData(item.children)
+            }
+            return item.level <= 1 ? item : {}
+        })
+        .filter(item => Object.keys(item).length > 0)
+}
+
+const handleClose = () => {
+    dialogVisible.value = false
+}
+defineExpose({ open })
+</script>
+<style lang="scss" scoped></style>

src/views/govern/mxgraph/graphList/index.vue

@@ -28,7 +28,7 @@
                             <span style="display: flex; align-items: center">
                                 {{ item.name }}
 
-                                <el-tooltip class="item" effect="dark" content="修改项目" placement="top">
+                                <el-tooltip class="item" effect="dark" content="修改项目" placement="top"  v-if="hasAdmin || item.createBy == adminInfo.id">
                                     <Edit
                                         style="margin-left: 5px; width: 16px"
                                         class="xiaoshou color"
@@ -36,28 +36,43 @@
                                     />
                                 </el-tooltip>
                             </span>
-                            <div style="display: flex; justify-content: end">
-                                <el-button
-                                    class="color"
-                                    icon="el-icon-Share"
-                                    style="padding: 3px 0"
-                                    type="text"
-                                    @click="Aclick(item)"
+                            <div style="height: 32px">
+                                <div
+                                    style="display: flex; justify-content: end"
+                                    v-if="hasAdmin || item.createBy == adminInfo.id"
                                 >
-                                    设计
-                                </el-button>
-                                <!-- <el-button icon="el-icon-share" style="padding: 3px 0; color: green"
+                                    <!-- <el-button
+                                        class="color"
+                                        icon="el-icon-Promotion"
+                                        style="padding: 3px 0"
+                                        type="text"
+                                        v-if="bindId != item.id"
+                                        @click="activate(item)"
+                                    >
+                                        绑定
+                                    </el-button> -->
+                                    <el-button
+                                        class="color"
+                                        icon="el-icon-Share"
+                                        style="padding: 3px 0"
+                                        type="text"
+                                        @click="Aclick(item)"
+                                    >
+                                        设计
+                                    </el-button>
+                                    <!-- <el-button icon="el-icon-share" style="padding: 3px 0; color: green"
                                     type="text" @click="shejid(item)">设计</el-button> -->
-                                <!-- <el-button icon="el-icon-edit" style="padding: 3px 0; color: blue" type="text"
+                                    <!-- <el-button icon="el-icon-edit" style="padding: 3px 0; color: blue" type="text"
                                     @click="shejid(item)">编辑</el-button> -->
-                                <el-button
-                                    icon="el-icon-Delete"
-                                    style="padding: 3px 0; color: red"
-                                    type="text"
-                                    @click="deleted(item)"
-                                >
-                                    删除
-                                </el-button>
+                                    <el-button
+                                        icon="el-icon-Delete"
+                                        style="padding: 3px 0; color: red"
+                                        type="text"
+                                        @click="deleted(item)"
+                                    >
+                                        删除
+                                    </el-button>
+                                </div>
                             </div>
                         </div>
                         <img
@@ -95,15 +110,18 @@ import TableStore from '@/utils/tableStore'
 import TableHeader from '@/components/table/header/index.vue'
 import { deleteTopoTemplate, uploadTopo } from '@/api/cs-device-boot/topologyTemplate'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { audit, add } from '@/api/cs-harmonic-boot/mxgraph'
+import { audit, add, savePageIdWithUser, getByUserId } from '@/api/cs-harmonic-boot/mxgraph'
 import { Edit } from '@element-plus/icons-vue'
 import popup from './components/popup.vue'
-
+import { useAdminInfo } from '@/stores/adminInfo'
 const VITE_FLAG = import.meta.env.VITE_NAME == 'ypt'
 
 defineOptions({
     name: 'mxgraph/graph-list'
 })
+const adminInfo = useAdminInfo()
+
+const hasAdmin = adminInfo.roleCode.some(item => item.includes('operation_manager')|| item.includes('root'))
 const tableRef = ref()
 const popupRef = ref()
 let DOMIN = window.location.origin
@@ -120,8 +138,12 @@ const tableStore = new TableStore({
 })
 provide('tableStore', tableStore)
 tableStore.table.params.searchValue = ''
+tableStore.table.params.currentUserId = adminInfo.id
+// let aa=['operation_manager',]
+tableStore.table.params.roleCode = adminInfo.roleCode.join(',')
 onMounted(() => {
     tableStore.table.ref = tableRef.value
+    getBindId()
     tableStore.index()
     tableStore.table.loading = false
 })
@@ -131,6 +153,31 @@ const onSubmitadd = () => {
         title: '新增项目'
     })
 }
+const bindId = ref('')
+const activate = (e: any) => {
+    ElMessageBox.confirm('是否绑定?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+    })
+        .then(() => {
+            savePageIdWithUser({ pageId: e.id, userId: adminInfo.id }).then(res => {
+                if (res.code == 'A0000') {
+                    ElMessage({
+                        type: 'success',
+                        message: '操作成功'
+                    })
+                    bindId.value = e.id
+                }
+            })
+        })
+        .catch(() => {})
+}
+const getBindId = () => {
+    getByUserId({ userId: adminInfo.id }).then(res => {
+        bindId.value = res.data.pageId
+    })
+}
 const querdata = (e: any) => {}
 const editd = (e: any) => {
     popupRef.value.open({
@@ -142,7 +189,7 @@ const editd = (e: any) => {
 const Aclick = (e: any) => {
     //window.open(window.location.origin + `/zutai/?id=${e.id}&&name=${e.name}&&preview=false&&graphicDisplay=zl`)
     window.open(
-        'http://192.168.1.179:4001' +
+        window.location.origin +
             `/zutai/?id=${e.id}&&name=${e.name}&&preview=false&&graphicDisplay=${VITE_FLAG ? 'ypt' : 'zl'}`
     )
 }
@@ -179,7 +226,10 @@ const deleted = (e: any) => {
 
 const imgData = (e: any) => {
     window.open(
-        window.location.origin + `/zutai/?id=${e.id}&&name=${e.name}&&preview=true&&graphicDisplay=${VITE_FLAG ? 'ypt' : 'zl'}#/preview_ZL`
+        window.location.origin +
+            `/zutai/?id=${e.id}&&name=${e.name}&&preview=true&&graphicDisplay=${VITE_FLAG ? 'ypt' : 'zl'}#/preview_${
+                VITE_FLAG ? 'YPT' : 'ZL'
+            }`
     )
     //  window.open('http://192.168.1.128:4001' + `/zutai/?id=${e.id}&&name=${e.name}&&preview=true&&graphicDisplay=zl#/preview_ZL`)
 }

src/views/govern/reportCore/lineReport/index.vue

@@ -0,0 +1,274 @@
+<template>
+    <div class="default-main" :style="height">
+        <splitpanes style="height: 100%" id="navigation-splitpanes">
+            <pane :size="size">
+                <CloudDeviceEntryTree
+                    ref="TerminalRef"
+                    @node-click="handleNodeClick"
+                    @init="handleNodeClick"
+                ></CloudDeviceEntryTree>
+            </pane>
+            <pane style="background: #fff" :style="height">
+                <TableHeader ref="TableHeaderRef" date-picker :show-search="false">
+                    <template v-slot:select>
+                        <!-- <el-form-item label=" 模板策略">
+                            <el-select v-model="value" placeholder="请选择" @change="changeFn" clearable>
+                                <el-option
+                                    v-for="item in templatePolicy"
+                                    :key="item.id"
+                                    :label="item.name"
+                                    :value="item.id"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item> -->
+                    </template>
+                    <template #operation>
+                        <el-button icon="el-icon-Download" type="primary" @click="exportEvent">生成报告</el-button>
+                    </template>
+                </TableHeader>
+                <div class="box" :style="`height: calc(${tableStore.table.height} + 65px)`">
+                    <el-row>
+                        <el-col :span="12" class="mTop">
+                            <div class="grid-content">
+                                <div class="divBox">监测点详情</div>
+                            </div>
+                        </el-col>
+                        <el-col :span="12" class="mTop">
+                            <el-checkbox v-model="formd.xq">监测点详情</el-checkbox>
+                        </el-col>
+                    </el-row>
+                    <el-divider></el-divider>
+                    <el-row>
+                        <el-col :span="12" class="mTop">
+                            <div class="grid-content">
+                                <div class="divBox">暂降事件列表</div>
+                            </div>
+                        </el-col>
+                        <el-col :span="12" class="mTop">
+                            <el-checkbox v-model="formd.lb">表格</el-checkbox>
+                        </el-col>
+                    </el-row>
+                    <el-divider></el-divider>
+                    <el-row>
+                        <el-col :span="12" class="mTop">
+                            <div class="grid-content">
+                                <div class="divBox">暂降密度</div>
+                            </div>
+                        </el-col>
+                        <el-col :span="12" class="mTop">
+                            <el-checkbox v-model="formd.mdbg">表格</el-checkbox>
+                            <el-checkbox v-model="formd.mdtx">图形</el-checkbox>
+                        </el-col>
+                    </el-row>
+                    <el-divider></el-divider>
+                    <el-row>
+                        <el-col :span="12" class="mTop">
+                            <div class="grid-content">
+                                <div class="divBox">暂降事件点</div>
+                            </div>
+                        </el-col>
+                        <el-col :span="12" class="mTop">
+                            <el-checkbox v-model="formd.sjdITIC">ITIC</el-checkbox>
+                            <el-checkbox v-model="formd.sjdF47">F47</el-checkbox>
+                        </el-col>
+                    </el-row>
+                    <el-divider></el-divider>
+                    <el-row>
+                        <el-col :span="12" class="mTop">
+                            <div class="grid-content">
+                                <div class="divBox">概率分布</div>
+                            </div>
+                        </el-col>
+                        <el-col :span="12" class="mTop">
+                            <el-checkbox v-model="formd.glfbfz">暂降幅值</el-checkbox>
+                            <el-checkbox v-model="formd.glfbsj">持续时间</el-checkbox>
+                        </el-col>
+                    </el-row>
+                    <el-divider></el-divider>
+                    <el-row>
+                        <el-col :span="12" class="mTop">
+                            <div class="grid-content">
+                                <div class="divBox">月份统计</div>
+                            </div>
+                        </el-col>
+                        <el-col :span="12" class="mTop">
+                            <el-checkbox v-model="formd.tjbg">表格</el-checkbox>
+                            <el-checkbox v-model="formd.tjtx">图形</el-checkbox>
+                        </el-col>
+                    </el-row>
+                    <el-divider></el-divider>
+                    <el-row>
+                        <el-col :span="12" class="mTop">
+                            <div class="grid-content">
+                                <div class="divBox">暂降原因</div>
+                            </div>
+                        </el-col>
+                        <el-col :span="12" class="mTop">
+                            <el-checkbox v-model="formd.yybg">表格</el-checkbox>
+                            <el-checkbox v-model="formd.yytx">图形</el-checkbox>
+                        </el-col>
+                    </el-row>
+                    <el-divider></el-divider>
+                    <el-row>
+                        <el-col :span="12" class="mTop">
+                            <div class="grid-content">
+                                <div class="divBox">暂降类型</div>
+                            </div>
+                        </el-col>
+                        <el-col :span="12" class="mTop">
+                            <el-checkbox v-model="formd.lxbg">表格</el-checkbox>
+                            <el-checkbox v-model="formd.lxtx">图形</el-checkbox>
+                        </el-col>
+                    </el-row>
+                    <el-divider></el-divider>
+                </div>
+            </pane>
+        </splitpanes>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { onMounted, ref, provide } from 'vue'
+import 'splitpanes/dist/splitpanes.css'
+import { Splitpanes, Pane } from 'splitpanes'
+import TableStore from '@/utils/tableStore'
+import PointTree from '@/components/tree/pqs/pointTree.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useDictData } from '@/stores/dictData'
+import { mainHeight } from '@/utils/layout'
+import pointTreeWx from '@/components/tree/govern/pointTreeWx.vue'
+import { genFileId, ElMessage, ElNotification } from 'element-plus'
+import type { UploadProps, UploadUserFile } from 'element-plus'
+import CloudDeviceEntryTree from '@/components/tree/govern/cloudDeviceEntryTree.vue'
+import { getLineExport } from '@/api/harmonic-boot/cockpit/cockpit'
+defineOptions({
+    name: 'TransientReport/monitoringpointReport'
+})
+const height = mainHeight(20)
+const size = ref(0)
+const dictData = useDictData()
+const TableHeaderRef = ref()
+const dotList: any = ref({})
+const Template: any = ref({})
+const uploadList: any = ref([])
+
+const formd: any = ref({
+    xq: true,
+    lb: true,
+    mdbg: false,
+    mdtx: false,
+    sjdITIC: false,
+    sjdF47: false,
+    glfbfz: false,
+    glfbsj: false,
+    tjbg: false,
+    tjtx: false,
+    yybg: false,
+    yytx: false,
+    lxbg: false,
+    lxtx: false,
+    type: 0
+})
+
+const tableStore = new TableStore({
+    url: '',
+    method: 'POST',
+    column: [],
+    beforeSearchFun: () => {},
+    loadCallback: () => {}
+})
+provide('tableStore', tableStore)
+
+onMounted(() => {
+    const dom = document.getElementById('navigation-splitpanes')
+
+    if (dom) {
+        size.value = Math.round((180 / dom.offsetHeight) * 100)
+    }
+})
+
+const handleNodeClick = (data: any, node: any) => {
+    dotList.value = data
+}
+// 上传
+const choose = (files: any) => {
+    const isJPG = files.raw.type === 'image/jpg'
+    const isJPEG = files.raw.type === 'image/jpeg'
+    const isPNG = files.raw.type === 'image/png'
+    if (!isJPG && !isPNG && !isJPEG) {
+        ElMessage.warning('上传文件只能是 JPG/PNG 格式!')
+        return false
+    }
+
+    uploadList.value = files
+    ElMessage.success('上传成功')
+}
+
+//生成报告
+const exportEvent = () => {
+    if (dotList.value?.level != 4) {
+        return ElMessage.warning('请选择监测点进行报告生成!')
+    }
+    let a = ''
+
+    // formd.value.lineId = monitoringPoint.state.lineId
+    // formd.value.lineName = monitoringPoint.state.lineName.split('>').at(-1)
+    formd.value.lineId = dotList.value.id
+    formd.value.lineName = dotList.value.name
+    formd.value.searchBeginTime = TableHeaderRef.value.datePickerRef.timeValue[0]
+    formd.value.searchEndTime = TableHeaderRef.value.datePickerRef.timeValue[1]
+    formd.value.flag = TableHeaderRef.value.datePickerRef.interval
+    ElMessage('生成报告中,请稍等!')
+     const now = new Date()
+    const year = now.getFullYear() // 4位年份
+    const month = now.getMonth() + 1 // 月份0-11，需+1
+    const day = now.getDate() // 日期1-31
+
+    // 格式化YYYY - MM - DD（补零）
+    const formattedDate = `${year}${String(month).padStart(2, '0')}${String(day).padStart(2, '0')}`
+    getLineExport(formd.value).then((res: any) => {
+        let blob = new Blob([res], {
+            type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=UTF-8'
+        })
+        // createObjectURL(blob); //创建下载的链接
+        const url = window.URL.createObjectURL(blob)
+        const link = document.createElement('a') // 创建a标签
+        link.href = url
+        link.download = dotList.value.name+formattedDate // 设置下载的文件名
+        document.body.appendChild(link)
+        link.click() //执行下载
+        document.body.removeChild(link)
+    })
+}
+</script>
+<style lang="scss">
+.splitpanes.default-theme .splitpanes__pane {
+    background: #eaeef1;
+}
+.grid-content {
+    text-align: center;
+}
+.divBox {
+    width: 250px;
+    height: 31px;
+    margin: auto;
+    line-height: 32px;
+    border: 1px solid #c9c9c9;
+    &:hover {
+        border: 1px solid #002255;
+    }
+}
+.box {
+    padding: 10px;
+    // margin-top: 10px;
+    overflow-y: auto;
+    font-size: 15px;
+}
+.el-divider--horizontal {
+    margin: 10px 0;
+}
+.mTop {
+    margin-top: 5px;
+    margin-bottom: 5px;
+}
+</style>

src/views/govern/reportCore/report/index.vue

@@ -0,0 +1,182 @@
+<template>
+    <div class="default-main" :style="height">
+        <splitpanes style="height: 100%" id="navigation-splitpanes">
+            <pane :size="size">
+                <CloudDeviceEntryTree
+                    ref="TerminalRef"
+                    @node-click="handleNodeClick"
+                    @init="handleNodeClick"
+                ></CloudDeviceEntryTree>
+            </pane>
+            <pane style="background: #fff" :style="height">
+                <TableHeader ref="TableHeaderRef" datePicker :show-search="false">
+                    <template v-slot:select>
+                        <el-form-item label="客户名称">
+                            <el-input
+                                v-model="tableStore.table.params.crmName"
+                                maxlength="32"
+                                show-word-limit
+                                clearable
+                                placeholder="请输入客户名称"
+                            />
+                        </el-form-item>
+                        <el-form-item label="报表编号">
+                            <el-input
+                                v-model="tableStore.table.params.reportNumber"
+                                clearable
+                                placeholder="请输入报表编号"
+                                maxlength="12"
+                                show-word-limit
+                            />
+                        </el-form-item>
+                    </template>
+                    <template #operation>
+                        <el-upload
+                            :show-file-list="false"
+                            ref="uploadRef"
+                            action=""
+                            accept=".png,.jpg"
+                            :on-change="choose"
+                            :auto-upload="false"
+                        >
+                            <template #trigger>
+                                <el-button icon="el-icon-Upload" type="primary" class="mr10 ml10">上传接线图</el-button>
+                            </template>
+                        </el-upload>
+                        <el-button icon="el-icon-Download" type="primary" @click="exportEvent">生成</el-button>
+                    </template>
+                </TableHeader>
+                <div class="box">
+                    <div id="luckysheet">
+                        <img
+                            width="100%"
+                            :style="`height: calc(${tableStore.table.height} + 40px)`"
+                            src="@/assets/img/jss.png"
+                        />
+                    </div>
+                </div>
+            </pane>
+        </splitpanes>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { onMounted, ref, provide } from 'vue'
+import 'splitpanes/dist/splitpanes.css'
+import { Splitpanes, Pane } from 'splitpanes'
+import TableStore from '@/utils/tableStore'
+import PointTree from '@/components/tree/pqs/pointTree.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useDictData } from '@/stores/dictData'
+import { mainHeight } from '@/utils/layout'
+import pointTreeWx from '@/components/tree/govern/pointTreeWx.vue'
+import { genFileId, ElMessage, ElNotification } from 'element-plus'
+import type { UploadProps, UploadUserFile } from 'element-plus'
+import CloudDeviceEntryTree from '@/components/tree/govern/cloudDeviceEntryTree.vue'
+import { exportModel } from '@/api/cs-harmonic-boot/datatrend'
+defineOptions({
+    name: 'harmonic-boot/report/word'
+})
+
+const height = mainHeight(20)
+const size = ref(0)
+const dictData = useDictData()
+const TableHeaderRef = ref()
+const dotList: any = ref({})
+const Template: any = ref({})
+const uploadList: any = ref([])
+
+const tableStore = new TableStore({
+    url: '',
+    method: 'POST',
+    column: [],
+    beforeSearchFun: () => {},
+    loadCallback: () => {}
+})
+provide('tableStore', tableStore)
+
+onMounted(() => {
+    const dom = document.getElementById('navigation-splitpanes')
+
+    if (dom) {
+        size.value = Math.round((180 / dom.offsetHeight) * 100)
+    }
+})
+
+const handleNodeClick = (data: any, node: any) => {
+    dotList.value = data
+}
+// 上传
+const choose = (files: any) => {
+    const isJPG = files.raw.type === 'image/jpg'
+    const isJPEG = files.raw.type === 'image/jpeg'
+    const isPNG = files.raw.type === 'image/png'
+    if (!isJPG && !isPNG && !isJPEG) {
+        ElMessage.warning('上传文件只能是 JPG/PNG 格式!')
+        return false
+    }
+
+    uploadList.value = files
+    ElMessage.success('上传成功')
+}
+// 生成
+const exportEvent = () => {
+    console.log('🚀 ~ exportEvent ~ dotList.value:', dotList.value)
+    if (dotList.value?.level != 4) {
+        return ElMessage.warning('请选择监测点进行报告生成!')
+    }
+
+    let form = new FormData()
+    form.append('lineIndex', dotList.value.id)
+    form.append('name', dotList.value.name)
+    form.append('crmName', tableStore.table.params.crmName || '')
+    form.append('reportNumber', tableStore.table.params.reportNumber || '')
+    form.append('type', '0')
+    form.append('startTime', TableHeaderRef.value.datePickerRef.timeValue[0])
+    form.append('endTime', TableHeaderRef.value.datePickerRef.timeValue[1])
+    console.log('🚀 ~ exportEvent ~ uploadList.value:', uploadList.value?.raw)
+    form.append('file', uploadList.value?.raw || '')
+    // 特殊字符正则表达式
+    const specialCharRegex = /[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]/
+    if (
+        specialCharRegex.test(tableStore.table.params.crmName) ||
+        specialCharRegex.test(tableStore.table.params.reportNumber)
+    ) {
+        ElNotification({
+            type: 'error',
+            message: '包含特殊字符，请注意修改!'
+        })
+    } else {
+        ElMessage('生成报告中...')
+        const now = new Date()
+        const year = now.getFullYear() // 4位年份
+        const month = now.getMonth() + 1 // 月份0-11，需+1
+        const day = now.getDate() // 日期1-31
+
+        // 格式化YYYY - MM - DD（补零）
+        const formattedDate = `${year}${String(month).padStart(2, '0')}${String(day).padStart(2, '0')}`
+        exportModel(form).then((res: any) => {
+            let blob = new Blob([res], {
+                type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=UTF-8'
+            })
+            // createObjectURL(blob); //创建下载的链接
+            const url = window.URL.createObjectURL(blob)
+            const link = document.createElement('a') // 创建a标签
+            link.href = url
+            link.download = dotList.value.name + formattedDate // 设置下载的文件名
+            document.body.appendChild(link)
+            link.click() //执行下载
+            document.body.removeChild(link)
+        })
+    }
+}
+</script>
+<style lang="scss">
+.splitpanes.default-theme .splitpanes__pane {
+    background: #eaeef1;
+}
+
+.box {
+    padding: 10px;
+}
+</style>

src/views/govern/reportCore/statistics/index.vue

@@ -1,147 +1,147 @@
-<template>
-    <div class="default-main" :style="height">
-        <splitpanes style="height: 100%" class="default-theme" id="navigation-splitpanes">
-            <pane :size="size">
-                <PointTree :default-expand-all="false" template @node-click="handleNodeClick" @init="handleNodeClick"
-                    @Policy="stencil">
-                </PointTree>
-            </pane>
-            <pane :size="(100 - size)" style="background: #fff" :style="height">
-                <TableHeader ref="TableHeaderRef" datePicker>
-                    <template v-slot:select>
-                        <el-form-item label="模板策略">
-                            <el-select v-model.trim="Template" @change="changetype" placeholder="请选择模版" value-key="id">
-                                <el-option v-for="item in templatePolicy" :key="item.id" :label="item.name"
-                                    :value="item"></el-option>
-                            </el-select>
-                        </el-form-item>
-                    </template>
-                    <template #operation>
-                        <el-button icon="el-icon-Download" type="primary" @click="exportEvent">导出excel</el-button>
-                    </template>
-                </TableHeader>
-                <div class="box">
-                    <div id="luckysheet" v-loading="tableStore.table.loading"
-                        :style="`height: calc(${tableStore.table.height} + 45px)`"></div>
-                </div>
-            </pane>
-        </splitpanes>
-    </div>
-</template>
-<script setup lang="ts">
-import { onMounted, ref, provide } from 'vue'
-import TableStore from '@/utils/tableStore'
-import PointTree from '@/components/tree/govern/pointTree.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import { useDictData } from '@/stores/dictData'
-import { mainHeight } from '@/utils/layout'
-import { getTemplateByDept } from '@/api/harmonic-boot/luckyexcel'
-import { exportExcel } from '@/views/system/reportForms/export.js'
-import 'splitpanes/dist/splitpanes.css'
-import { Splitpanes, Pane } from 'splitpanes'
-// import data from './123.json'
-defineOptions({
-    name: 'govern/reportCore/statistics/index'
-})
-const height = mainHeight(20)
-const size = ref(0)
-const dictData = useDictData()
-const TableHeaderRef = ref()
-const dotList: any = ref({})
-const Template: any = ref({})
-const reportForm: any = ref('')
-
-const templatePolicy: any = ref([])
-const reportFormList: any = ref([
-    {
-        value: '1',
-        label: '分析报表'
-    },
-    {
-        value: '2',
-        label: '统计报表'
-    },
-    {
-        value: '3',
-        label: '自定义报表'
-    }
-])
-const tableStore = new TableStore({
-    url: '/harmonic-boot/customReport/getCustomReport',
-    method: 'POST',
-    column: [],
-    beforeSearchFun: () => {
-        tableStore.table.params.tempId = Template.value.id
-        tableStore.table.params.lineId = dotList.value.id
-    },
-    loadCallback: () => {
-        tableStore.table.data.forEach((item: any) => {
-            item.data1 ? (item.data = JSON.parse(item.data1)) : ''
-            item.celldata.forEach((k: any) => {
-
-                item.data[k.r][k.c].v ? (item.data[k.r][k.c] = k.v) : ''
-            })
-        })
-        setTimeout(() => {
-            luckysheet.create({
-                container: 'luckysheet',
-                title: '', // 表 头名
-                lang: 'zh', // 中文
-                showtoolbar: false, // 是否显示工具栏
-                showinfobar: false, // 是否显示顶部信息栏
-                showsheetbar: true, // 是否显示底部sheet按钮
-                data: tableStore.table.data
-                //  tableStore.table.data
-            })
-        }, 10)
-    }
-})
-provide('tableStore', tableStore)
-tableStore.table.params.resourceType = 1
-const flag = ref(true)
-onMounted(() => {
-    const dom = document.getElementById('navigation-splitpanes')
-    if (dom) {
-        size.value = ((280 / (dom.offsetWidth - 7)) * 100)
-    }
-})
-
-// getTemplateByDept({ id: dictData.state.area[0].id }).then((res: any) => {
-//     templatePolicy.value = res.data
-
-
-// })
-
-const stencil = (val: any) => {
-    templatePolicy.value = val
-    Template.value = val[0]
-    reportForm.value = val[0]?.reportForm
-
-}
-
-const changetype = (val: any) => {
-    reportForm.value = val.reportForm
-}
-
-const handleNodeClick = (data: any, node: any) => {
-    if (data?.type == "line") {
-        dotList.value = data
-        setTimeout(() => {
-            tableStore.index()
-        }, 500)
-    }
-}
-
-const exportEvent = () => {
-    exportExcel(luckysheet.getAllSheets(), '统计报表下载')
-}
-</script>
-<style lang="scss">
-.splitpanes.default-theme .splitpanes__pane {
-    background: #fff;
-}
-
-.box {
-    padding: 10px;
-}
-</style>
+<template>
+    <div class="default-main" :style="height">
+        <splitpanes style="height: 100%" class="default-theme" id="navigation-splitpanes">
+            <pane :size="size">
+                <PointTree :default-expand-all="false" template @node-click="handleNodeClick" @init="handleNodeClick"
+                    @Policy="stencil">
+                </PointTree>
+            </pane>
+            <pane :size="(100 - size)" style="background: #fff" :style="height">
+                <TableHeader ref="TableHeaderRef" datePicker>
+                    <template v-slot:select>
+                        <el-form-item label="模板策略">
+                            <el-select v-model.trim="Template" @change="changetype" placeholder="请选择模版" value-key="id">
+                                <el-option v-for="item in templatePolicy" :key="item.id" :label="item.name"
+                                    :value="item"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </template>
+                    <template #operation>
+                        <el-button icon="el-icon-Download" type="primary" @click="exportEvent">导出</el-button>
+                    </template>
+                </TableHeader>
+                <div class="box">
+                    <div id="luckysheet" v-loading="tableStore.table.loading"
+                        :style="`height: calc(${tableStore.table.height} + 45px)`"></div>
+                </div>
+            </pane>
+        </splitpanes>
+    </div>
+</template>
+<script setup lang="ts">
+import { onMounted, ref, provide } from 'vue'
+import TableStore from '@/utils/tableStore'
+import PointTree from '@/components/tree/govern/pointTree.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useDictData } from '@/stores/dictData'
+import { mainHeight } from '@/utils/layout'
+import { getTemplateByDept } from '@/api/harmonic-boot/luckyexcel'
+import { exportExcel } from '@/views/system/reportForms/export.js'
+import 'splitpanes/dist/splitpanes.css'
+import { Splitpanes, Pane } from 'splitpanes'
+// import data from './123.json'
+defineOptions({
+    name: 'govern/reportCore/statistics/index'
+})
+const height = mainHeight(20)
+const size = ref(0)
+const dictData = useDictData()
+const TableHeaderRef = ref()
+const dotList: any = ref({})
+const Template: any = ref({})
+const reportForm: any = ref('')
+
+const templatePolicy: any = ref([])
+const reportFormList: any = ref([
+    {
+        value: '1',
+        label: '分析报表'
+    },
+    {
+        value: '2',
+        label: '统计报表'
+    },
+    {
+        value: '3',
+        label: '自定义报表'
+    }
+])
+const tableStore = new TableStore({
+    url: '/harmonic-boot/customReport/getCustomReport',
+    method: 'POST',
+    column: [],
+    beforeSearchFun: () => {
+        tableStore.table.params.tempId = Template.value.id
+        tableStore.table.params.lineId = dotList.value.id
+    },
+    loadCallback: () => {
+        tableStore.table.data.forEach((item: any) => {
+            item.data1 ? (item.data = JSON.parse(item.data1)) : ''
+            item.celldata.forEach((k: any) => {
+
+                item.data[k.r][k.c].v ? (item.data[k.r][k.c] = k.v) : ''
+            })
+        })
+        setTimeout(() => {
+            luckysheet.create({
+                container: 'luckysheet',
+                title: '', // 表 头名
+                lang: 'zh', // 中文
+                showtoolbar: false, // 是否显示工具栏
+                showinfobar: false, // 是否显示顶部信息栏
+                showsheetbar: true, // 是否显示底部sheet按钮
+                data: tableStore.table.data
+                //  tableStore.table.data
+            })
+        }, 10)
+    }
+})
+provide('tableStore', tableStore)
+tableStore.table.params.resourceType = 1
+const flag = ref(true)
+onMounted(() => {
+    const dom = document.getElementById('navigation-splitpanes')
+    if (dom) {
+        size.value = ((280 / (dom.offsetWidth - 7)) * 100)
+    }
+})
+
+// getTemplateByDept({ id: dictData.state.area[0].id }).then((res: any) => {
+//     templatePolicy.value = res.data
+
+
+// })
+
+const stencil = (val: any) => {
+    templatePolicy.value = val
+    Template.value = val[0]
+    reportForm.value = val[0]?.reportForm
+
+}
+
+const changetype = (val: any) => {
+    reportForm.value = val.reportForm
+}
+
+const handleNodeClick = (data: any, node: any) => {
+    if (data?.type == "line") {
+        dotList.value = data
+        setTimeout(() => {
+            tableStore.index()
+        }, 500)
+    }
+}
+
+const exportEvent = () => {
+    exportExcel(luckysheet.getAllSheets(), '统计报表下载')
+}
+</script>
+<style lang="scss">
+.splitpanes.default-theme .splitpanes__pane {
+    background: #fff;
+}
+
+.box {
+    padding: 10px;
+}
+</style>

src/views/govern/reportCore/statisticsWx/index.vue

@@ -20,7 +20,7 @@
                         </el-form-item>
                     </template>
                     <template #operation>
-                        <el-button icon="el-icon-Download" type="primary" @click="exportEvent">导出excel</el-button>
+                        <el-button icon="el-icon-Download" type="primary" @click="exportEvent">导出</el-button>
                     </template>
                 </TableHeader>
                 <div class="box" v-loading="tableStore.table.loading">
@@ -45,6 +45,7 @@ import { exportExcel } from '@/views/system/reportForms/export.js'
 import 'splitpanes/dist/splitpanes.css'
 import DatePicker from '@/components/form/datePicker/time.vue'
 import { Splitpanes, Pane } from 'splitpanes'
+const name = ref('')
 // import data from './123.json'
 defineOptions({
     name: 'govern/reportCore/statisticsWx/index'
@@ -73,6 +74,7 @@ const tableStore = new TableStore({
         delete tableStore.table.params.timeFlag
     },
     loadCallback: () => {
+        name.value = dotList.value.name
         tableStore.table.data.forEach((item: any) => {
             item.data1 ? (item.data = JSON.parse(item.data1)) : ''
             item.celldata.forEach((k: any) => {
@@ -140,7 +142,14 @@ const handleNodeClick = (data: any, node: any) => {
 }
 
 const exportEvent = () => {
-    exportExcel(luckysheet.getAllSheets(), '统计报表下载')
+     const now = new Date()
+    const year = now.getFullYear() // 4位年份
+    const month = now.getMonth() + 1 // 月份0-11，需+1
+    const day = now.getDate() // 日期1-31
+
+    // 格式化YYYY - MM - DD（补零）
+    const formattedDate = `${year}${String(month).padStart(2, '0')}${String(day).padStart(2, '0')}`
+    exportExcel(luckysheet.getAllSheets(), name.value + formattedDate)
 }
 </script>
 <style lang="scss">

src/views/govern/reportCore/statisticsWx/index_ypt.vue

@@ -0,0 +1,192 @@
+<template>
+    <div class="default-main" :style="height">
+        <splitpanes style="height: 100%" class="default-theme" id="navigation-splitpanes">
+            <pane :size="size">
+                <!-- <pointTreeWx :default-expand-all="false" template @node-click="handleNodeClick" @init="handleNodeClick"
+                    @Policy="stencil">
+                </pointTreeWx> -->
+                <CloudDeviceEntryTree
+                    ref="TerminalRef"
+                    template
+                    @Policy="stencil"
+                    @node-click="handleNodeClick"
+                    @init="handleNodeClick"
+                ></CloudDeviceEntryTree>
+            </pane>
+            <pane :size="100 - size" style="background: #fff" :style="height">
+                <TableHeader datePicker ref="TableHeaderRef" :showReset="false">
+                    <template v-slot:select>
+                        <!-- <el-form-item label="时间:">
+                            <DatePicker ref="datePickerRef"></DatePicker>
+                        </el-form-item> -->
+                        <el-form-item label="模板策略">
+                            <el-select
+                                v-model.trim="Template"
+                                @change="changetype"
+                                placeholder="请选择模版"
+                                value-key="id"
+                            >
+                                <el-option
+                                    v-for="item in templatePolicy"
+                                    :key="item.id"
+                                    :label="item.name"
+                                    :value="item"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </template>
+                    <template #operation>
+                        <el-button icon="el-icon-Download" type="primary" @click="exportEvent">导出</el-button>
+                    </template>
+                </TableHeader>
+                <div class="box" v-loading="tableStore.table.loading">
+                    <div
+                        id="luckysheet"
+                        :style="`height: calc(${tableStore.table.height} + 45px)`"
+                        v-if="tableStore.table.data.length > 0"
+                    ></div>
+                    <el-empty
+                        :style="`height: calc(${tableStore.table.height} + 45px)`"
+                        v-else
+                        description="暂无数据"
+                    />
+                </div>
+            </pane>
+        </splitpanes>
+    </div>
+</template>
+<script setup lang="ts">
+import { onMounted, ref, provide } from 'vue'
+import TableStore from '@/utils/tableStore'
+import pointTreeWx from '@/components/tree/govern/pointTreeWx.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useDictData } from '@/stores/dictData'
+import { mainHeight } from '@/utils/layout'
+import { getTemplateByDept } from '@/api/harmonic-boot/luckyexcel'
+import { exportExcel } from '@/views/system/reportForms/export.js'
+import 'splitpanes/dist/splitpanes.css'
+import DatePicker from '@/components/form/datePicker/time.vue'
+import { Splitpanes, Pane } from 'splitpanes'
+import CloudDeviceEntryTree from '@/components/tree/govern/cloudDeviceEntryTree.vue'
+// import data from './123.json'
+defineOptions({
+    name: 'govern/reportCore/statisticsWx/index'
+})
+const height = mainHeight(20)
+const size = ref(0)
+const dictData = useDictData()
+const TableHeaderRef = ref()
+const dotList: any = ref({})
+const Template: any = ref({})
+const reportForm: any = ref('')
+const datePickerRef = ref()
+const templatePolicy: any = ref([])
+const name = ref('')
+const tableStore = new TableStore({
+    url: '/cs-harmonic-boot/customReport/getCustomReport',
+    method: 'POST',
+    column: [],
+    beforeSearchFun: () => {
+        tableStore.table.params.tempId = Template.value.id
+        tableStore.table.params.lineId = dotList.value.id
+        // tableStore.table.params.startTime  = datePickerRef.value.timeValue[0],
+        // tableStore.table.params.endTime = datePickerRef.value.timeValue[1],
+        delete tableStore.table.params.searchBeginTime
+        delete tableStore.table.params.searchEndTime
+        delete tableStore.table.params.timeFlag
+    },
+    loadCallback: () => {
+        console.log('🚀 ~ tableStore.table:', tableStore.table)
+        name.value = dotList.value.name
+        // tableStore.table.data.forEach((item: any) => {
+        //     item.data1 ? (item.data = JSON.parse(item.data1)) : ''
+        //     item.celldata.forEach((k: any) => {
+
+        //         item.data[k.r][k.c].v ? (item.data[k.r][k.c] = k.v) : ''
+        //     })
+        // })
+        tableStore.table.data.forEach((item: any) => {
+            item.data1 ? (item.data = JSON.parse(item.data1)) : ''
+            item.celldata.forEach((k: any) => {
+                item.data[k.r][k.c].v ? (item.data[k.r][k.c] = k.v) : ''
+            })
+        })
+        console.log('🚀 ~ tableStore.table:', tableStore.table)
+
+        setTimeout(() => {
+            luckysheet.create({
+                container: 'luckysheet',
+                title: '', // 表 头名
+                lang: 'zh', // 中文
+                showtoolbar: false, // 是否显示工具栏
+                showinfobar: false, // 是否显示顶部信息栏
+                showsheetbar: true, // 是否显示底部sheet按钮
+                allowEdit: false, // 禁止所有编辑操作（必填）
+                data: tableStore.table.data
+                //  tableStore.table.data
+            })
+        }, 10)
+    }
+})
+provide('tableStore', tableStore)
+tableStore.table.params.resourceType = 1
+tableStore.table.params.customType = null
+const flag = ref(true)
+onMounted(() => {
+    nextTick(() => {
+        const dom = document.getElementById('navigation-splitpanes')
+        if (dom && dom.offsetHeight > 0) {
+            size.value = (280 / (dom.offsetWidth - 7)) * 100
+        } else {
+            // 设置默认值
+            size.value = 20
+        }
+    })
+})
+
+// getTemplateByDept({ id: dictData.state.area[0].id }).then((res: any) => {
+//     templatePolicy.value = res.data
+
+// })
+
+const stencil = (val: any) => {
+    templatePolicy.value = val.filter((item: any) => item.name != '稳态治理报表')
+    Template.value = templatePolicy.value[0]
+    reportForm.value = templatePolicy.value[0]?.reportForm
+}
+
+const changetype = (val: any) => {
+    reportForm.value = val.reportForm
+}
+
+const handleNodeClick = (data: any, node: any) => {
+    if (data?.level == 4) {
+        dotList.value = data
+        setTimeout(() => {
+            tableStore.index()
+        }, 500)
+    } else {
+        tableStore.table.loading = false
+    }
+}
+
+const exportEvent = () => {
+    const now = new Date()
+    const year = now.getFullYear() // 4位年份
+    const month = now.getMonth() + 1 // 月份0-11，需+1
+    const day = now.getDate() // 日期1-31
+
+    // 格式化YYYY - MM - DD（补零）
+    const formattedDate = `${year}${String(month).padStart(2, '0')}${String(day).padStart(2, '0')}`
+    exportExcel(luckysheet.getAllSheets(), name.value + formattedDate)
+}
+</script>
+<style lang="scss">
+.splitpanes.default-theme .splitpanes__pane {
+    background: #fff;
+}
+
+.box {
+    padding: 10px;
+}
+</style>

src/views/govern/reportCore/statisticsWx/index_zl.vue

@@ -0,0 +1,212 @@
+<template>
+    <div class="default-main" :style="height">
+        <splitpanes style="height: 100%" class="default-theme" id="navigation-splitpanes">
+            <pane :size="size">
+                <!-- <pointTreeWx :default-expand-all="false" template @node-click="handleNodeClick" @init="handleNodeClick"
+                    @Policy="stencil">
+                </pointTreeWx> -->
+                <CloudDeviceEntryTree
+                    ref="TerminalRef"
+                    template
+                    @Policy="stencil"
+                    @node-click="handleNodeClick"
+                    @init="handleNodeClick"
+                ></CloudDeviceEntryTree>
+            </pane>
+            <pane :size="100 - size" style="background: #fff" :style="height">
+                <TableHeader datePicker ref="TableHeaderRef" :showReset="false">
+                    <template v-slot:select>
+                        <!-- <el-form-item label="时间:">
+                            <DatePicker ref="datePickerRef"></DatePicker>
+                        </el-form-item> -->
+                        <el-form-item label="模板策略">
+                            <el-select
+                                v-model.trim="Template"
+                                @change="changetype"
+                                placeholder="请选择模版"
+                                value-key="id"
+                            >
+                                <el-option
+                                    v-for="item in templatePolicy"
+                                    :key="item.id"
+                                    :label="item.name"
+                                    :value="item"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item>
+                        <!-- <el-form-item label="监测对象">
+                            <el-select
+                                filterable
+                                v-model="tableStore.table.params.sensitiveUserId"
+                                placeholder="请选择监测对象"
+                                clearable
+                            >
+                                <el-option v-for="item in idList" :key="item.id" :label="item.name" :value="item.id" />
+                            </el-select>
+                        </el-form-item> -->
+                    </template>
+                    <template #operation>
+                        <el-button icon="el-icon-Download" type="primary" @click="exportEvent">导出</el-button>
+                    </template>
+                </TableHeader>
+                <div class="box" v-loading="tableStore.table.loading">
+                    <div
+                        id="luckysheet"
+                        :style="`height: calc(${tableStore.table.height} + 45px)`"
+                        v-if="tableStore.table.data.length > 0"
+                    ></div>
+                    <el-empty
+                        :style="`height: calc(${tableStore.table.height} + 45px)`"
+                        v-else
+                        description="暂无数据"
+                    />
+                </div>
+            </pane>
+        </splitpanes>
+    </div>
+</template>
+<script setup lang="ts">
+import { onMounted, ref, provide } from 'vue'
+import TableStore from '@/utils/tableStore'
+import pointTreeWx from '@/components/tree/govern/pointTreeWx.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useDictData } from '@/stores/dictData'
+import { mainHeight } from '@/utils/layout'
+import { getTemplateByDept } from '@/api/harmonic-boot/luckyexcel'
+import { exportExcel } from '@/views/system/reportForms/export.js'
+import 'splitpanes/dist/splitpanes.css'
+import DatePicker from '@/components/form/datePicker/time.vue'
+import { Splitpanes, Pane } from 'splitpanes'
+import CloudDeviceEntryTree from '@/components/tree/govern/cloudDeviceEntryTreeZL.vue'
+import { getListByIds } from '@/api/harmonic-boot/cockpit/cockpit'
+// import data from './123.json'
+defineOptions({
+    name: 'govern/reportCore/statisticsWx/indexZL'
+})
+const height = mainHeight(20)
+const size = ref(0)
+const dictData = useDictData()
+const TableHeaderRef = ref()
+const dotList: any = ref({})
+const Template: any = ref({})
+const reportForm: any = ref('')
+const datePickerRef = ref()
+const templatePolicy: any = ref([])
+const name = ref('')
+
+const tableStore = new TableStore({
+    url: '/cs-harmonic-boot/customReport/getSensitiveUserReport',
+    method: 'POST',
+    column: [],
+    beforeSearchFun: () => {
+        tableStore.table.params.tempId = Template.value.id
+        tableStore.table.params.lineId = dotList.value.id
+       tableStore.table.params.sensitiveUserId = dotList.value.id
+        // ;(tableStore.table.params.startTime = datePickerRef.value.timeValue[0]),
+        //     (tableStore.table.params.endTime = datePickerRef.value.timeValue[1]),
+        delete tableStore.table.params.searchBeginTime
+        delete tableStore.table.params.searchEndTime
+        delete tableStore.table.params.timeFlag
+    },
+    loadCallback: () => {
+        console.log('🚀 ~ tableStore.table:', tableStore.table.data)
+        name.value = dotList.value.name
+        // tableStore.table.data.forEach((item: any) => {
+        //     item.data1 ? (item.data = JSON.parse(item.data1)) : ''
+        //     item.celldata.forEach((k: any) => {
+        //         item.data[k.r][k.c].v ? (item.data[k.r][k.c] = k.v) : ''
+        //     })
+        // })
+
+        setTimeout(() => {
+            luckysheet.create({
+                container: 'luckysheet',
+                title: '', // 表 头名
+                lang: 'zh', // 中文
+                showtoolbar: false, // 是否显示工具栏
+                showinfobar: false, // 是否显示顶部信息栏
+                showsheetbar: true, // 是否显示底部sheet按钮
+                allowEdit: false, // 禁止所有编辑操作（必填）
+                data: tableStore.table.data
+                //  tableStore.table.data
+            })
+        }, 10)
+    }
+})
+provide('tableStore', tableStore)
+tableStore.table.params.resourceType = 1
+tableStore.table.params.customType = 1
+const flag = ref(true)
+onMounted(() => {
+    initListByIds()
+    nextTick(() => {
+        const dom = document.getElementById('navigation-splitpanes')
+        if (dom && dom.offsetHeight > 0) {
+            size.value = (280 / (dom.offsetWidth - 7)) * 100
+        } else {
+            // 设置默认值
+            size.value = 20
+        }
+    })
+})
+
+// getTemplateByDept({ id: dictData.state.area[0].id }).then((res: any) => {
+//     templatePolicy.value = res.data
+
+// })
+const idList = ref([])
+// 监测对象
+const initListByIds = () => {
+    getListByIds({}).then((res: any) => {
+        if (res.data.length > 0) {
+            idList.value = res.data
+
+            if (!tableStore.table.params.sensitiveUserId && idList.value?.length > 0) {
+                tableStore.table.params.sensitiveUserId = idList.value[0].id
+            }
+            // templateListData()
+        }
+    })
+}
+const stencil = (val: any) => {
+    console.log('🚀 ~ stencil ~ val:', val)
+    templatePolicy.value = val.filter((item: any) => item.name == '稳态治理报表')
+    Template.value = templatePolicy.value[0]
+    reportForm.value = templatePolicy.value[0]?.reportForm
+}
+
+const changetype = (val: any) => {
+    reportForm.value = val.reportForm
+}
+
+const handleNodeClick = (data: any, node: any) => {
+    if (data?.level == 3) {
+        dotList.value = data
+        setTimeout(() => {
+            tableStore.index()
+        }, 500)
+    } else {
+        tableStore.table.loading = false
+    }
+}
+
+const exportEvent = () => {
+    const now = new Date()
+    const year = now.getFullYear() // 4位年份
+    const month = now.getMonth() + 1 // 月份0-11，需+1
+    const day = now.getDate() // 日期1-31
+
+    // 格式化YYYY - MM - DD（补零）
+    const formattedDate = `${year}${String(month).padStart(2, '0')}${String(day).padStart(2, '0')}`
+    exportExcel(luckysheet.getAllSheets(), name.value + formattedDate)
+}
+</script>
+<style lang="scss">
+.splitpanes.default-theme .splitpanes__pane {
+    background: #fff;
+}
+
+.box {
+    padding: 10px;
+}
+</style>

src/views/govern/reportForms/look.vue

@@ -11,7 +11,7 @@
             >
                 <el-button icon="el-icon-Upload" type="primary" class="mr10">导入excel</el-button>
             </el-upload>
-            <el-button @click="downloadExcel" class="" type="primary" icon="el-icon-Download">导出excel</el-button>
+            <el-button @click="downloadExcel" class="" type="primary" icon="el-icon-Download">导出</el-button>
             <el-button icon="el-icon-Back" @click="emit('shutDown')">返回</el-button>
         </div>
 

src/views/govern/reportForms/luckysheet.vue

@@ -11,7 +11,7 @@
             >
                 <el-button icon="el-icon-Upload" type="primary" class="mr10">导入excel</el-button>
             </el-upload>
-            <el-button @click="downloadExcel" class="" type="primary" icon="el-icon-Download">导出excel</el-button>
+            <el-button @click="downloadExcel" class="" type="primary" icon="el-icon-Download">导出</el-button>
             <el-button type="primary" icon="el-icon-Check" @click="preservation">保存</el-button>
             <el-button icon="el-icon-Back" @click="emit('shutDown')">返回</el-button>
         </div>

src/views/govern/sensitiveLoadMange/detail.vue

@@ -48,7 +48,7 @@ import { useDictData } from '@/stores/dictData'
 const TypeOptions = ref()
 
 const dictData = useDictData()
-const DataTypeSelect = dictData.getBasicData('Sensitive_User_Type')
+const DataTypeSelect = dictData.getBasicData('Interference_Source')
 
 const tableStore = inject('tableStore') as TableStore
 

src/views/govern/sensitiveLoadMange/index.vue

@@ -26,7 +26,7 @@ defineOptions({
 const detail = ref()
 
 const dictData = useDictData()
-const interferenceType = dictData.getBasicData('Sensitive_User_Type')
+const interferenceType = dictData.getBasicData('Interference_Source')
 
 const tableStore: any = new TableStore({
     url: '/cs-harmonic-boot/pqSensitiveUser/getList',

src/views/govern/setting/statisticalType/add.vue

@@ -1,107 +1,108 @@
-<template>
-    <el-dialog width="500px" v-model.trim="dialogVisible" :title="title">
-
-        <el-form :model="form" class="form-one" label-width="auto">
-            <el-form-item label="名称">
-                <el-input maxlength="32" show-word-limit v-model.trim="form.name" placeholder="请输入名称" />
-            </el-form-item>
-            <el-form-item label="编码">
-                <el-input maxlength="32" show-word-limit v-model.trim="form.code" placeholder="请输入编码" />
-            </el-form-item>
-            <el-form-item label="类型" v-if="title == '新增'|| title == '编辑'">
-                <el-select v-model.trim="form.type" placeholder="请选择类型">
-                    <el-option v-for="item in options" :key="item.value" :label="item.name" :value="item.value" />
-                </el-select>
-            </el-form-item>
-            <el-form-item label="备注">
-                <el-input maxlength="32" show-word-limit v-model.trim="form.remark" placeholder="请输入备注" />
-            </el-form-item>
-
-            <el-form-item label="排序">
-                <el-input maxlength="32" show-word-limit-number v-model.trim="form.sort" :min="0" />
-            </el-form-item>
-
-        </el-form>
-
-        <template #footer>
-            <span class="dialog-footer">
-                <el-button @click="dialogVisible = false">取消</el-button>
-                <el-button type="primary" @click="submit">确认</el-button>
-            </span>
-        </template>
-    </el-dialog>
-</template>
-<script lang="ts" setup>
-import { ref, inject } from 'vue'
-import { reactive } from 'vue'
-import TableStore from '@/utils/tableStore'
-import { addDictTree, updateStatistical } from '@/api/system-boot/dictTree'
-import { ElMessage } from 'element-plus'
-
-const emits = defineEmits<{
-    (e: 'over'): void
-}>()
-defineOptions({
-    name: 'govern/setting/statisticalType/add'
-})
-const tableStore = inject('tableStore') as TableStore
-const form = reactive({
-    name: '',
-    code: '',
-    remark: '',
-    // type: 2,
-    sort: 100,
-    pid: '',
-    id: ''
-})
-const options = ref([
-    { name: '通用指标', value: 2 },
-    { name: 'APF模块', value: 3 },
-    { name: '星型接线', value: 4 },
-    { name: '角型接线', value: 5 },
-    { name: 'V型接线', value: 6 },
-])
-
-const dialogVisible = ref(false)
-const title = ref('新增菜单')
-const open = (text: string, data?: anyObj) => {
-    title.value = text
-    for (let key in form) {
-        form[key] = data ? data[key] : ''
-
-        if (key == 'sort') {
-
-            form[key] = data?.sort ? data[key] : 100
-            // console.log("🚀 ~ open ~ form[key]:", form[key])
-        }
-    }
-    dialogVisible.value = true
-}
-const submit = async () => {
-    // 非空校验
-    for (let key in form) {
-        if (key != 'pid' && key != 'id' && key != 'sort') {
-            if (!form[key]) {
-                ElMessage.warning('请填写完整信息')
-                return
-            }
-        }
-    }
-    if (form.id) {
-        await updateStatistical(form).then(res => {
-            ElMessage.success('编辑成功')
-        })
-    } else {
-        if (!form.pid) {
-            form.pid = tableStore.table.params.pid
-        }
-        await addDictTree(form).then(res => {
-            ElMessage.success('新增成功')
-        })
-    }
-    emits('over')
-    dialogVisible.value = false
-}
-
-defineExpose({ open })
-</script>
+<template>
+    <el-dialog width="500px" v-model.trim="dialogVisible" :title="title">
+
+        <el-form :model="form" class="form-one" label-width="auto">
+            <el-form-item label="名称">
+                <el-input maxlength="32" show-word-limit v-model.trim="form.name" placeholder="请输入名称" />
+            </el-form-item>
+            <el-form-item label="编码">
+                <el-input maxlength="32" show-word-limit v-model.trim="form.code" placeholder="请输入编码" />
+            </el-form-item>
+            <el-form-item label="类型" v-if="title == '新增'|| title == '编辑'">
+                <el-select v-model.trim="form.type" placeholder="请选择类型">
+                    <el-option v-for="item in options" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+            </el-form-item>
+            <el-form-item label="备注">
+                <el-input maxlength="32" show-word-limit v-model.trim="form.remark" placeholder="请输入备注" />
+            </el-form-item>
+
+            <el-form-item label="排序">
+                <el-input maxlength="32" show-word-limit-number v-model.trim="form.sort" :min="0" />
+            </el-form-item>
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="dialogVisible = false">取消</el-button>
+                <el-button type="primary" @click="submit">确认</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+<script lang="ts" setup>
+import { ref, inject } from 'vue'
+import { reactive } from 'vue'
+import TableStore from '@/utils/tableStore'
+import { addDictTree, updateStatistical } from '@/api/system-boot/dictTree'
+import { ElMessage } from 'element-plus'
+
+const emits = defineEmits<{
+    (e: 'over'): void
+}>()
+defineOptions({
+    name: 'govern/setting/statisticalType/add'
+})
+const tableStore = inject('tableStore') as TableStore
+const form = reactive({
+    name: '',
+    code: '',
+    remark: '',
+    // type: 2,
+    sort: 100,
+    pid: '',
+    id: ''
+})
+const options = ref([
+    { name: '通用指标', value: 2 },
+    { name: 'APF模块', value: 3 },
+    { name: '星型接线', value: 4 },
+    { name: '角型接线', value: 5 },
+    { name: 'V型接线', value: 6 },
+    { name: '驾驶舱指标', value: 7 },
+])
+
+const dialogVisible = ref(false)
+const title = ref('新增菜单')
+const open = (text: string, data?: anyObj) => {
+    title.value = text
+    for (let key in form) {
+        form[key] = data ? data[key] : ''
+
+        if (key == 'sort') {
+
+            form[key] = data?.sort ? data[key] : 100
+            // console.log("🚀 ~ open ~ form[key]:", form[key])
+        }
+    }
+    dialogVisible.value = true
+}
+const submit = async () => {
+    // 非空校验
+    for (let key in form) {
+        if (key != 'pid' && key != 'id' && key != 'sort') {
+            if (!form[key]) {
+                ElMessage.warning('请填写完整信息')
+                return
+            }
+        }
+    }
+    if (form.id) {
+        await updateStatistical(form).then(res => {
+            ElMessage.success('编辑成功')
+        })
+    } else {
+        if (!form.pid) {
+            form.pid = tableStore.table.params.pid
+        }
+        await addDictTree(form).then(res => {
+            ElMessage.success('新增成功')
+        })
+    }
+    emits('over')
+    dialogVisible.value = false
+}
+
+defineExpose({ open })
+</script>

src/views/govern/setting/statisticalType/index.vue

@@ -1,154 +1,155 @@
-<template>
-    <div class='default-main'>
-        <TableHeader :showReset='false'>
-            <template v-slot:operation>
-                <el-button :icon='Plus' type='primary' @click='addMenu'>新增</el-button>
-            </template>
-        </TableHeader>
-        <Table ref='tableRef' />
-        <!-- <el-tabs type="border-card">
-            <el-tab-pane v-for="item in tabPane" :label="item.name">
-               
-            </el-tab-pane>
-        </el-tabs> -->
-
-
-
-
-        <PopupBinding ref='bindingRef'></PopupBinding>
-        <PopupAdd ref='addRef' @over='init'></PopupAdd>
-    </div>
-</template>
-<script setup lang='ts'>
-import { Plus } from '@element-plus/icons-vue'
-import { ref, onMounted, provide } from 'vue'
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import PopupBinding from './binding.vue'
-import PopupAdd from './add.vue'
-import { queryByCode, queryCsDictTree } from '@/api/system-boot/dictTree'
-import { dicDelete } from '@/api/system-boot/dic'
-
-defineOptions({
-    name: 'govern/setting/statisticalType'
-})
-const tabPane = [{ name: '在线监测' }, { name: '治理' }, { name: '测试' }]
-const tableRef = ref()
-const bindingRef = ref()
-const addRef = ref()
-const options = ref([
-    { name: '通用指标', value: 2 },
-    { name: 'APF模块', value: 3 },
-    { name: '星型接线', value: 4 },
-    { name: '角型接线', value: 5 },
-    { name: 'V型接线', value: 6 },
-])
-const tableStore = new TableStore({
-    showPage: false,
-    url: '/system-boot/dictTree/query',
-    method: 'POST',
-    paramsPOST: true,
-    // publicHeight: 60,
-    column: [
-        {
-            title: '序号', width: 80, formatter: (row: any) => {
-                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-            }
-        },
-        { title: '统计类型', field: 'name' },
-        {
-            title: '类型', field: 'type',
-            width: 200,
-            formatter: row => {
-                return options.value.filter((item: any) => item.value == row.cellValue)[0]?.name
-            },
-        },
-        {
-            title: '操作',
-            align: 'center',
-            width: '200',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'edit',
-                    title: '绑定指标',
-                    type: 'primary',
-                    icon: 'el-icon-Connection',
-                    render: 'basicButton',
-                    click: row => {
-                        bindingRef.value.open(row.id)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '编辑',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    click: row => {
-                        addRef.value.open('编辑', row)
-                    }
-                },
-                {
-                    name: 'del',
-                    title: '删除',
-                    type: 'danger',
-                    icon: 'el-icon-Delete',
-                    render: 'confirmButton',
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'danger',
-                        title: '确定删除该菜单吗？'
-                    },
-                    click: row => {
-                        dicDelete(row.id).then(() => {
-                            init()
-                        })
-                    }
-                }
-            ]
-        }
-    ],
-    loadCallback: () => {
-        // // 过滤数组中type等于1的数据，children下钻
-        // const filterData = (arr: any[]) => {
-        //     return arr.filter((item: any) => {
-        //         if (item.children.length) {
-        //             item.children = filterData(item.children)
-        //         }
-        //         return item.type != 1
-        //     })
-        // }
-        // tableStore.table.data = filterData(tableStore.table.data)
-    }
-})
-provide('tableStore', tableStore)
-const init = () => {
-    tableStore.table.loading = true
-    queryByCode('Statistical_Type').then(res => {
-        tableStore.table.params.pid = res.data.id
-        queryCsDictTree(res.data.id).then(res => {
-            tableStore.table.data = res.data
-            tableStore.table.loading = false
-        })
-    })
-}
-onMounted(() => {
-    tableStore.table.ref = tableRef.value
-    init()
-})
-
-const addMenu = () => {
-    // console.log(bindingRef)
-    addRef.value.open('新增', {
-        sort: tableStore.table.data.length ? tableStore.table.data[tableStore.table.data.length - 1].sort + 1 : 1,
-        code: '',
-        pid: '',
-        id: '',
-        remark: '',
-        name: ''
-    })
-}
-</script>
+<template>
+    <div class="default-main">
+        <TableHeader :showReset="false">
+            <template v-slot:operation>
+                <el-button :icon="Plus" type="primary" @click="addMenu">新增</el-button>
+            </template>
+        </TableHeader>
+        <Table ref="tableRef" />
+        <!-- <el-tabs type="border-card">
+            <el-tab-pane v-for="item in tabPane" :label="item.name">
+               
+            </el-tab-pane>
+        </el-tabs> -->
+
+        <PopupBinding ref="bindingRef"></PopupBinding>
+        <PopupAdd ref="addRef" @over="init"></PopupAdd>
+    </div>
+</template>
+<script setup lang="ts">
+import { Plus } from '@element-plus/icons-vue'
+import { ref, onMounted, provide } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import PopupBinding from './binding.vue'
+import PopupAdd from './add.vue'
+import { queryByCode, queryCsDictTree } from '@/api/system-boot/dictTree'
+import { dicDelete } from '@/api/system-boot/dic'
+
+defineOptions({
+    name: 'govern/setting/statisticalType'
+})
+const tabPane = [{ name: '在线监测' }, { name: '治理' }, { name: '测试' }]
+const tableRef = ref()
+const bindingRef = ref()
+const addRef = ref()
+const options = ref([
+    { name: '通用指标', value: 2 },
+    { name: 'APF模块', value: 3 },
+    { name: '星型接线', value: 4 },
+    { name: '角型接线', value: 5 },
+    { name: 'V型接线', value: 6 },
+    { name: '驾驶舱指标', value: 7 }
+])
+const tableStore = new TableStore({
+    showPage: false,
+    url: '/system-boot/dictTree/query',
+    method: 'POST',
+    paramsPOST: true,
+    // publicHeight: 60,
+    column: [
+        {
+            title: '序号',
+            width: 80,
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { title: '统计类型', field: 'name' },
+        {
+            title: '类型',
+            field: 'type',
+            width: 200,
+            formatter: row => {
+                return options.value.filter((item: any) => item.value == row.cellValue)[0]?.name
+            }
+        },
+        {
+            title: '操作',
+            align: 'center',
+            width: '200',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '绑定指标',
+                    type: 'primary',
+                    icon: 'el-icon-Connection',
+                    render: 'basicButton',
+                    click: row => {
+                        bindingRef.value.open(row.id)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        addRef.value.open('编辑', row)
+                    }
+                },
+                {
+                    name: 'del',
+                    title: '删除',
+                    type: 'danger',
+                    icon: 'el-icon-Delete',
+                    render: 'confirmButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定删除该菜单吗？'
+                    },
+                    click: row => {
+                        dicDelete(row.id).then(() => {
+                            init()
+                        })
+                    }
+                }
+            ]
+        }
+    ],
+    loadCallback: () => {
+        // // 过滤数组中type等于1的数据，children下钻
+        // const filterData = (arr: any[]) => {
+        //     return arr.filter((item: any) => {
+        //         if (item.children.length) {
+        //             item.children = filterData(item.children)
+        //         }
+        //         return item.type != 1
+        //     })
+        // }
+        // tableStore.table.data = filterData(tableStore.table.data)
+    }
+})
+provide('tableStore', tableStore)
+const init = () => {
+    tableStore.table.loading = true
+    queryByCode('Statistical_Type').then(res => {
+        tableStore.table.params.pid = res.data.id
+        queryCsDictTree(res.data.id).then(res => {
+            tableStore.table.data = res.data
+            tableStore.table.loading = false
+        })
+    })
+}
+onMounted(() => {
+    tableStore.table.ref = tableRef.value
+    init()
+})
+
+const addMenu = () => {
+    // console.log(bindingRef)
+    addRef.value.open('新增', {
+        sort: tableStore.table.data.length ? tableStore.table.data[tableStore.table.data.length - 1].sort + 1 : 1,
+        code: '',
+        pid: '',
+        id: '',
+        remark: '',
+        name: ''
+    })
+}
+</script>

src/views/pqs/cockpit/homePage/components/routingConfig.vue

@@ -1,10 +1,10 @@
 <template>
     <div>
-        <el-dialog v-model="dialogVisible" title="设置" width="600">
+        <el-dialog v-model="dialogVisible" title="自定义功能管理" width="650">
             <div style="display: flex; justify-content: end" class="mb10">
                 <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
             </div>
-            <div style="height: calc(100vh / 2); max-height: 400px">
+            <div style="height: 300px; max-height: 400px">
                 <vxe-table
                     border
                     ref="tableRef"
@@ -25,6 +25,7 @@
                             <el-switch
                                 v-model="row.state"
                                 inline-prompt
+                                :disabled="!hasAdmin && row.scope"
                                 :active-value="1"
                                 :inactive-value="0"
                                 active-text="已激活"
@@ -33,11 +34,29 @@
                             />
                         </template>
                     </vxe-column>
+                    <vxe-column field="startTime" title="是否全局" v-if="hasAdmin">
+                        <template #default="{ row }">
+                            <el-switch
+                                v-model="row.scope"
+                                inline-prompt
+                                :active-value="1"
+                                width="50px"
+                                :inactive-value="0"
+                                active-text="是"
+                                inactive-text="否"
+                                :before-change="() => beforeChange1(row)"
+                            />
+                        </template>
+                    </vxe-column>
                     <vxe-column field="startTime" title="操作">
                         <template #default="{ row }">
-                            <el-button type="primary" link @click="edit(row)">编辑</el-button>
+                            <el-button type="primary" link @click="edit(row)" v-if="!(!hasAdmin && row.scope)">
+                                编辑
+                            </el-button>
 
-                            <el-button type="danger" link @click="deletes(row)">删除</el-button>
+                            <el-button type="danger" link @click="deletes(row)" v-if="!(!hasAdmin && row.scope)">
+                                删除
+                            </el-button>
                         </template>
                     </vxe-column>
                 </vxe-table>
@@ -49,17 +68,20 @@
 import { ref, reactive } from 'vue'
 import { useRouter } from 'vue-router'
 import { defaultAttribute } from '@/components/table/defaultAttribute'
-import { getDashboardPageByUserId, deleteDashboard, activatePage } from '@/api/system-boot/csstatisticalset'
+import { getDashboardPageByUserId, deleteDashboard, activatePage, scopePage } from '@/api/system-boot/csstatisticalset'
 import { useAdminInfo } from '@/stores/adminInfo'
 import { ElMessage, ElMessageBox } from 'element-plus'
-
+import { useNavTabs } from '@/stores/navTabs'
 import { getMenu } from '@/utils/router'
 
 const { push } = useRouter()
+
 const dialogVisible = ref(false)
 const route = useRouter()
+const navTabs = useNavTabs()
 const adminInfo = useAdminInfo()
 const pageList: any = ref([])
+const hasAdmin = adminInfo.roleCode.some(item => item.includes('operation_manager') || item.includes('root'))
 
 const open = () => {
     dialogVisible.value = true
@@ -67,7 +89,10 @@ const open = () => {
 }
 const init = () => {
     getDashboardPageByUserId({ id: adminInfo.id, state: false }).then(res => {
-        pageList.value = res.data
+        pageList.value = res.data.filter(item => {
+            item.scope = item.userId == '0' ? 1 : 0
+            return item
+        })
     })
 }
 // 新增
@@ -92,7 +117,7 @@ const beforeChange = (row: any): Promise<boolean> => {
             type: 'warning'
         })
             .then(() => {
-                activatePage({ id: row.id, state: row.state == 0 ? 1 : 0 }).then((res: any) => {
+                activatePage({ id: row.id, state: row.state == 0 ? 1 : 0 }).then(async (res: any) => {
                     if (res.code == 'A0000') {
                         ElMessage({
                             type: 'success',
@@ -101,15 +126,45 @@ const beforeChange = (row: any): Promise<boolean> => {
                     }
                     init()
                     resolve(true)
-                    getMenu()
+                    await getMenu()
+                    await setTimeout(() => {
+                        navTabs.refresh()
+                    }, 1000)
                 })
             })
-            .catch(() => {
-                ElMessage({
-                    type: 'info',
-                    message: '已取消删除'
+            .catch(() => {})
+    })
+}
+// 全局
+const beforeChange1 = (row: any): Promise<boolean> => {
+    return new Promise(resolve => {
+        // setTimeout(() => {
+        //     loading1.value = false
+        //     ElMessage.success('Switch success')
+        //     return resolve(true)
+        // }, 1000)
+        ElMessageBox.confirm('此操作将页面配置成全局, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+        })
+            .then(() => {
+                scopePage({ id: row.id, userId: row.scope == 0 ? '0' : adminInfo.id }).then(async (res: any) => {
+                    if (res.code == 'A0000') {
+                        ElMessage({
+                            type: 'success',
+                            message: '操作成功!'
+                        })
+                    }
+                    init()
+                    resolve(true)
+                    await getMenu()
+                    await setTimeout(() => {
+                        navTabs.refresh()
+                    }, 1000)
                 })
             })
+            .catch(() => {})
     })
 }
 // 删除

src/views/pqs/cockpit/homePage/index.vue

@@ -2,7 +2,7 @@
     <div class="default-main">
         <TableHeader :showSearch="false" v-show="flag">
             <template v-slot:select>
-                <el-form-item label="日期">
+                <el-form-item label="日期" v-show="layout?.length != 1">
                     <DatePicker
                         ref="datePickerRef"
                         :nextFlag="false"
@@ -12,11 +12,19 @@
                 </el-form-item>
             </template>
             <template v-slot:operation>
-                <el-button type="primary" icon="el-icon-Edit" @click="editd">编辑</el-button>
-                <el-button type="primary" icon="el-icon-Tools" @click="settings">设置</el-button>
+                <el-button type="primary" icon="el-icon-Edit" v-if="hasAdmin || adminInfo.id == userId" @click="editd">
+                    编辑
+                </el-button>
+                <el-button
+                    type="primary"
+                    icon="el-icon-Tools"
+                    @click="settings"
+                    v-if="router.currentRoute.value.name == 'dashboard/index'"
+                >
+                    自定义功能管理
+                </el-button>
             </template>
         </TableHeader>
-
         <GridLayout
             v-model:layout="layout"
             :row-height="rowHeight"
@@ -26,6 +34,11 @@
             :vertical-compact="false"
             prevent-collision
             :col-num="12"
+            :style="{
+                transform: `scale(${zoom})`,
+                transformOrigin: 'top left',
+                width: zoom !== 1 ? `${100 / zoom}%` : '100%'
+            }"
         >
             <template #item="{ item }">
                 <div class="box">
@@ -34,8 +47,14 @@
                             <Icon class="HelpFilled" :name="(item as LayoutItem).icon" />
                             {{ (item as LayoutItem).name }}
                         </div>
-                        <!-- <FullScreen class="HelpFilled" style="cursor: pointer" @click="zoom(item)" /> -->
-                        <img :src="flag ? img : img1" style="cursor: pointer; height: 16px" @click="zoom(item)" />
+                        <!-- <FullScreen class="HelpFilled" style="cursor: pointer" @click="setZoom(item)" /> -->
+                        <span style="display: flex; align-items: center">
+                            <img
+                                :src="flag ? img : img1"
+                                style="cursor: pointer; height: 16px"
+                                @click="setZoom(item)"
+                            />
+                        </span>
                     </div>
                     <div>
                         <component
@@ -46,7 +65,7 @@
                             :timeValue="datePickerRef?.timeValue || 3"
                             :height="rowHeight * item.h - seRowHeight(item.h) + 'px'"
                             :width="rowWidth * item.w - 30 + 'px'"
-                            :timeKey="(item as LayoutItem).timeKey"
+                            :timeKey="(item as LayoutItem).timeKeys"
                             :interval="datePickerRef?.interval"
                             :w="item.w"
                             :h="item.h"
@@ -71,22 +90,26 @@ import { queryActivatePage, queryByPagePath } from '@/api/system-boot/csstatisti
 import RoutingConfig from '@/views/pqs/cockpit/homePage/components/routingConfig.vue'
 import { useRouter, useRoute } from 'vue-router'
 import { useTimeCacheStore } from '@/stores/timeCache'
+import { Sort } from '@element-plus/icons-vue'
 const { push } = useRouter()
 const datePickerRef = ref()
 const router = useRouter()
 const route = useRoute()
 const timeCacheStore = useTimeCacheStore()
-
+import { useAdminInfo } from '@/stores/adminInfo'
+const adminInfo = useAdminInfo()
+const hasAdmin = adminInfo.roleCode.some(item => item.includes('operation_manager') || item.includes('root'))
 defineOptions({
     // name: 'dashboard/index'
 })
+
 // 定义类型
 interface LayoutItem {
     x: number
     y: number
     w: number
     h: number
-    timeKey: number | string
+    timeKeys: any
     i: string | number
     name: string
     path: string
@@ -95,7 +118,9 @@ interface LayoutItem {
     loading?: boolean
     error?: any
 }
+const zoom = ref(1)
 const RoutingConfigRef = ref()
+const userId = ref('')
 const key = ref(0)
 const img = new URL(`@/assets/img/amplify.png`, import.meta.url).href
 const img1 = new URL(`@/assets/img/reduce.png`, import.meta.url).href
@@ -120,13 +145,16 @@ const componentMap = reactive(new Map<string, Component | string>())
 const dataList: any = ref({})
 // 获取主内容区域高度
 const getMainHeight = () => {
-    const elMain = document.querySelector('.el-main')
-    return (elMain?.offsetHeight || 0) - 70
+    const elMain = document.querySelector('.el-main') as HTMLElement | null
+    zoom.value =
+        layout.value.length == 1 ? 1 : (elMain?.offsetHeight ?? 0) > 1080 ? 1 : (elMain?.offsetHeight ?? 0) / 1080
+    // console.log('🚀 ~ getMainHeight ~ elMain:', elMain?.offsetHeight)
+    return ((elMain?.offsetHeight || 0) - 70) / zoom.value
 }
 // 获取主内容区域高度
 const getMainWidth = () => {
-    const elMain = document.querySelector('.el-main')
-    return (elMain?.offsetWidth || 0) - 20
+    const elMain = document.querySelector('.el-main') as HTMLElement | null
+    return ((elMain?.offsetWidth || 0) - 20) / zoom.value
 }
 
 // 初始化行高
@@ -170,8 +198,9 @@ const registerComponent = (path: string): Component | string | null => {
         return null
     }
 }
+
 // 缩放
-const zoom = (value: any) => {
+const setZoom = (value: any) => {
     if (flag.value) {
         layout.value = [{ ...value, x: 0, y: 0, w: 12, h: 6 }]
     } else {
@@ -181,7 +210,6 @@ const zoom = (value: any) => {
             component: registerComponent(item.path)
         }))
     }
-        console.log("🚀 ~ zoom ~ layout.value:", layout.value)
 
     flag.value = !flag.value
 
@@ -203,6 +231,7 @@ const seRowHeight = (value: any) => {
 const fetchLayoutData = async () => {
     try {
         const { data } = await queryByPagePath({ pagePath: router.currentRoute.value.name })
+        userId.value = data.userId
         dataList.value = data
         const parsedLayout = JSON.parse(data.containerConfig || '[]') as LayoutItem[]
         // 处理布局数据
@@ -212,6 +241,10 @@ const fetchLayoutData = async () => {
             component: registerComponent(item.path)
         }))
         layoutCopy.value = JSON.parse(JSON.stringify(layout.value))
+        if (layout.value.length == 1) {
+            setZoom(layout.value[0])
+        }
+
         initRowHeight()
     } catch (error) {
         console.error('获取布局数据失败:', error)

src/views/pqs/cockpit/realTimeData/bind.vue

@@ -0,0 +1,146 @@
+<template>
+    <el-dialog
+        class="cn-operate-dialog"
+        width="1200px"
+        append-to-body
+        v-model.trim="dialogVisible"
+        title="绑定"
+    >
+        <el-form ref="formRef" label-width="80px" class="form">
+            <el-form-item label="项目名称">
+                <el-input
+                    maxlength="32"
+                    show-word-limit
+                    clearable
+                    style="width: 240px"
+                    v-model.trim="searchValue"
+                    placeholder="请输入项目名称"
+                ></el-input>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" @click="info" icon="el-icon-Search">查询</el-button>
+            </el-form-item>
+        </el-form>
+        <div style="height: calc(60vh - 120px); overflow-y: auto" v-loading="loading">
+            <el-row :gutter="10" style="width: 100%; margin: auto">
+                <el-col :span="6" v-for="item in list" :key="item.id" class="mt10">
+                    <el-card class="box-card" shadow="hover">
+                        <div slot="header" class="clearfix mb10">
+                            <span style="display: flex; align-items: center;justify-content: space-between;">
+                                {{ item.name }}
+
+                                <!-- <el-tooltip
+                                    class="item"
+                                    effect="dark"
+                                    content="绑定实时数据"
+                                    placement="top"
+                                    v-if="bindId != item.id"
+                                >
+                                    <Sort
+                                        style="margin-left: 5px; width: 16px"
+                                        class="xiaoshou color"
+                                        @click="activate(item)"
+                                    />
+                                </el-tooltip> -->
+                                <el-button type="primary"   v-if="bindId != item.id" @click="activate(item)" icon="el-icon-Sort" link>绑定</el-button>
+                            </span>
+                        </div>
+                        <img v-if="item.fileContent" :src="item.fileContent" class="image" />
+                        <el-empty v-else description="暂无设计" style="height: 220px" />
+                    </el-card>
+                </el-col>
+            </el-row>
+        </div>
+    </el-dialog>
+</template>
+<script lang="ts" setup>
+import { ref, inject } from 'vue'
+import { reactive } from 'vue'
+import { coFqueryPage, getByUserId, savePageIdWithUser } from '@/api/cs-harmonic-boot/mxgraph'
+import { useAdminInfo } from '@/stores/adminInfo'
+import { Sort } from '@element-plus/icons-vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+const adminInfo = useAdminInfo()
+const emit = defineEmits(['bindClick'])
+const dialogVisible = ref(false)
+const searchValue = ref('')
+const bindId = ref('')
+const list = ref([])
+const loading = ref(false)
+const open = (text: string, data: anyObj) => {
+    searchValue.value = ''
+    list.value = []
+    info()
+    dialogVisible.value = true
+}
+const info = () => {
+    loading.value = true
+    getBindId()
+    coFqueryPage({
+        currentUserId: adminInfo.id,
+        roleCode: adminInfo.roleCode.join(','),
+        searchValue: searchValue.value,
+        pageNum: 1,
+        pageSize: 1000
+    })
+        .then(res => {
+            list.value = res.data.records
+            loading.value = false
+        })
+        .catch(err => {
+            loading.value = false
+        })
+}
+const getBindId = () => {
+    getByUserId({ userId: adminInfo.id }).then(res => {
+        bindId.value = res.data.pageId
+    })
+}
+const activate = (e: any) => {
+    ElMessageBox.confirm('是否绑定页面?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+    })
+        .then(() => {
+            savePageIdWithUser({ pageId: e.id, userId: adminInfo.id }).then(res => {
+                if (res.code == 'A0000') {
+                    ElMessage({
+                        type: 'success',
+                        message: '操作成功'
+                    })
+                    bindId.value = e.id
+                    emit('bindClick', bindId.value)
+                }
+            })
+        })
+        .catch(() => {})
+}
+defineExpose({ open })
+</script>
+<style lang="scss" scoped>
+.form {
+    display: flex;
+    justify-content: space-between;
+    height: 35px;
+}
+.image {
+    display: block;
+    width: 100%;
+    height: 220px;
+}
+.xiaoshou {
+    cursor: pointer;
+}
+.color {
+    color: var(--el-color-primary);
+}
+.box-card {
+    width: 100%;
+    // border: 1px solid #000;
+    box-shadow: var(--el-box-shadow-light);
+}
+:deep(.el-card__body) {
+    padding: 10px;
+}
+</style>

src/views/pqs/cockpit/realTimeData/iframeDia.vue

@@ -1,459 +0,0 @@
-<template>
-    <div class="container">
-        <!-- 使用 v-for 遍历四个角落 -->
-        <div v-for="corner in corners" v-show="corner.show"  :key="corner.id" :class="['corner', corner.className]">
-            <div class="content">
-                <div class="title" style="display: flex">
-                    <img src="@/assets/img/lightning.png" class="title_img" />
-                    <span>{{ corner.title }}</span>
-                </div>
-                <vxe-table
-                    :data="corner.data"
-                    size="small"
-                    border
-                    show-header
-                    :header-cell-style="{ textAlign: 'center' }"
-                    :cell-style="{ textAlign: 'center' }"
-                    height="200"
-                    style="padding: 5px;"
-                >
-                    <vxe-column field="name" title="名称"></vxe-column>
-                    <vxe-column field="a" title="A" width="40"></vxe-column>
-                    <vxe-column field="b" title="B" width="40"></vxe-column>
-                    <vxe-column field="c" title="C" width="40"></vxe-column>
-                </vxe-table>
-            </div>
-            <span class="close-btn" @click="closeCorner(corner.id)">
-                <Close />
-            </span>
-        </div>
-    </div>
-</template>
-
-<script setup lang="ts">
-import { ref, onMounted, onBeforeUnmount, nextTick, reactive } from 'vue'
-// import { clickImage } from "@/api/manage_wx";
-import { Close } from '@element-plus/icons-vue'
-import socketClient from '@/utils/webSocketClient'
-
-//开始创建webSocket客户端
-const dataSocket = reactive({
-    socketServe: socketClient.Instance
-})
-// 定义四个角落的数据
-const corners = ref([
-    {
-        id: 'topLeft',
-        title: '左上',
-        className: 'top-left',
-        show: false,
-        data: [
-            { name: '电压', a: 1098, b: 2080, c: 3006 },
-            { name: '电流', a: 15, b: 25, c: 35 },
-            { name: '电压畸变率', a: 12, b: 22, c: 32 },
-            { name: '电流畸变率', a: 18, b: 28, c: 38 },
-            { name: '电压偏值', a: 12, b: 22, c: 32 },
-            { name: '电压不平衡', a: 18, b: 28, c: 38 }
-        ] as any[],
-        elementId: '', // 记录该角落对应的元素ID
-        raceLists: [] as any[] // 为每个角落添加独立的跑马灯数据存储
-    },
-    {
-        id: 'topRight',
-        title: '右上',
-        className: 'top-right',
-        show: false,
-        data: [] as any[],
-        elementId: '',
-        raceLists: [] as any[] // 为每个角落添加独立的跑马灯数据存储
-    }
-    // {
-    //   id: "bottomLeft",
-    //   title: "左下",
-    //   className: "bottom-left",
-    //   show: false,
-    //   data: [] as { label: string; value: string }[],
-    //   elementId: "",
-    // },
-    // {
-    //   id: "bottomRight",
-    //   title: "右下",
-    //   className: "bottom-right",
-    //   show: false,
-    //   data: [] as { label: string; value: string }[],
-    //   elementId: "",
-    // },
-])
-
-interface DataTableItem {
-    name: string
-    a: number
-    b: number
-    c: number
-}
-
-const tableData = ref<DataTableItem[]>([
-    { name: '电压', a: 1098, b: 2080, c: 3006 },
-    { name: '电流', a: 15, b: 25, c: 35 },
-    { name: '电压畸变率', a: 12, b: 22, c: 32 },
-    { name: '电流畸变率', a: 18, b: 28, c: 38 },
-    { name: '电压偏值', a: 12, b: 22, c: 32 },
-    { name: '电压不平衡', a: 18, b: 28, c: 38 }
-])
-
-const steadyStateList = ref([])
-
-const selectedId = ref('')
-
-// 内部响应式数据
-const eventList = ref<any[]>([])
-
-// const handleClickImage = async (elementId: string) => {
-//   // 检查 elementId 是否有值，没有值则直接返回空数组
-//   if (!elementId) {
-//     eventList.value = [];
-//     return;
-//   }
-//   try {
-//     // 发送点击图片请求
-//     const res = await clickImage({ lineId: elementId });
-
-//     // 确保返回的数据是数组格式，并且过滤掉 null/undefined 元素
-//     let dataToStore: any[] = [];
-
-//     if (Array.isArray(res.data)) {
-//       dataToStore = res.data.filter(
-//         (item:any) => item !== null && item !== undefined
-//       );
-//     } else if (res.data && Array.isArray(res.data.records)) {
-//       dataToStore = res.data.records.filter(
-//         (item:any) => item !== null && item !== undefined
-//       );
-//     } else if (res.data) {
-//       // 如果是单个对象且不为 null
-//       if (res.data !== null && res.data !== undefined) {
-//         dataToStore = [res.data];
-//       }
-//     }
-
-//     eventList.value = dataToStore;
-//   } catch (error) {
-//     console.error("调用 clickImage 接口出错:", error);
-//     // 出错时设置为空数组，避免后续处理出错
-//     eventList.value = [];
-//   }
-// };
-
-// 记录显示顺序，用于循环替换
-const displayOrder = ref<number[]>([])
-
-// 更新指定角落数据的函数
-const updateCornerData = (cornerIndex: number, dataItem: any, elementId: string) => {
-    // 更新标题为 objName
-    if (dataItem.objName) {
-        corners.value[cornerIndex].title = dataItem.objName
-    } else {
-        corners.value[cornerIndex].title = dataItem.stationName
-    }
-
-    // 格式化数据
-    corners.value[cornerIndex].data = [
-        { label: '监测点', value: dataItem.lineName },
-        // {
-        //   label: "暂降次数",
-        //   value: dataItem.eventIds.length,
-        // },
-        {
-            label: '暂降次数',
-            value: ``
-        },
-        // { label: "稳态指标", value: "Ua:65.5   Ub:65.02   Uc:65.27   Uac:112.85  Uab:112.67   Ubc:112.85"  },
-        {
-            label: '稳态指标',
-            value: ``
-        }
-    ]
-
-    // 记录该角落对应的元素ID
-    corners.value[cornerIndex].elementId = elementId
-    corners.value[cornerIndex].show = true
-}
-
-// 显示下一个角落的函数
-const showNextCorner = (elementId: string) => {
-    // 检查该元素ID是否已经显示过
-    const existingCornerIndex = corners.value.findIndex(corner => corner.elementId === elementId && corner.show)
-
-    if (existingCornerIndex !== -1) {
-        // 如果该元素已经显示过，不更新数据
-        return
-    }
-
-    // 确保 eventList.value 是数组并且过滤掉 null/undefined 元素
-    if (!Array.isArray(eventList.value)) {
-        console.warn('eventList.value 不是数组格式:', eventList.value)
-        return
-    }
-
-    // 过滤掉 null 和 undefined 元素，然后查找匹配项
-    const validItems = eventList.value.filter(item => item !== null && item !== undefined)
-    const dataItem = validItems.find(item => item.lineId === elementId)
-
-    // 如果没有找到匹配的数据项，则不更新数据
-    if (!dataItem) {
-        console.warn('未找到匹配的数据项:', elementId)
-        return
-    }
-
-    // 查找一个未显示的角落
-    const availableCornerIndex = corners.value.findIndex(corner => !corner.show)
-
-    if (availableCornerIndex !== -1) {
-        // 有空闲角落，显示在该角落
-        updateCornerData(availableCornerIndex, dataItem, elementId)
-        // 将事件数据存储到该角落
-        corners.value[availableCornerIndex].raceLists = dataItem.eventList || []
-        // 记录显示顺序
-        displayOrder.value.push(availableCornerIndex)
-    } else {
-        // 没有空闲角落，按顺序替换角落
-        // 获取需要替换的角落索引（循环替换）
-        const replaceIndex = displayOrder.value.shift() || 0
-        updateCornerData(replaceIndex, dataItem, elementId)
-        // 将事件数据存储到该角落
-        corners.value[replaceIndex].raceLists = dataItem.eventList || []
-        // 将替换的索引重新加入队列末尾
-        displayOrder.value.push(replaceIndex)
-    }
-}
-
-// 关闭指定角落的函数
-const closeCorner = (id: string) => {
-    const cornerIndex = corners.value.findIndex(c => c.id === id)
-    if (cornerIndex !== -1) {
-        corners.value[cornerIndex].show = false
-        corners.value[cornerIndex].elementId = '' // 清空元素ID记录
-
-        // 从显示顺序中移除该角落索引
-        const orderIndex = displayOrder.value.indexOf(cornerIndex)
-        if (orderIndex !== -1) {
-            displayOrder.value.splice(orderIndex, 1)
-        }
-    }
-    send()
-}
-
-// 关闭所有角落的函数
-const closeAllCorners = () => {
-    corners.value.forEach(corner => {
-        corner.show = false
-        corner.elementId = ''
-    })
-    displayOrder.value = []
-}
-
-// 组件挂载后初始化监听器
-onMounted(() => {
-    init()
-    // 初始化时不显示任何内容
-})
-
-// 连接webSocket客户端
-const init = () => {
-    if (!dataSocket.socketServe) {
-        console.error('WebSocket 客户端实例不存在')
-        return
-    }
-    dataSocket.socketServe.connect(new Date().getTime())
-    dataSocket.socketServe.registerCallBack('message', (res: any) => {
-        if (res.type == 1) {
-            //稳态指标数据
-            let steadyState = JSON.parse(res.message)
-
-            // console.log(steadyState, "8990hhhhh");
-            if (steadyState == null || steadyState.length == 0) return
-            steadyStateList.value = steadyState
-            corners.value.forEach((corner, index) => {
-                let str = ``
-                steadyState
-                    .filter((item: any) => item.lineId == corner.elementId)
-                    .forEach((item: any) => {
-                        if (item.value == 3.1415926) {
-                            str += `<div>${item.statisticalName}：/</div>`
-                        } else {
-                            str += `<div>${item.statisticalName}：${item.value}${item.unit}</div>`
-                        }
-                    })
-
-                corner.data.length > 0
-                    ? (corner.data[2].value = `<div style="max-height: 100px;overflow-y: auto;">${str} </div>`)
-                    : ''
-            })
-        }
-    })
-}
-
-const time = ref(null)
-// 推送消息
-const send = () => {
-    dataSocket.socketServe.send({
-        pageId: selectedId.value,
-        lineIdList: corners.value.filter(item => item.show == true).map(corner => corner.elementId)
-    })
-    if (time.value) {
-        clearTimeout(time.value)
-    }
-    if (corners.value.filter(item => item.show == true).map(corner => corner.elementId).length == 0) return
-    time.value = setInterval(() => {
-        dataSocket.socketServe.send({
-            pageId: selectedId.value,
-            lineIdList: corners.value.filter(item => item.show == true).map(corner => corner.elementId)
-        })
-    }, 1000 * 60)
-}
-
-// 监听来自 iframe 的消息
-window.addEventListener('message', async function (event) {
-    // 安全起见，可以验证消息来源（origin）
-    // if (event.origin !== 'https://trusted-origin.com') return;
-
-    // 处理从 iframe 发送过来的消息
-    if (event.data.action === 'coreClick') {
-        const clickedElementId = event.data.coreId
-        selectedId.value = event.data.selectedId
-
-        // 调用接口获取最新数据
-        // await handleClickImage(clickedElementId);
-
-        // 根据接收到的元素LineId显示对应数据
-        await showNextCorner(clickedElementId)
-
-        await send()
-    }
-})
-
-// 页面卸载时清除定时器
-onBeforeUnmount(() => {
-    clearTimeout(time.value)
-    dataSocket.socketServe?.closeWs()
-})
-</script>
-
-
-<style scoped lang="scss">
-.container {
-    position: relative;
-}
-
-.corner {
-    width: 240px;
-    /* height: 135px; */
-    background-color: #fff;
-    position: absolute;
-    color: #000;
-    /* font-weight: bold; */
-    /* 添加弹出动画 */
-    opacity: 0;
-    transform: scale(0.3);
-    transition: all 0.4s ease-out;
-    border-radius: 8px;
-    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.3);
-}
-
-/* 显示状态的样式 */
-.corner:not([style*='display: none']):not([style*='display:none']) {
-    opacity: 1;
-    transform: scale(1);
-}
-
-.top-left {
-    top: 10px;
-    left: 10px;
-}
-
-.top-right {
-    top: 10px;
-    right: 10px;
-}
-
-.bottom-left {
-    top: 170px;
-    left: 10px;
-}
-
-.bottom-right {
-    top: 170px;
-    right: 10px;
-}
-
-.content {
-    width: 100%;
-    height: 100%;
-    box-sizing: border-box;
-    display: flex;
-    flex-direction: column;
-}
-
-.title {
-    font-size: 16px;
-    // text-align: center;
-    padding: 5px;
-     color: #fff; 
-    border-bottom: 1px solid #444;
-    background-color: var(--el-color-primary);
-    border-radius: 8px 8px 0 0;
-}
-
-.title_img {
-    width: 25px;
-    height: 25px;
-    margin-right: 10px;
-}
-
-.data-item {
-    display: flex;
-    margin-bottom: 4px;
-    font-size: 12px;
-}
-
-.label {
-    /* font-weight: bold; */
-    width: 55px;
-    flex-shrink: 0;
-}
-
-.value {
-    flex: 1;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-}
-
-/* 关闭按钮样式 */
-.close-btn {
-    position: absolute;
-    top: 10px;
-    right: 10px;
-    width: 14px;
-    color: white;
-    font-size: 14px;
-    font-weight: bold;
-    cursor: pointer;
-}
-
-.indicator {
-    display: flex;
-}
-
-.table {
-    width: 100%;
-    border-collapse: collapse;
-}
-
-.table th,
-.table td {
-    border: 1px solid #000;
-    text-align: center;
-    font-size: 12px;
-}
-</style>

src/views/pqs/cockpit/realTimeData/index.vue

@@ -1,16 +1,19 @@
 <template>
     <div class="default-main" :style="{ padding: prop.height ? '0px !important' : '10px' }">
         <!-- 实时数据 -->
+        <!-- 实时数据 走驾驶舱-->
         <!-- 添加加载事件监听 -->
-        <div class="dataBox" :style="{ height: prop.height || pageHeight.height }" >
+        <div class="dataBox" :style="{ height: prop.height ? prop.height : pageHeight.height }">
             <div
                 class="iframe-container"
                 :style="{
                     boxShadow: `var(--el-box-shadow-light)`
                 }"
-                style="position: relative;"
+                style="position: relative"
             >
                 <iframe
+                    v-if="bindId"
+                    :key="bindId"
                     :src="iframeSrc"
                     width="100%"
                     height="100%"
@@ -19,20 +22,37 @@
                     id="iframeLeft"
                     @load="onIframeLoad"
                 ></iframe>
-                <IframeDia
-                style="position: absolute; top: 0px; right: 0px; left: 0px"
-              />
+                <el-empty v-else description="暂无绑定页面" style="height: 100%" />
             </div>
-
-            <el-card class="bottom-container " style="min-height: 230px;">
-                <div class="buttonBox">
-                    <el-button type="primary" icon="el-icon-Aim" @click="reset">复位</el-button>
-                </div>
-                <div class="tableBox">
-                    <Table ref="tableRef"  height="100%"></Table>
-                </div>
-            </el-card>
         </div>
+        <div class="bottom-container">
+            <el-button
+                type="primary"
+                :icon="show ? 'el-icon-ArrowDownBold' : 'el-icon-ArrowUpBold'"
+                @click="show = !show"
+                style="width: 100%"
+                v-if="bindId"
+            >
+                事件列表
+            </el-button>
+            <el-button class="bindBut" type="primary" icon="el-icon-Sort" @click="bindClick">绑定</el-button>
+            <!-- <div class="buttonBox">
+                    <el-button type="primary" icon="el-icon-Aim" @click="reset">复位</el-button>
+                </div> -->
+
+            <transition name="table-fade">
+                <div class="tableBox" v-if="show">
+                    <vxe-table border auto-resize height="230px" :data="tableData" ref="tableRef">
+                        <vxe-column type="seq" title="序号" align="center" width="80px"></vxe-column>
+                        <vxe-column field="date" align="center" title="时间" width="200px"></vxe-column>
+                        <vxe-column field="name" align="center" title="监测点名" width="200px"></vxe-column>
+                        <vxe-column field="address" align="center" title="事件描述"></vxe-column>
+                    </vxe-table>
+                </div>
+            </transition>
+        </div>
+        <!--绑定实时数据 -->
+        <Bind ref="bindRef" @bindClick="info" />
     </div>
 </template>
 <script setup lang="ts">
@@ -40,93 +60,63 @@ import { ref, watch, onMounted, onUnmounted, provide } from 'vue'
 import Table from '@/components/table/index.vue'
 import TableStore from '@/utils/tableStore'
 import { mainHeight } from '@/utils/layout'
-import IframeDia from './iframeDia.vue'
+
+import { useAdminInfo } from '@/stores/adminInfo'
+import { audit, add, coFqueryPage, getByUserId } from '@/api/cs-harmonic-boot/mxgraph'
+import Bind from './bind.vue'
 // import { getActive } from "@/api/manage_wx/index";
 
 // const props = defineProps<{
 //     project: { id: string; name: string } | null
 // }>()
-
+const adminInfo = useAdminInfo()
+const show = ref(false)
 const prop = defineProps({
-    width: { type:  [String, Number]},
-    height: { type:  [String, Number]},
-    timeKey: { type:  [String, Number]},
+    width: { type: [String, Number] },
+    height: { type: [String, Number] },
+    timeKey: { type: Array as () => string[] },
     timeValue: { type: Object }
 })
+const bindRef = ref()
+const tableData = ref([])
+const bindId = ref('')
 
-const tableStore: any = new TableStore({
-    url: '/user-boot/role/selectRoleDetail?id=0',
-    method: 'POST',
+// 在父页面中添加事件监听器
+window.addEventListener('message', function (event) {
+    const { action, data } = event.data
 
-    showPage: false,
-  
-    column: [
-        {
-            field: 'index',
-            title: '序号',
-            width: '80',
-            formatter: (row: any) => {
-                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-            }
-        },
-        {
-            title: '时间',
-            field: 'whetherToGovern',
-            minWidth: '70'
-        },
-        {
-            title: '监测点名',
-            field: 'name',
-            minWidth: '90'
-
-            // render: 'customTemplate',
-            // customTemplate: (row: any) => {
-            //     return `<span style='cursor: pointer;text-decoration: underline;'>${row.name}</span>`
-            // }
-        },
-
-        { title: '事件描述', field: 'question', minWidth: '200' }
-    ],
-    beforeSearchFun: () => {
-        // tableStore.table.params.searchBeginTime = prop.timeValue?.[0] || getTimeOfTheMonth(prop.timeKey)[0]
-        //     tableStore.table.params.searchEndTime = prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
-    },
-    loadCallback: () => {
-        tableStore.table.data = [
-            {
-                name: '10kV1#电动机',
-                type: '电动机',
-                whetherToGovern: '2025-01-01 15:00:00',
-                question: '3次谐波电压、5次谐波电流、电压不平衡度超标'
-            },
-            {
-                name: '10kV2#(治理后)',
-                type: '电焊机',
-                whetherToGovern: '2025-05-01 16:00:00',
-                question: '所有指标均合格'
-            },
-            {
-                name: '380V电焊机(治理前)',
-                type: '电焊机',
-                whetherToGovern: '2025-06-01 15:00:00',
-                question: '5次谐波电流、电压不平衡度超标'
-            },
-            {
-                name: '380V水泵机',
-                type: '电动机',
-                whetherToGovern: '2025-08-01 15:00:00',
-                question: '所有指标均合格'
-            }
-        ]
+    if (action == 'securityDetailData') {
+        // 处理接收到的 tableArray 数据
+        tableData.value = data
     }
 })
+
 const tableRef = ref()
-provide('tableRef', tableRef)
+
 const pageHeight = mainHeight(40)
-provide('tableStore', tableStore)
+const bindClick = () => {
+    bindRef.value.open()
+}
 
 const reset = () => {
-    tableRef.value.reset()
+    // 向 iframe 发送复位事件
+    sendResetToIframe()
+    // 清空表格数据
+    //   tableData.value = [];
+}
+
+// 向 iframe 发送复位消息的函数
+const sendResetToIframe = () => {
+    const iframe = document.getElementById('iframeLeft') as HTMLIFrameElement
+    if (iframe && iframe.contentWindow) {
+        iframe.contentWindow.postMessage(
+            {
+                type: 'RESET_EVENT',
+                payload: true
+            },
+            '*' // 生产环境中应替换为具体的域名
+        )
+    }
 }
 
 const iframeSrc = ref('')
@@ -152,16 +142,10 @@ const iframeSrc = ref('')
 //     { immediate: true, deep: true }
 // )
 
-onMounted(() => {
-    iframeSrc.value =
-        'http://192.168.1.179:4001' +
-        `/zutai/?id=4b4f7f4260198776594f5f9d93a532e8&&name=stt&&preview=true#/preview_YPT`
-
-    tableStore.index()
-
+onMounted(async () => {
+    info()
+    // tableStore.index()
     // 监听来自 eventStatistics 组件的消息
-    window.addEventListener('message', handleMessage)
-
     //   getActive({}).then((res: any) => {
     //     if (res.code == "A0000") {
     //       //   window.location.origin
@@ -173,7 +157,31 @@ onMounted(() => {
     //     }
     //   });
 })
-
+const info = async () => {
+    iframeSrc.value = ''
+    await getByUserId({ userId: adminInfo.id })
+        .then(res => {
+            bindId.value = res.data.pageId
+        })
+        .catch(async err => {
+            // bindId.value = '4b4f7f4260198776594f5f9d93a532e8'
+            await coFqueryPage({
+                currentUserId: adminInfo.id,
+                roleCode: adminInfo.roleCode.join(','),
+                searchValue: '',
+                pageNum: 1,
+                pageSize: 1000
+            }).then(res => {
+                bindId.value = res.data.records.filter(item => item.scope == 1)[0]?.id || null
+          
+            })
+        })
+    await setTimeout(() => {
+        iframeSrc.value = window.location.origin + `/zutai/?id=${bindId.value}&&name=stt&&preview=true#/preview_YPT`
+        // iframeSrc.value =  `http://192.168.2.128:4001/zutai/?id=${bindId.value}&&name=stt&&preview=true#/preview_YPT`
+        window.addEventListener('message', handleMessage)
+    }, 0)
+}
 onUnmounted(() => {
     // 清理事件监听器
     window.removeEventListener('message', handleMessage)
@@ -230,19 +238,62 @@ const sendKeysToIframe = (keyList: string[]) => {
 .iframe-container {
     flex: 3.5;
 }
-:deep(.el-card__body) {
-    display: flex;
-    padding: 10px;
-    height: 100%;
+
+.bottom-container {
+    position: absolute;
+    width: 100%;
+    bottom: 0px;
+
     .buttonBox {
-        display: flex; 
+        display: flex;
         width: 150px;
         align-items: center;
         justify-content: center;
     }
+
     .tableBox {
         flex: 1;
         width: 100%;
     }
 }
+.tableBox {
+    /* 必须：初始高度/overflow 配合动画 */
+    overflow: hidden;
+    /* 与表格高度一致，保证展开后高度正确 */
+    height: 230px;
+    // margin-top: 10px;
+}
+
+/* 过渡动画核心样式 */
+.table-fade-enter-from,
+.table-fade-leave-to {
+    /* 关闭时：高度收为0 + 透明度0 */
+    height: 0;
+    opacity: 0;
+}
+
+.table-fade-enter-to,
+.table-fade-leave-from {
+    /* 展开时：高度恢复 + 透明度1 */
+    height: 230px;
+    opacity: 1;
+}
+
+/* 动画过渡时长 + 曲线（可自定义） */
+.table-fade-enter-active,
+.table-fade-leave-active {
+    transition: all 0.3s ease;
+    /* 防止动画过程中出现滚动条 */
+    overflow: hidden;
+}
+
+/* 解决动画结束后瞬间闪回的问题 */
+.table-fade-enter-active {
+    transition-delay: 0.05s;
+}
+.bindBut {
+    position: absolute;
+    right: 0px;
+    top: -35px;
+}
 </style>

src/views/pqs/cockpit/setUp/components/popup.vue

@@ -1,126 +1,195 @@
 <template>
-    <div class="pd10">
-        <el-card>
-            <el-form ref="formRef" inline :rules="rules" :model="form" label-width="auto" class="form-four">
-                <el-form-item label="页面名称" prop="pageName">
-                    <el-input
-                        style="width: 100%"
-                        maxlength="32"
-                        show-word-limit
-                        v-model.trim="form.pageName"
-                        placeholder="请输入页面名称"
-                    ></el-input>
-                </el-form-item>
-                <el-form-item label="图标">
-                    <IconSelector v-model.trim="form.icon" style="width: 80%" placeholder="请选择图标" />
-                </el-form-item>
-                <el-form-item label="页面排序" prop="sort">
-                    <el-input-number style="width: 100%" v-model.trim="form.sort" :min="0" :max="10000" :step="1" />
-                </el-form-item>
-                <!-- <el-form-item label="绑定页面">
-                    <el-select v-model="form.pagePath" filterable placeholder="请选择绑定页面" style="width: 100%" clearable>
-                        <el-option v-for="item in pageList" :key="item.path" :label="item.name" :value="item.path" />
-                    </el-select>
-                </el-form-item> -->
-
-                <el-form-item label="备注" class="top">
-                    <el-input
-                        maxlength="300"
-                        show-word-limit
-                        type="textarea"
-                        :rows="1"
-                        placeholder="请输入内容"
-                        v-model.trim="form.remark"
-                    ></el-input>
-                </el-form-item>
-                <el-form-item>
-                    <div style="width: 100%; display: flex; justify-content: end">
-                        <el-button type="primary" icon="el-icon-Check" @click="onSubmit">保存</el-button>
-                        <back-component />
-                    </div>
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="mt10" :style="height">
-            <div style="display: flex">
-                <div style="width: 605px; overflow: auto" :style="indicatorHeight" class="mr10">
-                    <el-collapse v-model="activeNames" :expand-icon-position="position">
-                        <el-collapse-item
-                            v-for="item in treeComponents"
-                            :key="item.id"
-                            :title="item.name"
-                            :name="item.id"
-                        >
-                            <el-collapse v-model="activeNames1" class="ml20">
-                                <el-collapse-item v-for="k in item.children" :key="k.id" :title="k.name" :name="k.id">
-                                    <div class="Box">
-                                        <div
-                                            v-for="(s, index) in k.children"
-                                            :key="index"
-                                            class="mr10 mb10 imgBox"
-                                            draggable="true"
-                                            unselectable="on"
-                                            @drag="drag(s)"
-                                            @dragend="dragEnd(s)"
-                                        >
-                                            <div class="textName">{{ s.name }}</div>
-                                            <img :src="s.image" style="width: 180px" />
+    <div class="default-main pd10">
+        <div style="width: 100%; display: flex; justify-content: end">
+            <el-button type="primary" icon="el-icon-Check" @click="onSubmit">保存</el-button>
+            <back-component />
+        </div>
+        <div style="display: flex" class="mt10">
+            <!-- <el-tabs type="border-card">
+                <el-tab-pane label="组件">
+                    <div style="width: 520px; overflow: auto" :style="indicatorHeight" class="mr10">
+                        <el-collapse v-model="activeNames" :expand-icon-position="position">
+                            <el-collapse-item
+                                v-for="item in treeComponents"
+                                :key="item.id"
+                                :title="item.name"
+                                :name="item.id"
+                            >
+                                <el-collapse v-model="activeNames1" class="ml20">
+                                    <el-collapse-item
+                                        v-for="k in item.children"
+                                        :key="k.id"
+                                        :title="k.name"
+                                        :name="k.id"
+                                    >
+                                        <div class="Box">
+                                            <div
+                                                v-for="(s, index) in k.children"
+                                                :key="index"
+                                                class="mr10 mb10 imgBox"
+                                                draggable="true"
+                                                unselectable="on"
+                                                @drag="drag(s)"
+                                                @dragend="dragEnd(s)"
+                                            >
+                                                <div class="textName">{{ s.name }}</div>
+                                                <img :src="s.image" style="width: 150px" />
+                                            </div>
                                         </div>
-                                    </div>
-                                </el-collapse-item>
-                            </el-collapse>
-                        </el-collapse-item>
-                    </el-collapse>
-                </div>
-                <div style="flex: 1" ref="wrapper">
-                    <GridLayout
-                        class="GridLayout"
-                        ref="gridLayout"
-                        v-model:layout="layout"
-                        style="width: 100%"
-                        :style="{ height: GridHeight + 'px' }"
-                        :row-height="rowHeight"
-                        :col-num="12"
-                        prevent-collision
-                        :vertical-compact="false"
-                    >
-                        <template #item="{ item }">
-                            <div class="imgBox">
-                                <div class="textName">{{ item.name }}</div>
-
-                                <img
-                                    :src="getImg(item.path)"
-                                    :style="{
-                                        height:
-                                            item.h * rowHeight -
-                                            (item.h == 1
-                                                ? 30
-                                                : item.h == 2
-                                                ? 20
-                                                : item.h == 3
-                                                ? 10
-                                                : item.h == 4
-                                                ? -0
-                                                : item.h == 5
-                                                ? -10
-                                                : -20) +
-                                            'px'
-                                    }"
-                                />
-
-                                <CloseBold class="remove" @click="removeItem(item.i)" />
+                                    </el-collapse-item>
+                                </el-collapse>
+                            </el-collapse-item>
+                        </el-collapse>
+                    </div>
+                </el-tab-pane>
+            </el-tabs> -->
+            <el-tabs v-model="tableName" type="border-card" @tab-change="changeTab">
+                <el-tab-pane v-for="item in treeComponents" :key="item.name" :label="item.name" :name="item.name">
+                    <el-tabs v-model="tableName1" tab-position="top">
+                        <el-tab-pane v-for="k in item?.children" :key="k.name" :label="k.name" :name="k.name">
+                            <div :style="indicatorHeight" style="overflow-y: auto; overflow-x: hidden">
+                                <el-row :gutter="10" class="pl5 pr5 pt5" style="width: 520px">
+                                    <el-col :span="8" v-for="component in k.children" :key="component.id" class="mb10">
+                                        <el-card
+                                            class="box-card"
+                                            shadow="hover"
+                                            @drag="drag(component)"
+                                            @dragend="dragEnd(component)"
+                                        >
+                                            <div slot="header" class="clearfix">
+                                                <span style="display: flex; align-items: center">
+                                                    {{ component.name }}
+                                                </span>
+                                            </div>
+                                            <img v-if="component.image" :src="component.image" class="image xiaoshou" />
+                                        </el-card>
+                                    </el-col>
+                                </el-row>
                             </div>
-                            <!-- <span class="text">{{ `${item?.name}` }}</span>
+                        </el-tab-pane>
+                    </el-tabs>
+                </el-tab-pane>
+            </el-tabs>
+
+            <div style="flex: 1" ref="wrapper" class="ml10">
+                <el-tabs type="border-card" class="mb10">
+                    <el-tab-pane label="基础信息">
+                        <el-form ref="formRef" inline :rules="rules" :model="form" label-width="auto" class="form-four">
+                            <el-form-item label="页面名称" prop="pageName">
+                                <el-input
+                                    style="width: 100%"
+                                    maxlength="32"
+                                    show-word-limit
+                                    v-model.trim="form.pageName"
+                                    placeholder="请输入页面名称"
+                                ></el-input>
+                            </el-form-item>
+                            <el-form-item label="图标">
+                                <IconSelector v-model.trim="form.icon" placeholder="请选择图标" />
+                            </el-form-item>
+                            <el-form-item label="页面排序" prop="sort">
+                                <el-input-number
+                                    style="width: 100%"
+                                    v-model.trim="form.sort"
+                                    :min="0"
+                                    :max="10000"
+                                    :step="1"
+                                />
+                            </el-form-item>
+
+                            <el-form-item label="是否激活">
+                                <el-switch
+                                    v-model="form.state"
+                                    inline-prompt
+                                    width="60px"
+                                    :disabled="form.pagePath == 'dashboard/index'"
+                                    :active-value="1"
+                                    :inactive-value="0"
+                                    active-text="是  "
+                                    inactive-text="否  "
+                                />
+                            </el-form-item>
+                            <el-form-item label="是否全局" v-if="hasAdmin">
+                                <el-switch
+                                    v-model="form.scope"
+                                    inline-prompt
+                                    width="60px"
+                                    :active-value="1"
+                                    :inactive-value="0"
+                                    :disabled="form.pagePath == 'dashboard/index'"
+                                    active-text="是  "
+                                    inactive-text="否  "
+                                />
+                            </el-form-item>
+                            <el-form-item label="备注" class="top">
+                                <el-input
+                                    maxlength="300"
+                                    show-word-limit
+                                    style="width: 100%"
+                                    type="textarea"
+                                    :rows="1"
+                                    placeholder="请输入内容"
+                                    v-model.trim="form.remark"
+                                ></el-input>
+                            </el-form-item>
+                            <el-form-item></el-form-item>
+                        </el-form>
+                    </el-tab-pane>
+                </el-tabs>
+                <div ref="PaneRef">
+                    <el-tabs type="border-card">
+                        <el-tab-pane label="画布" :style="height">
+                            <GridLayout
+                                class="GridLayout"
+                                ref="gridLayout"
+                                v-model:layout="layout"
+                                style="width: 100%"
+                                :style="{ height: GridHeight + 'px' }"
+                                :row-height="rowHeight"
+                                :col-num="12"
+                                prevent-collision
+                                :is-bounded="true"
+                                :vertical-compact="false"
+                            >
+                                <template #item="{ item }">
+                                    <div class="imgBox">
+                                        <div class="textName">{{ item.name }}</div>
+
+                                        <img
+                                            :src="getImg(item.path)"
+                                            :style="{
+                                                height:
+                                                    item.h * rowHeight -
+                                                    (item.h == 1
+                                                        ? 30
+                                                        : item.h == 2
+                                                        ? 20
+                                                        : item.h == 3
+                                                        ? 10
+                                                        : item.h == 4
+                                                        ? -0
+                                                        : item.h == 5
+                                                        ? -10
+                                                        : -20) +
+                                                    'px'
+                                            }"
+                                        />
+
+                                        <CloseBold class="remove" @click="removeItem(item.i)" />
+                                    </div>
+                                    <!-- <span class="text">{{ `${item?.name}` }}</span>
                             -->
-                        </template>
-                    </GridLayout>
+                                </template>
+                            </GridLayout>
+                        </el-tab-pane>
+                    </el-tabs>
                 </div>
             </div>
-        </el-card>
+        </div>
     </div>
 </template>
 <script setup lang="ts">
-import { ref, reactive, onMounted, onBeforeUnmount } from 'vue'
+import { ref, reactive, onMounted, onBeforeUnmount, nextTick } from 'vue'
 import { useRouter } from 'vue-router'
 import BackComponent from '@/components/icon/back/index.vue'
 import { mainHeight } from '@/utils/layout'
@@ -135,14 +204,22 @@ import { addDashboard, updateDashboard, queryById } from '@/api/system-boot/csst
 import html2canvas from 'html2canvas'
 import { useRoute } from 'vue-router'
 import { getMenu } from '@/utils/router'
+import { useAdminInfo } from '@/stores/adminInfo'
+const tableName = ref('')
+const tableName1 = ref('')
+import { useNavTabs } from '@/stores/navTabs'
 // defineOptions({
 //     name: 'cockpit/popup'
 // })
+const adminInfo = useAdminInfo()
+const hasAdmin = adminInfo.roleCode.some(item => item.includes('operation_manager') || item.includes('root'))
+
 const { go } = useRouter()
+const navTabs = useNavTabs()
 const { query } = useRoute()
 const router = useRouter()
-const height = mainHeight(108)
-const indicatorHeight = mainHeight(128)
+const height = mainHeight(295)
+const indicatorHeight = mainHeight(180)
 const rowHeight = ref(0)
 const pageList: any = ref([])
 const GridHeight = ref(0)
@@ -153,7 +230,8 @@ const form: any = reactive({
     containerConfig: [],
     sort: '100',
     id: '',
-
+    state: 1,
+    scope: 0,
     icon: '',
     pagePath: '',
     remark: '',
@@ -192,6 +270,8 @@ const info = () => {
     activeNames1.value = []
     componentTree().then(res => {
         treeComponents.value = res.data
+        tableName.value = tableName.value == '' ? treeComponents.value[0].name : tableName.value
+        tableName1.value = tableName1.value == '' ? treeComponents.value[0].children[0].name : tableName1.value
         activeNames.value = treeComponents.value.map(item => item.id)
         res.data.forEach(item => {
             item.children.forEach(k => {
@@ -209,6 +289,8 @@ const info = () => {
             form.sort = res.data.sort
             form.remark = res.data.remark
             form.id = res.data.id
+            form.state = res.data.state
+            form.scope = res.data.userId == 0 ? 1 : 0
             form.icon = res.data.icon
         })
     } else {
@@ -237,6 +319,10 @@ const tree2List = (list: any, id: any) => {
     // 返回结果数组
     return arr
 }
+const changeTab = (e: any) => {
+    console.log('🚀 ~ changeTab ~ e:', e)
+    tableName1.value = treeComponents.filter(item => item.name == e)[0].children[0].name
+}
 // 删除拖拽
 const removeItem = (id: string) => {
     const index = layout.value.findIndex(item => item.i === id)
@@ -246,6 +332,7 @@ const removeItem = (id: string) => {
     }
 }
 const wrapper = ref<HTMLElement>()
+const PaneRef = ref<HTMLElement>()
 const gridLayout = ref<InstanceType<typeof GridLayout>>()
 
 const mouseAt = { x: -1, y: -1 }
@@ -337,7 +424,7 @@ function dragEnd(row: any) {
         name: row.name,
         path: row.path,
         icon: row.icon,
-        timeKey: row.timeKey
+        timeKeys: row.timeKeys
     })
     gridLayout.value.dragEvent('dragend', dragItem.i, dragItem.x, dragItem.y, dragItem.h, dragItem.w)
     const item = gridLayout.value.getItem(dropId)
@@ -351,6 +438,12 @@ const onSubmit = () => {
     if (layout.value.length == 0) {
         return ElMessage.warning('页面设计不能为空!')
     }
+    console.log(123, findDuplicateNames(layout.value))
+    let repeat = findDuplicateNames(layout.value) || []
+    if (repeat.length > 0) {
+        return ElMessage.warning(repeat.join('、')+' 组件重复,请删除重复组件!')
+    }
+
     // const maxValue = Math.max(...layout.value.map(item => item.y + item.h))
     // if (maxValue > 6) {
     //     return ElMessage.warning('组件不能超出当前容器!')
@@ -367,36 +460,78 @@ const onSubmit = () => {
 
         if (valid) {
             if (form.id == '') {
-                addDashboard({ ...form, containerConfig: JSON.stringify(layout.value), thumbnail: url }).then(
-                    (res: any) => {
-                        ElMessage.success('新增页面成功!')
-                        go(-1)
-                        getMenu()
-                    }
-                )
+                await addDashboard({
+                    ...form,
+                    containerConfig: JSON.stringify(layout.value),
+                    thumbnail: url,
+                    userId: form.scope == 1 ? '0' : adminInfo.id
+                }).then(async (res: any) => {
+                    ElMessage.success('新增页面成功!')
+                    // go(-1)
+                    await getMenu()
+                })
             } else {
-                updateDashboard({ ...form, containerConfig: JSON.stringify(layout.value), thumbnail: url }).then(
-                    (res: any) => {
-                        ElMessage.success('修改页面成功!')
-                        go(-1)
-                        getMenu()
-                    }
-                )
+                await updateDashboard({
+                    ...form,
+                    containerConfig: JSON.stringify(layout.value),
+                    thumbnail: url,
+                    userId: form.scope == 1 ? '0' : adminInfo.id
+                }).then(async (res: any) => {
+                    ElMessage.success('修改页面成功!')
+                    // go(-1)
+                    await getMenu()
+                })
             }
+            await setTimeout(() => {
+                router.push({
+                    name: form.state == 1 ? form.pagePath : 'dashboard/index'
+                })
+                navTabs.refresh()
+            }, 500)
         }
     })
 }
+// 查找重复的name
+const findDuplicateNames = (arr: any) => {
+    // 用于记录每个name出现的次数
+    const nameCount = {}
+    // 用于存储重复的name
+    const duplicates = []
+
+    // 遍历数组统计每个name的出现次数
+    arr.forEach(item => {
+        const name = item.name
+        if (nameCount[name]) {
+            nameCount[name]++
+        } else {
+            nameCount[name] = 1
+        }
+    })
+
+    // 筛选出出现次数大于1的name
+    for (const name in nameCount) {
+        if (nameCount[name] > 1) {
+            duplicates.push(name)
+        }
+    }
+
+    return duplicates
+}
 const getImg = throttle((path: string) => {
     if (path != undefined) return treeComponentsCopy.value.filter(item => item.path == path)[0]?.image
 })
 
 onMounted(() => {
     info()
-
-    GridHeight.value = wrapper.value?.offsetWidth / 1.77777
-    rowHeight.value = GridHeight.value / 6 - 11.5
-    document.documentElement.style.setProperty('--GridLayout-height', rowHeight.value + 10 + 'px')
-    document.addEventListener('dragover', syncMousePosition)
+    nextTick(() => {
+        GridHeight.value = PaneRef.value?.offsetHeight - 60 //wrapper.value?.offsetWidth / 1.77777
+        setTimeout(() => {
+            console.log('🚀 ~ wrapper.value?.offsetWidth:', PaneRef.value?.offsetWidth)
+        }, 500)
+        rowHeight.value = GridHeight.value / 6 - 11.5
+        document.documentElement.style.setProperty('--GridLayout-height', rowHeight.value + 10 + 'px')
+        document.addEventListener('dragover', syncMousePosition)
+    })
 })
 
 onBeforeUnmount(() => {
@@ -414,8 +549,9 @@ onBeforeUnmount(() => {
     justify-content: space-between;
     .el-form-item {
         display: flex;
-        flex: 1;
-        align-items: center;
+        // flex: 1;
+        // align-items: center;
+        width: 32%;
         .el-form-item__content {
             width: 100%;
             flex: 1;
@@ -495,4 +631,24 @@ onBeforeUnmount(() => {
 :deep(.el-form--inline .el-form-item) {
     margin-right: 0px;
 }
+:deep(.el-card__header) {
+    padding: 13px 20px;
+    height: 44px;
+}
+:deep(.el-card__body) {
+    padding: 10px;
+}
+.xiaoshou {
+    cursor: pointer;
+}
+.image {
+    display: block;
+    width: 100%;
+    height: 100px;
+}
+.box-card {
+    width: 100%;
+    // border: 1px solid #000;
+    box-shadow: var(--el-box-shadow-light);
+}
 </style>

src/views/pqs/cockpit/setUp/components/view.vue

@@ -43,7 +43,7 @@
                             :timeValue="datePickerRef.timeValue"
                             :height="rowHeight * item.h - seRowHeight(item.h) + 'px'"
                             :width="rowWidth * item.w - 30 + 'px'"
-                            :timeKey="item.timeKey"
+                            :timeKey="item.timeKeys"
                         />
                         <div v-else class="pd10">组件加载失败...</div>
                     </div>