修改测试问题

.gitignore

@@ -23,3 +23,5 @@ dist-ssr
 *.sln
 *.sw?
 pnpm-lock.yaml
+
+#test

src/api/algorithm-boot/scopeConfig.ts

@@ -0,0 +1,42 @@
+import createAxios from '@/utils/request'
+
+/**
+ * 删除数据合理范围
+ **/
+export const pqDelete = (data: any) => {
+    return createAxios({
+        url: '/algorithm-boot/pqReasonableRange/delete',
+        method: 'post',
+        params: data
+    })
+}
+/**
+ * 按条件获取数据合理范围
+ **/
+export const getData = (data: any) => {
+    return createAxios({
+        url: '/algorithm-boot/pqReasonableRange/getData',
+        method: 'post',
+        data
+    })
+}
+/**
+ * 新增数据合理范围
+ **/
+export const save = (data: any) => {
+    return createAxios({
+        url: '/algorithm-boot/pqReasonableRange/save',
+        method: 'post',
+         data
+    })
+}
+/**
+ * 更新数据合理范围
+ **/
+export const update = (data: any) => {
+    return createAxios({
+        url: '/algorithm-boot/pqReasonableRange/update',
+        method: 'post',
+         data
+    })
+}

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

@@ -1,6 +1,6 @@
 import createAxios from '@/utils/request'
 
-// 装置基础数据和模板数据
+// 设备基础数据和模板数据
 export function getDeviceData(deviceId: string, type: string, lineId: string) {
     let form = new FormData()
     form.append('deviceId', deviceId)
@@ -142,3 +142,11 @@ export function getModuleState(data?: any) {
         params: data
     })
 }
+//获取运行取数
+export function getRawData(data?: any) {
+    return createAxios({
+        url: '/cs-device-boot/pqsCommunicate/getRawData',
+        method: 'POST',
+         data
+    })
+}

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

@@ -1,4 +1,4 @@
-import createAxios from "@/utils/request";
+import createAxios from '@/utils/request'
 
 //根据Id获取台账信息
 export function getInfoById(id: any) {
@@ -11,7 +11,6 @@ export function getInfoById(id: any) {
     })
 }
 
-
 //工程查询通过id获取
 export function getEngineerById(id: any) {
     let form = new FormData()
@@ -23,7 +22,6 @@ export function getEngineerById(id: any) {
     })
 }
 
-
 //项目查询通过id获取
 export function getProjectById(id: any) {
     let form = new FormData()
@@ -53,7 +51,7 @@ export function getById(id: any) {
     return createAxios({
         url: '/cs-device-boot/csline/getById',
         method: 'POST',
-         data: form
+        data: form
     })
 }
 
@@ -75,13 +73,15 @@ export function addLedger(data: any) {
 }
 
 //修改-删除项目
-export function deleteProject(id: any,name:any,area:any,description:any,status:any) {
+export function deleteProject(id: any, name: any, area: any, description: any, status: any, sort: any, topoIds: any) {
     let form = new FormData()
     form.append('id', id)
     form.append('name', name)
     form.append('area', area)
     form.append('description', description)
     form.append('status', status)
+    form.append('sort', sort)
+    form.append('topoIds', topoIds)
     return createAxios({
         url: '/cs-device-boot/project/auditAppProject',
         method: 'post',
@@ -105,7 +105,7 @@ export const deleteLine = (id: any) => {
     let form = new FormData()
     form.append('id', id)
     return createAxios({
-       url: '/cs-device-boot/csline/delCldLine',
+        url: '/cs-device-boot/csline/delCldLine',
         method: 'POST',
         data: form
     })
@@ -120,7 +120,6 @@ export function updateEquipment(data: any) {
     })
 }
 
-
 //修改监测点
 export function updateLine(data: any) {
     return createAxios({
@@ -134,8 +133,7 @@ export function updateLine(data: any) {
 export function pushLog() {
     return createAxios({
         url: '/cs-device-boot/csTerminalLogs/pushCldInfo',
-        method: 'post',
+        method: 'post'
-      
     })
 }
 
@@ -143,7 +141,14 @@ export function pushLog() {
 export function queryPushResult() {
     return createAxios({
         url: '/cs-device-boot/csTerminalReply/queryData',
-        method: 'post',
+        method: 'post'
-       
+    })
+}
+//查询升级日志
+export function getByDevId(data: any) {
+    return createAxios({
+        url: '/cs-device-boot/csUpgradeLogs/getByDevId',
+        method: 'get',
+        params:data
     })
 }

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

@@ -14,7 +14,7 @@ export function getGroup(dataSet: string) {
     })
 }
 
-// 装置分组实时数据
+// 设备分组实时数据
 export function deviceHisData(data: any) {
     return createAxios({
         url: '/cs-device-boot/csGroup/deviceHistoryData',
@@ -33,7 +33,7 @@ export function deviceHisData(data: any) {
     })
 }
 
-// 装置分组历史数据
+// 设备分组历史数据
 export function deviceRtData(data: any) {
     let form = new FormData()
     form.append('id', data.id)
@@ -51,7 +51,7 @@ export function deviceRtData(data: any) {
         data: form
     })
 }
-// 装置分组历史数据
+// 设备分组历史数据
 export function realTimeData(data: any) {
     let form = new FormData()
     form.append('id', data.id)
@@ -76,7 +76,7 @@ export function getTestData(data: any) {
         data
     })
 }
-// 设备监控-删除装置测试项
+// 设备监控-删除设备测试项
 export function deleteItem(data: any) {
     return createAxios({
         url: '/cs-device-boot/wlRecord/deleteItem',

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

@@ -1,18 +1,20 @@
 import createAxios from '@/utils/request'
 
 // 设备列表
-export function getDeviceTree() {
+export function getDeviceTree(params?: any) {
     return createAxios({
         url: '/cs-device-boot/csLedger/deviceTree',
-        method: 'POST'
+        method: 'POST',
+        params
     })
 }
 
 // 监测点列表
-export function getLineTree() {
+export function getLineTree(params?: any) {
     return createAxios({
         url: '/cs-device-boot/csLedger/lineTree',
-        method: 'POST'
+        method: 'POST',
+        params
     })
 }
 // 监测点列表治理

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

@@ -79,4 +79,12 @@ export const addProject = (data: any) => {
         data: data
     })
 }
+// 修改项目
+export const updateProjects = (data: any) => {
+    return request({
+        url: '/cs-device-boot/engineeringProjectRelation/updateProject',
+        method: 'post',
+        data: data
+    })
+}
 

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

@@ -15,7 +15,54 @@ export function getFileServiceFileOrDir(data) {
         method: 'POST'
     })
 }
-
+// 监测设备-目录信息询问
+export function listDir(data) {
+    return createAxios({
+        url: `/zl-event-boot/file/listDir`,
+        method: 'POST',
+        data: data
+    })
+}
+// 下载文件
+export function downloadFileFromFrontr(data: any) {
+    return createAxios({
+        url: `/zl-event-boot/file/downloadFileFromFront`,
+        method: 'POST',
+        data: data,
+        responseType: 'blob'
+    })
+}
+// 删除文件
+export function deleteCld(data: any) {
+    return createAxios({
+        url: `/zl-event-boot/file/delete`,
+        method: 'POST',
+        data: data
+    })
+}
+// 新建文件
+export function mkdir(data: any) {
+    return createAxios({
+        url: `/zl-event-boot/file/mkdir`,
+        method: 'POST',
+        data: data
+    })
+}
+//  上传文件
+export function uploadFileToFront(obj: any) {
+    let form = new FormData()
+    form.append('file', obj.file)
+    form.append('devId', obj.devId)
+    form.append('dirPath', obj.dirPath)
+    return createAxios({
+        url: `/zl-event-boot/file/uploadFileToFront`,
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded'
+        },
+        data: form
+    })
+}
 //设备文件下载
 export function downLoadDeviceFile(data) {
     return createAxios({
@@ -38,7 +85,7 @@ export function downLoadDeviceFilePath(obj) {
         data: form
     })
 }
-//装置重启
+//设备重启
 export function reStartDevice(data) {
     return createAxios({
         url: `/cs-device-boot/EquipmentDelivery/rebootDevice?nDid=${data.nDid}`,
@@ -46,7 +93,7 @@ export function reStartDevice(data) {
     })
 }
 
-//上传文件至装置
+//上传文件至设备
 export function uploadDeviceFile(data) {
     let form = new FormData()
     form.append('file', data.file)

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

@@ -65,3 +65,35 @@ export function savePageIdWithUser(data: any) {
         params: data
     })
 }
+//新增稳态指标方案
+export function save(data: any) {
+    return createAxios({
+        url: '/cs-harmonic-boot/csHarmonicPlan/save',
+        method: 'post',
+        data: data
+    })
+}
+//修改稳态指标方案
+export function update(data: any) {
+    return createAxios({
+        url: '/cs-harmonic-boot/csHarmonicPlan/update',
+        method: 'post',
+        data: data
+    })
+}
+//新增稳态指标方案
+export function deletePlan(data: any) {
+    return createAxios({
+        url: '/cs-harmonic-boot/csHarmonicPlan/delete',
+        method: 'post',
+        data: data
+    })
+}
+//根据ID查询稳态指标方案
+export function getById(data: any) {
+    return createAxios({
+        url: '/cs-harmonic-boot/csHarmonicPlan/getById',
+        method: 'GET',
+        params: data
+    })
+}

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

@@ -8,7 +8,7 @@ export function getMakeUpData(data: any) {
     })
 }
 
-//查询装置目录-文件
+//查询设备目录-文件
 export function getAskDirOrFile(data: any) {
     return createAxios({
         url: `/cs-harmonic-boot/offlineDataUpload/askDirOrFile?fileType=${data.fileType}&nDid=${data.nDid}&path=${data.path}&prjName=${data.prjName}`,

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

@@ -17,14 +17,53 @@ export const queryAppInfo = (type: string) => {
     })
 }
 
-
 /**
  * 新增app基础信息
  **/
-export const addAppInfo = (data: { type: string, content: string }) => {
+export const addAppInfo = (data: { type: string; content: string }) => {
     return createAxios({
         url: '/cs-system-boot/appinfo/addAppInfo',
         method: 'post',
         data: data
     })
 }
+/**
+ * 切换告警配置启用状态
+ **/
+export const toggleActive = (data: any) => {
+    return createAxios({
+        url: '/cs-system-boot/csAlarmSet/toggleActive',
+        method: 'post',
+        params: data
+    })
+}
+/**
+ * 切换告警配置启用状态
+ **/
+export const csDelete = (data: any) => {
+    return createAxios({
+        url: '/cs-system-boot/csAlarmSet/delete',
+        method: 'post',
+        params: data
+    })
+}
+/**
+ * 新增告警配置
+ **/
+export const add = (data: any) => {
+    return createAxios({
+        url: '/cs-system-boot/csAlarmSet/add',
+        method: 'post',
+        data: data
+    })
+}
+/**
+ * 修改告警配置
+ **/
+export const update = (data: any) => {
+    return createAxios({
+        url: '/cs-system-boot/csAlarmSet/update',
+        method: 'post',
+        data: data
+    })
+}

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

@@ -85,7 +85,7 @@ export const portableDeviceRegister = (params: any) => {
 export const portableDeviceAccess = (data: any) => {
     return createAxios({
         url: `/access-boot/device/wlAccess?nDid=${data.nDid}`,
-        method: 'POST',
+        method: 'POST'
     })
 }
 // 下载模版
@@ -96,3 +96,26 @@ export function getExcelTemplate() {
         responseType: 'blob'
     })
 }
+// 查询工程信息列表
+export function engineeringProject() {
+    return createAxios({
+        url: '/cs-device-boot/engineeringProjectRelation/list',
+        method: 'post'
+    })
+}
+//监测设备接入
+export function onlineRegister(data: any) {
+    return createAxios({
+        url: '/access-boot/device/onlineRegister',
+        method: 'post',
+        params: data
+    })
+}
+//重启设备
+export function resetFactory(data: any) {
+    return createAxios({
+        url: '/access-boot/device/resetFactory',
+        method: 'post',
+        params: data
+    })
+}

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

@@ -27,3 +27,23 @@ export const removeUserDev = (data: any) => {
         data: data
     })
 }
+/**
+ * 短信配置
+ */
+export const addUserDevices = (data: any) => {
+    return createAxios({
+        url: '/cs-system-boot/appMsgSet/addUserDevices',
+        method: 'post',
+        data: data
+    })
+}
+/**
+ * 短信配置
+ */
+export const queryDeviceIdsByUserId = (data: any) => {
+    return createAxios({
+        url: '/cs-system-boot/appMsgSet/queryDeviceIdsByUserId',
+        method: 'post',
+        params: data
+    })
+}

src/api/system-boot/dictTree.ts

@@ -94,3 +94,19 @@ export function codeDicTree(data: any) {
         params: data
     })
 }
+// 根据装置型号获取装置类型
+export function findByDevTypeId(data: any) {
+    return createAxios({
+        url: '/cs-device-boot/edData/queryEdDataPage',
+        method: 'post',
+        data
+    })
+}
+// 装置升级
+export function upgrade(params: any) {
+    return createAxios({
+        url: '/zl-event-boot/device/upgrade',
+        method: 'get',
+        params
+    })
+}

src/components/cockpit/F47Curve/index.vue

@@ -147,8 +147,9 @@ const tableStore: any = new TableStore({
                 backgroundColor: 'rgba(0,0,0,0.55)',
                 borderWidth: 0,
                 formatter: function (a: any) {
-                    var relVal = ''
+                    var relVal = `<strong>${a.seriesName}</strong><br/>`
-                    relVal = "<font style='color:" + "'>发生时间:" + a.value[2] + '</font><br/>'
+
+                    relVal += "<font style='color:" + "'>发生时间:" + a.value[2] + '</font><br/>'
                     relVal += "<font style='color:" + "'>持续时间:" + a.value[0] + 's</font><br/>'
                     relVal += "<font style='color:" + "'>特征幅值:" + a.value[1].toFixed(2) + '%</font>'
                     return relVal
@@ -214,18 +215,18 @@ const tableStore: any = new TableStore({
                         //     [0.2, 10, '2023-01-01 10:00:00'],
                         //     [0.4, 50, '2023-01-01 11:00:00']
                         // ],
-                        legendSymbol: 'circle',
+                        legendSymbol: 'circle'
 
-                        tooltip: {
+                        //     tooltip: {
-                            show: true,
+                        //         show: true,
-                            trigger: 'item',
+                        //         trigger: 'item',
-                            formatter: function (params: any) {
+                        //         formatter: function (params: any) {
-                                return `<strong>可容忍事件</strong><br/>
+                        //             return `<strong>可容忍事件</strong><br/>
-                    持续时间: ${params.value[0]}s<br/>
+                        // 持续时间: ${params.value[0]}s<br/>
-                    特征幅值: ${params.value[1].toFixed(2)}%<br/>
+                        // 特征幅值: ${params.value[1].toFixed(2)}%<br/>
-                    发生时间: ${params.value[2] || 'N/A'}`
+                        // 发生时间: ${params.value[2] || 'N/A'}`
-                            }
+                        //         }
-                        }
+                        //     }
                     },
                     {
                         name: '不可容忍事件',

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

@@ -47,7 +47,6 @@ const init = () => {
         tooltip: {
             trigger: 'axis',
             formatter: (params: any) => {
-                console.log('🚀 ~ init ~ params:', params)
                 if (!params || params.length === 0) return ''
 
                 // 使用第一个项目的轴标签作为时间标题
@@ -90,8 +89,6 @@ const initData = async (row: any) => {
             let [min, max] = yMethod(res.data.map((item: any) => item.value.split(',')).flat())
 
             // 从第一条数据中提取时间作为x轴数据
-            const firstItem = res.data[0]
-            const xAxisData = firstItem.time.split(',')
 
             // 定义相位颜色映射
             const phaseColors: any = {
@@ -107,6 +104,7 @@ const initData = async (row: any) => {
                     return a.phasic.localeCompare(b.phasic)
                 })
                 .map((item: any) => {
+                    const xAxisData = item.time.split(',')
                     const values = xAxisData.map((time: string, index: number) => {
                         // 将传入的日期与时间拼接成完整的时间字符串
                         const fullTime = `${row.time} ${time}`

src/components/cockpit/exceedanceLevel/index.vue

@@ -1,27 +1,15 @@
 <template>
     <div>
         <!--指标越限程度 -->
-        <TableHeader
+        <TableHeader ref="TableHeaderRef" :showReset="false" @selectChange="selectChange" datePicker
-            ref="TableHeaderRef"
+            :timeKeyList="prop.timeKey" v-if="fullscreen"></TableHeader>
-            :showReset="false"
+        <my-echart class="tall" :options="echartList"
-            @selectChange="selectChange"
+            :style="{ width: prop.width, height: `calc(${prop.height} / 2 )` }" />
-            datePicker
+        <Table ref="tableRef" @cell-click="cellClickEvent"
-            :timeKeyList="prop.timeKey"
+            :height="`calc(${prop.height} / 2 - ${headerHeight}px + ${fullscreen ? 0 : 56}px )`" isGroup></Table>
-            v-if="fullscreen"
-        ></TableHeader>
-        <my-echart
-            class="tall"
-            :options="echartList"
-            :style="{ width: prop.width, height: `calc(${prop.height} / 2 )` }"
-        />
-        <Table
-            ref="tableRef"
-            @cell-click="cellClickEvent"
-            :height="`calc(${prop.height} / 2 - ${headerHeight}px + ${fullscreen ? 0 : 56}px )`"
-            isGroup
-        ></Table>
         <!-- 指标日趋势图 -->
-        <DailyTrendChart v-if="dialogTrendChart" ref="dailyTrendChartRef" @close="dialogTrendChart = false" />
+        <HarmonicRatio‌ ref="harmonicRatio‌Ref" v-if="dialogFlag" @close="onHarmonicRatioClose" :showIndex="false" />
+        <!-- <DailyTrendChart v-if="dialogTrendChart" ref="dailyTrendChartRef" @close="dialogTrendChart = false" /> -->
     </div>
 </template>
 <script setup lang="ts">
@@ -31,9 +19,10 @@ import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import MyEchart from '@/components/echarts/MyEchart.vue'
 import { getTimeOfTheMonth } from '@/utils/formatTime'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import DailyTrendChart from '@/components/cockpit/exceedanceLevel/components/dailyTrendChart.vue'
 import { getTime } from '@/utils/formatTime'
-
+import HarmonicRatio‌ from '@/components/cockpit/overLimitStatistics/components/harmonicRatio‌.vue'
 const prop = defineProps({
     w: { type: [String, Number] },
     h: { type: [String, Number] },
@@ -47,7 +36,7 @@ const prop = defineProps({
 const TableHeaderRef = ref()
 
 const headerHeight = ref(57)
-
+const harmonicRatio‌Ref: any = ref(null)
 const dialogTrendChart = ref(false)
 
 const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
@@ -143,23 +132,14 @@ const tableStore: any = new TableStore({
     },
     loadCallback: () => {
         // 定义 x 轴标签顺序
-        const xAxisLabels = ['长时闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡']
 
-        // 根据指标名称顺序提取对应的 extent 数据
-        const chartData = xAxisLabels.map(label => {
-            // 在表格数据中查找对应指标名称的数据项
-            const item = tableStore.table.data.find((row: any) => row.name === label)
-            // 如果找到对应项，则返回 extent 值，否则返回 0，并保留两位小数
-            const extentValue = item ? item.extent || 0 : 0
-            return Math.round(extentValue * 100) / 100
-        })
         echartList.value = {
             title: {
                 text: '指标越限严重度'
             },
 
             xAxis: {
-                data: xAxisLabels
+                data: tableStore.table.data.map((item: any) => item.name)
             },
 
             yAxis: {
@@ -175,7 +155,7 @@ const tableStore: any = new TableStore({
                     {
                         type: 'bar',
                         name: '越限占比',
-                        data: chartData,
+                        data: tableStore.table.data.map((item: any) => Math.floor(item.extent * 100) / 100),
                         barMaxWidth: 30
                     }
                 ]
@@ -188,15 +168,32 @@ const tableRef = ref()
 provide('tableRef', tableRef)
 
 provide('tableStore', tableStore)
-
+const codeMap = [
+    { key: '闪变', code: 'flickerOvertime' },
+    { key: '电压偏差', code: 'voltageDevOvertime' },
+    { key: '三相', code: 'ubalanceOvertime' },
+    { key: '谐波电压', code: 'uharm' },
+    { key: '谐波电流', code: 'iharm' },
+];
 // 点击行
 const cellClickEvent = ({ row, column }: any) => {
     dialogTrendChart.value = true
 
-    if (column.field == 'maxValue' && row.lineId) {
+    if (column.field == 'maxValue') {
-        nextTick(() => {
+        if (row.lineId == null) {
-            dailyTrendChartRef.value.open(row)
+            ElMessage.info('暂无越限监测点！')
-        })
+        } else {
+            nextTick(() => {
+                // dailyTrendChartRef.value.open(row)
+                dialogFlag.value = true
+                nextTick(() => {
+
+                    const code = codeMap.find(item => row.name.includes(item.key))?.code || '';
+                    harmonicRatio‌Ref.value.openDialog(row, code, column.title.replace(/次/g, ""))
+                })
+            })
+        }
+
     }
 }
 
@@ -218,6 +215,14 @@ const setTime = () => {
         console.warn('获取时间失败，time 不是一个有效数组')
     }
 }
+const dialogFlag = ref(false)
+// 谐波弹窗关闭时的回调
+const onHarmonicRatioClose = () => {
+    dialogFlag.value = false
+    // 重新打开指标越限详情弹窗
+
+}
+
 
 onMounted(() => {
     tableStore.index()
@@ -238,6 +243,6 @@ watch(
     }
 )
 
-const addMenu = () => {}
+const addMenu = () => { }
 </script>
 <style lang="scss" scoped></style>

src/components/cockpit/governanceReport/index.vue

@@ -1,15 +1,37 @@
 <template>
     <div>
         <!--治理效果报表 -->
-        <TableHeader :showReset="false"  :timeKeyList="prop.timeKey" ref="TableHeaderRef" datePicker @selectChange="selectChange" v-if="fullscreen">
+        <TableHeader
+            :showReset="false"
+            :timeKeyList="prop.timeKey"
+            ref="TableHeaderRef"
+            datePicker
+            @selectChange="selectChange"
+            v-if="fullscreen"
+        >
             <template v-slot:select>
                 <el-form-item label="模板策略">
-                    <el-select filterable v-model="tableStore.table.params.tempId" placeholder="请选择模板策略" clearable>
+                    <el-select
-                        <el-option v-for="item in templateList" :key="item.id" :label="item.excelName" :value="item.id" />
+                        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="监测对象">
-                    <el-select filterable v-model="tableStore.table.params.sensitiveUserId" placeholder="请选择监测对象" clearable>
+                    <el-select
+                        filterable
+                        v-model="tableStore.table.params.sensitiveUserId"
+                        placeholder="请选择监测对象"
+                        clearable
+                    >
                         <el-option v-for="item in idList" :key="item.id" :label="item.name" :value="item.id" />
                     </el-select>
                 </el-form-item>
@@ -43,7 +65,7 @@ const prop = defineProps({
     h: { type: [String, Number] },
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-   timeKey: { type: Array as () => string[] },
+    timeKey: { type: Array as () => string[] },
     timeValue: { type: Object },
     interval: { type: Number }
 })
@@ -59,13 +81,21 @@ const idList = ref()
 // 监测对象
 const initListByIds = () => {
     getListByIds({}).then((res: any) => {
-        if (res.data.length > 0) {
+        if (res.data?.length > 0) {
             idList.value = res.data
 
             if (!tableStore.table.params.sensitiveUserId && idList.value?.length > 0) {
                 tableStore.table.params.sensitiveUserId = idList.value[0].id
             }
             templateListData()
+        } else {
+            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
+                }
+            })
+            tableStore.table.loading = false
         }
     })
 }

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

@@ -93,15 +93,7 @@ const tableStore: any = new TableStore({
                 return `<span style='cursor: pointer;text-decoration: underline;'>${row.flickerOvertime}</span>`
             }
         },
-        {
+            {
-            title: '谐波电压越限(%)',
-            children: loop50('uharm')
-        },
-        {
-            title: '谐波电流越限(%)',
-            children: loop50('iharm')
-        },
-         {
             title: '电压偏差越限(%)',
             field: 'voltageDevOvertime',
             width: '100',
@@ -119,6 +111,15 @@ const tableStore: any = new TableStore({
                 return `<span style='cursor: pointer;text-decoration: underline;'>${row.ubalanceOvertime}</span>`
             }
         },
+        {
+            title: '谐波电压越限(%)',
+            children: loop50('uharm')
+        },
+        {
+            title: '谐波电流越限(%)',
+            children: loop50('iharm')
+        },
+
 
         // {
         //     title: '频率偏差越限(%)',

src/components/cockpit/indicatorCrossingTime/index.vue

@@ -186,7 +186,7 @@ const initProbabilityData = () => {
                             var tips = ''
                             tips += '指标类型: ' + yAxisData[yIndex] + '</br>'
                             tips += '越限程度: ' + params.seriesName + '</br>'
-                            tips += '越限次数: ' + params.value[2] + '</br>'
+                            tips += '越限天数: ' + params.value[2] + '</br>'
                             return tips
                         }
                     },
@@ -228,7 +228,7 @@ const initProbabilityData = () => {
                     },
                     zAxis3D: {
                         type: 'value',
-                        name: '越限次数',
+                        name: '越限天数',
                         nameLocation: 'middle',
                         nameGap: 30,
                         minInterval: 10

src/components/cockpit/indicatorDistribution/index.vue

@@ -185,7 +185,7 @@ const initProbabilityData = () => {
                             var tips = ''
                             tips += '指标类型: ' + yAxisData[yIndex] + '</br>'
                             tips += '越限程度: ' + params.seriesName + '</br>'
-                            tips += '越限次数: ' + params.value[2] + '</br>'
+                            tips += '越限天数: ' + params.value[2] + '</br>'
                             return tips
                         }
                     },
@@ -227,7 +227,7 @@ const initProbabilityData = () => {
                     },
                     zAxis3D: {
                         type: 'value',
-                        name: '越限次数',
+                        name: '越限天数',
                         nameLocation: 'middle',
                         nameGap: 30,
                         minInterval: 10

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

@@ -93,15 +93,7 @@ const tableStore: any = new TableStore({
             customTemplate: (row: any) => {
                 return `<span style='cursor: pointer;text-decoration: underline;'>${row.flickerOvertime}</span>`
             }
-        },
+        }, {
-        {
-            title: '谐波电压越限(分钟)',
-            children: loop50('uharm')
-        },
-        {
-            title: '谐波电流越限(分钟)',
-            children: loop50('iharm')
-        },    {
             title: '电压偏差越限(分钟)',
             field: 'uaberranceOvertime',
             width: '100',
@@ -119,6 +111,14 @@ const tableStore: any = new TableStore({
                 return `<span style='cursor: pointer;text-decoration: underline;'>${row.ubalanceOvertime}</span>`
             }
         },
+        {
+            title: '谐波电压越限(分钟)',
+            children: loop50('uharm')
+        },
+        {
+            title: '谐波电流越限(分钟)',
+            children: loop50('iharm')
+        },
 
         // {
         //     title: '频率偏差越限(分钟)',

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

@@ -73,15 +73,7 @@ const tableStore: any = new TableStore({
             field: 'flicker',
             width: '80'
         },
-        {
+           {
-            title: '谐波电压越限(分钟)',
-            children: loop50('voltage')
-        },
-        {
-            title: '谐波电流越限(分钟)',
-            children: loop50('harmonicCurrent')
-        },
-        {
             title: '三相不平衡度越限(分钟)',
             field: 'flicker',
             width: '100'
@@ -95,7 +87,16 @@ const tableStore: any = new TableStore({
             title: '频率偏差越限(分钟)',
             field: 'flicker',
             width: '100'
-        }
+        },
+        {
+            title: '谐波电压越限(分钟)',
+            children: loop50('voltage')
+        },
+        {
+            title: '谐波电流越限(分钟)',
+            children: loop50('harmonicCurrent')
+        },
+     
     ],
     beforeSearchFun: () => {},
     loadCallback: () => {

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

@@ -92,15 +92,7 @@ const tableStore: any = new TableStore({
                 return `<span style='cursor: pointer;text-decoration: underline;'>${row.flicker}</span>`
             }
         },
-        {
+              {
-            title: '谐波电压越限(分钟)',
-            children: loop50('voltage')
-        },
-        {
-            title: '谐波电流越限(分钟)',
-            children: loop50('harmonicCurrent')
-        },
-        {
             title: '三相不平衡度越限(分钟)',
             field: 'flicker',
             width: '100'
@@ -114,7 +106,16 @@ const tableStore: any = new TableStore({
             title: '频率偏差越限(分钟)',
             field: 'flicker',
             width: '100'
-        }
+        },
+        {
+            title: '谐波电压越限(分钟)',
+            children: loop50('voltage')
+        },
+        {
+            title: '谐波电流越限(分钟)',
+            children: loop50('harmonicCurrent')
+        },
+  
     ],
     beforeSearchFun: () => {},
     loadCallback: () => {

src/components/cockpit/listOfMainMonitoringPoints/index.vue

@@ -150,6 +150,7 @@ const indicatorList = ref()
 
 const initLineList = async () => {
     cslineList({}).then(res => {
+        setTime()
         if (res.data.length == 0) {
             lineShow.value = false
             return (tableStore.table.loading = false)

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

@@ -93,15 +93,7 @@ const tableStore: any = new TableStore({
                 return `<span style='cursor: pointer;text-decoration: underline;'>${row.flickerOvertime}</span>`
             }
         },
-        {
+         {
-            title: '谐波电压越限(%)',
-            children: loop50('uharm')
-        },
-        {
-            title: '谐波电流越限(%)',
-            children: loop50('iharm')
-        },
-             {
             title: '电压偏差越限(%)',
             field: 'voltageDevOvertime',
             width: '100',
@@ -119,6 +111,15 @@ const tableStore: any = new TableStore({
                 return `<span style='cursor: pointer;text-decoration: underline;'>${row.ubalanceOvertime}</span>`
             }
         },
+        {
+            title: '谐波电压越限(%)',
+            children: loop50('uharm')
+        },
+        {
+            title: '谐波电流越限(%)',
+            children: loop50('iharm')
+        },
+            
 
         // {
         //     title: '频率偏差越限(%)',

src/components/cockpit/monitoringPointList/index.vue

@@ -5,10 +5,22 @@
             ref="TableHeaderRef"
             :showReset="false"
             @selectChange="selectChange"
-            
             v-if="fullscreen"
             :timeKeyList="prop.timeKey"
-        ></TableHeader>
+        >
+            <template #select>
+                <el-form-item label="关键字筛选">
+                    <el-input
+                        maxlength="32"
+                        show-word-limit
+                        style="width: 240px"
+                        v-model.trim="tableStore.table.params.searchValue"
+                        clearable
+                        placeholder="请输入监测点名称"
+                    />
+                </el-form-item>
+            </template>
+        </TableHeader>
         <Table
             ref="tableRef"
             @cell-click="cellClickEvent"
@@ -189,7 +201,7 @@ const tableStore: any = new TableStore({
             field: 'volGrade',
             minWidth: '80',
             formatter: (row: any) => {
-                return row.cellValue==0?'/': row.cellValue+'kV' || '/'
+                return row.cellValue == 0 ? '/' : row.cellValue + 'kV' || '/'
             }
         },
         {
@@ -236,7 +248,8 @@ const tableStore: any = new TableStore({
             }
         },
         {
-            title: '操作', fixed: 'right',
+            title: '操作',
+            fixed: 'right',
             width: 150,
             render: 'buttons',
             buttons: [
@@ -294,6 +307,7 @@ const tableStore: any = new TableStore({
 const tableRef = ref()
 provide('tableRef', tableRef)
 tableStore.table.params.keywords = ''
+tableStore.table.params.searchValue = ''
 provide('tableStore', tableStore)
 
 const setTime = () => {
@@ -304,7 +318,6 @@ const setTime = () => {
     //         ? [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]

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

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog draggable title="趋势图" v-model="dialogVisible" append-to-body width="70%">
+    <el-dialog draggable :title="titles" v-model="dialogVisible" append-to-body width="70%">
         <!-- 总体指标占比详情谐波含有率 -->
         <div>
             <TableHeader ref="tableHeaderRef" :showSearch="false" @selectChange="selectChange">
@@ -7,7 +7,7 @@
                     <el-form-item>
                         <DatePicker ref="datePickerRef"></DatePicker>
                     </el-form-item>
-                    <el-form-item label="统计指标" label-width="80px">
+                    <el-form-item label="统计指标" label-width="80px" v-if="props.showIndex">
                         <el-select
                             multiple
                             :multiple-limit="2"
@@ -107,9 +107,14 @@ defineOptions({
 const props = defineProps({
     TrendList: {
         type: Array
+    },
+    showIndex:{
+        type: Boolean,
+        default: true
+    
     }
 })
-
+const titles = ref('趋势图')
 const dialogVisible: any = ref(false)
 // console.log("🚀 ~ props:", props.TrendList)
 const showEchart = ref(true)
@@ -268,6 +273,7 @@ const lineStyle = [{ type: 'solid' }, { type: 'dashed' }, { type: 'dotted' }]
 const init = async () => {
     loading.value = true
     // 选择指标的时候切换legend内容和data数据
+    echartsData.value = {}
     let list: any = []
     legendDictList.value?.selectedList?.map((item: any) => {
         searchForm.value.index.map((vv: any) => {
@@ -407,6 +413,7 @@ const setEchart = () => {
             formatter(params: any) {
                 const xname = params[0].value[0]
                 let str = `${xname}<br>`
+
                 params.forEach((el: any, index: any) => {
                     let marker = ''
 
@@ -651,6 +658,7 @@ watch(
 )
 
 const openDialog = async (row: any, field: any, title: any) => {
+    titles.value = `${row?.lineName ? `${row.lineName}_` : ''}趋势图`
     dialogVisible.value = true
     trendRequestData.value = row
 

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

@@ -92,14 +92,6 @@ const tableStore: any = new TableStore({
             customTemplate: (row: any) => {
                 return `<span style='cursor: pointer;text-decoration: underline;'>${row.flickerOvertime}</span>`
             }
-        },
-        {
-            title: '谐波电压越限(%)',
-            children: loop50('uharm')
-        },
-        {
-            title: '谐波电流越限(%)',
-            children: loop50('iharm')
         },
          {
             title: '电压偏差越限(%)',
@@ -119,6 +111,15 @@ const tableStore: any = new TableStore({
                 return `<span style='cursor: pointer;text-decoration: underline;'>${row.ubalanceOvertime}</span>`
             }
         },
+        {
+            title: '谐波电压越限(%)',
+            children: loop50('uharm')
+        },
+        {
+            title: '谐波电流越限(%)',
+            children: loop50('iharm')
+        },
+
 
         // {
         //     title: '频率偏差越限(%)',

src/components/cockpit/sensitiveLoad/index.vue

@@ -5,10 +5,22 @@
             ref="TableHeaderRef"
             :showReset="false"
             @selectChange="selectChange"
-            
             v-if="fullscreen"
             :timeKeyList="prop.timeKey"
-        ></TableHeader>
+        >
+            <template #select>
+                <el-form-item label="关键字筛选">
+                    <el-input
+                        maxlength="32"
+                        show-word-limit
+                        style="width: 240px"
+                        v-model.trim="tableStore.table.params.searchValue"
+                        clearable
+                        placeholder="请输入敏感负荷名称"
+                    />
+                </el-form-item>
+            </template>
+        </TableHeader>
         <Table
             ref="tableRef"
             @cell-click="cellClickEvent"
@@ -66,7 +78,7 @@ const fullscreen = computed(() => {
 
 const OverLimitDetailsRef = ref()
 const tableStore: any = new TableStore({
-    url: '/cs-harmonic-boot/pqSensitiveUser/getList',
+    url: '/cs-harmonic-boot/pqSensitiveUser/getListByUser',
     method: 'POST',
     showPage: fullscreen.value ? true : false,
     column: [
@@ -115,7 +127,7 @@ const tableStore: any = new TableStore({
 
     loadCallback: () => {}
 })
-
+tableStore.table.params.searchValue = ''
 const tableRef = ref()
 provide('tableRef', tableRef)
 
@@ -137,7 +149,6 @@ const setTime = () => {
     //         ? [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]

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

@@ -4,8 +4,8 @@
         <el-dialog draggable title="暂态事件详情 " v-model="dialogVisible" append-to-body width="70%">
             <TableHeader datePicker showExport :showReset="false" ref="tableHeaderRef" @selectChange="selectChange">
                 <template v-slot:select>
-                    <el-form-item label="监测点">
+                    <el-form-item label="监测点" v-if="props.showLine">
-                        <el-select v-model="tableStore.table.params.lineId" placeholder="请选择监测点名称">
+                        <el-select v-model="tableStore.table.params.lineId" filterable placeholder="请选择监测点名称">
                             <el-option
                                 v-for="item in options"
                                 :key="item.value"
@@ -14,6 +14,21 @@
                             />
                         </el-select>
                     </el-form-item>
+                    <el-form-item label="暂态类型">
+                        <el-select
+                            v-model="tableStore.table.params.eventType"
+                            style="min-width: 150px"
+                            clearable
+                            placeholder="请选择暂态类型"
+                        >
+                            <el-option
+                                v-for="item in eventList"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            />
+                        </el-select>
+                    </el-form-item>
                 </template>
             </TableHeader>
             <Table ref="tableRef" isGroup :height="heightRef"></Table>
@@ -46,6 +61,13 @@ import { mainHeight } from '@/utils/layout'
 import waveFormAnalysis from '@/views/govern/device/control/tabs/components/waveFormAnalysis.vue'
 import { analyseWave } from '@/api/common'
 import { getSimpleLine } from '@/api/harmonic-boot/cockpit/cockpit'
+interface Props {
+    showLine?: boolean
+}
+
+const props = withDefaults(defineProps<Props>(), {
+    showLine: true
+})
 
 const dialogVisible: any = ref(false)
 const waveFormAnalysisRef: any = ref(null)
@@ -62,7 +84,11 @@ const heightRef = ref(mainHeight(168, 2.1).height)
 const selectChange = (flag: boolean, h: any) => {
     heightRef.value = mainHeight(h, 2.1).height
 }
-
+const eventList = [
+    { label: '电压暂降', value: '1' },
+    { label: '电压中断', value: '2' },
+    { label: '电压暂升', value: '3' }
+]
 const getSimpleLineList = async () => {
     const res = await getSimpleLine()
     options.value = res.data
@@ -200,9 +226,10 @@ const tableStore: any = new TableStore({
     beforeSearchFun: () => {},
     loadCallback: () => {}
 })
-
+tableStore.table.params.eventType = ''
 provide('tableStore', tableStore)
 const open = async (time: any) => {
+    tableStore.table.params.eventType = ''
     dialogVisible.value = true
     getSimpleLineList()
     tableStore.table.params.lineId = ''

src/components/cockpit/transientDetails/index.vue

@@ -7,7 +7,7 @@
             @selectChange="selectChange"
             datePicker
             v-if="fullscreen"
-             :timeKeyList="prop.timeKey"
+            :timeKeyList="prop.timeKey"
         ></TableHeader>
         <el-calendar
             v-model="value"
@@ -58,7 +58,7 @@
             </template>
         </el-calendar>
         <!-- 暂态事件列表  -->
-        <TransientList ref="transientListRef" />
+        <TransientList ref="transientListRef" :showLine="false" />
     </div>
 </template>
 <script setup lang="ts">
@@ -74,7 +74,7 @@ const prop = defineProps({
     h: { type: [String, Number] },
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-   timeKey: { type: Array as () => string[] },
+    timeKey: { type: Array as () => string[] },
     timeValue: { type: Object },
     interval: { type: Number }
 })

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

@@ -14,6 +14,21 @@
                             />
                         </el-select>
                     </el-form-item>
+                    <el-form-item label="暂态类型">
+                        <el-select
+                            v-model="tableStore.table.params.eventType"
+                            style="min-width: 150px"
+                            clearable
+                            placeholder="请选择暂态类型"
+                        >
+                            <el-option
+                                v-for="item in eventList"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            />
+                        </el-select>
+                    </el-form-item>
                 </template>
             </TableHeader>
             <Table ref="tableRef" isGroup :height="heightRef"></Table>
@@ -62,7 +77,11 @@ const heightRef = ref(mainHeight(168, 2.2).height)
 const selectChange = (flag: boolean, h: any) => {
     heightRef.value = mainHeight(h, 2.2).height
 }
-
+const eventList = [
+    { label: '电压暂降', value: '1' },
+    { label: '电压中断', value: '2' },
+    { label: '电压暂升', value: '3' }
+]
 const getSimpleLineList = async () => {
     const res = await getSimpleLine()
     options.value = res.data
@@ -201,9 +220,10 @@ const tableStore: any = new TableStore({
     beforeSearchFun: () => {},
     loadCallback: () => {}
 })
-
+tableStore.table.params.eventType = ''
 provide('tableStore', tableStore)
 const open = async (row: any, searchBeginTime: any, searchEndTime: any) => {
+    tableStore.table.params.eventType = ''
     dialogVisible.value = true
     getSimpleLineList()
     tableStore.table.params.lineId = row.id

src/components/echarts/MyEchart.vue

@@ -106,13 +106,15 @@ const initChart = () => {
                 start: 0,
 
                 bottom: '20px',
-                end: 100
+                end: 100,
+                filterMode: 'none'
             },
             {
                 start: 0,
                 height: 13,
                 bottom: '20px',
-                end: 100
+                end: 100,
+                filterMode: 'none'
             }
             // {
             //     show: true,

src/components/echarts/rmsboxi.vue

@@ -748,8 +748,10 @@ const initWave = (
                 rotation: 0,
                 y: -10
             },
-            max: rmscm[0]?.[1] * 1.06 || 0,
+            // max: rmscm[0]?.[1] * 1.06 || 0,
-            min: rmscu[0]?.[1] - rmscu[0]?.[1] * 0.2 || 0,
+            // min: rmscu[0]?.[1] - rmscu[0]?.[1] * 0.2 || 0,
+            max: Math.floor((rmscm[0]?.[1] * 1.06 || 0) * 1.1 * 10) / 10,
+            min: Math.floor((rmscu[0]?.[1] - rmscu[0]?.[1] * 0.2 || 0) * 10) / 10,
             boundaryGap: [0, '100%'],
             showLastLabel: true,
             opposite: false,
@@ -780,11 +782,11 @@ const initWave = (
             }
         },
         grid: {
-            left: '1%',
+            left: '60px',
             right: '45px',
             bottom: '40px',
-            top: '60px',
+            top: '60px'
-            containLabel: true
+            // containLabel: true
         },
         dataZoom: [
             {
@@ -1077,6 +1079,8 @@ const drawPics = (
             boundaryGap: [0, '100%'],
             showLastLabel: true,
             opposite: false,
+            // max: Math.floor((rmscm[0]?.[1] * 1.06 || 0) * 1.1 * 10) / 10,
+            // min: Math.floor((rmscu[0]?.[1] - rmscu[0]?.[1] * 0.2 || 0) * 10) / 10,
             nameTextStyle: {
                 fontSize: '12px',
                 color: props.DColor ? '#000' : echartsColor.WordColor
@@ -1105,11 +1109,11 @@ const drawPics = (
             }
         },
         grid: {
-            left: '1%',
+            left: '60px',
             right: '45px',
             bottom: '40px',
-            top: '60px',
+            top: '60px'
-            containLabel: true
+            // containLabel: true
         },
         dataZoom: [
             {

src/components/echarts/shushiboxi.vue

@@ -481,8 +481,10 @@ const initWave = (
             },
             boundaryGap: [0, '100%'],
             showLastLabel: true,
-            max: max.toFixed(2) * 1.1,
+            // max: max.toFixed(2) * 1.1,
-            min: min.toFixed(2) > 0 ? min.toFixed(2) - min.toFixed(2) * 0.1 : min.toFixed(2) * 1.1,
+            // min: min.toFixed(2) > 0 ? min.toFixed(2) - min.toFixed(2) * 0.1 : min.toFixed(2) * 1.1,
+               max: Math.floor(max.toFixed(2) * 1.1 * 10) / 10,
+            min: Math.floor(min.toFixed(2) > 0 ? min.toFixed(2) - min.toFixed(2) * 0.1 : min.toFixed(2) * 1.1 * 10) / 10  ,
             opposite: false,
             nameTextStyle: {
                 fontSize: '12px',
@@ -512,11 +514,11 @@ const initWave = (
             }
         },
         grid: {
-            left: '1%',
+            left: '60px',
             right: '45px',
             bottom: '40px',
-            top: '60px',
+            top: '60px'
-            containLabel: true
+            // containLabel: true
         },
         dataZoom: [
             {
@@ -789,8 +791,8 @@ const drawPics = (
             },
             boundaryGap: [0, '100%'],
             showLastLabel: true,
-            max: max.toFixed(2) * 1.1,
+            max: Math.floor(max.toFixed(2) * 1.1 * 10) / 10,
-            min: min.toFixed(2) > 0 ? min.toFixed(2) - min.toFixed(2) * 0.1 : min.toFixed(2) * 1.1,
+            min: Math.floor(min.toFixed(2) > 0 ? min.toFixed(2) - min.toFixed(2) * 0.1 : min.toFixed(2) * 1.1 * 10) / 10  ,
             opposite: false,
             nameTextStyle: {
                 fontSize: '12px',
@@ -820,11 +822,11 @@ const drawPics = (
             }
         },
         grid: {
-            left: '1%',
+            left: '60px',
             right: '45px',
             bottom: '40px',
-            top: '60px',
+            top: '60px'
-            containLabel: true
+            // containLabel: true
         },
         dataZoom: [
             {

src/components/form/mac/MacAddressInput.vue

@@ -1,35 +1,36 @@
 <template>
-  <div class="mac-address-input" :class="{ disabled: disabled }">
+    <div class="mac-address-input" :class="{ disabled: disabled }">
-    <el-input
+        <el-input
-      ref="inputRef"
+            ref="inputRef"
-      v-model="macValue"
+            placeholder="请输入设备mac地址"
-      type="text"
+            v-model="macValue"
-      maxlength="17"
+            type="text"
-      :disabled="disabled"
+            maxlength="17"
-      @input="handleInput"
+            :disabled="disabled"
-      @keydown="handleKeydown"
+            @input="handleInput"
-      @focus="handleFocus"
+            @keydown="handleKeydown"
-      @blur="handleBlur"
+            @focus="handleFocus"
-      @paste="handlePaste"
+            @blur="handleBlur"
-    />
+            @paste="handlePaste"
-  </div>
+        />
+    </div>
 </template>
 
 <script setup lang="ts">
 import { ref, watch } from 'vue'
 
 interface Props {
-  modelValue?: string
+    modelValue?: string
-  disabled?: boolean
+    disabled?: boolean
 }
 
 interface Emits {
-  (e: 'update:modelValue', value: string): void
+    (e: 'update:modelValue', value: string): void
 }
 
 const props = withDefaults(defineProps<Props>(), {
-  modelValue: '',
+    modelValue: '',
-  disabled: false
+    disabled: false
 })
 
 const emit = defineEmits<Emits>()
@@ -42,35 +43,35 @@ const macValue = ref<string>('')
 
 // 解析传入的MAC地址
 const parseMacAddress = (mac: string): string => {
-  if (!mac) return ''
+    if (!mac) return ''
 
-  // 移除非十六进制字符并转为大写
+    // 移除非十六进制字符并转为大写
-  const cleanMac = mac.replace(/[^0-9a-fA-F]/g, '').toUpperCase()
+    const cleanMac = mac.replace(/[^0-9a-fA-F]/g, '').toUpperCase()
 
-  // 按每2个字符分割并用冒号连接
+    // 按每2个字符分割并用冒号连接
-  let result = ''
+    let result = ''
-  for (let i = 0; i < cleanMac.length; i += 2) {
+    for (let i = 0; i < cleanMac.length; i += 2) {
-    if (i > 0) result += ':'
+        if (i > 0) result += ':'
-    result += cleanMac.substr(i, 2)
+        result += cleanMac.substr(i, 2)
-  }
+    }
-  return result.substring(0, 17) // 最多17个字符 (12个数字+5个冒号)
+    return result.substring(0, 17) // 最多17个字符 (12个数字+5个冒号)
 }
 
 // 格式化MAC地址 - 改进版
 const formatMac = (value: string): string => {
-  // 移除所有冒号
+    // 移除所有冒号
-  const cleanValue = value.replace(/:/g, '')
+    const cleanValue = value.replace(/:/g, '')
-  // 只保留十六进制字符并转为大写
+    // 只保留十六进制字符并转为大写
-  const hexOnly = cleanValue.replace(/[^0-9a-fA-F]/g, '').toUpperCase()
+    const hexOnly = cleanValue.replace(/[^0-9a-fA-F]/g, '').toUpperCase()
 
-  // 按每两个字符添加冒号，最多6段
+    // 按每两个字符添加冒号，最多6段
-  let formatted = ''
+    let formatted = ''
-  for (let i = 0; i < Math.min(hexOnly.length, 12); i += 2) {
+    for (let i = 0; i < Math.min(hexOnly.length, 12); i += 2) {
-    if (i > 0) formatted += ':'
+        if (i > 0) formatted += ':'
-    formatted += hexOnly.substr(i, 2)
+        formatted += hexOnly.substr(i, 2)
-  }
+    }
 
-  return formatted
+    return formatted
 }
 
 // 当前聚焦的输入框索引
@@ -78,88 +79,86 @@ const focusedIndex = ref<number | null>(null)
 
 // 处理输入事件
 const handleInput = (value: string) => {
-  const formatted = formatMac(value)
+    const formatted = formatMac(value)
-  macValue.value = formatted
+    macValue.value = formatted
-  // 发出不带冒号的纯净值
+    // 发出不带冒号的纯净值
-  emit('update:modelValue', formatted.replace(/:/g, ''))
+    emit('update:modelValue', formatted.replace(/:/g, ''))
 }
 
 // 处理键盘事件
 const handleKeydown = (event: KeyboardEvent) => {
-  const target = event.target as HTMLInputElement
+    const target = event.target as HTMLInputElement
 
-  // 处理退格键
+    // 处理退格键
-  if (event.key === 'Backspace') {
+    if (event.key === 'Backspace') {
-    // 处理在冒号前删除的情况
+        // 处理在冒号前删除的情况
-    const cursorPos = target.selectionStart || 0
+        const cursorPos = target.selectionStart || 0
-    if (cursorPos > 0 && macValue.value[cursorPos - 1] === ':' && 
+        if (cursorPos > 0 && macValue.value[cursorPos - 1] === ':' && target.selectionStart === target.selectionEnd) {
-        target.selectionStart === target.selectionEnd) {
+            event.preventDefault()
-      event.preventDefault()
+            // 删除冒号前的两个字符
-      // 删除冒号前的两个字符
+            const newValue = macValue.value.substring(0, cursorPos - 3) + macValue.value.substring(cursorPos)
-      const newValue = macValue.value.substring(0, cursorPos - 3) + 
+            macValue.value = newValue
-                      macValue.value.substring(cursorPos)
+            // 设置光标位置
-      macValue.value = newValue
+            setTimeout(() => {
-      // 设置光标位置
+                if (target.setSelectionRange) {
-      setTimeout(() => {
+                    target.setSelectionRange(cursorPos - 3, cursorPos - 3)
-        if (target.setSelectionRange) {
+                }
-          target.setSelectionRange(cursorPos - 3, cursorPos - 3)
+            }, 0)
+            emit('update:modelValue', newValue.replace(/:/g, ''))
         }
-      }, 0)
-      emit('update:modelValue', newValue.replace(/:/g, ''))
     }
-  }
 }
 
 // 处理焦点事件
 const handleFocus = () => {
-  focusedIndex.value = 0
+    focusedIndex.value = 0
 }
 
 // 处理失焦事件
 const handleBlur = () => {
-  focusedIndex.value = null
+    focusedIndex.value = null
 }
 
 // 处理粘贴事件
 const handlePaste = (event: ClipboardEvent) => {
-  event.preventDefault()
+    event.preventDefault()
-  const pastedText = event.clipboardData?.getData('text') || ''
+    const pastedText = event.clipboardData?.getData('text') || ''
 
-  // 清理粘贴的文本
+    // 清理粘贴的文本
-  const cleanPastedText = pastedText.replace(/[^0-9a-fA-F]/g, '').toUpperCase()
+    const cleanPastedText = pastedText.replace(/[^0-9a-fA-F]/g, '').toUpperCase()
-  const formatted = formatMac(cleanPastedText)
+    const formatted = formatMac(cleanPastedText)
-  macValue.value = formatted
+    macValue.value = formatted
-  emit('update:modelValue', formatted.replace(/:/g, ''))
+    emit('update:modelValue', formatted.replace(/:/g, ''))
 }
 
 // 监听modelValue变化
 watch(
-  () => props.modelValue,
+    () => props.modelValue,
-  (newVal) => {
+    newVal => {
-    const cleanNewVal = (newVal || '').replace(/[^0-9a-fA-F]/g, '').toUpperCase()
+        const cleanNewVal = (newVal || '').replace(/[^0-9a-fA-F]/g, '').toUpperCase()
-    const currentCleanValue = macValue.value.replace(/:/g, '')
+        const currentCleanValue = macValue.value.replace(/:/g, '')
 
-    if (cleanNewVal !== currentCleanValue) {
+        if (cleanNewVal !== currentCleanValue) {
-      macValue.value = parseMacAddress(cleanNewVal)
+            macValue.value = parseMacAddress(cleanNewVal)
-    }
+        }
-  },
+    },
-  { immediate: true }
+    { immediate: true }
 )
 </script>
 
 <style scoped lang="scss">
 .mac-address-input {
-  width: 100%;
+    width: 100%;
 
-  &.disabled {
+    &.disabled {
-    opacity: 0.7;
+        opacity: 0.7;
-  }
+    }
-  
+
-  :deep(.el-input__wrapper) {
+    :deep(.el-input__wrapper) {
-    input {
+        input {
-      text-transform: uppercase;
+            text-transform: uppercase;
-      font-family: inherit; // 使用继承的字体而不是等宽字体
+            font-family: inherit; // 使用继承的字体而不是等宽字体
+        }
     }
-  }
 }
 </style>

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="mt10 mr10" style="display: flex; justify-content: end">
+        <div class="mt10 mr10" style="display: flex; justify-content: end" v-if="showBut">
             <el-button type="primary" icon="el-icon-Select" @click="save" :loading="loading">保存</el-button>
         </div>
         <Icon
@@ -14,7 +14,7 @@
         />
         <div class="cn-tree" :style="{ opacity: menuCollapse ? 0 : 1 }">
             <div style="display: flex; align-items: center" class="mb10">
-                <el-input maxlength="32" show-word-limit v-model.trim="filterText" placeholder="请输入内容" clearable>
+                <el-input maxlength="32" v-model.trim="filterText" placeholder="请输入内容" clearable>
                     <template #prefix>
                         <Icon name="el-icon-Search" style="font-size: 16px" />
                     </template>
@@ -39,7 +39,7 @@
             </div>
 
             <el-tree
-                :style="{ height: 'calc(100vh - 267px)' }"
+                :style="{ height: `calc(100vh - ${height}px)` }"
                 style="overflow: auto"
                 ref="treeRef"
                 :props="defaultProps"
@@ -69,9 +69,9 @@
 <script lang="ts" setup>
 import useCurrentInstance from '@/utils/useCurrentInstance'
 import { ElTree } from 'element-plus'
-import { emit } from 'process'
+
 import { ref, watch } from 'vue'
-import { t } from 'vxe-table'
+
 import { useConfig } from '@/stores/config'
 
 defineOptions({
@@ -82,12 +82,16 @@ interface Props {
     width?: string
     canExpand?: boolean
     showPush?: boolean
+    showBut?: boolean
+    height?: number
 }
 const loading = ref(false)
 const props = withDefaults(defineProps<Props>(), {
     width: '280px',
     canExpand: true,
-    showPush: false
+    showPush: false,
+    showBut: true,
+    height: 267
 })
 const config = useConfig()
 const { proxy } = useCurrentInstance()
@@ -183,7 +187,5 @@ defineExpose({ treeRef, loading })
 .custom-tree-node {
     display: flex;
     align-items: center;
-   
-
 }
 </style>

src/components/tree/cloudDevice.vue

@@ -5,7 +5,7 @@
             style='cursor: pointer' />
         <div class='cn-tree' :style='{ opacity: menuCollapse ? 0 : 1 }'>
             <div style='display: flex; align-items: center' class='mb10'>
-                <el-input maxlength="32" show-word-limit v-model.trim='filterText' placeholder='请输入内容' clearable>
+                <el-input maxlength="32"  v-model.trim='filterText' placeholder='请输入内容' clearable>
                     <template #prefix>
                         <Icon name='el-icon-Search' style='font-size: 16px' />
                     </template>

src/components/tree/device.vue

@@ -13,18 +13,29 @@
         <div class="cn-tree" :style="{ opacity: menuCollapse ? 0 : 1 }">
             <div style="display: flex; align-items: center" class="mb10">
                 <!-- <el-form-item> -->
+
                 <el-input
                     maxlength="32"
-                    show-word-limit
                     v-model.trim="filterText"
                     autocomplete="off"
                     placeholder="请输入内容"
                     clearable
                 >
+                    <template #prepend>
+                        <el-select v-model="treeType" @change="changeTreeType" style="min-width: 75px">
+                            <el-option
+                                v-for="item in options"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            />
+                        </el-select>
+                    </template>
                     <template #prefix>
                         <Icon name="el-icon-Search" style="font-size: 16px" />
                     </template>
                 </el-input>
+
                 <!-- </el-form-item> -->
                 <Icon
                     @click="onMenuCollapse"
@@ -42,6 +53,8 @@
                 v-model.trim="activeName"
                 style="flex: 1; height: 100%"
                 @change="changeDevice"
+                v-if="treeType == '1'"
+                v-loading="loading"
             >
                 <el-collapse-item title="治理设备" name="0" v-if="zlDeviceData.length != 0">
                     <el-select v-model.trim="process" clearable placeholder="请选择状态" class="mb10">
@@ -52,7 +65,7 @@
                     <el-tree
                         :style="{
                             height:
-                                bxsDeviceData.length != 0
+                                treeType.length != 0
                                     ? `calc(100vh - 380px - ${props.height}px)`
                                     : 'calc(100vh - 278px)'
                         }"
@@ -142,6 +155,32 @@
                     </el-tree>
                 </el-collapse-item>
             </el-collapse>
+            <div v-if="treeType == '2'" v-loading="loading">
+                <el-tree
+                    :style="{ height: `calc(100vh - 188px - ${props.height}px )` }"
+                    ref="treeRef4"
+                    :props="defaultProps"
+                    highlight-current
+                    :filter-node-method="filterNode"
+                    node-key="id"
+                    v-bind="$attrs"
+                    :data="data"
+                    style="overflow: auto"
+                    :default-expand-all="false"
+                >
+                    <template #default="{ node, data }">
+                        <span class="custom-tree-node">
+                            <Icon
+                                :name="data.icon"
+                                style="font-size: 16px"
+                                :style="{ color: data.color }"
+                                v-if="data.icon"
+                            />
+                            <span style="margin-left: 4px">{{ node.label }}</span>
+                        </span>
+                    </template>
+                </el-tree>
+            </div>
         </div>
     </div>
 </template>
@@ -154,13 +193,14 @@ import { ref, watch, defineEmits, onMounted, nextTick } from 'vue'
 defineOptions({
     name: 'govern/tree'
 })
-const emit = defineEmits(['changeDeviceType'])
+const emit = defineEmits(['changeDeviceType', 'changeTreeType'])
 interface Props {
     width?: string
     canExpand?: boolean
     type?: string
     data?: any
     height?: number
+    engineering: boolean
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -168,8 +208,20 @@ const props = withDefaults(defineProps<Props>(), {
     canExpand: true,
     type: '',
     data: [],
-    height: 0
+    height: 0,
+    engineering: false
 })
+const treeType = ref('1')
+const options = [
+    {
+        label: '设备',
+        value: '1'
+    },
+    {
+        label: '工程',
+        value: '2'
+    }
+]
 const { proxy } = useCurrentInstance()
 const menuCollapse = ref(false)
 const activeName = ref('0')
@@ -219,7 +271,9 @@ watch(
 )
 
 watch(filterText, val => {
-    if (activeName.value == '0') {
+    if (treeType.value == '2') {
+        treeRef4.value!.filter(val)
+    } else if (activeName.value == '0') {
         treeRef1.value!.filter(val)
     } else if (activeName.value == '1') {
         treeRef2.value!.filter(val)
@@ -362,27 +416,44 @@ const treeRef1 = ref<InstanceType<typeof ElTree>>()
 const treeRef2 = ref<InstanceType<typeof ElTree>>()
 //前置
 const treeRef3 = ref<InstanceType<typeof ElTree>>()
-defineExpose({ treeRef1, treeRef2, treeRef3 })
+const treeRef4 = ref<InstanceType<typeof ElTree>>()
+defineExpose({ treeRef1, treeRef2, treeRef3, treeRef4 })
 onMounted(() => {
+    treeType.value = props.engineering ? '2' : '1'
     setTimeout(() => {
-        if (zlDeviceData.value.length != 0) {
+        setActiveName()
-            zlDevList.value = filterProcess(JSON.parse(JSON.stringify(zlDeviceData.value)))
-            activeName.value = '0'
-        }
-        if (zlDeviceData.value.length === 0 && bxsDeviceData.value.length != 0) {
-            activeName.value = '1'
-        }
-        if (zlDeviceData.value.length === 0 && bxsDeviceData.value.length === 0) {
-            activeName.value = '2'
-        }
-        if (!zlDeviceData.value && !bxsDeviceData.value) {
-            activeName.value = ''
-        }
-        nextTick(() => {
-            changeDevice(activeName.value)
-        })
     }, 500)
 })
+
+const setActiveName = () => {
+    if (zlDeviceData.value.length != 0) {
+        zlDevList.value = filterProcess(JSON.parse(JSON.stringify(zlDeviceData.value)))
+        activeName.value = '0'
+    }
+    if (zlDeviceData.value.length === 0 && bxsDeviceData.value.length != 0) {
+        activeName.value = '1'
+    }
+    if (zlDeviceData.value.length === 0 && bxsDeviceData.value.length === 0) {
+        activeName.value = '2'
+    }
+    if (!zlDeviceData.value && !bxsDeviceData.value) {
+        activeName.value = ''
+    }
+    nextTick(() => {
+        changeDevice(activeName.value)
+    })
+}
+const loading = ref(false)
+const changeTreeType = (val: string) => {
+    loading.value = true
+    emit('changeTreeType', val)
+    if (val == '1') {
+        setActiveName()
+    }
+    setTimeout(() => {
+        loading.value = false
+    }, 1000)
+}
 </script>
 
 <style lang="scss" scoped>
@@ -412,4 +483,7 @@ onMounted(() => {
     display: flex;
     align-items: center;
 }
+:deep(.el-input-group__prepend) {
+    background-color: var(--el-fill-color-blank);
+}
 </style>

src/components/tree/govern/cloudDeviceEntryTree.vue

@@ -1,11 +1,19 @@
 <template>
-    <Tree ref="treRef" :width="width" :showPush="props.showPush"  :data="tree" default-expand-all @changePointType="changePointType" @onAdd="onAdd"/>
+    <Tree
+        ref="treRef"
+        :width="width"
+        :showPush="props.showPush"
+        :expand-on-click-node="false"
+        :data="tree"
+        @changePointType="changePointType"
+        @onAdd="onAdd"
+    />
 </template>
 
 <script lang="ts" setup>
 import { ref, nextTick, onMounted, defineProps } from 'vue'
 import Tree from '../index.vue'
-import { getLineTree,getCldTree } from '@/api/cs-device-boot/csLedger'
+import { getLineTree, getCldTree } from '@/api/cs-device-boot/csLedger'
 import { useConfig } from '@/stores/config'
 import { querySysExcel } from '@/api/harmonic-boot/luckyexcel'
 import { useDictData } from '@/stores/dictData'
@@ -22,136 +30,61 @@ defineOptions({
     name: 'govern/deviceTree'
 })
 
-const emit = defineEmits(['init', 'checkChange', 'pointTypeChange', 'Policy','onAdd'])
+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[] = []
     getCldTree().then(res => {
-        try {
+        res.data.icon = 'el-icon-Menu'
-            // 检查响应数据结构
+        res.data.color = config.getColorVal('elementUiPrimary')
-            let rootData = null;
+        res.data?.children.map((item: any) => {
-            if (Array.isArray(res.data)) {
+            item.icon = 'el-icon-HomeFilled'
-                // 旧的数据结构 - 数组
+            item.color = config.getColorVal('elementUiPrimary')
-                rootData = res.data.find((item: any) => item.name == '监测设备');
+            item.children.forEach((item: any) => {
-            } else if (res.data && res.data.name == '监测设备') {
+                item.icon = 'el-icon-List'
-                // 新的数据结构 - 单个对象
+                item.color = config.getColorVal('elementUiPrimary')
-                rootData = res.data;
+                item.children.forEach((item2: any) => {
-            }
+                    // item2.icon = 'el-icon-List'
-
+                    // item2.color = config.getColorVal('elementUiPrimary')
-            // 治理设备
+                    item2.icon = 'el-icon-Platform'
-            if (rootData) {
+                    item2.level = 2
-                rootData.icon = 'el-icon-Menu'
+                    item2.color = item2.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
-                rootData.level = 0
+                    item2.children.forEach((item3: any) => {
-                rootData.color = config.getColorVal('elementUiPrimary')
+                        item3.icon = 'el-icon-Platform' 
-                // 确保根节点的 children 是数组
+                        item3.color =
-                if (!Array.isArray(rootData.children)) {
+                            item3.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
-                    rootData.children = []
+                        arr1.push(item3)
-                }
-                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)
+        tree.value = [res.data]
-        }
+
+        nextTick(() => {
+            setTimeout(() => {
+                //初始化选中
+
+                treRef.value?.treeRef.setCurrentKey(arr1[0].id)
+                // 注册父组件事件
+                emit('init', {
+                    level: 3,
+                    ...arr1[0]
+                })
+                changePointType('4', arr1[0])
+                return
+            }, 500)
+        })
     })
 }
 
-
 const changePointType = (val: any, obj: any) => {
-    emit('pointTypeChange', val, obj)
+    // emit('pointTypeChange', val, obj)
 }
 
 const onAdd = () => {

src/components/tree/govern/csLedgerLineTree.vue

@@ -1,11 +1,19 @@
 <template>
-    <Tree ref="treRef" :width="width" :showPush="props.showPush"  :data="tree" default-expand-all @changePointType="changePointType" @onAdd="onAdd"/>
+    <Tree
+        ref="treRef"
+        :width="width"
+        :showPush="props.showPush"
+        :data="tree"
+        default-expand-all
+        @changePointType="changePointType"
+        @onAdd="onAdd"
+    />
 </template>
 
 <script lang="ts" setup>
 import { ref, nextTick, onMounted, defineProps } from 'vue'
 import Tree from '../index.vue'
-import { getLineTree,lineTree } from '@/api/cs-device-boot/csLedger'
+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'
@@ -22,27 +30,26 @@ defineOptions({
     name: 'govern/deviceTree'
 })
 
-const emit = defineEmits(['init', 'checkChange', 'pointTypeChange', 'Policy','onAdd'])
+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;
+            let rootData = null
             if (Array.isArray(res.data)) {
                 // 旧的数据结构 - 数组
-                rootData = res.data.find((item: any) => item.name == '监测设备');
+                rootData = res.data.find((item: any) => item.name == '监测设备')
             } else if (res.data && res.data.name == '监测设备') {
                 // 新的数据结构 - 单个对象
-                rootData = res.data;
+                rootData = res.data
             }
 
             // 治理设备
@@ -97,50 +104,51 @@ const info = (selectedNodeId?: string) => {
                 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)
+                    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);
+                        console.log('selectedNodeId:', selectedNodeId)
                         if (selectedNodeId) {
-                            treRef.value.treeRef.setCurrentKey(selectedNodeId);
+                            treRef.value.treeRef.setCurrentKey(selectedNodeId)
                             // 查找对应的节点数据并触发事件
-                            let selectedNode = null;
+                            let selectedNode = null
                             const findNode = (nodes: any[]) => {
                                 for (const node of nodes) {
                                     if (node.id === selectedNodeId) {
-                                        selectedNode = node;
+                                        selectedNode = node
-                                        return true;
+                                        return true
                                     }
                                     if (node.children && findNode(node.children)) {
-                                        return true;
+                                        return true
                                     }
                                 }
-                                return false;
+                                return false
-                            };
+                            }
 
-                            findNode(tree.value);
+                            findNode(tree.value)
 
                             if (selectedNode) {
                                 emit('init', {
                                     level: selectedNode.level,
                                     ...selectedNode
-                                });
+                                })
                             }
                         } else {
                             // 初始化选中第一个节点
-                            treRef.value.treeRef.setCurrentKey(arr1[0].id);
+                            treRef.value.treeRef.setCurrentKey(arr1[0].id)
                             emit('init', {
                                 level: 2,
                                 ...arr1[0]
-                            });
+                            })
                         }
                     }
                 } else {
-                  
                 }
             })
         } catch (error) {
@@ -149,7 +157,6 @@ const info = (selectedNodeId?: string) => {
     })
 }
 
-
 const changePointType = (val: any, obj: any) => {
     emit('pointTypeChange', val, obj)
 }
@@ -158,7 +165,8 @@ const onAdd = () => {
     emit('onAdd')
 }
 if (props.template) {
-    querySysExcel({ id: dictData.state.area[0]?.id })
+    // id: dictData.state.area[0]?.id
+    querySysExcel({})
         .then((res: any) => {
             emit('Policy', res.data)
             info()

src/components/tree/govern/deviceTree.vue

@@ -7,6 +7,8 @@
         :data="tree"
         :height="props.height"
         @changeDeviceType="changeDeviceType"
+        @changeTreeType="info"
+        :engineering="props.engineering"
     />
 </template>
 
@@ -16,6 +18,7 @@ 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'
 })
@@ -24,11 +27,13 @@ const props = withDefaults(
         showCheckbox?: boolean
         defaultCheckedKeys?: any
         height?: number
+        engineering?: boolean
     }>(),
     {
         showCheckbox: false,
         defaultCheckedKeys: [],
-        height: 0
+        height: 0,
+        engineering: false
     }
 )
 const emit = defineEmits(['init', 'checkChange', 'deviceTypeChange'])
@@ -38,112 +43,149 @@ const treRef = ref()
 const changeDeviceType = (val: any, obj: any) => {
     emit('deviceTypeChange', val, obj)
 }
-getDeviceTree().then(res => {
+
-    let arr: any[] = []
+const info = (type?: string) => {
-    let arr2: any[] = []
+    getDeviceTree({ type: type == '2' ? 'engineering' : '' }).then(res => {
-    let arr3: any[] = []
+        let arr: any[] = []
-    //治理设备
+        let arr2: any[] = []
-    res.data.map((item: any) => {
+        let arr3: any[] = []
-        if (item.name == '治理设备') {
+        let arr4: any[] = []
-            item.children.forEach((item: any) => {
+        //治理设备
+        res.data.map((item: any) => {
+            if (type == '2') {
                 item.icon = 'el-icon-HomeFilled'
                 item.color = config.getColorVal('elementUiPrimary')
-                item.children.forEach((item2: any) => {
+                item.children.forEach((item: any) => {
-                    item2.icon = 'el-icon-List'
+                    item.icon = 'el-icon-List'
-                    item2.color = config.getColorVal('elementUiPrimary')
+                    item.color = config.getColorVal('elementUiPrimary')
-                    item2.children.forEach((item3: any) => {
+                    item.children.forEach((item2: any) => {
-                        item3.pName = '治理设备'
+                        item2.icon = 'el-icon-Platform'
-                        item3.icon = 'el-icon-Platform'
+                        item2.color = config.getColorVal('elementUiPrimary')
-                        item3.level = 2
+                        item2.color =
-                        item3.color = config.getColorVal('elementUiPrimary')
+                            item2.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
-                        if (item3.comFlag === 1) {
+                        arr4.push(item2)
-                            item3.color = '#e26257 !important'
-                        }
-                        arr.push(item3)
                     })
                 })
-            })
-        } else if (item.name == '便携式设备') {
-            item.children.forEach((item: any) => {
-                item.icon = 'el-icon-Platform'
-                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')
-                    //     if (item3.comFlag === 1) {
-                    //         item3.color = '#e26257 !important'
-                    //     }
-                    //     arr.push(item3)
-                    // })
-                })
-            })
-        } else if (item.name == '监测设备') {
-            item.children.forEach((item: any) => {
-                item.icon = 'el-icon-HomeFilled'
-                item.color = config.getColorVal('elementUiPrimary')
-                item.children.forEach((item2: any) => {
-                    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) {
-                            item3.color = '#e26257 !important'
-                        }
-                        arr3.push(item3)
-                    })
-                })
-            })
-        }
-    })
-    tree.value = res.data
-
-    nextTick(() => {
-        setTimeout(() => {
-            if (arr.length > 0) {
-                treRef.value.treeRef1.setCurrentKey(arr[0].id)
-                // 注册父组件事件
-                emit('init', {
-                    level: 2,
-                    ...arr[0]
-                })
-                return
-            } else if (arr2.length > 0) {
-                treRef.value.treeRef2.setCurrentKey(arr2[0].id)
-                // 注册父组件事件
-                emit('init', {
-                    level: 2,
-                    ...arr2[0]
-                })
-                return
-            } else if (arr3.length > 0) {
-                console.log('🚀 ~ arr3:', arr3)
-
-                treRef.value.treeRef3.setCurrentKey(arr3[0].id)
-                // 注册父组件事件
-                emit('init', {
-                    level: 2,
-                    ...arr3[0]
-                })
-                return
             } else {
-                emit('init')
+                if (item.name == '治理设备') {
-                return
+                    item.children.forEach((item: any) => {
+                        item.icon = 'el-icon-HomeFilled'
+                        item.color = config.getColorVal('elementUiPrimary')
+                        item.children.forEach((item2: any) => {
+                            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')
+                                if (item3.comFlag === 1) {
+                                    item3.color = '#e26257 !important'
+                                }
+                                arr.push(item3)
+                            })
+                        })
+                    })
+                } else if (item.name == '便携式设备') {
+                    item.children.forEach((item: any) => {
+                        item.icon = 'el-icon-Platform'
+                        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')
+                            //     if (item3.comFlag === 1) {
+                            //         item3.color = '#e26257 !important'
+                            //     }
+                            //     arr.push(item3)
+                            // })
+                        })
+                    })
+                } else if (item.name == '监测设备') {
+                    item.children.forEach((item: any) => {
+                        item.icon = 'el-icon-HomeFilled'
+                        item.color = config.getColorVal('elementUiPrimary')
+                        item.children.forEach((item2: any) => {
+                            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) {
+                                    item3.color = '#e26257 !important'
+                                }
+                                arr3.push(item3)
+                            })
+                        })
+                    })
+                }
             }
-        }, 500)
+        })
+        tree.value = res.data
+
+        nextTick(() => {
+            setTimeout(() => {
+                if (type == '2') {
+                    //初始化选中
+
+                    treRef.value?.treeRef4.setCurrentKey(arr4[0]?.id)
+                    // 注册父组件事件
+                    emit('init', {
+                        level: 2,
+                        ...arr4[0]
+                    })
+                    // changePointType('4', arr4[0])
+                    return
+                }
+                if (arr.length > 0) {
+                    treRef.value.treeRef1.setCurrentKey(arr[0]?.id)
+                    // 注册父组件事件
+                    emit('init', {
+                        level: 2,
+                        ...arr[0]
+                    })
+                    return
+                } else if (arr2.length > 0) {
+                    treRef.value.treeRef2.setCurrentKey(arr2[0]?.id)
+                    // 注册父组件事件
+                    emit('init', {
+                        level: 2,
+                        ...arr2[0]
+                    })
+                    return
+                } else if (arr3.length > 0) {
+                    console.log('🚀 ~ arr3:', arr3)
+
+                    treRef.value.treeRef3.setCurrentKey(arr3[0].id)
+                    // 注册父组件事件
+                    emit('init', {
+                        level: 2,
+                        ...arr3[0]
+                    })
+                    return
+                } else {
+                    emit('init')
+                    return
+                }
+            }, 500)
+        })
     })
+}
+
+onMounted(() => {
+    info(props.engineering ? '2' : '1')
 })
 
 throttle(

src/components/tree/govern/getMarketList.vue

@@ -19,9 +19,11 @@ getMarketList().then((res: any) => {
                 color: 'royalblue'
             }
         })
+                console.log("🚀 ~ royalblue:")
+        
         emit('selectUser', tree.value[0])
         nextTick(() => {
-            treRef.value.treeRef.setCurrentKey(tree.value[0].id)
+            treRef.value.treeRef.setCurrentKey(tree.value[0]?.id)
         })
     }
 })

src/components/tree/govern/officialUserTree.vue

@@ -21,7 +21,7 @@ getFormalUserList().then((res: any) => {
         })
         emit('selectUser', tree.value[0])
         nextTick(() => {
-            treRef.value.treeRef.setCurrentKey(tree.value[0].id)
+            treRef.value.treeRef.setCurrentKey(tree.value[0]?.id)
         })
     }
 })

src/components/tree/govern/pointTree.vue

@@ -1,5 +1,12 @@
 <template>
-    <Tree ref="treRef" :width="width" :data="tree" default-expand-all @changePointType="changePointType" />
+    <Tree
+        ref="treRef"
+        :width="width"
+        :data="tree"
+        default-expand-all
+        @changePointType="changePointType"
+        @changeTreeType="info"
+    />
 </template>
 
 <script lang="ts" setup>
@@ -27,80 +34,128 @@ const dictData = useDictData()
 const treRef = ref()
 const width = ref('')
 
-const info = () => {
+const info = (type?: string) => {
     tree.value = []
     let arr1: any[] = []
     let arr2: any[] = []
     let arr3: any[] = []
-    getLineTree().then(res => {
+    let arr4: any[] = []
+    getLineTree({ type: type == '2' ? 'engineering' : '' }).then(res => {
         //治理设备
+
         res.data.map((item: any) => {
-            if (item.name == '治理设备') {
+            if (type == '2') {
+                item.icon = 'el-icon-HomeFilled'
+                item.color = config.getColorVal('elementUiPrimary')
                 item.children.forEach((item: any) => {
-                    item.icon = 'el-icon-HomeFilled'
+                    item.icon = 'el-icon-List'
-                    item.level = 1
                     item.color = config.getColorVal('elementUiPrimary')
                     item.children.forEach((item2: any) => {
-                        item2.icon = 'el-icon-List'
+                        // item2.icon = 'el-icon-List'
-                        item2.level = 1
+                        // item2.color = config.getColorVal('elementUiPrimary')
-                        item2.color = config.getColorVal('elementUiPrimary')
-                        item2.children.forEach((item3: any) => {
-                            item3.icon = 'el-icon-Platform'
-                            item3.level = 2
-                            item3.color =
-                                item3.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
-                            item3.children.forEach((item4: any) => {
-                                item4.icon = 'el-icon-Platform'
-                                item4.color =
-                                    item4.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
-                                // item4.color = '#e26257 !important'
-                                arr1.push(item4)
-                            })
-                        })
-                    })
-                })
-            } else if (item.name == '便携式设备') {
-                item.children.forEach((item: any) => {
-                    item.icon = 'el-icon-Platform'
-                    item.color = config.getColorVal('elementUiPrimary')
-                    item.color = item.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
-                    item.children.forEach((item2: any) => {
                         item2.icon = 'el-icon-Platform'
+                        item2.level = 2
                         item2.color =
                             item2.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
-                        arr2.push(item2)
-                    })
-                })
-            } else if (item.name == '监测设备') {
-                item.children.forEach((item: any) => {
-                    item.icon = 'el-icon-HomeFilled'
-                    item.level = 1
-                    item.color = config.getColorVal('elementUiPrimary')
-                    item.children.forEach((item2: any) => {
-                        item2.icon = 'el-icon-List'
-                        item2.level = 1
-                        item2.color = config.getColorVal('elementUiPrimary')
                         item2.children.forEach((item3: any) => {
                             item3.icon = 'el-icon-Platform'
-                            item3.level = 1
+
                             item3.color =
                                 item3.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
-                            item3.children.forEach((item4: any) => {
+                            arr4.push(item3)
-                                item4.icon = 'el-icon-Platform'
+                            // item3.children.forEach((item4: any) => {
-                                item4.color =
+                            //     item4.icon = 'el-icon-Platform'
-                                    item4.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
+                            //     item4.color =
-                                // item4.color = '#e26257 !important'
+                            //         item4.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
-                                arr3.push(item4)
+
-                            })
+                            // })
                         })
                     })
                 })
+            } else {
+                if (item.name == '治理设备') {
+                    item.children.forEach((item: any) => {
+                        item.icon = 'el-icon-HomeFilled'
+                        item.level = 1
+                        item.color = config.getColorVal('elementUiPrimary')
+                        item.children.forEach((item2: any) => {
+                            item2.icon = 'el-icon-List'
+                            item2.level = 1
+                            item2.color = config.getColorVal('elementUiPrimary')
+                            item2.children.forEach((item3: any) => {
+                                item3.icon = 'el-icon-Platform'
+                                item3.level = 2
+                                item3.color =
+                                    item3.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
+                                item3.children.forEach((item4: any) => {
+                                    item4.icon = 'el-icon-Platform'
+                                    item4.color =
+                                        item4.comFlag === 2
+                                            ? config.getColorVal('elementUiPrimary')
+                                            : '#e26257 !important'
+                                    // item4.color = '#e26257 !important'
+                                    arr1.push(item4)
+                                })
+                            })
+                        })
+                    })
+                } else if (item.name == '便携式设备') {
+                    item.children.forEach((item: any) => {
+                        item.icon = 'el-icon-Platform'
+                        item.color = config.getColorVal('elementUiPrimary')
+                        item.color = item.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
+                        item.children.forEach((item2: any) => {
+                            item2.icon = 'el-icon-Platform'
+                            item2.color =
+                                item2.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
+                            arr2.push(item2)
+                        })
+                    })
+                } else if (item.name == '监测设备') {
+                    item.children.forEach((item: any) => {
+                        item.icon = 'el-icon-HomeFilled'
+                        item.level = 1
+                        item.color = config.getColorVal('elementUiPrimary')
+                        item.children.forEach((item2: any) => {
+                            item2.icon = 'el-icon-List'
+                            item2.level = 1
+                            item2.color = config.getColorVal('elementUiPrimary')
+                            item2.children.forEach((item3: any) => {
+                                item3.icon = 'el-icon-Platform'
+                                item3.level = 1
+                                item3.color =
+                                    item3.comFlag === 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
+                                item3.children.forEach((item4: any) => {
+                                    item4.icon = 'el-icon-Platform'
+                                    item4.color =
+                                        item4.comFlag === 2
+                                            ? config.getColorVal('elementUiPrimary')
+                                            : '#e26257 !important'
+                                    // item4.color = '#e26257 !important'
+                                    arr3.push(item4)
+                                })
+                            })
+                        })
+                    })
+                }
             }
         })
         tree.value = res.data
+
         nextTick(() => {
             setTimeout(() => {
-                if (arr1.length > 0) {
+                if (type == '2') {
+                    //初始化选中
+
+                    treRef.value?.treeRef4.setCurrentKey(arr4[0].id)
+                    // 注册父组件事件
+                    emit('init', {
+                        level: 3,
+                        ...arr4[0]
+                    })
+                    changePointType('4', arr4[0])
+                    return
+                } else if (arr1.length > 0) {
                     //初始化选中
                     treRef.value?.treeRef1.setCurrentKey(arr1[0].id)
                     // 注册父组件事件
@@ -119,7 +174,6 @@ const info = () => {
                     })
                     return
                 } else if (arr3.length > 0) {
-
                     treRef.value?.treeRef3?.setCurrentKey(arr3[0].id)
                     emit('init', {
                         level: 2,
@@ -138,7 +192,8 @@ const changePointType = (val: any, obj: any) => {
     emit('pointTypeChange', val, obj)
 }
 if (props.template) {
-    querySysExcel({ id: dictData.state.area[0]?.id })
+    // id: dictData.state.area[0]?.id
+    querySysExcel({})
         .then((res: any) => {
             emit('Policy', res.data)
             info()

src/components/tree/govern/pointTreeWx.vue

@@ -3,13 +3,7 @@
         <div style="transition: all 0.3s; overflow: hidden; height: 100%">
             <div class="cn-tree">
                 <div style="display: flex; align-items: center" class="mb10">
-                    <el-input
+                    <el-input maxlength="32" v-model.trim="filterText" placeholder="请输入内容" clearable>
-                        maxlength="32"
-                        show-word-limit
-                        v-model.trim="filterText"
-                        placeholder="请输入内容"
-                        clearable
-                    >
                         <template #prefix>
                             <Icon name="el-icon-Search" style="font-size: 16px" />
                         </template>
@@ -37,7 +31,7 @@
                                     :style="{ color: data.color }"
                                     v-if="data.icon"
                                 />
-                                <span style="margin-left: 5px;">{{ node.label }}</span>
+                                <span style="margin-left: 5px">{{ node.label }}</span>
                             </div>
                         </span>
                     </template>
@@ -157,7 +151,8 @@ const clickNode = (e: anyObj) => {
 }
 
 if (props.template) {
-    querySysExcel({ id: dictData.state.area[0]?.id })
+    // id: dictData.state.area[0]?.id
+    querySysExcel({})
         .then((res: any) => {
             emit('Policy', res.data)
             getTreeList()

src/components/tree/index.vue

@@ -1,41 +1,61 @@
 <template>
-    <div :style="{ width: menuCollapse ? '40px' : props.width }" style='transition: all 0.3s; overflow: hidden;'>
+    <div :style="{ width: menuCollapse ? '40px' : props.width }" style="transition: all 0.3s; overflow: hidden">
-        <Icon v-show='menuCollapse' @click='onMenuCollapse' :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
+        <Icon
-            :class="menuCollapse ? 'unfold' : ''" size='18' class='fold ml10 mt20 menu-collapse'
+            v-show="menuCollapse"
-            style='cursor: pointer' />
+            @click="onMenuCollapse"
-        <div class='cn-tree' :style='{ opacity: menuCollapse ? 0 : 1 }'>
+            :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
-            <div style='display: flex; align-items: center' class='mb10'>
+            :class="menuCollapse ? 'unfold' : ''"
-                <el-input maxlength="32" show-word-limit v-model.trim='filterText' placeholder='请输入内容' clearable>
+            size="18"
+            class="fold ml10 mt20 menu-collapse"
+            style="cursor: pointer"
+        />
+        <div class="cn-tree" :style="{ opacity: menuCollapse ? 0 : 1 }">
+            <div style="display: flex; align-items: center" class="mb10">
+                <el-input maxlength="32" v-model.trim="filterText" placeholder="请输入内容" clearable>
                     <template #prefix>
-                        <Icon name='el-icon-Search' style='font-size: 16px' />
+                        <Icon name="el-icon-Search" style="font-size: 16px" />
                     </template>
                 </el-input>
                 <el-tooltip placement="bottom" :hide-after="0" v-if="props.showPush">
-                        <template #content>
+                    <template #content>
-                            <span>台账推送</span>
+                        <span>台账推送</span>
-                        </template>
+                    </template>
 
-                       <Icon 
+                    <Icon
                         name="el-icon-Promotion"
                         size="20"
-                        class="fold ml10 menu-collapse" 
+                        class="fold ml10 mr10 menu-collapse"
-                        style="cursor: pointer;" 
+                        style="cursor: pointer"
                         :style="{ color: config.getColorVal('elementUiPrimary') }"
-                        @click="onAdd" />
+                        @click="onAdd"
+                    />
                 </el-tooltip>
                 <!-- <Icon @click='onMenuCollapse' :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'" v-else
                     :class="menuCollapse ? 'unfold' : ''" size='18' class='fold ml10 menu-collapse'
                     style='cursor: pointer' v-if='props.canExpand' /> -->
             </div>
 
-            <el-tree :style="{ height:  'calc(100vh - 190px)' }"
+            <el-tree
-            style=' overflow: auto;' ref='treeRef' :props='defaultProps' highlight-current :default-expand-all="false"
+                :style="{ height: 'calc(100vh - 190px)' }"
-                @check-change="checkTreeNodeChange" :filter-node-method='filterNode' node-key='id' v-bind='$attrs'>
+                style="overflow: auto"
-                <template #default='{ node, data }'>
+                ref="treeRef"
-                    <span class='custom-tree-node'>
+                :props="defaultProps"
-                        <Icon :name='data.icon' style='font-size: 16px' :style='{ color: data.color }'
+                highlight-current
-                            v-if='data.icon' />
+                :default-expand-all="false"
-                        <span style='margin-left: 4px'>{{ node.label }}</span>
+                @check-change="checkTreeNodeChange"
+                :filter-node-method="filterNode"
+                node-key="id"
+                v-bind="$attrs"
+            >
+                <template #default="{ node, data }">
+                    <span class="custom-tree-node">
+                        <Icon
+                            :name="data.icon"
+                            style="font-size: 16px"
+                            :style="{ color: data.color }"
+                            v-if="data.icon"
+                        />
+                        <span style="margin-left: 4px">{{ node.label }}</span>
                     </span>
                 </template>
             </el-tree>
@@ -43,12 +63,10 @@
     </div>
 </template>
 
-<script lang='ts' setup>
+<script lang="ts" setup>
 import useCurrentInstance from '@/utils/useCurrentInstance'
 import { ElTree } from 'element-plus'
-import { emit } from 'process';
 import { ref, watch } from 'vue'
-import { t } from 'vxe-table';
 import { useConfig } from '@/stores/config'
 
 defineOptions({
@@ -74,7 +92,7 @@ const defaultProps = {
     label: 'name',
     value: 'id'
 }
-const emit = defineEmits(['checkTreeNodeChange','onAdd'])
+const emit = defineEmits(['checkTreeNodeChange', 'onAdd'])
 watch(filterText, val => {
     treeRef.value!.filter(val)
 })
@@ -83,18 +101,16 @@ const onMenuCollapse = () => {
     proxy.eventBus.emit('cnTreeCollapse', menuCollapse)
 }
 const filterNode = (value: string, data: any, node: any) => {
-    console.log(value, data, node, 'filterNode');
+    console.log(value, data, node, 'filterNode')
     if (!value) return true
     // return data.name.includes(value)
     if (data.name) {
-
         return chooseNode(value, data, node)
     }
 }
 
 // 过滤父节点 / 子节点 (如果输入的参数是父节点且能匹配，则返回该节点以及其下的所有子节点；如果参数是子节点，则返回该节点的父节点。name是中文字符，enName是英文字符.
 const chooseNode = (value: string, data: any, node: any) => {
-
     if (data.name.indexOf(value) !== -1) {
         return true
     }
@@ -132,13 +148,13 @@ const treeRef = ref<InstanceType<typeof ElTree>>()
 defineExpose({ treeRef })
 </script>
 
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .cn-tree {
     flex-shrink: 0;
     display: flex;
     flex-direction: column;
     box-sizing: border-box;
-    padding: 10px;
+    // padding: 10px;
     height: 100%;
     width: 100%;
 

src/components/tree/point.vue

@@ -13,11 +13,27 @@
         />
         <div class="cn-tree" :style="{ opacity: menuCollapse ? 0 : 1, display: menuCollapse ? 'none' : '' }">
             <div style="display: flex; align-items: center" class="mb10">
-                <el-input maxlength="32" show-word-limit v-model.trim="filterText" placeholder="请输入内容" clearable>
+                <!-- <el-input maxlength="32"  v-model.trim="filterText" placeholder="请输入内容" clearable>
+                    <template #prefix>
+                        <Icon name="el-icon-Search" style="font-size: 16px" />
+                    </template>
+                </el-input> -->
+                <el-input maxlength="32"  v-model.trim="filterText" placeholder="请输入内容" clearable>
+                    <template #prepend>
+                        <el-select v-model="treeType" @change="changeTreeType" style="min-width: 75px">
+                            <el-option
+                                v-for="item in options"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            />
+                        </el-select>
+                    </template>
                     <template #prefix>
                         <Icon name="el-icon-Search" style="font-size: 16px" />
                     </template>
                 </el-input>
+                <!--  -->
                 <Icon
                     @click="onMenuCollapse"
                     :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
@@ -34,6 +50,8 @@
                 v-model.trim="activeName"
                 style="flex: 1; height: 100%"
                 @change="changeDevice"
+                v-if="treeType == '1'"
+                v-loading="loading"
             >
                 <el-collapse-item title="治理设备" name="0" v-if="zlDeviceData.length != 0">
                     <el-select v-model.trim="process" clearable placeholder="请选择状态" class="mb10">
@@ -43,7 +61,7 @@
                     </el-select>
 
                     <el-tree
-                        :style="{ height: bxsDeviceData.length != 0 ? 'calc(100vh - 380px)' : 'calc(100vh - 278px)' }"
+                        :style="{ height: treeType.length != 0 ? 'calc(100vh - 380px)' : 'calc(100vh - 278px)' }"
                         ref="treeRef1"
                         :props="defaultProps"
                         highlight-current
@@ -120,6 +138,33 @@
                     </el-tree>
                 </el-collapse-item>
             </el-collapse>
+            <div v-if="treeType == '2'" v-loading="loading">
+                <el-tree
+                    :style="{ height: 'calc(100vh - 188px)' }"
+                    class="pt10"
+                    ref="treeRef4"
+                    :props="defaultProps"
+                    highlight-current
+                    :filter-node-method="filterNode"
+                    node-key="id"
+                    v-bind="$attrs"
+                    :data="data"
+                    style="overflow: auto"
+                    :default-expand-all="false"
+                >
+                    <template #default="{ node, data }">
+                        <span class="custom-tree-node">
+                            <Icon
+                                :name="data.icon"
+                                style="font-size: 16px"
+                                :style="{ color: data.color }"
+                                v-if="data.icon"
+                            />
+                            <span style="margin-left: 4px">{{ node.label }}</span>
+                        </span>
+                    </template>
+                </el-tree>
+            </div>
         </div>
     </div>
 </template>
@@ -133,7 +178,7 @@ import { useRoute } from 'vue-router'
 defineOptions({
     name: 'govern/tree'
 })
-const emit = defineEmits(['changePointType'])
+const emit = defineEmits(['changePointType', 'changeTreeType'])
 interface Props {
     width?: string
     canExpand?: boolean
@@ -157,6 +202,17 @@ const defaultProps = {
     label: 'name',
     value: 'id'
 }
+const treeType = ref('1')
+const options = [
+    {
+        label: '设备',
+        value: '1'
+    },
+    {
+        label: '工程',
+        value: '2'
+    }
+]
 //治理设备数据
 const zlDeviceData = ref<any>([])
 const zlDevList = ref<any>([])
@@ -196,7 +252,9 @@ watch(
 )
 
 watch(filterText, val => {
-    if (activeName.value == '0') {
+    if (treeType.value == '2') {
+        treeRef4.value!.filter(val)
+    } else if (activeName.value == '0') {
         treeRef1.value!.filter(val)
     } else if (activeName.value == '1') {
         treeRef2.value!.filter(val)
@@ -217,8 +275,6 @@ watch(process, val => {
 })
 
 const changeDevice = (val: any) => {
-    console.log('🚀 ~ changeDevice ~ val:', val)
-
     let arr1: any = []
     //zlDeviceData
     zlDevList.value.forEach((item: any) => {
@@ -299,7 +355,7 @@ function filterProcess(nodes: any) {
             // 递归处理子节点
             const children = node.children ? filterProcess(node.children) : []
 
-            // 对于装置层级（level=2），只保留 process 值匹配的节点
+            // 对于设备层级（level=2），只保留 process 值匹配的节点
             if (node.level === 2) {
                 if (node.process == process.value) {
                     return {
@@ -381,27 +437,43 @@ const treeRef1 = ref<InstanceType<typeof ElTree>>()
 const treeRef2 = ref<InstanceType<typeof ElTree>>()
 //在线
 const treeRef3 = ref<InstanceType<typeof ElTree>>()
-defineExpose({ treeRef1, treeRef2, treeRef3 })
+// 工程
+const treeRef4 = ref<InstanceType<typeof ElTree>>()
+defineExpose({ treeRef1, treeRef2, treeRef3, treeRef4 })
 onMounted(() => {
     setTimeout(() => {
-        if (zlDeviceData.value.length != 0) {
+        setActiveName()
-            zlDevList.value = filterProcess(JSON.parse(JSON.stringify(zlDeviceData.value)))
-            activeName.value = '0'
-        }
-        if (zlDeviceData.value.length === 0 && bxsDeviceData.value.length != 0) {
-            activeName.value = '1'
-        }
-        if (zlDeviceData.value.length === 0 && bxsDeviceData.value.length === 0) {
-            activeName.value = '2'
-        }
-        if (!zlDeviceData.value && !bxsDeviceData.value) {
-            activeName.value = '2'
-        }
-        nextTick(() => {
-            changeDevice(activeName.value)
-        })
     }, 500)
 })
+const setActiveName = () => {
+    if (zlDeviceData.value.length != 0) {
+        zlDevList.value = filterProcess(JSON.parse(JSON.stringify(zlDeviceData.value)))
+        activeName.value = '0'
+    }
+    if (zlDeviceData.value.length === 0 && bxsDeviceData.value.length != 0) {
+        activeName.value = '1'
+    }
+    if (zlDeviceData.value.length === 0 && bxsDeviceData.value.length === 0) {
+        activeName.value = '2'
+    }
+    if (!zlDeviceData.value && !bxsDeviceData.value) {
+        activeName.value = '2'
+    }
+    nextTick(() => {
+        changeDevice(activeName.value)
+    })
+}
+const loading = ref(false)
+const changeTreeType = (val: string) => {
+    loading.value = true
+    emit('changeTreeType', val)
+    if (val == '1') {
+        setActiveName()
+    }
+    setTimeout(() => {
+        loading.value = false
+    }, 1000)
+}
 </script>
 
 <style lang="scss" scoped>
@@ -432,4 +504,7 @@ onMounted(() => {
     display: flex;
     align-items: center;
 }
+:deep(.el-input-group__prepend) {
+    background-color: var(--el-fill-color-blank);
+}
 </style>

src/components/tree/select.vue

@@ -5,7 +5,7 @@
             style='cursor: pointer' />
         <div class='cn-tree' :style='{ opacity: menuCollapse ? 0 : 1 }'>
             <div style='display: flex; align-items: center' class='mb10'>
-                <el-input maxlength="32" show-word-limit v-model.trim='filterText' placeholder='请输入内容' clearable>
+                <el-input maxlength="32"  v-model.trim='filterText' placeholder='请输入内容' clearable>
                     <template #prefix>
                         <Icon name='el-icon-Search' style='font-size: 16px' />
                     </template>

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

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog draggable width="600px" v-model.trim="dialogVisible" :title="title">
+    <el-dialog draggable width="500px" v-model.trim="dialogVisible" :title="title">
   
             <el-form :inline="false" :model="form" label-width="auto" class="form-one">
                 <el-form-item label="用户名称:">

src/layouts/admin/index.vue

@@ -51,11 +51,11 @@ onBeforeMount(() => {
 })
 
 const init = async () => {
-    await Promise.all([getAreaList(), dictDataCache(), getUserById(), areaSelect(),getAllUserSimpleList()]).then(res => {
+    await Promise.all([ dictDataCache(), getUserById(), areaSelect(),getAllUserSimpleList()]).then(res => {
-        dictData.state.area = res[0].data
+        // dictData.state.area = res[0].data
-        dictData.state.basic = res[1].data
+        dictData.state.basic = res[0].data
         // dictData.state.userList=res[4].data
-        adminInfo.dataFill(res[2].data)
+        adminInfo.dataFill(res[1].data)
         // dictData.state.areaTree = res[3].data
     })
     /**

src/router/static.ts

@@ -35,6 +35,16 @@ export const adminBaseRoute = {
                 title: pageTitle('router.supplementaryRecruitment')
             }
         },
+        {
+            // 版本维护
+            path: '/version',
+            name: 'version',
+            component: () => import('@/views/govern/manage/basic/version.vue'),
+            meta: {
+                title: pageTitle('router.version')
+            }
+        },
+        
         {
             path: 'cockpit',
             name: '项目管理',

src/template/dialog.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog width="600px" v-model.trim='dialogVisible' :title='title'>
+    <el-dialog width="500px" v-model.trim='dialogVisible' :title='title'>
         <el-scrollbar>
             <el-form :inline='false' :model='form' label-width='auto' class="form-one" :rules='rules' ref='formRef'>
                 <el-form-item label='角色名称'>

src/utils/downloadFile.ts

@@ -0,0 +1,103 @@
+import { ElMessage, ElMessageBox, ElInput, ElSegmented } from 'element-plus'
+export const downLoadFile = (name: string, key: string, res: any) => {
+    let blob = new Blob([res], {
+        type: getFileType(key)
+    })
+    const url = window.URL.createObjectURL(blob)
+    const link = document.createElement('a') // 创建a标签
+    link.href = url
+    link.download = name // 设置下载的文件名
+    document.body.appendChild(link)
+    link.click() //执行下载
+    document.body.removeChild(link)
+    ElMessage.success('下载成功')
+}
+
+const getFileType = (url: string) => {
+    const ext = url.split('.').pop()?.toLowerCase() || ''
+    const mimeMap: Record<string, string> = {
+        // Excel
+        xls: 'application/vnd.ms-excel',
+        xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+        // CSV
+        csv: 'text/csv',
+        // Word
+        doc: 'application/msword',
+        docx: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+        // PDF
+        pdf: 'application/pdf',
+        // PowerPoint
+        ppt: 'application/vnd.ms-powerpoint',
+        pptx: 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+        // 图片
+        png: 'image/png',
+        gif: 'image/gif',
+        jpeg: 'image/jpeg',
+        jpg: 'image/jpeg',
+        bmp: 'image/bmp',
+        ico: 'image/vnd.microsoft.icon',
+        tif: 'image/tiff',
+        tiff: 'image/tiff',
+        svg: 'image/svg+xml',
+        webp: 'image/webp',
+        // 音频
+        mp3: 'audio/mpeg',
+        aac: 'audio/aac',
+        mid: 'audio/midi',
+        midi: 'audio/midi',
+        oga: 'audio/ogg',
+        wav: 'audio/wav',
+        weba: 'audio/webm',
+        // 视频
+        avi: 'video/x-msvideo',
+        mpeg: 'video/mpeg',
+        ogv: 'video/ogg',
+        webm: 'video/webm',
+        '3gp': 'video/3gpp',
+        '3g2': 'video/3gpp2',
+        // 网页/代码
+        html: 'text/html',
+        css: 'text/css',
+        js: 'text/javascript',
+        mjs: 'text/javascript',
+        json: 'application/json',
+        jsonld: 'application/ld+json',
+        xhtml: 'application/xhtml+xml',
+        xml: 'application/xml',
+        xul: 'application/vnd.mozilla.xul+xml',
+        // 文档
+        abw: 'application/x-abiword',
+        odp: 'application/vnd.oasis.opendocument.presentation',
+        ods: 'application/vnd.oasis.opendocument.spreadsheet',
+        odt: 'application/vnd.oasis.opendocument.text',
+        rtf: 'application/rtf',
+        txt: 'text/plain',
+        vsd: 'application/vnd.visio',
+        // 字体
+        otf: 'font/otf',
+        ttf: 'font/ttf',
+        woff: 'font/woff',
+        woff2: 'font/woff2',
+        eot: 'application/vnd.ms-fontobject',
+        // 压缩/归档
+        arc: 'application/x-freearc',
+        bz: 'application/x-bzip',
+        bz2: 'application/x-bzip2',
+        rar: 'application/x-rar-compressed',
+        tar: 'application/x-tar',
+        zip: 'application/zip',
+        '7z': 'application/x-7z-compressed',
+        // 其他
+        bin: 'application/octet-stream',
+        csh: 'application/x-csh',
+        epub: 'application/epub+zip',
+        azw: 'application/vnd.amazon.ebook',
+        ics: 'text/calendar',
+        jar: 'application/java-archive',
+        mpkg: 'application/vnd.apple.installer+xml',
+        ogx: 'application/ogg',
+        sh: 'application/x-sh',
+        swf: 'application/x-shockwave-flash'
+    }
+    return mimeMap[ext] || ''
+}

src/utils/echartMethod.ts

@@ -1,4 +1,3 @@
-import { number } from 'vue-types'
 
 const dataProcessing = (arr: any[]) => {
     return arr

src/utils/request.ts

@@ -4,7 +4,7 @@ import { ElLoading, ElMessage, ElNotification, type LoadingOptions } from 'eleme
 import { refreshToken } from '@/api/user-boot/user'
 import router from '@/router/index'
 import { useAdminInfo } from '@/stores/adminInfo'
-
+import { useNavTabs } from '@/stores/navTabs'
 window.requests = []
 window.tokenRefreshing = false
 let loginExpireTimer: any = null
@@ -13,7 +13,7 @@ const loadingInstance: LoadingInstance = {
     target: null,
     count: 0
 }
-
+const navTabs = useNavTabs()
 /**
  * 根据运行环境获取基础请求URL
  */
@@ -76,6 +76,7 @@ function createAxios<Data = any, T = ApiPromise<Data>>(
                     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/queryByid' ||
                     config.url == '/system-boot/dictTree/query'
                 )
             )
@@ -164,6 +165,9 @@ function createAxios<Data = any, T = ApiPromise<Data>>(
                         message: response.data.message
                     })
                     adminInfo.removeToken()
+                    navTabs.closeTabs()
+                    window.localStorage.clear()
+                    adminInfo.reset()
                     router.push({ name: 'login' })
                     loginExpireTimer = null // 执行后清空定时器
                 }, 100) // 可根据实际情况调整延迟时间

src/views/auth/userList/popupEdit.vue

@@ -57,7 +57,7 @@
                 <el-input maxlength="32" show-word-limit v-model.trim="form.email" placeholder="请输入描述" />
             </el-form-item>
             <el-form-item label="时间段" prop="limitTime">
-                <el-slider v-model.trim="form.limitTime" style="width: 95%" range show-stops :max="24" />
+                <el-slider v-model.trim="form.limitTime" style="width: 95%" range  :max="24" />
             </el-form-item>
             <el-form-item label="起始IP" prop="limitIpStart">
                 <el-input maxlength="32" show-word-limit v-model.trim="form.limitIpStart" placeholder="请输入描述" />

src/views/govern/alarm/Device.vue

@@ -100,6 +100,7 @@ const tableStore = new TableStore({
             }
         },
         { title: '设备名称', field: 'equipmentName', align: 'center', width: 120 },
+        { title: '监测点名称', field: 'lineName', align: 'center', width: 140 },
         { title: '工程名称', field: 'engineeringName', align: 'center', width: 120 },
         { title: '项目名称', field: 'projectName', align: 'center', width: 120 },
         { title: '发生时刻', field: 'startTime', align: 'center', width: 180, sortable: true },

src/views/govern/alarm/Transient.vue

@@ -1,5 +1,5 @@
 <template>
-    <div ref="refheader" v-show="!isWaveCharts" style="width: 100%;">
+    <div ref="refheader" v-show="!isWaveCharts" style="width: 100%">
         <TableHeader datePicker showExport>
             <template v-slot:select>
                 <el-form-item label="数据来源">
@@ -141,7 +141,8 @@ const tableStore = new TableStore({
         { title: '暂降(聚升)幅值(%)', minWidth: 100, field: 'evtParamVVaDepth', align: 'center', sortable: true },
 
         {
-            title: '操作', fixed: 'right',
+            title: '操作',
+            fixed: 'right',
             align: 'center',
             width: '180',
 
@@ -159,12 +160,12 @@ const tableStore = new TableStore({
                     },
                     click: async row => {
                         row.loading1 = true
-                        loading.value = true
-                        isWaveCharts.value = true
                         await analyseWave(row.id)
                             .then(res => {
                                 row.loading1 = false
                                 if (res != undefined) {
+                                    loading.value = true
+                                    isWaveCharts.value = true
                                     boxoList.value = row
                                     boxoList.value.persistTime = row.evtParamTm
                                     boxoList.value.featureAmplitude =

src/views/govern/alarm/alarmConfig/form.vue

@@ -0,0 +1,129 @@
+<template>
+    <el-dialog class="cn-operate-dialog" draggable v-model="dialogVisible" :title="title" width="500px"
+        @closed="handleClosed">
+        <el-form ref="formRef" :model="form" :rules="rules" label-width="auto" class="form-one">
+            <el-form-item label="方案名称" prop="name">
+                <el-input v-model.trim="form.name" maxlength="64" show-word-limit placeholder="请输入方案名称" clearable />
+            </el-form-item>
+            <el-form-item label="在线率阈值" prop="onlineRateLimit">
+                <el-input-number v-model="form.onlineRateLimit" :min="0" :max="100" :precision="0" style="width: 100%"
+                    placeholder="0-100" />
+            </el-form-item>
+            <el-form-item label="完整性阈值" prop="integrityLimit">
+                <el-input-number v-model="form.integrityLimit" :min="0" :max="100" :precision="0" style="width: 100%"
+                    placeholder="0-100" />
+            </el-form-item>
+            <!-- <el-form-item label="是否启用" prop="active">
+                <el-select v-model="form.active" placeholder="请选择" style="width: 100%">
+                    <el-option label="启用" value="1" />
+                    <el-option label="停用" value="0" />
+                </el-select>
+            </el-form-item> -->
+        </el-form>
+        <template #footer>
+            <el-button @click="handleCancel">取消</el-button>
+            <el-button type="primary" @click="onSubmit">确定</el-button>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive } from 'vue'
+import { ElMessage } from 'element-plus'
+import { inject } from 'vue'
+import { add, update } from '@/api/cs-system-boot/appinfo'
+
+const emit = defineEmits(['Cancels'])
+
+const dialogVisible = ref(false)
+const title = ref('')
+const formRef = ref()
+
+const defaultForm = () => ({
+    id: '',
+    name: '',
+    onlineRateLimit: undefined as number | undefined,
+    integrityLimit: undefined as number | undefined,
+    active: '0' as string
+})
+
+const form = reactive(defaultForm())
+
+const percentRule = (label: string) => [
+    { required: true, message: `请输入${label}`, trigger: 'blur' },
+    {
+        type: 'number',
+        min: 0,
+        max: 100,
+        message: `${label}范围为 0-100`,
+        trigger: 'blur'
+    }
+]
+
+const rules: any = {
+    name: [
+        { required: true, message: '请输入方案名称', trigger: 'blur' },
+        { min: 1, max: 64, message: '长度 1-64 个字符', trigger: 'blur' }
+    ],
+    onlineRateLimit: percentRule('在线率阈值'),
+    integrityLimit: percentRule('完整性阈值'),
+    active: [{ required: true, message: '请选择是否启用', trigger: 'change' }]
+}
+
+const isEdit = () => title.value.includes('修改')
+
+const resetForm = () => {
+    Object.assign(form, defaultForm())
+}
+
+const open = (e: { text: string; row?: any }) => {
+    formRef.value?.resetFields()
+    title.value = e.text
+    dialogVisible.value = true
+    resetForm()
+    if (e.row) {
+        form.id = e.row.id ?? ''
+        form.name = e.row.name ?? ''
+        form.onlineRateLimit = e.row.onlineRateLimit != null ? Number(e.row.onlineRateLimit) : undefined
+        form.integrityLimit = e.row.integrityLimit != null ? Number(e.row.integrityLimit) : undefined
+        form.active = String(e.row.active ?? '0')
+    }
+}
+
+const handleCancel = () => {
+    dialogVisible.value = false
+    emit('Cancels')
+}
+
+const handleClosed = () => {
+    resetForm()
+}
+
+const onSubmit = () => {
+    formRef.value?.validate(async (valid: boolean) => {
+        if (!valid) return
+        const payload = {
+            id: form.id,
+            name: form.name,
+            onlineRateLimit: form.onlineRateLimit,
+            integrityLimit: form.integrityLimit,
+            active: form.active
+        }
+        try {
+            if (isEdit()) {
+                await update(payload)
+                ElMessage.success('修改成功')
+            } else {
+                await add(payload)
+                ElMessage.success('新增成功')
+            }
+            dialogVisible.value = false
+            emit('Cancels')
+        } catch {
+            /* 请求层一般会统一提示 */
+        }
+    })
+}
+
+defineExpose({ open })
+</script>

src/views/govern/alarm/alarmConfig/index.vue

@@ -0,0 +1,152 @@
+<template>
+    <div class="default-main">
+        <TableHeader select :showReset="false" ref="TableHeaderRef">
+            <template #operation>
+                <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
+            </template>
+        </TableHeader>
+        <Table ref="tableRef" />
+        <Form ref="formRef" @Cancels="tableStore.index()" />
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, nextTick } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { ElMessage } from 'element-plus'
+import { toggleActive, csDelete } from '@/api/cs-system-boot/appinfo'
+import Form from './form.vue'
+defineOptions({
+    name: 'govern/alarmConfig'
+})
+const formTabRef = ref()
+const formRef = ref()
+const tableStore: any = new TableStore({
+    url: '/cs-system-boot/csAlarmSet/listAll',
+    method: 'POST',
+    showPage: false,
+    column: [
+        {
+            field: 'index',
+            title: '序号',
+            width: '80',
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { field: 'name', title: '名称' },
+        { field: 'onlineRateLimit', title: '在线率阈值' },
+        { field: 'integrityLimit', title: '完整性阈值' },
+        { field: 'updateTime', title: '创建时间' },
+        {
+            title: '是否启用',
+            render: 'switch',
+            width: 100,
+            field: 'active',
+            activeText: '启用',
+            inactiveText: '停用',
+            inactiveValue: '0',
+            activeValue: '1',
+            onChangeField: (row: any, value: any) => {
+                if (row.active == 1) {
+                    return ElMessage({ message: '至少需要保留一条启用的配置!', type: 'warning' })
+                    // 至少需要保留一条启用的配置
+                }
+                toggleActive({
+                    id: row.id
+                }).then(res => {
+                    ElMessage({ message: '启用成功!', type: 'success' })
+                    tableStore.index()
+                })
+            }
+        },
+
+        {
+            title: '操作',
+            fixed: 'right',
+            width: '180',
+            render: 'buttons',
+            buttons: [
+                // {
+                //     name: 'edit',
+                //     title: '启用 ',
+                //     type: 'primary',
+                //     icon: 'el-icon-Plus',
+                //     render: 'basicButton',
+                //     disabled: row => {
+                //         return row.active == 1
+                //     },
+                //     click: row => {
+                //         toggleActive({ id: row.id }).then(res => {
+                //             ElMessage({
+                //                 message: '启用成功!',
+                //                 type: 'success'
+                //             })
+                //             tableStore.index()
+                //         })
+                //     }
+                // },
+                {
+                    name: 'edit',
+                    title: '修改 ',
+                    type: 'primary',
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    click: row => {
+                        setTimeout(() => {
+                            formRef.value.open({
+                                text: '修改配置',
+                                row: row
+                            })
+                        }, 10)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '删除',
+                    type: 'danger',
+                    icon: 'el-icon-Delete',
+                    render: 'confirmButton',
+                    disabled: row => {
+                        return row.active == 1
+                    },
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定删除吗？'
+                    },
+                    click: row => {
+                        csDelete({ id: row.id }).then(res => {
+                            ElMessage({
+                                message: '删除成功!',
+                                type: 'success'
+                            })
+                            tableStore.index()
+                        })
+                    }
+                }
+            ]
+        }
+    ],
+
+    loadCallback: () => {
+
+
+    }
+})
+
+provide('tableStore', tableStore)
+// 新增主题
+const add = () => {
+    setTimeout(() => {
+        formRef.value.open({
+            text: '新增配置'
+        })
+    }, 10)
+}
+onMounted(() => {
+    tableStore.index()
+})
+</script>

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>
@@ -30,8 +30,9 @@ import { getDeviceTree } from '@/api/cs-device-boot/csLedger'
 defineOptions({
     name: 'govern/alarm/index'
 })
+
 const deviceTree = ref([])
-const activeName = ref('0')
+const activeName = ref('1')
 const key = ref(0)
 getDeviceTree().then(res => {
     // res.data.forEach((item: any) => {

src/views/govern/alarm/scopeConfig/form.vue

@@ -0,0 +1,270 @@
+<template>
+    <el-dialog class="cn-operate-dialog" draggable v-model="dialogVisible" :title="title" width="900px"
+        @closed="handleClosed">
+        <el-scrollbar max-height="60vh">
+            <el-form ref="formRef" :model="form" :rules="rules" label-width="auto" class="form-two">
+                <el-form-item label="指标名称" prop="indexName">
+                    <el-input v-model.trim="form.indexName" placeholder="请输入指标名称" clearable maxlength="128" />
+                </el-form-item>
+
+                <el-form-item label="指标code" prop="indexCode">
+                    <el-input v-model.trim="form.indexCode" placeholder="请输入指标code" clearable maxlength="64" />
+                </el-form-item>
+
+
+                <el-form-item label="表名" prop="influxdbTableName">
+                    <el-input v-model.trim="form.influxdbTableName" placeholder="请输入表名" clearable />
+                </el-form-item>
+                <el-form-item label="列属性" prop="influxdbColumnName">
+                    <el-input v-model.trim="form.influxdbColumnName" placeholder="实体类属性名" clearable maxlength="128" />
+                </el-form-item>
+                <el-form-item label="谐波次数">
+                    <el-slider v-model.trim="form.harmSlider" range :max="50" style="width: 90%" />
+                </el-form-item>
+                <el-form-item label="相别" prop="phaseList">
+                    <el-select v-model.trim="form.phaseList" filterable multiple clearable collapse-tags
+                        collapse-tags-tooltip placeholder="请选择相别">
+                        <el-option v-for="item in phaseSelect" :key="item.id" :label="item.name"
+                            :value="item.id"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="指标下限" prop="minValue">
+                    <el-input-number v-model="form.minValue" style="width: 100%" placeholder="下限" />
+                </el-form-item>
+                <el-form-item label="指标上限" prop="maxValue">
+                    <el-input-number v-model="form.maxValue" style="width: 100%" placeholder="上限" />
+                </el-form-item>
+                <el-form-item label="电压等级参与" prop="isVoltage">
+                    <el-radio-group v-model="form.isVoltage">
+                        <el-radio :value="0">不参与</el-radio>
+                        <el-radio :value="1">参与</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item label="Ct变比参与" prop="ctAttendFlag">
+                    <el-radio-group v-model="form.ctAttendFlag">
+                        <el-radio :value="0">不参与</el-radio>
+                        <el-radio :value="1">参与</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item label="数据来源" prop="dataSource">
+                    <el-select v-model="form.dataSource" placeholder="请选择" clearable style="width: 100%">
+                        <el-option label="InfluxDB" value="InfluxDB" />
+                        <!-- <el-option label="oracle" value="oracle" /> -->
+                        <el-option label="MySql" value="MySql" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="所属系统" prop="belongingSystem">
+                    <el-select v-model="form.belongingSystem" placeholder="请选择" clearable style="width: 100%">
+                        <el-option label="pqs" value="pqs" />
+                        <el-option label="govern" value="govern" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="单位" prop="unit">
+                    <el-input v-model.trim="form.unit" placeholder="请输入单位" clearable maxlength="32" />
+                </el-form-item>
+                <el-form-item label="排序" prop="sort">
+                    <el-input-number v-model="form.sort" :min="0" :precision="0" style="width: 100%" />
+                </el-form-item>
+                <!-- <el-form-item label="状态" prop="state">
+                    <el-select v-model="form.state" placeholder="请选择" style="width: 100%">
+                        <el-option label="正常" :value="1" />
+                        <el-option label="删除" :value="0" />
+                    </el-select>
+                </el-form-item> -->
+                <el-form-item label="条件描述" prop="otherAlgorithm" class="form-item-full">
+                    <el-input v-model.trim="form.otherAlgorithm" type="textarea" :rows="2" placeholder="无具体范围时的判断条件描述"
+                        maxlength="500" show-word-limit />
+                </el-form-item>
+                <el-form-item label="备注" prop="remark" class="form-item-full">
+                    <el-input v-model.trim="form.remark" type="textarea" :rows="2" placeholder="备注" maxlength="500"
+                        show-word-limit />
+                </el-form-item>
+            </el-form>
+        </el-scrollbar>
+        <template #footer>
+            <el-button @click="handleCancel">取消</el-button>
+            <el-button type="primary" @click="onSubmit">确定</el-button>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive } from 'vue'
+import { ElMessage } from 'element-plus'
+import { save, update } from '@/api/algorithm-boot/scopeConfig'
+const emit = defineEmits(['Cancels'])
+
+const dialogVisible = ref(false)
+const title = ref('')
+const formRef = ref()
+const phaseSelect = [
+    {
+        name: 'A相',
+        id: 'A'
+    },
+    {
+        name: 'B相',
+        id: 'B'
+    },
+    {
+        name: 'C相',
+        id: 'C'
+    },
+    {
+        name: '无相别',
+        id: 'T'
+    },
+    {
+        name: 'AB相',
+        id: 'AB'
+    },
+    {
+        name: 'BC相',
+        id: 'BC'
+    },
+    {
+        name: 'CA相',
+        id: 'CA'
+    },
+    // {
+    //     name: '无相别',
+    //     id: 'M'
+    // },
+]
+const defaultForm = () => ({
+    id: '',
+    indexCode: '',
+    indexName: '',
+    harmSlider: [0, 0],
+    harmStart: undefined as number | undefined,
+    harmEnd: undefined as number | undefined,
+    phaseType: '',
+    phaseList: [] as any,
+    influxdbTableName: '',
+    influxdbColumnName: '',
+    minValue: undefined as number | undefined,
+    maxValue: undefined as number | undefined,
+    isVoltage: 0,
+    ctAttendFlag: 0,
+    dataSource: '',
+    otherAlgorithm: '',
+    remark: '',
+    unit: '',
+    sort: 100,
+    belongingSystem: 'govern',
+    state: 1
+})
+
+const form = reactive(defaultForm())
+
+
+
+const validateMinMax = (_rule: any, _value: any, callback: (e?: Error) => void) => {
+    if (form.minValue == null || form.maxValue == null) {
+        callback()
+        return
+    }
+    if (form.minValue > form.maxValue) {
+        callback(new Error('指标下限不能大于指标上限'))
+    } else {
+        callback()
+    }
+}
+
+const rules: any = {
+    indexCode: [{ required: true, message: '请输入指标code', trigger: 'blur' }],
+    indexName: [{ required: true, message: '请输入指标名称', trigger: 'blur' }],
+    phaseList: [{ required: true, message: '请输入指标名称', trigger: 'change' }],
+
+    influxdbTableName: [{ required: true, message: '请输入表名', trigger: 'blur' }],
+    influxdbColumnName: [{ required: true, message: '请输入列属性', trigger: 'blur' }],
+    minValue: [
+        { required: true, message: '请输入指标下限', trigger: 'blur' },
+        { validator: validateMinMax, trigger: 'change' }
+    ],
+    maxValue: [
+        { required: true, message: '请输入指标上限', trigger: 'blur' },
+        { validator: validateMinMax, trigger: 'change' }
+    ],
+    isVoltage: [{ required: true, message: '请选择电压等级是否参与', trigger: 'change' }],
+    ctAttendFlag: [{ required: true, message: '请选择Ct变比是否参与', trigger: 'change' }],
+    dataSource: [{ required: true, message: '请选择数据来源', trigger: 'change' }],
+    belongingSystem: [{ required: true, message: '请选择所属系统', trigger: 'change' }],
+    sort: [{ required: true, message: '请输入排序', trigger: 'blur' }],
+    state: [{ required: true, message: '请选择状态', trigger: 'change' }]
+}
+
+const isEdit = () => title.value.includes('修改')
+
+const resetForm = () => {
+    Object.assign(form, defaultForm())
+}
+
+const fillForm = (row: any) => {
+    const keys = Object.keys(defaultForm()) as (keyof ReturnType<typeof defaultForm>)[]
+    keys.forEach(key => {
+        if (row[key] === undefined || row[key] === null) return
+        if (['harmStart', 'harmEnd', 'sort', 'isVoltage', 'ctAttendFlag', 'state'].includes(key)) {
+            ; (form as any)[key] = Number(row[key])
+        } else if (['minValue', 'maxValue'].includes(key)) {
+            ; (form as any)[key] = Number(row[key])
+        } else {
+            ; (form as any)[key] = row[key]
+        }
+    })
+    form.phaseList = form.phaseType.split(',')
+
+    form.harmSlider = [form.harmStart || 0, form.harmEnd || 0]
+}
+
+const open = (e: { text: string; row?: any }) => {
+    formRef.value?.resetFields()
+    title.value = e.text
+    dialogVisible.value = true
+    resetForm()
+    if (e.row) {
+
+        fillForm(e.row)
+    }
+}
+
+const handleCancel = () => {
+    dialogVisible.value = false
+    emit('Cancels')
+}
+
+const handleClosed = () => {
+    resetForm()
+}
+
+const onSubmit = () => {
+    formRef.value?.validate(async (valid: boolean) => {
+        if (!valid) return
+        form.harmStart = form.harmSlider[0]
+        form.harmEnd = form.harmSlider[1]
+        form.phaseType = form.phaseList.join(',')
+        const payload = { ...form }
+        try {
+            if (isEdit()) {
+                await update(payload)
+                ElMessage.success('修改成功!')
+            } else {
+                await save({ ...payload, id: '' })
+                ElMessage.success('新增成功!')
+            }
+            dialogVisible.value = false
+            emit('Cancels')
+        } catch {
+            /* 统一错误提示 */
+        }
+    })
+}
+
+defineExpose({ open })
+</script>
+
+<style scoped>
+.form-item-full {
+    grid-column: 1 / -1;
+}
+</style>

src/views/govern/alarm/scopeConfig/index.vue

@@ -0,0 +1,193 @@
+<template>
+    <div class="default-main">
+        <TableHeader ref="TableHeaderRef">
+            <template #select>
+                <el-form-item label="数据来源">
+                    <el-select v-model="tableStore.table.params.dataSource" clearable placeholder="请选择数据来源">
+                        <el-option v-for="item in dataSourceOptions" :key="item.value" :label="item.label"
+                            :value="item.value" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="系统类型">
+                    <el-select v-model="tableStore.table.params.systemType" clearable placeholder="请选择系统类型">
+                        <el-option v-for="item in systemTypeOptions" :key="item.value" :label="item.label"
+                            :value="item.value" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="表名">
+                    <el-input v-model.trim="tableStore.table.params.tableName" placeholder="请输入表名" clearable
+                        maxlength="64" />
+                </el-form-item>
+            </template>
+            <template #operation>
+                <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
+            </template>
+        </TableHeader>
+        <Table ref="tableRef" />
+        <Form ref="formRef" @Cancels="tableStore.index()" />
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, nextTick } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { ElMessage } from 'element-plus'
+import { pqDelete } from '@/api/algorithm-boot/scopeConfig'
+import Form from './form.vue'
+defineOptions({
+    name: 'govern/alarmConfig'
+})
+const dataSourceOptions = [
+    { label: 'InfluxDB', value: 'InfluxDB' },
+    // { label: 'oracle', value: 'oracle' },
+    { label: 'MySql', value: 'MySql' }
+]
+const systemTypeOptions = [
+    { label: 'pqs', value: 'pqs' },
+    { label: 'govern', value: 'govern' }
+]
+const yesNo = (v: number) => (v === 1 ? '是' : v === 0 ? '否' : '/')
+const stateMap: Record<number, string> = { 0: '删除', 1: '正常' }
+const formRef = ref()
+const tableStore: any = new TableStore({
+    url: '/algorithm-boot/pqReasonableRange/getData',
+    method: 'POST',
+    showPage: false,
+    column: [
+        {
+            field: 'index',
+            title: '序号',
+            width: '80',
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { field: 'indexName', title: '指标名称', minWidth: 200 },
+        { field: 'indexCode', title: '指标code', minWidth: 150 },
+
+        { field: 'influxdbTableName', title: '表名', minWidth: 150 },
+        { field: 'influxdbColumnName', title: '列属性', minWidth: 150 },
+        {
+            field: 'harmStart', title: '谐波次数', width: 90,
+            formatter: (row: any) => {
+                return row.cellValue == null ? '/' : row.cellValue + '-' + row.row.harmEnd
+            }
+        },
+        {
+            field: 'phaseType', title: '相别', width: 100, formatter: (row: any) => {
+                return row.cellValue == 'T' ? '/' : row.cellValue
+
+
+            }
+        },
+        { field: 'minValue', title: '指标下限', width: 100 },
+        { field: 'maxValue', title: '指标上限', width: 100 },
+        {
+            field: 'isVoltage',
+            title: '电压等级参与',
+            width: 110,
+            formatter: (row: any) => yesNo(row.cellValue)
+        },
+        {
+            field: 'ctAttendFlag',
+            title: 'Ct变比参与',
+            width: 100,
+            formatter: (row: any) => yesNo(row.cellValue)
+        },
+        { field: 'dataSource', title: '数据来源', width: 100 },
+        { field: 'belongingSystem', title: '所属系统', width: 100 },
+
+
+        {
+            field: 'unit', title: '单位', width: 80,
+            formatter: (row: any) => {
+                return row.cellValue || '/'
+            }
+        },
+        { field: 'sort', title: '排序', width: 70 },
+        {
+            field: 'otherAlgorithm', title: '条件描述', minWidth: 200,
+            formatter: (row: any) => {
+                return row.cellValue || '/'
+            }
+        },
+        {
+            field: 'remark', title: '备注', minWidth: 200,
+            formatter: (row: any) => {
+                return row.cellValue || '/'
+            }
+        },
+
+        {
+            title: '操作',
+            fixed: 'right',
+            width: '180',
+            render: 'buttons',
+            buttons: [
+
+                {
+                    name: 'edit',
+                    title: '修改 ',
+                    type: 'primary',
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    click: row => {
+                        setTimeout(() => {
+                            formRef.value.open({
+                                text: '修改配置',
+                                row: row
+                            })
+                        }, 10)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '删除',
+                    type: 'danger',
+                    icon: 'el-icon-Delete',
+                    render: 'confirmButton',
+                    disabled: row => {
+                        return row.active == 1
+                    },
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定删除吗？'
+                    },
+                    click: row => {
+                        pqDelete({ id: row.id }).then(res => {
+                            ElMessage({
+                                message: '删除成功!',
+                                type: 'success'
+                            })
+                            tableStore.index()
+                        })
+                    }
+                }
+            ]
+        }
+    ],
+
+    loadCallback: () => {
+
+
+    }
+})
+tableStore.table.params.dataSource = ''
+tableStore.table.params.tableName = ''
+tableStore.table.params.systemType = ''
+provide('tableStore', tableStore)
+// 新增主题
+const add = () => {
+    setTimeout(() => {
+        formRef.value.open({
+            text: '新增配置'
+        })
+    }, 10)
+}
+onMounted(() => {
+    tableStore.index()
+})
+</script>

src/views/govern/alarm/steadyStateEvent/index.vue

@@ -0,0 +1,440 @@
+<template>
+    <div class="default-main" style="display: flex" :style="height">
+        <div style="width: 400px; overflow: hidden">
+            <div class="custom-table-header">
+                <div class="title">方案列表</div>
+                <el-button :icon="Plus" type="primary" @click="addRole" class="ml10">新增</el-button>
+            </div>
+            <Table ref="tableRef" :row-config="{ isCurrent: true, isHover: true }" @currentChange="currentChange" />
+        </div>
+        <div style="flex: 1; overflow: hidden">
+            <div class="custom-table-header">
+                <div class="title">指标配置</div>
+                <!-- <el-button :icon="Select" type="primary" @click="saveIndicator" class="ml10">保存</el-button> -->
+            </div>
+            <div class="pd10 borderBox" :style="height1" style="overflow-y: auto">
+                <H4 class="mt10">基础指标</H4>
+
+                <el-checkbox-group v-model="indicator">
+                    <el-checkbox label="频率偏差" value="频率偏差" />
+                    <el-checkbox label="电压偏差" value="电压偏差" />
+                    <el-checkbox label="三相电压不平衡度" value="三相电压不平衡度" />
+                    <el-checkbox label="闪变" value="闪变" />
+                    <el-checkbox label="电压总谐波畸变率" value="电压总谐波畸变率" />
+                    <el-checkbox label="负序电流" value="负序电流" />
+                </el-checkbox-group>
+                <H4 class="mt10">谐波电压</H4>
+                <div class="df">
+                    <div class="title">谐波电压含有率:</div>
+                    <div style="flex: 1">
+                        <el-checkbox v-model="checkAll1" @change="handleCheckAllChange1">全选</el-checkbox>
+                        <el-checkbox-group v-model="indicator" @change="handleHarmonicVoltageChange">
+                            <el-checkbox
+                                v-for="num in 24"
+                                :key="`harmonicVoltage_${num + 1}`"
+                                :label="`${num + 1}次`"
+                                :value="`${num + 1}次谐波电压含有率`"
+                            />
+                        </el-checkbox-group>
+                    </div>
+                </div>
+                <H4 class="mt10">谐波电流</H4>
+                <div class="df">
+                    <div class="title">谐波电流有效值:</div>
+                    <div style="flex: 1">
+                        <el-checkbox v-model="checkAll2" @change="handleCheckAllChange2">全选</el-checkbox>
+                        <el-checkbox-group v-model="indicator" @change="handleHarmonicCurrentChange">
+                            <el-checkbox
+                                v-for="num in 24"
+                                :key="`harmonicCurrent_${num + 1}`"
+                                :label="`${num + 1}次`"
+                                :value="`${num + 1}次谐波电流有效值`"
+                            />
+                        </el-checkbox-group>
+                    </div>
+                </div>
+
+                <H4 class="mt10">间谐波电压</H4>
+                <div class="df">
+                    <div class="title">间谐波电压含有率:</div>
+                    <div style="flex: 1">
+                        <el-checkbox v-model="checkAll3" @change="handleCheckAllChange3">全选</el-checkbox>
+                        <el-checkbox-group v-model="indicator" @change="handleInterharmonicVoltageChange">
+                            <el-checkbox
+                                v-for="num in 16"
+                                :key="`interharmonicVoltage_${num}`"
+                                :label="`${num - 0.5}次`"
+                                :value="`${num - 0.5}次间谐波电压含有率`"
+                            />
+                        </el-checkbox-group>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div style="width: 370px">
+            <div class="custom-table-header">
+                <div class="title">监测点绑定</div>
+                <el-button :icon="Select" type="primary" @click="saveIndicator" class="ml10" :loading="loading">
+                    保存
+                </el-button>
+            </div>
+            <!-- <steadyStateTree /> -->
+            <Tree
+                class="borderBox"
+                ref="treeRef"
+                show-checkbox
+                :showBut="false"
+                width="370px"
+                :height="260"
+                :data="menuTree"
+                :checkStrictly="checkStrictly"
+            ></Tree>
+        </div>
+        <!-- 新增/编辑弹框 -->
+        <el-dialog v-model="dialogVisible" :title="dialogTitle" width="400px" :before-close="handleClose">
+            <el-form :model="formData" :rules="formRules" ref="formRef" label-width="100px">
+                <el-form-item label="方案名称" prop="name">
+                    <el-input v-model.trim="formData.name" placeholder="请输入方案名称" clearable />
+                </el-form-item>
+                <el-form-item label="排序" prop="sort">
+                    <el-input maxlength="32" show-word-limit-number v-model.number="formData.sort" :min="0" />
+                </el-form-item>
+            </el-form>
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="dialogVisible = false">取消</el-button>
+                    <el-button type="primary" @click="submitForm">确定</el-button>
+                </span>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { Plus, Select } from '@element-plus/icons-vue'
+import { ref, onMounted, provide, computed } from 'vue'
+import TableStore from '@/utils/tableStore'
+import { getLineTree, getCldTree } from '@/api/cs-device-boot/csLedger'
+import Table from '@/components/table/index.vue'
+import { save, deletePlan, update, getById } from '@/api/cs-harmonic-boot/mxgraph'
+import { mainHeight } from '@/utils/layout'
+import { ElMessage } from 'element-plus'
+import steadyStateTree from '@/components/tree/govern/steadyStateTree.vue'
+import { useConfig } from '@/stores/config'
+import Tree from '@/components/tree/allocation.vue'
+import { id } from 'element-plus/es/locale'
+defineOptions({
+    name: 'govern/steadyStateEvent'
+})
+const height = mainHeight(20)
+const height1 = mainHeight(90)
+const config = useConfig()
+const tableRef = ref()
+const checkAll1 = ref(false)
+const checkAll2 = ref(false)
+const checkAll3 = ref(false)
+const menuTree: any = ref([])
+const checkStrictly = ref(false)
+const indicator: any = ref([])
+const lineList: any = ref([])
+const copyRow: any = ref({})
+const treeRef = ref()
+const loading = ref(false)
+// 弹框相关
+const dialogVisible = ref(false)
+const dialogTitle = ref('新增方案')
+const formRef = ref()
+const formData = ref({
+    id: '',
+    sort: 0,
+    lineList: [],
+    harmonicTarget: '',
+    name: ''
+})
+const formRules = {
+    name: [{ required: true, message: '请输入方案名称', trigger: 'blur' }],
+    sort: [{ required: true, message: '请输入排序', trigger: 'blur' }]
+}
+
+// 生成各分组的指标值数组
+const harmonicVoltageValues = computed(() => Array.from({ length: 24 }, (_, i) => `${i + 2}次谐波电压含有率`))
+const harmonicCurrentValues = computed(() => Array.from({ length: 24 }, (_, i) => `${i + 2}次谐波电流有效值`))
+const interharmonicVoltageValues = computed(() => Array.from({ length: 16 }, (_, i) => `${i + 0.5}次间谐波电压含有率`))
+
+// 谐波电压全选/取消全选
+const handleCheckAllChange1 = (val: any) => {
+    if (val) {
+        const newValues = harmonicVoltageValues.value.filter(v => !indicator.value.includes(v))
+        indicator.value = [...indicator.value, ...newValues]
+    } else {
+        indicator.value = indicator.value.filter(v => !harmonicVoltageValues.value.includes(v))
+    }
+}
+
+// 谐波电流全选/取消全选
+const handleCheckAllChange2 = (val: any) => {
+    if (val) {
+        const newValues = harmonicCurrentValues.value.filter(v => !indicator.value.includes(v))
+        indicator.value = [...indicator.value, ...newValues]
+    } else {
+        indicator.value = indicator.value.filter(v => !harmonicCurrentValues.value.includes(v))
+    }
+}
+
+// 间谐波电压全选/取消全选
+const handleCheckAllChange3 = (val: any) => {
+    if (val) {
+        const newValues = interharmonicVoltageValues.value.filter(v => !indicator.value.includes(v))
+        indicator.value = [...indicator.value, ...newValues]
+    } else {
+        indicator.value = indicator.value.filter(v => !interharmonicVoltageValues.value.includes(v))
+    }
+}
+
+// 谐波电压分组内值变化时，更新全选状态
+const handleHarmonicVoltageChange = () => {
+    const selectedInGroup = harmonicVoltageValues.value.filter(v => indicator.value.includes(v))
+    checkAll1.value =
+        selectedInGroup.length == harmonicVoltageValues.value.length && harmonicVoltageValues.value.length > 0
+}
+
+// 谐波电流分组内值变化时，更新全选状态
+const handleHarmonicCurrentChange = () => {
+    const selectedInGroup = harmonicCurrentValues.value.filter(v => indicator.value.includes(v))
+    checkAll2.value =
+        selectedInGroup.length == harmonicCurrentValues.value.length && harmonicCurrentValues.value.length > 0
+}
+
+// 间谐波电压分组内值变化时，更新全选状态
+const handleInterharmonicVoltageChange = () => {
+    const selectedInGroup = interharmonicVoltageValues.value.filter(v => indicator.value.includes(v))
+
+    checkAll3.value =
+        selectedInGroup.length == interharmonicVoltageValues.value.length && interharmonicVoltageValues.value.length > 0
+}
+
+const tableStore = new TableStore({
+    showPage: false,
+    url: '/cs-harmonic-boot/csHarmonicPlan/list',
+    method: 'GET',
+    publicHeight: 70,
+    column: [
+        { title: '方案名称', field: 'name', align: 'center' },
+        {
+            title: '操作',
+            fixed: 'right',
+            align: 'center',
+            width: '100',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+
+                    click: row => {
+                        openDialog('edit', row)
+                    }
+                },
+                {
+                    name: 'del',
+                    title: '删除',
+                    type: 'danger',
+                    icon: 'el-icon-Delete',
+                    render: 'confirmButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定删除该角色吗？'
+                    },
+                    click: row => {
+                        deletePlan([row.id]).then(() => {
+                            ElMessage.success('删除成功')
+                            tableStore.index()
+                        })
+                    }
+                }
+            ]
+        }
+    ],
+    beforeSearchFun: () => {},
+    loadCallback: () => {
+        tableRef.value.getRef().setCurrentRow(tableStore.table.data[0])
+        currentChange({
+            row: tableStore.table.data[0]
+        })
+    }
+})
+tableStore.table.params.searchValue = ''
+getCldTree().then(res => {
+    res.data?.children.map((item: any) => {
+        item.icon = 'el-icon-HomeFilled'
+        item.color = config.getColorVal('elementUiPrimary')
+        item.children.forEach((item: any) => {
+            item.icon = 'el-icon-List'
+            item.color = config.getColorVal('elementUiPrimary')
+            item.children.forEach((item2: any) => {
+                item2.icon = 'el-icon-Platform'
+                item2.color = item2.comFlag == 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
+                item2.children.forEach((item3: any) => {
+                    item3.icon = 'el-icon-Platform'
+                    item3.color = item3.comFlag == 2 ? config.getColorVal('elementUiPrimary') : '#e26257 !important'
+                })
+            })
+        })
+    })
+    menuTree.value = filterTreeKeepPath(res.data.children)
+})
+provide('tableStore', tableStore)
+const filterTreeKeepPath = (treeData: any) => {
+    const result = []
+
+    for (const node of treeData) {
+        // 递归处理子节点
+        const filteredChildren: any = node.children?.length ? filterTreeKeepPath(node.children) : []
+
+        // 如果当前节点 level == 3，或者子节点中有符合条件的数据
+        if (node.level == 3 || filteredChildren.length > 0) {
+            result.push({
+                ...node,
+                children: filteredChildren
+            })
+        }
+    }
+
+    return result
+}
+// 打开弹框
+const openDialog = (type: string, row?: any) => {
+    if (type == 'add') {
+        dialogTitle.value = '新增方案'
+        formData.value = {
+            id: '',
+            name: '',
+            lineList: [],
+            harmonicTarget: '',
+            sort: 0
+        }
+    } else if (type == 'edit') {
+        dialogTitle.value = '编辑方案'
+        formData.value = {
+            id: row.id,
+            lineList: row.lineList,
+            harmonicTarget: row.harmonicTarget,
+            sort: row.sort,
+            name: row.name
+        }
+    }
+    dialogVisible.value = true
+}
+
+// 关闭弹框
+const handleClose = () => {
+    dialogVisible.value = false
+    formRef.value?.resetFields()
+}
+
+// 提交表单
+const submitForm = async () => {
+    await formRef.value?.validate()
+    if (dialogTitle.value == '新增方案') {
+        await save({
+            harmonicTarget: '',
+            id: '',
+            lineList: [],
+            name: formData.value.name,
+            sort: formData.value.sort
+        }).then((res: any) => {
+            ElMessage.success(`${dialogTitle.value}成功`)
+            dialogVisible.value = false
+            tableStore.index() // 刷新列表
+        })
+    } else {
+        await update({
+            harmonicTarget: formData.value.harmonicTarget,
+            id: formData.value.id,
+            lineList: formData.value.lineList,
+            name: formData.value.name,
+            sort: formData.value.sort
+        }).then((res: any) => {
+            ElMessage.success(`${dialogTitle.value}成功`)
+            dialogVisible.value = false
+            tableStore.index() // 刷新列表
+        })
+    }
+
+    // 模拟保存成功
+}
+
+// 保存指标
+const saveIndicator = () => {
+    // TODO: 调用保存指标接口
+    loading.value = true
+    update({
+        harmonicTarget: indicator.value.join(','),
+        id: copyRow.value.id,
+        lineList: treeRef.value.treeRef
+            .getCheckedNodes(false, true)
+            .filter(item => item.level == 3)
+            .map((node: any) => node.id),
+        name: copyRow.value.name,
+        sort: copyRow.value.sort
+    })
+        .then((res: any) => {
+            ElMessage.success(`保存成功`)
+            loading.value = false
+            tableStore.index()
+        })
+        .catch(() => {
+            loading.value = false
+        })
+}
+
+const currentChange = (data: any) => {
+    getById({ id: data.row.id }).then((res: any) => {
+        checkStrictly.value = true
+        indicator.value = res.data.harmonicTarget.split(',')
+        lineList.value = res.data.lineList || []
+        copyRow.value = res.data
+        treeRef.value.treeRef.setCheckedKeys(lineList.value)
+        setTimeout(() => {
+            handleInterharmonicVoltageChange()
+            handleHarmonicCurrentChange()
+            handleHarmonicVoltageChange()
+            checkStrictly.value = false
+        }, 100)
+    })
+}
+
+onMounted(() => {
+    tableStore.index()
+})
+
+const addRole = () => {
+    openDialog('add')
+}
+</script>
+
+<style lang="scss" scoped>
+:deep(.el-tabs--border-card > .el-tabs__content) {
+    padding: 0px !important;
+}
+.df {
+    display: flex;
+    .title {
+        width: 125px;
+    }
+    :deep(.el-checkbox) {
+        width: 70px;
+    }
+}
+.custom-table-header {
+    height: 60px;
+}
+.borderBox {
+    border: 1px solid var(--el-border-color);
+}
+</style>

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

@@ -179,7 +179,6 @@ const init = () => {
                         opacity: 0.35,
                         fontSize: 14
                     },
-                    backgroundColor: 'rgba(0,0,0,0.55)',
                     borderWidth: 0
                 },
 

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

@@ -141,7 +141,8 @@
                             v-show="
                                 dataSet.includes('_items') ||
                                 dataSet.indexOf('_history') != -1 ||
-                                dataSet.indexOf('_moduleData') != -1
+                                dataSet.indexOf('_moduleData') != -1 ||
+                                dataSet.indexOf('_devRunTrend') != -1
                             "
                         >
                             <DatePicker ref="datePickerRef"></DatePicker>
@@ -165,7 +166,11 @@
                             </el-select> -->
                             <el-radio-group
                                 v-model.trim="formInline.dataLevel"
-                                v-if="!dataSet.includes('_moduleData') && TrendList?.lineType == 1"
+                                v-if="
+                                    !dataSet.includes('_devRunTrend') &&
+                                    !dataSet.includes('_moduleData') &&
+                                    TrendList?.lineType == 1
+                                "
                                 :disabled="TrendList?.lineType != 1"
                                 @change="handleClick"
                             >
@@ -226,7 +231,7 @@
                         <el-button
                             type="primary"
                             :disabled="tableLoading"
-                            v-if="realTimeFlag"
+                            v-if="showButton"
                             :icon="DataLine"
                             @click="handleTrend"
                         >
@@ -234,13 +239,22 @@
                         </el-button>
                         <el-button
                             type="primary"
-                            v-if="realTimeFlag"
+                            v-if="showButton"
                             :icon="TrendCharts"
                             @click="handleHarmonicSpectrum"
                             :disabled="tableLoading"
                         >
                             实时趋势
                         </el-button>
+                        <el-button
+                            type="primary"
+                            v-if="showButton"
+                            :icon="Download"
+                            @click="downloadTxt"
+                            :disabled="tableLoading"
+                        >
+                            下载数据
+                        </el-button>
                     </template>
                 </TableHeader>
                 <div
@@ -525,6 +539,14 @@
                 >
                     <moduleData ref="moduleDataRef" @onSubmit="handleClick" />
                 </div>
+                <!-- 运行趋势 -->
+                <div
+                    style="height: calc(100vh - 395px)"
+                    v-if="dataSet.indexOf('_devRunTrend') != -1"
+                    v-loading="tableLoading"
+                >
+                    <operatingTrend ref="operatingTrendRef" @onSubmit="handleClick" />
+                </div>
                 <div v-if="!tableData" style="height: 42px"></div>
             </el-tabs>
         </div>
@@ -548,7 +570,8 @@ import {
     getOverLimitData,
     queryDictType,
     getById,
-    allModelData
+    allModelData,
+    getRawData
 } from '@/api/cs-device-boot/EquipmentDelivery'
 import { deviceHisData, deviceRtData, realTimeData, getTestData } from '@/api/cs-device-boot/csGroup'
 import { ref, reactive, onMounted, onUnmounted, inject, nextTick, onBeforeUnmount } from 'vue'
@@ -557,6 +580,7 @@ import DatePicker from '@/components/form/datePicker/index.vue'
 import Trend from './tabs/trend.vue' //趋势数据
 import realTime from './tabs/realtime.vue' //实时数据-主界面
 import realTrend from './tabs/components/realtrend.vue' //实时数据-实时趋势
+import operatingTrend from './tabs/operatingTrend.vue' //运行趋势
 import harmonicSpectrum from './tabs/components/harmonicSpectrum.vue' //实时数据-谐波频谱子页面
 import recordWoves from './tabs/components/recordwoves.vue' //实时数据-实时录波子页面
 import offLineDataImport from './offLineDataImport/index.vue'
@@ -569,7 +593,7 @@ import { useRouter } from 'vue-router'
 import TableHeader from '@/components/table/header/index.vue'
 import { useAdminInfo } from '@/stores/adminInfo'
 import {
-    Histogram,
+    Download,
     TrendCharts,
     DataLine,
     DataAnalysis,
@@ -581,6 +605,7 @@ import {
 } from '@element-plus/icons-vue'
 import analysisList from './analysisList/index.vue'
 import mqtt from 'mqtt'
+import { json } from 'node:stream/consumers'
 defineOptions({
     name: 'govern/device/control'
 })
@@ -660,6 +685,8 @@ const volConTypeList = dictData.getBasicData('Dev_Connect')
 // }
 //谐波频谱
 const realTrendRef = ref()
+const txtContent = ref('')
+const operatingTrendRef = ref()
 const changeTrendType = (val: any) => {
     trendDataTime.value = ''
     activeTrendName.value = val * 1
@@ -669,7 +696,7 @@ const changeTrendType = (val: any) => {
 const activeTrendName: any = ref(0)
 const trendTimer: any = ref()
 const trendDataTime: any = ref()
-
+const showButton = ref(false)
 //谐波频谱方法
 const handleTrend = async () => {
     realTimeFlag.value = false
@@ -685,7 +712,7 @@ const handleTrend = async () => {
         .then((res: any) => {
             if (res.code == 'A0000') {
                 trendDataTime.value = ''
-                ElMessage.success('装置应答成功')
+                ElMessage.success('设备应答成功')
                 //每隔30s调用一下接口，通知后台推送mqtt消息
                 trendTimer.value = window.setInterval(() => {
                     if (!dataSet.value.includes('_realtimedata')) return
@@ -709,7 +736,7 @@ const handleTrend = async () => {
                     // }
                 })
             } else {
-                ElMessage.warning('装置应答失败')
+                ElMessage.warning('设备应答失败')
             }
         })
         .catch(e => {
@@ -741,9 +768,9 @@ const handleHarmonicSpectrum = async () => {
     // getRealDataMqttMsg()
     await getBasicRealData(lineId.value).then((res: any) => {
         if (res.code == 'A0000') {
-            ElMessage.success('装置应答成功')
+            ElMessage.success('设备应答成功')
             // mqttMessage.value = {}
-
+            showButton.value = true
             realDataTimer.value = window.setInterval(() => {
                 if (!dataSet.value.includes('_realtimedata')) return
 
@@ -771,7 +798,8 @@ const handleReturn = async () => {
     tableLoading.value = true
     await getBasicRealData(lineId.value).then((res: any) => {
         if (res.code == 'A0000') {
-            ElMessage.success('装置应答成功')
+            ElMessage.success('设备应答成功')
+            showButton.value = true
             // mqttMessage.value = {}
             realDataTimer.value = window.setInterval(() => {
                 if (!dataSet.value.includes('_realtimedata')) return
@@ -920,6 +948,10 @@ const nodeClick = async (e: anyObj, node: any) => {
                         if (item.type === 'moduleData') {
                             item.id = item.id + '_moduleData'
                         }
+                        // 模块数据
+                        if (item.type === 'devRunTrend') {
+                            item.id = item.id + '_devRunTrend'
+                        }
                     })
                     res.data.dataSetList = res.data.dataSetList.filter((item: any) => item.name != '历史统计数据')
                     //便携式设备默认二次值
@@ -982,9 +1014,9 @@ const getRealDataMqttMsg = async () => {
     await getBasicRealData(lineId.value)
         .then((res: any) => {
             if (res.code == 'A0000') {
-                ElMessage.success('装置应答成功')
+                ElMessage.success('设备应答成功')
                 mqttMessage.value = {}
-
+                showButton.value = true
                 realDataTimer.value = window.setInterval(async () => {
                     if (!dataSet.value.includes('_realtimedata')) return
                     await getBasicRealData(lineId.value).then((res: any) => {
@@ -1113,6 +1145,7 @@ const getRealDataMqttMsg = async () => {
                     }
                     if (obj.hasOwnProperty('pA') && obj.hasOwnProperty('pB')) {
                         mqttMessage.value = obj
+                        txtContent.value = JSON.stringify(obj)
 
                         //更新实时数据主页面值
                         realTimeFlag.value &&
@@ -1146,7 +1179,7 @@ const getRealDataMqttMsg = async () => {
                     console.log('mqtt客户端已断开连接.....')
                 })
             } else {
-                ElMessage.success('装置应答失败')
+                ElMessage.success('设备应答失败')
                 tableLoading.value = false
             }
         })
@@ -1162,6 +1195,7 @@ const realDataTimer: any = ref()
 const mqttMessage = ref<any>({})
 const handleClick = async (tab?: any) => {
     tableLoading.value = true
+    showButton.value = false
     if (realDataTimer.value) {
         window.clearInterval(realDataTimer.value)
     }
@@ -1316,6 +1350,36 @@ const handleClick = async (tab?: any) => {
             }, 0)
         }, 0)
     }
+    //运行趋势
+    if (dataSet.value.includes('_devRunTrend')) {
+        setTimeout(async () => {
+            if (tab.props != undefined) await (datePickerRef.value && datePickerRef.value?.setInterval(5))
+
+            let obj = {
+                // devId: deviceId.value, //e.id
+                lineId: [deviceId.value], //e.pid
+                startTime: datePickerRef.value && datePickerRef.value.timeValue[0],
+                endTime: datePickerRef.value && datePickerRef.value.timeValue[1]
+            }
+            await setTimeout(() => {
+                getRawData(obj)
+                    .then((res: any) => {
+                        tableLoading.value = false
+                        setTimeout(() => {
+                            operatingTrendRef.value?.setData(res.data)
+                        }, 500)
+                        setTimeout(() => {
+                            loading.value = false
+                        }, 1500)
+                    })
+                    .catch(e => {
+                        setTimeout(() => {
+                            tableLoading.value = false
+                        }, 1500)
+                    })
+            }, 0)
+        }, 0)
+    }
 
     //查询当前指标
     if (!dataSet.value.includes('_')) {
@@ -1435,6 +1499,21 @@ const queryList: any = ref([])
 const echoName = (value: any, arr: any[]) => {
     return value ? arr.find(item => item.value == value)?.label : '/'
 }
+// 下载txt
+const downloadTxt = () => {
+    const content = txtContent.value // 文件内容
+    const blob = new Blob([content], { type: 'text/plain' }) // 创建 Blob 对象
+    const url = URL.createObjectURL(blob) // 生成下载链接
+
+    // 创建 <a> 标签并触发下载
+    const link = document.createElement('a')
+    link.href = url
+    link.download = '实时数据.txt' // 文件名
+    link.click()
+
+    // 释放 URL 对象
+    URL.revokeObjectURL(url)
+}
 
 onMounted(() => {})
 onBeforeUnmount(() => {

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

@@ -241,7 +241,7 @@ const tableStore = new TableStore({
             width: '180',
             render: 'buttons',
             buttons: [
-                //直连装置注册
+                //直连设备注册
                 {
                     title: '注册',
                     type: 'primary',

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

@@ -20,14 +20,8 @@
 
             <el-button @click="handleBack" :icon="Back">返回</el-button>
         </div>
-           <!-- v-loading="loading" -->
+        <!-- v-loading="loading" -->
-        <el-tabs
+        <el-tabs class="home_body" type="border-card" v-model.trim="activeName1" @tab-click="handleClick">
-            class="home_body"
-            type="border-card"
-            v-model.trim="activeName1"
-            @tab-click="handleClick"
-         
-        >
             <el-tab-pane label="瞬时波形" name="ssbx" :style="'height:' + bxecharts + ';overflow-y: auto;'">
                 <shushiboxi
                     v-if="isWp && wp && activeName == 'ssbx' && showBoxi"
@@ -110,9 +104,15 @@ const value = ref(1)
 const isWp = ref(false)
 const boxoList: any = ref([])
 const getWpData = (val: any, list: any) => {
-    wp.value = val
+    wp.value = {}
-    isWp.value = true
+    isWp.value = false
-    boxoList.value = list
+    boxoList.value = []
+
+    setTimeout(() => {
+        wp.value = val
+        isWp.value = true
+        boxoList.value = list
+    }, 100)
 }
 const changeView = () => {
     showBoxi.value = false
@@ -140,7 +140,6 @@ const handleBack = () => {
     emit('handleHideCharts')
 }
 const setHeight = (h: any, vh: any, num = 1) => {
-    console.log('🚀 ~ setHeight ~ h:', h)
     if (h != false) {
         parentHeight.value = h
     }

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

@@ -182,7 +182,7 @@ const tableStore: any = new TableStore({
                     icon: 'el-icon-Check',
                     render: 'basicButton',
                     disabled: row => {
-                        return (props.deviceType === '2' && row.wavePath) || row.showName === '未知'
+                        return !(props.deviceType == '2' && row.wavePath == null)
                     },
                     click: row => {
                         getFileByEventId(row.id).then(res => {
@@ -219,6 +219,8 @@ const handleBack = async () => {
 }
 defineExpose({ getTableParams })
 onMounted(() => {
+    console.log('🚀 ~ props.deviceType:', props.deviceType)
+
     tableStore.index()
 })
 </script>

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

@@ -0,0 +1,165 @@
+<template>
+    <div :style="height">
+        <MyEchart v-if="list.length != 0" :options="options1" style="height: 100%; width: 100%" class="pt10" />
+        <el-empty description="暂无数据" style="width: 100%; height: 100%" v-else></el-empty>
+    </div>
+</template>
+
+<script setup lang="ts">
+import MyEchart from '@/components/echarts/MyEchart.vue'
+import { ref, reactive } from 'vue'
+import { mainHeight } from '@/utils/layout'
+import { max } from 'lodash'
+const height = ref(mainHeight(290))
+const list = ref([])
+const options1 = ref({})
+const setData = (data: any) => {
+    // list.value = [...fillDataFromFirstTime(data),...data]
+    list.value = data
+    init()
+}
+/**
+ * 补全离散数据（严格从数组第一个time开始，最后一个time结束）
+ * @param {Array} data 原始离散数据数组
+ * @param {number} interval 补全时间间隔（秒，默认10秒）
+ * @returns {Array} 补全后的连续数据
+ */
+function fillDataFromFirstTime(data, interval = 10) {
+    // 1. 基础校验
+    if (!Array.isArray(data) || data.length === 0) {
+        console.error('原始数据必须是非空数组')
+        return []
+    }
+
+    // 2. 锁定起始时间：直接取数组第一个元素的time（不做任何偏移）
+    const firstItem = data[0]
+    const startTime = new Date(firstItem.time)
+    const startTimestamp = startTime.getTime()
+
+    // 3. 锁定结束时间：取数组最后一个元素的time
+    const lastItem = data[data.length - 1]
+    const endTime = new Date(lastItem.time)
+    const endTimestamp = endTime.getTime()
+
+    // 4. 预处理：按时间排序（防止原始数据乱序）
+    const sortedData = [...data].sort((a, b) => new Date(a.time) - new Date(b.time))
+
+    // 5. 初始化状态（继承第一个数据的type）
+    let currentType = firstItem.type
+    let currentDesc = firstItem.description
+    let nextStatusIndex = 1 // 指向待切换的下一个状态点
+
+    const filledData = []
+
+    // 6. 核心循环：从第一个time开始，按间隔补全到最后一个time
+    for (let ts = startTimestamp; ts <= endTimestamp; ts += interval * 1000) {
+        const currentDate = new Date(ts)
+        // 格式化时间为和原始数据一致的 "YYYY-MM-DD HH:mm:ss" 格式
+        const formattedTime = `${currentDate.getFullYear()}-${String(currentDate.getMonth() + 1).padStart(
+            2,
+            '0'
+        )}-${String(currentDate.getDate()).padStart(2, '0')} ${String(currentDate.getHours()).padStart(
+            2,
+            '0'
+        )}:${String(currentDate.getMinutes()).padStart(2, '0')}:${String(currentDate.getSeconds()).padStart(2, '0')}`
+
+        // 7. 检查是否到达下一个状态切换点
+        if (nextStatusIndex < sortedData.length) {
+            const nextStatusTime = new Date(sortedData[nextStatusIndex].time).getTime()
+            if (ts >= nextStatusTime) {
+                currentType = sortedData[nextStatusIndex].type
+                currentDesc = sortedData[nextStatusIndex].description
+                nextStatusIndex++
+            }
+        }
+
+        // 8. 生成补全数据项（结构与原始数据完全一致）
+        filledData.push({
+            time: formattedTime,
+            devId: firstItem.devId,
+            description: currentDesc,
+            type: currentType
+        })
+    }
+
+    return filledData
+}
+
+const init = () => {
+    options1.value = {
+        title: {
+            text: '运行状态'
+        },
+        legend: {
+            show: false
+        },
+        tooltip: {
+            formatter: function (params: any) {
+                var res = params[0].data[0] + '<br/>运行状态：'
+                var texts = ''
+                if (params[0].data[1] === 1 || params[0].data[1] === '1') {
+                    texts = '中断'
+                } else if (params[0].data[1] === 10 || params[0].data[1] === '10') {
+                    texts = '正常'
+                }
+                res = res + texts
+                return res
+            }
+        },
+        xAxis: {
+            // type: 'category',
+            // data: data.updateTime
+            type: 'time',
+            name: '时间',
+            //
+            axisLabel: {
+                formatter: {
+                    day: '{MM}-{dd}',
+                    month: '{MM}',
+                    year: '{yyyy}'
+                }
+            }
+        },
+        yAxis: {
+            name: '',
+            type: 'value',
+            max: 11,
+            interval: 1,
+            splitLine: {
+                lineStyle: {
+                    // 使用深浅的间隔色
+                    color: ['#ccc'],
+                    type: 'dashed',
+                    opacity: 0
+                }
+            },
+            axisLabel: {
+                // 这里重新定义就可以
+                formatter: function (value: number) {
+                    var texts = []
+                    if (value === 1) {
+                        texts.push('中断')
+                    } else if (value === 10) {
+                        texts.push('正常')
+                    }
+                    return texts
+                }
+            }
+        },
+        series: [
+            {
+                name: '运行状态',
+                data: list.value.map((item: any, index: number) => [item.time, item.type == 0 ? 1 : 10]),
+                type: 'line',
+                showSymbol: false,
+
+                step: 'end'
+            }
+        ]
+    }
+}
+defineExpose({
+    setData
+})
+</script>
+<style lang="scss" scoped></style>

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

@@ -1,12 +1,10 @@
 <template>
-    <div class=" device-manage" :style="{ height: pageHeight.height }" v-loading="loading">
+    <div class="device-manage" :style="{ height: pageHeight.height }" v-loading="loading">
         <GetMarketList @node-click="selectUser" @selectUser="selectUser"></GetMarketList>
         <div class="device-manage-right" :style="{ height: pageHeight.height }">
             <el-descriptions title="用户基本信息" class="mb10" :column="2" border>
                 <template #extra>
-                    <el-button type="primary" icon="el-icon-Sort" @click="getMarketEnginner">
+                    <el-button type="primary" icon="el-icon-Sort" @click="getMarketEnginner">绑定工程</el-button>
-                        绑定工程
-                    </el-button>
                 </template>
                 <el-descriptions-item label="名称">
                     {{ user.name }}
@@ -29,18 +27,36 @@
                 </vxe-table>
             </div>
         </div>
-        <el-dialog v-model.trim="dialogVisible" title="绑定工程" class="cn-operate-dialog" :close-on-click-modal="false">
+        <el-dialog
-            <el-input maxlength="32" show-word-limit v-model.trim="filterText" icon="el-icon-Search" placeholder="请输入内容"
+            v-model.trim="dialogVisible"
-                clearable style="margin-bottom: 10px">
+            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>
                     <Icon name="el-icon-Search" style="font-size: 16px" />
                 </template>
             </el-input>
 
-            <vxe-table ref="tableRef" v-bind="defaultAttribute" :data="tableData2.filter((item: any) => {
+            <vxe-table
+                ref="tableRef"
+                v-bind="defaultAttribute"
+                :data="tableData2.filter((item: any) => {
                 return item.name.includes(filterText)
             })
-                " height="500px" style="width: 100%">
+                "
+                height="500px"
+                style="width: 100%"
+            >
                 <vxe-column type="checkbox" width="60"></vxe-column>
                 <vxe-column field="name" title="工程名称"></vxe-column>
             </vxe-table>
@@ -77,6 +93,7 @@ const filterText = ref('')
 const tableRef = ref()
 
 const selectUser = (e: any) => {
+    if (e == undefined) return (loading.value = false)
     user.value = e
     loading.value = true
     queryByUseId({

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

@@ -2,7 +2,7 @@
 <template>
     <div class="default-main main" :style="{ height: pageHeight.height }">
         <div class="main_left">
-            <DeviceTree @node-click="nodeClick" @init="nodeClick"></DeviceTree>
+            <DeviceTree @node-click="nodeClick" @deviceTypeChange="deviceTypeChange"></DeviceTree>
         </div>
         <div class="main_right" v-loading="loading">
             <div class="right_nav">
@@ -19,7 +19,7 @@
                     </el-breadcrumb>
                 </div>
                 <!-- <el-button :icon="Refresh" @click="handleRestartDevice" type="primary" :loading="deviceRestartLoading">
-                    装置重启
+                    设备重启
                 </el-button> -->
             </div>
 
@@ -197,22 +197,28 @@
 import DeviceTree from '@/components/tree/govern/deviceTree.vue'
 import { mainHeight } from '@/utils/layout'
 import { ref, watch, onMounted, onBeforeUnmount, h, inject } from 'vue'
-import { ElMessage, ElMessageBox, ElInput } from 'element-plus'
+import { ElMessage, ElMessageBox, ElInput, ElSegmented } from 'element-plus'
 import {
     getFileServiceFileOrDir,
     uploadDeviceFile,
     reStartDevice,
     addDeviceDir,
-    delDeviceDir
+    delDeviceDir,
-} from '@/api/cs-device-boot/fileService.ts'
+    listDir,
+    downloadFileFromFrontr,
+    deleteCld,
+    uploadFileToFront,
+    mkdir
+} from '@/api/cs-device-boot/fileService'
 import { defaultAttribute } from '@/components/table/defaultAttribute'
 import { Delete, Download, Upload, Plus, Refresh, Search } from '@element-plus/icons-vue'
 import popup from './popup.vue'
 import mqtt from 'mqtt'
 import { useAdminInfo } from '@/stores/adminInfo'
 import { passwordConfirm } from '@/api/user-boot/user'
+import { downLoadFile } from '@/utils/downloadFile.ts'
 defineOptions({
-    name: 'govern/device/fileService'
+    name: 'govern/device/fileService/index'
 })
 const pageHeight = mainHeight(20)
 const tableHeight = mainHeight(130)
@@ -220,31 +226,53 @@ const adminInfo = useAdminInfo()
 const loading = ref(false)
 //nDid
 const nDid = ref<string>('')
+const devId = ref<string>('')
 //当前目录
 const activePath = ref<string>('')
 //判断是否是根目录
 const isRoot = ref<boolean>(true)
 //储存所有点击过的目录
 const activePathList: any = ref([])
+const devConType = ref<string>('')
+const deviceTypeChange = (val: any, obj: any) => {
+    nodeClick(obj)
+}
 const nodeClick = (e: any) => {
     if (e && (e.level == 2 || e.type == 'device')) {
         loading.value = true
         nDid.value = e.ndid
+        devId.value = e.id
         dirList.value = []
         activePathList.value = []
         activePath.value = '/'
-        getFileServiceFileOrDir({ nDid: nDid.value, name: activePath.value, type: 'dir' })
+        devConType.value = e.devConType
-            .then((resp: any) => {
+        if (devConType.value == 'CLD') {
-                if (resp.code == 'A0000') {
+            listDir({ devId: devId.value, filePath: activePath.value })
-                    dirList.value = resp.data
+                .then((resp: any) => {
-                    currentDirList.value = resp.data
+                    if (resp.code == 'A0000') {
-                    activePathList.value = [{ path: activePath.value }]
+                        dirList.value = resp.data
+                        currentDirList.value = resp.data
+                        activePathList.value = [{ path: activePath.value }]
+                        loading.value = false
+                    }
+                })
+                .catch(e => {
                     loading.value = false
-                }
+                })
-            })
+        } else {
-            .catch(e => {
+            getFileServiceFileOrDir({ nDid: nDid.value, name: activePath.value, type: 'dir' })
-                loading.value = false
+                .then((resp: any) => {
-            })
+                    if (resp.code == 'A0000') {
+                        dirList.value = resp.data
+                        currentDirList.value = resp.data
+                        activePathList.value = [{ path: activePath.value }]
+                        loading.value = false
+                    }
+                })
+                .catch(e => {
+                    loading.value = false
+                })
+        }
     }
 }
 //搜索文件或文件夹
@@ -291,11 +319,11 @@ const vNode = () => {
     ])
 }
 
-//装置重启
+//设备重启
 const deviceRestartLoading = ref<boolean>(false)
 const handleRestartDevice = () => {
     deviceRestartLoading.value = true
-    ElMessageBox.prompt('二次校验密码确认', '装置重启', {
+    ElMessageBox.prompt('二次校验密码确认', '设备重启', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         customClass: 'customInput',
@@ -360,21 +388,41 @@ const handleIntoDir = (row: any) => {
     if (activePathList.value.indexOf(obj.name) == -1) {
         activePathList.value.push({ path: obj.name })
     }
-    getFileServiceFileOrDir(obj)
+
-        .then(res => {
+    if (devConType.value == 'CLD') {
-            dirList.value = res.data
+        listDir({ devId: devId.value, filePath: row.prjDataPath })
-            loading.value = false
+            .then((resp: any) => {
-            currentDirList.value = res.data
+                if (resp.code == 'A0000') {
-            activePathList.value.map((item: any, index: any) => {
+                    dirList.value = resp.data
-                if (item.path.includes(activePath.value) && item.path.length > activePath.value.length) {
+                    currentDirList.value = resp.data
-                    activePathList.value.splice(index, 1)
+                    activePathList.value.map((item: any, index: any) => {
+                        if (item.path.includes(activePath.value) && item.path.length > activePath.value.length) {
+                            activePathList.value.splice(index, 1)
+                        }
+                    })
+                    loading.value = false
                 }
             })
-            isRoot.value = false
+            .catch(e => {
-        })
+                loading.value = false
-        .catch(e => {
+            })
-            loading.value = false
+    } else {
-        })
+        getFileServiceFileOrDir(obj)
+            .then(res => {
+                dirList.value = res.data
+                loading.value = false
+                currentDirList.value = res.data
+                activePathList.value.map((item: any, index: any) => {
+                    if (item.path.includes(activePath.value) && item.path.length > activePath.value.length) {
+                        activePathList.value.splice(index, 1)
+                    }
+                })
+                isRoot.value = false
+            })
+            .catch(e => {
+                loading.value = false
+            })
+    }
 }
 
 //处理导航栏路径
@@ -406,19 +454,38 @@ const handleIntoByPath = async (val: any) => {
     }
     activePath.value = val.path
     loading.value = true
-    getFileServiceFileOrDir(obj)
+    if (devConType.value == 'CLD') {
-        .then(res => {
+        listDir({ devId: devId.value, filePath: val.path })
-            dirList.value = res.data
+            .then((resp: any) => {
-            activePathList.value.map((item: any, index: any) => {
+                if (resp.code == 'A0000') {
-                if (item.path.includes(activePath.value) && item.path.length > activePath.value.length) {
+                    dirList.value = resp.data
-                    activePathList.value.splice(index, 1)
+
+                    activePathList.value.map((item: any, index: any) => {
+                        if (item.path.includes(activePath.value) && item.path.length > activePath.value.length) {
+                            activePathList.value.splice(index, 1)
+                        }
+                    })
+                    loading.value = false
                 }
             })
-            loading.value = false
+            .catch(e => {
-        })
+                loading.value = false
-        .catch(e => {
+            })
-            loading.value = false
+    } else {
-        })
+        getFileServiceFileOrDir(obj)
+            .then(res => {
+                dirList.value = res.data
+                activePathList.value.map((item: any, index: any) => {
+                    if (item.path.includes(activePath.value) && item.path.length > activePath.value.length) {
+                        activePathList.value.splice(index, 1)
+                    }
+                })
+                loading.value = false
+            })
+            .catch(e => {
+                loading.value = false
+            })
+    }
 }
 const form = ref({
     path: ''
@@ -437,45 +504,84 @@ const formRef = ref()
 //重新加载当前页面菜单
 const reloadCurrentMenu = (msg: string) => {
     loading.value = true
-    getFileServiceFileOrDir({ nDid: nDid.value, name: activePath.value, type: 'dir' })
-        .then((resp: any) => {
-            if (resp.code == 'A0000') {
-                loading.value = false
-                dirList.value = resp.data
-                currentDirList.value = resp.data
-                activePathList.value.map((item: any, index: any) => {
-                    if (item.path.includes(activePath.value) && item.path.length > activePath.value.length) {
-                        activePathList.value.splice(index, 1)
-                    }
-                })
-                loading.value = false
 
-                if (!msg) return
+    if (devConType.value == 'CLD') {
-                ElMessage({ message: msg, type: 'success', duration: 5000 })
+        listDir({ devId: devId.value, filePath: activePath.value })
-            }
+            .then((resp: any) => {
-        })
+                if (resp.code == 'A0000') {
-        .catch(e => {
+                    dirList.value = resp.data
-            loading.value = false
+                    currentDirList.value = resp.data
-        })
+                    activePathList.value.map((item: any, index: any) => {
+                        if (item.path.includes(activePath.value) && item.path.length > activePath.value.length) {
+                            activePathList.value.splice(index, 1)
+                        }
+                    })
+                    loading.value = false
+                    if (!msg) return
+                    ElMessage({ message: msg, type: 'success', duration: 5000 })
+                }
+            })
+            .catch(e => {
+                loading.value = false
+            })
+    } else {
+        getFileServiceFileOrDir({ nDid: nDid.value, name: activePath.value, type: 'dir' })
+            .then((resp: any) => {
+                if (resp.code == 'A0000') {
+                    loading.value = false
+                    dirList.value = resp.data
+                    currentDirList.value = resp.data
+                    activePathList.value.map((item: any, index: any) => {
+                        if (item.path.includes(activePath.value) && item.path.length > activePath.value.length) {
+                            activePathList.value.splice(index, 1)
+                        }
+                    })
+                    loading.value = false
+
+                    if (!msg) return
+                    ElMessage({ message: msg, type: 'success', duration: 5000 })
+                }
+            })
+            .catch(e => {
+                loading.value = false
+            })
+    }
 }
 //新建文件夹
 const submitDeviceDir = () => {
     formRef.value.validate((valid: any) => {
         if (valid) {
-            let obj = {
+            if (devConType.value == 'CLD') {
-                nDid: nDid.value,
+                let obj = {
-                path:
+                    devId: devId.value,
-                    activePath.value == '/'
+                    filePath:
-                        ? activePath.value + form.value.path
+                        activePath.value == '/'
-                        : activePath.value + '/' + form.value.path
+                            ? activePath.value + form.value.path
-            }
+                            : activePath.value + '/' + form.value.path
-            loading.value = true
-            addDeviceDir(obj).then((res: any) => {
-                if (res.code == 'A0000') {
-                    reloadCurrentMenu(res.message)
-                    addDeviceDirOpen.value = false
                 }
-            })
+                loading.value = true
+                mkdir(obj).then((res: any) => {
+                    if (res.code == 'A0000') {
+                        reloadCurrentMenu(res.message)
+                        addDeviceDirOpen.value = false
+                    }
+                })
+            } else {
+                let obj = {
+                    nDid: nDid.value,
+                    path:
+                        activePath.value == '/'
+                            ? activePath.value + form.value.path
+                            : activePath.value + '/' + form.value.path
+                }
+                loading.value = true
+                addDeviceDir(obj).then((res: any) => {
+                    if (res.code == 'A0000') {
+                        reloadCurrentMenu(res.message)
+                        addDeviceDirOpen.value = false
+                    }
+                })
+            }
         }
     })
 }
@@ -507,13 +613,30 @@ const handleDelDirOrFile = (row: any) => {
             passwordConfirm(value)
                 .then((resp: any) => {
                     if (resp.code == 'A0000') {
-                        delDeviceDir({ nDid: nDid.value, path: row.prjDataPath }).then((res: any) => {
+                        if (devConType.value == 'CLD') {
-                            if (res.code == 'A0000') {
+                            deleteCld({
-                                reloadCurrentMenu(res.message)
+                                devId: devId.value,
-
+                                filePath: row.prjDataPath
-                                // ElMessage({ message: res.message, type: 'success', duration: 5000 })
+                            })
-                            }
+                                .then((res: any) => {
-                        })
+                                    if (res.code == 'A0000') {
+                                        reloadCurrentMenu(res.message)
+                                    }
+                                })
+                                .catch(e => {
+                                    loading.value = false
+                                })
+                        } else {
+                            delDeviceDir({ nDid: nDid.value, path: row.prjDataPath })
+                                .then((res: any) => {
+                                    if (res.code == 'A0000') {
+                                        reloadCurrentMenu(res.message)
+                                    }
+                                })
+                                .catch(e => {
+                                    loading.value = false
+                                })
+                        }
                     }
                 })
                 .catch(e => {
@@ -526,11 +649,21 @@ const changeType = ref<any>('')
 //下载文件
 const fileRef = ref()
 const handleDownLoad = async (row: any) => {
-    ;(await nDid.value) && fileRef.value && fileRef.value.open(row, nDid.value)
+    if (devConType.value == 'CLD') {
-    // fileName.value = row?.prjDataPath.split('/')[row?.prjDataPath.split('/').length - 1]
+        ElMessage.info('下载中，请稍等...')
-    // localStorage.setItem('fileName', fileName.value)
+        downloadFileFromFrontr({
-    changeType.value = 'download'
+            devId: devId.value,
-    localStorage.setItem('changeType', changeType.value)
+            filePath: row.prjDataPath
+        }).then(res => {
+            downLoadFile(row.name, row.name, res)
+        })
+    } else {
+        ;(await nDid.value) && fileRef.value && fileRef.value.open(row, nDid.value)
+        // fileName.value = row?.prjDataPath.split('/')[row?.prjDataPath.split('/').length - 1]
+        // localStorage.setItem('fileName', fileName.value)
+        changeType.value = 'download'
+        localStorage.setItem('changeType', changeType.value)
+    }
 }
 //上传文件
 const fileName = ref<any>('')
@@ -540,17 +673,32 @@ const handleUpload = (e: any, fileList: any, row: any) => {
     localStorage.setItem('fileName', fileName.value)
     changeType.value = 'upload'
     localStorage.setItem('changeType', changeType.value)
-    const obj = {
+
-        id: nDid.value,
+    if (devConType.value == 'CLD') {
-        file: e.raw,
+        const obj = {
-        filePath: row || row.prjDataPath
+            devId: devId.value,
-    }
+            file: e.raw,
-    uploadDeviceFile(obj).then((res: any) => {
+            dirPath: row || row.prjDataPath
-        if (res.code == 'A0000') {
-            reloadCurrentMenu(res.message)
-            status.value = 100
         }
-    })
+        uploadFileToFront(obj).then((res: any) => {
+            if (res.code == 'A0000') {
+                reloadCurrentMenu(res.message)
+                status.value = 100
+            }
+        })
+    } else {
+        const obj = {
+            id: nDid.value,
+            file: e.raw,
+            filePath: row || row.prjDataPath
+        }
+        uploadDeviceFile(obj).then((res: any) => {
+            if (res.code == 'A0000') {
+                reloadCurrentMenu(res.message)
+                status.value = 100
+            }
+        })
+    }
 }
 watch(
     () => activePathList.value,
@@ -598,26 +746,28 @@ const mqttMessage = ref<any>({})
 const status: any = ref()
 function parseStringToObject(str: string) {
     const content = str.replace(/^{|}$/g, '')
-    const pairs = content.split(',')
     const result: any = {}
-    pairs.forEach(pair => {
+
-        const [key, value] = pair.split(':')
+    // 正则匹配：key:value 格式，支持 value 里带 : / 等字符
-        // 尝试将数字转换为Number类型
+    const regex = /([^,:]+):([^,]+)(?=,|$)/g
-        result[key.trim()] = isNaN(Number(value)) ? value.trim() : Number(value)
+    let match
-    })
+
+    while ((match = regex.exec(content)) !== null) {
+        const key = match[1].trim()
+        const value = match[2].trim()
+        // 数字自动转 Number
+        result[key] = isNaN(Number(value)) ? value : Number(value)
+    }
+
     return result
 }
 mqttRef.value.on('message', (topic: any, message: any) => {
     // console.log('mqtt接收到消息', JSON.parse(JSON.stringify(JSON.parse(new TextDecoder().decode(message)))))
 
     let str = JSON.parse(JSON.stringify(JSON.parse(new TextDecoder().decode(message))))
-
-    let regex = /fileName:(.*?),allStep/
-    let regex1 = /allStep:(.*?),nowStep/
-    let regex2 = /nowStep:(.*?),userId/
-    let regex3 = /userId:(.*?)}/
-
     mqttMessage.value = parseStringToObject(str)
+    if (adminInfo.id != mqttMessage.value.userId) return
+
     // console.log("🚀 ~ str.match(regex3)[1]:", str.match(regex3)[1])
     status.value = parseInt(Number((mqttMessage.value.nowStep / mqttMessage.value.allStep) * 100))
     fileRef.value.setStatus(mqttMessage.value)

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

@@ -3,6 +3,7 @@
     <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"
@@ -57,7 +58,7 @@ import {
     getFileServiceFileOrDir,
     downLoadDeviceFile,
     downLoadDeviceFilePath
-} from '@/api/cs-device-boot/fileService.ts'
+} from '@/api/cs-device-boot/fileService'
 import { ElMessage } from 'element-plus'
 import { useAdminInfo } from '@/stores/adminInfo'
 import { downLoadFile } from '@/api/cs-system-boot/manage.ts'

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

@@ -20,7 +20,7 @@
                         type="primary"
                         :loading="deviceRestartLoading"
                     >
-                        装置重启
+                        设备重启
                     </el-button>
                 </template>
                 <el-descriptions-item label="名称">
@@ -237,11 +237,11 @@ const openGroup = () => {
         })
     })
 }
-//装置重启
+//设备重启
 const deviceRestartLoading = ref<boolean>(false)
 const handleRestartDevice = () => {
     deviceRestartLoading.value = true
-    ElMessageBox.prompt('二次校验密码确认', '装置重启', {
+    ElMessageBox.prompt('二次校验密码确认', '设备重启', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         customClass: 'customInput',

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

@@ -1,141 +1,159 @@
 <template>
-  <div class=" device-manage" :style="{ height: pageHeight.height }" v-loading="loading">
+    <div class="device-manage" :style="{ height: pageHeight.height }" v-loading="loading">
-    <OfficialUserTree @node-click="selectUser" @selectUser="selectUser"></OfficialUserTree>
+        <OfficialUserTree @node-click="selectUser" @selectUser="selectUser"></OfficialUserTree>
-    <div class="device-manage-right" :style="{ height: pageHeight.height }">
+        <div style="flex: 1" class="pt10 pr10">
-      <div class="el-descriptions__header">
+            <div class="el-descriptions__header">
-        <el-button type="primary"  icon="el-icon-Sort"  @click="getEnginnerDev">绑定工程 / 设备</el-button>
+                <div class="el-descriptions__title">工程 / 设备列表</div>
-      </div>
+                <el-button type="primary" icon="el-icon-Sort" @click="getEnginnerDev">绑定工程 / 设备</el-button>
+            </div>
 
-      <!-- 使用flex布局平均分配高度 -->
+            <!-- 使用flex布局平均分配高度 -->
-      <div class="tables-container">
+            <div class="tables-container">
-        <div class="table-wrapper">
+                <div class="table-wrapper" :style="{ height: pageHeight1.height }">
-          <vxe-table v-bind="defaultAttribute" :data="tableData" height="auto" style="width: 100%">
+                    <vxe-table v-bind="defaultAttribute" :data="tableData" height="auto" style="width: 100%">
-            <vxe-column field="name" title="工程名称"></vxe-column>
+                        <vxe-column field="name" title="工程名称"></vxe-column>
-            <vxe-column title="操作" width="200px">
+                        <vxe-column title="操作" width="200px">
-              <template v-slot:default="scoped">
+                            <template v-slot:default="scoped">
-                <el-button link size="small" type="danger" @click="deleteEngineering(scoped.row)">
+                                <el-button link size="small" type="danger" @click="deleteEngineering(scoped.row)">
-                  移除
+                                    移除
-                </el-button>
+                                </el-button>
-              </template>
+                            </template>
-            </vxe-column>
+                        </vxe-column>
-          </vxe-table>
+                    </vxe-table>
+                </div>
+            </div>
+        </div>
+        <!-- 短信配置 -->
+
+        <div style="width: 400px" class="pt10 pr10">
+            <div class="el-descriptions__header">
+                <div class="el-descriptions__title">短信配置</div>
+                <el-button type="primary" icon="el-icon-Select" @click="saveConfiguration">保存</el-button>
+            </div>
+
+            <!-- 使用flex布局平均分配高度 -->
+            <div :style="{ height: pageHeight1.height }" class="border">
+                <el-tree
+                    ref="treeRef"
+                    class="mt10"
+                    node-key="id"
+                    default-expand-all
+                    :data="tableData"
+                    :props="defaultProps"
+                    show-checkbox
+                >
+                    <template #default="{ node, data }">
+                        <span>{{ data.name.replace(/\([^)]*\)/, '') }}</span>
+                    </template>
+                </el-tree>
+            </div>
         </div>
 
-        <!-- 新增设备列表 -->
+        <!-- 对话框为左右布局 -->
-        <div class="device-list-section table-wrapper">
+        <el-dialog
-          <vxe-table v-bind="defaultAttribute" :data="deviceTableData" height="auto" style="width: 100%">
+            v-model.trim="dialogVisible"
-            <vxe-column field="name" title="设备名称"></vxe-column>
+            draggable
-            <vxe-column title="操作" width="200px">
+            title="绑定工程 / 设备"
-              <template v-slot:default="scoped">
+            class="cn-operate-dialog"
-                <el-button link size="small" type="danger" @click="deleteDevice(scoped.row)">
+            :close-on-click-modal="false"
-                  移除
+        >
-                </el-button>
+            <div class="dialog-content">
-              </template>
+                <!-- 工程部分 -->
-            </vxe-column>
+                <div class="dialog-section">
-          </vxe-table>
+                    <div class="section-header">
-        </div>
+                        <span>工程列表</span>
-      </div>
+                        <el-input
+                            maxlength="32"
+                            show-word-limit
+                            v-model.trim="filterText"
+                            placeholder="搜索工程"
+                            clearable
+                            class="search-input"
+                        >
+                            <template #prefix>
+                                <Icon name="el-icon-Search" style="font-size: 16px" />
+                            </template>
+                        </el-input>
+                    </div>
+
+                    <vxe-table
+                        ref="tableRef"
+                        v-bind="defaultAttribute"
+                        :data="tableData2.filter((item: any) => {
+            return item.name.includes(filterText)
+          })"
+                        height="400px"
+                        style="width: 100%"
+                    >
+                        <vxe-column type="checkbox" width="60"></vxe-column>
+                        <vxe-column field="name" title="工程名称"></vxe-column>
+                    </vxe-table>
+                </div>
+
+                <!-- 设备部分 -->
+                <div class="dialog-section">
+                    <div class="section-header">
+                        <span>设备列表</span>
+                        <el-input
+                            maxlength="32"
+                            show-word-limit
+                            v-model.trim="deviceFilterText"
+                            placeholder="搜索设备"
+                            clearable
+                            class="search-input"
+                        >
+                            <template #prefix>
+                                <Icon name="el-icon-Search" style="font-size: 16px" />
+                            </template>
+                        </el-input>
+                    </div>
+
+                    <vxe-table
+                        ref="deviceTableRef"
+                        v-bind="defaultAttribute"
+                        :data="deviceTableData2.filter((item: any) => {
+            return item.name.includes(deviceFilterText)
+          })"
+                        height="400px"
+                        style="width: 100%"
+                    >
+                        <vxe-column type="checkbox" width="60"></vxe-column>
+                        <vxe-column field="name" title="便携式设备名称"></vxe-column>
+                    </vxe-table>
+                </div>
+            </div>
+
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="dialogVisible = false">取 消</el-button>
+                    <el-button type="primary" @click="addData">确 定</el-button>
+                </span>
+            </template>
+        </el-dialog>
     </div>
-    
-    <!-- 对话框为左右布局 -->
-    <el-dialog 
-      v-model.trim="dialogVisible" 
-      draggable
-      title="绑定工程 / 设备" 
-      class="cn-operate-dialog" 
-      :close-on-click-modal="false"
-      
-    >
-      <div class="dialog-content">
-        <!-- 工程部分 -->
-        <div class="dialog-section">
-          <div class="section-header">
-            <span>工程列表</span>
-            <el-input 
-              maxlength="32" 
-              show-word-limit 
-              v-model.trim="filterText" 
-              placeholder="搜索工程" 
-              clearable 
-              class="search-input"
-            >
-              <template #prefix>
-                <Icon name="el-icon-Search" style="font-size: 16px" />
-              </template>
-            </el-input>
-          </div>
-          
-          <vxe-table 
-            ref="tableRef" 
-            v-bind="defaultAttribute" 
-            :data="tableData2.filter((item: any) => {
-              return item.name.includes(filterText)
-            })" 
-            height="400px" 
-            style="width: 100%"
-          >
-            <vxe-column type="checkbox" width="60"></vxe-column>
-            <vxe-column field="name" title="工程名称"></vxe-column>
-          </vxe-table>
-        </div>
-        
-        <!-- 设备部分 -->
-        <div class="dialog-section">
-          <div class="section-header">
-            <span>设备列表</span>
-            <el-input 
-              maxlength="32" 
-              show-word-limit 
-              v-model.trim="deviceFilterText" 
-              placeholder="搜索设备" 
-              clearable 
-              class="search-input"
-            >
-              <template #prefix>
-                <Icon name="el-icon-Search" style="font-size: 16px" />
-              </template>
-            </el-input>
-          </div>
-          
-          <vxe-table 
-            ref="deviceTableRef" 
-            v-bind="defaultAttribute" 
-            :data="deviceTableData2.filter((item: any) => {
-              return item.name.includes(deviceFilterText)
-            })" 
-            height="400px" 
-            style="width: 100%"
-          >
-            <vxe-column type="checkbox" width="60"></vxe-column>
-            <vxe-column field="name" title="设备名称"></vxe-column>
-          </vxe-table>
-        </div>
-      </div>
-
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="dialogVisible = false">取 消</el-button>
-          <el-button type="primary" @click="addData">确 定</el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </div>
 </template>
 
 <script setup lang="ts">
 defineOptions({
-  name: 'govern/officialUser/index'
+    name: 'govern/officialUser/index'
 })
 
 import { defaultAttribute } from '@/components/table/defaultAttribute'
 import OfficialUserTree from '@/components/tree/govern/officialUserTree.vue'
 import { mainHeight } from '@/utils/layout'
-import {  queryRunPortableDevByUseId ,queryUnlinkEngineeringByUseId} from '@/api/cs-device-boot/user'
+import { queryRunPortableDevByUseId, queryUnlinkEngineeringByUseId } from '@/api/cs-device-boot/user'
-import { add, removeUserDev, queryDevByUseId } from '@/api/cs-system-boot/official'
+import {
+    add,
+    removeUserDev,
+    queryDevByUseId,
+    addUserDevices,
+    queryDeviceIdsByUserId
+} from '@/api/cs-system-boot/official'
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 
 const pageHeight = mainHeight(60)
+const pageHeight1 = mainHeight(125)
 const loading = ref(true)
 
 const user: any = ref({})
@@ -148,185 +166,222 @@ const filterText = ref('') // 工程搜索文本
 const deviceFilterText = ref('') // 设备搜索文本
 const tableRef = ref()
 const deviceTableRef = ref() // 设备表格引用
-
+const defaultProps = {
+    children: 'devList',
+    label: 'name'
+}
 const selectUser = (e: any) => {
-  user.value = e
+      if (e == undefined) return (loading.value = false)
-  loading.value = true
+    user.value = e
+    loading.value = true
 
-    queryDevByUseId({ userId: e.id }).then((engineeringRes) => {
+    queryDevByUseId({ userId: e.id })
-        loading.value = false
+        .then(engineeringRes => {
-        tableData.value = engineeringRes.data.engineeringList || []
+            loading.value = false
-        deviceTableData.value =  engineeringRes.data.portableDevList || []
+
-  }).catch(() => {
+            tableData.value = engineeringRes.data.engineeringList || []
-        loading.value = false
+            deviceTableData.value = engineeringRes.data.portableDevList || []
-  })
+            queryDeviceIdsByUserId({
+                userId: user.value.id
+            }).then(res => {
+                treeRef.value!.setCheckedKeys(res.data, false)
+            })
+        })
+        .catch(() => {
+            loading.value = false
+        })
 }
 
 const getEnginnerDev = () => {
-  filterText.value = ''
+    filterText.value = ''
-  deviceFilterText.value = ''
+    deviceFilterText.value = ''
 
-  // 同时获取工程和设备数据
+    // 同时获取工程和设备数据
-  Promise.all([
+    Promise.all([
-    queryUnlinkEngineeringByUseId({ userId: user.value.id }),
+        queryUnlinkEngineeringByUseId({ userId: user.value.id }),
-    queryRunPortableDevByUseId({ userId: user.value.id })
+        queryRunPortableDevByUseId({ userId: user.value.id })
-  ]).then(([engineeringRes, deviceRes]) => {
+    ]).then(([engineeringRes, deviceRes]) => {
-    tableData2.value = engineeringRes.data || []
+        tableData2.value = engineeringRes.data || []
-    deviceTableData2.value = deviceRes.data || []
+        deviceTableData2.value = deviceRes.data || []
-    dialogVisible.value = true
+        dialogVisible.value = true
 
-    setTimeout(() => {
+        setTimeout(() => {
-      tableRef.value?.clearCheckboxRow()
+            tableRef.value?.clearCheckboxRow()
-      deviceTableRef.value?.clearCheckboxRow()
+            deviceTableRef.value?.clearCheckboxRow()
-    }, 0)
+        }, 0)
-  })
+    })
 }
 
 const deleteEngineering = (row: any) => {
-  ElMessageBox.confirm('是否移出该工程?', '请确认', {
+    ElMessageBox.confirm('是否移出该工程?', '请确认', {
-    confirmButtonText: '确认',
+        confirmButtonText: '确认',
-    cancelButtonText: '取消',
+        cancelButtonText: '取消',
-    type: 'warning'
+        type: 'warning'
-  }).then(() => {
+    }).then(() => {
-    // 只移除工程，设备列表为空
+        // 只移除工程，设备列表为空
-    const form = {
+        const form = {
-      engineeringList: [row.id],  // 要移除的工程ID
+            engineeringList: [row.id], // 要移除的工程ID
-      portableDevList: [],               // 设备列表为空
+            portableDevList: [], // 设备列表为空
-      userId: user.value.id
+            userId: user.value.id
-    }
+        }
 
-    removeUserDev(form).then((res: any) => {
+        removeUserDev(form).then((res: any) => {
-      ElMessage.success(res.message)
+            ElMessage.success(res.message)
-      selectUser(user.value)
+            selectUser(user.value)
+        })
     })
-  })
 }
 
 // 删除设备方法
 const deleteDevice = (row: any) => {
     console.log('删除设备', row)
-  ElMessageBox.confirm('是否移出该设备?', '请确认', {
+    ElMessageBox.confirm('是否移出该设备?', '请确认', {
-    confirmButtonText: '确认',
+        confirmButtonText: '确认',
-    cancelButtonText: '取消',
+        cancelButtonText: '取消',
-    type: 'warning'
+        type: 'warning'
-  }).then(() => {
+    }).then(() => {
-    // 只移除设备，工程列表为空
+        // 只移除设备，工程列表为空
-    const form = {
+        const form = {
-      engineeringList: [],               // 工程列表为空
+            engineeringList: [], // 工程列表为空
-      portableDevList: [row.id],   // 要移除的设备ID
+            portableDevList: [row.id], // 要移除的设备ID
-      userId: user.value.id
+            userId: user.value.id
-    }
+        }
 
-    removeUserDev(form).then((res: any) => {
+        removeUserDev(form).then((res: any) => {
-      ElMessage.success(res.message)
+            ElMessage.success(res.message)
-      selectUser(user.value)
+            selectUser(user.value)
+        })
     })
-  })
 }
 
 const addData = () => {
-  const selectedEngineers = tableRef.value.getCheckboxRecords()
+    const selectedEngineers = tableRef.value.getCheckboxRecords()
-  const selectedDevices = deviceTableRef.value.getCheckboxRecords()
+    const selectedDevices = deviceTableRef.value.getCheckboxRecords()
 
-  // 如果没有选择任何项，则提示
+    // 如果没有选择任何项，则提示
-  if (selectedEngineers.length === 0 && selectedDevices.length === 0) {
+    if (selectedEngineers.length === 0 && selectedDevices.length === 0) {
-    ElMessage.warning('请至少选择一项工程或设备')
+        ElMessage.warning('请至少选择一项工程或设备')
-    return
+        return
-  }
+    }
 
-  // 构造请求参数对象
+    // 构造请求参数对象
-  const form = {
+    const form = {
-    engineeringList: [] as any[],
+        engineeringList: [] as any[],
-    portableDevList: [] as any[],
+        portableDevList: [] as any[],
-    userId: user.value.id
+        userId: user.value.id
-  }
+    }
 
-//   // 处理已有的工程数据
+    //   // 处理已有的工程数据
-//   tableData.value.forEach((item: any) => {
+    //   tableData.value.forEach((item: any) => {
-//     form.engineeringList.push(item.id)
+    //     form.engineeringList.push(item.id)
-//   })
+    //   })
 
-//   // 处理已有的设备数据
+    //   // 处理已有的设备数据
-//   deviceTableData.value.forEach((item: any) => {
+    //   deviceTableData.value.forEach((item: any) => {
-//     form.portableDevList.push(item.id)
+    //     form.portableDevList.push(item.id)
-//   })
+    //   })
 
-  // 添加新选择的工程
+    // 添加新选择的工程
-  selectedEngineers.forEach((item: any) => {
+    selectedEngineers.forEach((item: any) => {
-    form.engineeringList.push( item.id)
+        form.engineeringList.push(item.id)
-  })
+    })
 
-  // 添加新选择的设备
+    // 添加新选择的设备
-  selectedDevices.forEach((item: any) => {
+    selectedDevices.forEach((item: any) => {
-    form.portableDevList.push(item.id)
+        form.portableDevList.push(item.id)
-  })
+    })
 
-  // 发送请求
+    // 发送请求
-  add(form).then((res: any) => {
+    add(form).then((res: any) => {
-    ElMessage.success(res.message)
+        ElMessage.success(res.message)
-    selectUser(user.value)
+        selectUser(user.value)
-    dialogVisible.value = false
+        dialogVisible.value = false
-  })
+    })
+}
+const treeRef = ref()
+// 保存短信配置
+const saveConfiguration = () => {
+    // treeRef.value!.getCheckedNodes(false, false)
+    let deviceIds = treeRef
+        .value!.getCheckedNodes(false, false)
+        .filter((item: any) => item.devList == null)
+        .map((item: any) => item.id)
+    if (deviceIds.length == 0) {
+        return ElMessage.warning('请选择设备!')
+    }
+    addUserDevices({
+        deviceIds: deviceIds,
+        userId: user.value.id
+    }).then((res: any) => {
+        return ElMessage.success('短信配置成功!')
+    })
 }
 </script>
 
 <style lang="scss" scoped>
 .device-manage {
-  display: flex;
-
-  &-right {
-    overflow: hidden;
-    flex: 1;
-    padding: 10px 10px 10px 0;
     display: flex;
-    flex-direction: column;
 
-    .el-descriptions__header {
+    &-right {
-      height: 27px;
+        overflow: hidden;
-      display: flex;
-      justify-content: flex-end; /* 靠右显示 */
-      align-items: center;
-    }
-
-    .tables-container {
-      flex: 1;
-      display: flex;
-      flex-direction: column;
-
-      .table-wrapper {
         flex: 1;
-        min-height: 0;
+        padding: 10px 10px 10px 0;
+        display: flex;
+        flex-direction: column;
 
-        &:first-child {
+        .el-descriptions__header {
-          margin-bottom: 10px;
+            // height: 27px;
+            display: flex;
+            justify-content: flex-end;
+            /* 靠右显示 */
+            align-items: center;
+        }
+
+        .tables-container {
+            flex: 1;
+            display: flex;
+            flex-direction: column;
+
+            .table-wrapper {
+                flex: 1;
+                min-height: 0;
+
+                &:first-child {
+                    // margin-bottom: 10px;
+                }
+            }
         }
-      }
     }
-  }
+}
+:deep(.el-descriptions__header) {
+    margin-bottom: 10px !important;
 }
 
 .dialog-content {
-  display: flex;
+    display: flex;
-  gap: 20px;
+    gap: 20px;
 
-  .dialog-section {
+    .dialog-section {
-    flex: 1;
+        flex: 1;
 
-    .section-header {
+        .section-header {
-      display: flex;
+            display: flex;
-      justify-content: space-between;
+            justify-content: space-between;
-      align-items: center;
+            align-items: center;
-      margin-bottom: 10px;
+            margin-bottom: 10px;
 
-      span {
+            span {
-        font-weight: bold;
+                font-weight: bold;
-        font-size: 16px;
+                font-size: 16px;
-      }
+            }
 
-      .search-input {
+            .search-input {
-        width: 200px;
+                width: 200px;
-      }
+            }
+        }
     }
-  }
+}
+.border {
+    border: 1px solid var(--el-border-color);
 }
 </style>

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

@@ -6,7 +6,7 @@
                 style="cursor: pointer" />
             <div class="cn-tree" :style="{ opacity: menuCollapse ? 0 : 1, display: menuCollapse ? 'none' : '' }">
                 <div style="display: flex; align-items: center" class="mb10">
-                    <el-input maxlength="32" show-word-limit v-model.trim="filterText" placeholder="请输入内容" clearable>
+                    <el-input maxlength="32"  v-model.trim="filterText" placeholder="请输入内容" clearable>
                         <template #prefix>
                             <Icon name="el-icon-Search" style="font-size: 16px" />
                         </template>

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

@@ -6,12 +6,13 @@
             :default-checked-keys="defaultCheckedKeys"
             @checkChange="checkChange"
             :height="35"
+            :engineering="true"
         ></DeviceTree>
         <div class="device-manage-right" :style="{ height: pageHeight.height }">
             <vxe-table v-bind="defaultAttribute" :data="tableData" height="auto" style="width: 100%">
                 <vxe-column field="enginerName" title="工程名称"></vxe-column>
                 <vxe-column field="projectName" title="项目名称"></vxe-column>
-                <vxe-column field="deviceName" title="装置名称"></vxe-column>
+                <vxe-column field="deviceName" title="设备名称"></vxe-column>
             </vxe-table>
         </div>
     </div>
@@ -27,6 +28,7 @@ import { mainHeight } from '@/utils/layout'
 import { getVisitorConfig, updateVisitorConfig } from '@/api/cs-device-boot/user'
 import { ref, onMounted } from 'vue'
 import { ElMessage } from 'element-plus'
+import { debounce } from 'lodash-es'
 const pageHeight = mainHeight(60)
 const loading = ref(true)
 const defaultCheckedKeys: any = ref([])
@@ -34,6 +36,7 @@ const tableData = ref([])
 const treeRef = ref(null)
 const ignoreCheckChange = ref(false)
 const checkChange = (data: any) => {
+    if (data == undefined) return (loading.value = false)
     if (data.data.pName == '便携式设备') {
         if (ignoreCheckChange.value) {
             ignoreCheckChange.value = false // 清除标记，不影响后续正常触发
@@ -54,7 +57,7 @@ const checkChange = (data: any) => {
         updateVisitorConfigs()
     }
 }
-const updateVisitorConfigs = () => {
+const updateVisitorConfigs = debounce(() => {
     const result = Array.from(new Set(defaultCheckedKeys.value))
     updateVisitorConfig(
         result.map(item => {
@@ -67,7 +70,7 @@ const updateVisitorConfigs = () => {
             getVisitorConfigs()
         }
     })
-}
+}, 500)
 const getVisitorConfigs = () => {
     getVisitorConfig().then((res: any) => {
         if (res.code === 'A0000') {

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

@@ -3,47 +3,22 @@
         <TableHeader>
             <template #select>
                 <el-form-item label="数据分类">
-                    <el-select
+                    <el-select v-model.trim="tableStore.table.params.dataType" multiple filterable collapse-tags
-                        v-model.trim="tableStore.table.params.dataType"
+                        clearable placeholder="请选择数据分类">
-                        multiple
+                        <el-option v-for="item in DataTypeSelect" :key="item.id" :label="item.name"
-                        filterable
+                            :value="item.id"></el-option>
-                        collapse-tags
-                        clearable
-                        placeholder="请选择数据分类"
-                    >
-                        <el-option
-                            v-for="item in DataTypeSelect"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        ></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="数据存储">
-                    <el-select
+                    <el-select v-model.trim="tableStore.table.params.classId" multiple filterable collapse-tags
-                        v-model.trim="tableStore.table.params.classId"
+                        clearable placeholder="请选择数据存储">
-                        multiple
+                        <el-option v-for="item in DataSelect" :key="item.id" :label="item.name"
-                        filterable
+                            :value="item.id"></el-option>
-                        collapse-tags
-                        clearable
-                        placeholder="请选择数据存储"
-                    >
-                        <el-option
-                            v-for="item in DataSelect"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        ></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="关键字筛选">
-                    <el-input
+                    <el-input maxlength="32" show-word-limit v-model.trim="tableStore.table.params.searchValue"
-                        maxlength="32"
+                        placeholder="数据名称、别名、展示名称" clearable></el-input>
-                        show-word-limit
-                        v-model.trim="tableStore.table.params.searchValue"
-                        placeholder="数据名称、别名、展示名称"
-                        clearable
-                    ></el-input>
                 </el-form-item>
             </template>
             <template #operation>
@@ -99,8 +74,9 @@ const tableStore = new TableStore({
                     ? row.cellValue == '/'
                         ? '/'
                         : row.cellValue == 'M'
-                        ? '无相别'
+                            ? '/' : row.cellValue == 'T'
-                        : row.cellValue + '相'
+                                ? '/'
+                                : row.cellValue + '相'
                     : '/'
             }
         },

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

@@ -1,10 +1,10 @@
 <template>
-    <el-dialog class="cn-operate-dialog" draggable v-model.trim="dialogVisible" :title="title" @close="emit('close')">
+    <el-dialog class="cn-operate-dialog" draggable v-model.trim="dialogVisible" width="900px" :title="title" @close="emit('close')">
         <el-scrollbar>
             <div style="padding-left: 50px">
                 <el-divider content-position="center">基础数据</el-divider>
             </div>
-            <el-form :model="form" label-width="140px" ref="formRef" class="form-two" :rules="rules">
+            <el-form :model="form" label-width="130px" ref="formRef" class="form-two" :rules="rules">
                 <el-form-item label="数据分类:" prop="dataType">
                     <el-select v-model.trim="form.dataType" filterable clearable placeholder="请选择数据分类">
                         <el-option
@@ -71,7 +71,7 @@
                     ></el-input>
                 </el-form-item>
                 <el-form-item label="开始结束次数:">
-                    <el-slider v-model.trim="form.harm" range show-stops :max="50" style="width: 95%" />
+                    <el-slider v-model.trim="form.harm" range  :max="50" style="width: 90%" />
                 </el-form-item>
                 <el-form-item label="统计方法:">
                     <el-select
@@ -155,7 +155,7 @@
             <div style="padding-left: 50px">
                 <el-divider content-position="center">拓展数据</el-divider>
             </div>
-            <el-form class="form-two" :model="form" label-width="140px" ref="formRef2">
+            <el-form class="form-two" :model="form" label-width="130px" ref="formRef2">
                 <el-form-item label="告警码(缺省值):">
                     <el-input
                         maxlength="32"
@@ -282,7 +282,7 @@ const phaseSelect = [
         id: 'C'
     },
     {
-        name: 'T相',
+        name: '无相别',
         id: 'T'
     },
     {
@@ -297,10 +297,10 @@ const phaseSelect = [
         name: 'CA相',
         id: 'CA'
     },
-    {
+    // {
-        name: '无相别',
+    //     name: '无相别',
-        id: 'M'
+    //     id: 'M'
-    },
+    // },
 ]
 const StatMethodSelect = [
     {

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

@@ -1,115 +1,55 @@
 <template>
-    <el-dialog
+    <el-dialog draggable class="cn-operate-dialog" width="800px" v-model.trim="dialogVisible" :title="title"
-        class="cn-operate-dialog"
+        @close="emit('closePopup')">
-        width="800px"
-        v-model.trim="dialogVisible"
-        :title="title"
-        @close="emit('closePopup')"
-    >
         <el-form class="form-two" :model="form" label-width="100px" ref="formRef" :rules="rules">
-            <el-form-item label="装置类型:" prop="type">
+            <el-form-item label="设备类型:" prop="type">
-                <!-- <el-select v-model.trim="form.type" filterable placeholder="请选择" @change="typeChange">
+
-                    <el-option v-for="item in TypeOptions" :key="item.id" :label="item.name"
+                <el-select v-model.trim="form.type" placeholder="请选择设备类型" @change="formDevTypeChange" clearable>
-                        :value="item.id"></el-option>
+                    <el-option v-for="item in devTypeOptions" :key="item.value" :label="item.label"
-                </el-select> -->
+                        :value="item.value"></el-option>
-                <el-select v-model.trim="form.type" placeholder="请选择装置类型" @change="formDevTypeChange" clearable>
-                    <el-option
-                        v-for="item in devTypeOptions"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                    ></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="装置型号:" prop="devType">
+            <el-form-item label="设备型号:" prop="devType">
                 <!-- <el-select v-model.trim="form.devType" placeholder="请选择" filterable @change="devTypeChange">
                     <el-option v-for="item in DevTypeOptions" :key="item.id" :label="item.name"
                         :value="item.id"></el-option>
                 </el-select> -->
-                <el-select
+                <el-select v-model.trim="form.devType" filterable placeholder="请选择设备型号" clearable
-                    v-model.trim="form.devType"
+                    @change="devTypeChange">
-                    filterable
+                    <el-option v-for="item in formDevModelOptionsFilter" :key="item.value" :label="item.label"
-                    placeholder="请选择装置型号"
+                        :value="item.value"></el-option>
-                    clearable
-                    @change="devTypeChange"
-                >
-                    <el-option
-                        v-for="item in formDevModelOptionsFilter"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                    ></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="版本号:" prop="versionNo">
-                <el-input
+                <el-input maxlength="32" show-word-limit v-model.trim="form.versionNo" autocomplete="off"
-                    maxlength="32"
+                    placeholder="请输入版本号"></el-input>
-                    show-word-limit
-                    v-model.trim="form.versionNo"
-                    autocomplete="off"
-                    placeholder="请输入版本号"
-                ></el-input>
             </el-form-item>
             <el-form-item label="版本类型:" prop="versionType">
-                <el-input
+                <el-input maxlength="32" show-word-limit v-model.trim="form.versionType" autocomplete="off"
-                    maxlength="32"
+                    placeholder="填写特殊类型(不填默认通用类型)"></el-input>
-                    show-word-limit
-                    v-model.trim="form.versionType"
-                    autocomplete="off"
-                    placeholder="填写特殊类型(不填默认通用类型)"
-                ></el-input>
             </el-form-item>
-            <el-form-item label="版本协议:" prop="versionAgreement">
+            <el-form-item label="协议版本:" prop="versionAgreement">
-                <el-input
+                <el-input maxlength="32" show-word-limit v-model.trim="form.versionAgreement" autocomplete="off"
-                    maxlength="32"
+                    placeholder="请输入协议版本"></el-input>
-                    show-word-limit
-                    v-model.trim="form.versionAgreement"
-                    autocomplete="off"
-                    placeholder="请输入版本协议"
-                ></el-input>
             </el-form-item>
             <el-form-item label="版本日期:" prop="versionDate">
-                <el-date-picker
+                <el-date-picker v-model.trim="form.versionDate" type="date" value-format="YYYY-MM-DD"
-                    v-model.trim="form.versionDate"
+                    placeholder="选择日期时间" style="width: 100%"></el-date-picker>
-                    type="date"
-                    value-format="YYYY-MM-DD"
-                    placeholder="选择日期时间"
-                    style="width: 100%"
-                ></el-date-picker>
             </el-form-item>
 
-            <el-form-item label="CRC校验:" prop="crcInfo">
+            <el-form-item label="CRC校验:" prop="crc">
-                <el-input
+                <el-input maxlength="32" show-word-limit v-model.trim="form.crc" autocomplete="off"
-                    maxlength="32"
+                    placeholder="请输入CRC校验"></el-input>
-                    show-word-limit
-                    v-model.trim="form.crcInfo"
-                    autocomplete="off"
-                    placeholder="请输入CRC校验"
-                ></el-input>
             </el-form-item>
         </el-form>
         <el-form :model="form" label-width="100px" class="mt10 form-one">
             <el-form-item label="描述:" prop="description">
-                <el-input
+                <el-input maxlength="300" :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" show-word-limit
-                    maxlength="300"
+                    v-model.trim="form.description" autocomplete="off" placeholder="请输入描述"></el-input>
-                    :autosize="{ minRows: 2, maxRows: 4 }"
-                    type="textarea"
-                    show-word-limit
-                    v-model.trim="form.description"
-                    autocomplete="off"
-                    placeholder="请输入描述"
-                ></el-input>
             </el-form-item>
             <el-form-item label="升级文件:" prop="file">
-                <el-upload
+                <el-upload :limit="1" accept=".bin" :auto-upload="false" :on-change="fileChange" :on-exceed="fileExceed"
-                    :limit="1"
+                    :on-remove="fileRemove" :file-list="fileList">
-                    accept=".bin"
-                    :auto-upload="false"
-                    :on-change="fileChange"
-                    :on-exceed="fileExceed"
-                    :on-remove="fileRemove"
-                    :file-list="fileList"
-                >
                     <el-button type="primary">点击上传</el-button>
                 </el-upload>
             </el-form-item>
@@ -146,7 +86,7 @@ const form = reactive<any>({
     versionAgreement: null,
     versionNo: null,
     versionType: null,
-    crcInfo: null,
+    crc: null,
     description: null,
     versionDate: null,
     type: null,
@@ -154,14 +94,14 @@ const form = reactive<any>({
     file: []
 })
 const rules = {
-    type: [{ required: true, message: '请选择装置类型', trigger: 'change' }],
+    type: [{ required: true, message: '请选择设备类型', trigger: 'change' }],
-    devType: [{ required: true, message: '请选择装置型号', trigger: 'change' }],
+    devType: [{ required: true, message: '请选择设备型号', trigger: 'change' }],
     versionNo: [{ required: true, message: '请输入版本号', trigger: 'blur' }],
     versionType: [{ required: true, message: '请输入版本类型', trigger: 'blur' }],
-    versionAgreement: [{ required: true, message: '请输入版本协议', trigger: 'blur' }],
+    versionAgreement: [{ required: true, message: '请输入协议版本', trigger: 'blur' }],
     versionDate: [{ required: true, message: '请输入版本日期', trigger: 'blur' }],
     description: [{ required: true, message: '请输入描述', trigger: 'blur' }],
-    crcInfo: [{ required: true, message: '请输入CRC校验', trigger: 'blur' }],
+    crc: [{ required: true, message: '请输入CRC校验', trigger: 'blur' }],
     file: [{ required: true, message: '请输入升级文件', trigger: 'blur' }]
 }
 const typeChange = () => {
@@ -176,7 +116,7 @@ const devTypeChange = (e: any) => {
     // console.log(e)
     form.devTypeName = formDevModelOptionsFilter.value.filter((item: any) => item.value == e)[0].label
 }
-queryByCode('Device_Type').then(res => {
+queryByCode('Device_Type').then(async res => {
     const id = res.data.id
     queryCsDictTree(id).then(res => {
         devTypeOptions.value = res.data.map((item: any) => {
@@ -203,6 +143,14 @@ queryByCode('Device_Type').then(res => {
     })
     // tableStore.index()
 })
+queryByCode('Direct_Connected_Device').then(res => {
+    queryCsDictTree(res.data.id).then(res => {
+        TypeOptions.value = res.data
+    })
+    queryByid(res.data.id).then(res => {
+        DevTypeAllOptions.value = res.data
+    })
+})
 const formDevModelOptionsFilter = computed(() => {
     return devModelOptions.value.filter((item: any) => {
         if (form.type) {
@@ -246,7 +194,7 @@ const formDevTypeChange = (e: any) => {
 }
 const dialogVisible = ref(false)
 const title = ref('新增版本')
-const open = (text: string, data?: anyObj) => {
+const open = async (text: string, data?: anyObj) => {
     title.value = text
     dialogVisible.value = true
     if (data) {
@@ -264,14 +212,7 @@ const open = (text: string, data?: anyObj) => {
             form[key] = null
         }
     }
-    queryByCode('Direct_Connected_Device').then(res => {
+
-        queryCsDictTree(res.data.id).then(res => {
-            TypeOptions.value = res.data
-        })
-        queryByid(res.data.id).then(res => {
-            DevTypeAllOptions.value = res.data
-        })
-    })
 }
 const submit = () => {
     // console.log(formRef)

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

@@ -11,7 +11,7 @@
                         placeholder="请输入名称"
                     ></el-input>
                 </el-form-item>
-                <el-form-item label="装置型号">
+                <el-form-item label="设备型号">
                     <el-select v-model.trim="tableStore.table.params.devType" placeholder="请选择" clearable>
                         <el-option
                             v-for="item in DevTypeOptions"
@@ -71,7 +71,7 @@ const tableStore = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        { title: '装置型号', field: 'devTypeName' },
+        { title: '设备型号', field: 'devTypeName' },
         { title: '模板名称', field: 'name' },
         { title: '版本号', field: 'versionNo' },
         { title: '版本时间', field: 'versionDate', sortable: true },

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

@@ -2,19 +2,17 @@
     <div class="default-main">
         <TableHeader ref="tableHeaderRef" :showReset="false" showExport>
             <template #select>
-                <el-form-item label="装置型号:">
+                <el-form-item label="设备型号:">
-                    <el-select v-model.trim="tableStore.table.params.devType" placeholder="请选择装置型号" clearable>
+                    <el-select v-model.trim="tableStore.table.params.devType" filterable placeholder="请选择设备型号"
-                        <el-option
+                        clearable>
-                            v-for="item in DevTypeOptions"
+                        <el-option v-for="item in DevTypeOptions" :key="item.id" :label="item.name"
-                            :key="item.id"
+                            :value="item.id"></el-option>
-                            :label="item.name"
-                            :value="item.id"
-                        ></el-option>
                     </el-select>
                 </el-form-item>
             </template>
             <template #operation>
                 <el-button :icon="Plus" type="primary" @click="addMenu" class="ml10">新增版本</el-button>
+                <el-button :icon="Back" @click="go(-1)">返回</el-button>
             </template>
         </TableHeader>
         <Table ref="tableRef" />
@@ -27,13 +25,15 @@ import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import { delCsDictData } from '@/api/system-boot/csDictData'
-import { ElMessage } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import { queryByCode, queryByid } from '@/api/system-boot/dictTree'
 import { useDictData } from '@/stores/dictData'
 import PopupVersion from '@/views/govern/manage/basic/popupVersion.vue'
-import { Plus } from '@element-plus/icons-vue'
+import { Plus, Back } from '@element-plus/icons-vue'
 import { auditEdData } from '@/api/cs-device-boot/edData'
+import { activateUser, deluser, passwordConfirm } from '@/api/user-boot/user'
 import { getFileUrl, downLoadFile } from '@/api/cs-system-boot/manage'
+import { useRouter } from 'vue-router'
 defineOptions({
     name: 'govern/manage/basic/version'
 })
@@ -42,12 +42,12 @@ const dictData = useDictData()
 const showPopup = ref(false)
 const DevTypeOptions = ref()
 const tableHeaderRef = ref()
-
+const { push, go } = useRouter()
 const tableStore = new TableStore({
     url: '/cs-device-boot/edData/queryEdDataPage',
     method: 'POST',
     column: [
-         {
+        {
             field: 'index',
             title: '序号',
             width: '80',
@@ -55,28 +55,74 @@ const tableStore = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        { title: '装置型号', field: 'devTypeName' ,minWidth: '100'},
+        { title: '设备型号', field: 'devTypeName', minWidth: '100' },
-        { title: '版本号', field: 'versionNo' ,minWidth: '100'},
+        { title: '版本号', field: 'versionNo', minWidth: '100' },
-        { title: '版本协议', field: 'versionAgreement' ,minWidth: '100'},
+        { title: '协议版本', field: 'versionAgreement', minWidth: '100' },
-        { title: '版本日期', field: 'versionDate' ,minWidth: '100'},
+        { title: '版本日期', field: 'versionDate', minWidth: '100' },
-        { title: '归档日期', field: 'updateTime',minWidth: '150' },
+        { title: '归档日期', field: 'updateTime', minWidth: '150' },
-        { title: '描述', field: 'description',minWidth: '200' },
+        { title: '描述', field: 'description', minWidth: '200' },
+        // {
+        //     title: '状态',
+        //     field: 'status',
+        //     render: 'tag',
+        //     minWidth: '80',
+        //     custom: {
+        //         0: 'danger',
+        //         1: 'success'
+        //     },
+        //     replaceValue: {
+        //         0: '禁用',
+        //         1: '启用'
+        //     }
+        // },
         {
-            title: '状态',
+            title: '使用状态',
+            render: 'switch',
+            width: 100,
             field: 'status',
-            render: 'tag',
+            activeText: '启用',
-            minWidth: '80',
+            inactiveText: '禁用',
-            custom: {
+            inactiveValue: '0',
-                0: 'error',
+            activeValue: '1',
-                1: 'success'
+            onChangeField: (row: any, value: any) => {
-            },
+                // console.log("🚀 ~ row:", row)
-            replaceValue: {
+                ElMessageBox.prompt('二次校验密码确认', '', {
-                0: '禁用',
+                    confirmButtonText: '确认',
-                1: '启用'
+                    cancelButtonText: '取消',
+                    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()
+                            }
+                        } else {
+                            done()
+                        }
+                    }
+                }).then(({ value }) => {
+                    passwordConfirm(value).then(res => {
+                        auditEdData({
+                            id: row.id,
+                            status: row.status == 0 ? 1 : 0
+                        }).then((res: any) => {
+                            ElMessage.success(row.status == 0 ? '启用成功!' : '禁用成功!')
+                            tableStore.index()
+                        })
+
+                    })
+                })
             }
         },
         {
-            title: '操作', fixed: 'right',
+            title: '操作',
+            fixed: 'right',
             align: 'center',
             width: '180',
             render: 'buttons',
@@ -104,50 +150,7 @@ const tableStore = new TableStore({
                         }, 100)
                     }
                 },
-                {
+
-                    name: 'edit',
-                    title: '启用',
-                    type: 'primary',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.status == 1
-                    },
-                    click: row => {
-                        auditEdData({
-                            id: row.id,
-                            status: 1
-                        }).then((res: any) => {
-                            ElMessage.success('启用成功')
-                            tableStore.index()
-                        })
-                    }
-                },
-                {
-                    name: 'del',
-                    title: '禁用',
-                    type: 'danger',
-                    icon: 'el-icon-SwitchButton',
-                    render: 'confirmButton',
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'danger',
-                        title: '确定禁用吗？'
-                    },
-                    disabled: row => {
-                        return row.status == 0
-                    },
-                    click: row => {
-                        auditEdData({
-                            id: row.id,
-                            status: 0
-                        }).then((res: any) => {
-                            ElMessage.success('禁用成功')
-                            tableStore.index()
-                        })
-                    }
-                }
             ]
         }
     ],
@@ -177,7 +180,6 @@ queryByCode('Device_Type').then(res => {
 // 下载报告
 const downloadTheReport = (name: string) => {
     getFileUrl(name).then((res: any) => {
-  
         downLoadFile(res.data).then(res => {
             let blob = new Blob([res], {
                 type: 'application/octet-stream'
@@ -209,3 +211,10 @@ const closePopup = () => {
     showPopup.value = false
 }
 </script>
+<style lang="scss">
+.customInput {
+    .el-input__inner {
+        -webkit-text-security: disc !important;
+    }
+}
+</style>

src/views/govern/manage/engineering/components/itemAdd.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog draggable class="cn-operate-dialog" width="520px" v-model.trim="dialogVisible" :title="title">
+    <el-dialog draggable class="cn-operate-dialog" width="540px" 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="请输入项目名称" />
@@ -23,14 +23,9 @@
             <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="拓扑图" prop="sort">
+            <el-form-item label="拓扑图">
                 <div class="image-radio-group">
-                    <div
+                    <div class="image-radio-item" v-for="item in images" :key="item.id" @click="handleSelect(item.id)">
-                        class="image-radio-item"
-                        v-for="item in images"
-                        :key="item.id"
-                        @click="handleSelect(item.id)"
-                    >
                         <el-radio :label="item.id" v-model="form.topoIds" class="hidden-radio">
                             {{ item.name }}
                         </el-radio>
@@ -64,7 +59,7 @@ import TableStore from '@/utils/tableStore'
 import { ElMessage } from 'element-plus'
 import { add, update } from '@/api/user-boot/role'
 import { useAdminInfo } from '@/stores/adminInfo'
-import { addProject, updateProject } from '@/api/cs-device-boot/edData'
+import { addProject, updateProjects } from '@/api/cs-device-boot/edData'
 import { getTopoTemplate } from '@/api/cs-device-boot/topologyTemplate'
 import { getFileUrl } from '@/api/system-boot/file'
 const adminInfo = useAdminInfo()
@@ -123,14 +118,15 @@ const open = (text: string, List: any, data?: anyObj, id?: string) => {
     }
 }
 const submit = async () => {
+    if (form.topoIds == '') {
+        return ElMessage.warning('请选择拓扑图!')
+    }
     formRef.value.validate(async valid => {
-                console.log("🚀 ~ submit ~ form.topoIds:", form.topoIds)
-
         if (valid) {
             if (form.id) {
-                await updateProject({ ...form ,topoIds:[form.topoIds]})
+                await updateProjects({ ...form, topoIds: [form.topoIds] })
             } else {
-                await addProject({ ...form,topoIds:[form.topoIds] })
+                await addProject({ ...form, topoIds: [form.topoIds] })
             }
             ElMessage.success('保存成功')
             tableStore.index()
@@ -150,7 +146,11 @@ const getImageList = async () => {
 }
 
 const handleSelect = (filePath: any) => {
-    form.topoIds = filePath
+    if (form.topoIds == filePath) {
+        form.topoIds = ''
+    } else {
+        form.topoIds = filePath
+    }
 }
 defineExpose({ open })
 </script>

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

@@ -1,14 +1,24 @@
 <template>
     <div class="default-main">
-        <div style="display: flex">
+        <el-row v-loading="tableStore.table.loading">
-            <div style="width: 800px">
+            <el-col :span="11">
                 <div class="custom-table-header">
-                    <div class="title">工程列表</div>
+                    <div class="title">
+                        工程列表
+                        <el-input
+                            class="ml10"
+                            v-model="searchValue"
+                            placeholder="请输入工程名称"
+                            clearable
+                            style="width: 240px"
+                            @input="inpChaange"
+                        />
+                    </div>
                     <el-button :icon="Plus" type="primary" @click="addRole" class="ml10">新增工程</el-button>
                 </div>
                 <Table ref="tableRef" @currentChange="currentChange" />
-            </div>
+            </el-col>
-            <div style="flex: 1">
+            <el-col :span="13">
                 <div class="custom-table-header">
                     <div class="title">項目列表</div>
 
@@ -25,17 +35,19 @@
                         <vxe-column field="projectName" title="项目名称"></vxe-column>
                         <vxe-column field="projectArea" title="地址"></vxe-column>
 
-                        <vxe-column title="拓扑图">
+                        <vxe-column field="projectRemark" title="备注"></vxe-column>
+                        <vxe-column title="拓扑图" width="100px">
                             <template #default="{ row }">
                                 <el-image
                                     :hide-on-click-modal="true"
                                     :preview-teleported="true"
+                                    v-if="row.topologyInfo"
                                     :preview-src-list="[row.topologyImageUrl]"
-                                    :src="getUrl(row) ? row.topologyImageUrl : ''"
+                                    :src="row.topologyImageUrl"
                                 ></el-image>
+                                <span v-else>/</span>
                             </template>
                         </vxe-column>
-                        <vxe-column field="projectRemark" title="备注"></vxe-column>
                         <vxe-column field="projectSort" title="排序" width="80px"></vxe-column>
                         <vxe-column title="操作" width="180px">
                             <template #default="{ row }">
@@ -64,8 +76,8 @@
                         </vxe-column>
                     </vxe-table>
                 </div>
-            </div>
+            </el-col>
-        </div>
+        </el-row>
         <!-- 新增工程 -->
         <popup ref="popupRef" @save="save" />
         <!-- 新增項目 -->
@@ -78,7 +90,7 @@ import { Plus } from '@element-plus/icons-vue'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import { delTemplate, deleteSysExcel, bandRelation, queryList } from '@/api/harmonic-boot/luckyexcel'
-import { deleteProject ,deleteEngineering} from '@/api/cs-device-boot/edData'
+import { deleteProject, deleteEngineering } from '@/api/cs-device-boot/edData'
 import { useDictData } from '@/stores/dictData'
 import { ElMessage } from 'element-plus'
 import { defaultAttribute } from '@/components/table/defaultAttribute'
@@ -92,13 +104,16 @@ defineOptions({
 const height = mainHeight(80)
 const volConTypeList: any = dictData.getBasicData('Dev_Connect')
 import { getFileUrl } from '@/api/system-boot/file'
+
 const popupRef = ref()
 const tableRef = ref()
 const tableRef1 = ref()
-const itemList = ref([])
+const searchValue = ref('')
+const itemList: any = ref([])
 const menuListId = ref([])
 const itemAddRef = ref()
 const engineeringId = ref('')
+const tableList = ref([])
 const tableStore: any = new TableStore({
     url: '/cs-device-boot/engineeringProjectRelation/list',
     method: 'POST',
@@ -161,17 +176,35 @@ const tableStore: any = new TableStore({
     ],
 
     loadCallback: () => {
-        if (engineeringId.value == '') {
+        tableList.value = JSON.parse(JSON.stringify(tableStore.table.data))
-            engineeringId.value = tableStore.table.data[0].engineeringId
+        setTableRow()
-        }
-        let list = tableStore.table.data.filter((item: any) => item.engineeringId == engineeringId.value)
-        tableRef.value.getRef().setCurrentRow(list[0])
-        itemList.value = list[0].projectInfoList
     }
 })
 
 provide('tableStore', tableStore)
-
+// 过滤
+const inpChaange = (val: any) => {
+    engineeringId.value = ''
+    if (val == '') {
+        tableStore.table.data = tableList.value
+    } else {
+        tableStore.table.data = tableList.value.filter((item: any) => item.engineeringName.includes(val))
+    }
+    setTableRow()
+}
+const setTableRow = () => {
+    if (engineeringId.value == '') {
+        engineeringId.value = tableStore.table.data[0].engineeringId
+    }
+    let list = tableStore.table.data.filter((item: any) => item.engineeringId == engineeringId.value)
+    tableRef.value.getRef().setCurrentRow(list[0] ?? {})
+    itemList.value = list?.[0]?.projectInfoList ?? []
+    if (itemList.value.length > 0) {
+        itemList.value.forEach((item: any) => {
+            item.topologyImageUrl = getUrl(item)
+        })
+    }
+}
 // 修改模版
 const itemModification = (row: any) => {
     itemAddRef.value.open('新增项目', tableStore.table.data, row, engineeringId.value)
@@ -195,6 +228,11 @@ const add = () => {
 const currentChange = (data: any) => {
     engineeringId.value = data.row.engineeringId
     itemList.value = data.row.projectInfoList
+    if (itemList.value.length > 0) {
+        itemList.value.forEach((item: any) => {
+            item.topologyImageUrl = getUrl(item)
+        })
+    }
 }
 // 保存模版
 const save = () => {
@@ -210,14 +248,11 @@ const save = () => {
 const imgList = ref([])
 // 获取拓扑图
 const getUrl = async (row: any) => {
-    if (!row.topologyInfo || row.topologyInfo === '/') return false
+    if (!row.topologyInfo || row.topologyInfo === '/') return ''
-    try {
+
-        const res = await getFileUrl({ filePath: row.topologyInfo })
+    const res = await getFileUrl({ filePath: row.topologyInfo })
-        row.topologyImageUrl = res.data
+    row.topologyImageUrl = res.data
-        return true
+    return res.data
-    } catch (error) {
-        return false
-    }
 }
 
 onMounted(() => {

src/views/govern/manage/factory.vue

@@ -10,13 +10,13 @@
                         placeholder="请输入设备名称/网络设备ID"
                     />
                 </el-form-item>
-                <el-form-item label="流程阶段">
+                <!-- <el-form-item label="流程阶段">
                     <el-select v-model.trim="tableStore.table.params.process" clearable placeholder="请选择状态">
                         <el-option label="功能调试" :value="2"></el-option>
                         <el-option label="出厂调试" :value="3"></el-option>
                         <el-option label="正式投运" :value="4"></el-option>
                     </el-select>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="物联状态">
                     <el-select
                         v-model.trim="tableStore.table.params.connectStatus"
@@ -151,7 +151,7 @@
                 <el-form-item label="设备型号:" prop="devModel" class="top">
                     <el-select v-model.trim="form.devModel" filterable placeholder="请选择" clearable>
                         <el-option
-                            v-for="item in formDevModelOptionsFilter "
+                            v-for="item in formDevModelOptionsFilter"
                             :key="item.value"
                             :label="item.label"
                             :value="item.value"
@@ -164,6 +164,15 @@
                         <el-option label="CLD" value="CLD"></el-option>
                     </el-select>
                 </el-form-item>
+                <el-form-item label="关联项目:" class="top">
+                    <el-cascader
+                        v-model.trim="form.association"
+                        filterable
+                        :options="engineeringList"
+                        :props="props"
+                        clearable
+                    />
+                </el-form-item>
                 <el-form-item label="排序:" class="top" prop="sort">
                     <el-input maxlength="32" show-word-limit-number v-model.trim="form.sort" :min="0" />
                 </el-form-item>
@@ -198,7 +207,7 @@ import TableHeader from '@/components/table/header/index.vue'
 import { queryByCode, queryByid, queryCsDictTree } from '@/api/system-boot/dictTree'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { activateUser, deluser, passwordConfirm } from '@/api/user-boot/user'
-import { downLoadFile } from '@/api/cs-system-boot/manage.ts'
+import { downLoadFile } from '@/api/cs-system-boot/manage'
 import {
     addEquipmentDelivery,
     deleteEquipmentDelivery,
@@ -208,7 +217,10 @@ import {
     governDeviceRegister,
     portableDeviceRegister,
     portableDeviceAccess,
-    getExcelTemplate
+    getExcelTemplate,
+    engineeringProject,
+    onlineRegister,
+    resetFactory
 } from '@/api/cs-system-boot/device'
 import html2canvas from 'html2canvas'
 import { fullUrl } from '@/utils/common'
@@ -221,17 +233,27 @@ const showQrCode = ref(false)
 const devTypeOptions: any = ref([])
 const devTypeOptions2: any = ref([])
 const devModelOptions2: any = ref([])
+const engineeringList: any = ref([])
+
 const deivce: any = ref({})
 const ruleFormRef = ref()
-const form = reactive({
+const form: any = reactive({
     cntractNo: '',
     devAccessMethod: 'MQTT',
     devModel: '',
     devType: '',
     name: '',
     ndid: '',
+    associatedEngineering: '',
+    associatedProject: '',
+    association: [],
     sort: 0
 })
+const props = {
+    label: 'projectName',
+    value: 'projectId',
+    children: 'projectInfoList'
+}
 const rules = reactive({
     name: [{ required: true, message: '请输入设备名', trigger: 'blur' }],
     ndid: [{ required: true, message: '请输入网络设备id', trigger: 'blur' }],
@@ -248,19 +270,19 @@ const dialogTitle = ref('新增设备')
 const loading = ref<boolean>(false)
 const devModelOptions: any = ref([])
 const queryTheDictionary = () => {
-        queryByCode('DEV_CLD').then(res => {
+    queryByCode('DEV_CLD')
+        .then(res => {
             devTypeOptions2.value = res.data
-            return queryCsDictTree(res.data.id).then(res => {
+            queryCsDictTree(res.data.id).then(res => {
                 devModelOptions2.value = res.data.map((item: any) => {
-                        return {
+                    return {
-                            value: item.id,
+                        value: item.id,
-                            label: item.name,
+                        label: item.name,
-                            ...item
+                        ...item
-                        }
+                    }
-                    })
+                })
             })
-        }).then(() => {
+            queryByCode('Device_Type').then(async res => {
-             queryByCode('Device_Type').then(async res => {
                 const id = res.data.id
                 await queryCsDictTree(id).then(res => {
                     devTypeOptions.value = res.data.map((item: any) => {
@@ -292,10 +314,11 @@ const queryTheDictionary = () => {
                 })
                 await tableStore.index()
             })
-        }).catch(error => {
-            console.error('查询过程中出现错误:', error)
         })
 
+        .catch(error => {
+            console.error('查询过程中出现错误:', error)
+        })
 }
 const devModelOptionsFilter = computed(() => {
     return devModelOptions.value.filter((item: any) => {
@@ -308,7 +331,7 @@ const devModelOptionsFilter = computed(() => {
 })
 
 const formDevModelOptionsFilter = computed(() => {
-    if(form.devAccessMethod === 'CLD'){
+    if (form.devAccessMethod === 'CLD') {
         return devModelOptions2.value.filter((item: any) => {
             if (form.devType) {
                 return item.pid == form.devType
@@ -316,18 +339,17 @@ const formDevModelOptionsFilter = computed(() => {
                 return true
             }
         })
-    }else{
+    } else {
         return devModelOptions.value.filter((item: any) => {
-                if (form.devType) {
+            if (form.devType) {
-                    return item.pid == form.devType
+                return item.pid == form.devType
-                } else {
+            } else {
-                    return true
+                return true
-                }
+            }
-            })
+        })
     }
 })
 
-
 const formDevTypeOptions = computed(() => {
     // 如果协议是CLD，使用devTypeOptions2，否则使用devTypeOptions
     if (form.devAccessMethod === 'CLD') {
@@ -367,8 +389,8 @@ const tableStore = new TableStore({
                 }
                 // 如果是MQTT协议，使用devTypeOptions查找
                 else if (row.row.devAccessMethod === 'MQTT') {
-                    const item = devTypeOptions.value.find((item: any) => item.value == row.cellValue);
+                    const item = devTypeOptions.value.find((item: any) => item.value == row.cellValue)
-                    return item ? item.label : '/';
+                    return item ? item.label : '/'
                 }
             },
             minWidth: 120
@@ -378,8 +400,8 @@ const tableStore = new TableStore({
             field: 'devModel',
             formatter: row => {
                 const options = row.row.devAccessMethod === 'MQTT' ? devModelOptions.value : devModelOptions2.value
-                const item = options.find((item: any) => item.value == row.cellValue);
+                const item = options.find((item: any) => item.value == row.cellValue)
-                    return item ? item.label : '/';
+                return item ? item.label : '/'
             },
             minWidth: 120
         },
@@ -488,12 +510,13 @@ const tableStore = new TableStore({
             minWidth: 80
         },
         {
-            title: '操作', fixed: 'right',
+            title: '操作',
+            fixed: 'right',
             align: 'center',
             width: 220,
             render: 'buttons',
             buttons: [
-                //直连装置注册
+                //直连设备注册
                 // {
                 //     title: '注册',
                 //     type: 'primary',
@@ -589,12 +612,51 @@ const tableStore = new TableStore({
                 //             .catch(e => {})
                 //     }
                 // },
+                // 在线设备注册
+                {
+                    title: '接入',
+                    type: 'primary',
+                    icon: 'el-icon-Grid',
+                    render: 'basicButton',
+                    loading: 'loading1',
+                    disabled: row => {
+                        return !(
+                            row.devType == '123202e523be2b8defc8d0c2f118f232' &&
+                            row.associatedProject != null &&
+                            row.status != 3
+                        )
+                    },
+                    click: row => {
+                        // 便携式设备手动接入
+                        ElMessageBox.confirm('确定接入该设备吗?', '提示', {
+                            confirmButtonText: '确认',
+                            cancelButtonText: '取消',
+                            type: 'warning'
+                        }).then(() => {
+                            row.loading1 = true
+
+                            onlineRegister({
+                                projectId: row.associatedProject,
+                                nDid: row.ndid
+                            })
+                                .then(res => {
+                                    ElMessage.success(res.message)
+                                    row.loading1 = false
+                                    tableStore.index()
+                                })
+                                .catch(() => {
+                                    row.loading1 = false
+                                })
+                        })
+                    }
+                },
                 //便携式设备手动接入
                 {
                     title: '接入',
                     type: 'primary',
                     icon: 'el-icon-Grid',
                     render: 'basicButton',
+                    loading: 'loading1',
                     disabled: row => {
                         return (
                             (row.devType != '8b45cf6b7f5266e777d07c166ad5fa77' &&
@@ -610,14 +672,18 @@ const tableStore = new TableStore({
                             type: 'warning'
                         })
                             .then(() => {
+                                row.loading1 = true
                                 portableDeviceAccess({
                                     nDid: row.ndid
                                 }).then(res => {
                                     ElMessage.success(res.message)
+                                    row.loading1 = false
                                     tableStore.index()
                                 })
                             })
-                            .catch(e => {})
+                            .catch(e => {
+                                row.loading1 = false
+                            })
                     }
                 },
                 {
@@ -625,6 +691,7 @@ const tableStore = new TableStore({
                     type: 'primary',
                     icon: 'el-icon-Grid',
                     render: 'basicButton',
+                    loading: 'loading1',
                     disabled: row => {
                         return (
                             (row.devType != '8b45cf6b7f5266e777d07c166ad5fa77' &&
@@ -640,24 +707,20 @@ const tableStore = new TableStore({
                             confirmButtonText: '确认',
                             cancelButtonText: '取消',
                             type: 'warning'
-                        })
+                        }).then(() => {
-                            .then(() => {
+                            row.loading1 = true
-                                loading.value = true
+                            portableDeviceRegister({
-                                portableDeviceRegister({
+                                nDid: row.ndid
-                                    nDid: row.ndid
+                            })
+                                .then(res => {
+                                    row.loading1 = false
+                                    ElMessage.success(res.message)
+                                    tableStore.index()
                                 })
-                                    .then(res => {
+                                .catch(e => {
-                                        loading.value = false
+                                    row.loading1 = false
-                                        ElMessage.success(res.message)
+                                })
-                                        tableStore.index()
+                        })
-                                    })
-                                    .catch(e => {
-                                        loading.value = false
-                                    })
-                            })
-                            .catch(e => {
-                                loading.value = false
-                            })
                     }
                 },
                 {
@@ -677,7 +740,6 @@ const tableStore = new TableStore({
                                 useCORS: true
                             }).then(canvas => {
                                 let url = canvas.toDataURL('image/png')
-                                console.log('🚀 ~ html2canvas ~ url:', url)
                                 // 下载图片
                                 let a = document.createElement('a')
                                 let event = new MouseEvent('click')
@@ -701,9 +763,35 @@ const tableStore = new TableStore({
                         for (let key in form) {
                             form[key] = row[key]
                         }
+
+                        form.association = row.associatedProject
+                            ? [row.associatedEngineering, row.associatedProject]
+                            : []
                         form.id = row.id
                     }
                 },
+                {
+                    name: 'edit',
+                    title: '重置',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+
+                    click: async row => {
+                        ElMessageBox.confirm('确定重置该设备吗?', '提示', {
+                            confirmButtonText: '确认',
+                            cancelButtonText: '取消',
+                            type: 'warning'
+                        }).then(() => {
+                            resetFactory({
+                                nDid: row.ndid
+                            }).then(res => {
+                                ElMessage.success('重置成功!')
+                                tableStore.onTableAction('search', {})
+                            })
+                        })
+                    }
+                },
                 {
                     name: 'del',
                     title: '删除',
@@ -741,14 +829,13 @@ const tableStore = new TableStore({
                     : ''
             }
         })
-        console.log('🚀 ~ loadCallback ~ tableStore.table:', tableStore.table)
         tableKey.value += 1
     }
 })
 tableStore.table.params.orderBy = 'desc'
 tableStore.table.params.devType = ''
 tableStore.table.params.devModel = ''
-tableStore.table.params.process = 2
+// tableStore.table.params.process = 2
 tableStore.table.params.devAccessMethod = ''
 tableStore.table.params.status = ''
 tableStore.table.params.sortBy = ''
@@ -877,6 +964,9 @@ const add = () => {
 const onSubmit = () => {
     ruleFormRef.value.validate((valid: any) => {
         if (valid) {
+            form.associatedEngineering = form.association ? form.association[0] : ''
+            form.associatedProject = form.association ? form.association[1] : ''
+
             if (dialogTitle.value == '新增设备') {
                 addEquipmentDelivery(form).then(res => {
                     ElMessage.success('新增成功')
@@ -923,6 +1013,9 @@ const resetForm = () => {
             devModel: '',
             devType: '',
             name: '',
+            associatedEngineering: '',
+            associatedProject: '',
+            association: [],
             ndid: ''
         }
         Object.assign(form, user)
@@ -939,6 +1032,15 @@ provide('tableStore', tableStore)
 
 onMounted(() => {
     queryTheDictionary()
+    engineeringProject().then(res => {
+        engineeringList.value = res.data.filter(item => {
+            item.projectName = item.engineeringName
+            item.projectId = item.engineeringId
+            item.disabled = item.projectInfoList ? false : true
+            return item
+        })
+    })
+
     setTimeout(() => {}, 100)
 })
 

src/views/govern/manage/monthly.vue

@@ -9,13 +9,13 @@
                         clearable
                     ></el-input>
                 </el-form-item>
-                <el-form-item label="流程阶段">
+                <!-- <el-form-item label="流程阶段">
                     <el-select v-model.trim="tableStore.table.params.process" clearable placeholder="请选择">
                         <el-option label="功能调试" :value="2"></el-option>
                         <el-option label="出厂调试" :value="3"></el-option>
                         <el-option label="正式投运" :value="4"></el-option>
                     </el-select>
-                </el-form-item>
+                </el-form-item> -->
             </template>
             <template v-slot:operation>
                 <el-button type="primary" icon="el-icon-Download" @click="exportTab">导出</el-button>
@@ -147,7 +147,6 @@ const tableStore = new TableStore({
             item.process = item.process == 2 ? '功能调试' : item.process == 3 ? '出厂调试' : '正式投运'
             return item
         })
-        console.log('🚀 ~ tableStore.table.allData:', tableStore.table.allData)
     },
     loadCallback: () => {
         let name = tableStore.table.params.name
@@ -176,7 +175,7 @@ const tableStore = new TableStore({
 })
 
 provide('tableStore', tableStore)
-tableStore.table.params.process = 4
+// tableStore.table.params.process = 4
 tableStore.table.params.name = ''
 const tableRef = ref()
 const exportTab = () => {

src/views/govern/manage/programVersion/comp/deviceLog.vue

@@ -0,0 +1,94 @@
+<template>
+    <el-dialog v-model="dialogVisible" :title="title" width="800" :close-on-click-modal="false"
+        :before-close="handleClose">
+
+        <!-- 表格区域 -->
+        <div class="table-area" :style="layout1">
+            <vxe-table v-bind="defaultAttribute" :data="tableData" v-loading="loading" height="auto">
+                <vxe-column type="seq" title="序号" width="80" align="center" />
+                <vxe-column field="version" title="版本" min-width="120" align="center" />
+                <vxe-column field="result" title="升级结果" width="120" align="center">
+                    <template #default="{ row }">
+                        <el-tag :type="getResultTagType(row.result)" size="small">
+                            {{ getResultText(row.result) }}
+                        </el-tag>
+                    </template>
+                </vxe-column>
+                <vxe-column field="upgradeTime" title="升级时间" width="180" align="center" />
+                <vxe-column field="upgradeUser" title="升级人" width="120" align="center" />
+            </vxe-table>
+        </div>
+
+
+    </el-dialog>
+</template>
+
+<script setup>
+import { ref, reactive } from 'vue'
+import { defaultAttribute } from '@/components/table/defaultAttribute'
+import { ElMessage } from 'element-plus'
+import { mainHeight } from '@/utils/layout'
+import { getByDevId } from '@/api/cs-device-boot/cloudDeviceEntry'
+const layout1 = mainHeight(100, 2)
+// 弹框显示控制
+const dialogVisible = ref(false)
+
+// 表格数据
+const tableData = ref([])
+
+// 加载状态
+const loading = ref(false)
+const title = ref('升级日志')
+// 升级结果标签类型映射
+const getResultTagType = (result) => {
+    const map = {
+        success: 'success',
+        fail: 'danger',
+        processing: 'warning'
+    }
+    return map[result] || 'info'
+}
+
+// 升级结果文本映射
+const getResultText = (result) => {
+    const map = {
+        success: '成功',
+        fail: '失败',
+        processing: '进行中'
+    }
+    return map[result] || result
+}
+
+// 打开弹框
+const open = (row) => {
+    title.value = `${row.name}_升级日志`
+    dialogVisible.value = true
+    getByDevId({
+        devId: row.id
+    }).then((res) => {
+        tableData = res.data
+    })
+
+}
+
+// 加载表格数据
+const loadTableData = async (deviceId) => {
+    loading.value = true
+
+}
+
+// 关闭弹框
+const handleClose = () => {
+    dialogVisible.value = false
+    // 重置数据
+    tableData.value = []
+}
+
+// 暴露方法给父组件
+defineExpose({
+    open
+})
+
+</script>
+
+<style scoped></style>

src/views/govern/manage/programVersion/comp/upgrade.vue

@@ -0,0 +1,114 @@
+<template>
+    <el-dialog draggable width="500px" v-model.trim="dialogVisible" :title="title">
+        <el-form :model="form" class="form-one" label-width="auto" ref="formRef" :rules="rules">
+            <el-form-item label="版本:" prop="edDataId">
+                <el-select v-model.trim="form.edDataId" placeholder="请选择版本" @change="selectChange">
+                    <el-option v-for="item in devList" :disabled="version == item.versionNo"
+                        :label="`${item.devTypeName}_${item.versionNo}_${item.versionAgreement}_${item.versionDate}`"
+                        :value="item.id"></el-option>
+                </el-select>
+            </el-form-item>
+
+            <el-form-item label="描述:">
+                <el-input v-model.trim="versionDesc" disabled type="textarea" :rows="3"></el-input>
+            </el-form-item>
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="dialogVisible = false">取消</el-button>
+                <el-button type="primary" @click="submit" :loading="loading">确认</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, inject, reactive } from 'vue'
+import { ElMessage } from 'element-plus'
+import { findByDevTypeId, upgrade } from '@/api/system-boot/dictTree'
+const formRef = ref()
+const dialogVisible = ref(false)
+const title = ref('程序版本')
+const devList: any = ref([])
+const versionDesc = ref('')
+const version = ref('')
+// 表单数据（新增了版本类型、版本描述字段）
+const form = reactive<any>({
+    devId: [],
+    edDataId: '' // 新增：下拉选择版本
+})
+const loading = ref(false)
+// 校验规则（新增两个字段的必填校验）
+const rules = {
+    // 新增校验
+    edDataId: [{ required: true, message: '请选择版本', trigger: 'change' }]
+}
+
+// 打开弹窗
+const open = (data: any) => {
+
+    loading.value = false
+    version.value = data.version
+    form.devId = []
+    form.edDataId = ''
+    versionDesc.value = ''
+
+    getFindByDev(data.devModel)
+    formRef.value?.resetFields()
+    dialogVisible.value = true
+    form.devId = data.id
+}
+// 获取版本
+const getFindByDev = (devModel: string) => {
+    findByDevTypeId({
+        devType: devModel, //'45afe3ad9970785090cd7da27f489c37',
+        pageNum: 1,
+        pageSize: 10000
+    }).then((res: any) => {
+        devList.value = res.data.records
+        if (devList.value.length == 0) {
+            ElMessage.warning('该设备没有可升级的版本!')
+            return
+        } else if (devList.value.length == 1 && devList.value[0].versionNo == version.value) {
+            ElMessage.warning('该设备没有可升级的版本!')
+        }
+
+    })
+}
+// 提交
+const submit = () => {
+    formRef.value.validate(async (valid: boolean) => {
+        if (valid) {
+            try {
+                ElMessage.info('升级中，请稍等...')
+                loading.value = true
+                upgrade({
+                    devId: form.devId.join(),
+                    edDataId: form.edDataId
+                })
+                    .then(res => {
+                        ElMessage.success('升级成功')
+                        loading.value = false
+                        dialogVisible.value = false
+                    })
+                    .catch(error => {
+                        loading.value = false
+                    })
+            } catch (error) {
+                loading.value = false
+                ElMessage.error('升级失败')
+            }
+        }
+    })
+}
+const selectChange = e => {
+    devList.value.forEach(item => {
+        if (item.id === e) {
+            versionDesc.value = item.description
+        }
+    })
+}
+
+defineExpose({ open })
+</script>

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

@@ -0,0 +1,217 @@
+<template>
+    <div class="default-main">
+        <TableHeader ref="tableHeaderRef" showExport>
+            <template #select>
+                <el-form-item label="关键字筛选">
+                    <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="请输入设备名称"
+                        style="width:200px" />
+                </el-form-item>
+                <el-form-item label="通讯状态">
+                    <el-select v-model.trim="tableStore.table.params.connectStatus" filterable placeholder="请选择通讯状态"
+                        clearable>
+                        <el-option label="中断" :value="0"></el-option>
+                        <el-option label="正常" :value="1"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="设备型号">
+                    <el-select v-model.trim="tableStore.table.params.devModel" filterable placeholder="请选择设备型号"
+                        clearable>
+                        <el-option v-for="item in DevTypeOptions" :key="item.id" :label="item.name"
+                            :value="item.id"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="icd模型">
+                    <el-select v-model.trim="tableStore.table.params.icd" filterable placeholder="请选择设备系列" clearable>
+                        <el-option v-for="item in icdList" :key="item.id" :label="item.name"
+                            :value="item.id"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="升级设备筛选">
+                    <el-select v-model.trim="tableStore.table.params.upgrade" filterable placeholder="请选择升级设备筛选"
+                        clearable>
+                        <el-option label="可升级" :value="1"></el-option>
+                        <el-option label="不可升级" :value="0"></el-option>
+                    </el-select>
+                </el-form-item>
+            </template>
+            <template #operation>
+                <el-button :icon="Document" type="primary" class="ml10" @click="maintenance">版本维护</el-button>
+                <!-- <el-button :icon="Share" type="primary" class="ml10" @click="upgradeVersion">批量升级</el-button> -->
+            </template>
+        </TableHeader>
+        <Table :checkbox-config="checkboxConfig" ref="tableRef" />
+        <upgrade ref="upgradeRef" />
+        <deviceLog ref="deviceLogRef" />
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { ElMessage } from 'element-plus'
+import { queryByCode, queryByid } from '@/api/system-boot/dictTree'
+import { useDictData } from '@/stores/dictData'
+import { Share, Document } from '@element-plus/icons-vue'
+import { useRouter } from 'vue-router'
+import upgrade from './comp/upgrade.vue'
+import deviceLog from './comp/deviceLog.vue'
+defineOptions({
+    name: 'govern/manage/programVersion'
+})
+const upgradeRef = ref()
+const deviceLogRef = ref()
+const dictData = useDictData()
+const DevTypeOptions = ref()
+const icdList = ref()
+const tableHeaderRef = ref()
+const { push, options, currentRoute } = useRouter()
+const tableStore: any = new TableStore({
+    url: '/cs-device-boot/EquipmentDelivery/version/page',
+    method: 'POST',
+    column: [
+        // { type: 'checkbox', width: '60', },
+        {
+            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: '150' },
+        { title: '版本号', field: 'version', minWidth: '100', formatter: (row: any) => { return row.cellValue || '/' } },
+        { title: '协议版本', field: 'protocolVersion', minWidth: '100', formatter: (row: any) => { return row.cellValue || '/' } },
+        { title: '版本日期', field: 'versionDate', minWidth: '150', formatter: (row: any) => { return row.cellValue || '/' } },
+        { title: '设备型号', field: 'devModelName', minWidth: '120', formatter: (row: any) => { return row.cellValue || '/' } },
+        { title: 'icd模型', field: 'icd', minWidth: '120', formatter: (row: any) => { return icdList.value.filter(item => item.id == row.cellValue)[0]?.name || '/' } },
+        { title: '所属工程', field: 'associatedEngineering', minWidth: '120', formatter: (row: any) => { return row.cellValue || '/' } },
+        { title: '所属项目', field: 'associatedProject', minWidth: '120', formatter: (row: any) => { return row.cellValue || '/' } },
+        {
+            title: '状态',
+            field: 'runStatus',
+            render: 'tag',
+            minWidth: '80',
+            custom: {
+                1: 'danger',
+                2: 'success'
+            },
+            replaceValue: {
+                1: '离线',
+                2: '在线'
+            }
+        },
+        { title: '更新时间', field: 'updateTime', minWidth: '150', formatter: (row: any) => { return row.cellValue || '/' }, sortable: true },
+        { title: '修改人员', field: 'updateByName', minWidth: '100', formatter: (row: any) => { return row.cellValue || '/' } },
+        {
+            title: '操作',
+            fixed: 'right',
+            align: 'center',
+            width: '130',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'productSetting',
+                    title: '升级',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    disabled: (row: any) => {
+                        return row.upgrade == 0
+                    },
+                    render: 'basicButton',
+                    click: (row: any) => {
+                        upgradeRef.value.open({
+                            id: [row.id],
+                            devModel: row.devModel,
+                            version: row.version
+
+                        })
+                    }
+                },
+                {
+                    name: 'productSetting',
+                    title: '日志',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: (row: any) => {
+                        deviceLogRef.value.open(row)
+                    }
+                }
+            ]
+        }
+    ],
+    loadCallback: () => { }
+})
+const checkboxConfig = reactive({
+    checkMethod: ({ row }) => {
+        return row.upgrade == 1
+    }
+})
+const getQuery = async () => {
+    queryByCode('Device_Type').then(res => {
+        const id = res.data.id
+        queryByid(id).then(res => {
+            res.data.map((item: any, index: any) => {
+                if (item.pid == id) {
+                    res.data.splice(index, 1)
+                }
+            })
+
+            DevTypeOptions.value = res.data
+        })
+    })
+    queryByCode('Icd_Model').then(res => {
+        const id = res.data.id
+        queryByid(id).then(res => {
+            icdList.value = res.data
+        })
+    })
+
+}
+
+// 禁止点击
+
+// 升级版本
+const upgradeVersion = () => {
+    if (!tableStore.table.selection.length) {
+        ElMessage.warning('请选择需要升级的设备!')
+        return
+    }
+    // 获取第一个设备的 devModel
+    const firstDevModel = tableStore.table.selection[0].devModel
+
+    // 检查是否所有设备的 devModel 都相同
+    const allSame = tableStore.table.selection.every(device => device.devModel === firstDevModel)
+
+    if (!allSame) {
+        return ElMessage.warning('请选择相同设备型号的设备进行批量升级!')
+    }
+
+    upgradeRef.value.open(
+        {
+            id: tableStore.table.selection.map(item => item.id),
+            devModel: firstDevModel
+
+        }
+    )
+}
+// 版本维护
+const maintenance = () => {
+    push({
+        // path: '/versionMaintenance'
+        path: '/version'
+    })
+}
+
+tableStore.table.params.searchValue = ''
+tableStore.table.params.connectStatus = ''
+tableStore.table.params.devModel = ''
+tableStore.table.params.icd = ''
+tableStore.table.params.upgrade = ''
+provide('tableStore', tableStore)
+onMounted(() => {
+    getQuery()
+    tableStore.index()
+})
+</script>

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

@@ -0,0 +1,263 @@
+<template>
+    <div class="default-main manage-realTime" :style="{ height: pageHeight.height }">
+        <DeviceTree @node-click="nodeClick" @init="" @deviceTypeChange=""></DeviceTree>
+        <div class="manage-realTime-right">
+            <div class="time-container">
+                <div>
+                    <div>系统时间：{{ realTime }}</div>
+                    <div>终端时间：{{ deviceTime }}</div>
+                </div>
+                <el-button icon="el-icon-RefreshLeft" type="primary" @click="synchronizeTime">对时</el-button>
+            </div>
+            <div :style="echartHeight" class="pl10 pr10">
+                <MyEchart :options="echartsData" />
+            </div>
+            <div class="pl10 pr10">
+                <el-table :data="tableData" border stripe :show-header="false" class="custom-table">
+                    <el-table-column prop="label1" />
+                    <el-table-column prop="label2" />
+                    <el-table-column prop="value1" />
+                    <el-table-column prop="label3" />
+                    <el-table-column prop="value2" />
+                    <el-table-column prop="label4" />
+                    <el-table-column prop="value3" />
+                </el-table>
+            </div>
+        </div>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, reactive } from 'vue'
+import { mainHeight } from '@/utils/layout'
+import DeviceTree from '@/components/tree/govern/deviceTree.vue'
+import MyEchart from '@/components/echarts/MyEchart.vue'
+import { formatToDateTime } from '@/utils/dateUtil'
+defineOptions({
+    name: 'govern/manage/realTime'
+})
+
+//页面属性
+const pageHeight = mainHeight(20)
+const echartHeight = mainHeight(180)
+const realTime = ref<string>('')
+const deviceTime = ref<string>('')
+const timer = ref<any>(null)
+const echartsData = ref<any>({
+    title: {
+        text: '终端性能'
+    },
+    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
+    },
+
+    legend: {
+        bottom: 0,
+        data: ['CPU1使用率', 'CPU2使用率', '内存使用率', '磁盘使用率']
+    },
+    xAxis: {
+        type: 'time',
+        name: '时间',
+        axisLabel: {
+            formatter: {
+                day: '{MM}-{dd}',
+                month: '{MM}',
+                year: '{yyyy}'
+            }
+        }
+    },
+    yAxis: {
+        name: '%',
+        type: 'value',
+        min: 0,
+        max: 100
+    },
+    series: [
+        {
+            name: 'CPU1使用率',
+            type: 'line',
+            showSymbol: false,
+            smooth: true,
+            data: [
+                ['2025-01-01 08:00:00', 10],
+                ['2025-01-01 09:00:00', 10],
+                ['2025-01-01 010:00:00', 10]
+            ]
+        },
+        {
+            name: 'CPU2使用率',
+            type: 'line',
+            showSymbol: false,
+            smooth: true,
+            data: [
+                ['2025-01-01 08:00:00', 11],
+                ['2025-01-01 09:00:00', 11],
+                ['2025-01-01 010:00:00', 11]
+            ]
+        },
+        {
+            name: '内存使用率',
+            type: 'line',
+            showSymbol: false,
+            smooth: true,
+            data: [
+                ['2025-01-01 08:00:00', 12],
+                ['2025-01-01 09:00:00', 12],
+                ['2025-01-01 010:00:00', 12]
+            ]
+        },
+        {
+            name: '磁盘使用率',
+            type: 'line',
+            showSymbol: false,
+            smooth: true,
+            data: [
+                ['2025-01-01 08:00:00', 13],
+                ['2025-01-01 09:00:00', 13],
+                ['2025-01-01 010:00:00', 13]
+            ]
+        }
+    ]
+})
+
+const tableData = ref([
+    {
+        label1: 'cpu1负载(%)',
+        label2: '使用:',
+        value1: '43',
+        label3: '剩余:',
+        value2: '57',
+        label4: '',
+        value3: ''
+    },
+    {
+        label1: 'cpu2负载(%)',
+        label2: '使用:',
+        value1: '/',
+        label3: '剩余:',
+        value2: '/',
+        label4: '',
+        value3: ''
+    },
+    {
+        label1: '终端内存详情(MB)',
+        label2: '内存总量:',
+        value1: '489',
+        label3: '已使用:',
+        value2: '143',
+        label4: '未使用:',
+        value3: '346.00'
+    },
+    {
+        label1: '主存储器详情(GB)',
+        label2: '主存储器总量:',
+        value1: '6.44',
+        label3: '已使用:',
+        value2: '6.03',
+        label4: '未使用:',
+        value3: '0.41'
+    },
+    {
+        label1: '其余信息',
+        label2: '最后对时对标:',
+        value1: '1970-01-01 08:00:00',
+        label3: '信号强度(dBm):',
+        value2: '-',
+        label4: '',
+        value3: ''
+    }
+])
+
+const nodeClick = async (e: anyObj) => {
+    console.log('点击设备树节点')
+}
+
+const handleClose = () => {
+    console.log('close')
+}
+
+const synchronizeTime = async () => {
+    console.log('对时')
+}
+onMounted(() => {
+    timer.value = setInterval(() => {
+        realTime.value = formatToDateTime(new Date())
+    }, 1000)
+})
+// 在组件卸载时清除定时器
+onUnmounted(() => {
+    if (timer.value) {
+        clearInterval(timer.value)
+        timer.value = null
+    }
+})
+</script>
+<style scoped lang="scss">
+.manage-realTime {
+    display: flex;
+
+    &-right {
+        height: 100%;
+        overflow: hidden;
+        flex: 1;
+        padding: 10px 10px 10px 0;
+        display: flex;
+        flex-direction: column;
+        border: 1px solid #ebeef5; // 加个边框方便查看效果
+
+        .time-container {
+            display: flex;
+            justify-content: flex-end; // 让内容靠右
+            align-items: center; // 让内容垂直居中（避免高度不一致时偏移）
+
+            * {
+                margin-right: 15px;
+            }
+
+            .el-button * {
+                margin-right: 0;
+            }
+        }
+
+        :deep(.el-table__cell) {
+            text-align: center;
+        }
+
+        /* 1. 加深表格边框线条 */
+        :deep(.custom-table.el-table) {
+            border: 1px solid #dcdfe6;
+            width: auto;
+        }
+
+        :deep(.custom-table .el-table__cell) {
+            border: 0.5px solid #dcdfe6;
+        }
+
+        /* 2. 第 1、2、4、6 列显示深色背景 */
+        :deep(.custom-table .el-table__row .el-table__cell:nth-child(1)) {
+            background-color: #f5f7fa;
+            font-weight: bold;
+        }
+
+        /* 第 3、5、7 列显示白色背景 */
+        :deep(.custom-table .el-table__row .el-table__cell:nth-child(3)),
+        :deep(.custom-table .el-table__row .el-table__cell:nth-child(5)),
+        :deep(.custom-table .el-table__row .el-table__cell:nth-child(7)) {
+            // background-color: #fff;
+        }
+    }
+}
+</style>

src/views/govern/monitorRecall/eventRecall.vue

@@ -16,9 +16,8 @@ import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import { Setting } from '@element-plus/icons-vue'
-import { eventRecall, fileRecall, logRecall } from '@/api/cs-device-boot/recall'
+import { eventRecall, fileRecall,  } from '@/api/cs-device-boot/recall'
 import { ElMessage } from 'element-plus'
-import { el } from 'element-plus/es/locale'
 
 const props = defineProps({
     checkedNodes: {
@@ -147,9 +146,11 @@ const recall1 = async () => {
     await eventRecall({
         startTime: tableStore.table.params.startTime,
         endTime: tableStore.table.params.endTime,
-        lineList: props.checkedNodes.map((node: any) => node.id)
+        lineList: props.checkedNodes.map((node: any) => node.id),
+      
     }).then((res: any) => {
         ElMessage.success('补召事件成功')
+           tableStore.index()
     })
 }
 

src/views/govern/monitorRecall/steadyRecall.vue

@@ -16,7 +16,7 @@ import Table from '@/components/table/index.vue'
 import { ElMessage, ElTree } from 'element-plus'
 import TableHeader from '@/components/table/header/index.vue'
 import { Setting } from '@element-plus/icons-vue'
-
+import { eventRecall, fileRecall } from '@/api/cs-device-boot/recall'
 const props = defineProps({
     checkedNodes: {
         type: Array,
@@ -68,23 +68,23 @@ const tableStore: any = new TableStore({
                 2: '解析失败',
                 3: '文件不存在'
             }
-        },
-        {
-            title: '操作',
-            fixed: 'right',
-            width: '100',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'edit',
-                    title: '详情',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    click: row => {}
-                }
-            ]
         }
+        // {
+        //     title: '操作',
+        //     fixed: 'right',
+        //     width: '100',
+        //     render: 'buttons',
+        //     buttons: [
+        //         {
+        //             name: 'edit',
+        //             title: '详情',
+        //             type: 'primary',
+        //             icon: 'el-icon-EditPen',
+        //             render: 'basicButton',
+        //             click: row => {}
+        //         }
+        //     ]
+        // }
     ],
     beforeSearchFun: () => {},
     loadCallback: () => {}
@@ -92,8 +92,22 @@ const tableStore: any = new TableStore({
 
 provide('tableStore', tableStore)
 
-const exportTab = () => {
+const exportTab = async () => {
-    ElMessage.info('稳态补召功能暂未开发！')
+    // ElMessage.info('稳态补召功能暂未开发！')
+    if (!props.checkedNodes || props.checkedNodes.length === 0) {
+        ElMessage.warning('请先勾选监测点')
+        return
+    }
+
+    await eventRecall({
+        startTime: tableStore.table.params.startTime,
+        endTime: tableStore.table.params.endTime,
+        lineList: props.checkedNodes.map((node: any) => node.id),
+        bzType: 0
+    }).then((res: any) => {
+        ElMessage.success('补召成功')
+        tableStore.index()
+    })
 }
 //获取请求参数
 const getTableParams = (val: any) => {

src/views/govern/reportForms/export.js

@@ -3,347 +3,324 @@ import Excel from 'exceljs'
 
 import FileSaver from 'file-saver'
 
-const exportExcel = function(luckysheet, value) {
+const exportExcel = function (luckysheet, value) {
-  // 参数为luckysheet.getluckysheetfile()获取的对象
+    // 参数为luckysheet.getluckysheetfile()获取的对象
-  // 1.创建工作簿，可以为工作簿添加属性
+    // 1.创建工作簿，可以为工作簿添加属性
-  const workbook = new Excel.Workbook()
+    const workbook = new Excel.Workbook()
-  // 2.创建表格，第二个参数可以配置创建什么样的工作表
+    // 2.创建表格，第二个参数可以配置创建什么样的工作表
-  if (Object.prototype.toString.call(luckysheet) === '[object Object]') {
+    if (Object.prototype.toString.call(luckysheet) === '[object Object]') {
-    luckysheet = [luckysheet]
+        luckysheet = [luckysheet]
-  }
+    }
-  luckysheet.forEach(function(table) {
+    luckysheet.forEach(function (table) {
-    if (table.data.length === 0) return  true
+        if (table.data.length === 0) return true
-    // ws.getCell('B2').fill = fills.
+        // ws.getCell('B2').fill = fills.
-    const worksheet = workbook.addWorksheet(table.name)
+        const worksheet = workbook.addWorksheet(table.name)
-    const merge = (table.config && table.config.merge) || {}
+        const merge = (table.config && table.config.merge) || {}
-    const borderInfo = (table.config && table.config.borderInfo) || {}
+        const borderInfo = (table.config && table.config.borderInfo) || {}
-    // 3.设置单元格合并,设置单元格边框,设置单元格样式,设置值
+        // 3.设置单元格合并,设置单元格边框,设置单元格样式,设置值
-    setStyleAndValue(table.data, worksheet)
+        setStyleAndValue(table.data, worksheet)
-    setMerge(merge, worksheet)
+        setMerge(merge, worksheet)
-    setBorder(borderInfo, worksheet)
+        setBorder(borderInfo, worksheet)
-    return true
+        return true
-  })
-
-  // return
-  // 4.写入 buffer
-  const buffer = workbook.xlsx.writeBuffer().then(data => {
-    // console.log('data', data)
-    const blob = new Blob([data], {
-      type: 'application/vnd.ms-excel;charset=utf-8'
     })
-    console.log("导出成功！")
-    FileSaver.saveAs(blob, `${value}.xlsx`)
-  })
-  return buffer
-}
 
-var setMerge = function(luckyMerge = {}, worksheet) {
+    // return
-  const mergearr = Object.values(luckyMerge)
+    // 4.写入 buffer
-  mergearr.forEach(function(elem) {
+    const buffer = workbook.xlsx.writeBuffer().then(data => {
-    // elem格式：{r: 0, c: 0, rs: 1, cs: 2}
+        // console.log('data', data)
-    // 按开始行，开始列，结束行，结束列合并（相当于 K10:M12）
+        const blob = new Blob([data], {
-    worksheet.mergeCells(
+            type: 'application/vnd.ms-excel;charset=utf-8'
-      elem.r + 1,
-      elem.c + 1,
-      elem.r + elem.rs,
-      elem.c + elem.cs
-    )
-  })
-}
-
-var setBorder = function(luckyBorderInfo, worksheet) {
-  if (!Array.isArray(luckyBorderInfo)) return
-  // console.log('luckyBorderInfo', luckyBorderInfo)
-  luckyBorderInfo.forEach(function(elem) {
-    // 现在只兼容到borderType 为range的情况
-    // console.log('ele', elem)
-    if (elem.rangeType === 'range') {
-      let border = borderConvert(elem.borderType, elem.style, elem.color)
-      let rang = elem.range[0]
-      // console.log('range', rang)
-      let row = rang.row
-      let column = rang.column
-      for (let i = row[0] + 1; i < row[1] + 2; i++) {
-        for (let y = column[0] + 1; y < column[1] + 2; y++) {
-          worksheet.getCell(i, y).border = border
-        }
-      }
-    }
-    if (elem.rangeType === 'cell') {
-      // col_index: 2
-      // row_index: 1
-      // b: {
-      //   color: '#d0d4e3'
-      //   style: 1
-      // }
-      const { col_index, row_index } = elem.value
-      const borderData = Object.assign({}, elem.value)
-      delete borderData.col_index
-      delete borderData.row_index
-      let border = addborderToCell(borderData, row_index, col_index)
-      // console.log('bordre', border, borderData)
-      worksheet.getCell(row_index + 1, col_index + 1).border = border
-    }
-    // console.log(rang.column_focus + 1, rang.row_focus + 1)
-    // worksheet.getCell(rang.row_focus + 1, rang.column_focus + 1).border = border
-  })
-}
-var setStyleAndValue = function(cellArr, worksheet) {
-  if (!Array.isArray(cellArr)) return
-  cellArr.forEach(function(row, rowid) {
-    row.every(function(cell, columnid) {
-      if (!cell) return true
-      let fill = fillConvert(cell.bg)
-
-      let font = fontConvert(
-        cell.ff,
-        cell.fc,
-        cell.bl,
-        cell.it,
-        cell.fs,
-        cell.cl,
-        cell.ul
-      )
-      let alignment = alignmentConvert(cell.vt, cell.ht, cell.tb, cell.tr)
-      let value = ''
-
-      if (cell.f) {
-        value = { formula: cell.f, result: cell.v }
-      } else if (!cell.v && cell.ct && cell.ct.s) {
-        // xls转为xlsx之后，内部存在不同的格式，都会进到富文本里，即值不存在与cell.v，而是存在于cell.ct.s之后
-        // value = cell.ct.s[0].v
-        cell.ct.s.forEach(arr => {
-          value += arr.v
         })
-      } else {
+        console.log('导出成功！')
-        value = cell.v
+        FileSaver.saveAs(blob, `${value}.xlsx`)
-      }
-      //  style 填入到_value中可以实现填充色
-      let letter = createCellPos(columnid)
-      let target = worksheet.getCell(letter + (rowid + 1))
-      // console.log('1233', letter + (rowid + 1))
-      for (const key in fill) {
-        target.fill = fill
-        break
-      }
-      target.font = font
-      target.alignment = alignment
-      target.value = value
-
-      return true
     })
-  })
+    return buffer
 }
 
-var fillConvert = function(bg) {
+var setMerge = function (luckyMerge = {}, worksheet) {
-  if (!bg) {
+    const mergearr = Object.values(luckyMerge)
-    return {}
+    mergearr.forEach(function (elem) {
-  }
+        // elem格式：{r: 0, c: 0, rs: 1, cs: 2}
-  // const bgc = bg.replace('#', '')
+        // 按开始行，开始列，结束行，结束列合并（相当于 K10:M12）
-  let fill = {
+        worksheet.mergeCells(elem.r + 1, elem.c + 1, elem.r + elem.rs, elem.c + elem.cs)
-    type: 'pattern',
+    })
-    pattern: 'solid',
-    fgColor: { argb: bg.replace('#', '') }
-  }
-  return fill
 }
 
-var fontConvert = function(
+var setBorder = function (luckyBorderInfo, worksheet) {
-  ff = 0,
+    if (!Array.isArray(luckyBorderInfo)) return
-  fc = '#000000',
+    // console.log('luckyBorderInfo', luckyBorderInfo)
-  bl = 0,
+    luckyBorderInfo.forEach(function (elem) {
-  it = 0,
+        // 现在只兼容到borderType 为range的情况
-  fs = 10,
+        // console.log('ele', elem)
-  cl = 0,
+        if (elem.rangeType === 'range') {
-  ul = 0
+            let border = borderConvert(elem.borderType, elem.style, elem.color)
-) {
+            let rang = elem.range[0]
-  // luckysheet：ff(样式), fc(颜色), bl(粗体), it(斜体), fs(大小), cl(删除线), ul(下划线)
+            // console.log('range', rang)
-  const luckyToExcel = {
+            let row = rang.row
-    0: '微软雅黑',
+            let column = rang.column
-    1: '宋体（Song）',
+            for (let i = row[0] + 1; i < row[1] + 2; i++) {
-    2: '黑体（ST Heiti）',
+                for (let y = column[0] + 1; y < column[1] + 2; y++) {
-    3: '楷体（ST Kaiti）',
+                    worksheet.getCell(i, y).border = border
-    4: '仿宋（ST FangSong）',
+                }
-    5: '新宋体（ST Song）',
+            }
-    6: '华文新魏',
+        }
-    7: '华文行楷',
+        if (elem.rangeType === 'cell') {
-    8: '华文隶书',
+            // col_index: 2
-    9: 'Arial',
+            // row_index: 1
-    10: 'Times New Roman ',
+            // b: {
-    11: 'Tahoma ',
+            //   color: '#d0d4e3'
-    12: 'Verdana',
+            //   style: 1
-    num2bl: function(num) {
+            // }
-      return num === 0 ? false : true
+            const { col_index, row_index } = elem.value
+            const borderData = Object.assign({}, elem.value)
+            delete borderData.col_index
+            delete borderData.row_index
+            let border = addborderToCell(borderData, row_index, col_index)
+            // console.log('bordre', border, borderData)
+            worksheet.getCell(row_index + 1, col_index + 1).border = border
+        }
+        // console.log(rang.column_focus + 1, rang.row_focus + 1)
+        // worksheet.getCell(rang.row_focus + 1, rang.column_focus + 1).border = border
+    })
+}
+var setStyleAndValue = function (cellArr, worksheet) {
+    if (!Array.isArray(cellArr)) return
+    cellArr.forEach(function (row, rowid) {
+        row.every(function (cell, columnid) {
+            if (!cell) return true
+            let fill = fillConvert(cell.bg)
+
+            let font = fontConvert(cell.ff, cell.fc, cell.bl, cell.it, cell.fs, cell.cl, cell.ul)
+            let alignment = alignmentConvert(cell.vt, cell.ht, cell.tb, cell.tr)
+            let value = ''
+
+            if (cell.f) {
+                value = { formula: cell.f, result: cell.v }
+            } else if (!cell.v && cell.ct && cell.ct.s) {
+                // xls转为xlsx之后，内部存在不同的格式，都会进到富文本里，即值不存在与cell.v，而是存在于cell.ct.s之后
+                // value = cell.ct.s[0].v
+                cell.ct.s.forEach(arr => {
+                    value += arr.v
+                })
+            } else {
+                value = cell.v
+            }
+            //  style 填入到_value中可以实现填充色
+            let letter = createCellPos(columnid)
+            let target = worksheet.getCell(letter + (rowid + 1))
+            // console.log('1233', letter + (rowid + 1))
+            for (const key in fill) {
+                target.fill = fill
+                break
+            }
+            target.font = font
+            target.alignment = alignment
+            target.value = value
+
+            return true
+        })
+    })
+}
+
+var fillConvert = function (bg) {
+    if (!bg) {
+        return {}
     }
-  }
+    // const bgc = bg.replace('#', '')
-  // 出现Bug，导入的时候ff为luckyToExcel的val
+    let fill = {
-
+        type: 'pattern',
-  let font = {
+        pattern: 'solid',
-    name: typeof ff === 'number' ? luckyToExcel[ff] : ff,
+        fgColor: { argb: bg.replace('#', '') }
-    family: 1,
+    }
-    size: fs,
+    return fill
-    color: { argb: fc.replace('#', '') },
-    bold: luckyToExcel.num2bl(bl),
-    italic: luckyToExcel.num2bl(it),
-    underline: luckyToExcel.num2bl(ul),
-    strike: luckyToExcel.num2bl(cl)
-  }
-
-  return font
 }
 
-var alignmentConvert = function(
+var fontConvert = function (ff = 0, fc = '#000000', bl = 0, it = 0, fs = 10, cl = 0, ul = 0) {
-  vt = 'default',
+    // luckysheet：ff(样式), fc(颜色), bl(粗体), it(斜体), fs(大小), cl(删除线), ul(下划线)
-  ht = 'default',
+    const luckyToExcel = {
-  tb = 'default',
+        0: '微软雅黑',
-  tr = 'default'
+        1: '宋体（Song）',
-) {
+        2: '黑体（ST Heiti）',
-  // luckysheet:vt(垂直), ht(水平), tb(换行), tr(旋转)
+        3: '楷体（ST Kaiti）',
-  const luckyToExcel = {
+        4: '仿宋（ST FangSong）',
-    vertical: {
+        5: '新宋体（ST Song）',
-      0: 'middle',
+        6: '华文新魏',
-      1: 'top',
+        7: '华文行楷',
-      2: 'bottom',
+        8: '华文隶书',
-      default: 'top'
+        9: 'Arial',
-    },
+        10: 'Times New Roman ',
-    horizontal: {
+        11: 'Tahoma ',
-      0: 'center',
+        12: 'Verdana',
-      1: 'left',
+        num2bl: function (num) {
-      2: 'right',
+            return num === 0 ? false : true
-      default: 'left'
+        }
-    },
-    wrapText: {
-      0: false,
-      1: false,
-      2: true,
-      default: false
-    },
-    textRotation: {
-      0: 0,
-      1: 45,
-      2: -45,
-      3: 'vertical',
-      4: 90,
-      5: -90,
-      default: 0
     }
-  }
+    // 出现Bug，导入的时候ff为luckyToExcel的val
 
-  let alignment = {
+    let font = {
-    vertical: luckyToExcel.vertical[vt],
+        name: typeof ff === 'number' ? luckyToExcel[ff] : ff,
-    horizontal: luckyToExcel.horizontal[ht],
+        family: 1,
-    wrapText: luckyToExcel.wrapText[tb],
+        size: fs,
-    textRotation: luckyToExcel.textRotation[tr]
+        color: { argb: fc.replace('#', '') },
-  }
+        bold: luckyToExcel.num2bl(bl),
-  return alignment
+        italic: luckyToExcel.num2bl(it),
+        underline: luckyToExcel.num2bl(ul),
+        strike: luckyToExcel.num2bl(cl)
+    }
+
+    return font
 }
 
-var borderConvert = function(borderType, style = 1, color = '#000') {
+var alignmentConvert = function (vt = 'default', ht = 'default', tb = 'default', tr = 'default') {
-  // 对应luckysheet的config中borderinfo的的参数
+    // luckysheet:vt(垂直), ht(水平), tb(换行), tr(旋转)
-  if (!borderType) {
+    const luckyToExcel = {
-    return {}
+        vertical: {
-  }
+            0: 'middle',
-  const luckyToExcel = {
+            1: 'top',
-    type: {
+            2: 'bottom',
-      'border-all': 'all',
+            default: 'top'
-      'border-top': 'top',
+        },
-      'border-right': 'right',
+        horizontal: {
-      'border-bottom': 'bottom',
+            0: 'center',
-      'border-left': 'left'
+            1: 'left',
-    },
+            2: 'right',
-    style: {
+            default: 'left'
-      0: 'none',
+        },
-      1: 'thin',
+        wrapText: {
-      2: 'hair',
+            0: false,
-      3: 'dotted',
+            1: false,
-      4: 'dashDot', // 'Dashed',
+            2: true,
-      5: 'dashDot',
+            default: false
-      6: 'dashDotDot',
+        },
-      7: 'double',
+        textRotation: {
-      8: 'medium',
+            0: 0,
-      9: 'mediumDashed',
+            1: 45,
-      10: 'mediumDashDot',
+            2: -45,
-      11: 'mediumDashDotDot',
+            3: 'vertical',
-      12: 'slantDashDot',
+            4: 90,
-      13: 'thick'
+            5: -90,
+            default: 0
+        }
     }
-  }
+
-  let template = {
+    let alignment = {
-    style: luckyToExcel.style[style],
+        vertical: luckyToExcel.vertical[vt],
-    color: { argb: color.replace('#', '') }
+        horizontal: luckyToExcel.horizontal[ht],
-  }
+        wrapText: luckyToExcel.wrapText[tb],
-  let border = {}
+        textRotation: luckyToExcel.textRotation[tr]
-  if (luckyToExcel.type[borderType] === 'all') {
+    }
-    border['top'] = template
+    return alignment
-    border['right'] = template
+}
-    border['bottom'] = template
+
-    border['left'] = template
+var borderConvert = function (borderType, style = 1, color = '#000') {
-  } else {
+    // 对应luckysheet的config中borderinfo的的参数
-    border[luckyToExcel.type[borderType]] = template
+    if (!borderType) {
-  }
+        return {}
-  // console.log('border', border)
+    }
-  return border
+    const luckyToExcel = {
+        type: {
+            'border-all': 'all',
+            'border-top': 'top',
+            'border-right': 'right',
+            'border-bottom': 'bottom',
+            'border-left': 'left'
+        },
+        style: {
+            0: 'none',
+            1: 'thin',
+            2: 'hair',
+            3: 'dotted',
+            4: 'dashDot', // 'Dashed',
+            5: 'dashDot',
+            6: 'dashDotDot',
+            7: 'double',
+            8: 'medium',
+            9: 'mediumDashed',
+            10: 'mediumDashDot',
+            11: 'mediumDashDotDot',
+            12: 'slantDashDot',
+            13: 'thick'
+        }
+    }
+    let template = {
+        style: luckyToExcel.style[style],
+        color: { argb: color.replace('#', '') }
+    }
+    let border = {}
+    if (luckyToExcel.type[borderType] === 'all') {
+        border['top'] = template
+        border['right'] = template
+        border['bottom'] = template
+        border['left'] = template
+    } else {
+        border[luckyToExcel.type[borderType]] = template
+    }
+    // console.log('border', border)
+    return border
 }
 
 function addborderToCell(borders, row_index, col_index) {
-  let border = {}
+    let border = {}
-  const luckyExcel = {
+    const luckyExcel = {
-    type: {
+        type: {
-      l: 'left',
+            l: 'left',
-      r: 'right',
+            r: 'right',
-      b: 'bottom',
+            b: 'bottom',
-      t: 'top'
+            t: 'top'
-    },
+        },
-    style: {
+        style: {
-      0: 'none',
+            0: 'none',
-      1: 'thin',
+            1: 'thin',
-      2: 'hair',
+            2: 'hair',
-      3: 'dotted',
+            3: 'dotted',
-      4: 'dashDot', // 'Dashed',
+            4: 'dashDot', // 'Dashed',
-      5: 'dashDot',
+            5: 'dashDot',
-      6: 'dashDotDot',
+            6: 'dashDotDot',
-      7: 'double',
+            7: 'double',
-      8: 'medium',
+            8: 'medium',
-      9: 'mediumDashed',
+            9: 'mediumDashed',
-      10: 'mediumDashDot',
+            10: 'mediumDashDot',
-      11: 'mediumDashDotDot',
+            11: 'mediumDashDotDot',
-      12: 'slantDashDot',
+            12: 'slantDashDot',
-      13: 'thick'
+            13: 'thick'
+        }
     }
-  }
+    // console.log('borders', borders)
-  // console.log('borders', borders)
+    for (const bor in borders) {
-  for (const bor in borders) {
+        const borderItem = borders[bor]
-    // console.log(bor)
+        // 同时判断边框对象 和 color 属性都存在
-    if (borders[bor].color.indexOf('rgb') === -1) {
+        if (!borderItem || !borderItem.color) {
-      border[luckyExcel.type[bor]] = {
+            continue
-        style: luckyExcel.style[borders[bor].style],
+        }
-        color: { argb: borders[bor].color.replace('#', '') }
-      }
-    } else {
-      border[luckyExcel.type[bor]] = {
-        style: luckyExcel.style[borders[bor].style],
-        color: { argb: borders[bor].color }
-      }
-    }
-  }
 
-  return border
+        if (borderItem.color.indexOf('rgb') === -1) {
+            border[luckyExcel.type[bor]] = {
+                style: luckyExcel.style[borderItem.style],
+                color: { argb: borderItem.color.replace('#', '') }
+            }
+        } else {
+            border[luckyExcel.type[bor]] = {
+                style: luckyExcel.style[borderItem.style],
+                color: { argb: borderItem.color }
+            }
+        }
+    }
+
+    return border
 }
 
 function createCellPos(n) {
-  let ordA = 'A'.charCodeAt(0)
+    let ordA = 'A'.charCodeAt(0)
 
-  let ordZ = 'Z'.charCodeAt(0)
+    let ordZ = 'Z'.charCodeAt(0)
-  let len = ordZ - ordA + 1
+    let len = ordZ - ordA + 1
-  let s = ''
+    let s = ''
-  while (n >= 0) {
+    while (n >= 0) {
-    s = String.fromCharCode((n % len) + ordA) + s
+        s = String.fromCharCode((n % len) + ordA) + s
 
-    n = Math.floor(n / len) - 1
+        n = Math.floor(n / len) - 1
-  }
+    }
-  return s
+    return s
 }
 
-export {
+export { exportExcel }
-  exportExcel
-}

src/views/govern/reportForms/index.vue

@@ -1,14 +1,14 @@
 <template>
     <div class="default-main">
-        <div v-show="show && lookShow" style="display: flex">
+        <el-row v-show="show && lookShow">
-            <div style="width: 600px">
+            <el-col :span="10">
                 <div class="custom-table-header">
                     <div class="title">报表列表</div>
                     <el-button :icon="Plus" type="primary" @click="addRole" class="ml10">新增报表</el-button>
                 </div>
                 <Table ref="tableRef" @currentChange="currentChange" />
-            </div>
+            </el-col>
-            <div style="flex: 1">
+            <el-col :span="14">
                 <div class="custom-table-header">
                     <div class="title">模版绑定</div>
 
@@ -61,8 +61,9 @@
                         </vxe-column>
                     </vxe-table>
                 </div>
-            </div>
+            </el-col>
-        </div>
+        </el-row>
+
         <luckysheet ref="luckysheetRef" v-if="!show" @shutDown="shutDown" />
         <!-- 查看 -->
         <look ref="lookRef" v-if="!lookShow" @shutDown="shutDown" />

src/views/govern/sensitiveLoadMange/detail.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog class="cn-operate-dialog" width="600px" v-model.trim="dialogVisible" :title="title">
+    <el-dialog class="cn-operate-dialog" width="500px" v-model.trim="dialogVisible" :title="title">
         <el-form :model="form" class="form-one" label-width="auto" ref="formRef" :rules="rules">
             <el-form-item label="所属厂站名称" prop="substationName">
                 <el-input v-model.trim="form.substationName" placeholder="请输入所属厂站名称"></el-input>
@@ -8,7 +8,7 @@
                 <el-input v-model.trim="form.name" placeholder="请输入敏感用户名称"></el-input>
             </el-form-item>
             <el-form-item label="敏感负荷类型" prop="loadType">
-                <el-select v-model.trim="form.loadType" filterable clearable placeholder="请选择数据分类">
+                <el-select v-model.trim="form.loadType" filterable clearable placeholder="请选择敏感负荷类型">
                     <el-option
                         v-for="item in DataTypeSelect"
                         :key="item.id"

src/views/govern/sensitiveLoadMange/index.vue

@@ -1,6 +1,18 @@
 <template>
     <div class="default-main">
         <TableHeader :showReset="false" showExport>
+            <template #select>
+                <el-form-item label="关键字筛选">
+                    <el-input
+                        maxlength="32"
+                        show-word-limit
+                        style="width: 240px"
+                        v-model.trim="tableStore.table.params.searchValue"
+                        clearable
+                        placeholder="请输入敏感负荷名称"
+                    />
+                </el-form-item>
+            </template>
             <template #operation>
                 <el-button :icon="Plus" type="primary" @click="addMenu" class="ml10">新增</el-button>
             </template>

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

@@ -60,7 +60,7 @@ const tableStore = new TableStore({
         {
             title: '类型',
             field: 'type',
-            width: 200,
+            width: 250,
             formatter: row => {
                 return options.value.filter((item: any) => item.value == row.cellValue)[0]?.name
             }