添加工程信息管理 页面

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

@@ -31,4 +31,11 @@ export function getCldTree() {
         method: 'POST'
     })
 }
+//报表树
+export function lineTree() {
+    return createAxios({
+        url: '/cs-device-boot/csLedger/lineTree',
+        method: 'POST'
+    })
+}
 

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

@@ -1,41 +1,82 @@
 import request from '@/utils/request'
 
 // 新增程序版本
-export const addEdData = (data) => {
+export const addEdData = data => {
     return request({
         url: '/cs-device-boot/edData/addEdData',
         method: 'post',
         headers: {
-            'Content-Type': 'multipart/form-data',
+            'Content-Type': 'multipart/form-data'
         },
-        data: data,
+        data: data
     })
 }
 
-export const auditEdData = (data) => {
+export const auditEdData = data => {
     return request({
         url: '/cs-device-boot/edData/auditEdData',
         method: 'post',
         headers: {
-            'Content-Type': 'multipart/form-data',
+            'Content-Type': 'multipart/form-data'
         },
-        data: data,
+        data: data
     })
 }
 // 修改-删除工程
-export const auditEngineering = (data:any)=> {
+export const auditEngineering = (data: any) => {
     return request({
         url: '/cs-device-boot/engineering/auditEngineering',
         method: 'post',
-        data: data,
+        data: data
     })
 }
 // 修改项目
-export const updateProject = (data:any) => {
+export const updateProject = (data: any) => {
     return request({
         url: '/cs-device-boot/project/updateProject',
         method: 'post',
 
-        data: data,
+        data: data
     })
 }
+// 新增工程
+export const addEngineering = (data: any) => {
+    return request({
+        url: '/cs-device-boot/engineeringProjectRelation/addEngineering',
+        method: 'post',
+        data: data
+    })
+}
+// 修改工程
+export const updateEngineering = (data: any) => {
+    return request({
+        url: '/cs-device-boot/engineeringProjectRelation/updateEngineering',
+        method: 'post',
+        data: data
+    })
+}
+// 刪除工程
+export const deleteEngineering = (data: any) => {
+    return request({
+        url: '/cs-device-boot/engineeringProjectRelation/deleteEngineering',
+        method: 'post',
+        params: data
+    })
+}
+// 刪除項目
+export const deleteProject = (data: any) => {
+    return request({
+        url: '/cs-device-boot/engineeringProjectRelation/deleteProject',
+        method: 'post',
+        params: data
+    })
+}
+// 新增项目
+export const addProject = (data: any) => {
+    return request({
+        url: '/cs-device-boot/engineeringProjectRelation/addProject',
+        method: 'post',
+        data: data
+    })
+}
+

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

@@ -1,5 +1,5 @@
 import createAxios from '@/utils/request'
-
+import { genFileId, ElMessage, ElNotification } from 'element-plus'
 // 查询设备数据趋势
 export function getDeviceDataTrend(data: any) {
     return createAxios({
@@ -9,8 +9,6 @@ export function getDeviceDataTrend(data: any) {
     })
 }
 
-
-
 // 波形下载
 export function getFileZip(params: any) {
     return createAxios({
@@ -27,5 +25,35 @@ export function exportModel(data: any) {
         method: 'post',
         data: data,
         responseType: 'blob'
+    }).then(async res => {
+        let load: any = await readJsonBlob(res)
+        if (load.code) {
+            if (load.data.code == 'A0011') {
+                ElMessage.warning('下载失败!')
+            } else {
+                ElMessage.warning(load.data.message)
+            }
+        } else {
+            return res
+        }
     })
 }
+async function readJsonBlob(blob) {
+    try {
+        // 1. Blob.text() 读取二进制 → 直接转为 字符串（自动处理编码）
+        const jsonStr = await blob.text()
+        // 2. JSON.parse 解析字符串 → 得到可用的 JS 对象/数组
+        const jsonData = JSON.parse(jsonStr)
+        // 3. 拿到数据，后续随便用
+        return {
+            code: true,
+            data: jsonData
+        }
+    } catch (err) {
+        return {
+            code: false,
+            data: {}
+        }
+        // console.error('解析Blob的JSON数据失败：', err)
+    }
+}

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

@@ -3,7 +3,7 @@ import createAxios from '@/utils/request'
 // 获取设备补召页面数据
 export function getMakeUpData(data: any) {
     return createAxios({
-        url: '/cs-harmonic-boot/offlineDataUpload/makeUpData?lineId='+data,
+        url: '/cs-harmonic-boot/offlineDataUpload/makeUpData?lineId=' + data,
         method: 'POST'
     })
 }
@@ -30,7 +30,14 @@ export function offlineDataUploadMakeUp(data: any) {
 export function getListByIds() {
     return createAxios({
         url: '/cs-harmonic-boot/pqSensitiveUser/getListByIds',
-        method: 'POST',
-        
+        method: 'POST'
+    })
+}
+// 根据id集合获取敏感负荷用户列表
+export function getList(data) {
+    return createAxios({
+        url: '/cs-harmonic-boot/pqSensitiveUser/getList',
+        method: 'POST',
+        data
     })
 }

src/api/cs-system-boot/manage.ts

@@ -18,3 +18,13 @@ export function downLoadFile(filePath: any) {
         params: { filePath: filePath }
     })
 }
+
+//获取文件的一个短期url
+export function getFileUrl(filePath: any) {
+    return createAxios({
+        url: '/system-boot/file/getFileUrl',
+        method: 'get',
+        // responseType: 'blob',
+        params: { filePath: filePath }
+    })
+}

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

@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-
+import { genFileId, ElMessage, ElNotification } from 'element-plus'
 // 主要监测点列表查询>>分页
 export function mainLineList(data: any) {
     return request({
@@ -115,7 +115,6 @@ export function limitProbabilityData(data: any) {
     })
 }
 
-
 // 电网侧指标越限统计列表
 export function gridSideLimitStatisticsList(data: any) {
     return request({
@@ -152,7 +151,6 @@ export function getListByIds(data: any) {
     })
 }
 
-
 // 上传治理报告
 export function uploadReport(data: any) {
     return request({
@@ -260,14 +258,42 @@ export function getSimpleLine() {
     })
 }
 
-
-export function getLineExport(data:any) {
+export function getLineExport(data: any) {
     return request({
         url: '/cs-harmonic-boot/eventReport/getLineExport',
         method: 'post',
         data: data,
         responseType: 'blob'
+    }).then(async res => {
+        let load: any = await readJsonBlob(res)
+        if (load.code) {
+            if (load.data.code == 'A0011') {
+                ElMessage.warning('下载失败!')
+            } else {
+                ElMessage.warning(load.data.message)
+            }
+        } else {
+            return res
+        }
     })
 }
 
-
+async function readJsonBlob(blob) {
+    try {
+        // 1. Blob.text() 读取二进制 → 直接转为 字符串（自动处理编码）
+        const jsonStr = await blob.text()
+        // 2. JSON.parse 解析字符串 → 得到可用的 JS 对象/数组
+        const jsonData = JSON.parse(jsonStr)
+        // 3. 拿到数据，后续随便用
+        return {
+            code: true,
+            data: jsonData
+        }
+    } catch (err) {
+        return {
+            code: false,
+            data: {}
+        }
+        // console.error('解析Blob的JSON数据失败：', err)
+    }
+}

src/api/harmonic-boot/luckyexcel.ts

@@ -103,6 +103,14 @@ export function getTemplateByDept(params) {
         params
     })
 }
+// 获取模版
+export function querySysExcel(params) {
+    return createAxios({
+        url: '/cs-harmonic-boot/sysExcel/querySysExcel',
+        method: 'post',
+        params
+    })
+}
 //资源管理 查询数据
 export function queryData(data) {
     return createAxios({
@@ -168,3 +176,43 @@ export function terminalChooseTree() {
         method: 'get'
     })
 }
+//新增模版
+export function addSysExcel(data:any) {
+    return createAxios({
+         url: '/cs-harmonic-boot/sysExcel/addSysExcel',
+        method: 'post',
+        data
+    })
+}
+//修改模版
+export function updateSysExcel(data:any) {
+    return createAxios({
+         url: '/cs-harmonic-boot/sysExcel/updateSysExcel',
+        method: 'post',
+        data
+    })
+}
+//删除模版
+export function deleteSysExcel(params:any) {
+    return createAxios({
+         url: '/cs-harmonic-boot/sysExcel/deleteSysExcel',
+        method: 'post',
+        params
+    })
+}
+//查詢綁定
+export function queryList(params:any) {
+    return createAxios({
+         url: '/cs-harmonic-boot/sysExcelRelation/queryList',
+        method: 'post',
+        params
+    })
+}
+//綁定
+export function bandRelation(data:any) {
+    return createAxios({
+         url: '/cs-harmonic-boot/sysExcelRelation/bandRelation',
+        method: 'post',
+        data
+    })
+}

src/api/user-boot/roleFuction.ts

@@ -8,14 +8,26 @@ export function getFunctionsByRoleIndex(data) {
     })
 }
 
-export function updateRoleMenu(data:any) {
+export function updateRoleMenu(data: any) {
     return createAxios({
         url: '/user-boot/function/assignFunctionByRoleIndexes',
         method: 'post',
         data: data
-        // params: roleIndex,functionIndexList
-        // data:{
-        //   roleIndex,functionIndexList
-        // }
+    })
+}
+// 新增角色与系统关系
+export function systemAdd(data: any) {
+    return createAxios({
+        url: '/user-boot/sysRoleSystem/add',
+        method: 'post',
+        data: data
+    })
+}
+// 根据角色id获取系统信息
+export function getSystemByRoleId(params: any) {
+    return createAxios({
+        url: '/user-boot/sysRoleSystem/getSystemByRoleId',
+        method: 'get',
+        params
     })
 }

src/components/cockpit/F47Curve/index.vue

@@ -1,7 +1,14 @@
 <template>
     <div>
         <!--F47曲线 -->
-        <TableHeader ref="TableHeaderRef" :showReset="false"  :timeKeyList="prop.timeKey" @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>
@@ -109,8 +116,8 @@ const tableStore: any = new TableStore({
     loadCallback: () => {
         const gongData = gongfunction(tableStore.table.data)
         data.gs = tableStore.table.data.length
-        data.krr = gongData.pointI.length
-        data.bkrr = gongData.pointIun.length
+        data.krr = gongData.pointF.length
+        data.bkrr = gongData.pointFun.length
         echartList.value = {
             title: {
                 text: `F47曲线`
@@ -162,11 +169,16 @@ const tableStore: any = new TableStore({
             yAxis: [
                 {
                     type: 'value',
-                    max: function (value: any) {
-                        return value.max + 20
+                    // max: function (value: any) {
+                    //     return value.max + 20
+                    // },
+                    max: function (value) {
+                        // 先取原始最大值+20，再向上取整到最近的10的倍数，确保刻度够用且规整
+                        return Math.ceil((value.max + 20) / 10) * 10
                     },
-                    splitNumber: 10,
-                    minInterval: 0.1,
+                    // splitNumber: 10,
+                    // interval: 10,
+                    // minInterval: 10,
                     name: '%'
                 }
             ],
@@ -203,15 +215,7 @@ const tableStore: any = new TableStore({
                         //     [0.4, 50, '2023-01-01 11:00:00']
                         // ],
                         legendSymbol: 'circle',
-                        emphasis: {
-                            focus: 'series',
-                            itemStyle: {
-                                borderColor: '#fff',
-                                borderWidth: 2,
-                                shadowBlur: 10,
-                                shadowColor: 'rgba(0, 0, 0, 0.5)'
-                            }
-                        },
+                       
                         tooltip: {
                             show: true,
                             trigger: 'item',

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

@@ -47,6 +47,7 @@ const init = () => {
         tooltip: {
             trigger: 'axis',
             formatter: (params: any) => {
+                console.log('🚀 ~ init ~ params:', params)
                 if (!params || params.length === 0) return ''
 
                 // 使用第一个项目的轴标签作为时间标题
@@ -100,7 +101,12 @@ const initData = async (row: any) => {
             }
 
             // 处理每条相位数据
-            const seriesData = res.data.map((item: any) => {
+            const seriesData = res.data
+                .filter(item => item.valueType == 'max')
+                .sort((a, b) => {
+                    return a.phasic.localeCompare(b.phasic)
+                })
+                .map((item: any) => {
                     const values = xAxisData.map((time: string, index: number) => {
                         // 将传入的日期与时间拼接成完整的时间字符串
                         const fullTime = `${row.time} ${time}`
@@ -135,7 +141,7 @@ onMounted(() => {})
 const open = async (row: any) => {
     dialogVisible.value = true
     dialogTitle.value = row.name + '日趋势图'
-    dialogText.value = `监测点名称:${row.lineName}_越限时间:${row.time}_指标名称:${row.name}`
+    dialogText.value = `监测点名称:${row.lineName}　越限时间:${row.time}　指标名称:${row.name}`
     nextTick(() => {
         initData(row)
     })

src/components/cockpit/exceedanceLevel/index.vue

@@ -117,40 +117,24 @@ const tableStore: any = new TableStore({
             title: '越限程度(%)',
             field: 'extent',
             minWidth: '70',
-            render: 'customTemplate',
-            customTemplate: (row: any) => {
-                // 保留两个小数
-                const extentValue =
-                    row.extent !== null && row.extent !== undefined && row.extent !== ''
-                        ? Math.floor(row.extent * 100) / 100
-                        : '/'
-                return `<span>${extentValue}</span>`
+            formatter: (row: any) => {
+                return Math.floor(row.cellValue * 100) / 100 
             }
         },
         {
             title: '越限时间',
             field: 'time',
             minWidth: '60',
-            render: 'customTemplate',
-            customTemplate: (row: any) => {
-                if (row.time !== null && row.time !== undefined && row.time !== '') {
-                    return `<span>${row.time}</span>`
-                } else {
-                    return `<span>/</span>`
-                }
+            formatter: (row: any) => {
+                return row.cellValue || '/'
             }
         },
         {
             title: '越限最高监测点',
             field: 'lineName',
             minWidth: '90',
-            render: 'customTemplate',
-            customTemplate: (row: any) => {
-                if (row.lineName !== null && row.lineName !== undefined && row.lineName !== '') {
-                    return `<span>${row.lineName}</span>`
-                } else {
-                    return `<span>/</span>`
-                }
+            formatter: (row: any) => {
+                return row.cellValue || '/'
             }
         }
     ],
@@ -159,7 +143,7 @@ const tableStore: any = new TableStore({
     },
     loadCallback: () => {
         // 定义 x 轴标签顺序
-        const xAxisLabels = ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡']
+        const xAxisLabels = ['长时闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡']
 
         // 根据指标名称顺序提取对应的 extent 数据
         const chartData = xAxisLabels.map(label => {
@@ -208,6 +192,7 @@ provide('tableStore', tableStore)
 // 点击行
 const cellClickEvent = ({ row, column }: any) => {
     dialogTrendChart.value = true
+
     if (column.field == 'maxValue' && row.lineId) {
         nextTick(() => {
             dailyTrendChartRef.value.open(row)

src/components/cockpit/governanceReport/index.vue

@@ -3,9 +3,9 @@
         <!--治理效果报表 -->
         <TableHeader :showReset="false"  :timeKeyList="prop.timeKey" ref="TableHeaderRef" datePicker @selectChange="selectChange" v-if="fullscreen">
             <template v-slot:select>
-                <el-form-item label="报表模板">
-                    <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-form-item label="模板策略">
+                    <el-select filterable v-model="tableStore.table.params.tempId" placeholder="请选择模板策略" clearable>
+                        <el-option v-for="item in templateList" :key="item.id" :label="item.excelName" :value="item.id" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="监测对象">
@@ -34,10 +34,10 @@ import { ref, onMounted, provide, reactive, watch, h, computed, nextTick } from
 import TableStore from '@/utils/tableStore'
 import { exportExcel } from '@/views/govern/reportForms/export.js'
 import TableHeader from '@/components/table/header/index.vue'
-import { getTemplateList } from '@/api/harmonic-boot/luckyexcel'
+import { querySysExcel } from '@/api/harmonic-boot/luckyexcel'
 import { getListByIds } from '@/api/harmonic-boot/cockpit/cockpit'
 import { getTime } from '@/utils/formatTime'
-
+import { ElMessage } from 'element-plus'
 const prop = defineProps({
     w: { type: [String, Number] },
     h: { type: [String, Number] },
@@ -71,8 +71,8 @@ const initListByIds = () => {
 }
 
 const templateListData = () => {
-    getTemplateList({}).then(res => {
-        templateList.value = res.data.filter(item => item.name === '稳态治理报表')
+    querySysExcel({}).then(res => {
+        templateList.value = res.data.filter(item => item.excelType == 4)
         if (!tableStore.table.params.tempId && templateList.value?.length > 0) {
             tableStore.table.params.tempId = templateList.value[0].id
         }
@@ -118,12 +118,15 @@ const tableStore: any = new TableStore({
     column: [],
     beforeSearchFun: () => {
         setTime()
-        if (!tableStore.table.params.sensitiveUserId && idList.value?.length > 0) {
-            tableStore.table.params.sensitiveUserId = idList.value[0].id
-        }
-        if (!tableStore.table.params.tempId && templateList.value?.length > 0) {
-            tableStore.table.params.tempId = templateList.value[0].id
-        }
+        // if (!tableStore.table.params.sensitiveUserId && idList.value?.length > 0) {
+        //     tableStore.table.params.sensitiveUserId = idList.value[0].id
+        // }
+        // if (!tableStore.table.params.tempId && templateList.value?.length > 0) {
+        //     tableStore.table.params.tempId = templateList.value[0].id
+        // }
+        // if( !tableStore.table.params.tempId){
+        //     return ElMessage.warning('请选择模板')
+        // }
     },
     loadCallback: () => {
         luckysheet.create({

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

@@ -34,7 +34,7 @@
                     </el-form-item>
                     <el-form-item label="统计类型">
                         <el-select
-                            style="min-width: 120px !important"
+                            style="min-width: 90px !important"
                             placeholder="请选择"
                             v-model="searchForm.valueType"
                             filterable
@@ -42,7 +42,7 @@
                             <el-option value="max" label="最大值"></el-option>
                             <el-option value="min" label="最小值"></el-option>
                             <el-option value="avg" label="平均值"></el-option>
-                            <el-option value="cp95" label="cp95"></el-option>
+                            <el-option value="cp95" label="CP95"></el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item>
@@ -66,7 +66,7 @@
                                 <el-option
                                     v-for="vv in item.countOptions"
                                     :key="vv"
-                                    :label="vv"
+                                    :label="item.name.includes('间谐波') ? vv - 0.5 : vv"
                                     :value="vv"
                                 ></el-option>
                             </el-select>
@@ -82,11 +82,7 @@
             </TableHeader>
         </div>
         <div class="history_chart" :style="pageHeight" v-loading="loading">
-            <MyEchart
-                ref="historyChart"
-                :options="echartsData"
-                v-if="showEchart"
-            />
+            <MyEchart ref="historyChart" :options="echartsData" v-if="showEchart" />
             <el-empty :style="pageHeight" v-else description="暂无数据" />
         </div>
     </el-dialog>
@@ -160,28 +156,40 @@ const countOptions: any = ref([])
 const legendDictList: any = ref([])
 
 const initCode = (field: string, title: string) => {
-    queryByCode('steady_state_limit_trend').then(res => {
+    queryByCode('gridSide_exceedTheLimit').then(res => {
         queryCsDictTree(res.data.id).then(item => {
             //排序
             indexOptions.value = item.data.sort((a: any, b: any) => {
                 return a.sort - b.sort
             })
-            const titleMap: Record<string, number> = {
-                flickerOvertime: 0,
-                uaberranceOvertime: 3,
-                ubalanceOvertime: 4,
-                freqDevOvertime: 5
-            }
+            let codeKey = field.includes('flickerOvertime')
+                ? '闪变'
+                : field.includes('uharm')
+                ? '谐波电压'
+                : field.includes('iharm')
+                ? '谐波电流'
+                : field.includes('voltageDevOvertime')
+                ? '电压偏差'
+                : field.includes('ubalanceOvertime')
+                ? '不平衡'
+                : ''
 
-            let defaultIndex = 0 // 默认值
+            // const titleMap: Record<string, number> = {
+            //     flickerOvertime: 0,
+            //     uaberranceOvertime: 3,
+            //     ubalanceOvertime: 4,
+            //     freqDevOvertime: 5
+            // }
 
-            if (field in titleMap) {
-                defaultIndex = titleMap[field]
-            } else if (field.includes('uharm')) {
-                defaultIndex = 1
-            } else if (field.includes('iharm')) {
-                defaultIndex = 2
-            }
+            // let defaultIndex = 0 // 默认值
+            let defaultIndex = indexOptions.value.findIndex((item: any) => item.name.includes(codeKey)) || 0
+            // if (field in titleMap) {
+            //     defaultIndex = titleMap[field]
+            // } else if (field.includes('uharm')) {
+            //     defaultIndex = indexOptions.value.findIndex((item: any) => item.code === 'uharm')
+            // } else if (field.includes('iharm')) {
+            //     defaultIndex = indexOptions.value.findIndex((item: any) => item.code === 'iharm')
+            // }
 
             searchForm.value.index[0] = indexOptions.value[defaultIndex].id
         })
@@ -205,7 +213,7 @@ const initCode = (field: string, title: string) => {
                             if (kk.harmStart && kk.harmEnd) {
                                 range(0, 0, 0)
 
-                                if (kk.showName == '间谐波电压含有率') {
+                                if (kk.showName.includes('间谐波电压')) {
                                     countDataCopy.value[index].countOptions = range(kk.harmStart, kk.harmEnd, 1).map(
                                         (item: any) => {
                                             return item - 0.5
@@ -287,11 +295,12 @@ const init = async () => {
     let lists: any = []
     let frequencys: any = null
     countData.value.map((item: any, index: any) => {
-        if (item.name.includes('谐波含有率')) {
+        if (item.name.includes('谐波')) {
             frequencys = item.count
         } else {
             frequencys = ''
         }
+
         lists[index] = {
             statisticalId: item.index,
             frequency: frequencys !== null && frequencys !== undefined ? String(frequencys) : ''
@@ -600,12 +609,12 @@ const formatCountOptions = () => {
         })
 
         countData.value.map((item: any, key: any) => {
-            if (item.name == '谐波电流有效值') {
-                item.name = '谐波电流次数'
-            } else if (item.name == '谐波电压含有率') {
-                item.name = '谐波电压次数'
-            } else if (item.name == '间谐波电压含有率') {
+            if (item.name.includes('间谐波电压')) {
                 item.name = '间谐波电压次数'
+            } else if (item.name.includes('谐波电流')) {
+                item.name = '谐波电流次数'
+            } else if (item.name.includes('谐波电压')) {
+                item.name = '谐波电压次数'
             }
         })
     }

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

@@ -14,7 +14,7 @@
                             <el-option
                                 v-for="item in options"
                                 :key="item.lineId"
-                                :label="item.name"
+                                :label="item.lineName"
                                 :value="item.lineId"
                             />
                         </el-select>
@@ -85,7 +85,7 @@ const tableStore: any = new TableStore({
             width: '150'
         },
         {
-            title: '闪变越限(%)',
+            title: '长时闪变越限(%)',
             field: 'flickerOvertime',
             width: '90',
             render: 'customTemplate',
@@ -101,15 +101,6 @@ const tableStore: any = new TableStore({
             title: '谐波电流越限(%)',
             children: loop50('iharm')
         },
-        {
-            title: '三相不平衡度越限(%)',
-            field: 'ubalanceOvertime',
-            width: '100',
-            render: 'customTemplate',
-            customTemplate: (row: any) => {
-                return `<span style='cursor: pointer;text-decoration: underline;'>${row.ubalanceOvertime}</span>`
-            }
-        },
          {
             title: '电压偏差越限(%)',
             field: 'voltageDevOvertime',
@@ -120,14 +111,24 @@ const tableStore: any = new TableStore({
             }
         },
         {
-            title: '频率偏差越限(%)',
-            field: 'freqDevOvertime',
+            title: '三相不平衡度越限(%)',
+            field: 'ubalanceOvertime',
             width: '100',
             render: 'customTemplate',
             customTemplate: (row: any) => {
-                return `<span style='cursor: pointer;text-decoration: underline;'>${row.freqDevOvertime}</span>`
-            }
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.ubalanceOvertime}</span>`
             }
+        },
+
+        // {
+        //     title: '频率偏差越限(%)',
+        //     field: 'freqDevOvertime',
+        //     width: '100',
+        //     render: 'customTemplate',
+        //     customTemplate: (row: any) => {
+        //         return `<span style='cursor: pointer;text-decoration: underline;'>${row.freqDevOvertime}</span>`
+        //     }
+        // }
     ],
      beforeSearchFun: () => {
     },
@@ -139,16 +140,20 @@ const tableStore: any = new TableStore({
 provide('tableStore', tableStore)
 tableStore.table.params.sortBy = ''
 tableStore.table.params.orderBy = ''
-const open = async (row: any,searchBeginTime:any,searchEndTime:any) => {
+const open = async (row: any,searchBeginTime:any,searchEndTime:any,interval:any,list:any) => {
     dialogVisible.value = true
-    initCSlineList()
+     options.value = list
+    // initCSlineList()
     tableStore.table.params.lineId = row.lineId
 
     nextTick(() => {
+        tableHeaderRef.value.setInterval(interval)
+       setTimeout(() => {
             tableHeaderRef.value.setTimeInterval([searchBeginTime, searchEndTime])
         tableStore.table.params.searchBeginTime =searchBeginTime
         tableStore.table.params.searchEndTime = searchEndTime
         tableStore.index()
+       },100)
     })
 
 }

src/components/cockpit/gridSideStatistics/index.vue

@@ -5,7 +5,8 @@
             :showReset="false"
             ref="TableHeaderRef"
             @selectChange="selectChange"
-            datePicker  :timeKeyList="prop.timeKey"
+            datePicker
+            :timeKeyList="prop.timeKey"
             v-if="fullscreen"
         ></TableHeader>
         <my-echart
@@ -87,7 +88,7 @@ const initEcharts = () => {
 
             xAxis: {
                 // name: '(区域)',
-                data: ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡']
+                data: ['长时闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡']
             },
 
             yAxis: {
@@ -148,7 +149,7 @@ const tableStore: any = new TableStore({
             title: '越限占比(%)',
             children: [
                 {
-                    title: '闪变',
+                    title: '长时闪变',
                     field: 'flicker',
                     minWidth: '70',
                     render: 'customTemplate',
@@ -197,6 +198,7 @@ const tableStore: any = new TableStore({
     ],
     beforeSearchFun: () => {
         setTime()
+        tableStore.table.params.interval = TableHeaderRef.value?.datePickerRef?.interval || 3
     },
     loadCallback: () => {
         tableStore.table.height = `calc(${prop.height} - 80px)`
@@ -211,13 +213,13 @@ provide('tableStore', tableStore)
 
 // 点击行
 const cellClickEvent = ({ row, column }: any) => {
-    if (column.field != 'name') {
     OverLimitDetailsRef.value.open(
         row,
         tableStore.table.params.searchBeginTime || prop.timeValue?.[0],
-            tableStore.table.params.searchEndTime || prop.timeValue?.[1]
+        tableStore.table.params.searchEndTime || prop.timeValue?.[1],
+        tableStore.table.params.interval || prop.interval,
+         tableStore.table.data
     )
-    }
 }
 
 onMounted(() => {

src/components/cockpit/indicatorCrossingTime/index.vue

@@ -2,7 +2,14 @@
     <div>
         <!--指标越限时间分布
          -->
-        <TableHeader :showReset="false"  :timeKeyList="prop.timeKey" ref="TableHeaderRef" @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" filterable v-model="tableStore.table.params.lineId">
@@ -19,12 +26,21 @@
         <div v-loading="tableStore.table.loading">
             <my-echart
                 class="tall"
+                v-if="lineShow"
                 :options="echartList1"
                 :style="{
                     width: prop.width,
                     height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px)`
                 }"
             />
+            <el-empty
+                v-else
+                description="暂无监测点"
+                :style="{
+                    width: prop.width,
+                    height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px)`
+                }"
+            />
             <!-- <my-echart
                 class="mt10"
                 :options="echartList1"
@@ -61,7 +77,7 @@ const lineList = ref()
 const headerHeight = ref(57)
 
 const TableHeaderRef = ref()
-
+const lineShow = ref(true)
 const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
     headerHeight.value = height
 
@@ -92,6 +108,11 @@ const probabilityData = ref()
 
 const initLineList = async () => {
     cslineList({}).then(res => {
+        if (res.data.length == 0) {
+            lineShow.value = false
+            return (tableStore.table.loading = false)
+        }
+        lineShow.value = true
         lineList.value = res.data
         tableStore.table.params.lineId = lineList.value[0].lineId
         tableStore.index()
@@ -115,7 +136,7 @@ const initProbabilityData = () => {
         // 处理接口返回的数据，转换为图表所需格式
         if (res.data && Array.isArray(res.data)) {
             // 定义指标类型顺序
-            const indicatorOrder = ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相电压不平衡度', '频率偏差']
+            const indicatorOrder = ['长时闪变', '谐波电压', '谐波电流', '电压偏差', '三相电压不平衡度', '频率偏差']
             // 按照指定顺序排序数据
             const sortedData = [...res.data].sort((a, b) => {
                 return indicatorOrder.indexOf(a.indexName) - indicatorOrder.indexOf(b.indexName)
@@ -146,6 +167,9 @@ const initProbabilityData = () => {
             const yAxisData = sortedData.map(item => item.indexName)
 
             echartList.value = {
+                title: {
+                    text: '指标越限概率分布'
+                },
                 options: {
                     backgroundColor: '#fff',
                     tooltip: {
@@ -166,14 +190,7 @@ const initProbabilityData = () => {
                             return tips
                         }
                     },
-                    title: {
-                        text: '指标越限概率分布',
-                        x: 'center',
-                        textStyle: {
-                            fontSize: 16,
-                            fontWeight: 'normal'
-                        }
-                    },
+
                     // 移除或隐藏 visualMap 组件
                     visualMap: {
                         show: false, // 设置为 false 隐藏右侧颜色条

src/components/cockpit/indicatorDistribution/index.vue

@@ -1,7 +1,14 @@
 <template>
     <div>
         <!--指标越限概率分布 -->
-        <TableHeader :showReset="false"  :timeKeyList="prop.timeKey" ref="TableHeaderRef" @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" filterable v-model="tableStore.table.params.lineId">
@@ -17,6 +24,7 @@
         </TableHeader>
         <div v-loading="tableStore.table.loading">
             <my-echart
+                v-if="lineShow"
                 class="tall"
                 :options="echartList"
                 :style="{
@@ -24,6 +32,14 @@
                     height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px)`
                 }"
             />
+            <el-empty
+                v-else
+                description="暂无监测点"
+                :style="{
+                    width: prop.width,
+                    height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px)`
+                }"
+            />
             <!-- <my-echart
                 class="mt10"
                 :options="echartList1"
@@ -52,7 +68,7 @@ const prop = defineProps({
     timeValue: { type: Object },
     interval: { type: Number }
 })
-
+const lineShow = ref(true)
 // const options = ref(JSON.parse(window.localStorage.getItem('lineIdList') || '[]'))
 
 const lineList = ref()
@@ -91,6 +107,11 @@ const probabilityData = ref()
 
 const initLineList = async () => {
     cslineList({}).then(res => {
+        if (res.data.length == 0) {
+            lineShow.value = false
+            return (tableStore.table.loading = false)
+        }
+        lineShow.value = true
         lineList.value = res.data
         tableStore.table.params.lineId = lineList.value[0].lineId
         tableStore.index()
@@ -114,7 +135,7 @@ const initProbabilityData = () => {
         // 处理接口返回的数据，转换为图表所需格式
         if (res.data && Array.isArray(res.data)) {
             // 定义指标类型顺序
-            const indicatorOrder = ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相电压不平衡度', '频率偏差']
+            const indicatorOrder = ['长时闪变', '谐波电压', '谐波电流', '电压偏差', '三相电压不平衡度', '频率偏差']
             // 按照指定顺序排序数据
             const sortedData = [...res.data].sort((a, b) => {
                 return indicatorOrder.indexOf(a.indexName) - indicatorOrder.indexOf(b.indexName)
@@ -145,6 +166,9 @@ const initProbabilityData = () => {
             const yAxisData = sortedData.map(item => item.indexName)
 
             echartList.value = {
+                title: {
+                    text: '指标越限概率分布'
+                },
                 options: {
                     backgroundColor: '#fff',
                     tooltip: {
@@ -165,14 +189,7 @@ const initProbabilityData = () => {
                             return tips
                         }
                     },
-                    title: {
-                        text: '指标越限概率分布',
-                        x: 'center',
-                        textStyle: {
-                            fontSize: 16,
-                            fontWeight: 'normal'
-                        }
-                    },
+
                     // 移除或隐藏 visualMap 组件
                     visualMap: {
                         show: false, // 设置为 false 隐藏右侧颜色条

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

@@ -66,7 +66,7 @@
                                 <el-option
                                     v-for="vv in item.countOptions"
                                     :key="vv"
-                                    :label="vv"
+                                    :label="item.name.includes('间谐波') ? vv - 0.5 : vv"
                                     :value="vv"
                                 ></el-option>
                             </el-select>
@@ -82,11 +82,7 @@
             </TableHeader>
         </div>
         <div class="history_chart" :style="pageHeight" v-loading="loading">
-            <MyEchart
-                ref="historyChart"
-                :options="echartsData"
-                v-if="showEchart"
-            />
+            <MyEchart ref="historyChart" :options="echartsData" v-if="showEchart" />
             <el-empty :style="pageHeight" v-else description="暂无数据" />
         </div>
     </el-dialog>
@@ -160,28 +156,40 @@ const countOptions: any = ref([])
 const legendDictList: any = ref([])
 
 const initCode = (field: string, title: string) => {
-    queryByCode('steady_state_limit_trend').then(res => {
+    queryByCode('gridSide_exceedTheLimit').then(res => {
         queryCsDictTree(res.data.id).then(item => {
             //排序
             indexOptions.value = item.data.sort((a: any, b: any) => {
                 return a.sort - b.sort
             })
-            const titleMap: Record<string, number> = {
-                flickerOvertime: 0,
-                uaberranceOvertime: 3,
-                ubalanceOvertime: 4,
-                freqDevOvertime: 5
-            }
+            // const titleMap: Record<string, number> = {
+            //     flickerOvertime: 0,
+            //     uaberranceOvertime: 3,
+            //     ubalanceOvertime: 4,
+            //     freqDevOvertime: 5
+            // }
 
-            let defaultIndex = 0 // 默认值
+            // let defaultIndex = 0 // 默认值
 
-            if (field in titleMap) {
-                defaultIndex = titleMap[field]
-            } else if (field.includes('uharm')) {
-                defaultIndex = 1
-            } else if (field.includes('iharm')) {
-                defaultIndex = 2
-            }
+            // if (field in titleMap) {
+            //     defaultIndex = titleMap[field]
+            // } else if (field.includes('uharm')) {
+            //     defaultIndex = 1
+            // } else if (field.includes('iharm')) {
+            //     defaultIndex = 2
+            // }
+            let codeKey = field.includes('flickerOvertime')
+                ? '闪变'
+                : field.includes('uharm')
+                ? '谐波电压'
+                : field.includes('iharm')
+                ? '谐波电流'
+                : field.includes('voltageDevOvertime')
+                ? '电压偏差'
+                : field.includes('ubalanceOvertime')
+                ? '不平衡'
+                : ''
+            let defaultIndex = indexOptions.value.findIndex((item: any) => item.name.includes(codeKey)) || 0
 
             searchForm.value.index[0] = indexOptions.value[defaultIndex].id
         })
@@ -579,7 +587,6 @@ const setTimeControl = () => {
 }
 
 const selectChange = (flag: boolean, height: any) => {
-  
     pageHeight.value = mainHeight(height * 1.6, 1.6)
 }
 //导出

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

@@ -14,7 +14,7 @@
                             <el-option
                                 v-for="item in options"
                                 :key="item.lineId"
-                                :label="item.name"
+                                :label="item.lineName"
                                 :value="item.lineId"
                             />
                         </el-select>
@@ -24,11 +24,7 @@
             <Table ref="tableRef" @cell-click="cellClickEvent" isGroup :height="height"></Table>
         </el-dialog>
         <!-- 谐波电流、谐波电压占有率 -->
-        <HarmonicRatio‌
-            ref="harmonicRatio‌Ref"
-            @close="onHarmonicRatioClose"
-            v-if="dialogFlag"
-        />
+        <HarmonicRatio‌ ref="harmonicRatio‌Ref" @close="onHarmonicRatioClose" v-if="dialogFlag" />
     </div>
 </template>
 <script setup lang="ts">
@@ -90,7 +86,7 @@ const tableStore: any = new TableStore({
             width: '150'
         },
         {
-            title: '闪变越限(分钟)',
+            title: '越限(分钟)',
             field: 'flickerOvertime',
             width: '90',
             render: 'customTemplate',
@@ -105,6 +101,14 @@ const tableStore: any = new TableStore({
         {
             title: '谐波电流越限(分钟)',
             children: loop50('iharm')
+        },    {
+            title: '电压偏差越限(分钟)',
+            field: 'uaberranceOvertime',
+            width: '100',
+            render: 'customTemplate',
+            customTemplate: (row: any) => {
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.uaberranceOvertime}</span>`
+            }
         },
         {
             title: '三相不平衡度越限(分钟)',
@@ -115,24 +119,16 @@ const tableStore: any = new TableStore({
                 return `<span style='cursor: pointer;text-decoration: underline;'>${row.ubalanceOvertime}</span>`
             }
         },
-        {
-            title: '电压偏差越限(分钟)',
-            field: 'uaberranceOvertime',
-            width: '100',
-            render: 'customTemplate',
-            customTemplate: (row: any) => {
-                return `<span style='cursor: pointer;text-decoration: underline;'>${row.uaberranceOvertime}</span>`
-            }
-        },
-        {
-            title: '频率偏差越限(分钟)',
-            field: 'freqDevOvertime',
-            width: '100',
-            render: 'customTemplate',
-            customTemplate: (row: any) => {
-                return `<span style='cursor: pointer;text-decoration: underline;'>${row.freqDevOvertime}</span>`
-            }
-        }
+
+        // {
+        //     title: '频率偏差越限(分钟)',
+        //     field: 'freqDevOvertime',
+        //     width: '100',
+        //     render: 'customTemplate',
+        //     customTemplate: (row: any) => {
+        //         return `<span style='cursor: pointer;text-decoration: underline;'>${row.freqDevOvertime}</span>`
+        //     }
+        // }
     ],
      beforeSearchFun: () => {
     },
@@ -144,9 +140,10 @@ const tableStore: any = new TableStore({
 provide('tableStore', tableStore)
 tableStore.table.params.sortBy = ''
 tableStore.table.params.orderBy = ''
-const open = async (row: any,searchBeginTime:any,searchEndTime:any) => {
+const open = async (row: any,searchBeginTime:any,searchEndTime:any,data:any=[]) => {
     dialogVisible.value = true
-    initCSlineList()
+    // initCSlineList()
+    options.value = data
     tableStore.table.params.lineId = row.lineId
 
     nextTick(() => {
@@ -180,8 +177,8 @@ const onHarmonicRatioClose = () => {
 }
 
 const initCSlineList = async () => {
-    const res = await cslineList({})
-    options.value = res.data
+    // const res = await cslineList({})
+    // options.value = res.data
 }
 
 

src/components/cockpit/indicatorFittingChart/index.vue

@@ -1,10 +1,17 @@
 <template>
     <div>
         <!--主要监测点列表 -->
-        <TableHeader :showReset="false"  :timeKeyList="prop.timeKey" @selectChange="selectChange" v-if="fullscreen" datePicker ref="TableHeaderRef">
+        <TableHeader
+            :showReset="false"
+            :timeKeyList="prop.timeKey"
+            @selectChange="selectChange"
+            v-if="fullscreen"
+            
+            ref="TableHeaderRef"
+        >
             <template v-slot:select>
-                <el-form-item label="关键词">
-                    <el-input v-model="tableStore.table.params.keywords" clearable placeholder="请输关键字" />
+                <el-form-item label="关键字筛选">
+                    <el-input v-model="tableStore.table.params.keywords" clearable placeholder="请输入监测点名称" />
                 </el-form-item>
             </template>
         </TableHeader>
@@ -22,7 +29,7 @@ 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 { getTime } from '@/utils/formatTime'
+import { getTimeOfTheMonth } from '@/utils/formatTime'
 import OverLimitDetails from '@/components/cockpit/indicatorFittingChart/components/overLimitDetails.vue'
 import { useRoute } from 'vue-router'
 import { useTimeCacheStore } from '@/stores/timeCache'
@@ -59,11 +66,11 @@ const fullscreen = computed(() => {
 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]
-    }
+    // if (datePickerValue && datePickerValue.timeValue) {
+    //     // 更新时间参数
+    //     tableStore.table.params.searchBeginTime = datePickerValue.timeValue[0]
+    //     tableStore.table.params.searchEndTime = datePickerValue.timeValue[1]
+    // }
 }
 
 const tableStore: any = new TableStore({
@@ -93,12 +100,18 @@ const tableStore: any = new TableStore({
         {
             title: '监测对象类型',
             field: 'objType',
-            minWidth: '90'
+            minWidth: '90',
+            formatter: (row: any) => {
+                return row.cellValue || '/'
+            }
         },
         {
             title: '是否治理',
             field: 'govern',
-            minWidth: '70'
+            minWidth: '80',
+            formatter: (row: any) => {
+                return row.cellValue || '/'
+            }
         },
 
         { title: '主要存在的电能质量问题', field: 'problems', minWidth: '150', showOverflow: true }
@@ -119,31 +132,34 @@ provide('tableStore', tableStore)
 // 点击行
 const cellClickEvent = ({ row, column }: any) => {
     if (column.field == 'lineName') {
+       
+        let  time = getTimeOfTheMonth('3');
         OverLimitDetailsRef.value.open(
             row,
-            tableStore.table.params.searchBeginTime || prop.timeValue?.[0],
-            tableStore.table.params.searchEndTime || prop.timeValue?.[1]
+           time[0],
+            time[1],
+            tableStore.table.data
         )
     }
 }
 
 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
-    )
+    // 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 不是一个有效数组')
-    }
+    // 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

src/components/cockpit/listOfMainMonitoringPoints/components/overLimitDetails copy.vue

@@ -69,7 +69,7 @@ const tableStore: any = new TableStore({
             width: '150'
         },
         {
-            title: '闪变越限(分钟)',
+            title: '长时闪变越限(分钟)',
             field: 'flicker',
             width: '80'
         },
@@ -99,26 +99,7 @@ const tableStore: any = new TableStore({
     ],
     beforeSearchFun: () => {},
     loadCallback: () => {
-        tableStore.table.data = [
-            {
-                time: '2024-01-01 00:00:00',
-                name: '35kV进线',
-                flicker: '0',
        
-            },
-            {
-                time: '2024-01-01 00:00:00',
-                name: '35kV进线',
-                flicker: '0',
-              
-            },
-            {
-                time: '2024-01-01 00:00:00',
-                name: '35kV进线',
-                flicker: '0',
-              
-            },
-        ]
     }
 })
 

src/components/cockpit/listOfMainMonitoringPoints/components/overLimitDetails.vue

@@ -84,7 +84,7 @@ const tableStore: any = new TableStore({
             width: '150'
         },
         {
-            title: '闪变越限(分钟)',
+            title: '长时闪变越限(分钟)',
             field: 'flicker',
             width: '80',
             render: 'customTemplate',

src/components/cockpit/listOfMainMonitoringPoints/index.vue

@@ -75,12 +75,21 @@
         <div v-loading="tableStore.table.loading">
             <my-echart
                 class="tall"
+                v-if="lineShow"
                 :options="echartList"
                 :style="{
                     width: prop.width,
                     height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px )`
                 }"
             />
+            <el-empty
+                v-else
+                description="暂无监测点"
+                :style="{
+                    width: prop.width,
+                    height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px)`
+                }"
+            />
         </div>
     </div>
 </template>
@@ -114,7 +123,7 @@ const lineList: any = ref()
 const powerList: any = ref()
 
 const chartsList = ref<any>([])
-
+const lineShow = ref(true)
 // 计算是否全屏展示
 const fullscreen = computed(() => {
     const w = Number(prop.w)
@@ -141,8 +150,14 @@ const indicatorList = ref()
 
 const initLineList = async () => {
     cslineList({}).then(res => {
+        if (res.data.length == 0) {
+            lineShow.value = false
+            return (tableStore.table.loading = false)
+        }
+        lineShow.value = true
         lineList.value = res.data
         tableStore.table.params.lineId = lineList.value[0].lineId
+        initCode()
     })
 }
 
@@ -171,7 +186,7 @@ const setEchart = () => {
         tooltip: {
             trigger: 'axis',
             formatter: function (params: any) {
-                let result = params[0].name
+                let result = params[0].axisValueLabel
                 params.forEach((item: any) => {
                     if (item.seriesName === indicatorName) {
                         // 对于电能质量指标，格式化Y轴值显示
@@ -186,7 +201,7 @@ const setEchart = () => {
                         result += `<br/>${item.marker}${item.seriesName}: ${valueText}`
                     } else {
                         // 对于功率数据，正常显示数值
-                        result += `<br/>${item.marker}${item.seriesName}: ${item.value[1]}`
+                        result += `<br/>${item.marker}${item.seriesName}: ${item.value[1]} ${item.value[2]}`
                     }
                 })
                 return result
@@ -277,7 +292,8 @@ const setEchart = () => {
                 item.time,
                 item.statisticalData !== null && item.statisticalData !== undefined
                     ? parseFloat(item.statisticalData.toFixed(2))
-                    : null
+                    : null,
+                item.unit
             ]
         })
 
@@ -287,7 +303,8 @@ const setEchart = () => {
                 item.time,
                 item.statisticalData !== null && item.statisticalData !== undefined
                     ? parseFloat(item.statisticalData.toFixed(2))
-                    : null
+                    : null,
+                item.unit
             ]
         })
 
@@ -432,10 +449,8 @@ watch(
     }
 )
 
-onMounted(() => {
-    initLineList().then(() => {
-        initCode()
-    })
+onMounted(async () => {
+    await initLineList()
 })
 
 watch(

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

@@ -14,7 +14,7 @@
                             <el-option
                                 v-for="item in options"
                                 :key="item.lineId"
-                                :label="item.name"
+                                :label="item.lineName"
                                 :value="item.lineId"
                             />
                         </el-select>
@@ -34,7 +34,7 @@ import TableHeader from '@/components/table/header/index.vue'
 import TableStore from '@/utils/tableStore'
 import { mainHeight } from '@/utils/layout'
 import HarmonicRatio‌ from '@/components/cockpit/gridSideStatistics/components/harmonicRatio‌.vue'
-import { cslineList } from '@/api/harmonic-boot/cockpit/cockpit'
+import { cslineList ,governLineList} from '@/api/harmonic-boot/cockpit/cockpit'
 
 const dialogVisible: any = ref(false)
 const harmonicRatio‌Ref: any = ref(null)
@@ -85,7 +85,7 @@ const tableStore: any = new TableStore({
             width: '150'
         },
         {
-            title: '闪变越限(%)',
+            title: '长时闪变越限(%)',
             field: 'flickerOvertime',
             width: '90',
             render: 'customTemplate',
@@ -101,15 +101,6 @@ const tableStore: any = new TableStore({
             title: '谐波电流越限(%)',
             children: loop50('iharm')
         },
-        {
-            title: '三相不平衡度越限(%)',
-            field: 'ubalanceOvertime',
-            width: '100',
-            render: 'customTemplate',
-            customTemplate: (row: any) => {
-                return `<span style='cursor: pointer;text-decoration: underline;'>${row.ubalanceOvertime}</span>`
-            }
-        },
              {
             title: '电压偏差越限(%)',
             field: 'voltageDevOvertime',
@@ -120,14 +111,24 @@ const tableStore: any = new TableStore({
             }
         },
         {
-            title: '频率偏差越限(%)',
-            field: 'freqDevOvertime',
+            title: '三相不平衡度越限(%)',
+            field: 'ubalanceOvertime',
             width: '100',
             render: 'customTemplate',
             customTemplate: (row: any) => {
-                return `<span style='cursor: pointer;text-decoration: underline;'>${row.freqDevOvertime}</span>`
-            }
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.ubalanceOvertime}</span>`
             }
+        },
+
+        // {
+        //     title: '频率偏差越限(%)',
+        //     field: 'freqDevOvertime',
+        //     width: '100',
+        //     render: 'customTemplate',
+        //     customTemplate: (row: any) => {
+        //         return `<span style='cursor: pointer;text-decoration: underline;'>${row.freqDevOvertime}</span>`
+        //     }
+        // }
     ],
      beforeSearchFun: () => {
     },
@@ -139,8 +140,10 @@ const tableStore: any = new TableStore({
 provide('tableStore', tableStore)
 tableStore.table.params.sortBy = ''
 tableStore.table.params.orderBy = ''
+const time:any=ref([])
 const open = async (row: any,searchBeginTime:any,searchEndTime:any) => {
     dialogVisible.value = true
+    time.value=[searchBeginTime,searchEndTime]
     initCSlineList()
     tableStore.table.params.lineId = row.lineId
 
@@ -175,8 +178,19 @@ const onHarmonicRatioClose = () => {
 }
 
 const initCSlineList = async () => {
-    const res = await cslineList({})
-    options.value = res.data
+    // const res = await cslineList({})
+    const res = await governLineList({
+        endTime:time.value[1],
+keywords:"",
+pageNum:1,
+pageSize:10000,
+searchBeginTime:time.value[0],
+searchEndTime:time.value[1],
+startTime:time.value[0],
+timeFlag:1
+    })
+    options.value = res.data.records
+
 }
 
 

src/components/cockpit/monitoringPointList/index.vue

@@ -5,8 +5,9 @@
             ref="TableHeaderRef"
             :showReset="false"
             @selectChange="selectChange"
-            datePicker
-            v-if="fullscreen"  :timeKeyList="prop.timeKey"
+            
+            v-if="fullscreen"
+            :timeKeyList="prop.timeKey"
         ></TableHeader>
         <Table
             ref="tableRef"
@@ -17,27 +18,35 @@
         <OverLimitDetails ref="OverLimitDetailsRef" />
 
         <!-- 上传对话框 -->
-        <el-dialog v-model="uploadDialogVisible" title="上传报告" width="500px" @closed="handleDialogClosed">
+        <el-dialog
+            v-model="uploadDialogVisible"
+            title="上传报告"
+            append-to-body
+            width="500px"
+            @closed="handleDialogClosed"
+        >
             <el-upload
                 ref="uploadRef"
                 class="upload-demo"
-                :auto-upload="true"
+                action=""
+                accept=".doc,.docx,.PDF"
                 :on-change="handleChange"
                 :before-upload="beforeUpload"
-                :http-request="handleUpload"
                 :limit="1"
+                :auto-upload="false"
                 :on-exceed="handleExceed"
+                :on-remove="handleRemove"
                 :file-list="fileList"
             >
                 <el-button type="primary">点击上传</el-button>
                 <template #tip>
-                    <div class="el-upload__tip">只能上传Word或PDF文件，且不超过10MB</div>
+                    <div class="el-upload__tip">请上传Word或PDF文件</div>
                 </template>
             </el-upload>
             <template #footer>
                 <span class="dialog-footer">
                     <el-button @click="uploadDialogVisible = false">取消</el-button>
-                    <el-button type="primary" @click="uploadDialogVisible = false">确定</el-button>
+                    <el-button type="primary" @click="handleUpload">确定</el-button>
                 </span>
             </template>
         </el-dialog>
@@ -77,11 +86,11 @@ const fileList = 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]
-    }
+    // if (datePickerValue && datePickerValue.timeValue) {
+    //     // 更新时间参数
+    //     tableStore.table.params.searchBeginTime = datePickerValue.timeValue[0]
+    //     tableStore.table.params.searchEndTime = datePickerValue.timeValue[1]
+    // }
 }
 
 // 计算是否全屏展示
@@ -120,31 +129,76 @@ const tableStore: any = new TableStore({
                 return `<span style='cursor: pointer;text-decoration: underline;'>${row.lineName}</span>`
             }
         },
-        { title: '监测类型', field: 'position', minWidth: '80' },
+        {
+            title: '监测类型',
+            field: 'position',
+            minWidth: '80',
+            formatter: (row: any) => {
+                return row.cellValue || '/'
+            }
+        },
+        // {
+        //     title: '监测点状态',
+        //     field: 'runStatus',
+        //     minWidth: '90',
+        //     render: 'customTemplate',
+        //     customTemplate: (row: any) => {
+        //         return `<span style='color: ${row.runStatus === '中断' ? '#FF0000' : ''}'>${row.runStatus==null?'/':row.runStatus}</span>`
+        //     }
+        // },
         {
             title: '监测点状态',
             field: 'runStatus',
-            minWidth: '90',
-            render: 'customTemplate',
-            customTemplate: (row: any) => {
-                return `<span style='color: ${row.runStatus === '中断' ? '#FF0000' : ''}'>${row.runStatus}</span>`
+            render: 'tag',
+
+            width: 100,
+            custom: {
+                停运: 'danger',
+                退运: 'danger',
+                运行: 'success',
+                在线: 'success',
+                中断: 'warning',
+                离线: 'danger',
+                检修: 'warning',
+                调试: 'warning',
+                null: 'info'
+            },
+            replaceValue: {
+                运行: '运行',
+                在线: '在线',
+                退运: '退运',
+                停运: '停运',
+                中断: '中断',
+                检修: '检修',
+                离线: '离线',
+                调试: '调试',
+                null: '/'
             }
         },
         {
             title: '治理对象',
             field: 'sensitiveUser',
-            minWidth: '90'
+            minWidth: '90',
+            formatter: (row: any) => {
+                return row.cellValue || '/'
+            }
         },
 
         {
             title: '电压等级',
             field: 'volGrade',
-            minWidth: '80'
+            minWidth: '80',
+            formatter: (row: any) => {
+                return row.cellValue==0?'/': row.cellValue+'kV' || '/'
+            }
         },
         {
             title: '是否治理',
             field: 'govern',
-            minWidth: '80'
+            minWidth: '80',
+            formatter: (row: any) => {
+                return row.cellValue || '/'
+            }
         },
 
         {
@@ -160,10 +214,30 @@ const tableStore: any = new TableStore({
                 }
             }
         },
+        // {
+        //     title: '报告',
+        //     field: 'reportFilePath',
+        //     minWidth: '120',
+        //     render: 'customTemplate',
+        //     customTemplate: (row: any) => {
+        //         return row.reportFilePath == null
+        //             ? '/'
+        //             : `<span style='cursor: pointer;text-decoration: underline;'>${row.reportFilePath
+        //                   .split('/')
+        //                   .pop()}</span>`
+        //     }
+        // },
         {
-            title: '操作',
-            minWidth: 80,
-            // fixed: 'right',
+            title: '报告',
+            field: 'reportFilePath',
+            minWidth: '120',
+            formatter: (row: any) => {
+                return row.cellValue == null ? '/' : row.cellValue.split('/').pop()
+            }
+        },
+        {
+            title: '操作', fixed: 'right',
+            width: 150,
             render: 'buttons',
             buttons: [
                 {
@@ -187,7 +261,7 @@ const tableStore: any = new TableStore({
                     icon: 'el-icon-EditPen',
                     render: 'basicButton',
                     click: row => {
-                        downloadTheReport(row.lineId)
+                        downloadTheReport(row.lineId, row.reportFilePath)
                     },
                     disabled: row => {
                         return row.reportFilePath == null || row.reportFilePath.length == 0
@@ -223,22 +297,22 @@ 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
-    )
+    // 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 不是一个有效数组')
-    }
+    // 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 不是一个有效数组')
+    // }
 }
 
 // 点击行
@@ -253,16 +327,43 @@ const cellClickEvent = ({ row, column }: any) => {
 }
 
 // 下载报告
-const downloadTheReport = (lineId: string) => {
+const downloadTheReport = (lineId: string, name: string) => {
     getReportUrl({ lineId: lineId }).then((res: any) => {
-        const link = document.createElement('a')
-        link.href = res.data
-        link.download = '治理报告'
-        document.body.appendChild(link)
-        link.click()
-        document.body.removeChild(link)
+        forceDownloadPdf(res.data, name.split('/').pop() || '')
     })
 }
+const forceDownloadPdf = async (pdfUrl, fileName = '文件.pdf') => {
+    try {
+        // 1. 请求 PDF 并转为 Blob（关键：绕开浏览器直接解析）
+        const response = await fetch(pdfUrl, {
+            method: 'GET'
+            // 若需要鉴权，添加请求头（如 token）
+        })
+
+        // 校验响应是否成功
+        if (!response.ok) throw new Error(`请求失败：${response.status}`)
+
+        // 2. 将响应转为 Blob（指定类型为 PDF，确保兼容性）
+        const blob = await response.blob()
+        const pdfBlob = new Blob([blob], { type: 'application/pdf' })
+
+        // 3. 创建临时 URL 并触发下载
+        const blobUrl = URL.createObjectURL(pdfBlob)
+        const a = document.createElement('a')
+        a.href = blobUrl
+        a.download = fileName // 此时 Blob URL 是同源的，download 必生效
+        a.style.display = 'none'
+        document.body.appendChild(a)
+        a.click() // 触发下载
+
+        // 4. 清理资源（避免内存泄漏）
+        document.body.removeChild(a)
+        URL.revokeObjectURL(blobUrl)
+    } catch (error) {
+        console.error('PDF 下载失败：', error)
+        // ElMessage.error('文件下载失败，请检查网络或文件地址') // 适配 Element Plus
+    }
+}
 
 // 上传报告
 const uploadReportRow = (row: any) => {
@@ -279,14 +380,18 @@ const handleDialogClosed = () => {
 }
 
 // 处理文件超出限制
-const handleExceed = (files: any, fileList: any) => {
+const handleExceed = (files: any) => {
     ElMessage.warning('只能上传一个文件，请先删除已选择的文件')
 }
+const handleRemove = (files: any) => {
+    fileList.value = []
+}
 
 // 文件变更处理函数
-const handleChange = (file: any, fileList: any) => {
+const handleChange = (file: any) => {
     // 在这里直接处理文件上传逻辑
-    beforeUpload(file.raw) // 注意使用 file.raw 获取原始文件对象
+    // beforeUpload(file.raw) // 注意使用 file.raw 获取原始文件对象
+    fileList.value = [file] // 只保留最新选择的文件
 }
 
 // 处理上传前检查
@@ -303,11 +408,7 @@ const beforeUpload = (file: any) => {
     const isLt10M = file.size / 1024 / 1024 < 10
 
     if (!isValidType) {
-        ElMessage.error('上传文件只能是 Word 文档(.doc/.docx) 或 PDF 文件(.pdf)!')
-        return false
-    }
-    if (!isLt10M) {
-        ElMessage.error('上传文件大小不能超过 10MB!')
+        ElMessage.error('请上传(.doc/.docx/.pdf)格式文件!')
         return false
     }
 
@@ -315,10 +416,11 @@ const beforeUpload = (file: any) => {
     return true
 }
 
-const handleUpload = async (options: any) => {
-    const { file } = options
+const handleUpload = async () => {
+    // return
+
     const formData = new FormData()
-    formData.append('file', file)
+    formData.append('file', fileList.value[0]?.raw)
     formData.append('lineId', currentUploadRow.value?.lineId || currentUploadRow.value?.id || '')
 
     try {

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

@@ -66,7 +66,7 @@
                                 <el-option
                                     v-for="vv in item.countOptions"
                                     :key="vv"
-                                    :label="vv"
+                                    :label="item.name.includes('间谐波') ? vv - 0.5 : vv"
                                     :value="vv"
                                 ></el-option>
                             </el-select>
@@ -82,11 +82,7 @@
             </TableHeader>
         </div>
         <div class="history_chart" :style="pageHeight" v-loading="loading">
-            <MyEchart
-                ref="historyChart"
-                :options="echartsData"
-                v-if="showEchart"
-            />
+            <MyEchart ref="historyChart" :options="echartsData" v-if="showEchart" />
             <el-empty :style="pageHeight" v-else description="暂无数据" />
         </div>
     </el-dialog>
@@ -160,28 +156,40 @@ const countOptions: any = ref([])
 const legendDictList: any = ref([])
 
 const initCode = (field: string, title: string) => {
-    queryByCode('steady_state_limit_trend').then(res => {
+    queryByCode('gridSide_exceedTheLimit').then(res => {
         queryCsDictTree(res.data.id).then(item => {
             //排序
             indexOptions.value = item.data.sort((a: any, b: any) => {
                 return a.sort - b.sort
             })
-            const titleMap: Record<string, number> = {
-                flickerOvertime: 0,
-                uaberranceOvertime: 3,
-                ubalanceOvertime: 4,
-                freqDevOvertime: 5
-            }
+            // const titleMap: Record<string, number> = {
+            //     flickerOvertime: 0,
+            //     uaberranceOvertime: 3,
+            //     ubalanceOvertime: 4,
+            //     freqDevOvertime: 5
+            // }
 
-            let defaultIndex = 0 // 默认值
+            // let defaultIndex = 0 // 默认值
 
-            if (field in titleMap) {
-                defaultIndex = titleMap[field]
-            } else if (field.includes('uharm')) {
-                defaultIndex = 1
-            } else if (field.includes('iharm')) {
-                defaultIndex = 2
-            }
+            // if (field in titleMap) {
+            //     defaultIndex = titleMap[field]
+            // } else if (field.includes('uharm')) {
+            //     defaultIndex = 1
+            // } else if (field.includes('iharm')) {
+            //     defaultIndex = 2
+            // }
+            let codeKey = field.includes('flickerOvertime')
+                ? '闪变'
+                : field.includes('uharm')
+                ? '谐波电压'
+                : field.includes('iharm')
+                ? '谐波电流'
+                : field.includes('voltageDevOvertime')
+                ? '电压偏差'
+                : field.includes('ubalanceOvertime')
+                ? '不平衡'
+                : ''
+            let defaultIndex = indexOptions.value.findIndex((item: any) => item.name.includes(codeKey)) || 0
 
             searchForm.value.index[0] = indexOptions.value[defaultIndex].id
         })
@@ -205,7 +213,7 @@ const initCode = (field: string, title: string) => {
                             if (kk.harmStart && kk.harmEnd) {
                                 range(0, 0, 0)
 
-                                if (kk.showName == '间谐波电压含有率') {
+                                if (kk.showName.includes('间谐波电压')) {
                                     countDataCopy.value[index].countOptions = range(kk.harmStart, kk.harmEnd, 1).map(
                                         (item: any) => {
                                             return item - 0.5
@@ -600,12 +608,12 @@ const formatCountOptions = () => {
         })
 
         countData.value.map((item: any, key: any) => {
-            if (item.name == '谐波电流有效值') {
-                item.name = '谐波电流次数'
-            } else if (item.name == '谐波电压含有率') {
-                item.name = '谐波电压次数'
-            } else if (item.name == '间谐波电压含有率') {
+            if (item.name.includes('间谐波电压')) {
                 item.name = '间谐波电压次数'
+            } else if (item.name.includes('谐波电流')) {
+                item.name = '谐波电流次数'
+            } else if (item.name.includes('谐波电压')) {
+                item.name = '谐波电压次数'
             }
         })
     }

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

@@ -14,7 +14,7 @@
                             <el-option
                                 v-for="item in options"
                                 :key="item.lineId"
-                                :label="item.name"
+                                :label="item.lineName"
                                 :value="item.lineId"
                             />
                         </el-select>
@@ -85,7 +85,7 @@ const tableStore: any = new TableStore({
             width: '150'
         },
         {
-            title: '闪变越限(%)',
+            title: '长时闪变越限(%)',
             field: 'flickerOvertime',
             width: '90',
             render: 'customTemplate',
@@ -101,15 +101,6 @@ const tableStore: any = new TableStore({
             title: '谐波电流越限(%)',
             children: loop50('iharm')
         },
-        {
-            title: '三相不平衡度越限(%)',
-            field: 'ubalanceOvertime',
-            width: '100',
-            render: 'customTemplate',
-            customTemplate: (row: any) => {
-                return `<span style='cursor: pointer;text-decoration: underline;'>${row.ubalanceOvertime}</span>`
-            }
-        },
          {
             title: '电压偏差越限(%)',
             field: 'voltageDevOvertime',
@@ -120,14 +111,24 @@ const tableStore: any = new TableStore({
             }
         },
         {
-            title: '频率偏差越限(%)',
-            field: 'freqDevOvertime',
+            title: '三相不平衡度越限(%)',
+            field: 'ubalanceOvertime',
             width: '100',
             render: 'customTemplate',
             customTemplate: (row: any) => {
-                return `<span style='cursor: pointer;text-decoration: underline;'>${row.freqDevOvertime}</span>`
-            }
+                return `<span style='cursor: pointer;text-decoration: underline;'>${row.ubalanceOvertime}</span>`
             }
+        },
+       
+        // {
+        //     title: '频率偏差越限(%)',
+        //     field: 'freqDevOvertime',
+        //     width: '100',
+        //     render: 'customTemplate',
+        //     customTemplate: (row: any) => {
+        //         return `<span style='cursor: pointer;text-decoration: underline;'>${row.freqDevOvertime}</span>`
+        //     }
+        // }
     ],
      beforeSearchFun: () => {
     },
@@ -139,9 +140,10 @@ const tableStore: any = new TableStore({
 provide('tableStore', tableStore)
 tableStore.table.params.sortBy = ''
 tableStore.table.params.orderBy = ''
-const open = async (row: any,searchBeginTime:any,searchEndTime:any) => {
+const open = async (row: any,searchBeginTime:any,searchEndTime:any,data: any) => {
     dialogVisible.value = true
-    initCSlineList()
+    // initCSlineList()
+     options.value = data
     tableStore.table.params.lineId = row.lineId
 
     nextTick(() => {

src/components/cockpit/overLimitStatistics/index.vue

@@ -89,7 +89,7 @@ const initEcharts = () => {
 
             xAxis: {
                 // name: '(区域)',
-                data: ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡']
+                data: ['长时闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡']
             },
 
             yAxis: {
@@ -150,7 +150,7 @@ const tableStore: any = new TableStore({
             title: '越限占比(%)',
             children: [
                 {
-                    title: '闪变',
+                    title: '长时闪变',
                     field: 'flicker',
                     minWidth: '70',
                     render: 'customTemplate',
@@ -217,7 +217,8 @@ const cellClickEvent = ({ row, column }: any) => {
         OverLimitDetailsRef.value.open(
             row,
             tableStore.table.params.searchBeginTime || prop.timeValue?.[0],
-            tableStore.table.params.searchEndTime || prop.timeValue?.[1]
+            tableStore.table.params.searchEndTime || prop.timeValue?.[1],
+             tableStore.table.data
         )
     }
 }

src/components/cockpit/sensitiveLoad/index.vue

@@ -5,8 +5,9 @@
             ref="TableHeaderRef"
             :showReset="false"
             @selectChange="selectChange"
-            datePicker
-            v-if="fullscreen"  :timeKeyList="prop.timeKey"
+            
+            v-if="fullscreen"
+            :timeKeyList="prop.timeKey"
         ></TableHeader>
         <Table
             ref="tableRef"
@@ -44,11 +45,11 @@ const sensitiveUserType = dictData.getBasicData('Interference_Source')
 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]
-    }
+    // if (datePickerValue && datePickerValue.timeValue) {
+    //     // 更新时间参数
+    //     tableStore.table.params.searchBeginTime = datePickerValue.timeValue[0]
+    //     tableStore.table.params.searchEndTime = datePickerValue.timeValue[1]
+    // }
 }
 
 // 计算是否全屏展示
@@ -94,12 +95,18 @@ const tableStore: any = new TableStore({
         {
             title: '是否监测',
             field: 'isMonitor',
-            minWidth: '80'
+            minWidth: '80',
+            formatter: (row: any) => {
+                return row.cellValue || '/'
+            }
         },
         {
             title: '是否治理',
             field: 'isGovern',
-            minWidth: '80'
+            minWidth: '80',
+            formatter: (row: any) => {
+                return row.cellValue || '/'
+            }
         }
     ],
     beforeSearchFun: () => {
@@ -123,22 +130,22 @@ 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
-    )
+    // 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 不是一个有效数组')
-    }
+    // 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(() => {

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

@@ -166,8 +166,8 @@ const tableStore: any = new TableStore({
                                     //     ...row,
                                     //     duration: row.persistTime // 将 persistTime 值赋给 duration
                                     // }
-                                    boxoList.value.featureAmplitude =
-                                        row.evtParamVVaDepth != '-' ? row.evtParamVVaDepth - 0 : null
+                                    boxoList.value.featureAmplitude = (row.amplitude - 0) / 100
+                                    // row.evtParamVVaDepth != '-' ? row.evtParamVVaDepth - 0 : null
                                     boxoList.value.systemType = 'YPT'
                                     wp.value = res.data
                                 }

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

@@ -166,8 +166,9 @@ const tableStore: any = new TableStore({
                                     //     ...row,
                                     //     duration: row.persistTime // 将 persistTime 值赋给 duration
                                     // }
-                                    boxoList.value.featureAmplitude =
-                                        row.evtParamVVaDepth != '-' ? row.evtParamVVaDepth - 0 : null
+                                    // boxoList.value.featureAmplitude =
+                                    //     row.evtParamVVaDepth != '-' ? row.evtParamVVaDepth - 0 : null
+                                    boxoList.value.featureAmplitude = (row.amplitude - 0) / 100
                                     boxoList.value.systemType = 'YPT'
                                     wp.value = res.data
                                 }

src/components/cockpit/trendComparison/index.vue

@@ -81,6 +81,7 @@
                 height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px)`
             }"
         />
+        <!-- <el-empty description="暂无数据" /> -->
     </div>
 </template>
 <script setup lang="ts">
@@ -92,7 +93,8 @@ import { useConfig } from '@/stores/config'
 import { queryByCode, queryCsDictTree } from '@/api/system-boot/dictTree'
 import { getListByIds } from '@/api/harmonic-boot/cockpit/cockpit'
 import { getTime } from '@/utils/formatTime'
-
+import { yMethod, exportCSV } from '@/utils/echartMethod'
+import { max } from 'lodash'
 const prop = defineProps({
     w: { type: [String, Number] },
     h: { type: [String, Number] },
@@ -127,14 +129,16 @@ const echartList = ref()
 const headerHeight = ref(57)
 
 // 监测对象
-const idList = ref()
+const idList = ref([])
 
 // 监测对象
 const initListByIds = () => {
     getListByIds({}).then((res: any) => {
-        if (res.data.length > 0) {
+        if (res.data?.length > 0) {
             idList.value = res.data
             initCode()
+        } else {
+            tableStore.index()
         }
     })
 }
@@ -179,7 +183,7 @@ const setEchart = () => {
         if (!beforeGroupedByPhase[phase]) {
             beforeGroupedByPhase[phase] = []
         }
-        beforeGroupedByPhase[phase].push([item.time, item.statisticalData])
+        beforeGroupedByPhase[phase].push([item.time, item.statisticalData, item.unit, 'solid'])
     })
 
     // 处理治理后数据
@@ -188,7 +192,7 @@ const setEchart = () => {
         if (!afterGroupedByPhase[phase]) {
             afterGroupedByPhase[phase] = []
         }
-        afterGroupedByPhase[phase].push([item.time, item.statisticalData])
+        afterGroupedByPhase[phase].push([item.time, item.statisticalData, item.unit, 'dotted'])
     })
 
     // 构建系列数据
@@ -259,6 +263,11 @@ const setEchart = () => {
         titleText = afterData[0].anotherName
     }
 
+    // statisticalData
+    //  chartsListBefore.value.map((item: any) => item.statisticalData)
+    //         chartsListAfter.value = tableStore.table.data.after
+
+
     // 构建图例数据
     const legendData = series.map((item: any, index: number) => {
         let color = config.layout.elementUiPrimary[0]
@@ -288,11 +297,45 @@ const setEchart = () => {
             }
         }
     })
-
+        let [min, max] = yMethod(
+        [...chartsListBefore.value.map((item: any) => item.statisticalData),
+        ...chartsListAfter.value.map((item: any) => item.statisticalData)]
+    )
     echartList.value = {
         title: {
             text: titleText
         },
+        tooltip: {
+            axisPointer: {
+                type: 'cross',
+                label: {
+                    color: '#fff',
+                    fontSize: 16
+                }
+            },
+            textStyle: {
+                color: '#fff',
+                fontStyle: 'normal',
+                opacity: 0.35,
+                fontSize: 14
+            },
+            backgroundColor: 'rgba(0,0,0,0.55)',
+            borderWidth: 0,
+            formatter(params: any) {
+                const xname = params[0].value[0]
+                let str = `${xname}<br>`
+                params.forEach((el: any, index: any) => {
+                    let marker = ''
+
+                    marker = `<span style="display:inline-block;border: 2px ${el.color} ${el.value[3]};margin-right:5px;width:40px;height:0px;background-color:#ffffff00;"></span>`
+
+                    str += `${marker}${el.seriesName.split('(')[0]}：${
+                        el.value[1] != null ? el.value[1] + ' ' + (el.value[2] == null ? '' : el.value[2]) : '-'
+                    }<br>`
+                })
+                return str
+            }
+        },
         legend: {
             data: legendData,
             icon: 'rect',
@@ -316,7 +359,9 @@ const setEchart = () => {
             }
         },
         yAxis: {
-            name: beforeData.length > 0 ? beforeData[0].unit : afterData.length > 0 ? afterData[0].unit : ''
+            name: beforeData.length > 0 ? beforeData[0].unit : afterData.length > 0 ? afterData[0].unit : '',
+            max: max,
+            min: min,
         },
         grid: {
             left: '10px',
@@ -368,8 +413,8 @@ const tableStore: any = new TableStore({
     }
 })
 
-tableStore.table.params.indicator = '1'
-tableStore.table.params.exceedingTheLimit = '1'
+tableStore.table.params.indicator = ''
+tableStore.table.params.exceedingTheLimit = ''
 tableStore.table.params.dataLevel = 'Primary'
 tableStore.table.params.valueType = 'avg'
 provide('tableStore', tableStore)
@@ -405,7 +450,7 @@ const shouldShowHarmonicCount = () => {
 
     return (
         currentIndicator &&
-        (currentIndicator.name.includes('电压谐波含有率') || currentIndicator.name.includes('电流谐波含有率'))
+        (currentIndicator.name.includes('幅值') || currentIndicator.name.includes('含有率'))
     )
 }
 
@@ -414,9 +459,9 @@ const getHarmonicTypeName = () => {
     const currentIndicator = indicatorList.value.find((item: any) => item.id === tableStore.table.params.indicator)
 
     if (currentIndicator) {
-        if (currentIndicator.name.includes('电压谐波含有率')) {
+        if (currentIndicator.name.includes('电压')) {
             return '电压'
-        } else if (currentIndicator.name.includes('电流谐波含有率')) {
+        } else if (currentIndicator.name.includes('电流')) {
             return '电流'
         }
     }

src/components/echarts/rmsWorker.js

@@ -266,8 +266,6 @@ self.onmessage = function (e) {
         } else if (boxoList.systemType == 'ZL') {
             titles =
                 (boxoList.engineeringName == undefined ? '' : ' 项目名称:' + boxoList.engineeringName) +
-                '　项目名称:' +
-                boxoList.engineeringName +
                 '　监测点名称:' +
                 boxoList.equipmentName +
                 '　发生时刻:' +
@@ -280,8 +278,6 @@ self.onmessage = function (e) {
         } else if (boxoList.systemType == 'YPT') {
             titles =
                 (boxoList.engineeringName == undefined ? '' : ' 项目名称:' + boxoList.engineeringName) +
-                '　项目名称:' +
-                boxoList.engineeringName +
                 '　监测点名称:' +
                 boxoList.lineName +
                 '　发生时刻:' +
@@ -293,15 +289,15 @@ self.onmessage = function (e) {
                 's'
         } else {
             titles =
-                '变电站名称:' +
+                '　变电站名称:' +
                 boxoList.subName +
-                ' 监测点名称:' +
+                '　监测点名称:' +
                 boxoList.lineName +
-                ' 发生时刻:' +
+                '　发生时刻:' +
                 boxoList.startTime +
-                ' 暂降(骤升)幅值:' +
+                '　暂降(骤升)幅值:' +
                 (boxoList.featureAmplitude * 100).toFixed(2) +
-                '% 持续时间:' +
+                '%　持续时间:' +
                 boxoList.duration +
                 's'
         }

src/components/echarts/rmsboxi.vue

@@ -1,8 +1,8 @@
 <template>
     <div v-loading="loading" style="position: relative; height: 100%">
         <div id="boxr">
-            <div id="rmsp" :style="`height:${vh};overflow: hidden;`">
-                <div class="bx" id="rms"></div>
+            <div id="rmsp" :style="`height:${vh};overflow: hidden;min-height: 200px;`">
+                <div class="bx" id="rms" style="min-height: 200px"></div>
             </div>
         </div>
     </div>
@@ -594,10 +594,10 @@ const initWave = (
         for (let step = waveDatas.length - 1; step > 0 && step < waveDatas.length; step--) {
             const rmsId = 'rms' + step
             const newDivRms = $(
-                `<div style="height:${vh.value};overflow: hidden;"><div class='bx' id='${rmsId}'></div></div>`
+                `<div style="height:${vh.value};overflow: hidden;min-height: 200px;"><div class='bx' id='${rmsId}'></div></div>`
             )
             newDivRms.insertAfter($('#rmsp'))
-            $(`#${rmsId}`).css('height', picHeight).css('width', vw.value)
+            $(`#${rmsId}`).css('height', picHeight).css('width', vw.value).css('min-height', '200px')
         }
     } else {
         titleText = `变电站名称：${subName.value} 监测点名称：${lineName.value} 发生时刻：${time} 暂降(骤升)幅值：${(
@@ -749,7 +749,7 @@ const initWave = (
                 y: -10
             },
             max: rmscm[0]?.[1] * 1.06 || 0,
-            min: rmscu[0]?.[1] - rmscu[0]?.[1] * 0.04 || 0,
+            min: rmscu[0]?.[1] - rmscu[0]?.[1] * 0.2 || 0,
             boundaryGap: [0, '100%'],
             showLastLabel: true,
             opposite: false,
@@ -768,7 +768,7 @@ const initWave = (
                 fontSize: '12px',
                 color: props.DColor ? '#000' : echartsColor.WordColor,
                 formatter: function (value: number) {
-                    return (value - 0).toFixed(2)
+                    return Math.floor(value * 1000) / 1000
                 }
             },
             splitLine: {
@@ -1092,7 +1092,8 @@ const drawPics = (
                 fontSize: '12px',
                 color: props.DColor ? '#000' : echartsColor.WordColor,
                 formatter: function (value: number) {
-                    return (value - 0).toFixed(2)
+                    // return (value - 0).toFixed(2)
+                    return Math.floor(value * 1000) / 1000
                 }
             },
             splitLine: {

src/components/echarts/shuWorker.js

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

src/components/echarts/shushiboxi.vue

@@ -1,8 +1,8 @@
 <template>
     <div v-loading="loading" class="boxbx" style="position: relative; height: 100%">
         <div id="boxsj">
-            <div id="shushi" :style="`height:${vh};overflow: hidden;`">
-                <div class="bx" id="wave"></div>
+            <div id="shushi" :style="`height:${vh};overflow: hidden;min-height: 200px;`">
+                <div class="bx" id="wave" style="min-height: 200px"></div>
             </div>
         </div>
     </div>
@@ -327,11 +327,11 @@ const initWave = (
 
         for (let step = waveDatas.length - 1; step > 0 && step < waveDatas.length; step--) {
             const waveId = 'wave' + step
-            const newDivShunshi = $(`<div style="height:${vh.value};overflow: hidden;">
+            const newDivShunshi = $(`<div style="height:${vh.value};overflow: hidden;min-height: 200px;">
         <div class='bx1' id='${waveId}'></div>
       </div>`)
             newDivShunshi.insertAfter($('#shushi'))
-            $(`#${waveId}`).css('height', picHeight).css('width', vw.value)
+            $(`#${waveId}`).css('height', picHeight).css('width', vw.value).css('min-height', '200px')
         }
     } else {
         titleText = `变电站名称：${subName.value} 监测点名称：${lineName.value} 发生时刻：${time} 暂降(骤升)幅值：${(
@@ -499,7 +499,8 @@ const initWave = (
                 fontSize: '12px',
                 color: props.DColor ? '#000' : echartsColor.WordColor,
                 formatter: function (value: number) {
-                    return (value - 0).toFixed(2)
+                    // return (value - 0).toFixed(2)
+                    return Math.floor(value * 1000) / 1000
                 }
             },
             splitLine: {
@@ -591,7 +592,7 @@ const initWave = (
 
 const drawPics = (
     waveDataTemp: WaveData,
-    picHeight: string,
+    picHeight: any,
     step: number,
     show: boolean,
     myChartes1: echarts.ECharts,
@@ -806,7 +807,8 @@ const drawPics = (
                 fontSize: '12px',
                 color: props.DColor ? '#000' : echartsColor.WordColor,
                 formatter: function (value: number) {
-                    return (value - 0).toFixed(2)
+                    // return (value - 0).toFixed(2)
+                    return Math.floor(value * 1000) / 1000
                 }
             },
             splitLine: {

src/components/table/fieldRender/index.vue

@@ -21,8 +21,8 @@
         <el-image
             :hide-on-click-modal="true"
             :preview-teleported="true"
-            :preview-src-list="[fieldValue]"
-            :src="fieldValue.length > 100 ? fieldValue : getUrl(fieldValue)"
+            :preview-src-list="[imgList[fieldValue]]"
+            :src="fieldValue.length > 100 ? fieldValue : getUrl(fieldValue) ? imgList[fieldValue] : ''"
         ></el-image>
     </div>
 
@@ -226,10 +226,12 @@ const handlerCommand = (item: OptButton) => {
             break
     }
 }
+const imgList: any = ref({})
 const getUrl = (url: string) => {
     getFileUrl({ filePath: url }).then(res => {
-        return res.data
+        imgList.value[url] = res.data
     })
+    return true
 }
 </script>
 

src/components/table/header/index.vue

@@ -2,7 +2,7 @@
     <div ref="tableHeader" class="cn-table-header">
         <div class="table-header ba-scroll-style" :key="num">
             <el-form
-                style="flex: 1; height: 34px; margin-right: 20px; display: flex; flex-wrap: wrap"
+                style="flex: 1; height: 34px; margin-right: 0px; display: flex; flex-wrap: wrap"
                 ref="headerForm"
                 @submit.prevent=""
                 @keyup.enter="onComSearch"
@@ -29,12 +29,27 @@
                     <Icon size="14" name="el-icon-ArrowUp" style="color: #fff" v-if="showSelect" />
                     <Icon size="14" name="el-icon-ArrowDown" style="color: #fff" v-else />
                 </el-button>
-                <el-button @click="onComSearch" v-if="showSearch" type="primary" :icon="Search">查询</el-button>
-                <el-button @click="onResetForm" v-if="showSearch && showReset" :icon="RefreshLeft">重置</el-button>
+                <el-button
+                    @click="onComSearch"
+                    v-if="showSearch"
+                    :loading="tableStore.table.loading"
+                    type="primary"
+                    :icon="Search"
+                >
+                    查询
+                </el-button>
+                <el-button
+                    @click="onResetForm"
+                    v-if="showSearch && showReset"
+                    :loading="tableStore.table.loading"
+                    :icon="RefreshLeft"
+                >
+                    重置
+                </el-button>
                 <el-button
                     @click="onExport"
                     v-if="showExport"
-                    :loading="tableStore.table.loading"
+                    :loading="tableStore.table.exportLoading"
                     type="primary"
                     icon="el-icon-Download"
                 >

src/components/tree/allocation.vue

@@ -1,6 +1,6 @@
 <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">
+        <div class="mt10 mr10" style="display: flex; justify-content: end">
             <el-button type="primary" icon="el-icon-Select" @click="save" :loading="loading">保存</el-button>
         </div>
         <Icon
@@ -39,7 +39,7 @@
             </div>
 
             <el-tree
-                :style="{ height: 'calc(100vh - 235px)' }"
+                :style="{ height: 'calc(100vh - 267px)' }"
                 style="overflow: auto"
                 ref="treeRef"
                 :props="defaultProps"
@@ -183,5 +183,7 @@ defineExpose({ treeRef, loading })
 .custom-tree-node {
     display: flex;
     align-items: center;
+   
+
 }
 </style>

src/components/tree/device.vue

@@ -110,7 +110,7 @@
                         </template>
                     </el-tree>
                 </el-collapse-item>
-                <el-collapse-item title="在线设备" name="2" v-if="frontDeviceData.length != 0">
+                <el-collapse-item title="监测设备" name="2" v-if="frontDeviceData.length != 0">
                     <el-tree
                         :style="{
                             height:
@@ -202,7 +202,7 @@ watch(
                     item.children.map((vv: any) => {
                         bxsDeviceData.value.push(vv)
                     })
-                } else if (item.name == '在线设备') {
+                } else if (item.name == '监测设备') {
                     frontDeviceData.value = []
 
                     item.children.map((vv: any) => {
@@ -300,7 +300,6 @@ const chooseNode = (value: string, data: any, node: any) => {
 }
 
 const changeDevice = (val: any) => {
-    console.log('changeDevice', val)
     let arr1: any = []
 
     //zlDeviceData
@@ -331,22 +330,30 @@ const changeDevice = (val: any) => {
         arr2.map((item: any) => {
             item.checked = false
         })
-        treeRef1.value && treeRef1.value.setCurrentKey(arr1[0]?.id)
+
         emit('changeDeviceType', activeName.value, arr1[0])
+        setTimeout(() => {
+            treeRef1.value?.setCurrentKey(arr1[0]?.id)
+        }, 100)
     }
     if (val == '1') {
         arr1.map((item: any) => {
             item.checked = false
         })
-        treeRef2.value && treeRef2.value.setCurrentKey(arr2[0]?.id)
         emit('changeDeviceType', activeName.value, arr2[0])
+        setTimeout(() => {
+            treeRef2.value?.setCurrentKey(arr2[0]?.id)
+        }, 100)
     }
     if (val == '2') {
         arr3.map((item: any) => {
             item.checked = false
         })
-        treeRef3.value && treeRef3.value.setCurrentKey(arr3[0]?.id)
+
         emit('changeDeviceType', activeName.value, arr3[0])
+        setTimeout(() => {
+            treeRef3.value?.setCurrentKey(arr3[0]?.id)
+        }, 100)
     }
 }
 //治理

src/components/tree/govern/cloudDeviceEntryTree.vue

@@ -7,7 +7,7 @@ import { ref, nextTick, onMounted, defineProps } from 'vue'
 import Tree from '../index.vue'
 import { getLineTree,getCldTree } from '@/api/cs-device-boot/csLedger'
 import { useConfig } from '@/stores/config'
-import { getTemplateByDept } from '@/api/harmonic-boot/luckyexcel'
+import { querySysExcel } from '@/api/harmonic-boot/luckyexcel'
 import { useDictData } from '@/stores/dictData'
 
 interface Props {
@@ -39,8 +39,8 @@ const info = (selectedNodeId?: string) => {
             let rootData = null;
             if (Array.isArray(res.data)) {
                 // 旧的数据结构 - 数组
-                rootData = res.data.find((item: any) => item.name == '在线设备');
-            } else if (res.data && res.data.name == '在线设备') {
+                rootData = res.data.find((item: any) => item.name == '监测设备');
+            } else if (res.data && res.data.name == '监测设备') {
                 // 新的数据结构 - 单个对象
                 rootData = res.data;
             }
@@ -158,7 +158,7 @@ const onAdd = () => {
     emit('onAdd')
 }
 if (props.template) {
-    getTemplateByDept({ id: dictData.state.area[0]?.id })
+    querySysExcel({ id: dictData.state.area[0]?.id })
         .then((res: any) => {
             emit('Policy', res.data)
             info()

src/components/tree/govern/cloudDeviceEntryTreeZL.vue

@@ -15,7 +15,7 @@ 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 { querySysExcel } from '@/api/harmonic-boot/luckyexcel'
 import { useDictData } from '@/stores/dictData'
 
 interface Props {
@@ -85,7 +85,7 @@ const onAdd = () => {
     emit('onAdd')
 }
 if (props.template) {
-    getTemplateByDept({ id: dictData.state.area[0]?.id })
+    querySysExcel({ id: dictData.state.area[0]?.id })
         .then((res: any) => {
             emit('Policy', res.data)
             info()

src/components/tree/govern/csLedgerLineTree.vue

@@ -0,0 +1,179 @@
+<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,lineTree } from '@/api/cs-device-boot/csLedger'
+import { useConfig } from '@/stores/config'
+import { querySysExcel } 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[] = []
+    lineTree().then(res => {
+        try {
+            // 检查响应数据结构
+            let rootData = null;
+            if (Array.isArray(res.data)) {
+                // 旧的数据结构 - 数组
+                rootData = res.data.find((item: any) => item.name == '监测设备');
+            } else if (res.data && res.data.name == '监测设备') {
+                // 新的数据结构 - 单个对象
+                rootData = res.data;
+            }
+
+            // 治理设备
+            if (rootData) {
+                rootData.icon = 'el-icon-Menu'
+                rootData.level = 0
+                rootData.color = config.getColorVal('elementUiPrimary')
+                // 确保根节点的 children 是数组
+                if (!Array.isArray(rootData.children)) {
+                    rootData.children = []
+                }
+                rootData.children.forEach((item: any) => {
+                    item.icon = 'el-icon-HomeFilled'
+                    item.level = 1
+                    item.color = config.getColorVal('elementUiPrimary')
+                    // 确保 children 是数组
+                    if (!Array.isArray(item.children)) {
+                        item.children = []
+                    }
+                    item.children.forEach((item2: any) => {
+                        item2.icon = 'el-icon-List'
+                        item2.level = 2
+                        item2.color = config.getColorVal('elementUiPrimary')
+                        
+                        // 确保 children 是数组
+                        if (!Array.isArray(item2.children)) {
+                            item2.children = []
+                        }
+                        item2.children.forEach((item3: any) => {
+                            item3.icon = 'el-icon-Platform'
+                            item3.level = 3
+                            item3.color =
+                                item3.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
+                                
+                            // 确保 children 是数组
+                            if (!Array.isArray(item3.children)) {
+                                item3.children = []
+                            }
+                            
+                            item3.children.forEach((item4: any) => {
+                                item4.icon = 'el-icon-Platform'
+                                item4.level = 4
+                                item4.color =
+                                    item4.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
+                                arr1.push(item4)
+                            })
+                        })
+                    })
+                })
+                tree.value = [rootData] // 确保 tree.value 是数组
+            } else {
+                tree.value = []
+            }
+            nextTick(() => {
+              
+                if (arr1.length) {
+                    // 安全检查 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.treeRef.setCurrentKey(selectedNodeId);
+                            // 查找对应的节点数据并触发事件
+                            let selectedNode = null;
+                            const findNode = (nodes: any[]) => {
+                                for (const node of nodes) {
+                                    if (node.id === selectedNodeId) {
+                                        selectedNode = node;
+                                        return true;
+                                    }
+                                    if (node.children && findNode(node.children)) {
+                                        return true;
+                                    }
+                                }
+                                return false;
+                            };
+                            
+                            findNode(tree.value);
+                            
+                            if (selectedNode) {
+                                emit('init', {
+                                    level: selectedNode.level,
+                                    ...selectedNode
+                                });
+                            }
+                        } else {
+                            // 初始化选中第一个节点
+                            treRef.value.treeRef.setCurrentKey(arr1[0].id);
+                            emit('init', {
+                                level: 2,
+                                ...arr1[0]
+                            });
+                        }
+                    }
+                } else {
+                  
+                }
+            })
+        } 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) {
+    querySysExcel({ 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

@@ -11,10 +11,11 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, nextTick, defineEmits } from 'vue'
+import { ref, nextTick } from 'vue'
 import Tree from '../device.vue'
 import { getDeviceTree } from '@/api/cs-device-boot/csLedger'
 import { useConfig } from '@/stores/config'
+import { throttle } from 'lodash'
 defineOptions({
     name: 'govern/deviceTree'
 })
@@ -27,7 +28,7 @@ const props = withDefaults(
     {
         showCheckbox: false,
         defaultCheckedKeys: [],
-        height:0
+        height: 0
     }
 )
 const emit = defineEmits(['init', 'checkChange', 'deviceTypeChange'])
@@ -35,7 +36,6 @@ const config = useConfig()
 const tree = ref()
 const treRef = ref()
 const changeDeviceType = (val: any, obj: any) => {
-    console.log('🚀 ~ changeDeviceType ~ val:', val, obj)
     emit('deviceTypeChange', val, obj)
 }
 getDeviceTree().then(res => {
@@ -52,6 +52,7 @@ getDeviceTree().then(res => {
                     item2.icon = 'el-icon-List'
                     item2.color = config.getColorVal('elementUiPrimary')
                     item2.children.forEach((item3: any) => {
+                        item3.pName = '治理设备'
                         item3.icon = 'el-icon-Platform'
                         item3.level = 2
                         item3.color = config.getColorVal('elementUiPrimary')
@@ -68,14 +69,15 @@ getDeviceTree().then(res => {
                 item.color = config.getColorVal('elementUiPrimary')
                 item.color = '#e26257 !important'
                 item.color = item.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
-
+                // item.disabled =true
+                item.pName = '便携式设备'
                 if (item.type == 'device') {
                     arr2.push(item)
                 }
                 item.children.forEach((item2: any) => {
                     item2.icon = 'el-icon-Platform'
                     item2.color = item2.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
-
+                    item2.pName = '便携式设备'
                     // item2.children.forEach((item3: any) => {
                     //     item3.icon = 'el-icon-Platform'
                     //     item3.color = config.getColorVal('elementUiPrimary')
@@ -86,7 +88,7 @@ getDeviceTree().then(res => {
                     // })
                 })
             })
-        } else if (item.name == '在线设备') {
+        } else if (item.name == '监测设备') {
             item.children.forEach((item: any) => {
                 item.icon = 'el-icon-HomeFilled'
                 item.color = config.getColorVal('elementUiPrimary')
@@ -94,6 +96,7 @@ getDeviceTree().then(res => {
                     item2.icon = 'el-icon-List'
                     item2.color = config.getColorVal('elementUiPrimary')
                     item2.children.forEach((item3: any) => {
+                        item3.pName = '监测设备'
                         item3.icon = 'el-icon-Platform'
                         item3.color = config.getColorVal('elementUiPrimary')
                         if (item3.comFlag === 1) {
@@ -105,7 +108,6 @@ getDeviceTree().then(res => {
             })
         }
     })
-    console.log('🚀 ~ file: deviceTree.vue ~ line 18 ~ getDeviceTree ~ tree:', arr, arr2, arr3)
     tree.value = res.data
 
     nextTick(() => {
@@ -143,6 +145,22 @@ getDeviceTree().then(res => {
         }, 500)
     })
 })
+
+throttle(
+    (data: any, checked: any, indeterminate: any) => {
+        emit('checkChange', {
+            data,
+            checked,
+            indeterminate
+        })
+    },
+    300,
+    {
+        leading: true, // 首次触发立即执行（可选，默认 true）
+        trailing: false // 节流结束后是否执行最后一次（可选，默认 true，根据需求调整）
+    }
+)
+
 const handleCheckChange = (data: any, checked: any, indeterminate: any) => {
     emit('checkChange', {
         data,
@@ -150,4 +168,7 @@ const handleCheckChange = (data: any, checked: any, indeterminate: any) => {
         indeterminate
     })
 }
+defineExpose({
+    treRef
+})
 </script>

src/components/tree/govern/pointTree.vue

@@ -7,7 +7,7 @@ import { ref, nextTick, onMounted, defineProps } from 'vue'
 import Tree from '../point.vue'
 import { getLineTree } from '@/api/cs-device-boot/csLedger'
 import { useConfig } from '@/stores/config'
-import { getTemplateByDept } from '@/api/harmonic-boot/luckyexcel'
+import { querySysExcel } from '@/api/harmonic-boot/luckyexcel'
 import { useDictData } from '@/stores/dictData'
 // const props = defineProps(['template'])
 interface Props {
@@ -71,7 +71,7 @@ const info = () => {
                         arr2.push(item2)
                     })
                 })
-            } else if (item.name == '在线设备') {
+            } else if (item.name == '监测设备') {
                 item.children.forEach((item: any) => {
                     item.icon = 'el-icon-HomeFilled'
                     item.level = 1
@@ -138,7 +138,7 @@ const changePointType = (val: any, obj: any) => {
     emit('pointTypeChange', val, obj)
 }
 if (props.template) {
-    getTemplateByDept({ id: dictData.state.area[0]?.id })
+    querySysExcel({ id: dictData.state.area[0]?.id })
         .then((res: any) => {
             emit('Policy', res.data)
             info()

src/components/tree/govern/pointTreeWx.vue

@@ -53,7 +53,7 @@ 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 { querySysExcel } from '@/api/harmonic-boot/luckyexcel'
 import { useDictData } from '@/stores/dictData'
 defineOptions({
     name: 'govern/schemeTree'
@@ -157,7 +157,7 @@ const clickNode = (e: anyObj) => {
 }
 
 if (props.template) {
-    getTemplateByDept({ id: dictData.state.area[0]?.id })
+    querySysExcel({ id: dictData.state.area[0]?.id })
         .then((res: any) => {
             emit('Policy', res.data)
             getTreeList()

src/components/tree/govern/selectTree.vue

@@ -33,7 +33,7 @@ const info = () => {
     getLineTree().then(res => {
         //治理设备
         res.data.map((item: any) => {
-           if (item.name == '在线设备') {
+           if (item.name == '监测设备') {
                 item.children.forEach((item: any) => {
                     item.icon = 'el-icon-HomeFilled'
                     item.level = 1
@@ -59,7 +59,7 @@ const info = () => {
                 })
             }
         })
-        tree.value = res.data.filter(item => item.name == '在线设备')
+        tree.value = res.data.filter(item => item.name == '监测设备')
         nextTick(() => {
             if (arr3.length) {
                 //初始化选中

src/components/tree/point.vue

@@ -93,7 +93,7 @@
                         </template>
                     </el-tree>
                 </el-collapse-item>
-                <el-collapse-item title="在线设备" name="2" v-if="yqfDeviceData.length != 0">
+                <el-collapse-item title="监测设备" name="2" v-if="yqfDeviceData.length != 0">
                     <el-tree
                         :style="{ height: zlDeviceData.length != 0 ? 'calc(100vh - 340px)' : 'calc(100vh - 238px)' }"
                         ref="treeRef3"
@@ -162,7 +162,7 @@ const zlDeviceData = ref<any>([])
 const zlDevList = ref<any>([])
 //便携式设备数据
 const bxsDeviceData = ref<any>([])
-//在线设备数据
+//监测设备数据
 const yqfDeviceData = ref<any>([])
 watch(
     () => props.data,
@@ -180,7 +180,7 @@ watch(
                     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)
@@ -251,22 +251,28 @@ const changeDevice = (val: any) => {
         arr2.map((item: any) => {
             item.checked = false
         })
-        treeRef1?.value && treeRef1.value.setCurrentKey(arr1[0]?.id)
         emit('changePointType', activeName.value, arr1[0])
+        setTimeout(() => {
+            treeRef1.value?.setCurrentKey(arr1[0]?.id)
+        }, 100)
     }
     if (val == '1') {
         arr1.map((item: any) => {
             item.checked = false
         })
-        treeRef2?.value && treeRef2.value.setCurrentKey(arr2[0]?.id)
         emit('changePointType', activeName.value, arr2[0])
+        setTimeout(() => {
+            treeRef2.value?.setCurrentKey(arr2[0]?.id)
+        }, 100)
     }
     if (val == '2') {
         arr3.map((item: any) => {
             item.checked = false
         })
-        treeRef3?.value && treeRef3.value.setCurrentKey(arr3[0]?.id)
         emit('changePointType', activeName.value, arr3[0])
+        setTimeout(() => {
+            treeRef3.value?.setCurrentKey(arr3[0]?.id)
+        }, 100)
     }
     // if(activeName.value){
     //    emit('changePointType', activeName.value)

src/components/tree/select.vue

@@ -218,11 +218,12 @@ const updateNodeCheckStatus = (currentCount: number) => {
     const allNodes = treeRef.value.store._getAllNodes()
     allNodes.forEach((node: any) => {
         if (node.level === 3) { // 监测点层级
+            
             // 如果已达到最大数量且该节点未被选中，则禁用勾选
-            if (isMaxSelected && !node.checked) {
-                node.disabled = true
+            if (isMaxSelected && !node.data.checked) {
+                node.data.disabled = true
             } else {
-                node.disabled = false
+                node.data.disabled = false
             }
         }
     })

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

@@ -214,8 +214,8 @@ onMounted(() => {
     overflow-x: auto;
     overflow-y: hidden;
     margin-right: var(--ba-main-space);
-    scrollbar-width: none;
-
+    // scrollbar-width: none;
+// overflow-x: auto;
     &::-webkit-scrollbar {
         height: 5px;
     }

src/layouts/admin/components/navMenus.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="nav-menus" :class="configStore.layout.layoutMode">
-        <div @click="savePng" class="nav-menu-item">
+        <!-- <div @click="savePng" class="nav-menu-item">
             <Icon
                 :color="configStore.getColorVal('headerBarTabColor')"
                 class="nav-menu-icon"
@@ -23,7 +23,7 @@
                 name="fa-solid fa-expand"
                 size="18"
             />
-        </div>
+        </div> -->
 
         <el-dropdown style="height: 100%" @command="handleCommand">
             <div class="admin-info" :class="state.currentNavMenu == 'adminInfo' ? 'hover' : ''">
@@ -47,7 +47,8 @@
                 name="fa fa-cogs"
                 size="18"
             />
-        </div> -->"
+        </div> -->
+        "
 
         <Config />
         <PopupPwd ref="popupPwd" />
@@ -71,7 +72,6 @@ import PopupPwd from './popup/password.vue'
 import AdminInfo from './popup/adminInfo.vue'
 import { useNavTabs } from '@/stores/navTabs'
 
-
 const adminInfo = useAdminInfo()
 const navTabs = useNavTabs()
 const configStore = useConfig()
@@ -106,7 +106,7 @@ const onFullScreen = () => {
     })
 }
 
-const handleCommand = (key: string) => {
+const handleCommand = async (key: string) => {
     // console.log(key)
     switch (key) {
         case 'adminInfo':
@@ -116,10 +116,13 @@ const handleCommand = (key: string) => {
             popupPwd.value.open()
             break
         case 'layout':
+            await window.location.reload()
+            setTimeout(() => {
                 navTabs.closeTabs()
                 window.localStorage.clear()
                 adminInfo.reset()
                 router.push({ name: 'login' })
+            }, 0)
             break
         default:
             break

src/layouts/admin/components/popup/password.vue

@@ -9,7 +9,12 @@
                     <el-input v-model.trim="form.newPwd" type="password" placeholder="请输入新密码" show-password />
                 </el-form-item>
                 <el-form-item label="确认密码:" prop="confirmPwd">
-                    <el-input v-model.trim="form.confirmPwd" type="password" placeholder="请输入确认密码" show-password />
+                    <el-input
+                        v-model.trim="form.confirmPwd"
+                        type="password"
+                        placeholder="请输入确认密码"
+                        show-password
+                    />
                 </el-form-item>
             </el-form>
         </el-scrollbar>
@@ -28,8 +33,10 @@ import { ElMessage } from 'element-plus'
 import { passwordConfirm, updatePassword } from '@/api/user-boot/user'
 import { validatePwd } from '@/utils/common'
 import { useAdminInfo } from '@/stores/adminInfo'
-
+import router from '@/router'
+import { useNavTabs } from '@/stores/navTabs'
 const adminInfo = useAdminInfo()
+const navTabs = useNavTabs()
 const dialogVisible = ref(false)
 const title = ref('修改密码')
 const formRef = ref()
@@ -96,9 +103,16 @@ const submit = () => {
                 updatePassword({
                     id: adminInfo.$state.userIndex,
                     newPassword: form.newPwd
-                }).then((res: any) => {
+                }).then(async (res: any) => {
                     ElMessage.success('密码修改成功')
                     dialogVisible.value = false
+                    
+                    setTimeout(() => {
+                         navTabs.closeTabs()
+                        window.localStorage.clear()
+                        adminInfo.reset()
+                        router.push({ name: 'login' })
+                    }, 0)
                 })
             })
         }

src/router/index.ts

@@ -26,7 +26,7 @@ router.beforeEach((to, from, next) => {
         const token = adminInfo.getToken()
         // token 不存在
         if (token === null || token === '') {
-            ElMessage.error('您还没有登录，请先登录')
+            // ElMessage.error('您还没有登录，请先登录')
             next('/login')
         } else {
             next()

src/stores/navTabs.ts

@@ -25,7 +25,6 @@ export const useNavTabs = defineStore(
         })
 
         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) {
@@ -69,7 +68,7 @@ export const useNavTabs = defineStore(
         }
 
         const setTabsViewRoutes = (data: RouteRecordRaw[]): void => {
-            state.tabsViewRoutes = encodeRoutesURI(data)
+            state.tabsViewRoutes = encodeRoutesURI(JSON.parse(JSON.stringify(data)))
         }
 
         const setAuthNode = (key: string, data: string[]) => {

src/template/dialog.vue

@@ -41,8 +41,8 @@ const form = reactive({
     id: ''
 })
 const rules = {
-    name: [{ required: true, message: '角色名称不能为空', trigger: 'blur' }],
-    code: [{ required: true, message: '角色编码不能为空', trigger: 'blur' }]
+    name: [{ required: true, message: '请输入角色名称', trigger: 'blur' }],
+    code: [{ required: true, message: '请输入角色编码', trigger: 'blur' }]
 }
 
 const open = (text: string, data?: anyObj) => {

src/utils/echartMethod.ts

@@ -44,7 +44,8 @@ const calculateValue = (o: number, value: number, num: number, isMin: boolean) =
     }
 
     if (base === 0.1) {
-        return parseFloat(calculatedValue.toFixed(1))
+        // return parseFloat(calculatedValue.toFixed(1))
+        return Math.ceil(calculatedValue * 10) / 10
     } else if (isMin) {
         return Math.floor(calculatedValue / base) * base
     } else {

src/utils/request.ts

@@ -7,7 +7,7 @@ import { useAdminInfo } from '@/stores/adminInfo'
 
 window.requests = []
 window.tokenRefreshing = false
-let loginExpireTimer:any=null
+let loginExpireTimer: any = null
 const pendingMap = new Map()
 const loadingInstance: LoadingInstance = {
     target: null,
@@ -65,14 +65,17 @@ function createAxios<Data = any, T = ApiPromise<Data>>(
             if (
                 !(
                     config.url == '/system-boot/file/upload' ||
+                    config.url == '/user-boot/sysRoleSystem/getSystemByRoleId' ||
+                    config.url == '/system-boot/file/getFileUrl' ||
+                    config.url == '/cs-harmonic-boot/realData/getBaseRealData' ||
                     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/csevent/getEventCoords'||
-                    config.url == '/cs-harmonic-boot/limitRateDetailD/limitTimeProbabilityData'||
-                    config.url == '/cs-harmonic-boot/limitRateDetailD/limitProbabilityData'||
-                    config.url == '/system-boot/dictTree/queryByCode'||
+                    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'
                 )
             )
@@ -179,8 +182,7 @@ 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 if (response.config.url == '/cs-harmonic-boot/cspage/getByUserId') {
                     } else {
                         ElMessage.error(response.data.message || '未知错误')
                     }

src/utils/router.ts

@@ -304,7 +304,7 @@ export const getMenu = () => {
         }
         handlerMenu(res.data)
         handleAdminRoute(res.data)
-        if (route.params.to) {
+        if (route?.params?.to) {
             const lastRoute = JSON.parse(route.params.to as string)
             if (lastRoute.path != adminBaseRoutePath) {
                 let query = !isEmpty(lastRoute.query) ? lastRoute.query : {}

src/utils/tableStore.ts

@@ -45,6 +45,7 @@ export default class TableStore {
             pageSize: 20
         },
         loading: true,
+        exportLoading: false,
         column: [],
         loadCallback: null,
         resetCallback: null,
@@ -196,6 +197,7 @@ export default class TableStore {
             [
                 'export',
                 () => {
+                    this.table.exportLoading = true
                     // this.index()
                     let params = { ...this.table.params, pageNum: 1, pageSize: this.table.total }
                     createAxios(
@@ -206,10 +208,15 @@ export default class TableStore {
                             },
                             requestPayload(this.method, params, this.paramsPOST)
                         )
-                    ).then(res => {
+                    )
+                        .then(res => {
                             this.table.allData = filtration(res.data.records || res.data)
                             this.table.exportProcessingData && this.table.exportProcessingData()
                             this.table.allFlag = data.showAllFlag || true
+                            this.table.exportLoading = false
+                        })
+                        .catch(() => {
+                            this.table.exportLoading = false
                         })
                 }
             ]

src/views/auth/audit/index.vue

@@ -23,7 +23,7 @@ const tableStore = new TableStore({
     method: 'POST',
     url: '/user-boot/user/checkUserList',
     column: [
-        // { width: '60', type: 'checkbox' },
+        { width: '60', type: 'checkbox' },
         { title: '名称', field: 'name' },
         { title: '登录名', field: 'loginName' },
         { title: '角色', field: 'roleName' },
@@ -33,7 +33,7 @@ const tableStore = new TableStore({
         { title: '类型', field: 'casualUserName' },
         { title: '状态', field: 'stateName' },
         {
-            title: '操作',
+            title: '操作', fixed: 'right',
             width: '180',
             render: 'buttons',
             buttons: [

src/views/auth/menu/api.vue

@@ -2,8 +2,16 @@
     <div>
         <div class="custom-table-header">
             <div class="title">接口权限列表</div>
-            <el-input maxlength="32" show-word-limit v-model.trim="tableStore.table.params.searchValue"
-                style="width: 240px" placeholder="请输入菜单名称" class="ml10" clearable @input="search" />
+            <el-input
+                maxlength="32"
+                show-word-limit
+                v-model.trim="tableStore.table.params.searchValue"
+                style="width: 240px"
+                placeholder="请输入菜单名称"
+                class="ml10"
+                clearable
+                @input="search"
+            />
             <el-button :icon="Plus" type="primary" @click="addMenu" class="ml10" :disabled="!props.id">新增</el-button>
         </div>
         <Table ref="tableRef" />
@@ -17,7 +25,7 @@ import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import popupApi from './popupApi.vue'
 import { deleteMenu } from '@/api/user-boot/function'
-
+import { ElMessage } from 'element-plus'
 defineOptions({
     name: 'auth/menu/api'
 })
@@ -38,19 +46,29 @@ const tableStore = new TableStore({
     url: '/user-boot/function/getButtonById',
     publicHeight: 60,
     column: [
-        { title: '普通接口/接口名称', field: 'name' },
+        {
+            field: 'index',
+            title: '序号',
+            width: '80',
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { title: '普通接口/接口名称', field: 'name', minWidth: '180' },
         {
             title: '接口类型',
             field: 'type',
+            minWidth: '140',
             formatter: row => {
                 return row.cellValue == 1 ? '普通接口' : '公用接口'
             }
         },
-        { title: 'URL接口路径', field: 'path' },
+        { title: 'URL接口路径', field: 'path', minWidth: '200' },
         {
             title: '操作',
+            fixed: 'right',
             align: 'center',
-            width: '180',
+            width: '140',
             render: 'buttons',
             buttons: [
                 {
@@ -77,6 +95,8 @@ const tableStore = new TableStore({
                     },
                     click: row => {
                         deleteMenu(row.id).then(() => {
+                            ElMessage.success('删除成功！')
+
                             tableStore.index()
                         })
                     }

src/views/auth/menu/menu.vue

@@ -17,7 +17,7 @@ import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import popupMenu from './popupMenu.vue'
 import { delMenu } from '@/api/systerm'
-
+import { ElMessage } from 'element-plus'
 defineOptions({
     name: 'auth/menu/menu'
 })
@@ -50,7 +50,7 @@ const tableStore = new TableStore({
             render: 'icon'
         },
         {
-            title: '操作',
+            title: '操作', fixed: 'right',
             align: 'center',
             width: '180',
             render: 'buttons',
@@ -89,6 +89,8 @@ const tableStore = new TableStore({
                     },
                     click: row => {
                         delMenu(row.id).then(() => {
+                                            ElMessage.success('删除成功!')
+
                             emits('init')
                         })
                     }

src/views/auth/menu/popupApi.vue

@@ -1,12 +1,25 @@
 <template>
     <el-dialog width="700px" v-model.trim="dialogVisible" :title="title">
         <el-scrollbar>
-            <el-form :mode="form" :inline="false" :model="form" label-width="120px" :rules="rules" class="form-one">
+            <el-form
+                :mode="form"
+                :inline="false"
+                ref="formRef"
+                :model="form"
+                label-width="120px"
+                :rules="rules"
+                class="form-one"
+            >
                 <el-form-item prop="name" label="接口/按钮名称">
                     <el-input maxlength="32" show-word-limit v-model.trim="form.name" placeholder="请输入接口名称" />
                 </el-form-item>
                 <el-form-item prop="code" label="接口/按钮标识">
-                    <el-input maxlength="32" show-word-limit v-model.trim="form.code" placeholder="请输入英文接口标识" />
+                    <el-input
+                        maxlength="32"
+                        show-word-limit
+                        v-model.trim="form.code"
+                        placeholder="请输入英文接口标识"
+                    />
                 </el-form-item>
                 <el-form-item prop="path" label="接口路径">
                     <el-input v-model.trim="form.path" placeholder="请输入接口路径" />
@@ -18,11 +31,17 @@
                     </el-radio-group>
                 </el-form-item>
                 <el-form-item prop="sort" label="排序">
-                    <el-input maxlength="32" show-word-limit-number v-model.trim="form.sort" :min="0" />
+                    <el-input maxlength="32" show-word-limit-number v-model.number="form.sort" :min="0" />
                 </el-form-item>
                 <el-form-item prop="remark" label="接口/按钮描述">
-                    <el-input maxlength="300" show-word-limit v-model.trim="form.remark" :rows="2" type="textarea"
-                        placeholder="请输入描述" />
+                    <el-input
+                        maxlength="300"
+                        show-word-limit
+                        v-model.trim="form.remark"
+                        :rows="2"
+                        type="textarea"
+                        placeholder="请输入描述"
+                    />
                 </el-form-item>
             </el-form>
         </el-scrollbar>
@@ -39,13 +58,14 @@
 import { ref, inject } from 'vue'
 import { reactive } from 'vue'
 import { update, add } from '@/api/user-boot/function'
-
+import { ElMessage } from 'element-plus'
 defineOptions({
     name: 'auth/menu/popupApi'
 })
 const emits = defineEmits<{
     (e: 'init'): void
 }>()
+const formRef = ref()
 const form: any = reactive({
     id: '',
     pid: '0',
@@ -58,7 +78,7 @@ const form: any = reactive({
 })
 const rules = {
     code: [
-        { required: true, message: '标识不能为空', trigger: 'blur' },
+        { required: true, message: '请输入标识', trigger: 'blur' },
         {
             pattern: /^[a-zA-Z_]{1}[a-zA-Z0-9_]{2,20}$/,
             message: '请输入至少3-20位英文',
@@ -74,12 +94,14 @@ const rules = {
 const dialogVisible = ref(false)
 const title = ref('新增菜单')
 const open = (text: string, data: anyObj) => {
+    formRef.value?.resetFields()
     title.value = text
     // 重置表单
     for (let key in form) {
         form[key] = ''
     }
     form.type = 1
+    form.sort = 100
     form.pid = data.pid
     if (data.id) {
         for (let key in form) {
@@ -89,15 +111,23 @@ const open = (text: string, data: anyObj) => {
     dialogVisible.value = true
 }
 const submit = async () => {
+    formRef.value.validate(async valid => {
+        if (valid) {
             if (form.id) {
-        await update(form)
+                await update(form).then(() => {
+                    ElMessage.success('修改成功!')
+                })
             } else {
                 let obj = JSON.parse(JSON.stringify(form))
                 delete obj.id
-        await add(obj)
+                await add(obj).then(() => {
+                    ElMessage.success('新增成功!')
+                })
             }
             emits('init')
             dialogVisible.value = false
+        }
+    })
 }
 
 defineExpose({ open })

src/views/auth/menu/popupMenu.vue

@@ -1,29 +1,43 @@
 <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 :inline="false" :model="form" label-width="auto" ref="formRef" class="form-one" :rules="rules">
                 <el-form-item label="上级菜单">
-                    <el-cascader v-model.trim="form.pid" :options="tableStore.table.data" :props="cascaderProps" clearable
-                        style="width: 100%" />
+                    <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-form-item label="菜单名称" prop="name">
                     <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-form-item label="菜单路由" prop="path">
                     <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 label="组件路径" prop="routeName">
+                    <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 label="排序" prop="sort">
+                    <el-input maxlength="32" show-word-limit-number v-model.number="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-input
+                        maxlength="300"
+                        show-word-limit
+                        v-model.trim="form.remark"
+                        :rows="2"
+                        type="textarea"
+                        placeholder="请输入描述"
+                    />
                 </el-form-item>
             </el-form>
         </el-scrollbar>
@@ -42,10 +56,11 @@ import { reactive } from 'vue'
 import TableStore from '@/utils/tableStore'
 import IconSelector from '@/components/baInput/components/iconSelector.vue'
 import { updateMenu, addMenu } from '@/api/systerm'
-
+import { ElMessage } from 'element-plus'
 defineOptions({
     name: 'auth/menu/popupMenu'
 })
+const formRef = ref()
 const emits = defineEmits<{
     (e: 'init'): void
 }>()
@@ -71,7 +86,15 @@ const form: any = reactive({
 
 const dialogVisible = ref(false)
 const title = ref('新增菜单')
+const rules = {
+    name: [{ required: true, message: '请输入菜单名称', trigger: 'blur' }],
+    path: [{ required: true, message: '请输入菜单路由', trigger: 'blur' }],
+    icon: [{ required: true, message: '请选择图标', trigger: 'blur' }],
+    routeName: [{ required: true, message: '请输入组件路径', trigger: 'blur' }],
+    sort: [{ required: true, message: '请输入排序', trigger: 'blur' }]
+}
 const open = (text: string, data: anyObj) => {
+    formRef.value?.resetFields()
     title.value = text
     // 重置表单
     for (let key in form) {
@@ -91,17 +114,27 @@ const open = (text: string, data: anyObj) => {
     dialogVisible.value = true
 }
 const submit = async () => {
+    formRef.value.validate(async valid => {
+        if (valid) {
             if (form.id) {
-        form.pid =  form.pid||'0'
-        await updateMenu(form)
+                form.pid = form.pid || '0'
+                await updateMenu(form).then(() => {
+                    ElMessage.success('编辑成功!')
+                })
             } else {
                 form.code = 'menu'
+                form.pid = form.pid || '0'
                 let obj = JSON.parse(JSON.stringify(form))
                 delete obj.id
-        await addMenu(obj)
+
+                await addMenu(obj).then(() => {
+                    ElMessage.success('新增成功!')
+                })
             }
             emits('init')
             dialogVisible.value = false
+        }
+    })
 }
 
 defineExpose({ open })

src/views/auth/role/index.vue

@@ -7,16 +7,34 @@
             </div>
             <Table ref="tableRef" :row-config="{ isCurrent: true, isHover: true }" @currentChange="currentChange" />
         </div>
+        <div>
+            <el-tabs type="border-card">
+                <el-tab-pane label="菜单">
                     <Tree
                         v-if="menuListId"
                         ref="treeRef"
                         show-checkbox
                         width="350px"
                         :data="menuTree"
-            :checkStrictly="false"
+                        :checkStrictly="checkStrictly"
                         @checkChange="checkChange"
                     ></Tree>
-        <el-empty style="width: 350px; padding-top: 300px; box-sizing: border-box" description="请选择角色" v-else />
+                    <el-empty
+                        style="width: 350px; padding-top: 300px; box-sizing: border-box"
+                        description="请选择角色"
+                        v-else
+                    />
+                </el-tab-pane>
+                <el-tab-pane label="系统">
+                    <div class="mt10 mr10" style="display: flex; justify-content: end">
+                        <el-button type="primary" icon="el-icon-Select" @click="saveSystem">保存</el-button>
+                    </div>
+                    <el-checkbox-group v-model="systemIds" class="md10 system">
+                        <el-checkbox v-for="item in systemList" :label="item.name" :value="item.id" :key="item.id" />
+                    </el-checkbox-group>
+                </el-tab-pane>
+            </el-tabs>
+        </div>
         <PopupForm ref="popupRef"></PopupForm>
     </div>
 </template>
@@ -28,17 +46,20 @@ import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/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 { getFunctionsByRoleIndex, updateRoleMenu, getSystemByRoleId, systemAdd } from '@/api/user-boot/roleFuction'
 import { mainHeight } from '@/utils/layout'
 import { del } from '@/api/user-boot/role'
 import { ElMessage } from 'element-plus'
 import PopupForm from './popupForm.vue'
 import { useAdminInfo } from '@/stores/adminInfo'
-
+import { useDictData } from '@/stores/dictData'
+const dictData = useDictData()
+const systemList = dictData.getBasicData('System_Type')
 const adminInfo = useAdminInfo()
 defineOptions({
     name: 'auth/role'
 })
+const systemIds = ref([])
 const height = mainHeight(20).height
 const treeRef = ref()
 const menuTree = ref<treeData[]>([])
@@ -69,7 +90,7 @@ const tableStore = new TableStore({
             }
         },
         {
-            title: '操作',
+            title: '操作', fixed: 'right',
             align: 'center',
             width: '180',
             render: 'buttons',
@@ -141,15 +162,21 @@ const currentChange = (data: any) => {
     menuListId.value = data.row.id
     getFunctionsByRoleIndex({ id: data.row.id }).then((res: any) => {
         treeRef.value.treeRef.setCheckedKeys(res.data.map((item: any) => item.id))
+        setTimeout(() => {
+            checkStrictly.value = false
+        }, 100)
+    })
+    getSystemByRoleId({ id: data.row.id }).then((res: any) => {
+        systemIds.value = res.data.systemIds || []
     })
 }
 
 const timeout = ref<NodeJS.Timeout>()
 const checkChange = (data: any) => {
-    // if (checkStrictly.value) {
-    //     checkStrictly.value = false
-    //     return
-    // }
+    if (checkStrictly.value) {
+        checkStrictly.value = false
+        return
+    }
 
     updateRoleMenu({
         id: menuListId.value,
@@ -163,6 +190,19 @@ const checkChange = (data: any) => {
             treeRef.value.loading = false
         })
 }
+const saveSystem = () => {
+    systemAdd({
+        roleId: menuListId.value,
+        systemIds: systemIds.value
+    })
+        .then(() => {
+            ElMessage.success('操作成功!')
+            treeRef.value.loading = false
+        })
+        .catch(() => {
+            treeRef.value.loading = false
+        })
+}
 onMounted(() => {
     tableStore.index()
 })
@@ -170,3 +210,17 @@ const addRole = () => {
     popupRef.value.open('新增角色')
 }
 </script>
+
+<style lang="scss" scoped>
+:deep(.el-tabs--border-card > .el-tabs__content) {
+    padding: 0px !important;
+}
+.system {
+    width: 330px;
+    height: calc(100vh - 225px);
+    border: 1px solid var(--el-border-color);
+    padding: 5px 10px;
+    display: flex;
+    flex-direction: column;
+}
+</style>

src/views/auth/role/popupForm.vue

@@ -1,15 +1,21 @@
 <template>
-    <el-dialog class="cn-operate-dialog" width="700px" v-model.trim="dialogVisible" :title="title">
-        <el-form :inline="false" :model="form" label-width="auto" class="form-one" :rules="rules">
-            <el-form-item label="角色名称">
+    <el-dialog class="cn-operate-dialog" width="500px" v-model.trim="dialogVisible" :title="title">
+        <el-form :inline="false" ref="formRef" :model="form" label-width="auto" class="form-one" :rules="rules">
+            <el-form-item label="角色名称" prop="name">
                 <el-input maxlength="32" show-word-limit v-model.trim="form.name" placeholder="请输入菜单名称" />
             </el-form-item>
-            <el-form-item label="角色编码">
+            <el-form-item label="角色编码" prop="code">
                 <el-input maxlength="32" show-word-limit v-model.trim="form.code" placeholder="请输入菜单名称" />
             </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-input
+                    maxlength="300"
+                    show-word-limit
+                    v-model.trim="form.remark"
+                    :rows="2"
+                    type="textarea"
+                    placeholder="请输入描述"
+                />
             </el-form-item>
         </el-form>
 
@@ -40,12 +46,14 @@ const form = reactive({
     type: 0
 })
 const rules = {
-    name: [{ required: true, message: '角色名称不能为空', trigger: 'blur' }],
-    code: [{ required: true, message: '角色编码不能为空', trigger: 'blur' }]
+    name: [{ required: true, message: '请输入角色名称', trigger: 'blur' }],
+    code: [{ required: true, message: '请输入角色编码', trigger: 'blur' }]
 }
 const dialogVisible = ref(false)
 const title = ref('新增菜单')
+const formRef = ref()
 const open = (text: string, data?: anyObj) => {
+    formRef.value?.resetFields()
     title.value = text
     dialogVisible.value = true
     if (data) {
@@ -59,6 +67,8 @@ const open = (text: string, data?: anyObj) => {
     }
 }
 const submit = async () => {
+    formRef.value.validate(async valid => {
+        if (valid) {
             if (form.id) {
                 await update(form)
             } else {
@@ -68,6 +78,8 @@ const submit = async () => {
             ElMessage.success('保存成功')
             tableStore.index()
             dialogVisible.value = false
+        }
+    })
 }
 
 defineExpose({ open })

src/views/auth/userList/index.vue

@@ -79,10 +79,10 @@ const tableStore = new TableStore({
             }
         },
         {
-            title: '操作',
+            title: '操作', fixed: 'right',
             width: '180',
             render: 'buttons',
-            fixed: 'right',
+      
             buttons: [
                 {
                     name: 'edit',
@@ -95,6 +95,7 @@ const tableStore = new TableStore({
                     },
                     click: row => {
                         popupEditRef.value.open('编辑用户', row)
+                        console.log("🚀 ~ row:", row)
                     }
                 },
                 {

src/views/auth/userList/popupEdit.vue

@@ -1,7 +1,6 @@
 <template>
     <el-dialog class="cn-operate-dialog" v-model.trim="dialogVisible" :title="title">
-
-        <el-form :model="form" label-width="auto" class="form-two" :rules="rules">
+        <el-form :model="form" ref="formRef" label-width="auto" class="form-two" :rules="rules">
             <el-form-item label="用户名" prop="name">
                 <el-input maxlength="32" show-word-limit v-model.trim="form.name" placeholder="请输入昵称" />
             </el-form-item>
@@ -9,18 +8,32 @@
                 <el-input maxlength="32" show-word-limit v-model.trim="form.loginName" placeholder="请输入登录名" />
             </el-form-item>
             <el-form-item label="默认密码" prop="password" v-if="title === '新增用户'">
-                <el-input maxlength="32" show-word-limit v-model.trim="form.password" placeholder="请输入密码" disabled />
+                <el-input
+                    maxlength="32"
+                    show-word-limit
+                    v-model.trim="form.password"
+                    placeholder="请输入密码"
+                    disabled
+                />
             </el-form-item>
             <el-form-item label="权限类型" prop="type">
                 <el-select v-model.trim="form.type" @change="changeValue" disabled placeholder="请选择权限类型">
-                    <el-option v-for="(item, index) in UserTypeOption" :label="item.label" :value="item.value"
-                        :key="index"></el-option>
+                    <el-option
+                        v-for="(item, index) in UserTypeOption"
+                        :label="item.label"
+                        :value="item.value"
+                        :key="index"
+                    ></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="用户类型" prop="casualUser">
                 <el-select v-model.trim="form.casualUser" placeholder="请选择权限类型">
-                    <el-option v-for="(item, index) in TypeOptions" :label="item.label" :value="item.value"
-                        :key="index"></el-option>
+                    <el-option
+                        v-for="(item, index) in TypeOptions"
+                        :label="item.label"
+                        :value="item.value"
+                        :key="index"
+                    ></el-option>
                 </el-select>
             </el-form-item>
             <!-- <el-form-item label="所属部门" prop="deptId">
@@ -28,8 +41,12 @@
             </el-form-item> -->
             <el-form-item label="角色" prop="role">
                 <el-select v-model.trim="form.role" placeholder="请选择角色" multiple collapse-tags>
-                    <el-option v-for="(item, index) in roleOptions" :label="item.label" :value="item.value"
-                        :key="index"></el-option>
+                    <el-option
+                        v-for="(item, index) in roleOptions"
+                        :label="item.label"
+                        :value="item.value"
+                        :key="index"
+                    ></el-option>
                 </el-select>
             </el-form-item>
 
@@ -67,8 +84,16 @@
                         <el-radio-button :label="1">是</el-radio-button>
                         <el-radio-button :label="0">否</el-radio-button>
                     </el-radio-group>
-                    <el-input maxlength="32" show-word-limit :disabled="title !== '新增用户'" v-model.trim="form.id"
-                        placeholder="请输入用户id" v-if="useId" style="flex: 1;" class="ml10"></el-input>
+                    <el-input
+                        maxlength="32"
+                        show-word-limit
+                        :disabled="title !== '新增用户'"
+                        v-model.trim="form.id"
+                        placeholder="请输入用户id"
+                        v-if="useId"
+                        style="flex: 1"
+                        class="ml10"
+                    ></el-input>
                 </div>
             </el-form-item>
         </el-form>
@@ -113,16 +138,17 @@ const form = reactive({
     emailNotice: 0,
     type: 0
 })
+const formRef = ref()
 const rules: Partial<Record<string, Arrayable<FormItemRule>>> = {
-    name: [{ required: true, message: '用户名不能为空', trigger: 'blur' }],
-    role: [{ required: true, message: '角色不能为空', trigger: 'blur' }],
-    password: [{ required: true, message: '用户密码不能为空', trigger: 'blur' }],
-    loginName: [{ required: true, message: '登录名不能为空', trigger: 'blur' }],
-    casualUser: [{ required: true, message: '用户类型不能为空', trigger: 'blur' }],
-    smsNotice: [{ required: true, message: '短信通知不能为空', trigger: 'blur' }],
-    emailNotice: [{ required: true, message: '邮件通知不能为空', trigger: 'blur' }],
+    name: [{ required: true, message: '请输入用户名', trigger: 'blur' }],
+    role: [{ required: true, message: '请输入角色', trigger: 'blur' }],
+    password: [{ required: true, message: '请输入用户密码', trigger: 'blur' }],
+    loginName: [{ required: true, message: '请输入登录名', trigger: 'blur' }],
+    casualUser: [{ required: true, message: '请输入用户类型', trigger: 'blur' }],
+    smsNotice: [{ required: true, message: '请输入短信通知', trigger: 'blur' }],
+    emailNotice: [{ required: true, message: '请输入邮件通知', trigger: 'blur' }],
     email: [
-        { required: false, message: '邮箱不能为空', trigger: 'blur' },
+        { required: false, message: '请输入邮箱', trigger: 'blur' },
         {
             type: 'email',
             message: "'请输入正确的邮箱地址",
@@ -130,16 +156,16 @@ const rules: Partial<Record<string, Arrayable<FormItemRule>>> = {
         }
     ],
     phone: [
-        { required: false, message: '手机号不能为空', trigger: 'blur' },
+        { required: false, message: '请输入手机号', trigger: 'blur' },
         {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
             message: '请输入正确的手机号码',
             trigger: 'blur'
         }
     ],
-    limitTime: [{ required: true, message: '时间段不能为空', trigger: 'blur' }],
+    limitTime: [{ required: true, message: '请选择时间段', trigger: 'blur' }],
     limitIpStart: [
-        { required: true, message: '起始IP不能为空', trigger: 'blur' },
+        { required: true, message: '请输入起始IP', trigger: 'blur' },
         {
             required: true,
             validator: (rule: any, value: string, callback: any) => {
@@ -157,7 +183,7 @@ const rules: Partial<Record<string, Arrayable<FormItemRule>>> = {
         }
     ],
     limitIpEnd: [
-        { required: true, message: '结束IP不能为空', trigger: 'blur' },
+        { required: true, message: '请输入结束IP', trigger: 'blur' },
         {
             required: true,
             validator: (rule: any, value: string, callback: any) => {
@@ -199,8 +225,10 @@ queryRole()
 const dialogVisible = ref(false)
 const title = ref('新增菜单')
 const open = (text: string, data?: anyObj) => {
+    formRef.value?.resetFields()
     title.value = text
     dialogVisible.value = true
+  
     if (data) {
         for (let key in form) {
             form[key] = data[key]
@@ -221,10 +249,12 @@ const open = (text: string, data?: anyObj) => {
         form.limitIpStart = '0.0.0.0'
         form.limitIpEnd = '255.255.255.255'
         form.password = '123456'
-    }
         form.type = adminInfo.$state.userType + 1
+    }
 }
 const submit = async () => {
+    formRef.value.validate(async (valid: any) => {
+        if (valid) {
             let obj = JSON.parse(JSON.stringify(form))
             obj.limitTime = obj.limitTime.join('-')
             delete obj.password
@@ -238,8 +268,10 @@ const submit = async () => {
             }
             tableStore.index()
             dialogVisible.value = false
+        }
+    })
 }
 
-const changeValue = () => { }
+const changeValue = () => {}
 defineExpose({ open })
 </script>

src/views/govern/alarm/Device.vue

@@ -9,7 +9,7 @@
                     @change="sourceChange"
                     :options="deviceTreeOptions"
                     :show-all-levels="false"
-                    :props="{ checkStrictly: true }"
+                    :props="{ checkStrictly: true, value: 'id', label: 'name' }"
                     clearable
                 ></el-cascader>
                 <!-- <el-input maxlength="32" show-word-limit v-model.trim="tableStore.table.params.searchValue" placeholder="请输入设备名称" /> -->
@@ -57,17 +57,33 @@ const tabsList = ref([
 ])
 const rankOptions = ref([
     {
-        value: '1',
-        label: '1级'
+        value: '1,7',
+        label: '1级(ERROR)'
     },
     {
-        value: '2',
-        label: '2级'
+        value: '2,6',
+        label: '2级(WARN)'
     },
     {
-        value: '3',
-        label: '3级'
-    }
+        value: '3,4,5',
+        label: '3级(DEBUG,NORMAL)'
+    },
+    // {
+    //     value: '4',
+    //     label: 'DEBUG'
+    // },
+    // {
+    //     value: '5',
+    //     label: 'NORMAL'
+    // },
+    // {
+    //     value: '6',
+    //     label: 'WARN'
+    // },
+    // {
+    //     value: '7',
+    //     label: 'ERROR'
+    // }
 ])
 
 const tableStore = new TableStore({
@@ -83,14 +99,15 @@ const tableStore = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        { 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: 'equipmentName', align: 'center', width: 120 },
+        { title: '工程名称', field: 'engineeringName', align: 'center', width: 120 },
+        { title: '项目名称', field: 'projectName', align: 'center', width: 120 },
+        { title: '发生时刻', field: 'startTime', align: 'center', width: 180, sortable: true },
         {
             title: '模块信息',
             field: 'moduleNo',
-            align: 'center',minWidth: 100 ,
+            align: 'center',
+            width: 100,
             formatter: (row: any) => {
                 return row.cellValue ? row.cellValue : '/'
             }
@@ -116,14 +133,24 @@ const tableStore = new TableStore({
             width: 100,
             render: 'tag',
             custom: {
+                // 1:Ⅰ级 2:Ⅱ级 3:Ⅲ级 4:DEBUG 5:NORMAL 6:WARN 7:ERROR
+
                 1: 'danger',
                 2: 'warning',
-                3: 'success'
+                3: 'success',
+                4: 'warning',
+                5: 'success',
+                6: 'warning',
+                7: 'danger'
             },
             replaceValue: {
                 1: '1级',
                 2: '2级',
-                3: '3级'
+                3: '3级',
+                4: 'DEBUG',
+                5: 'NORMAL',
+                6: 'WARN',
+                7: 'ERROR'
             }
         }
         // {
@@ -135,7 +162,25 @@ const tableStore = new TableStore({
         // }
     ],
     beforeSearchFun: () => {},
-  
+    exportProcessingData: () => {
+        tableStore.table.allData = tableStore.table.allData.filter(item => {
+            item.level =
+                item.level == 1
+                    ? '1级'
+                    : item.level == 2
+                    ? '2级'
+                    : item.level == 3
+                    ? '3级'
+                    : item.level == 4
+                    ? 'DEBUG'
+                    : item.level == 5
+                    ? 'NORMAL'
+                    : item.level == 6
+                    ? 'WARN'
+                    : 'ERROR'
+            return item
+        })
+    }
 })
 
 provide('tableStore', tableStore)
@@ -177,6 +222,7 @@ const sourceChange = (e: any) => {
             tableStore.table.params.deviceTypeId = e[0] || ''
             tableStore.table.params.engineeringid = e[1] || ''
             tableStore.table.params.projectId = e[2] || ''
+            tableStore.table.params.deviceId = e[3] || ''
         }
     }
 }

src/views/govern/alarm/Front.vue

@@ -1,10 +1,24 @@
 <template>
     <TableHeader datePicker ref="refheader" showExport>
         <template v-slot:select>
-            <el-form-item label="关键词">
-                <el-input maxlength="32" show-word-limit v-model.trim="tableStore.table.params.searchValue" placeholder="请输入前置服务器名称，ip" />
+            <el-form-item label="关键字筛选">
+                <el-input
+                    maxlength="32"
+                    show-word-limit
+                    v-model.trim="tableStore.table.params.searchValue"
+                    placeholder="请输入前置服务器名称，ip"
+                />
+            </el-form-item>
+            <el-form-item label="级别">
+                <el-select v-model.trim="tableStore.table.params.level" placeholder="请选择级别" clearable>
+                    <el-option
+                        v-for="item in rankOptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                    ></el-option>
+                </el-select>
             </el-form-item>
-
         </template>
     </TableHeader>
     <!-- <div style="height: 300px;"> -->
@@ -21,7 +35,36 @@ import { mainHeight } from '@/utils/layout'
 const props = defineProps(['deviceTree'])
 
 const refheader = ref()
-
+const rankOptions = ref([
+      {
+        value: '1,7',
+        label: '1级(ERROR)'
+    },
+    {
+        value: '2,6',
+        label: '2级(WARN)'
+    },
+    {
+        value: '3,4,5',
+        label: '3级(DEBUG,NORMAL)'
+    },
+    // {
+    //     value: '4',
+    //     label: 'DEBUG'
+    // },
+    // {
+    //     value: '5',
+    //     label: 'NORMAL'
+    // },
+    // {
+    //     value: '6',
+    //     label: 'WARN'
+    // },
+    // {
+    //     value: '7',
+    //     label: 'ERROR'
+    // }
+])
 const tableStore = new TableStore({
     url: '/cs-harmonic-boot/eventUser/frontWarnInfo',
     method: 'POST',
@@ -35,10 +78,10 @@ const tableStore = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        { 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: '前置服务器名称', field: 'lineId', align: 'center',  width: 120 },
+        { title: '前置服务器ip', field: 'wavePath', align: 'center', width: 120 },
+        { title: '进程号', field: 'clDid', align: 'center', width: 60 },
+        { title: '发生时刻', field: 'startTime', align: 'center', width: 180, sortable: true },
 
         {
             title: '事件描述',
@@ -48,21 +91,66 @@ const tableStore = new TableStore({
         {
             title: '告警代码',
             field: 'code',
-            align: 'center',minWidth: 100 ,
-            
+            align: 'center',
+            width: 100,
 
             formatter: (row: any) => {
                 return row.cellValue ? '\u200B' + row.cellValue : '/'
             },
             sortable: true
         },
+        {
+            title: '级别',
+            field: 'level',
+            width: 100,
+            render: 'tag',
+            custom: {
+                // 1:Ⅰ级 2:Ⅱ级 3:Ⅲ级 4:DEBUG 5:NORMAL 6:WARN 7:ERROR
 
+                1: 'danger',
+                2: 'warning',
+                3: 'success',
+                4: 'warning',
+                5: 'success',
+                6: 'warning',
+                7: 'danger'
+            },
+            replaceValue: {
+                1: '1级',
+                2: '2级',
+                3: '3级',
+                4: 'DEBUG',
+                5: 'NORMAL',
+                6: 'WARN',
+                7: 'ERROR'
+            }
+        }
     ],
-    beforeSearchFun: () => {}
+    beforeSearchFun: () => {},
+    exportProcessingData: () => {
+        tableStore.table.allData = tableStore.table.allData.filter(item => {
+            item.level =
+                item.level == 1
+                    ? '1级'
+                    : item.level == 2
+                    ? '2级'
+                    : item.level == 3
+                    ? '3级'
+                    : item.level == 4
+                    ? 'DEBUG'
+                    : item.level == 5
+                    ? 'NORMAL'
+                    : item.level == 6
+                    ? 'WARN'
+                    : 'ERROR'
+            return item
+        })
+    }
 })
 
 provide('tableStore', tableStore)
 tableStore.table.params.searchValue = ''
+tableStore.table.params.level = ''
 const deviceTreeOptions = ref<any>(props.deviceTree)
 deviceTreeOptions.value.map((item: any, index: any) => {
     if (item.children.length == 0) {
@@ -76,6 +164,5 @@ onMounted(() => {
 setTimeout(() => {
     // tableStore.table.height = mainHeight(200).height as any
 }, 0)
-
 </script>
 <style></style>

src/views/govern/alarm/Steady.vue

@@ -9,7 +9,7 @@
                     @change="sourceChange"
                     :options="deviceTreeOptions"
                     :show-all-levels="false"
-                    :props="{ checkStrictly: true }"
+                    :props="{ checkStrictly: true, value: 'id', label: 'name' }"
                     clearable
                 ></el-cascader>
                 <!-- <el-input maxlength="32" show-word-limit v-model.trim="tableStore.table.params.searchValue" placeholder="请输入设备名称" /> -->
@@ -133,6 +133,7 @@ const sourceChange = (e: any) => {
             tableStore.table.params.deviceTypeId = e[0] || ''
             tableStore.table.params.engineeringid = e[1] || ''
             tableStore.table.params.projectId = e[2] || ''
+            tableStore.table.params.deviceId = e[3] || ''
         }
     }
 }

src/views/govern/alarm/Transient.vue

@@ -1,5 +1,5 @@
 <template>
-    <div ref="refheader" v-if="!isWaveCharts">
+    <div ref="refheader" v-show="!isWaveCharts" style="width: 100%;">
         <TableHeader datePicker showExport>
             <template v-slot:select>
                 <el-form-item label="数据来源">
@@ -10,7 +10,7 @@
                         v-model.trim="tableStore.table.params.cascader"
                         :options="deviceTreeOptions"
                         :show-all-levels="false"
-                        :props="{ checkStrictly: true }"
+                        :props="{ checkStrictly: true, value: 'id', label: 'name' }"
                         clearable
                     ></el-cascader>
                     <!-- <el-input maxlength="32" show-word-limit v-model.trim="tableStore.table.params.searchValue" placeholder="请输入设备名称" /> -->
@@ -121,28 +121,30 @@ const tableStore = new TableStore({
     method: 'POST',
     publicHeight: 65,
     exportName: '暂态事件',
-    column: [  {
+    column: [
+        {
             title: '序号',
             width: 80,
             formatter: (row: any) => {
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        { 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 },
+        { 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 },
 
         {
-            title: '操作',
+            title: '操作', fixed: 'right',
             align: 'center',
             width: '180',
+       
             render: 'buttons',
             buttons: [
                 {
@@ -164,9 +166,10 @@ const tableStore = new TableStore({
                                 row.loading1 = false
                                 if (res != undefined) {
                                     boxoList.value = row
+                                    boxoList.value.persistTime = row.evtParamTm
                                     boxoList.value.featureAmplitude =
-                                        row.evtParamVVaDepth != '-' ? row.evtParamVVaDepth - 0 : null
-                                    boxoList.value.systemType = 'ZL'
+                                        row.evtParamVVaDepth != '-' ? (row.evtParamVVaDepth - 0) / 100 : null
+                                    boxoList.value.systemType = 'YPT'
                                     wp.value = res.data
                                 }
                                 loading.value = false
@@ -234,7 +237,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-DataLine',
                     render: 'basicButton',
                     disabled: row => {
-                        return  row.showName != '未知'; 
+                        return row.showName != '未知'
                     }
                 },
                 {
@@ -244,7 +247,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Check',
                     render: 'basicButton',
                     disabled: row => {
-                     return  row.wavePath || row.showName === '未知';
+                        return row.wavePath || row.showName === '未知'
                     },
                     click: row => {
                         getFileByEventId(row.id).then(res => {
@@ -312,8 +315,8 @@ const sourceChange = (e: any) => {
             tableStore.table.params.deviceTypeId = e[0] || ''
             tableStore.table.params.engineeringid = e[1] || ''
             tableStore.table.params.projectId = e[2] || ''
+            tableStore.table.params.deviceId = e[3] || ''
         }
-        
     }
 
     // tableStore.table.params.engineeringid = e[1] || ''

src/views/govern/alarm/index.vue

@@ -7,15 +7,15 @@
             <el-tab-pane label="前置告警" name="2">
                 <Front v-if="activeName == '2'" :deviceTree="deviceTree" :key="key" />
             </el-tab-pane>
-            <el-tab-pane label="稳态越限告警" name="3">
+            <!-- <el-tab-pane label="稳态越限告警" name="3">
                 <Steady v-if="activeName == '3'" :deviceTree="deviceTree" :key="key" />
-            </el-tab-pane>
+            </el-tab-pane> -->
             <el-tab-pane label="暂态事件" name="4">
                 <Transient v-if="activeName == '4'" :deviceTree="deviceTree" :key="key" />
             </el-tab-pane>
-            <el-tab-pane label="异常事件" name="5">
+            <!-- <el-tab-pane label="异常事件" name="5">
                 <Abnormal v-if="activeName == '5'" :deviceTree="deviceTree" :key="key" />
-            </el-tab-pane>
+            </el-tab-pane> -->
         </el-tabs>
     </div>
 </template>
@@ -31,24 +31,25 @@ defineOptions({
     name: 'govern/alarm/index'
 })
 const deviceTree = ref([])
-const activeName = ref('1')
+const activeName = ref('0')
 const key = ref(0)
 getDeviceTree().then(res => {
-    res.data.forEach((item: any) => {
-        item.value = item.id
-        item.label = item.name
-        item.children.forEach((child: any) => {
-            child.value = child.id
-            child.label = child.name
-            child.children.forEach((grand: any) => {
-                grand.value = grand.id
-                grand.label = grand.name
-                delete grand.children
-            })
-        })
-    })
+    // res.data.forEach((item: any) => {
+    //     item.value = item.id
+    //     item.label = item.name
+    //     item.children.forEach((child: any) => {
+    //         child.value = child.id
+    //         child.label = child.name
+    //         child.children.forEach((grand: any) => {
+    //             grand.value = grand.id
+    //             grand.label = grand.name
+    //             delete grand.children
+    //         })
+    //     })
+    // })
     deviceTree.value = res.data
     key.value += 1
+    activeName.value = '1'
 })
 onMounted(() => { })
 

src/views/govern/analyze/APF/index.vue

@@ -158,6 +158,7 @@ const nodeClick = async (e: anyObj) => {
         getDevCapacity(formInline.devId)
             .then(res => {
                 devCapacity.value = res.data
+                
                 search()
             })
             .catch(() => {

src/views/govern/analyze/DVR/index.vue

@@ -136,21 +136,39 @@ const tableStore = new TableStore({
     url: '/cs-harmonic-boot/eventUser/queryEventpageWeb',
     method: 'POST',
     column: [
-        { title: '事件描述', field: 'showName' },
-        { title: '发生位置', field: 'evtParamPosition' },
-        { title: '持续时间(s)', field: 'evtParamTm', sortable: true },
+        {
+            field: 'index',
+            title: '序号',
+            width: '80',
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { title: '事件描述', field: 'showName', minWidth: 150 },
+        { title: '发生位置', field: 'evtParamPosition', minWidth: 150 },
+        {
+            title: '持续时间(s)',
+            field: 'evtParamTm',
+            sortable: true,
+            minWidth: 110,
+            formatter: (row: any) => {
+                return Math.floor(row.cellValue * 10000) / 100
+            }
+        },
         {
             title: '暂降(聚升)幅值(%)',
             field: 'evtParamVVaDepth',
+            minWidth: 150,
             formatter: (row: any) => {
                 let a = row.cellValue.split('%')[0] - 0
-                console.log('🚀 ~ a:', a)
                 return a ? a.toFixed(2) : '/'
-            }, sortable: true
             },
-        { title: '发生时刻', field: 'startTime', sortable: true },
+            sortable: true
+        },
+        { title: '发生时刻', field: 'startTime', sortable: true, minWidth: 180 },
         {
             title: '操作',
+            fixed: 'right',
             align: 'center',
             width: '180',
             render: 'buttons',
@@ -175,8 +193,11 @@ const tableStore = new TableStore({
                                 if (res != undefined) {
                                     boxoList.value = row
                                     boxoList.value.featureAmplitude =
-                                        row.evtParamVVaDepth != '-' ? row.evtParamVVaDepth - 0 : null
+                                        row.evtParamVVaDepth != '-' ? row.evtParamVVaDepth.split('%')[0] / 100 : null
+                                    boxoList.value.persistTime =
+                                        row.evtParamTm != '-' ? Math.floor(row.evtParamTm * 10000) / 100 : null
                                     // boxoList.value.systemType = 'WX'
+                                    boxoList.value.systemType = 'YPT'
                                     wp.value = res.data
                                 }
                                 loading.value = false
@@ -248,7 +269,7 @@ const deviceTypeChange = (val: any, obj: any) => {
 }
 const nodeClick = async (e: anyObj) => {
     // console.log("🚀 ~ nodeClick ~ e:", e)
-    if (e.level == 2&& flag.value) {
+    if (e.level == 2 && flag.value) {
         loading.value = false
         tableStore.table.params.deviceId = e.id
         nextTick(() => {

src/views/govern/cloudDeviceEntry/index.vue

@@ -89,6 +89,7 @@
                                 :rules="{ required: true, message: '请输入设备名称', trigger: 'blur' }"
                             >
                                 <el-select
+                                    clearable
                                     filterable
                                     v-model="project[2].name"
                                     :disabled="true"
@@ -113,6 +114,7 @@
                                 :rules="{ required: true, message: '请选择省', trigger: 'change' }"
                             >
                                 <el-select
+                                    clearable
                                     filterable
                                     v-model="formData.engineeringParam.province"
                                     :disabled="
@@ -139,6 +141,7 @@
                                 :rules="{ required: true, message: '请选择市', trigger: 'change' }"
                             >
                                 <el-select
+                                    clearable
                                     filterable
                                     v-model="formData.engineeringParam.city"
                                     :disabled="
@@ -158,12 +161,12 @@
                                 id="id300"
                                 class="form-item"
                                 label="工程名称:"
-                                
                                 v-if="nodeLevel > 0 || pageStatus == 2"
                                 prop="engineeringParam.name"
                                 :rules="{ required: true, message: '请输入工程名称', trigger: 'blur' }"
                             >
                                 <el-input
+                                    clearable
                                     v-model="formData.engineeringParam.name"
                                     placeholder="请输入工程名称"
                                     :disabled="
@@ -179,6 +182,7 @@
                                 v-if="nodeLevel > 0 || pageStatus == 2"
                             >
                                 <el-input
+                                    clearable
                                     v-model="formData.engineeringParam.description"
                                     placeholder="请输入描述"
                                     :disabled="
@@ -212,6 +216,7 @@
                                                 ]"
                                             >
                                                 <el-input
+                                                    clearable
                                                     v-model="item.name"
                                                     placeholder="请输入项目名称"
                                                     :disabled="
@@ -225,13 +230,14 @@
                                             </el-form-item>
                                             <el-form-item
                                                 class="form-item"
-                                                label="地市:"
+                                                label="地址:"
                                                 :prop="'projectInfoList[' + index + '].area'"
-                                                :rules="[{ required: true, message: '请输入地市', trigger: 'blur' }]"
+                                                :rules="[{ required: true, message: '请输入地址', trigger: 'blur' }]"
                                             >
                                                 <el-input
+                                                    clearable
                                                     v-model="item.area"
-                                                    placeholder="请输入地市"
+                                                    placeholder="请输入地址"
                                                     :disabled="
                                                         !(
                                                             (nodeLevel == 2 && pageStatus == 3) ||
@@ -248,6 +254,7 @@
                                                 :rules="[{ required: true, message: '请输入描述', trigger: 'blur' }]"
                                             >
                                                 <el-input
+                                                    clearable
                                                     v-model="item.description"
                                                     placeholder="请输入描述"
                                                     :disabled="
@@ -293,6 +300,7 @@
                                                 ]"
                                             >
                                                 <el-input
+                                                    clearable
                                                     v-model="busItem.name"
                                                     placeholder="请输入装置名称"
                                                     :disabled="
@@ -314,6 +322,7 @@
                                                 ]"
                                             >
                                                 <el-select
+                                                    clearable
                                                     filterable
                                                     v-model="busItem.devType"
                                                     placeholder="请选择装置类型"
@@ -344,6 +353,7 @@
                                                 ]"
                                             >
                                                 <el-select
+                                                    clearable
                                                     filterable
                                                     v-model="busItem.devModel"
                                                     placeholder="请选择装置型号"
@@ -374,6 +384,7 @@
                                                 ]"
                                             >
                                                 <el-select
+                                                    clearable
                                                     filterable
                                                     v-model="busItem.devAccessMethod"
                                                     placeholder="请选择装置接入方式"
@@ -411,14 +422,19 @@
                                                 :rules="[{ required: true, message: '请输入网络设备ID', trigger: 'blur' }]"
                                                 
                                             >
-                                                <el-input
+                                                <el-input clearable
                                                     v-model="busItem.ndid"
                                                     disabled
                                                     placeholder="请输入网络设备ID"
                                                 ></el-input>
                                             </el-form-item> -->
-                                            <el-form-item class="form-item" label="合同号:"  :prop="'deviceInfoList[' + bIndex + '].cntractNo'">
+                                            <el-form-item
+                                                class="form-item"
+                                                label="合同号:"
+                                                :prop="'deviceInfoList[' + bIndex + '].cntractNo'"
+                                            >
                                                 <el-input
+                                                    clearable
                                                     v-model="busItem.cntractNo"
                                                     placeholder="请输入合同号"
                                                     :disabled="
@@ -439,6 +455,7 @@
                                                 ]"
                                             >
                                                 <el-select
+                                                    clearable
                                                     filterable
                                                     v-model="busItem.nodeId"
                                                     placeholder="请选择所属前置机"
@@ -452,14 +469,45 @@
                                                     ></el-option>
                                                 </el-select>
                                             </el-form-item>
-                                            <el-form-item class="form-item" label="进程号:"  :prop="'deviceInfoList[' + bIndex + '].nodeProcess'">
+                                            <el-form-item
+                                                class="form-item"
+                                                label="进程号:"
+                                                :prop="'deviceInfoList[' + bIndex + '].nodeProcess'"
+                                            >
                                                 <el-input
+                                                    clearable
                                                     v-model="busItem.nodeProcess"
                                                     placeholder="自动分配"
                                                     :disabled="true"
                                                 ></el-input>
                                             </el-form-item>
-
+                                            <el-form-item
+                                                class="form-item"
+                                                label="日志等级:"
+                                                :prop="'deviceInfoList[' + bIndex + '].devLogLevel'"
+                                            >
+                                                <el-select
+                                                    clearable
+                                                    filterable
+                                                    v-model="busItem.devLogLevel"
+                                                    placeholder="请选择日志等级"
+                                                    style="width: 100%"
+                                                    :disabled="
+                                                        !(
+                                                            (nodeLevel == 3 && pageStatus == 3) ||
+                                                            ((nodeLevel == 2 || (nodeLevel == 1 && pageStatus == 2)) &&
+                                                                pageStatus == 2)
+                                                        )
+                                                    "
+                                                >
+                                                    <el-option
+                                                        v-for="value in logList"
+                                                        :key="value.value"
+                                                        :label="value.label"
+                                                        :value="value.value"
+                                                    ></el-option>
+                                                </el-select>
+                                            </el-form-item>
                                             <el-form-item
                                                 class="form-item"
                                                 label="排序:"
@@ -467,6 +515,7 @@
                                                 :rules="[{ required: true, message: '请输入排序', trigger: 'blur' }]"
                                             >
                                                 <el-input
+                                                    clearable
                                                     v-model="busItem.sort"
                                                     placeholder="请输入排序"
                                                     :disabled="
@@ -514,6 +563,7 @@
                                                 }"
                                             >
                                                 <el-input
+                                                    clearable
                                                     v-model="lineItem.name"
                                                     placeholder="请输入监测点名称"
                                                     :disabled="
@@ -536,6 +586,7 @@
                                                 }"
                                             >
                                                 <el-select
+                                                    clearable
                                                     filterable
                                                     v-model="lineItem.lineNo"
                                                     placeholder="请选择线路号"
@@ -562,6 +613,7 @@
                                                 :rules="{ required: true, message: '请选择接线方式', trigger: 'blur' }"
                                             >
                                                 <el-select
+                                                    clearable
                                                     filterable
                                                     v-model="lineItem.conType"
                                                     placeholder="请选择接线方式"
@@ -588,6 +640,7 @@
                                                 :rules="{ required: true, message: '请选择统计间隔', trigger: 'blur' }"
                                             >
                                                 <el-select
+                                                    clearable
                                                     filterable
                                                     v-model="lineItem.lineInterval"
                                                     placeholder="请选择统计间隔"
@@ -614,11 +667,13 @@
                                                 :rules="{ required: true, message: '请输入pt', trigger: 'blur' }"
                                             >
                                                 <div style="width: 100%; display: flex; justify-content: space-between">
-                                                    <el-input-number
+                                                    <el-input
+                                                        clearable-number
                                                         :controls="false"
                                                         :min="1"
                                                         style="width: 48%"
-                                                        v-model="lineItem.ptRatio"
+                                                        oninput="value=value.replace(/[^\d]/g,'')"
+                                                        v-model.number="lineItem.ptRatio"
                                                         :disabled="
                                                             !(
                                                                 (nodeLevel == 4 && pageStatus == 3) ||
@@ -627,7 +682,7 @@
                                                                     pageStatus == 2)
                                                             )
                                                         "
-                                                    ></el-input-number>
+                                                    ></el-input>
                                                     <span
                                                         style="
                                                             display: flex;
@@ -637,11 +692,13 @@
                                                     >
                                                         :
                                                     </span>
-                                                    <el-input-number
+                                                    <el-input
+                                                        clearable-number
                                                         :controls="false"
                                                         :min="1"
                                                         style="width: 48%"
-                                                        v-model="lineItem.pt2Ratio"
+                                                        oninput="value=value.replace(/[^\d]/g,'')"
+                                                        v-model.number="lineItem.pt2Ratio"
                                                         :disabled="
                                                             !(
                                                                 (nodeLevel == 4 && pageStatus == 3) ||
@@ -650,7 +707,7 @@
                                                                     pageStatus == 2)
                                                             )
                                                         "
-                                                    ></el-input-number>
+                                                    ></el-input>
                                                 </div>
                                             </el-form-item>
                                             <el-form-item
@@ -660,11 +717,13 @@
                                                 :rules="{ required: true, message: '请输入ct', trigger: 'blur' }"
                                             >
                                                 <div style="width: 100%; display: flex; justify-content: space-between">
-                                                    <el-input-number
+                                                    <el-input
+                                                        clearable-number
                                                         :controls="false"
                                                         :min="1"
                                                         style="width: 48%"
-                                                        v-model="lineItem.ctRatio"
+                                                        oninput="value=value.replace(/[^\d]/g,'')"
+                                                        v-model.number="lineItem.ctRatio"
                                                         :disabled="
                                                             !(
                                                                 (nodeLevel == 4 && pageStatus == 3) ||
@@ -673,7 +732,7 @@
                                                                     pageStatus == 2)
                                                             )
                                                         "
-                                                    ></el-input-number>
+                                                    ></el-input>
                                                     <span
                                                         style="
                                                             display: flex;
@@ -683,11 +742,13 @@
                                                     >
                                                         :
                                                     </span>
-                                                    <el-input-number
+                                                    <el-input
+                                                        clearable-number
                                                         :controls="false"
                                                         :min="1"
                                                         style="width: 48%"
-                                                        v-model="lineItem.ct2Ratio"
+                                                        oninput="value=value.replace(/[^\d]/g,'')"
+                                                        v-model.number="lineItem.ct2Ratio"
                                                         :disabled="
                                                             !(
                                                                 (nodeLevel == 4 && pageStatus == 3) ||
@@ -696,12 +757,18 @@
                                                                     pageStatus == 2)
                                                             )
                                                         "
-                                                    ></el-input-number>
+                                                    ></el-input>
                                                 </div>
                                             </el-form-item>
 
-                                            <el-form-item class="form-item" label="基准容量(MVA):"  :prop="'lineInfoList[' + lIndex + '].basicCapacity'" :rules="{ required: true, message: '请输入基准容量', trigger: 'blur' }">
-                                                <el-input-number
+                                            <el-form-item
+                                                class="form-item"
+                                                label="基准容量(MVA):"
+                                                :prop="'lineInfoList[' + lIndex + '].basicCapacity'"
+                                                :rules="{ required: true, message: '请输入基准容量', trigger: 'blur' }"
+                                            >
+                                                <el-input
+                                                    clearable-number
                                                     :controls="false"
                                                     :min="0"
                                                     style="width: 100%"
@@ -714,7 +781,7 @@
                                                         )
                                                     "
                                                     placeholder="请输入基准容量(MVA)"
-                                                ></el-input-number>
+                                                ></el-input>
                                             </el-form-item>
                                             <el-form-item
                                                 class="form-item"
@@ -722,7 +789,8 @@
                                                 :prop="'lineInfoList[' + lIndex + '].shortCircuitCapacity'"
                                                 :rules="{ required: true, message: '请输入短路容量', trigger: 'blur' }"
                                             >
-                                                <el-input-number
+                                                <el-input
+                                                    clearable-number
                                                     :controls="false"
                                                     :min="0"
                                                     style="width: 100%"
@@ -735,15 +803,16 @@
                                                         )
                                                     "
                                                     placeholder="请输入短路容量(MVA)"
-                                                ></el-input-number>
+                                                ></el-input>
                                             </el-form-item>
                                             <el-form-item
                                                 class="form-item"
-                                                label="设备容量(MW):"
+                                                label="设备容量(MVA):"
                                                 :prop="'lineInfoList[' + lIndex + '].devCapacity'"
                                                 :rules="{ required: true, message: '请输入设备容量', trigger: 'blur' }"
                                             >
-                                                <el-input-number
+                                                <el-input
+                                                    clearable-number
                                                     :controls="false"
                                                     :min="0"
                                                     style="width: 100%"
@@ -756,15 +825,16 @@
                                                         )
                                                     "
                                                     placeholder="请输入设备容量(MVA)"
-                                                ></el-input-number>
+                                                ></el-input>
                                             </el-form-item>
                                             <el-form-item
                                                 class="form-item"
-                                                label="协议容量(MW):"
+                                                label="协议容量(MVA):"
                                                 :prop="'lineInfoList[' + lIndex + '].protocolCapacity'"
                                                 :rules="{ required: true, message: '请输入协议容量', trigger: 'blur' }"
                                             >
-                                                <el-input-number
+                                                <el-input
+                                                    clearable-number
                                                     :controls="false"
                                                     :min="0"
                                                     style="width: 100%"
@@ -776,8 +846,8 @@
                                                                 pageStatus == 2)
                                                         )
                                                     "
-                                                    placeholder="请输入协议容量(MW)"
-                                                ></el-input-number>
+                                                    placeholder="请输入协议容量(MVA)"
+                                                ></el-input>
                                             </el-form-item>
 
                                             <el-form-item
@@ -787,6 +857,7 @@
                                                 :rules="{ required: true, message: '请选择电压等级', trigger: 'blur' }"
                                             >
                                                 <el-select
+                                                    clearable
                                                     filterable
                                                     v-model="lineItem.volGrade"
                                                     placeholder="请选择电压等级"
@@ -806,13 +877,9 @@
                                                     ></el-option>
                                                 </el-select>
                                             </el-form-item>
-                                            <el-form-item
-                                                class="form-item"
-                                                label="用户对象:"
-                                                   :prop="'lineInfoList[' + lIndex + '].monitorUser'"
-                                                :rules="{ required: true, message: '请选择用户对象', trigger: 'blur' }"
-                                            >
+                                            <el-form-item class="form-item" label="用户对象:">
                                                 <el-select
+                                                    clearable
                                                     filterable
                                                     v-model="lineItem.monitorUser"
                                                     placeholder="请选择用户对象"
@@ -843,6 +910,7 @@
                                                 }"
                                             >
                                                 <el-select
+                                                    clearable
                                                     filterable
                                                     v-model="lineItem.monitorObj"
                                                     placeholder="请选择监测对象类型"
@@ -864,11 +932,43 @@
                                             </el-form-item>
                                             <el-form-item
                                                 class="form-item"
-                                                label="是否治理:"
-                                                   :prop="'lineInfoList[' + lIndex + '].govern'"
-                                                :rules="{ required: true, message: '请选择是否治理', trigger: 'blur' }"
+                                                label="监测位置:"
+                                                :prop="'lineInfoList[' + lIndex + '].position'"
+                                                :rules="{
+                                                    required: true,
+                                                    message: '请选择监测位置',
+                                                    trigger: 'blur'
+                                                }"
                                             >
                                                 <el-select
+                                                    clearable
+                                                    filterable
+                                                    v-model="lineItem.position"
+                                                    placeholder="请选择监测位置"
+                                                    :disabled="
+                                                        !(
+                                                            (nodeLevel == 4 && pageStatus == 3) ||
+                                                            ((nodeLevel == 3 || (nodeLevel == 2 && pageStatus == 2)) &&
+                                                                pageStatus == 2)
+                                                        )
+                                                    "
+                                                >
+                                                    <el-option
+                                                        v-for="option in linePosition"
+                                                        :key="option.id"
+                                                        :label="option.name"
+                                                        :value="option.id"
+                                                    ></el-option>
+                                                </el-select>
+                                            </el-form-item>
+                                            <el-form-item
+                                                class="form-item"
+                                                label="是否治理:"
+                                                :prop="'lineInfoList[' + lIndex + '].govern'"
+                                                :rules="{ required: true, message: '请选择是否治理', trigger: 'change' }"
+                                            >
+                                                <el-select
+                                                    clearable
                                                     filterable
                                                     v-model="lineItem.govern"
                                                     placeholder="请选择是否治理"
@@ -892,6 +992,7 @@
                                             >
                                                 <!-- （0：运行；1：检修；2：停运；3：调试；4：退运） -->
                                                 <el-select
+                                                    clearable
                                                     filterable
                                                     v-model="lineItem.runStatus"
                                                     placeholder="请选择运行状态"
@@ -910,6 +1011,35 @@
                                                     <el-option label="退运" :value="4" />
                                                 </el-select>
                                             </el-form-item>
+                                            <el-form-item
+                                                class="form-item"
+                                                label="日志等级:"
+                                                :prop="'lineInfoList[' + lIndex + '].lineLogLevel'"
+                                                :rules="{ required: true, message: '请选择日志等级', trigger: 'change' }"
+                                            >
+                                                <!-- （0：运行；1：检修；2：停运；3：调试；4：退运） -->
+                                                <el-select
+                                                    clearable
+                                                    filterable
+                                                    v-model="lineItem.lineLogLevel"
+                                                    placeholder="请选择日志等级"
+                                                    :disabled="
+                                                        !(
+                                                            (nodeLevel == 4 && pageStatus == 3) ||
+                                                            ((nodeLevel == 3 || (nodeLevel == 2 && pageStatus == 2)) &&
+                                                                pageStatus == 2)
+                                                        )
+                                                    "
+                                                >
+                                                      <el-option
+                                                        v-for="value in logList"
+                                                        :key="value.value"
+                                                        :label="value.label"
+                                                        :value="value.value"
+                                                    ></el-option>
+                                                </el-select>
+                                            </el-form-item>
+                                            
                                         </div>
                                     </el-tab-pane>
                                 </el-tabs>
@@ -966,8 +1096,8 @@
                     <Loading />
                 </el-icon>
                 <p style="margin-top: 15px; font-size: 16px">正在推送台账信息，请稍候...</p>
-                <p style="margin-top: 10px; color: #999">预计需要30秒左右</p>
-                <p style="margin-top: 10px; color: #999">已等待: {{ countdown }}秒</p>
+                <!-- <p style="margin-top: 10px; color: #999">预计需要30秒左右</p>
+                <p style="margin-top: 10px; color: #999">已等待: {{ countdown }}秒</p> -->
             </div>
         </el-dialog>
     </div>
@@ -1004,7 +1134,7 @@ import MacAddressInput from '@/components/form/mac/MacAddressInput.vue'
 import { auditEngineering } from '@/api/cs-device-boot/edData'
 import { convertToObject } from 'typescript'
 import { Loading } from '@element-plus/icons-vue'
-import { getListByIds } from '@/api/cs-harmonic-boot/recruitment'
+import { getList } from '@/api/cs-harmonic-boot/recruitment'
 import { getDicDataByTypeCode } from '@/api/system-boot/csDictData'
 
 defineOptions({
@@ -1034,7 +1164,8 @@ const devId: any = ref('0')
 const busBarId: any = ref('0')
 const lineId: any = ref('0')
 const userList: any = ref([])
-const monitorObjList: any = ref([])
+const monitorObjList: any = dictData.getBasicData('M_Obj_Types')
+const linePosition: any = dictData.getBasicData('Line_Position')
 
 const currentGdName: any = ref('')
 const affiliatiedFrontArr: any = ref([])
@@ -1047,8 +1178,8 @@ const areaTree: any = tree
 
 const formData = ref({
     lineInfoList: [] as LineInfo[],
-  projectInfoList:[] as ProjectInfo[],
-  deviceInfoList :[] as DeviceInfo[],
+    projectInfoList: [] as ProjectInfo[],
+    deviceInfoList: [] as DeviceInfo[],
     engineeringParam: {
         city: '',
         description: '',
@@ -1057,12 +1188,10 @@ const formData = ref({
     }
 })
 
-
-
 const project = ref([
     { name: '治理设备', value: '治理设备' },
     { name: '便携式设备', value: '便携式设备' },
-    { name: '在线设备', value: '在线设备' }
+    { name: '监测设备', value: '监测设备' }
 ])
 const wiringTypeArr = ref([
     { name: '星型接线', value: 0 },
@@ -1085,6 +1214,24 @@ const lineSpaceArr = ref([
     { name: '5分钟', value: 5 },
     { name: '10分钟', value: 10 }
 ])
+const logList = ref([
+    {
+        value: 'DEBUG',
+        label: 'DEBUG'
+    },
+    {
+        value: 'NORMAL',
+        label: 'NORMAL'
+    },
+    {
+        value: 'WARN',
+        label: 'WARN'
+    },
+    {
+        value: 'ERROR',
+        label: 'ERROR'
+    }
+])
 //工程
 // const engineeringParam = ref({
 //     city: '',
@@ -1105,6 +1252,7 @@ interface DeviceInfo {
     devModel: string
     devType: string
     devAccessMethod: string
+    devLogLevel: string
     mac: string
     ndid: string
     nodeId: string
@@ -1127,7 +1275,9 @@ interface LineInfo {
     devMac: string
     monitorUser: string
     monitorObj: string
+    position: string
     govern: string | number
+    lineLogLevel: string 
     runStatus: string | number
     basicCapacity: number
     shortCircuitCapacity: number
@@ -1289,7 +1439,7 @@ const onAdd = async () => {
     if (timer.value) clearInterval(timer.value)
     timer.value = window.setInterval(() => {
         countdown.value++
-        if (countdown.value >= 30) {
+        if (countdown.value >= 5) {
             clearInterval(timer.value!)
             timer.value = null
         }
@@ -1317,7 +1467,7 @@ const onAdd = async () => {
         // 如果data不是"暂无需要推送的数据"，则继续执行
         if (pushLogResponse.data === '成功') {
             // 等待30秒
-            await new Promise(resolve => setTimeout(resolve, 30000))
+            await new Promise(resolve => setTimeout(resolve, 5000))
 
             // 30秒后调用查询推送结果接口
             const result = await queryPushResult()
@@ -1480,6 +1630,7 @@ const add = () => {
                 devModel: '',
                 devType: '',
                 devAccessMethod: 'CLD',
+                devLogLevel: 'WARN',
                 mac: '',
                 ndid: '',
                 nodeId: '',
@@ -1506,7 +1657,9 @@ const add = () => {
                 monitorUser: '',
                 devMac: '',
                 monitorObj: '',
+                position: '',
                 govern: 0,
+                lineLogLevel: 'WARN',
                 runStatus: 0,
                 basicCapacity: 0,
                 shortCircuitCapacity: 0,
@@ -1621,6 +1774,7 @@ const updateEquipmentFunc = (id: any) => {
         devModel: currentDevice.devModel,
         devType: currentDevice.devType, 
         devAccessMethod: currentDevice.devAccessMethod,
+        devLogLevel: currentDevice.devLogLevel,
         mac: currentDevice.mac,
         nodeId: currentDevice.nodeId,
         cntractNo: currentDevice.cntractNo,
@@ -1682,8 +1836,10 @@ const updateLineFunc = (id: any) => {
         ct2Ratio: currentLine.ct2Ratio || 1,
         monitorUser: currentLine.monitorUser || '',
         monitorObj: currentLine.monitorObj || '',
-        govern: currentLine.govern ,
-        runStatus: currentLine.runStatus ,
+        position: currentLine.position || '',
+        govern: currentLine.govern,
+        lineLogLevel: currentLine.lineLogLevel,
+        runStatus: currentLine.runStatus,
         basicCapacity: currentLine.basicCapacity || 0,
         shortCircuitCapacity: currentLine.shortCircuitCapacity || 0,
         devCapacity: currentLine.devCapacity || 0,
@@ -1848,6 +2004,7 @@ const next = async () => {
                         devModel: '',
                         devType: '',
                         devAccessMethod: 'CLD',
+                         devLogLevel: 'WARN',
                         mac: '',
                         ndid: '',
                         nodeId: '',
@@ -1878,7 +2035,9 @@ const next = async () => {
                         monitorUser: '',
                         devMac: '',
                         monitorObj: '',
+                        position: '',
                         govern: 0,
+                        lineLogLevel:'WARN',
                         runStatus: 0,
                         basicCapacity: 0,
                         shortCircuitCapacity: 0,
@@ -1900,7 +2059,6 @@ const next = async () => {
             }
         }
     })
-    
 }
 
 // 撤销
@@ -1958,7 +2116,6 @@ const onsubmit = async () => {
                 }
             }
         }
-       
     })
 }
 
@@ -2003,7 +2160,9 @@ const submitAllLevelData = async () => {
 
                 case 2: // 工程 + 项目 + 设备
                     // 工程信息
-                    const engineeringData2 = tempAllLevelData.value.engineering || { ...formData.value.engineeringParam }
+                    const engineeringData2 = tempAllLevelData.value.engineering || {
+                        ...formData.value.engineeringParam
+                    }
                     // 项目信息
                     const projectData2 =
                         tempAllLevelData.value.projects.length > 0
@@ -2059,7 +2218,9 @@ const submitAllLevelData = async () => {
                 case 3: // 工程 + 项目 + 设备 + 监测点
                 case 4:
                     // 工程信息
-                    const engineeringData3 = tempAllLevelData.value.engineering || { ...formData.value.engineeringParam }
+                    const engineeringData3 = tempAllLevelData.value.engineering || {
+                        ...formData.value.engineeringParam
+                    }
 
                     // 项目信息
                     const projectData3 =
@@ -2255,10 +2416,8 @@ const submitAllLevelData = async () => {
                     }
                 }, 100)
             })
-
         }
     })
-    
 }
 /**
  * 重置所有表单
@@ -2283,6 +2442,8 @@ const resetAllForms = () => {
         device.devModel = ''
         device.devType = ''
         device.devAccessMethod = 'CLD'
+        device.devLogLevel = 'WARN'
+        
         device.mac = ''
         device.nodeId = ''
         device.cntractNo = ''
@@ -2302,7 +2463,9 @@ const resetAllForms = () => {
         line.volGrade = ''
         line.monitorUser = ''
         line.monitorObj = ''
+        line.position = ''
         line.govern = 0
+        line.lineLogLevel = 'WARN'
         line.runStatus = 0
         line.basicCapacity = 0
         line.shortCircuitCapacity = 0
@@ -2401,6 +2564,7 @@ const submitData = () => {
                         devModel: currentDevice.devModel,
                         devType: currentDevice.devType,
                         devAccessMethod: currentDevice.devAccessMethod,
+                        devLogLevel: currentDevice.devLogLevel,
                         mac: currentDevice.mac,
                         nodeId: currentDevice.nodeId,
                         cntractNo: currentDevice.cntractNo,
@@ -2469,7 +2633,9 @@ const submitData = () => {
                         ct2Ratio: currentLine.ct2Ratio,
                         monitorUser: currentLine.monitorUser,
                         monitorObj: currentLine.monitorObj,
+                        position: currentLine.position,
                         govern: currentLine.govern,
+                        lineLogLevel: currentLine.lineLogLevel,
                         runStatus: currentLine.runStatus,
                         basicCapacity: currentLine.basicCapacity,
                         shortCircuitCapacity: currentLine.shortCircuitCapacity,
@@ -2584,6 +2750,7 @@ const handleBusBarTabsEdit = (targetName: any, action: any) => {
             devModel: '',
             devType: '',
             devAccessMethod: 'CLD',
+             devLogLevel: 'WARN',
             mac: '',
             ndid: '',
             nodeId: '',
@@ -2620,7 +2787,9 @@ const handleBusBarTabsEdit = (targetName: any, action: any) => {
                 } else {
                     // 如果是新增模式下删除未保存的设备
                     formData.value.deviceInfoList.splice(busBarIndex.value, 1)
-                    busBarIndex.value = formData.value.deviceInfoList.length ? (formData.value.deviceInfoList.length - 1).toString() : '0'
+                    busBarIndex.value = formData.value.deviceInfoList.length
+                        ? (formData.value.deviceInfoList.length - 1).toString()
+                        : '0'
                     lineIndex.value = '0'
                     ElMessage({
                         type: 'success',
@@ -2656,7 +2825,9 @@ const handleLineTabsEdit = (targetName: any, action: any) => {
             devMac: '',
             monitorUser: '',
             monitorObj: '',
+            position: '',
             govern: 0,
+            lineLogLevel: 'WARN',
             runStatus: 0,
             basicCapacity: 0,
             shortCircuitCapacity: 0,
@@ -2682,14 +2853,18 @@ const handleLineTabsEdit = (targetName: any, action: any) => {
                         // 从列表中移除
                         formData.value.lineInfoList.splice(lineIndex.value, 1)
                         // 重新设置当前选中的tab
-                        lineIndex.value = formData.value.lineInfoList.length ? (formData.value.lineInfoList.length - 1).toString() : '0'
+                        lineIndex.value = formData.value.lineInfoList.length
+                            ? (formData.value.lineInfoList.length - 1).toString()
+                            : '0'
                         pageStatus.value = 1
                         treedata()
                     })
                 } else {
                     // 如果是新增模式下删除未保存的监测点
                     formData.value.lineInfoList.splice(lineIndex.value, 1)
-                    lineIndex.value = formData.value.lineInfoList.length ? (formData.value.lineInfoList.length - 1).toString() : '0'
+                    lineIndex.value = formData.value.lineInfoList.length
+                        ? (formData.value.lineInfoList.length - 1).toString()
+                        : '0'
                     ElMessage({
                         type: 'success',
                         message: '删除成功'
@@ -2722,7 +2897,7 @@ const treedata = (selectedNodeId?: string) => {
     }
 
     titleList.value = []
-    titleList.value.unshift('在线设备')
+    titleList.value.unshift('监测设备')
 }
 /**
  * 重置初始状态
@@ -2744,7 +2919,7 @@ const reaseStatus = () => {
     currentGdName.value = ''
 }
 
-const area = () => {
+const area = async () => {
     nodeAllList()
         .then(res => {
             affiliatiedFrontArr.value = res.data
@@ -2771,11 +2946,11 @@ const area = () => {
             console.error('查询过程中出现错误:', error)
         })
 
-    getListByIds().then(res => {
-        userList.value = res.data
-    })
-    getDicDataByTypeCode({ dictTypeCode: 'M_Obj_Types' }).then(res => {
-        monitorObjList.value = res.data
+    getList({
+        pageNum: 1,
+        pageSize: 2000
+    }).then(res => {
+        userList.value = res.data.records
     })
 }
 
@@ -2838,7 +3013,7 @@ area()
 
     .el-form-item {
         width: 30%;
-        margin-bottom: 15px;
+        margin-bottom: 15px !important;
 
         .el-select {
             width: 100%;

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

@@ -12,7 +12,7 @@
                 </el-button>
             </template>
         </TableHeader>
-        <Table ref="tableRef" />
+        <Table ref="tableRef" :height="`calc(45vh - 50px)`"/>
     </el-dialog>
     <popup ref="detailRef"></popup>
     <!-- 离线数据导入组件 -->
@@ -82,7 +82,7 @@ const tableStore: any = new TableStore({
             // },
         },
         {
-            title: '操作',
+            title: '操作', fixed: 'right',
             width: '100',
             render: 'buttons',
             buttons: [

src/views/govern/device/control/analysisList/popup.vue

@@ -64,7 +64,7 @@ const tableStore: any = new TableStore({
             }
         },
         {
-            title: '操作',
+            title: '操作', fixed: 'right',
             width: '180',
             render: 'buttons',
             buttons: [

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

@@ -50,10 +50,18 @@
                 </el-descriptions-item> -->
 
                 <el-descriptions-item label="PT变比" width="160">
-                    {{ devData.ptRatio || '/' }}
+                    {{
+                        devData.ptRatio == null
+                            ? '/'
+                            : devData.ptRatio + (devData.pt2Ratio == null ? '' : ':' + devData.pt2Ratio)
+                    }}
                 </el-descriptions-item>
                 <el-descriptions-item label="CT变比" width="160">
-                    {{ devData.ctRatio || '/' }}
+                    {{
+                        devData.ctRatio == null
+                            ? '/'
+                            : devData.ctRatio + (devData.ct2Ratio == null ? '' : ':' + devData.ct2Ratio)
+                    }}
                 </el-descriptions-item>
 
                 <!-- <el-descriptions-item label="名称">
@@ -83,6 +91,7 @@
                     :name="item.id"
                     v-for="(item, index) in deviceData.dataSetList"
                     :key="index"
+                    :disabled="tableLoading"
                 >
                     <template #label>
                         <span class="custom-tabs-label">
@@ -700,7 +709,7 @@ const handleTrend = async () => {
                     // }
                 })
             } else {
-                ElMessage.success('装置应答失败')
+                ElMessage.warning('装置应答失败')
             }
         })
         .catch(e => {
@@ -748,11 +757,13 @@ const handleHarmonicSpectrum = async () => {
 //返回
 const handleReturn = async () => {
     if (realDataTimer.value) {
-        clearInterval(realDataTimer.value)
+        window.clearInterval(realDataTimer.value)
     }
+
     if (trendTimer.value) {
-        clearInterval(trendTimer.value)
+        window.clearInterval(trendTimer.value)
     }
+
     realTimeFlag.value = true
     sonTab.value = null
     activeTrendName.value = 0
@@ -981,10 +992,10 @@ 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
@@ -1152,10 +1163,10 @@ const mqttMessage = ref<any>({})
 const handleClick = async (tab?: any) => {
     tableLoading.value = true
     if (realDataTimer.value) {
-        clearInterval(realDataTimer.value)
+        window.clearInterval(realDataTimer.value)
     }
     if (trendTimer.value) {
-        clearInterval(trendTimer.value)
+        window.clearInterval(trendTimer.value)
     }
     sonTab.value = null
     activeTrendName.value = 0

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

@@ -375,12 +375,12 @@ const changeDataType = () => {
     let flag = dataType.value.includes(0) || dataType.value.includes(1)
     if (flag) {
         let data1 = dataType.value.includes(0)
-            ? list.value[activeTab.value].loadList.map(k => (k.data == 3.14159 ? 0 : k.data))
+            ? list.value[activeTab.value]?.loadList.map(k => (k.data == 3.14159 ? 0 : k.data))
             : [0]
         let data2 = dataType.value.includes(1)
-            ? list.value[activeTab.value].modOutList.map(k => (k.data == 3.14159 ? 0 : k.data))
+            ? list.value[activeTab.value]?.modOutList.map(k => (k.data == 3.14159 ? 0 : k.data))
             : [0]
-        let [modOuMin, modOuMax] = yMethod([...data1, ...data2])
+        let [modOuMin, modOuMax] = yMethod([...data1||[0], ...data2||[0]])
         console.log("🚀 ~ changeDataType ~ modOuMin:", modOuMin,modOuMax)
 
         echartsData.value.yAxis[0] = {

src/views/govern/device/control/supplementaryRecruitment/currentDevice.vue

@@ -16,14 +16,19 @@
             <el-button type="primary" :icon="Setting" @click="handleUpDevice">补召</el-button>
             <el-button :icon="Back" @click="go(-1)">返回</el-button>
         </template>
-
     </TableHeader>
     <!-- 设备补召 -->
-    <div class=" current_device" v-loading="loading">
-
+    <div class="current_device" v-loading="loading">
         <div class="current_body" ref="tbodyRef">
-            <vxe-table border ref="tableRef" :data="dirList" align="center" height="auto"
-                :style="{ height: tableHeight }" @radio-change="radioChangeEvent">
+            <vxe-table
+                border
+                ref="tableRef"
+                :data="dirList"
+                align="center"
+                height="auto"
+                :style="{ height: tableHeight }"
+                @radio-change="radioChangeEvent"
+            >
                 <vxe-column type="radio" width="60">
                     <template #header>
                         <vxe-button mode="text" @click="clearRadioRowEvent" :disabled="!selectRow">取消</vxe-button>
@@ -34,13 +39,20 @@
                 <vxe-column field="status" title="补召进度">
                     <template #default="{ row }">
                         <div class="finish" v-if="row.status == 100">
-                            <SuccessFilled style="width: 16px;" /><span class="ml5">补召完成</span>
+                            <SuccessFilled style="width: 16px" />
+                            <span class="ml5">补召完成</span>
                         </div>
-                        <el-progress v-model.trim="row.status" v-else :class="row.status == 100 ? 'progress' : ''"
-                            :format="format" :stroke-width="10" striped :percentage="row.status" :duration="30"
-                            striped-flow />
-
-
+                        <el-progress
+                            v-model.trim="row.status"
+                            v-else
+                            :class="row.status == 100 ? 'progress' : ''"
+                            :format="format"
+                            :stroke-width="10"
+                            striped
+                            :percentage="row.status"
+                            :duration="30"
+                            striped-flow
+                        />
                     </template>
                 </vxe-column>
                 <vxe-column field="startTime" title="起始时间"></vxe-column>
@@ -58,10 +70,7 @@ import { useRouter, useRoute } from 'vue-router'
 import { mainHeight } from '@/utils/layout'
 import { VxeUI, VxeTableInstance, VxeTableEvents } from 'vxe-table'
 import { SuccessFilled } from '@element-plus/icons-vue'
-import {
-    Back,
-    Setting, Search
-} from '@element-plus/icons-vue'
+import { Back, Setting, Search } from '@element-plus/icons-vue'
 import { ElMessage } from 'element-plus'
 import mqtt from 'mqtt'
 defineOptions({
@@ -75,7 +84,7 @@ const loading = ref(false)
 const dirList = ref([])
 const route: any = ref({})
 const datePickerRef = ref()
-const format = (percentage) => (percentage === 100 ? '完成' : `${percentage}%`)
+const format = percentage => (percentage === 100 ? '完成' : `${percentage}%`)
 const getMakeUpDataList = (row: any) => {
     route.value = row
     loading.value = true
@@ -139,11 +148,11 @@ const handleUpDevice = () => {
 }
 
 const radioChangeEvent: VxeTableEvents.RadioChange = ({ row }) => {
+    datePickerRef.value.timeValue = [row.startTime.split(' ')[0] , row.endTime.split(' ')[0] ]
     selectRow.value = row
     // console.log('单选事件')
 }
 
-
 const clearRadioRowEvent = () => {
     const $table = tableRef.value
     if ($table) {
@@ -173,10 +182,10 @@ const connectMqtt = () => {
 const handleSearch = () => {
     getMakeUpDataList(route.value)
 }
-function parseStringToObject(str:string) {
+function parseStringToObject(str: string) {
     const content = str.replace(/^{|}$/g, '')
     const pairs = content.split(',')
-    const result:any = {}
+    const result: any = {}
     pairs.forEach(pair => {
         const [key, value] = pair.split(':')
         // 尝试将数字转换为Number类型
@@ -210,7 +219,6 @@ mqttRef.value.on('message', (topic: any, message: any) => {
             let percentage = parseInt(Number((mqttMessage.value.nowStep / mqttMessage.value.allStep) * 100)) || 0
             if (percentage > 5) {
                 item.status = percentage
-
             }
         }
         // })
@@ -226,6 +234,8 @@ mqttRef.value.on('close', function () {
     console.log('mqtt客户端已断开连接.....')
 })
 onMounted(() => {
+    datePickerRef.value.setInterval(5)
+    datePickerRef.value.setTimeOptions([{ label: '自定义', value: 5 }])
 })
 onBeforeUnmount(() => {
     if (mqttRef.value) {
@@ -261,14 +271,21 @@ defineExpose({ getMakeUpDataList })
 //     }
 // }
 :deep(.el-progress-bar__inner--striped) {
-    background-image: linear-gradient(45deg, rgba(255, 255, 255, .3) 25%, transparent 0, transparent 50%, rgba(255, 255, 255, .3) 0, rgba(255, 255, 255, .3) 75%, transparent 0, transparent);
-
+    background-image: linear-gradient(
+        45deg,
+        rgba(255, 255, 255, 0.3) 25%,
+        transparent 0,
+        transparent 50%,
+        rgba(255, 255, 255, 0.3) 0,
+        rgba(255, 255, 255, 0.3) 75%,
+        transparent 0,
+        transparent
+    );
 }
 
 :deep(.progress) {
     .el-progress__text {
         color: green;
-
     }
 }
 
@@ -276,6 +293,6 @@ defineExpose({ getMakeUpDataList })
     display: flex;
     justify-content: center;
     font-weight: 550;
-    color: #009688
+    color: #009688;
 }
 </style>

src/views/govern/device/control/supplementaryRecruitment/history.vue

@@ -129,12 +129,12 @@ const form = reactive({
     ndid: ''
 })
 const rules = reactive({
-    name: [{ required: true, message: '设备名不能为空', trigger: 'blur' }],
-    ndid: [{ required: true, message: '网络设备id不能为空', trigger: 'blur' }],
-    devType: [{ required: true, message: '设备类型不能为空', trigger: 'change' }],
-    devModel: [{ required: true, message: '设备型号不能为空', trigger: 'change' }],
-    devAccessMethod: [{ required: true, message: '接入方式不能为空', trigger: 'blur' }],
-    cntractNo: [{ required: true, message: '合同号不能为空', trigger: 'blur' }]
+    name: [{ required: true, message: '请输入设备名', trigger: 'blur' }],
+    ndid: [{ required: true, message: '请输入网络设备id', trigger: 'blur' }],
+    devType: [{ required: true, message: '请选择设备类型', trigger: 'change' }],
+    devModel: [{ required: true, message: '请选择设备型号', trigger: 'change' }],
+    devAccessMethod: [{ required: true, message: '请输入接入方式', trigger: 'blur' }],
+    cntractNo: [{ required: true, message: '请输入合同号', trigger: 'blur' }]
 })
 const dialogFormVisible = ref(false)
 const dialogTitle = ref('新增设备')
@@ -236,7 +236,7 @@ const tableStore = new TableStore({
             // },
         },
         {
-            title: '操作',
+            title: '操作', fixed: 'right',
             align: 'center',
             width: '180',
             render: 'buttons',

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

@@ -4,7 +4,7 @@
         <div class="harmonic_select" v-if="!loading">
             <el-form :model="searchForm" id="history_select">
                 <el-form-item label="稳态指标">
-                    <el-select multiple collapse-tags collapse-tags-tooltip v-model.trim="searchForm.index"
+                    <el-select multiple collapse-tags collapse-tags-tooltip  filterable v-model.trim="searchForm.index"
                         placeholder="请选择统计指标"  :multiple-limit="3" value-key="id">
                         <el-option v-for="(item, index) in indexOptions" :label="item.name" :key="index"
                             :value="item"></el-option>
@@ -347,7 +347,7 @@ const init = () => {
                 //     }
                 // },
                 boundaryGap: false,
-                data: xAixsTimeList.value
+                // data: xAixsTimeList.value
             },
             yAxis: {
                 // type: 'value',

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

@@ -2,7 +2,7 @@
 <template>
     <div class="realtrend" v-loading="loading">
         <div class="select" v-if="!loading">
-            <div class="mr10">谐波次数 </div>
+            <div class="mr10">次数</div>
             <el-select v-model.trim="selectValue" style="width: 100px" @change="selectChange">
                 <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
             </el-select>
@@ -29,24 +29,26 @@
                         </div> -->
                         <div class="realtrend_table" v-if="Object.keys(tableData).length != 0">
                             <div class="thead_left">
-                                <p style="  font-weight: 700; background-color: #F3F6F9;">次数(次)</p>
+                                <p style="font-weight: 700; background-color: #f3f6f9">次数(次)</p>
                                 <p>{{ item.groupName }}{{ item.unit ? '(' + item.unit + ')' : '' }}</p>
                                 <!-- <p>国标限值{{ item.unit ? '(' + item.unit + ')' : '' }}</p> -->
                             </div>
                             <div class="thead_right">
                                 <div class="right_cell" v-for="(value, key, index) in tableData" :key="index">
-                                    <p v-if="item.groupName.includes('间谐波')" style="background-color: #F3F6F9;">
+                                    <p v-if="item.groupName.includes('间谐波')" style="background-color: #f3f6f9">
                                         {{ Number(String(key).replace('data', ' ')) - 0.5 }}
                                     </p>
-                                    <p v-else style="background-color: #F3F6F9;">
+                                    <p v-else style="background-color: #f3f6f9">
                                         <span>{{ String(key).replace('data', ' ') }}</span>
                                     </p>
                                     <p>
-                                        <span v-if="
+                                        <span
+                                            v-if="
                                                 String(key).includes('data') &&
                                                 String(key) != 'dataLevel' &&
                                                 String(key) != 'dataTime'
-                                        ">
+                                            "
+                                        >
                                             {{ value }}
                                         </span>
                                     </p>
@@ -60,10 +62,7 @@
                                         </span>
                                     </p> -->
                                 </div>
-
                             </div>
-
-
                         </div>
                     </div>
                     <div class="tab_info" v-if="Object.keys(tableData).length != 0">
@@ -91,18 +90,17 @@ const selectValue = ref('1')
 const options = [
     {
         value: '3',
-        label: '全部',
+        label: '全部'
     },
 
     {
         value: '1',
-        label: '奇次',
+        label: '奇次'
     },
     {
         value: '2',
-        label: '偶次',
-    },
-
+        label: '偶次'
+    }
 ]
 interface RowVO {
     [key: string]: any
@@ -121,14 +119,7 @@ const gridOptions = ref<VxeGridProps<RowVO>>({
 })
 gridOptions.value = { ...defaultAttribute, ...gridOptions.value }
 
-const tabsList: any = ref([])
-const loading: any = ref(true)
-//接收参数
-const params = ref({})
-const open = async (val: any) => {
-    loading.value = true
-    //获取指标tab
-    tabsList.value = [
+const tabsList: any = ref([
     {
         id: '6d5470f509ca271d7108a86e83bb283f',
         groupName: '谐波电压含有率',
@@ -150,7 +141,36 @@ const open = async (val: any) => {
         thdDataTdVODatas: null,
         unit: '%'
     }
-    ]
+])
+const loading: any = ref(true)
+//接收参数
+const params = ref({})
+const open = async (val: any) => {
+    loading.value = true
+    //获取指标tab
+    // tabsList.value = [
+    //     {
+    //         id: '6d5470f509ca271d7108a86e83bb283f',
+    //         groupName: '谐波电压含有率',
+    //         thdDataVOS: null,
+    //         thdDataTdVODatas: null,
+    //         unit: '%'
+    //     },
+    //     {
+    //         id: '8dc260f16280184e2b57d26668dc00b1',
+    //         groupName: '谐波电流幅值',
+    //         thdDataVOS: null,
+    //         thdDataTdVODatas: null,
+    //         unit: 'A'
+    //     },
+    //     {
+    //         id: 'ae31115b83f02f03a0d3bd65cb017121',
+    //         groupName: '间谐波电压含有率',
+    //         thdDataVOS: null,
+    //         thdDataTdVODatas: null,
+    //         unit: '%'
+    //     }
+    // ]
     if (tabsList.value.length != 0) {
         // activeName.value = tabsList.value[0]?.id
         activeName.value = val.activeTrendName || 0
@@ -222,13 +242,12 @@ const init = () => {
     let list: any = [
         trendData.map((item: any) => {
             return item.value
-        }),
+        })
         // gbData.value.map((item: any) => {
         //     return item.value
         // }),
-
     ]
-    let legendList = [tabsList.value[activeName.value]?.groupName, ]
+    let legendList = [tabsList.value[activeName.value]?.groupName]
     // let legendList = [tabsList.value[activeName.value]?.groupName, '国标限值',]
     // echartsData.value.legend.data = legendList
     list.map((item: any, index: any) => {
@@ -269,11 +288,11 @@ const setRealTrendData = (val: any) => {
     mqttMessage.value = val
     for (let key in val) {
         if (String(key).includes('data') && String(key) != 'dataLevel' && String(key) != 'dataTime') {
-            const numberPart = parseInt(key.replace('data', ''));
+            const numberPart = parseInt(key.replace('data', ''))
             if (selectValue.value != '3') {
                 if (selectValue.value == '2') {
                     if (activeName.value == 2) {
-                        if (numberPart % 2 !== 0) {
+                        if (numberPart % 2 !== 0 && numberPart < 17) {
                             tableData.value[key] = val[key]
                         }
                     } else {
@@ -283,7 +302,7 @@ const setRealTrendData = (val: any) => {
                     }
                 } else {
                     if (activeName.value == 2) {
-                        if (numberPart % 2 === 0) {
+                        if (numberPart % 2 === 0 && numberPart < 17) {
                             tableData.value[key] = val[key]
                         }
                     } else {
@@ -292,19 +311,22 @@ const setRealTrendData = (val: any) => {
                         }
                     }
                 }
-
+            } else {
+                if (activeName.value == 2) {
+                    if (numberPart < 17) {
+                        tableData.value[key] = val[key]
+                    }
                 } else {
                     tableData.value[key] = val[key]
-
                 }
-
+            }
         }
     }
 
     if (!tabsList.value[activeName.value].groupName.includes('间谐波')) {
         delete tableData.value.data1
     } else {
-        console.log('不删除')
+        // console.log('不删除')
     }
     if (Object.keys(tableData.value).length != 0) {
         init()
@@ -327,28 +349,21 @@ const setOverLimitData = (val: any) => {
         if (activeName.value == 0) {
             if (String(key).includes('uharm')) {
                 if (key.startsWith('uharm')) {
-
-                    limitData.value[key] = val[key];
+                    limitData.value[key] = val[key]
                 }
             }
         } else if (activeName.value == 1) {
             if (String(key).includes('iharm')) {
                 limitData.value[key] = val[key]
             }
-
         } else {
             if (String(key).includes('inuharm')) {
                 limitData.value[key] = val[key]
             }
         }
-
-
     }
-
-
-
 }
-onMounted(() => { })
+onMounted(() => {})
 defineExpose({ open, setRealTrendData, setOverLimitData })
 </script>
 <style lang="scss" scoped>
@@ -411,7 +426,6 @@ defineExpose({ open, setRealTrendData, setOverLimitData })
         // }
 
         .realtrend_table {
-
             width: 100%;
             height: auto;
             max-height: 150px;

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

@@ -20,12 +20,13 @@
 
             <el-button @click="handleBack" :icon="Back">返回</el-button>
         </div>
+           <!-- v-loading="loading" -->
         <el-tabs
             class="home_body"
             type="border-card"
             v-model.trim="activeName1"
             @tab-click="handleClick"
-            v-loading="loading"
+         
         >
             <el-tab-pane label="瞬时波形" name="ssbx" :style="'height:' + bxecharts + ';overflow-y: auto;'">
                 <shushiboxi
@@ -122,7 +123,7 @@ const changeView = () => {
     }, 500)
     setTimeout(() => {
         loading.value = false
-    }, 1500)
+    }, 1000)
 }
 const bxecharts: any = ref(mainHeight(190).height as any)
 
@@ -133,7 +134,7 @@ const handleClick = (tab: any, event: any) => {
     }, 500)
     setTimeout(() => {
         loading.value = false
-    }, 1500)
+    }, 1000)
 }
 const handleBack = () => {
     emit('handleHideCharts')

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

@@ -1,7 +1,9 @@
 <template>
     <div class="view">
-        <TableHeader datePicker ref="headerRef" v-if="!isWaveCharts" :showReset="false"></TableHeader>
-        <Table ref="tableRef" v-if="!isWaveCharts" />
+        <div v-show="!isWaveCharts">
+            <TableHeader datePicker ref="headerRef" :showReset="false"></TableHeader>
+            <Table ref="tableRef" />
+        </div>
         <waveFormAnalysis
             v-loading="loading"
             v-if="isWaveCharts"
@@ -56,31 +58,30 @@ const tableStore: any = new TableStore({
             }
         },
         { field: 'startTime', title: '发生时刻', minWidth: 170, sortable: true },
-        { field: 'showName', title: '事件描述', minWidth: 170 },
+        { field: 'showName', title: '事件描述', minWidth: 120 },
         {
             field: 'phaseType',
             title: '相别',
-            minWidth: 100,
+            minWidth: 80,
             formatter: (row: any) => {
-                row.cellValue = row.cellValue ? row.cellValue : '/'
-                return row.cellValue
+                return row.cellValue || '/'
             }
         },
         {
             field: 'persistTime',
             title: '持续时间(s)',
-            minWidth: 100,
+            minWidth: 110,
             formatter: (row: any) => {
-                console.log('row.cellValue', row.cellValue)
-                row.cellValue = row.cellValue ? row.cellValue.toFixed(2) : '/'
-                return row.cellValue
+                // console.log('🚀 ~  row.cellValue:', row.cellValue)
+
+                return row.cellValue ? (row.cellValue - 0).toFixed(2) : '/'
             },
             sortable: true
         },
         {
             field: 'featureAmplitude',
             title: '暂降(聚升)幅值(%)',
-            width: 100,
+            minWidth: 130,
             formatter: (row: any) => {
                 //row.cellValue = row.cellValue + '' ? row.cellValue.toFixed(2) : '/'
                 row.cellValue = row.cellValue != null ? Number(row.cellValue).toFixed(2) : '/'
@@ -92,9 +93,10 @@ const tableStore: any = new TableStore({
         },
         {
             title: '操作',
+            fixed: 'right',
             width: 180,
             render: 'buttons',
-            fixed: 'right',
+
             buttons: [
                 {
                     name: 'edit',
@@ -118,7 +120,9 @@ const tableStore: any = new TableStore({
                                     boxoList.value = row
                                     boxoList.value.systemType = 'YPT'
                                     boxoList.value.engineeringName = tableParams.value.engineeringName
-                                    console.log("🚀 ~ tableParams.value.engineeringName:", tableParams.value.engineeringName)
+                                    boxoList.value.featureAmplitude =
+                                        row.featureAmplitude != null ? Number(row.featureAmplitude / 100) : '-'
+                                    boxoList.value.persistTime = row.persistTime ? row.persistTime.toFixed(2) : '-'
                                     wp.value = res.data
                                     view.value = false
                                     view2.value = true
@@ -132,7 +136,8 @@ const tableStore: any = new TableStore({
 
                         nextTick(() => {
                             waveFormAnalysisRef.value && waveFormAnalysisRef.value.getWpData(wp.value, boxoList.value)
-                            waveFormAnalysisRef.value && waveFormAnalysisRef.value.setHeight(200, 345)
+                            // waveFormAnalysisRef.value && waveFormAnalysisRef.value.setHeight(200, 345)
+                            waveFormAnalysisRef.value && waveFormAnalysisRef.value.setHeight(350, 345)
                         })
                     }
                 },
@@ -194,7 +199,6 @@ 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: () => {}

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

@@ -37,14 +37,16 @@
                     </div>
                 </div>
             </el-collapse-item>
-
-
-
         </el-collapse>
 
         <div class="view_bot">
-            <vxe-table border height="" :data="realList" :column-config="{ resizable: true, tooltip: true }"
-                :tooltip-config="{ enterable: true }">
+            <vxe-table
+                border
+                height=""
+                :data="realList"
+                :column-config="{ resizable: true, tooltip: true }"
+                :tooltip-config="{ enterable: true }"
+            >
                 <vxe-colgroup align="center" :title="`电压有效值(${voltageUnit})`">
                     <vxe-column align="center" field="vRmsA" title="A相"></vxe-column>
                     <vxe-column align="center" field="vRmsB" title="B相"></vxe-column>
@@ -67,10 +69,15 @@
                 </vxe-colgroup>
             </vxe-table>
             <br />
-            <vxe-table border height="" :data="realList" :column-config="{ resizable: true, tooltip: true }"
-                :tooltip-config="{ enterable: true }">
-                <vxe-column align="center" field="freqDev" width="140" title="频率(Hz)"></vxe-column>
-                <vxe-column align="center" field="freq" width="120" title="频率偏差(Hz)"></vxe-column>
+            <vxe-table
+                border
+                height=""
+                :data="realList"
+                :column-config="{ resizable: true, tooltip: true }"
+                :tooltip-config="{ enterable: true }"
+            >
+                <vxe-column align="center" field="freq" width="140" title="频率(Hz)"></vxe-column>
+                <vxe-column align="center" field="freqDev" width="120" title="频率偏差(Hz)"></vxe-column>
                 <vxe-column align="center" width="180" field="vUnbalance" title="电压不平衡度(%)"></vxe-column>
                 <vxe-column align="center" width="180" field="iUnbalance" title="电流不平衡度(%)"></vxe-column>
                 <vxe-colgroup align="center" :title="`基波电压幅值(${voltageUnit})`">
@@ -85,8 +92,13 @@
                 </vxe-colgroup>
             </vxe-table>
             <br />
-            <vxe-table border height="" :data="realList" :column-config="{ resizable: true, tooltip: true }"
-                :tooltip-config="{ enterable: true }">
+            <vxe-table
+                border
+                height=""
+                :data="realList"
+                :column-config="{ resizable: true, tooltip: true }"
+                :tooltip-config="{ enterable: true }"
+            >
                 <vxe-colgroup align="center" title="电压偏差(%)">
                     <vxe-column align="center" field="vDevA" title="A相"></vxe-column>
                     <vxe-column align="center" field="vDevB" title="B相"></vxe-column>
@@ -110,8 +122,13 @@
                 </vxe-colgroup>
             </vxe-table>
             <br />
-            <vxe-table border height="" :data="realList" :column-config="{ resizable: true, tooltip: true }"
-                :tooltip-config="{ enterable: true }">
+            <vxe-table
+                border
+                height=""
+                :data="realList"
+                :column-config="{ resizable: true, tooltip: true }"
+                :tooltip-config="{ enterable: true }"
+            >
                 <vxe-colgroup align="center" :title="`无功功率(${reactivePowerUnit})`">
                     <vxe-column align="center" field="qA" title="A相"></vxe-column>
                     <vxe-column align="center" field="qB" title="B相"></vxe-column>
@@ -128,13 +145,13 @@
                     <vxe-column align="center" field="sC" title="C相"></vxe-column>
                     <vxe-column align="center" field="sTot" title="总"></vxe-column>
                 </vxe-colgroup>
-                <vxe-colgroup align="center" title="功率因数">
+                <vxe-colgroup align="center" title="视在功率因数">
                     <vxe-column align="center" field="pfA" title="A相"></vxe-column>
                     <vxe-column align="center" field="pfB" title="B相"></vxe-column>
                     <vxe-column align="center" field="pfC" title="C相"></vxe-column>
                     <vxe-column align="center" field="pfTot" title="总"></vxe-column>
                 </vxe-colgroup>
-                <vxe-colgroup align="center" title="基波功率因数">
+                <vxe-colgroup align="center" title="位移功率因数">
                     <vxe-column align="center" field="dpfA" title="A相"></vxe-column>
                     <vxe-column align="center" field="dpfB" title="B相"></vxe-column>
                     <vxe-column align="center" field="dpfC" title="C相"></vxe-column>
@@ -142,10 +159,6 @@
                 </vxe-colgroup>
             </vxe-table>
         </div>
-
-
-
-
     </div>
 </template>
 <script lang="ts" setup>
@@ -264,10 +277,17 @@ const initRadioCharts = () => {
                         }
                     },
 
+                    // // 指针设置
+                    // pointer: {
+                    //     length: '80%',
+                    //     width: 3
+                    // },
                     // 指针设置
                     pointer: {
-                        length: '80%',
-                        width: 3
+                        icon: 'path://m368.01136,209.80637l173.00807,-193.72679c19.14653,-21.43943 50.16392,-21.43943 69.31045,0l172.93149,193.72679c1.22537,1.37213 1.22537,3.51607 0,4.8882l-47.63657,53.34133c-1.22538,1.37213 -3.14003,1.37213 -4.36541,0l-113.65381,-127.26452c-1.91465,-2.14395 -5.20785,-0.60031 -5.20785,2.40122l0,731.94254c0,1.88667 -1.37855,3.43031 -3.06345,3.43031l-67.39579,0c-1.6849,0 -3.06345,-1.54364 -3.06345,-3.43031l0,-731.94254c0,-3.08728 -3.2932,-4.54517 -5.20785,-2.40122l-113.65381,127.26452c-1.22538,1.37213 -3.14003,1.37213 -4.36541,0l-47.63657,-53.34133c-1.22537,-1.37213 -1.22537,-3.51607 0,-4.88819l0,-0.00001M539,861.23064h73v800h-73z',
+                        length: '90%',
+                        width: 15,
+                        opacity: 1
                     },
                     detail: {
                         show: false
@@ -364,10 +384,17 @@ const initRadioCharts = () => {
                         }
                     },
 
+                    // // 指针设置
+                    // pointer: {
+                    //     length: '90%',
+                    //     width: 6
+                    // },
                     // 指针设置
                     pointer: {
+                        icon: 'path://m368.01136,209.80637l173.00807,-193.72679c19.14653,-21.43943 50.16392,-21.43943 69.31045,0l172.93149,193.72679c1.22537,1.37213 1.22537,3.51607 0,4.8882l-47.63657,53.34133c-1.22538,1.37213 -3.14003,1.37213 -4.36541,0l-113.65381,-127.26452c-1.91465,-2.14395 -5.20785,-0.60031 -5.20785,2.40122l0,731.94254c0,1.88667 -1.37855,3.43031 -3.06345,3.43031l-67.39579,0c-1.6849,0 -3.06345,-1.54364 -3.06345,-3.43031l0,-731.94254c0,-3.08728 -3.2932,-4.54517 -5.20785,-2.40122l-113.65381,127.26452c-1.22538,1.37213 -3.14003,1.37213 -4.36541,0l-47.63657,-53.34133c-1.22537,-1.37213 -1.22537,-3.51607 0,-4.88819l0,-0.00001M539,861.23064h73v800h-73z',
                         length: '90%',
-                        width: 6
+                        width: 15,
+                        opacity: 1
                     },
                     detail: {
                         show: false
@@ -567,7 +594,7 @@ const apparentPowerUnit = computed(() => {
     return currentDataLevel.value === 'Primary' ? 'kVA' : 'VA'
 })
 
-const setRealData = (val: any,dataLevel:string) => {
+const setRealData = (val: any, dataLevel: string) => {
     // 只有当 dataLevel 真正改变时才更新
     if (dataLevel !== previousDataLevel.value) {
         currentDataLevel.value = dataLevel
@@ -808,7 +835,6 @@ onMounted(() => {
 }
 
 :deep(.view_bot) {
-
     .vxe-table--render-default .vxe-body--column:not(.col--ellipsis),
     .vxe-table--render-default .vxe-footer--column:not(.col--ellipsis),
     .vxe-table--render-default .vxe-header--column:not(.col--ellipsis) {

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

@@ -9,9 +9,11 @@
                     </el-form-item>
                     <el-form-item label="统计指标" label-width="80px">
                         <el-select
+                            style="width: 200px"
                             multiple
                             :multiple-limit="3"
                             collapse-tags
+                            filterable
                             collapse-tags-tooltip
                             v-model="searchForm.index"
                             placeholder="请选择统计指标"
@@ -67,7 +69,7 @@
                                 <el-option
                                     v-for="vv in item.countOptions"
                                     :key="vv"
-                                    :label="vv"
+                                    :label="item.name.includes('间谐波') ? vv - 0.5 : vv"
                                     :value="vv"
                                 ></el-option>
                             </el-select>
@@ -157,7 +159,13 @@ const countOptions: any = ref([])
 // Harmonic_Type
 // portable-harmonic
 const legendDictList: any = ref([])
-queryByCode(props?.TrendList?.lineType == 0 ? 'apf-harmonic' : 'portable-harmonic').then(res => {
+queryByCode(
+    props?.TrendList?.lineType == 0
+        ? 'apf-harmonic'
+        : props?.TrendList?.conType == 1
+        ? 'portable-harmonic-jx'
+        : 'portable-harmonic'
+).then(res => {
     queryCsDictTree(res.data.id).then(item => {
         //排序
         indexOptions.value = item.data.sort((a: any, b: any) => {
@@ -185,15 +193,15 @@ queryByCode(props?.TrendList?.lineType == 0 ? 'apf-harmonic' : 'portable-harmoni
                         if (kk.harmStart && kk.harmEnd) {
                             range(0, 0, 0)
 
-                            if (kk.showName == '间谐波电压含有率') {
-                                countDataCopy.value[index].countOptions = range(kk.harmStart, kk.harmEnd, 1).map(
-                                    (item: any) => {
-                                        return item - 0.5
-                                    }
-                                )
-                            } else {
+                            // if (kk.showName == '间谐波电压含有率') {
+                            //     countDataCopy.value[index].countOptions = range(kk.harmStart, kk.harmEnd, 1).map(
+                            //         (item: any) => {
+                            //             return item - 0.5
+                            //         }
+                            //     )
+                            // } else {
                             countDataCopy.value[index].countOptions = range(kk.harmStart, kk.harmEnd, 1)
-                            }
+                            // }
                             if (!countDataCopy.value[index].count || countDataCopy.value[index].count.length == 0) {
                                 countDataCopy.value[index].count = countDataCopy.value[index].countOptions[0]
                             }
@@ -232,7 +240,7 @@ const init = async () => {
     loading.value = true
     // 选择指标的时候切换legend内容和data数据
     let list: any = []
-    echartsData.value={}
+    echartsData.value = {}
     legendDictList.value?.selectedList?.map((item: any) => {
         searchForm.value.index.map((vv: any) => {
             if (item.dataType == vv) {
@@ -260,7 +268,7 @@ const init = async () => {
     let frequencys: any = null
     countData.value.map((item: any, index: any) => {
         if (item.name.includes('间谐波电压')) {
-            frequencys = item.count + 0.5
+            frequencys = item.count //+ 0.5
         } else {
             frequencys = item.count
         }
@@ -859,4 +867,13 @@ defineExpose({ getTrendRequest })
         min-width: 100px;
     }
 }
+:deep(.el-select__selected-item) {
+    .is-closable {
+        width: 100px !important;
+    }
+}
+
+:deep(.el-form--inline .el-form-item) {
+    margin-right: 15px !important;
+}
 </style>

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

@@ -4,8 +4,8 @@
         <div class="device-manage-right" :style="{ height: pageHeight.height }">
             <el-descriptions title="用户基本信息" class="mb10" :column="2" border>
                 <template #extra>
-                    <el-button type="primary" icon="el-icon-Plus" @click="getMarketEnginner">
-                        添加工程
+                    <el-button type="primary" icon="el-icon-Sort" @click="getMarketEnginner">
+                        绑定工程
                     </el-button>
                 </template>
                 <el-descriptions-item label="名称">
@@ -29,7 +29,7 @@
                 </vxe-table>
             </div>
         </div>
-        <el-dialog v-model.trim="dialogVisible" title="添加工程" class="cn-operate-dialog" :close-on-click-modal="false">
+        <el-dialog v-model.trim="dialogVisible" title="绑定工程" class="cn-operate-dialog" :close-on-click-modal="false">
             <el-input maxlength="32" show-word-limit v-model.trim="filterText" icon="el-icon-Search" placeholder="请输入内容"
                 clearable style="margin-bottom: 10px">
                 <template #prefix>

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

@@ -27,7 +27,7 @@
                 <el-input
                     maxlength="32"
                     show-word-limit
-                    style="width: 200px; height: 32px"
+                    style="width: 240px; height: 32px"
                     placeholder="请输入文件或文件夹名称"
                     clearable
                     v-model.trim="filterText"
@@ -71,7 +71,7 @@
                     v-bind="defaultAttribute"
                 >
                     <vxe-column type="seq" title="序号" width="80"></vxe-column>
-                    <vxe-column field="prjDataPath" align="center" title="名称" #default="{ row }">
+                    <vxe-column field="prjDataPath" align="center" title="名称" minWidth="180" #default="{ row }">
                         <span
                             style="cursor: pointer; color: #551a8b"
                             :style="{
@@ -91,15 +91,15 @@
                         </span>
                     </vxe-column>
 
-                    <vxe-column field="startTime" align="center" title="文件时间" width="240" #default="{ row }">
+                    <vxe-column field="startTime" align="center" title="文件时间" minWidth="140" #default="{ row }">
                         {{ row.startTime ? row.startTime : '/' }}
                     </vxe-column>
-                    <vxe-column field="type" align="center" title="类型" width="120" #default="{ row }">
+                    <vxe-column field="type" align="center" title="类型" minWidth="100" #default="{ row }">
                         <span>
                             {{ row.type == 'dir' ? '文件夹' : row.type == 'file' ? '文件' : '/' }}
                         </span>
                     </vxe-column>
-                    <vxe-column field="size" align="center" width="120" title="大小" #default="{ row }">
+                    <vxe-column field="size" align="center" minWidth="100" title="大小" #default="{ row }">
                         <span>
                             {{ row.size && row.type == 'file' ? row.size + 'KB' : '/' }}
                         </span>
@@ -107,7 +107,7 @@
                     <!--<vxe-column field="fileCheck" align="center" title="文件校验码" width="100" #default="{ row }">
                     {{ row.fileCheck ? row.fileCheck : '/' }}
                 </vxe-column> -->
-                    <vxe-column title="操作" width="200px">
+                    <vxe-column title="操作" width="120px" fixed="right">
                         <template #default="{ row }">
                             <el-button link size="small" type="danger" @click="handleDelDirOrFile(row)">删除</el-button>
                             <el-button
@@ -596,10 +596,10 @@ mqttRef.value.on('connect', (e: any) => {
 })
 const mqttMessage = ref<any>({})
 const status: any = ref()
-function parseStringToObject(str:string) {
+function parseStringToObject(str: string) {
     const content = str.replace(/^{|}$/g, '')
     const pairs = content.split(',')
-    const result:any = {}
+    const result: any = {}
     pairs.forEach(pair => {
         const [key, value] = pair.split(':')
         // 尝试将数字转换为Number类型
@@ -612,7 +612,6 @@ mqttRef.value.on('message', (topic: any, message: any) => {
 
     let str = JSON.parse(JSON.stringify(JSON.parse(new TextDecoder().decode(message))))
 
-
     let regex = /fileName:(.*?),allStep/
     let regex1 = /allStep:(.*?),nowStep/
     let regex2 = /nowStep:(.*?),userId/

src/views/govern/device/fileService/popup.vue

@@ -3,8 +3,10 @@
     <div :class="downLoading ? 'all_disabled' : ''">
         <el-dialog v-model.trim="dialogVisible" title="文件信息" width="50%" @closed="handleClose">
             <div v-loading="loading">
-                <div class="download_progress"
-                    v-if="mqttFileName.includes(fileNameInfoMation) && status != 0 && status != 100">
+                <div
+                    class="download_progress"
+                    v-if="mqttFileName.includes(fileNameInfoMation) && status != 0 && status != 100"
+                >
                     <div class="progress_left">
                         正在下载：
                         {{
@@ -59,6 +61,7 @@ import {
 import { ElMessage } from 'element-plus'
 import { useAdminInfo } from '@/stores/adminInfo'
 import { downLoadFile } from '@/api/cs-system-boot/manage.ts'
+import { log } from 'console'
 const dialogVisible = ref(false)
 const loading = ref(false)
 const adminInfo = useAdminInfo()
@@ -146,8 +149,8 @@ const handleDownLoad = () => {
             }
         })
 }
-onMounted(() => { })
-onUnmounted(() => { })
+onMounted(() => {})
+onUnmounted(() => {})
 const status = ref(0)
 const mqttFileName = ref('')
 const setStatus = (val: any) => {

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

@@ -13,50 +13,67 @@
                     >
                     模版数据分组
                     </el-button> -->
-                    <el-button icon="el-icon-Refresh" v-if="showButtom" @click="handleRestartDevice" type="primary"
-                        :loading="deviceRestartLoading">
+                    <el-button
+                        icon="el-icon-Refresh"
+                        v-if="showButtom && pName == '治理设备'"
+                        @click="handleRestartDevice"
+                        type="primary"
+                        :loading="deviceRestartLoading"
+                    >
                         装置重启
                     </el-button>
                 </template>
                 <el-descriptions-item label="名称">
-                    {{ deviceData.name }}
+                    {{ deviceData.name || '/' }}
                 </el-descriptions-item>
                 <el-descriptions-item label="类型">
-                    {{ echoName(deviceData.devType, devTypeOptions) }}
+                    {{ echoName(deviceData.devType, devTypeOptions) || '/' }}
                 </el-descriptions-item>
 
                 <el-descriptions-item label="接入方式">
-                    {{ deviceData.devAccessMethod }}
+                    {{ deviceData.devAccessMethod || '/' }}
                 </el-descriptions-item>
                 <el-descriptions-item label="网络设备ID">
-                    {{ deviceData.ndid }}
+                    {{ deviceData.ndid || '/' }}
                 </el-descriptions-item>
                 <el-descriptions-item label="型号">
-                    {{ echoName(deviceData.devModel, devModelOptions) }}
+                    {{ echoName(deviceData.devModel, devModelOptions) || '/' }}
                 </el-descriptions-item>
                 <el-descriptions-item label="首次接入日期">
-                    {{ deviceData.time }}
+                    {{ deviceData.time || '/' }}
                 </el-descriptions-item>
                 <el-descriptions-item label="应用程序版本号">
-                    {{ deviceData.appVersion }}
+                    {{ deviceData.appVersion || '/' }}
                 </el-descriptions-item>
                 <el-descriptions-item label="应用程序发布日期">
-                    {{ deviceData.appDate }}
+                    {{ deviceData.appDate || '/' }}
                 </el-descriptions-item>
                 <el-descriptions-item label="应用程序校验码">
-                    {{ deviceData.appCheck }}
+                    {{ deviceData.appCheck || '/' }}
                 </el-descriptions-item>
             </el-descriptions>
             <div style="position: relative">
-
-
-                <el-tabs v-model.trim="dataSet" type="border-card" class="device-manage-box-card"
-                    @tab-click="handleClick">
-                    <el-tab-pane lazy :label="item.name" :name="item.id" v-for="(item, index) in deviceData.dataSetList"
-                        :key="index"></el-tab-pane>
+                <el-tabs
+                    v-model.trim="dataSet"
+                    type="border-card"
+                    class="device-manage-box-card"
+                    @tab-click="handleClick"
+                >
+                    <el-tab-pane
+                        lazy
+                        :label="item.name"
+                        :name="item.id"
+                        v-for="(item, index) in deviceData.dataSetList"
+                        :key="index"
+                    ></el-tab-pane>
                     <div :style="{ height: tableHeight }" v-loading="tableLoading">
-                        <vxe-table v-bind="defaultAttribute" :data="tableData" height="auto" ref="xTableRef"
-                            style="width: 100%">
+                        <vxe-table
+                            v-bind="defaultAttribute"
+                            :data="tableData"
+                            height="auto"
+                            ref="xTableRef"
+                            style="width: 100%"
+                        >
                             <vxe-column type="seq" title="序号" width="80"></vxe-column>
                             <vxe-column field="name" title="数据名称"></vxe-column>
                             <vxe-column field="phasic" title="相别"></vxe-column>
@@ -65,11 +82,11 @@
                             <vxe-column field="startTimes" title="开始次数"></vxe-column>
                             <vxe-column field="endTimes" title="结束次数"></vxe-column>
                         </vxe-table>
-
                     </div>
-
                 </el-tabs>
-                <el-button icon="el-icon-Download" type="primary" @click="exportData" class="export-btn">导出</el-button>
+                <el-button icon="el-icon-Download" type="primary" @click="exportData" class="export-btn">
+                    导出
+                </el-button>
             </div>
         </div>
         <el-empty v-else description="请选择设备" class="device-manage-right" />
@@ -93,21 +110,19 @@ import { ref } from 'vue'
 import { useAdminInfo } from '@/stores/adminInfo'
 import { passwordConfirm } from '@/api/user-boot/user'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import {
-    reStartDevice,
-} from '@/api/cs-device-boot/fileService'
+import { reStartDevice } from '@/api/cs-device-boot/fileService'
 import { defaultAttribute } from '@/components/table/defaultAttribute'
 const pageHeight = mainHeight(20)
 const adminInfo = useAdminInfo()
 const showButtom = ref(adminInfo.roleCode.includes('operation_manager') || adminInfo.roleCode.includes('root'))
-
+const pName = ref('')
 const loading = ref(true)
 const nDid = ref<string>('')
 const tableLoading = ref(false)
 const getGroupLoading = ref(false)
 const deviceData = ref<any>(null)
 const dataSet = ref('')
-const devTypeOptions = ref([])
+const devTypeOptions: any = ref([])
 const devModelOptions = ref([])
 const tableData = ref([])
 const tableHeight = mainHeight(260).height
@@ -119,15 +134,16 @@ const deviceType = ref('0')
 const deviceTypeChange = (val: any, obj: any) => {
     deviceType.value = val
     nodeClick(obj)
-
 }
 // 树节点点击
 const nodeClick = (e: anyObj) => {
+    console.log('🚀 ~ nodeClick ~ e:', e)
     if (!e) {
         loading.value = false
         return
     }
     if (e.level == 2) {
+        pName.value = e.pName
         nDid.value = e.ndid
         loading.value = true
         getDeviceData(e.id, 'rt', '').then((res: any) => {
@@ -159,8 +175,8 @@ const handleClick = () => {
         })
     }, 100)
 }
-queryByCode('Device_Type').then(res => {
-    queryCsDictTree(res.data.id).then(res => {
+queryByCode('Device_Type').then(async res => {
+    await queryCsDictTree(res.data.id).then(res => {
         devTypeOptions.value = res.data.map((item: any) => {
             return {
                 value: item.id,
@@ -169,7 +185,7 @@ queryByCode('Device_Type').then(res => {
             }
         })
     })
-    queryByid(res.data.id).then(res => {
+    await queryByid(res.data.id).then(res => {
         devModelOptions.value = res.data.map((item: any) => {
             return {
                 value: item.id,
@@ -178,9 +194,23 @@ queryByCode('Device_Type').then(res => {
             }
         })
     })
+    await queryByCode('DEV_CLD').then(k => {
+        devTypeOptions.value.push(k.data)
+        return queryCsDictTree(k.data.id).then(s => {
+            let list = s.data.map((item: any) => {
+                return {
+                    value: item.id,
+                    label: item.name,
+                    ...item
+                }
+            })
+
+            devModelOptions.value.push(...list)
+        })
+    })
 })
 const echoName = (value: any, arr: any[]) => {
-    return arr.find(item => item.value == value)?.label
+    return arr.find(item => item.id == value)?.name
 }
 const openGroup = () => {
     if (!dataSet.value) {
@@ -217,18 +247,16 @@ const handleRestartDevice = () => {
         customClass: 'customInput',
         inputType: 'text',
         beforeClose: (action, instance, done) => {
-
             if (action === 'confirm') {
                 if (instance.inputValue == null) {
                     return ElMessage.warning('请输入密码')
                 } else if (instance.inputValue?.length > 32) {
                     return ElMessage.warning('密码长度不能超过32位,当前密码长度为' + instance.inputValue.length)
                 } else {
-                    done();
+                    done()
                 }
-
             } else {
-                done();
+                done()
             }
         }
     })
@@ -241,18 +269,17 @@ const handleRestartDevice = () => {
                 passwordConfirm(value)
                     .then((resp: any) => {
                         if (resp.code == 'A0000') {
-                            reStartDevice({ nDid: nDid.value }).then((res: any) => {
+                            reStartDevice({ nDid: nDid.value })
+                                .then((res: any) => {
                                     deviceRestartLoading.value = false
                                     ElMessage({ message: res.message, type: 'success', duration: 3000 })
-
-                            }).catch(e => {
-
+                                })
+                                .catch(e => {
                                     deviceRestartLoading.value = false
                                 })
                         }
                     })
                     .catch(e => {
-
                         deviceRestartLoading.value = false
                     })
             }
@@ -262,8 +289,6 @@ const handleRestartDevice = () => {
         })
 }
 const exportData = () => {
-
-
     xTableRef.value.exportData({
         filename: deviceData.value.dataSetList.filter((item: any) => item.id == dataSet.value)[0]?.name, // 文件名字
         sheetName: 'Sheet1',

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

@@ -3,7 +3,7 @@
     <OfficialUserTree @node-click="selectUser" @selectUser="selectUser"></OfficialUserTree>
     <div class="device-manage-right" :style="{ height: pageHeight.height }">
       <div class="el-descriptions__header">
-        <el-button type="primary" @click="getEnginnerDev">添加工程 / 设备</el-button>
+        <el-button type="primary"  icon="el-icon-Sort"  @click="getEnginnerDev">绑定工程 / 设备</el-button>
       </div>
 
       <!-- 使用flex布局平均分配高度 -->
@@ -40,7 +40,8 @@
     <!-- 对话框为左右布局 -->
     <el-dialog 
       v-model.trim="dialogVisible" 
-      title="添加工程 / 设备" 
+      draggable
+      title="绑定工程 / 设备" 
       class="cn-operate-dialog" 
       :close-on-click-modal="false"
       

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

@@ -14,6 +14,9 @@ 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')
+defineOptions({
+    name: 'permission'
+})
 </script>
 <style lang="scss" scoped>
 :deep(.el-tabs--border-card > .el-tabs__content) {

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

@@ -73,15 +73,15 @@
                         </el-input>
                     </el-form-item>
                     <el-form-item label="PT变比：" prop="pt">
-                        <el-input maxlength="32" show-word-limit style="width: 48%" v-model.trim="form1.pt"
+                        <el-input maxlength="32" show-word-limit style="width: 48%" v-model.number.trim="form1.pt"
                             autocomplete="off" placeholder="请输入PT变比" oninput="value=value.replace(/[^0-9.]/g,'')" />
-                        <el-input maxlength="32" show-word-limit style="width: 48%" v-model.trim="form1.pt1"
+                        <el-input maxlength="32" show-word-limit style="width: 48%" v-model.number.trim="form1.pt1"
                             autocomplete="off" placeholder="请输入PT变比" oninput="value=value.replace(/[^0-9.]/g,'')" />
                     </el-form-item>
                     <el-form-item label="CT变比：" prop="ct">
-                        <el-input maxlength="32" show-word-limit v-model.trim="form1.ct" style="width: 48%"
+                        <el-input maxlength="32" show-word-limit v-model.number.trim="form1.ct" style="width: 48%"
                             autocomplete="off" oninput="value=value.replace(/[^0-9.]/g,'')" placeholder="请输入CT变比" />
-                        <el-input maxlength="32" show-word-limit v-model.trim="form1.ct1" style="width: 48%"
+                        <el-input maxlength="32" show-word-limit v-model.number.trim="form1.ct1" style="width: 48%"
                             autocomplete="off" oninput="value=value.replace(/[^0-9.]/g,'')" placeholder="请输入CT变比" />
                     </el-form-item>
                     <el-form-item label="监测位置：" prop="location" style="width: 100%">

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

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <Table ref="tableRef" v-if="!isWaveCharts" />
+        <Table ref="tableRef" v-show="!isWaveCharts" />
         <waveFormAnalysis v-loading="loading" v-if="isWaveCharts" ref="waveFormAnalysisRef"
             @handleHideCharts="isWaveCharts = false" :wp="wp" />
     </div>
@@ -77,10 +77,10 @@ const tableStore = new TableStore({
             }, sortable: true
         },
         {
-            title: '操作',
+            title: '操作', fixed: 'right',
             width: 180,
             render: 'buttons',
-            fixed: 'right',
+        
             buttons: [
                 {
                     name: 'edit',

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

@@ -83,12 +83,12 @@
                                     </el-descriptions-item>
                                     <el-descriptions-item label="起始时间" width="160">
                                         <span style="width: 140px; overflow: hidden; display: block">
-                                            {{ item.startTime }}
+                                            {{ item.startTime ||'/' }}
                                         </span>
                                     </el-descriptions-item>
                                     <el-descriptions-item label="结束时间" width="160">
                                         <span style="width: 140px; overflow: hidden; display: block">
-                                            {{ item.endTime }}
+                                            {{ item.endTime||'/'  }}
                                         </span>
                                     </el-descriptions-item>
                                     <el-descriptions-item label="监测位置" width="160">
@@ -120,7 +120,8 @@
                                     <template v-slot:select :key="num">
                                         <el-form-item for="-" label="统计指标">
                                             <el-select
-                                                style="min-width: 200px"
+                                                style="min-width: 240px"
+                                                filterable
                                                 collapse-tags
                                                 collapse-tags-tooltip
                                                 v-model.trim="searchForm.index"
@@ -266,6 +267,11 @@ const dictData = useDictData()
 defineOptions({
     // name: 'govern/device/planData/index'
 })
+const props = defineProps({
+    TrendList: {
+        type: Array
+    }
+})
 const childTab = ref('0')
 const num = ref(0)
 const config = useConfig()
@@ -313,7 +319,12 @@ const countOptions: any = ref([])
 // Harmonic_Type
 // portable-harmonic
 const legendDictList: any = ref([])
-queryByCode('portable-harmonic').then(res => {
+// queryByCode('portable-harmonic').then(res => {
+const getCode = (conType: string) => {
+    let code = volConTypeList.find(vv => {
+        return vv.id == conType
+    })?.code
+    queryByCode(code == 'Star_Triangle' ? 'portable-harmonic-jx' : 'portable-harmonic').then(res => {
         queryCsDictTree(res.data.id).then(item => {
             indexOptions.value = item.data.sort((a: any, b: any) => {
                 return a.sort - b.sort
@@ -341,15 +352,15 @@ queryByCode('portable-harmonic').then(res => {
                             if (kk.harmStart && kk.harmEnd) {
                                 range(0, 0, 0)
 
-                            if (kk.showName == '间谐波电压含有率') {
-                                countDataCopy.value[index].countOptions = range(kk.harmStart, kk.harmEnd, 1).map(
-                                    (item: any) => {
-                                        return item - 0.5
-                                    }
-                                )
-                            } else {
+                                // if (kk.showName == '间谐波电压含有率') {
+                                //     countDataCopy.value[index].countOptions = range(kk.harmStart, kk.harmEnd, 1).map(
+                                //         (item: any) => {
+                                //             return item - 0.5
+                                //         }
+                                //     )
+                                // } else {
                                 countDataCopy.value[index].countOptions = range(kk.harmStart, kk.harmEnd, 1)
-                            }
+                                // }
                                 if (!countDataCopy.value[index].count || countDataCopy.value[index].count.length == 0) {
                                     countDataCopy.value[index].count = countDataCopy.value[index].countOptions[0]
                                 }
@@ -359,7 +370,9 @@ queryByCode('portable-harmonic').then(res => {
                 })
             })
         })
-})
+    })
+}
+// getCode(1)
 const activeName: any = ref()
 const activeColName: any = ref('0')
 const deviceData: any = ref([])
@@ -368,11 +381,15 @@ const schemeTreeRef = ref()
 const historyDevId: any = ref('')
 const chartTitle: any = ref('')
 //点击测试项切换树节点
-const handleClickTabs = () => {
+const handleClickTabs = async () => {
+    await getCode(deviceData.value.records.filter(item => item.id == activeName.value)[0].volConType)
+    await setTimeout(() => {
         searchForm.value.index = [indexOptions.value[0].id]
         historyDevId.value = activeName.value
         schemeTreeRef.value.setCheckedNode(activeName.value)
-    setTimeout(() => {
+    }, 100)
+
+    await setTimeout(() => {
         init(true)
         transientRef.value && transientRef.value.init()
     }, 100)
@@ -391,6 +408,7 @@ const nodeClick = async (e: anyObj) => {
         await getTestRecordInfo(id)
             .then(async res => {
                 deviceData.value = res.data
+
                 if (res.data.records.length == 1) {
                     activeName.value = res.data.records[0].id
                 } else {
@@ -406,6 +424,7 @@ const nodeClick = async (e: anyObj) => {
                         activeName.value = res.data.records[0].id
                     }
                 }
+                getCode(deviceData.value.records.filter(item => item.id == activeName.value)[0].volConType)
 
                 // if (searchForm.value.index.length == 0) {
                 //     searchForm.value.index = [indexOptions.value[0].id]
@@ -498,7 +517,7 @@ const range = (start: any, end: any, step: any) => {
 const colors = ['#DAA520', '#2E8B57', '#A52a2a']
 const lineStyle = [{ type: 'solid' }, { type: 'dashed' }, { type: 'dotted' }]
 
-const titleList: any = ref('')
+const titleList: any = ref('(未绑定数据)')
 const init = (flag: boolean) => {
     titleList.value = ''
     let list: any = []
@@ -547,7 +566,7 @@ const init = (flag: boolean) => {
         let frequencys: any = null
         countData.value.map((item: any, index: any) => {
             if (item.name.includes('间谐波电压')) {
-                frequencys = item.count + 0.5
+                frequencys = item.count //+ 0.5
             } else {
                 frequencys = item.count
             }
@@ -574,6 +593,8 @@ const init = (flag: boolean) => {
             }).then(res => {
                 if (res.data.length == 0) {
                     titleList.value = '(未绑定数据)'
+                } else {
+                    titleList.value = ''
                 }
                 chartTitle.value = chartTitle.value + titleList.value
             })

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

@@ -1,6 +1,7 @@
 <template>
-    <div class=" device-manage" :style="{ height: pageHeight.height }" v-loading="loading">
+    <div class="device-manage" :style="{ height: pageHeight.height }" v-loading="loading">
         <DeviceTree
+            ref="treeRef"
             :showCheckbox="true"
             :default-checked-keys="defaultCheckedKeys"
             @checkChange="checkChange"
@@ -25,13 +26,24 @@ 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'
-
+import { ElMessage } from 'element-plus'
 const pageHeight = mainHeight(60)
 const loading = ref(true)
 const defaultCheckedKeys: any = ref([])
 const tableData = ref([])
-
+const treeRef = ref(null)
+const ignoreCheckChange = ref(false)
 const checkChange = (data: any) => {
+    if (data.data.pName == '便携式设备') {
+        if (ignoreCheckChange.value) {
+            ignoreCheckChange.value = false // 清除标记，不影响后续正常触发
+            return
+        }
+        ignoreCheckChange.value = true
+        ElMessage.warning('便携式设备暂时无法分配给游客！')
+        return treeRef.value?.treRef?.treeRef2?.setCheckedKeys([])
+    }
+
     if (data.data.level === 2) {
         if (data.checked) {
             defaultCheckedKeys.value.push(data.data.id)
@@ -57,13 +69,13 @@ const updateVisitorConfigs = () => {
     })
 }
 const getVisitorConfigs = () => {
-    getVisitorConfig().then((res:any) => {
+    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) => {
+            res.data.forEach((item: any) => {
                 defaultCheckedKeys.value.push(item.deviceId)
             })
         }

src/views/govern/log/debug.vue

@@ -1,10 +1,14 @@
 <template>
     <div class="default-main">
-        <TableHeader datePicker>
+        <TableHeader datePicker showExport>
             <template v-slot:select>
                 <el-form-item label="设备名称">
-                    <el-input maxlength="32" show-word-limit v-model.trim="tableStore.table.params.searchValue"
-                        placeholder="请输入设备名称" />
+                    <el-input
+                        maxlength="32"
+                        show-word-limit
+                        v-model.trim="tableStore.table.params.searchValue"
+                        placeholder="请输入设备名称"
+                    />
                 </el-form-item>
             </template>
         </TableHeader>
@@ -25,25 +29,52 @@ const tableStore = new TableStore({
     url: '/cs-device-boot/process/queryPage',
     method: 'POST',
     column: [
+        {
+            field: 'index',
+            title: '序号',
+            width: '80',
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
         { title: '设备名称', field: 'devName', align: 'center' },
         { title: '操作用户', field: 'operatorName', align: 'center' },
         {
-            title: '操作内容', field: 'process', align: 'center', formatter: (row: any) => {
-                return row.cellValue == 1 ? '设备登记' : row.cellValue == 2 ? '功能调试' : row.cellValue == 3 ? '出厂调试' : row.cellValue == 4 ? '设备投运' : ''
+            title: '操作内容',
+            field: 'process',
+            align: 'center',
+            formatter: (row: any) => {
+                return row.cellValue == 1
+                    ? '设备登记'
+                    : row.cellValue == 2
+                    ? '功能调试'
+                    : row.cellValue == 3
+                    ? '出厂调试'
+                    : row.cellValue == 4
+                    ? '设备投运'
+                    : ''
             }
         },
         { title: '开始时间', field: 'startTime', align: 'center', sortable: true },
-        { title: '结束时间', field: 'endTime', align: 'center', sortable: true }
+        {
+            title: '结束时间',
+            field: 'endTime',
+            align: 'center',
+            sortable: true,
+            formatter: (row: any) => {
+                return row.cellValue || '/'
+            }
+        }
     ],
 
     loadCallback: () => {
         tableStore.table.data.forEach((item: any) => {
             item.result = item.result === 1 ? '成功' : '失败'
-            for (let key in item) {
-                if (typeof item[key] !== 'number') {
-                    item[key] = item[key] || '/'
-                }
-            }
+            // for (let key in item) {
+            //     if (typeof item[key] !== 'number') {
+            //         item[key] = item[key] || '/'
+            //     }
+            // }
         })
     }
 })
@@ -57,5 +88,5 @@ onMounted(() => {
     tableStore.index()
 })
 
-const addMenu = () => { }
+const addMenu = () => {}
 </script>