去除部门树接口

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/cloudDeviceEntry.ts

@@ -144,3 +144,11 @@ export function queryPushResult() {
         method: 'post'
     })
 }
+//查询升级日志
+export function getByDevId(data: any) {
+    return createAxios({
+        url: '/cs-device-boot/csUpgradeLogs/getByDevId',
+        method: 'get',
+        params:data
+    })
+}

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-system-boot/appinfo.ts

@@ -1,30 +1,69 @@
-import createAxios from '@/utils/request'
+import createAxios from '@/utils/request'
-
+
-/**
+/**
- * 查询app个人中心信息详情
+ * 查询app个人中心信息详情
- * @param id
+ * @param id
- */
+ */
-export const queryAppInfo = (type: string) => {
+export const queryAppInfo = (type: string) => {
-    let form = new FormData()
+    let form = new FormData()
-    form.append('type', type)
+    form.append('type', type)
-    return createAxios({
+    return createAxios({
-        url: '/cs-system-boot/appinfo/queryAppInfoByType',
+        url: '/cs-system-boot/appinfo/queryAppInfoByType',
-        method: 'post',
+        method: 'post',
-        headers: {
+        headers: {
-            'Content-Type': 'application/x-www-form-urlencoded'
+            'Content-Type': 'application/x-www-form-urlencoded'
-        },
+        },
-        data: form
+        data: form
-    })
+    })
-}
+}
-
+
-
+/**
-/**
+ * 新增app基础信息
- * 新增app基础信息
+ **/
- **/
+export const addAppInfo = (data: { type: string; content: string }) => {
-export const addAppInfo = (data: { type: string, content: string }) => {
+    return createAxios({
-    return createAxios({
+        url: '/cs-system-boot/appinfo/addAppInfo',
-        url: '/cs-system-boot/appinfo/addAppInfo',
+        method: 'post',
-        method: 'post',
+        data: data
-        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

@@ -103,3 +103,19 @@ export function engineeringProject() {
         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/exceedanceLevel/index.vue

@@ -1,25 +1,12 @@
 <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>
         <!-- 指标日趋势图 -->
         <HarmonicRatio‌ ref="harmonicRatio‌Ref" v-if="dialogFlag" @close="onHarmonicRatioClose" :showIndex="false" />
         <!-- <DailyTrendChart v-if="dialogTrendChart" ref="dailyTrendChartRef" @close="dialogTrendChart = false" /> -->
@@ -168,7 +155,7 @@ const tableStore: any = new TableStore({
                     {
                         type: 'bar',
                         name: '越限占比',
-                        data: tableStore.table.data.map((item: any) =>  Math.floor(item.extent * 100) / 100),
+                        data: tableStore.table.data.map((item: any) => Math.floor(item.extent * 100) / 100),
                         barMaxWidth: 30
                     }
                 ]
@@ -182,29 +169,29 @@ provide('tableRef', tableRef)
 
 provide('tableStore', tableStore)
 const codeMap = [
-  { key: '闪变', code: 'flickerOvertime' },
+    { key: '闪变', code: 'flickerOvertime' },
-  { key: '电压偏差', code: 'voltageDevOvertime' },
+    { key: '电压偏差', code: 'voltageDevOvertime' },
-  { key: '三相', code: 'ubalanceOvertime' },
+    { key: '三相', code: 'ubalanceOvertime' },
-  { key: '谐波电压', code: 'uharm' },
+    { key: '谐波电压', code: 'uharm' },
-  { key: '谐波电流', code: 'iharm' },
+    { key: '谐波电流', code: 'iharm' },
 ];
 // 点击行
 const cellClickEvent = ({ row, column }: any) => {
     dialogTrendChart.value = true
 
-    if (column.field == 'maxValue' ) {
+    if (column.field == 'maxValue') {
-        if(row.lineId==null){
+        if (row.lineId == null) {
-ElMessage.info('暂无越限监测点！')
+            ElMessage.info('暂无越限监测点！')
-        }else{
+        } else {
- nextTick(() => {
+            nextTick(() => {
-            // dailyTrendChartRef.value.open(row)
+                // dailyTrendChartRef.value.open(row)
-              dialogFlag.value = true
+                dialogFlag.value = true
-               nextTick(() => {
+                nextTick(() => {
 
-const code = codeMap.find(item => row.name.includes(item.key))?.code || '';
+                    const code = codeMap.find(item => row.name.includes(item.key))?.code || '';
-           harmonicRatio‌Ref.value.openDialog(row,code,column.title.replace(/次/g, ""))
+                    harmonicRatio‌Ref.value.openDialog(row, code, column.title.replace(/次/g, ""))
-               })
+                })
-        })
+            })
         }
 
     }
@@ -228,10 +215,10 @@ const setTime = () => {
         console.warn('获取时间失败，time 不是一个有效数组')
     }
 }
-const dialogFlag=ref(false)
+const dialogFlag = ref(false)
 // 谐波弹窗关闭时的回调
 const onHarmonicRatioClose = () => {
-     dialogFlag.value = false
+    dialogFlag.value = false
     // 重新打开指标越限详情弹窗
 
 }
@@ -256,6 +243,6 @@ watch(
     }
 )
 
-const addMenu = () => {}
+const addMenu = () => { }
 </script>
 <style lang="scss" scoped></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"  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/layouts/admin/components/popup/adminInfo.vue

@@ -1,51 +1,51 @@
-<template>
+<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 :inline="false" :model="form" label-width="auto" class="form-one">
-                <el-form-item label="用户名称:">
+                <el-form-item label="用户名称:">
-                    <el-input v-model.trim="form.name" :disabled="true"></el-input>
+                    <el-input v-model.trim="form.name" :disabled="true"></el-input>
-                </el-form-item>
+                </el-form-item>
-                <el-form-item label="登录名称:" class="top">
+                <el-form-item label="登录名称:" class="top">
-                    <el-input v-model.trim="form.loginName" :disabled="true"></el-input>
+                    <el-input v-model.trim="form.loginName" :disabled="true"></el-input>
-                </el-form-item>
+                </el-form-item>
-                <!-- <el-form-item label="归属部门名称:" class="top">
+                <!-- <el-form-item label="归属部门名称:" class="top">
-                    <el-input v-model.trim="form.deptName" :disabled="true"></el-input>
+                    <el-input v-model.trim="form.deptName" :disabled="true"></el-input>
-                </el-form-item> -->
+                </el-form-item> -->
-                <el-form-item label="拥有的角色:" class="top">
+                <el-form-item label="拥有的角色:" class="top">
-                    <el-input v-model.trim="form.role" :disabled="true"></el-input>
+                    <el-input v-model.trim="form.role" :disabled="true"></el-input>
-                </el-form-item>
+                </el-form-item>
-                <el-form-item label="电话号码:" class="top">
+                <el-form-item label="电话号码:" class="top">
-                    <el-input v-model.trim="form.phone" :disabled="true"></el-input>
+                    <el-input v-model.trim="form.phone" :disabled="true"></el-input>
-                </el-form-item>
+                </el-form-item>
-                <el-form-item label="电子邮箱:" class="top">
+                <el-form-item label="电子邮箱:" class="top">
-                    <el-input v-model.trim="form.email" :disabled="true"></el-input>
+                    <el-input v-model.trim="form.email" :disabled="true"></el-input>
-                </el-form-item>
+                </el-form-item>
-            </el-form>
+            </el-form>
-    </el-dialog>
+    </el-dialog>
-</template>
+</template>
-<script lang="ts" setup>
+<script lang="ts" setup>
-import { ref, inject } from 'vue'
+import { ref, inject } from 'vue'
-import { reactive } from 'vue'
+import { reactive } from 'vue'
-import { useAdminInfo } from '@/stores/adminInfo'
+import { useAdminInfo } from '@/stores/adminInfo'
-
+
-const dialogVisible = ref(false)
+const dialogVisible = ref(false)
-const title = ref('用户信息')
+const title = ref('用户信息')
-const adminInfo = useAdminInfo()
+const adminInfo = useAdminInfo()
-const formRef = ref()
+const formRef = ref()
-const form = reactive({
+const form = reactive({
-    name: '',
+    name: '',
-    deptName: '',
+    deptName: '',
-    phone: '',
+    phone: '',
-    email: '',
+    email: '',
-    role: '',
+    role: '',
-    loginName: ''
+    loginName: ''
-})
+})
-
+
-const open = () => {
+const open = () => {
-    dialogVisible.value = true
+    dialogVisible.value = true
-    for (const key in form) {
+    for (const key in form) {
-        form[key] = Array.isArray(adminInfo.$state[key]) ? adminInfo.$state[key].join(',') : adminInfo.$state[key]
+        form[key] = Array.isArray(adminInfo.$state[key]) ? adminInfo.$state[key].join(',') : adminInfo.$state[key]
-    }
+    }
-}
+}
-defineExpose({ open })
+defineExpose({ open })
-</script>
+</script>

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

@@ -36,14 +36,15 @@ export const adminBaseRoute = {
             }
         },
         {
-            // 在线补召
+            // 版本维护
-            path: '/versionMaintenance',
+            path: '/version',
-            name: 'versionMaintenance',
+            name: 'version',
-            component: () => import('@/views/govern/manage/programVersion/comp/versionMaintenance.vue'),
+            component: () => import('@/views/govern/manage/basic/version.vue'),
             meta: {
-                title: pageTitle('router.versionMaintenance')
+                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/echartMethod.ts

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

src/utils/request.ts

@@ -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'
                 )
             )

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/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,10 +141,11 @@ const tableStore = new TableStore({
         { title: '暂降(聚升)幅值(%)', minWidth: 100, field: 'evtParamVVaDepth', align: 'center', sortable: true },
 
         {
-            title: '操作', fixed: 'right',
+            title: '操作',
+            fixed: 'right',
             align: 'center',
             width: '180',
-       
+
             render: 'buttons',
             buttons: [
                 {
@@ -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

@@ -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/index.vue

@@ -141,7 +141,7 @@
                             v-show="
                                 dataSet.includes('_items') ||
                                 dataSet.indexOf('_history') != -1 ||
-                                dataSet.indexOf('_moduleData') != -1||
+                                dataSet.indexOf('_moduleData') != -1 ||
                                 dataSet.indexOf('_devRunTrend') != -1
                             "
                         >
@@ -166,7 +166,11 @@
                             </el-select> -->
                             <el-radio-group
                                 v-model.trim="formInline.dataLevel"
-                                v-if="!dataSet.includes('_devRunTrend') &&!dataSet.includes('_moduleData') && TrendList?.lineType == 1"
+                                v-if="
+                                    !dataSet.includes('_devRunTrend') &&
+                                    !dataSet.includes('_moduleData') &&
+                                    TrendList?.lineType == 1
+                                "
                                 :disabled="TrendList?.lineType != 1"
                                 @change="handleClick"
                             >
@@ -227,7 +231,7 @@
                         <el-button
                             type="primary"
                             :disabled="tableLoading"
-                            v-if="realTimeFlag"
+                            v-if="showButton"
                             :icon="DataLine"
                             @click="handleTrend"
                         >
@@ -235,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
@@ -580,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,
@@ -592,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'
 })
@@ -671,6 +685,7 @@ const volConTypeList = dictData.getBasicData('Dev_Connect')
 // }
 //谐波频谱
 const realTrendRef = ref()
+const txtContent = ref('')
 const operatingTrendRef = ref()
 const changeTrendType = (val: any) => {
     trendDataTime.value = ''
@@ -681,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
@@ -755,7 +770,7 @@ const handleHarmonicSpectrum = async () => {
         if (res.code == 'A0000') {
             ElMessage.success('设备应答成功')
             // mqttMessage.value = {}
-
+            showButton.value = true
             realDataTimer.value = window.setInterval(() => {
                 if (!dataSet.value.includes('_realtimedata')) return
 
@@ -784,6 +799,7 @@ const handleReturn = async () => {
     await getBasicRealData(lineId.value).then((res: any) => {
         if (res.code == 'A0000') {
             ElMessage.success('设备应答成功')
+            showButton.value = true
             // mqttMessage.value = {}
             realDataTimer.value = window.setInterval(() => {
                 if (!dataSet.value.includes('_realtimedata')) return
@@ -1000,7 +1016,7 @@ const getRealDataMqttMsg = async () => {
             if (res.code == 'A0000') {
                 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) => {
@@ -1129,6 +1145,7 @@ const getRealDataMqttMsg = async () => {
                     }
                     if (obj.hasOwnProperty('pA') && obj.hasOwnProperty('pB')) {
                         mqttMessage.value = obj
+                        txtContent.value = JSON.stringify(obj)
 
                         //更新实时数据主页面值
                         realTimeFlag.value &&
@@ -1178,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)
     }
@@ -1346,11 +1364,8 @@ const handleClick = async (tab?: any) => {
             await setTimeout(() => {
                 getRawData(obj)
                     .then((res: any) => {
-                     
                         tableLoading.value = false
                         setTimeout(() => {
-                           
-                            
                             operatingTrendRef.value?.setData(res.data)
                         }, 500)
                         setTimeout(() => {
@@ -1484,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/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/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,221 @@ 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
+    user.value = e
-  loading.value = true
+    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;
-      }
+            }
+        }
     }
-  }
 }
-</style>
+.border {
+    border: 1px solid var(--el-border-color);
+}
+</style>

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

@@ -28,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([])
@@ -35,6 +36,7 @@ const tableData = ref([])
 const treeRef = ref(null)
 const ignoreCheckChange = ref(false)
 const checkChange = (data: any) => {
+    console.log('🚀 ~ checkChange ~ data:', data)
     if (data.data.pName == '便携式设备') {
         if (ignoreCheckChange.value) {
             ignoreCheckChange.value = false // 清除标记，不影响后续正常触发
@@ -55,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 => {
@@ -68,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 + '相'
                     : '/'
             }
         },
@@ -114,7 +90,7 @@ const tableStore = new TableStore({
             title: '操作', fixed: 'right',
             align: 'center',
             width: '180',
-          
+
             render: 'buttons',
             buttons: [
                 {

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,24 +1,12 @@
 <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-select v-model.trim="form.type" filterable placeholder="请选择" @change="typeChange">
+
-                    <el-option v-for="item in TypeOptions" :key="item.id" :label="item.name"
-                        :value="item.id"></el-option>
-                </el-select> -->
                 <el-select v-model.trim="form.type" placeholder="请选择设备类型" @change="formDevTypeChange" clearable>
-                    <el-option
+                    <el-option v-for="item in devTypeOptions" :key="item.value" :label="item.label"
-                        v-for="item in devTypeOptions"
+                        :value="item.value"></el-option>
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                    ></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="设备型号:" prop="devType">
@@ -26,90 +14,42 @@
                     <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-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,
@@ -161,7 +101,7 @@ const rules = {
     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/version.vue

@@ -3,18 +3,16 @@
         <TableHeader ref="tableHeaderRef" :showReset="false" showExport>
             <template #select>
                 <el-form-item label="设备型号:">
-                    <el-select v-model.trim="tableStore.table.params.devType" filterable 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/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"
@@ -218,7 +218,9 @@ import {
     portableDeviceRegister,
     portableDeviceAccess,
     getExcelTemplate,
-    engineeringProject
+    engineeringProject,
+    onlineRegister,
+    resetFactory
 } from '@/api/cs-system-boot/device'
 import html2canvas from 'html2canvas'
 import { fullUrl } from '@/utils/common'
@@ -271,7 +273,7 @@ const queryTheDictionary = () => {
     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 {
                         value: item.id,
@@ -280,8 +282,6 @@ const queryTheDictionary = () => {
                     }
                 })
             })
-        })
-        .then(() => {
             queryByCode('Device_Type').then(async res => {
                 const id = res.data.id
                 await queryCsDictTree(id).then(res => {
@@ -315,6 +315,7 @@ const queryTheDictionary = () => {
                 await tableStore.index()
             })
         })
+
         .catch(error => {
             console.error('查询过程中出现错误:', error)
         })
@@ -611,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' &&
@@ -632,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
+                            })
                     }
                 },
                 {
@@ -647,6 +691,7 @@ const tableStore = new TableStore({
                     type: 'primary',
                     icon: 'el-icon-Grid',
                     render: 'basicButton',
+                    loading: 'loading1',
                     disabled: row => {
                         return (
                             (row.devType != '8b45cf6b7f5266e777d07c166ad5fa77' &&
@@ -662,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
-                            })
                     }
                 },
                 {
@@ -729,6 +770,28 @@ const tableStore = new TableStore({
                         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: '删除',
@@ -772,7 +835,7 @@ const tableStore = new TableStore({
 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 = ''

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/form.vue

@@ -1,157 +0,0 @@
-<template>
-    <el-dialog class="cn-operate-dialog" width="600px" 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>
-            </el-form-item>
-            <el-form-item label="协议版本" prop="name">
-                <el-input v-model.trim="form.name" placeholder="请输入协议版本"></el-input>
-            </el-form-item>
-            <el-form-item label="版本日期" prop="name">
-                <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-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="版本类型" prop="name">
-                <el-input v-model.trim="form.name" placeholder="请输入版本类型"></el-input>
-            </el-form-item>
-            <el-form-item label="描述" prop="name">
-                <el-input
-                    maxlength="32"
-                    :autosize="{ minRows: 2, maxRows: 4 }"
-                    type="textarea"
-                    show-word-limit
-                    v-model.trim="form.remark"
-                    placeholder="请输入描述"
-                ></el-input>
-            </el-form-item>
-            <el-form-item label="上传升级文件" prop="name">
-                <el-upload
-                    :limit="1"
-                    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>
-            <el-form-item label="CRC校验" prop="name">
-                <el-input v-model.trim="form.name" placeholder="请输入版本日期"></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">确认</el-button>
-            </span>
-        </template>
-    </el-dialog>
-</template>
-<script lang="ts" setup>
-import { ref, inject } from 'vue'
-import { reactive } from 'vue'
-import { ElMessage } from 'element-plus'
-import TableStore from '@/utils/tableStore'
-import { queryByCode, queryCsDictTree } from '@/api/system-boot/dictTree'
-import { saveUser, updateUser } from '@/api/cs-device-boot/sensitiveLoadMange'
-import { useDictData } from '@/stores/dictData'
-
-const TypeOptions = ref()
-
-const dictData = useDictData()
-const DataTypeSelect = dictData.getBasicData('Interference_Source')
-
-const tableStore = inject('tableStore') as TableStore
-const fileList: any = ref([])
-const formRef = ref()
-const form = reactive<any>({
-    loadType: [],
-    substationName: null,
-    installedCapacity: null,
-    name: null,
-    userAgreementCapacity: null,
-    id: null,
-    sort: 100
-})
-const rules = {
-    substationName: [{ required: true, message: '请输入所属厂站名称', trigger: 'blur' }],
-    name: [{ required: true, message: '请输入敏感用户名称', trigger: 'blur' }],
-    loadType: [{ required: true, message: '请输入请选择敏感负荷类型', trigger: 'blur' }],
-    installedCapacity: [{ required: true, message: '请输入用户协议容量', trigger: 'blur' }],
-    userAgreementCapacity: [{ required: true, message: '请输入装机容量', trigger: 'blur' }],
-    sort: [{ required: true, message: '请输入排序', trigger: 'blur' }]
-}
-
-const dialogVisible = ref(false)
-const title = ref('新增')
-const open = (text: string, data?: anyObj) => {
-    formRef.value?.resetFields()
-    title.value = text
-    dialogVisible.value = true
-    if (data) {
-        for (let key in form) {
-            form[key] = data[key]
-        }
-    } else {
-        for (let key in form) {
-            form[key] = null
-            form.sort = 100
-        }
-    }
-}
-const fileRemove = (e: any) => {
-    form.file = null
-    fileList.value = []
-}
-const fileChange = (e: any) => {
-    if (!beforeUpload(e.raw)) return
-    form.file = e.raw
-    fileList.value = [e.raw]
-}
-const fileExceed = (e: any) => {
-    ElMessage.error('只能上传一个文件')
-}
-// 处理上传前检查
-const beforeUpload = (file: any) => {
-    const isWord = file.name.endsWith('.bin')
-
-    if (!isWord) {
-        ElMessage.error('请上传(.bin)格式文件!')
-        fileList.value = []
-        return false
-    }
-
-    // 校验通过后允许上传，交由 http-request 处理
-    return true
-}
-
-const submit = () => {
-    formRef.value.validate(async (valid: boolean) => {
-        if (valid) {
-            if (form.id) {
-                await updateUser(form)
-            } else {
-                await saveUser(form)
-            }
-            ElMessage.success('操作成功')
-            tableStore.index()
-            dialogVisible.value = false
-        }
-    })
-}
-
-defineExpose({ open })
-</script>

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/comp/versionMaintenance.vue

@@ -1,171 +0,0 @@
-<template>
-    <div class="default-main">
-        <TableHeader ref="tableHeaderRef" :showReset="false" showExport>
-            <template #select>
-                <el-form-item label="关键字筛选">
-                    <el-input v-model="tableStore.table.params.keywords" clearable placeholder="请输入关键字" />
-                </el-form-item>
-
-                <el-form-item label="设备系列">
-                    <el-select
-                        v-model.trim="tableStore.table.params.devType"
-                        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>
-            </template>
-            <template #operation>
-                <el-button :icon="Plus" type="primary" @click="add">新增</el-button>
-                <el-button :icon="Back" @click="go(-1)">返回</el-button>
-            </template>
-        </TableHeader>
-        <Table ref="tableRef" />
-        <!-- 新增 -->
-        <Form ref="formRef" />
-    </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 { Plus, EditPen } from '@element-plus/icons-vue'
-import { useRouter } from 'vue-router'
-import { Back, Setting, Search } from '@element-plus/icons-vue'
-import Form from './form.vue'
-defineOptions({
-    name: 'govern/manage/programVersion'
-})
-const dictData = useDictData()
-const DevTypeOptions = ref()
-const tableHeaderRef = ref()
-const { push, go } = useRouter()
-const formRef = ref()
-const tableStore = new TableStore({
-    url: '/cs-device-boot/edData/queryEdDataPage',
-    method: 'POST',
-    column: [
-        {
-            field: 'index',
-            title: '序号',
-            width: '80',
-            formatter: (row: any) => {
-                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-            }
-        },
-        { title: '设备系列', field: 'devTypeName', minWidth: '100' },
-        { title: '版本号', field: 'versionNo', minWidth: '100' },
-        { title: '协议版本', field: 'versionAgreement', minWidth: '100' },
-        { title: '版本日期', field: 'versionDate', minWidth: '100' },
-        { title: '修改人员', field: 'versionDate', minWidth: '100' },
-        { title: '修改日期', field: 'versionDate', minWidth: '100' },
-
-        { title: '描述', field: 'versionDate', minWidth: '100' },
-        { title: '版本类型', field: 'versionDate', minWidth: '100' },
-
-        {
-            title: '状态',
-            render: 'switch',
-            width: 100,
-            field: 'usageStatus',
-            activeText: '启用',
-            inactiveText: '停用',
-            inactiveValue: '0',
-            activeValue: '1',
-            onChangeField: (row: any, value: any) => {
-                // console.log("🚀 ~ row:", row)
-                // ElMessageBox.prompt('二次校验密码确认', '', {
-                //     confirmButtonText: '确认',
-                //     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 => {
-                //         editEquipmentDelivery({
-                //             ...row,
-                //             status: row.status == 5 ? 1 : row.status == 6 ? 2 : row.status,
-                //             usageStatus: row.usageStatus == 1 ? 0 : 1
-                //         }).then(res => {
-                //             ElMessage.success(row.usageStatus == 1 ? '设备停用成功！' : '设备启用成功！')
-                //             tableStore.index()
-                //         })
-                //     })
-                // })
-            }
-        },
-
-        {
-            title: '操作',
-            fixed: 'right',
-            align: 'center',
-            width: '120',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'productSetting',
-                    title: '修改',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton'
-                },
-                {
-                    name: 'productSetting',
-                    title: '删除',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton'
-                }
-            ]
-        }
-    ],
-    loadCallback: () => {}
-})
-queryByCode('Device_Type').then(res => {
-    const id = res.data.id
-    queryByid(id).then(res1 => {
-        res1.data.map((item: any, index: any) => {
-            if (item.pid == id) {
-                res1.data.splice(index, 1)
-            }
-        })
-
-        DevTypeOptions.value = res1.data
-    })
-})
-
-tableStore.table.params.devType = ''
-provide('tableStore', tableStore)
-
-const add = () => {
-    formRef.value.open('新增版本')
-}
-onMounted(() => {
-    tableHeaderRef.value.onComSearch()
-})
-</script>

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

@@ -1,77 +1,47 @@
 <template>
     <div class="default-main">
-        <TableHeader ref="tableHeaderRef" :showReset="false" showExport>
+        <TableHeader ref="tableHeaderRef" showExport>
             <template #select>
                 <el-form-item label="关键字筛选">
-                    <el-input v-model="tableStore.table.params.keywords" clearable placeholder="请输入关键字" />
+                    <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="请输入设备名称"
+                        style="width:200px" />
                 </el-form-item>
                 <el-form-item label="通讯状态">
-                    <el-select
+                    <el-select v-model.trim="tableStore.table.params.connectStatus" filterable placeholder="请选择通讯状态"
-                        v-model.trim="tableStore.table.params.devType"
+                        clearable>
-                        filterable
+                        <el-option label="中断" :value="0"></el-option>
-                        placeholder="请选择通讯状态"
+                        <el-option label="正常" :value="1"></el-option>
-                        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="设备型号">
-                    <el-select
+                    <el-select v-model.trim="tableStore.table.params.devModel" filterable placeholder="请选择设备型号"
-                        v-model.trim="tableStore.table.params.devType"
+                        clearable>
-                        filterable
+                        <el-option v-for="item in DevTypeOptions" :key="item.id" :label="item.name"
-                        placeholder="请选择设备型号"
+                            :value="item.id"></el-option>
-                        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="设备系列">
+                <el-form-item label="icd模型">
-                    <el-select
+                    <el-select v-model.trim="tableStore.table.params.icd" filterable placeholder="请选择设备系列" clearable>
-                        v-model.trim="tableStore.table.params.devType"
+                        <el-option v-for="item in icdList" :key="item.id" :label="item.name"
-                        filterable
+                            :value="item.id"></el-option>
-                        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="升级设备筛选">
-                    <el-select
+                    <el-select v-model.trim="tableStore.table.params.upgrade" filterable placeholder="请选择升级设备筛选"
-                        v-model.trim="tableStore.table.params.devType"
+                        clearable>
-                        filterable
+                        <el-option label="可升级" :value="1"></el-option>
-                        placeholder="请选择升级设备筛选"
+                        <el-option label="不可升级" :value="0"></el-option>
-                        clearable
-                    >
-                        <el-option
-                            v-for="item in DevTypeOptions"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        ></el-option>
                     </el-select>
                 </el-form-item>
             </template>
             <template #operation>
-                <el-button :icon="EditPen" type="primary" class="ml10" @click="maintenance">终端版本维护</el-button>
+                <el-button :icon="Document" type="primary" class="ml10" @click="maintenance">版本维护</el-button>
-                <el-button :icon="Share" type="primary" class="ml10">批量升级</el-button>
+                <!-- <el-button :icon="Share" type="primary" class="ml10" @click="upgradeVersion">批量升级</el-button> -->
             </template>
         </TableHeader>
-        <Table ref="tableRef" />
+        <Table :checkbox-config="checkboxConfig" ref="tableRef" />
+        <upgrade ref="upgradeRef" />
+        <deviceLog ref="deviceLogRef" />
     </div>
 </template>
 <script setup lang="ts">
@@ -82,20 +52,25 @@ 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, EditPen } from '@element-plus/icons-vue'
+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 = new TableStore({
+const tableStore: any = new TableStore({
-    url: '/cs-device-boot/edData/queryEdDataPage',
+    url: '/cs-device-boot/EquipmentDelivery/version/page',
     method: 'POST',
     column: [
-        { type: 'checkbox', width: '60' },
+        // { type: 'checkbox', width: '60', },
         {
             field: 'index',
             title: '序号',
@@ -104,36 +79,35 @@ const tableStore = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        { title: '设备名称', field: 'devTypeName', minWidth: '100' },
+        { title: '设备名称', field: 'name', minWidth: '150' },
-        { title: '版本号', field: 'versionNo', minWidth: '100' },
+        { title: '版本号', field: 'version', minWidth: '100', formatter: (row: any) => { return row.cellValue || '/' } },
-        { title: '协议版本', field: 'versionAgreement', minWidth: '100' },
+        { title: '协议版本', field: 'protocolVersion', minWidth: '100', formatter: (row: any) => { return row.cellValue || '/' } },
-        { title: '版本日期', field: 'versionDate', minWidth: '100' },
+        { title: '版本日期', field: 'versionDate', minWidth: '150', formatter: (row: any) => { return row.cellValue || '/' } },
-        { title: '设备系列', field: 'versionDate', minWidth: '100' },
+        { title: '设备型号', field: 'devModelName', minWidth: '120', formatter: (row: any) => { return row.cellValue || '/' } },
-        { title: '设备型号', field: 'versionDate', minWidth: '100' },
+        { title: 'icd模型', field: 'icd', minWidth: '120', formatter: (row: any) => { return icdList.value.filter(item => item.id == row.cellValue)[0]?.name || '/' } },
-        { title: '供电公司', field: 'versionDate', minWidth: '100' },
+        { title: '所属工程', field: 'associatedEngineering', minWidth: '120', formatter: (row: any) => { return row.cellValue || '/' } },
-        { title: '变电站', field: 'versionDate', minWidth: '100' },
+        { title: '所属项目', field: 'associatedProject', minWidth: '120', formatter: (row: any) => { return row.cellValue || '/' } },
         {
             title: '状态',
-            field: 'status',
+            field: 'runStatus',
             render: 'tag',
             minWidth: '80',
             custom: {
-                0: 'error',
+                1: 'danger',
-                1: 'success'
+                2: 'success'
             },
             replaceValue: {
-                0: '禁用',
+                1: '离线',
-                1: '启用'
+                2: '在线'
             }
         },
-        { title: '更新时间', field: 'versionDate', minWidth: '100' },
+        { title: '更新时间', field: 'updateTime', minWidth: '150', formatter: (row: any) => { return row.cellValue || '/' }, sortable: true },
-        { title: '修改人员', field: 'versionDate', minWidth: '100' },
+        { title: '修改人员', field: 'updateByName', minWidth: '100', formatter: (row: any) => { return row.cellValue || '/' } },
-
         {
             title: '操作',
             fixed: 'right',
             align: 'center',
-            width: '120',
+            width: '130',
             render: 'buttons',
             buttons: [
                 {
@@ -141,43 +115,103 @@ const tableStore = new TableStore({
                     title: '升级',
                     type: 'primary',
                     icon: 'el-icon-EditPen',
-                    render: 'basicButton'
+                    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: '升级日志',
+                    title: '日志',
                     type: 'primary',
                     icon: 'el-icon-EditPen',
-                    render: 'basicButton'
+                    render: 'basicButton',
+                    click: (row: any) => {
+                        deviceLogRef.value.open(row)
+                    }
                 }
             ]
         }
     ],
-    loadCallback: () => {}
+    loadCallback: () => { }
 })
-queryByCode('Device_Type').then(res => {
+const checkboxConfig = reactive({
-    const id = res.data.id
+    checkMethod: ({ row }) => {
-    queryByid(id).then(res1 => {
+        return row.upgrade == 1
-        res1.data.map((item: any, index: any) => {
+    }
-            if (item.pid == id) {
+})
-                res1.data.splice(index, 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 = res1.data
+            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: '/govern/manage/basic/version'
+        path: '/version'
     })
 }
 
-tableStore.table.params.devType = ''
+tableStore.table.params.searchValue = ''
+tableStore.table.params.connectStatus = ''
+tableStore.table.params.devModel = ''
+tableStore.table.params.icd = ''
+tableStore.table.params.upgrade = ''
 provide('tableStore', tableStore)
 onMounted(() => {
-    tableHeaderRef.value.onComSearch()
+    getQuery()
+    tableStore.index()
 })
 </script>

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/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>

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
             }

src/views/setting/dictionary/list/popupDetailEdit.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="名称:" class="top" prop="name">

src/views/setting/dictionary/tree/index.vue

@@ -26,6 +26,7 @@ const tableStore = new TableStore({
     showPage:false,
     url: '/system-boot/dictTree/queryTree',
     method: 'GET',
+    publicHeight: 60,
     column: [
         { title: '字典名称', field: 'name', treeNode: true, align: 'left' },
         // { title: '排序', field: 'sort',width:'80'  },

src/views/setting/dictionary/tree/popupForm.vue

@@ -1,7 +1,7 @@
 <template>
     <el-dialog class="cn-operate-dialog" width="500px" v-model.trim="dialogVisible" :title="title">
         <el-scrollbar>
-            <el-form :inline="false" :model="form" ref="formRef" label-width="120px" :rules="rules">
+            <el-form :inline="false" :model="form" ref="formRef" label-width="auto" :rules="rules">
                 <el-form-item label="字典名称:" prop="name">
                     <el-input
                         maxlength="32"

src/views/setting/dictionary/version/index.vue

@@ -1,123 +1,164 @@
-<template>
+<template>
-    <div class="default-main">
+    <div class="default-main">
-        <TableHeader :showReset="false">
+        <TableHeader :showReset="false">
-            <template #select>
+            <template #select>
-
+                <el-radio-group v-model.trim="tableStore.table.params.versionType" @change="tableStore.index()">
-
+                    <el-radio-button label="web" value="WEB" />
-                <el-radio-group v-model.trim="tableStore.table.params.versionType" @change="tableStore.index()">
+                    <el-radio-button label="app" value="APP" />
-                    <el-radio-button label="web" value="WEB" />
+                </el-radio-group>
-                    <el-radio-button label="app" value="APP" />
+            </template>
-
+            <template #operation>
-                </el-radio-group>
+                <el-button type="primary" icon="el-icon-Plus" @click="addMenu">新增版本</el-button>
-            </template>
+            </template>
-            <template #operation>
+        </TableHeader>
-                <el-button type="primary" icon="el-icon-Plus" @click="addMenu">新增版本</el-button>
+        <Table ref="tableRef">
-            </template>
+            <template v-slot:columns>
-        </TableHeader>
+                <vxe-column
-        <Table ref="tableRef" />
+                    field="androidPath"
-        <el-dialog width="600px" v-model.trim="dialogVisible" title="新增版本">
+                    title="Android路径"
-            <el-form :inline="false" :model="form" label-width="auto" class="form-one">
+                    width="250px"
-                <el-form-item label="版本号">
+                    v-if="tableStore.table.params.versionType == 'APP'"
-                    <el-input maxlength="32" show-word-limit v-model.trim="form.appVersion" placeholder="请输入版本号" />
+                ></vxe-column>
-                </el-form-item>
+                <vxe-column
-                <el-form-item label="整改内容">
+                    field="iosPath"
-                    <el-input maxlength="300" type="textarea" show-word-limit v-model.trim="form.content"
+                    title="IOS路径"
-                        placeholder="请输入整改内容" />
+                    width="250px"
-                </el-form-item>
+                    v-if="tableStore.table.params.versionType == 'APP'"
-                <el-form-item label="发布类型">
+                ></vxe-column>
-
+            </template>
-                    <el-select v-model.trim="form.sev" placeholder="请选择发布类型">
+        </Table>
-                        <el-option label="优化" :value="0" />
+        <el-dialog width="500px" v-model.trim="dialogVisible" title="新增版本">
-                        <el-option label="bug调整" :value="1" />
+            <el-form :inline="false" :model="form" ref="formRef" label-width="auto" class="form-one" :rules="rules">
-                    </el-select>
+                <el-form-item label="版本号:" prop="appVersion">
-                </el-form-item>
+                    <el-input
-                <el-form-item label="版本类型">
+                        maxlength="32"
-
+                        show-word-limit
-                    <el-select v-model.trim="form.versionType" placeholder="请选择版本类型">
+                        v-model.trim="form.appVersion"
-                        <el-option label="web" value="WEB" />
+                        placeholder="请输入版本号"
-                        <el-option label="app" value="APP" />
+                    />
-                    </el-select>
+                </el-form-item>
-                </el-form-item>
+                <el-form-item label="整改内容:">
-            </el-form>
+                    <el-input
-
+                        maxlength="300"
-            <template #footer>
+                        type="textarea"
-                <span class="dialog-footer">
+                        show-word-limit
-                    <el-button @click="dialogVisible = false">取消</el-button>
+                        v-model.trim="form.content"
-                    <el-button type="primary" @click="submit">确认</el-button>
+                        placeholder="请输入整改内容"
-                </span>
+                    />
-            </template>
+                </el-form-item>
-        </el-dialog>
+                <el-form-item label="发布类型:">
-    </div>
+                    <el-select v-model.trim="form.sev" placeholder="请选择发布类型">
-</template>
+                        <el-option label="优化" :value="0" />
-<script setup lang="ts">
+                        <el-option label="bug调整" :value="1" />
-import { ref, onMounted, provide } from 'vue'
+                    </el-select>
-import TableStore from '@/utils/tableStore'
+                </el-form-item>
-import Table from '@/components/table/index.vue'
+                <el-form-item label="版本类型:">
-import TableHeader from '@/components/table/header/index.vue'
+                    <el-select v-model.trim="form.versionType" placeholder="请选择版本类型">
-import { useDictData } from '@/stores/dictData'
+                        <el-option label="web" value="WEB" />
-import { ElMessage } from 'element-plus'
+                        <el-option label="app" value="APP" />
-import { addVersion } from '@/api/systerm'
+                    </el-select>
-import router from '@/router/index'
+                </el-form-item>
-const dialogVisible = ref(false)
+                <el-form-item label="Android路径:" prop="androidPath" v-if="form.versionType == 'APP'">
-const form = ref({
+                    <el-input v-model.trim="form.androidPath" placeholder="请输入Android路径" />
-    appVersion: '',
+                </el-form-item>
-    content: '',
+                <el-form-item label="IOS路径:" prop="iosPath" v-if="form.versionType == 'APP'">
-    versionType: '',
+                    <el-input v-model.trim="form.iosPath" placeholder="请输入IOS路径" />
-    sev: '',
+                </el-form-item>
-})
+            </el-form>
-const tableStore = new TableStore({
+
-    url: '/cs-system-boot/appVersion/getAllData',
+            <template #footer>
-    method: 'POST',
+                <span class="dialog-footer">
-    showPage: false,
+                    <el-button @click="dialogVisible = false">取消</el-button>
-    paramsPOST: true,
+                    <el-button type="primary" @click="submit">确认</el-button>
-    column: [
+                </span>
-        {
+            </template>
-            title: '序号', width: 80, formatter: (row: any) => {
+        </el-dialog>
-                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+    </div>
-            }
+</template>
-        },
+<script setup lang="ts">
-        { title: '版本号', field: 'versionName', width: '150' },
+import { ref, onMounted, provide } from 'vue'
-
+import TableStore from '@/utils/tableStore'
-        { title: '创建时间', field: 'createTime', width: '220', sortable: true },
+import Table from '@/components/table/index.vue'
-        {
+import TableHeader from '@/components/table/header/index.vue'
-            title: '发布类型', field: 'sev', formatter: (row,) => {
+import { useDictData } from '@/stores/dictData'
-                return row.cellValue == 0 ? '优化' : 'bug调整'
+import { ElMessage } from 'element-plus'
-            },
+import { addVersion } from '@/api/systerm'
-            width: '150'
+import router from '@/router/index'
-        },
+const dialogVisible = ref(false)
-        { title: '整改内容', field: 'content' },
+const form = ref({
-
+    appVersion: '',
-
+    content: '',
-
+    versionType: '',
-
+    sev: '',
-    ],
+    androidPath: '',
-})
+    iosPath: ''
-tableStore.table.params.versionType = 'WEB'
+})
-provide('tableStore', tableStore)
+const rules = {
-
+    appVersion: [{ required: true, message: '请输入版本号', trigger: 'blur' }],
-onMounted(async () => {
+    androidPath: [{ required: true, message: '请输入Android路径', trigger: 'blur' }],
-    tableStore.index()
+    iosPath: [{ required: true, message: '请输入IOS路径', trigger: 'blur' }]
-    // await queryByCode('Direct_Connected_Device').then((res) => {
+}
-    //     queryByid(res.data.id).then((res) => {
+const formRef = ref()
-    //         DevTypeOptions.value = res.data
+const tableStore = new TableStore({
-    //     })
+    url: '/cs-system-boot/appVersion/getAllData',
-    // })
+    method: 'POST',
-    // tableStore.table.params.devType = ''
+    showPage: false,
-})
+    paramsPOST: true,
-const submit = () => {
+    column: [
-    addVersion(form.value).then(res => {
+        {
-        ElMessage.success('新增成功')
+            title: '序号',
-        tableStore.index()
+            width: 80,
-        dialogVisible.value = false
+            formatter: (row: any) => {
-        router.go(0)
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-    })
+            }
-}
+        },
-const addMenu = () => {
+        { title: '版本号', field: 'versionName', width: '150' },
-    dialogVisible.value = true
+        { title: '创建时间', field: 'createTime', width: '220', sortable: true },
-    form.value.appVersion = tableStore.table.data[0].versionName || ''
+        {
-    form.value.content = ''
+            title: '发布类型',
-    form.value.sev = tableStore.table.data[0].sev || 0
+            field: 'sev',
-    form.value.versionType = tableStore.table.data[0].versionType || 'WEB'
+            formatter: row => {
-}
+                return row.cellValue == 0 ? '优化' : 'bug调整'
-
+            },
-</script>
+            width: '150'
+        },
+        { title: '整改内容', field: 'content' }
+    ],
+    beforeSearchFun: () => {
+        // console.log("🚀 ~ tableStore.table.params:", tableStore.table)
+        // if (tableStore.table.params.versionType == 'APP') {
+        // }
+    }
+})
+tableStore.table.params.versionType = 'WEB'
+provide('tableStore', tableStore)
+
+onMounted(async () => {
+    tableStore.index()
+    // await queryByCode('Direct_Connected_Device').then((res) => {
+    //     queryByid(res.data.id).then((res) => {
+    //         DevTypeOptions.value = res.data
+    //     })
+    // })
+    // tableStore.table.params.devType = ''
+})
+const submit = async () => {
+    await formRef.value.validate()
+    console.log(123)
+    addVersion(form.value).then(res => {
+        ElMessage.success('新增成功')
+        tableStore.index()
+        dialogVisible.value = false
+        router.go(0)
+    })
+}
+const addMenu = async () => {
+    dialogVisible.value = true
+    form.value.appVersion = tableStore.table.data[0].versionName || ''
+    form.value.content = ''
+    form.value.iosPath = ''
+    form.value.androidPath = ''
+    form.value.sev = tableStore.table.data[0].sev || 0
+    form.value.versionType = tableStore.table.data[0].versionType || 'WEB'
+}
+</script>

src/views/system/scheduledTasks/form.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog draggable width="600px" v-model="dialogVisible" :title="title">
+    <el-dialog draggable width="500px" v-model="dialogVisible" :title="title">
 
         <el-form :inline="false" :model="form" label-width="auto" class="form-one" :rules="rules" ref="formRef">
             <el-form-item label="任务名称" prop="timerName">

src/views/system/subject/form/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog draggable v-model.trim="dialogVisible" :title="title" :before-close="Cancel">
+    <el-dialog draggable v-model.trim="dialogVisible" :title="title" width="800px" :before-close="Cancel">
         <el-form :inline="false" :model="configStore" ref="formRef" label-width="auto" :rules="rules">
             <el-divider border-style="dashed">全局</el-divider>
             <div class="layout-config-global form-two">

vite.config.ts

@@ -27,7 +27,7 @@ export default defineConfig({
                 // target: 'http://192.168.1.122:10215', //gfh
                 // target: 'http://192.168.1.127:10215', //cdf
                 // target: 'http://192.168.1.125:10215',
-                target: 'http://192.168.1.103:10215',
+                target: 'http://192.168.2.124:10215',
                 // target: 'https://pqmcn.com:8092/api', //治理
                 // target:'http://www.zhilitest.com:8089/api',
                 changeOrigin: true,