From e9d7231a755edb58a211369184f860fb71e3f81c Mon Sep 17 00:00:00 2001
From: guanj <guan0550>
Date: Mon, 12 Jan 2026 11:06:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/cs-system-boot/manage.ts              |   48 +-
 src/components/tree/select.vue                |    7 +-
 src/views/auth/role/popupForm.vue             |    2 +-
 src/views/govern/cloudDeviceEntry/index.vue   |   20 +-
 .../device/planData/components/popup.vue      | 1090 ++++++++---------
 src/views/govern/manage/basic/dictionary.vue  |   19 +-
 .../govern/manage/basic/popupDictionary.vue   |   24 +-
 .../govern/manage/basic/popupVersion.vue      |   18 +-
 src/views/govern/manage/basic/version.vue     |   33 +-
 .../govern/monitorRecall/steadyRecall.vue     |   37 +-
 src/views/govern/mxgraph/graphList/index.vue  |   12 +-
 .../homePage/components/routingConfig.vue     |    3 +-
 src/views/pqs/cockpit/homePage/index.vue      |    3 +-
 .../pqs/cockpit/setUp/components/popup.vue    |    4 +-
 src/views/system/scheduledTasks/form.vue      |   11 +-
 src/views/system/scheduledTasks/index.vue     |  414 +++----
 16 files changed, 923 insertions(+), 822 deletions(-)

diff --git a/src/api/cs-system-boot/manage.ts b/src/api/cs-system-boot/manage.ts
index ddf7008..6a9017e 100644
--- a/src/api/cs-system-boot/manage.ts
+++ b/src/api/cs-system-boot/manage.ts
@@ -1,20 +1,30 @@
-import createAxios from '@/utils/request'
-
-// 更新问题状态
-export function auditFeedBack(data: any) {
-    return createAxios({
-        url: '/cs-system-boot/feedback/auditFeedBack',
-        method: 'post',
-        params: data
-    })
-}
-
-//下载文件
-export function downLoadFile(filePath: any) {
-    return createAxios({
-        url: '/system-boot/file/download',
-        method: 'get',
-        responseType: 'blob',
-        params: { filePath: filePath }
-    })
+import createAxios from '@/utils/request'
+
+// 更新问题状态
+export function auditFeedBack(data: any) {
+    return createAxios({
+        url: '/cs-system-boot/feedback/auditFeedBack',
+        method: 'post',
+        params: data
+    })
+}
+
+//下载文件
+export function downLoadFile(filePath: any) {
+    return createAxios({
+        url: '/system-boot/file/download',
+        method: 'get',
+        responseType: 'blob',
+        params: { filePath: filePath }
+    })
+}
+
+//获取文件的一个短期url
+export function getFileUrl(filePath: any) {
+    return createAxios({
+        url: '/system-boot/file/getFileUrl',
+        method: 'get',
+        // responseType: 'blob',
+        params: { filePath: filePath }
+    })
 }
\ No newline at end of file
diff --git a/src/components/tree/select.vue b/src/components/tree/select.vue
index 8ef41b2..83ad5ed 100644
--- a/src/components/tree/select.vue
+++ b/src/components/tree/select.vue
@@ -218,11 +218,12 @@ const updateNodeCheckStatus = (currentCount: number) => {
     const allNodes = treeRef.value.store._getAllNodes()
     allNodes.forEach((node: any) => {
         if (node.level === 3) { // 监测点层级
+            
             // 如果已达到最大数量且该节点未被选中，则禁用勾选
-            if (isMaxSelected && !node.checked) {
-                node.disabled = true
+            if (isMaxSelected && !node.data.checked) {
+                node.data.disabled = true
             } else {
-                node.disabled = false
+                node.data.disabled = false
             }
         }
     })
diff --git a/src/views/auth/role/popupForm.vue b/src/views/auth/role/popupForm.vue
index 46462f1..7a2b1c4 100644
--- a/src/views/auth/role/popupForm.vue
+++ b/src/views/auth/role/popupForm.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-dialog class="cn-operate-dialog" width="700px" v-model.trim="dialogVisible" :title="title">
+    <el-dialog class="cn-operate-dialog" width="500px" v-model.trim="dialogVisible" :title="title">
         <el-form :inline="false" ref="formRef" :model="form" label-width="auto" class="form-one" :rules="rules">
             <el-form-item label="角色名称" prop="name">
                 <el-input maxlength="32" show-word-limit v-model.trim="form.name" placeholder="请输入菜单名称" />
diff --git a/src/views/govern/cloudDeviceEntry/index.vue b/src/views/govern/cloudDeviceEntry/index.vue
index 29c9f0f..4674888 100644
--- a/src/views/govern/cloudDeviceEntry/index.vue
+++ b/src/views/govern/cloudDeviceEntry/index.vue
@@ -646,7 +646,8 @@
                                                         :controls="false"
                                                         :min="1"
                                                         style="width: 48%"
-                                                        v-model="lineItem.ptRatio"
+                                                      oninput="value=value.replace(/[^\d]/g,'')"
+                                                        v-model.number="lineItem.ptRatio"
                                                         :disabled="
                                                             !(
                                                                 (nodeLevel == 4 && pageStatus == 3) ||
@@ -670,7 +671,8 @@
                                                         :controls="false"
                                                         :min="1"
                                                         style="width: 48%"
-                                                        v-model="lineItem.pt2Ratio"
+                                                      oninput="value=value.replace(/[^\d]/g,'')"
+                                                        v-model.number="lineItem.pt2Ratio"
                                                         :disabled="
                                                             !(
                                                                 (nodeLevel == 4 && pageStatus == 3) ||
@@ -694,7 +696,8 @@
                                                         :controls="false"
                                                         :min="1"
                                                         style="width: 48%"
-                                                        v-model="lineItem.ctRatio"
+                                                      oninput="value=value.replace(/[^\d]/g,'')"
+                                                        v-model.number="lineItem.ctRatio"
                                                         :disabled="
                                                             !(
                                                                 (nodeLevel == 4 && pageStatus == 3) ||
@@ -718,7 +721,8 @@
                                                         :controls="false"
                                                         :min="1"
                                                         style="width: 48%"
-                                                        v-model="lineItem.ct2Ratio"
+                                                      oninput="value=value.replace(/[^\d]/g,'')"
+                                                        v-model.number="lineItem.ct2Ratio"
                                                         :disabled="
                                                             !(
                                                                 (nodeLevel == 4 && pageStatus == 3) ||
@@ -1037,8 +1041,8 @@
                     <Loading />
                 </el-icon>
                 <p style="margin-top: 15px; font-size: 16px">正在推送台账信息，请稍候...</p>
-                <p style="margin-top: 10px; color: #999">预计需要30秒左右</p>
-                <p style="margin-top: 10px; color: #999">已等待: {{ countdown }}秒</p>
+                <!-- <p style="margin-top: 10px; color: #999">预计需要30秒左右</p>
+                <p style="margin-top: 10px; color: #999">已等待: {{ countdown }}秒</p> -->
             </div>
         </el-dialog>
     </div>
@@ -1360,7 +1364,7 @@ const onAdd = async () => {
     if (timer.value) clearInterval(timer.value)
     timer.value = window.setInterval(() => {
         countdown.value++
-        if (countdown.value >= 30) {
+        if (countdown.value >= 5) {
             clearInterval(timer.value!)
             timer.value = null
         }
@@ -1388,7 +1392,7 @@ const onAdd = async () => {
         // 如果data不是"暂无需要推送的数据"，则继续执行
         if (pushLogResponse.data === '成功') {
             // 等待30秒
-            await new Promise(resolve => setTimeout(resolve, 30000))
+            await new Promise(resolve => setTimeout(resolve, 5000))
 
             // 30秒后调用查询推送结果接口
             const result = await queryPushResult()
diff --git a/src/views/govern/device/planData/components/popup.vue b/src/views/govern/device/planData/components/popup.vue
index 040cecc..a38aa44 100644
--- a/src/views/govern/device/planData/components/popup.vue
+++ b/src/views/govern/device/planData/components/popup.vue
@@ -1,545 +1,545 @@
-<template>
-    <el-dialog v-model.trim="dialogVisible" :title="title" draggable
-        :style="{ width: popupType == 0 || popupType == 1 ? '500px' : '1100px' }">
-        <!-- 新增方案数据 -->
-        <el-form :model="form" scroll-to-error label-width="140px" :rules="rules1" ref="ruleFormRef1" class="form-one"
-            v-if="popupType == 0 || popupType == 1">
-            <el-form-item label="方案名称：" prop="itemName">
-                <el-input maxlength="32" show-word-limit v-model.trim="form.itemName" placeholder="请输入方案名称" />
-            </el-form-item>
-            <el-form-item label="方案描述：" prop="describe">
-                <el-input maxlength="300" show-word-limit type="textarea" v-model.trim="form.describe"
-                    placeholder="请输入方案描述" />
-            </el-form-item>
-        </el-form>
-        <!-- 测试项信息&数据绑定页面 -->
-        <el-tabs type="border-card" v-model.trim="activeName" v-if="popupType != 0 && popupType != 1">
-            <el-tab-pane label="测试项信息" :name="0" v-if="openType == 'tree'">
-                <el-form :model="form1" ref="ruleFormRef2" scroll-to-error class="form-two" label-width="140px"
-                    :rules="rules2">
-                    <el-form-item label="测试项名称：" prop="itemName">
-                        <el-input maxlength="32" show-word-limit v-model.trim="form1.itemName" placeholder="请输入测试项名称" />
-                    </el-form-item>
-                    <el-form-item label="测量间隔：" prop="statisticalInterval">
-                        <el-select v-model.trim="form1.statisticalInterval" placeholder="请选择测量间隔" clearable
-                            style="width: 100%">
-                            <el-option v-for="(item, index) in statisticalIntervalList" :key="index" :label="item.name"
-                                :value="item.id"></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="电压等级：" prop="voltageLevel">
-                        <el-select v-model.trim="form1.voltageLevel" placeholder="请选择电压等级" clearable style="width: 100%"
-                            @change="changeVoltageLevel">
-                            <el-option v-for="(item, index) in voltageLevelList" :key="index" :label="item.name"
-                                :value="item.id"></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="接线方式：" prop="volConType">
-                        <el-select v-model.trim="form1.volConType" placeholder="请选择接线方式" clearable style="width: 100%">
-                            <el-option v-for="(item, index) in volConTypeList" :key="index" :label="item.name"
-                                :value="item.id"></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="最小短路容量：" prop="capacitySscmin">
-                        <el-input maxlength="32" show-word-limit v-model.trim="form1.capacitySscmin" oninput="value=value.replace(/[^\-?\d.]/g,'')
-.replace(/^\./g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')
-.replace('-','$#$').replace(/\-/g,'').replace('$#$','-')" autocomplete="off" placeholder="请选择最小短路容量">
-                            <template #append>MVA</template>
-                        </el-input>
-                    </el-form-item>
-
-                    <el-form-item label="用户协议容量：" prop="capacitySi">
-                        <el-input maxlength="32" show-word-limit v-model.trim="form1.capacitySi" autocomplete="off"
-                            oninput="value=value.replace(/[^\-?\d.]/g,'')
-.replace(/^\./g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')
-.replace('-','$#$').replace(/\-/g,'').replace('$#$','-')" placeholder="请输入用户协议容量">
-                            <template #append>MVA</template>
-                        </el-input>
-                    </el-form-item>
-
-                    <el-form-item label="基准短路容量：" prop="capacitySscb">
-                        <el-input maxlength="32" show-word-limit v-model.trim="form1.capacitySscb" oninput="value=value.replace(/[^\-?\d.]/g,'')
-.replace(/^\./g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')
-.replace('-','$#$').replace(/\-/g,'').replace('$#$','-')" placeholder="请输入基准短路容量">
-                            <template #append>MVA</template>
-                        </el-input>
-                    </el-form-item>
-
-                    <el-form-item label="供电设备容量：" prop="capacitySt">
-                        <el-input maxlength="32" show-word-limit v-model.trim="form1.capacitySt" oninput="value=value.replace(/[^\-?\d.]/g,'')
-.replace(/^\./g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')
-.replace('-','$#$').replace(/\-/g,'').replace('$#$','-')" placeholder="请输入供电设备容量">
-                            <template #append>MVA</template>
-                        </el-input>
-                    </el-form-item>
-                    <el-form-item label="PT变比：" prop="pt">
-                        <el-input maxlength="32" show-word-limit style="width: 48%" v-model.trim="form1.pt"
-                            autocomplete="off" placeholder="请输入PT变比" oninput="value=value.replace(/[^0-9.]/g,'')" />
-                        <el-input maxlength="32" show-word-limit style="width: 48%" v-model.trim="form1.pt1"
-                            autocomplete="off" placeholder="请输入PT变比" oninput="value=value.replace(/[^0-9.]/g,'')" />
-                    </el-form-item>
-                    <el-form-item label="CT变比：" prop="ct">
-                        <el-input maxlength="32" show-word-limit v-model.trim="form1.ct" style="width: 48%"
-                            autocomplete="off" oninput="value=value.replace(/[^0-9.]/g,'')" placeholder="请输入CT变比" />
-                        <el-input maxlength="32" show-word-limit v-model.trim="form1.ct1" style="width: 48%"
-                            autocomplete="off" oninput="value=value.replace(/[^0-9.]/g,'')" placeholder="请输入CT变比" />
-                    </el-form-item>
-                    <el-form-item label="监测位置：" prop="location" style="width: 100%">
-                        <el-input maxlength="300" show-word-limit type="textarea" v-model.trim="form1.location"
-                            placeholder="请输入监测位置" />
-                    </el-form-item>
-                </el-form>
-            </el-tab-pane>
-            <el-tab-pane label="数据绑定" :name="1" v-if="openType == 'table'">
-                <TreeTransfers :fromData="unBindList" :toData="bindList" @getData="getData" />
-            </el-tab-pane>
-        </el-tabs>
-        <template #footer="">
-            <el-button @click="close">取 消</el-button>
-            <el-button type="primary" @click="submit">确 定</el-button>
-        </template>
-    </el-dialog>
-</template>
-<script lang="ts" setup>
-import { ref, defineEmits } from 'vue'
-import { ElMessage } from 'element-plus'
-import { addPlan, addRecord, updateRecord, getDeviceList } from '@/api/cs-device-boot/planData'
-import { useDictData } from '@/stores/dictData'
-import TreeTransfers from './treeTransfers.vue'
-const dictData = useDictData()
-const dialogVisible = ref(false)
-const voltageLevelList: any = dictData.getBasicData('Dev_Voltage_Stand')
-const volConTypeList = dictData.getBasicData('Dev_Connect')
-const emit = defineEmits(['onSubmit'])
-//表单数据
-const form = ref({})
-//测试项数据
-const form1: any = ref({})
-//折叠面板初始值
-const activeTab = ref(0)
-//tab初始值
-const activeName = ref(0)
-//测量间隔数据
-const statisticalIntervalList = [
-    {
-        id: 1,
-        name: '1分钟'
-    },
-    {
-        id: 3,
-        name: '3分钟'
-    },
-    {
-        id: 5,
-        name: '5分钟'
-    },
-    {
-        id: 10,
-        name: '10分钟'
-    }
-]
-//初始化form
-const initForm = () => {
-    //方案数据
-    form.value = {
-        itemName: '', //方案名称
-        describe: '' //方案描述
-    }
-    //测试项数据
-    form1.value = {
-        itemName: '', //测试项名称
-        statisticalInterval: statisticalIntervalList[1].id, //测量间隔
-        voltageLevel: voltageLevelList[0].id, //电压等级
-        volConType: volConTypeList[0].id, //接线方式
-        capacitySscmin: 10, //最小短路容量
-        capacitySi: 10, //用户协议容量
-        capacitySscb: 10, //基准短路容量
-        capacitySt: 10, //供电设备容量
-        pt: 1, //pt变比1
-        pt1: 1, //pt变比2
-        ct: 300, //ct变比1
-        ct1: 5, //ct变比2
-        location: '' //监测位置
-    }
-    changeVoltageLevel()
-}
-const codeValue = (val: any) => {
-    return (
-        voltageLevelList.find((item: any) => {
-            return item.code == val
-        })?.value * 1
-    )
-}
-//改变电压等级计算基准短路容量
-const changeVoltageLevel = async () => {
-    let value: any =
-        voltageLevelList.find((item: any) => {
-            return item.id == form1.value.voltageLevel
-        })?.value * 1
-    if (value < codeValue('6kV')) {
-        form1.value.capacitySscb = 10
-    } else if (value < codeValue('20kV')) {
-        form1.value.capacitySscb = 100
-    } else if (value < codeValue('35kV')) {
-        form1.value.capacitySscb = 200
-    } else if (value < codeValue('66kV')) {
-        form1.value.capacitySscb = 250
-    } else if (value < codeValue('110kV')) {
-        form1.value.capacitySscb = 500
-    } else if (value < codeValue('220kV')) {
-        form1.value.capacitySscb = 750
-    } else if (value < codeValue('330kV')) {
-        form1.value.capacitySscb = 2000
-    } else if (value < codeValue('500kV')) {
-        form1.value.capacitySscb = 3000
-    } else if (value < codeValue('750kV')) {
-        form1.value.capacitySscb = 4500
-    } else if (value < codeValue('1000kV')) {
-        form1.value.capacitySscb = 7000
-    } else {
-        form1.value.capacitySscb = 9000
-    }
-
-    //PT变比 电压<0.48kv 1:1 电压>0.48 *1000/100
-    if (Number(value) <= 0.48) {
-        form1.value.pt = 1
-        form1.value.pt1 = 1
-    }
-    if (Number(value) > 0.48) {
-        form1.value.pt = value * 10
-        form1.value.pt1 = 1
-    }
-}
-
-initForm()
-//方案校验规则
-const rules1 = ref({
-    //方案名称
-    itemName: [
-        {
-            required: true,
-            message: '请输入方案名称',
-            trigger: 'blur'
-        }
-    ],
-    //方案名称
-    describe: [
-        {
-            required: true,
-            message: '请输入方案描述',
-            trigger: 'blur'
-        }
-    ]
-})
-//测试项校验规则
-const rules2 = ref({
-    //测试项名称
-    itemName: [
-        {
-            required: true,
-            message: '请输入测试项名称',
-            trigger: 'blur'
-        }
-    ],
-    describe: [
-        {
-            required: true,
-            message: '请选择测量间隔',
-            trigger: 'change'
-        }
-    ],
-    voltageLevel: [
-        {
-            required: true,
-            message: '请选择电压等级',
-            trigger: 'change'
-        }
-    ],
-    volConType: [
-        {
-            required: true,
-            message: '请选择接线方式',
-            trigger: 'change'
-        }
-    ],
-    capacitySscmin: [
-        {
-            required: true,
-            message: '请输入最小短路容量',
-            trigger: 'blur'
-        }
-    ],
-    capacitySi: [
-        {
-            required: true,
-            message: '请输入用户协议容量',
-            trigger: 'blur'
-        }
-    ],
-    capacitySscb: [
-        {
-            required: true,
-            message: '请输入基准短路容量',
-            trigger: 'blur'
-        }
-    ],
-    capacitySt: [
-        {
-            required: true,
-            message: '请输入供电设备容量',
-            trigger: 'blur'
-        }
-    ],
-    pt: [
-        {
-            required: true,
-            message: '请输入PT变比',
-            trigger: 'blur'
-        }
-    ],
-    ct: [
-        {
-            required: true,
-            message: '请输入CT变比',
-            trigger: 'blur'
-        }
-    ],
-    location: [
-        {
-            required: true,
-            message: '请输入监测位置',
-            trigger: 'blur'
-        }
-    ]
-})
-//弹框标题
-const title: any = ref('')
-//判断页面显示条件
-const popupType: any = ref(null)
-//方案/测试项id
-const planId: any = ref('')
-//打开的类型
-const openType = ref('')
-const detailsType = (val: any) => {
-    openType.value = val
-    if (val == 'tree') {
-        activeName.value = 0
-    }
-    if (val == 'table') {
-        activeName.value = 1
-    }
-}
-//回显方案、测试项操作
-const details = (val: any) => {
-    if (val) {
-        form.value = {
-            describe: val.describe,
-            itemName: val.itemName
-        }
-    }
-    if (val) {
-        form1.value = val
-        checkedIdList.value = form1.value.list
-    }
-}
-//未绑定数据tree
-const unBindList = ref([])
-//已绑定数据tree
-const bindList = ref([])
-//0 新增方案 1 修改方案 2 新增测试项 3 修改测试项 4 设备信息
-const open = async (val: any, id: any, name?: any) => {
-    // console.log("🚀 ~ open ~ val:", val)
-    popupType.value = val
-    title.value = val == 0 ? '新增方案' : val == 1 ? '修改方案' : val == 2 ? '新增测试项' : val == 3 ? '修改测试项' : ('绑定测试项' + '_' + name)
-    dialogVisible.value = true
-    planId.value = id
-    //新增方案或者测试项数据
-    if (val == 0 || val == 2) {
-        initForm()
-    }
-    if (val != 0 && val != 1) {
-        //1 列表  0树
-        // getDeviceList({ id: id, isTrueFlag: 0, pageNum: 1, pageSize: 200 }).then(res => {})
-        dialogVisible.value = true
-        selectId.value = id
-        //0未绑定数据 1 已绑定数据
-        //获取未绑定树形数据
-        getDeviceList({ id: id, isTrueFlag: 0 }).then(res => {
-            unBindList.value = res.data
-        })
-        //获取已绑定树形数据
-        getDeviceList({ id: id, isTrueFlag: 1 }).then(res => {
-            bindList.value = res.data
-        })
-        // activeName.value = 0
-    }
-}
-//获取选择的绑定的数据
-const checkedIdList: any = ref([])
-const getData = (rightData: any) => {
-    checkedIdList.value = []
-    if (rightData && rightData.length != 0) {
-        rightData.map((item: any) => {
-            item.children.map((vv: any) => {
-                vv.children.map((kk: any) => {
-                    checkedIdList.value.push(kk.id)
-                })
-            })
-        })
-    }
-    checkedIdList.value = [...new Set(checkedIdList.value)]
-}
-
-//判断是否显示新增页面 false显示详情页面和删除按钮隐藏确定按钮 true显示新增页面与确定按钮隐藏删除按钮
-const addFlag = ref(false)
-const selectId: any = ref('')
-//判断是否选择了设备数据
-const checkedList: any = ref([])
-//关闭
-const ruleFormRef1 = ref()
-const ruleFormRef2 = ref()
-const close = () => {
-    dialogVisible.value = false
-    //折叠面板
-    activeTab.value = 0
-    if (addFlag.value) {
-        addFlag.value = false
-        checkedList.value = []
-    } else {
-        dialogVisible.value = false
-    }
-
-    //取消表单校验状态
-    if (popupType.value == 0 || popupType.value == 1) {
-        ruleFormRef1.value && ruleFormRef1.value.resetFields()
-    } else {
-        ruleFormRef2.value && ruleFormRef2.value?.resetFields()
-    }
-    //tabs
-    activeName.value = 0
-    unBindList.value = []
-    bindList.value = []
-    initForm()
-}
-//提交
-const submit = () => {
-    //新增方案
-    if (popupType.value == 0) {
-        ruleFormRef1.value.validate((valid: any) => {
-            if (valid) {
-                const subForm = {
-                    itemName: form.value.itemName,
-                    describe: form.value.describe
-                }
-                addPlan(subForm).then((res: any) => {
-                    if (res.code == 'A0000') {
-                        ElMessage.success('新增方案成功')
-                        initForm()
-                        emit('onSubmit')
-                        close()
-                    }
-                })
-            } else {
-                console.log('表单验证失败')
-                return false
-            }
-        })
-    }
-    //修改方案
-    if (popupType.value == 1) {
-        ruleFormRef1.value.validate((valid: boolean) => {
-            if (valid) {
-                const subForm = {
-                    id: planId.value,
-                    itemName: form.value.itemName,
-                    describe: form.value.describe
-                }
-                addPlan(subForm).then(res => {
-                    ElMessage.success('修改方案成功')
-                    emit('onSubmit')
-                    close()
-                })
-            }
-        })
-    }
-    //新增测试项
-    if (popupType.value == 2) {
-        ruleFormRef2.value.validate((valid: boolean) => {
-            if (valid) {
-                let subForm = {
-                    id: planId.value,
-                    records: [form1.value]
-                }
-                subForm.records[0].list = checkedIdList.value
-                addRecord(subForm).then(res => {
-                    ElMessage.success('新增测试项成功')
-                    initForm()
-                    emit('onSubmit')
-                    close()
-                })
-            }
-        })
-    }
-    //修改测试项
-    if (popupType.value == 3 || popupType.value == 4) {
-        let subForm = JSON.parse(JSON.stringify(form1.value))
-        subForm.list = checkedIdList.value
-        console.log(title.value.includes('绑定测试项'));
-        
-        updateRecord(subForm).then((res: any) => {
-            if (res.code == 'A0000') {
-                ElMessage.success(title.value.includes('绑定测试项')?'绑定测试项成功':'修改测试项成功')
-                initForm()
-                emit('onSubmit')
-                close()
-            }
-        })
-    }
-}
-defineExpose({ open, details, detailsType })
-</script>
-<style lang="scss" scoped>
-::v-deep .el-form-item__content {
-    display: flex !important;
-    justify-content: space-between !important;
-}
-
-::v-deep .form-two {
-    .el-select {
-        width: 100% !important;
-    }
-}
-
-.button_info {
-    width: 100%;
-    display: flex;
-    justify-content: flex-end;
-    margin: 10px 0;
-}
-
-.device_info {
-    width: 100%;
-    display: flex;
-
-    .left_device,
-    .right_device {
-        width: 410px;
-        border: 1px solid #eee;
-        padding-right: 10px;
-
-        p {
-            margin: 10px 10px 0 10px;
-            font-weight: 800;
-            font-size: 14px;
-        }
-    }
-
-    .center_bind {
-        flex: 1;
-        display: flex;
-        padding: 0 30px;
-        align-items: center;
-        justify-content: center;
-    }
-}
-</style>
+<template>
+    <el-dialog v-model.trim="dialogVisible" :title="title" draggable
+        :style="{ width: popupType == 0 || popupType == 1 ? '500px' : '1100px' }">
+        <!-- 新增方案数据 -->
+        <el-form :model="form" scroll-to-error label-width="140px" :rules="rules1" ref="ruleFormRef1" class="form-one"
+            v-if="popupType == 0 || popupType == 1">
+            <el-form-item label="方案名称：" prop="itemName">
+                <el-input maxlength="32" show-word-limit v-model.trim="form.itemName" placeholder="请输入方案名称" />
+            </el-form-item>
+            <el-form-item label="方案描述：" prop="describe">
+                <el-input maxlength="300" show-word-limit type="textarea" v-model.trim="form.describe"
+                    placeholder="请输入方案描述" />
+            </el-form-item>
+        </el-form>
+        <!-- 测试项信息&数据绑定页面 -->
+        <el-tabs type="border-card" v-model.trim="activeName" v-if="popupType != 0 && popupType != 1">
+            <el-tab-pane label="测试项信息" :name="0" v-if="openType == 'tree'">
+                <el-form :model="form1" ref="ruleFormRef2" scroll-to-error class="form-two" label-width="140px"
+                    :rules="rules2">
+                    <el-form-item label="测试项名称：" prop="itemName">
+                        <el-input maxlength="32" show-word-limit v-model.trim="form1.itemName" placeholder="请输入测试项名称" />
+                    </el-form-item>
+                    <el-form-item label="测量间隔：" prop="statisticalInterval">
+                        <el-select v-model.trim="form1.statisticalInterval" placeholder="请选择测量间隔" clearable
+                            style="width: 100%">
+                            <el-option v-for="(item, index) in statisticalIntervalList" :key="index" :label="item.name"
+                                :value="item.id"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="电压等级：" prop="voltageLevel">
+                        <el-select v-model.trim="form1.voltageLevel" placeholder="请选择电压等级" clearable style="width: 100%"
+                            @change="changeVoltageLevel">
+                            <el-option v-for="(item, index) in voltageLevelList" :key="index" :label="item.name"
+                                :value="item.id"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="接线方式：" prop="volConType">
+                        <el-select v-model.trim="form1.volConType" placeholder="请选择接线方式" clearable style="width: 100%">
+                            <el-option v-for="(item, index) in volConTypeList" :key="index" :label="item.name"
+                                :value="item.id"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="最小短路容量：" prop="capacitySscmin">
+                        <el-input maxlength="32" show-word-limit v-model.trim="form1.capacitySscmin" oninput="value=value.replace(/[^\-?\d.]/g,'')
+.replace(/^\./g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')
+.replace('-','$#$').replace(/\-/g,'').replace('$#$','-')" autocomplete="off" placeholder="请选择最小短路容量">
+                            <template #append>MVA</template>
+                        </el-input>
+                    </el-form-item>
+
+                    <el-form-item label="用户协议容量：" prop="capacitySi">
+                        <el-input maxlength="32" show-word-limit v-model.trim="form1.capacitySi" autocomplete="off"
+                            oninput="value=value.replace(/[^\-?\d.]/g,'')
+.replace(/^\./g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')
+.replace('-','$#$').replace(/\-/g,'').replace('$#$','-')" placeholder="请输入用户协议容量">
+                            <template #append>MVA</template>
+                        </el-input>
+                    </el-form-item>
+
+                    <el-form-item label="基准短路容量：" prop="capacitySscb">
+                        <el-input maxlength="32" show-word-limit v-model.trim="form1.capacitySscb" oninput="value=value.replace(/[^\-?\d.]/g,'')
+.replace(/^\./g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')
+.replace('-','$#$').replace(/\-/g,'').replace('$#$','-')" placeholder="请输入基准短路容量">
+                            <template #append>MVA</template>
+                        </el-input>
+                    </el-form-item>
+
+                    <el-form-item label="供电设备容量：" prop="capacitySt">
+                        <el-input maxlength="32" show-word-limit v-model.trim="form1.capacitySt" oninput="value=value.replace(/[^\-?\d.]/g,'')
+.replace(/^\./g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')
+.replace('-','$#$').replace(/\-/g,'').replace('$#$','-')" placeholder="请输入供电设备容量">
+                            <template #append>MVA</template>
+                        </el-input>
+                    </el-form-item>
+                    <el-form-item label="PT变比：" prop="pt">
+                        <el-input maxlength="32" show-word-limit style="width: 48%" v-model.number.trim="form1.pt"
+                            autocomplete="off" placeholder="请输入PT变比" oninput="value=value.replace(/[^0-9.]/g,'')" />
+                        <el-input maxlength="32" show-word-limit style="width: 48%" v-model.number.trim="form1.pt1"
+                            autocomplete="off" placeholder="请输入PT变比" oninput="value=value.replace(/[^0-9.]/g,'')" />
+                    </el-form-item>
+                    <el-form-item label="CT变比：" prop="ct">
+                        <el-input maxlength="32" show-word-limit v-model.number.trim="form1.ct" style="width: 48%"
+                            autocomplete="off" oninput="value=value.replace(/[^0-9.]/g,'')" placeholder="请输入CT变比" />
+                        <el-input maxlength="32" show-word-limit v-model.number.trim="form1.ct1" style="width: 48%"
+                            autocomplete="off" oninput="value=value.replace(/[^0-9.]/g,'')" placeholder="请输入CT变比" />
+                    </el-form-item>
+                    <el-form-item label="监测位置：" prop="location" style="width: 100%">
+                        <el-input maxlength="300" show-word-limit type="textarea" v-model.trim="form1.location"
+                            placeholder="请输入监测位置" />
+                    </el-form-item>
+                </el-form>
+            </el-tab-pane>
+            <el-tab-pane label="数据绑定" :name="1" v-if="openType == 'table'">
+                <TreeTransfers :fromData="unBindList" :toData="bindList" @getData="getData" />
+            </el-tab-pane>
+        </el-tabs>
+        <template #footer="">
+            <el-button @click="close">取 消</el-button>
+            <el-button type="primary" @click="submit">确 定</el-button>
+        </template>
+    </el-dialog>
+</template>
+<script lang="ts" setup>
+import { ref, defineEmits } from 'vue'
+import { ElMessage } from 'element-plus'
+import { addPlan, addRecord, updateRecord, getDeviceList } from '@/api/cs-device-boot/planData'
+import { useDictData } from '@/stores/dictData'
+import TreeTransfers from './treeTransfers.vue'
+const dictData = useDictData()
+const dialogVisible = ref(false)
+const voltageLevelList: any = dictData.getBasicData('Dev_Voltage_Stand')
+const volConTypeList = dictData.getBasicData('Dev_Connect')
+const emit = defineEmits(['onSubmit'])
+//表单数据
+const form = ref({})
+//测试项数据
+const form1: any = ref({})
+//折叠面板初始值
+const activeTab = ref(0)
+//tab初始值
+const activeName = ref(0)
+//测量间隔数据
+const statisticalIntervalList = [
+    {
+        id: 1,
+        name: '1分钟'
+    },
+    {
+        id: 3,
+        name: '3分钟'
+    },
+    {
+        id: 5,
+        name: '5分钟'
+    },
+    {
+        id: 10,
+        name: '10分钟'
+    }
+]
+//初始化form
+const initForm = () => {
+    //方案数据
+    form.value = {
+        itemName: '', //方案名称
+        describe: '' //方案描述
+    }
+    //测试项数据
+    form1.value = {
+        itemName: '', //测试项名称
+        statisticalInterval: statisticalIntervalList[1].id, //测量间隔
+        voltageLevel: voltageLevelList[0].id, //电压等级
+        volConType: volConTypeList[0].id, //接线方式
+        capacitySscmin: 10, //最小短路容量
+        capacitySi: 10, //用户协议容量
+        capacitySscb: 10, //基准短路容量
+        capacitySt: 10, //供电设备容量
+        pt: 1, //pt变比1
+        pt1: 1, //pt变比2
+        ct: 300, //ct变比1
+        ct1: 5, //ct变比2
+        location: '' //监测位置
+    }
+    changeVoltageLevel()
+}
+const codeValue = (val: any) => {
+    return (
+        voltageLevelList.find((item: any) => {
+            return item.code == val
+        })?.value * 1
+    )
+}
+//改变电压等级计算基准短路容量
+const changeVoltageLevel = async () => {
+    let value: any =
+        voltageLevelList.find((item: any) => {
+            return item.id == form1.value.voltageLevel
+        })?.value * 1
+    if (value < codeValue('6kV')) {
+        form1.value.capacitySscb = 10
+    } else if (value < codeValue('20kV')) {
+        form1.value.capacitySscb = 100
+    } else if (value < codeValue('35kV')) {
+        form1.value.capacitySscb = 200
+    } else if (value < codeValue('66kV')) {
+        form1.value.capacitySscb = 250
+    } else if (value < codeValue('110kV')) {
+        form1.value.capacitySscb = 500
+    } else if (value < codeValue('220kV')) {
+        form1.value.capacitySscb = 750
+    } else if (value < codeValue('330kV')) {
+        form1.value.capacitySscb = 2000
+    } else if (value < codeValue('500kV')) {
+        form1.value.capacitySscb = 3000
+    } else if (value < codeValue('750kV')) {
+        form1.value.capacitySscb = 4500
+    } else if (value < codeValue('1000kV')) {
+        form1.value.capacitySscb = 7000
+    } else {
+        form1.value.capacitySscb = 9000
+    }
+
+    //PT变比 电压<0.48kv 1:1 电压>0.48 *1000/100
+    if (Number(value) <= 0.48) {
+        form1.value.pt = 1
+        form1.value.pt1 = 1
+    }
+    if (Number(value) > 0.48) {
+        form1.value.pt = value * 10
+        form1.value.pt1 = 1
+    }
+}
+
+initForm()
+//方案校验规则
+const rules1 = ref({
+    //方案名称
+    itemName: [
+        {
+            required: true,
+            message: '请输入方案名称',
+            trigger: 'blur'
+        }
+    ],
+    //方案名称
+    describe: [
+        {
+            required: true,
+            message: '请输入方案描述',
+            trigger: 'blur'
+        }
+    ]
+})
+//测试项校验规则
+const rules2 = ref({
+    //测试项名称
+    itemName: [
+        {
+            required: true,
+            message: '请输入测试项名称',
+            trigger: 'blur'
+        }
+    ],
+    describe: [
+        {
+            required: true,
+            message: '请选择测量间隔',
+            trigger: 'change'
+        }
+    ],
+    voltageLevel: [
+        {
+            required: true,
+            message: '请选择电压等级',
+            trigger: 'change'
+        }
+    ],
+    volConType: [
+        {
+            required: true,
+            message: '请选择接线方式',
+            trigger: 'change'
+        }
+    ],
+    capacitySscmin: [
+        {
+            required: true,
+            message: '请输入最小短路容量',
+            trigger: 'blur'
+        }
+    ],
+    capacitySi: [
+        {
+            required: true,
+            message: '请输入用户协议容量',
+            trigger: 'blur'
+        }
+    ],
+    capacitySscb: [
+        {
+            required: true,
+            message: '请输入基准短路容量',
+            trigger: 'blur'
+        }
+    ],
+    capacitySt: [
+        {
+            required: true,
+            message: '请输入供电设备容量',
+            trigger: 'blur'
+        }
+    ],
+    pt: [
+        {
+            required: true,
+            message: '请输入PT变比',
+            trigger: 'blur'
+        }
+    ],
+    ct: [
+        {
+            required: true,
+            message: '请输入CT变比',
+            trigger: 'blur'
+        }
+    ],
+    location: [
+        {
+            required: true,
+            message: '请输入监测位置',
+            trigger: 'blur'
+        }
+    ]
+})
+//弹框标题
+const title: any = ref('')
+//判断页面显示条件
+const popupType: any = ref(null)
+//方案/测试项id
+const planId: any = ref('')
+//打开的类型
+const openType = ref('')
+const detailsType = (val: any) => {
+    openType.value = val
+    if (val == 'tree') {
+        activeName.value = 0
+    }
+    if (val == 'table') {
+        activeName.value = 1
+    }
+}
+//回显方案、测试项操作
+const details = (val: any) => {
+    if (val) {
+        form.value = {
+            describe: val.describe,
+            itemName: val.itemName
+        }
+    }
+    if (val) {
+        form1.value = val
+        checkedIdList.value = form1.value.list
+    }
+}
+//未绑定数据tree
+const unBindList = ref([])
+//已绑定数据tree
+const bindList = ref([])
+//0 新增方案 1 修改方案 2 新增测试项 3 修改测试项 4 设备信息
+const open = async (val: any, id: any, name?: any) => {
+    // console.log("🚀 ~ open ~ val:", val)
+    popupType.value = val
+    title.value = val == 0 ? '新增方案' : val == 1 ? '修改方案' : val == 2 ? '新增测试项' : val == 3 ? '修改测试项' : ('绑定测试项' + '_' + name)
+    dialogVisible.value = true
+    planId.value = id
+    //新增方案或者测试项数据
+    if (val == 0 || val == 2) {
+        initForm()
+    }
+    if (val != 0 && val != 1) {
+        //1 列表  0树
+        // getDeviceList({ id: id, isTrueFlag: 0, pageNum: 1, pageSize: 200 }).then(res => {})
+        dialogVisible.value = true
+        selectId.value = id
+        //0未绑定数据 1 已绑定数据
+        //获取未绑定树形数据
+        getDeviceList({ id: id, isTrueFlag: 0 }).then(res => {
+            unBindList.value = res.data
+        })
+        //获取已绑定树形数据
+        getDeviceList({ id: id, isTrueFlag: 1 }).then(res => {
+            bindList.value = res.data
+        })
+        // activeName.value = 0
+    }
+}
+//获取选择的绑定的数据
+const checkedIdList: any = ref([])
+const getData = (rightData: any) => {
+    checkedIdList.value = []
+    if (rightData && rightData.length != 0) {
+        rightData.map((item: any) => {
+            item.children.map((vv: any) => {
+                vv.children.map((kk: any) => {
+                    checkedIdList.value.push(kk.id)
+                })
+            })
+        })
+    }
+    checkedIdList.value = [...new Set(checkedIdList.value)]
+}
+
+//判断是否显示新增页面 false显示详情页面和删除按钮隐藏确定按钮 true显示新增页面与确定按钮隐藏删除按钮
+const addFlag = ref(false)
+const selectId: any = ref('')
+//判断是否选择了设备数据
+const checkedList: any = ref([])
+//关闭
+const ruleFormRef1 = ref()
+const ruleFormRef2 = ref()
+const close = () => {
+    dialogVisible.value = false
+    //折叠面板
+    activeTab.value = 0
+    if (addFlag.value) {
+        addFlag.value = false
+        checkedList.value = []
+    } else {
+        dialogVisible.value = false
+    }
+
+    //取消表单校验状态
+    if (popupType.value == 0 || popupType.value == 1) {
+        ruleFormRef1.value && ruleFormRef1.value.resetFields()
+    } else {
+        ruleFormRef2.value && ruleFormRef2.value?.resetFields()
+    }
+    //tabs
+    activeName.value = 0
+    unBindList.value = []
+    bindList.value = []
+    initForm()
+}
+//提交
+const submit = () => {
+    //新增方案
+    if (popupType.value == 0) {
+        ruleFormRef1.value.validate((valid: any) => {
+            if (valid) {
+                const subForm = {
+                    itemName: form.value.itemName,
+                    describe: form.value.describe
+                }
+                addPlan(subForm).then((res: any) => {
+                    if (res.code == 'A0000') {
+                        ElMessage.success('新增方案成功')
+                        initForm()
+                        emit('onSubmit')
+                        close()
+                    }
+                })
+            } else {
+                console.log('表单验证失败')
+                return false
+            }
+        })
+    }
+    //修改方案
+    if (popupType.value == 1) {
+        ruleFormRef1.value.validate((valid: boolean) => {
+            if (valid) {
+                const subForm = {
+                    id: planId.value,
+                    itemName: form.value.itemName,
+                    describe: form.value.describe
+                }
+                addPlan(subForm).then(res => {
+                    ElMessage.success('修改方案成功')
+                    emit('onSubmit')
+                    close()
+                })
+            }
+        })
+    }
+    //新增测试项
+    if (popupType.value == 2) {
+        ruleFormRef2.value.validate((valid: boolean) => {
+            if (valid) {
+                let subForm = {
+                    id: planId.value,
+                    records: [form1.value]
+                }
+                subForm.records[0].list = checkedIdList.value
+                addRecord(subForm).then(res => {
+                    ElMessage.success('新增测试项成功')
+                    initForm()
+                    emit('onSubmit')
+                    close()
+                })
+            }
+        })
+    }
+    //修改测试项
+    if (popupType.value == 3 || popupType.value == 4) {
+        let subForm = JSON.parse(JSON.stringify(form1.value))
+        subForm.list = checkedIdList.value
+        console.log(title.value.includes('绑定测试项'));
+        
+        updateRecord(subForm).then((res: any) => {
+            if (res.code == 'A0000') {
+                ElMessage.success(title.value.includes('绑定测试项')?'绑定测试项成功':'修改测试项成功')
+                initForm()
+                emit('onSubmit')
+                close()
+            }
+        })
+    }
+}
+defineExpose({ open, details, detailsType })
+</script>
+<style lang="scss" scoped>
+::v-deep .el-form-item__content {
+    display: flex !important;
+    justify-content: space-between !important;
+}
+
+::v-deep .form-two {
+    .el-select {
+        width: 100% !important;
+    }
+}
+
+.button_info {
+    width: 100%;
+    display: flex;
+    justify-content: flex-end;
+    margin: 10px 0;
+}
+
+.device_info {
+    width: 100%;
+    display: flex;
+
+    .left_device,
+    .right_device {
+        width: 410px;
+        border: 1px solid #eee;
+        padding-right: 10px;
+
+        p {
+            margin: 10px 10px 0 10px;
+            font-weight: 800;
+            font-size: 14px;
+        }
+    }
+
+    .center_bind {
+        flex: 1;
+        display: flex;
+        padding: 0 30px;
+        align-items: center;
+        justify-content: center;
+    }
+}
+</style>
diff --git a/src/views/govern/manage/basic/dictionary.vue b/src/views/govern/manage/basic/dictionary.vue
index 9c09316..3c93936 100644
--- a/src/views/govern/manage/basic/dictionary.vue
+++ b/src/views/govern/manage/basic/dictionary.vue
@@ -51,7 +51,7 @@
             </template>
         </TableHeader>
         <Table ref="tableRef" />
-        <PopupDictionary ref="popupDictionary" v-if="show" @close="show=false"></PopupDictionary>
+        <PopupDictionary ref="popupDictionary" v-if="show" @close="show = false"></PopupDictionary>
     </div>
 </template>
 <script setup lang="ts">
@@ -90,7 +90,20 @@ const tableStore = new TableStore({
         { title: '别名', field: 'otherName', minWidth: 220 },
         { title: '展示名称', field: 'showName', minWidth: 170 },
         { title: '告警码', field: 'defaultValue', minWidth: 170 },
-        { title: '相别', field: 'phaseName', minWidth: 80 },
+        {
+            title: '相别',
+            field: 'phase',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return row.cellValue
+                    ? row.cellValue == '/'
+                        ? '/'
+                        : row.cellValue == 'M'
+                        ? '无相别'
+                        : row.cellValue + '相'
+                    : '/'
+            }
+        },
         { title: '单位', field: 'unit', minWidth: 80 },
         { title: '基础数据类型', field: 'type', minWidth: 170 },
         { title: '数据谐波次数', field: 'harmStartEnd', minWidth: 170 },
@@ -143,7 +156,7 @@ const tableStore = new TableStore({
         tableStore.table.data.forEach((item: any) => {
             item.classIdName = DataSelect.find((child: any) => child.id == item.classId)?.name || '/'
             item.resourcesIdName = ResourcesIdSelect.find((child: any) => child.id == item.resourcesId)?.name || '/'
-            item.phaseName = item.phase === 'M' ? '/' : item.phase || '/'
+            // item.phaseName = item.phase === 'M' ? '无相别' : item.phase || '/'
             item.harmStartEnd = item.harmEnd ? item.harmStart + '-' + item.harmEnd : '/'
             for (let key in item) {
                 if (typeof item[key] !== 'number') {
diff --git a/src/views/govern/manage/basic/popupDictionary.vue b/src/views/govern/manage/basic/popupDictionary.vue
index 6ac8e14..27e5565 100644
--- a/src/views/govern/manage/basic/popupDictionary.vue
+++ b/src/views/govern/manage/basic/popupDictionary.vue
@@ -61,7 +61,7 @@
                         placeholder="请输入单位"
                     ></el-input>
                 </el-form-item>
-                <el-form-item label="基础数据类型:" >
+                <el-form-item label="基础数据类型:">
                     <el-input
                         maxlength="32"
                         show-word-limit
@@ -284,7 +284,23 @@ const phaseSelect = [
     {
         name: 'T相',
         id: 'T'
-    }
+    },
+    {
+        name: 'AB相',
+        id: 'AB'
+    },
+    {
+        name: 'BC相',
+        id: 'BC'
+    },
+    {
+        name: 'CA相',
+        id: 'CA'
+    },
+    {
+        name: '无相别',
+        id: 'M'
+    },
 ]
 const StatMethodSelect = [
     {
@@ -372,8 +388,8 @@ const open = (text: string, data?: anyObj) => {
     if (data) {
         for (let key in form) {
             if (key == 'statMethod') {
-                form[key] = data[key].split(',')
-            } else {
+                form[key] = data[key] == '/' ? [] : data[key].split(',')
+            }  else {
                 form[key] = data[key] === '/' ? null : data[key]
             }
         }
diff --git a/src/views/govern/manage/basic/popupVersion.vue b/src/views/govern/manage/basic/popupVersion.vue
index 9e761ff..9660b32 100644
--- a/src/views/govern/manage/basic/popupVersion.vue
+++ b/src/views/govern/manage/basic/popupVersion.vue
@@ -88,7 +88,7 @@
                 ></el-input>
             </el-form-item>
         </el-form>
-        <el-form :model="form" label-width="100px" class="mt10 form-one" >
+        <el-form :model="form" label-width="100px" class="mt10 form-one">
             <el-form-item label="描述:" prop="description">
                 <el-input
                     maxlength="300"
@@ -103,6 +103,7 @@
             <el-form-item label="升级文件:" prop="file">
                 <el-upload
                     :limit="1"
+                    accept=".bin"
                     :auto-upload="false"
                     :on-change="fileChange"
                     :on-exceed="fileExceed"
@@ -212,12 +213,27 @@ const formDevModelOptionsFilter = computed(() => {
     })
 })
 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 fileRemove = (e: any) => {
     form.file = null
     fileList.value = []
diff --git a/src/views/govern/manage/basic/version.vue b/src/views/govern/manage/basic/version.vue
index 62d2c40..e91bbb4 100644
--- a/src/views/govern/manage/basic/version.vue
+++ b/src/views/govern/manage/basic/version.vue
@@ -33,7 +33,7 @@ import { useDictData } from '@/stores/dictData'
 import PopupVersion from '@/views/govern/manage/basic/popupVersion.vue'
 import { Plus } from '@element-plus/icons-vue'
 import { auditEdData } from '@/api/cs-device-boot/edData'
-
+import { getFileUrl, downLoadFile } from '@/api/cs-system-boot/manage'
 defineOptions({
     name: 'govern/manage/basic/version'
 })
@@ -72,6 +72,16 @@ const tableStore = new TableStore({
             width: '180',
             render: 'buttons',
             buttons: [
+                {
+                    name: 'productSetting',
+                    title: '下载文件',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        downloadTheReport(row.filePath)
+                    }
+                },
                 {
                     name: 'edit',
                     title: '编辑',
@@ -151,11 +161,30 @@ queryByCode('Device_Type').then(res => {
                 res1.data.splice(index, 1)
             }
         })
-        console.log('🚀 ~ res1.data.map ~ res1.data:', res1.data)
 
         DevTypeOptions.value = res1.data
     })
 })
+// 下载报告
+const downloadTheReport = (name: string) => {
+    getFileUrl(name).then((res: any) => {
+  
+        downLoadFile(res.data).then(res => {
+            let blob = new Blob([res], {
+                type: 'application/octet-stream'
+            })
+            const url = window.URL.createObjectURL(blob)
+            const link = document.createElement('a') // 创建a标签
+            link.href = url
+            link.download = name.split('/').pop() || '升级文件' // 设置下载的文件名
+            document.body.appendChild(link)
+            link.click() //执行下载
+            document.body.removeChild(link)
+            ElMessage.success('下载成功')
+        })
+    })
+}
+
 tableStore.table.params.devType = ''
 provide('tableStore', tableStore)
 onMounted(() => {
diff --git a/src/views/govern/monitorRecall/steadyRecall.vue b/src/views/govern/monitorRecall/steadyRecall.vue
index e883734..92359cb 100644
--- a/src/views/govern/monitorRecall/steadyRecall.vue
+++ b/src/views/govern/monitorRecall/steadyRecall.vue
@@ -1,21 +1,19 @@
 <template>
     <div class="view" style="height: 100%">
-        <TableHeader 
-            datePicker 
-            ref="headerRef"
-        >
+        <TableHeader datePicker ref="headerRef">
             <template v-slot:operation>
                 <el-button type="primary" :icon="Setting" @click="exportTab">补召</el-button>
             </template>
         </TableHeader>
-        <Table ref="tableRef"  />
+        <Table ref="tableRef" />
     </div>
 </template>
 
 <script lang="ts" setup>
-import { ref, onMounted, provide, nextTick, defineEmits, watch } from 'vue'
+import { ref, onMounted, provide, nextTick, watch } from 'vue'
 import TableStore from '@/utils/tableStore'
 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'
 
@@ -24,7 +22,7 @@ const props = defineProps({
         type: Array,
         default: () => []
     }
-});
+})
 
 const tableParams: any = ref({})
 const headerRef = ref()
@@ -35,7 +33,9 @@ const tableStore: any = new TableStore({
     method: 'POST',
     column: [
         {
-            title: '序号', width: 80, formatter: (row: any) => {
+            title: '序号',
+            width: 80,
+            formatter: (row: any) => {
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
@@ -49,7 +49,7 @@ const tableStore: any = new TableStore({
         },
         { field: 'successCount', title: '成功解析数', minWidth: 150 },
         { field: 'startTime', title: '导入开始时间', minWidth: 170, sortable: true },
-        { field: 'endTime', title: '导入结束时间', minWidth: 170 , sortable: true},
+        { field: 'endTime', title: '导入结束时间', minWidth: 170, sortable: true },
         {
             title: '解析状态',
             field: 'status',
@@ -79,30 +79,27 @@ const tableStore: any = new TableStore({
                     type: 'primary',
                     icon: 'el-icon-EditPen',
                     render: 'basicButton',
-                    click: row => {
-                    }
+                    click: row => {}
                 }
             ]
         }
     ],
-    beforeSearchFun: () => {
-
-    },
-    loadCallback: () => {
-       
-    }
+    beforeSearchFun: () => {},
+    loadCallback: () => {}
 })
 
 provide('tableStore', tableStore)
 
-
+const exportTab = () => {
+    ElMessage.info('稳态补召功能暂未开发！')
+}
 //获取请求参数
 const getTableParams = (val: any) => {
     tableParams.value = val
     tableStore.index()
 }
 
-defineExpose({ 
+defineExpose({
     getTableParams
 })
 
@@ -129,4 +126,4 @@ onMounted(() => {
 .view :deep(.el-table) {
     height: calc(100% - 56px);
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/govern/mxgraph/graphList/index.vue b/src/views/govern/mxgraph/graphList/index.vue
index c69051c..11e5e37 100644
--- a/src/views/govern/mxgraph/graphList/index.vue
+++ b/src/views/govern/mxgraph/graphList/index.vue
@@ -28,7 +28,13 @@
                             <span style="display: flex; align-items: center">
                                 {{ item.name }}
 
-                                <el-tooltip class="item" effect="dark" content="修改项目" placement="top"  v-if="hasAdmin || item.createBy == adminInfo.id">
+                                <el-tooltip
+                                    class="item"
+                                    effect="dark"
+                                    content="修改项目"
+                                    placement="top"
+                                    v-if="hasAdmin || item.createBy == adminInfo.id"
+                                >
                                     <Edit
                                         style="margin-left: 5px; width: 16px"
                                         class="xiaoshou color"
@@ -121,7 +127,9 @@ defineOptions({
 })
 const adminInfo = useAdminInfo()
 
-const hasAdmin = adminInfo.roleCode.some(item => item.includes('operation_manager')|| item.includes('root'))
+const hasAdmin =
+    adminInfo.userType.some(item => item.includes('operation_manager') || item.includes('root')) ||
+    adminInfo.userType == 1
 const tableRef = ref()
 const popupRef = ref()
 let DOMIN = window.location.origin
diff --git a/src/views/pqs/cockpit/homePage/components/routingConfig.vue b/src/views/pqs/cockpit/homePage/components/routingConfig.vue
index 4657ae2..6deb2b0 100644
--- a/src/views/pqs/cockpit/homePage/components/routingConfig.vue
+++ b/src/views/pqs/cockpit/homePage/components/routingConfig.vue
@@ -81,7 +81,8 @@ const route = useRouter()
 const navTabs = useNavTabs()
 const adminInfo = useAdminInfo()
 const pageList: any = ref([])
-const hasAdmin = adminInfo.roleCode.some(item => item.includes('operation_manager') || item.includes('root'))
+const hasAdmin = adminInfo.roleCode.some(item => item.includes('operation_manager') || item.includes('root'))||
+    adminInfo.userType == 1
 
 const open = () => {
     dialogVisible.value = true
diff --git a/src/views/pqs/cockpit/homePage/index.vue b/src/views/pqs/cockpit/homePage/index.vue
index e92e67f..3d7b8bf 100644
--- a/src/views/pqs/cockpit/homePage/index.vue
+++ b/src/views/pqs/cockpit/homePage/index.vue
@@ -98,7 +98,8 @@ const route = useRoute()
 const timeCacheStore = useTimeCacheStore()
 import { useAdminInfo } from '@/stores/adminInfo'
 const adminInfo = useAdminInfo()
-const hasAdmin = adminInfo.roleCode.some(item => item.includes('operation_manager') || item.includes('root'))
+const hasAdmin = adminInfo.roleCode.some(item => item.includes('operation_manager') || item.includes('root'))||
+    adminInfo.userType == 1
 defineOptions({
     // name: 'dashboard/index'
 })
diff --git a/src/views/pqs/cockpit/setUp/components/popup.vue b/src/views/pqs/cockpit/setUp/components/popup.vue
index 3e5b2a4..a866c70 100644
--- a/src/views/pqs/cockpit/setUp/components/popup.vue
+++ b/src/views/pqs/cockpit/setUp/components/popup.vue
@@ -177,7 +177,9 @@ import { id } from 'element-plus/es/locale'
 //     name: 'cockpit/popup'
 // })
 const adminInfo = useAdminInfo()
-const hasAdmin = adminInfo.roleCode.some(item => item.includes('operation_manager') || item.includes('root'))
+const hasAdmin =
+    adminInfo.roleCode.some(item => item.includes('operation_manager') || item.includes('root')) ||
+    adminInfo.userType == 1
 
 const { go } = useRouter()
 const navTabs = useNavTabs()
diff --git a/src/views/system/scheduledTasks/form.vue b/src/views/system/scheduledTasks/form.vue
index e12b607..ce0ec43 100644
--- a/src/views/system/scheduledTasks/form.vue
+++ b/src/views/system/scheduledTasks/form.vue
@@ -14,9 +14,9 @@
             <el-form-item label="任务表达式" prop="cron">
                 <el-input v-model.trim="form.cron" clearable placeholder="请输入任务表达式" />
             </el-form-item>
-            <el-form-item label="排序">
+            <el-form-item label="排序" prop="sort">
 
-                <el-input-number style="width: 100%" v-model.number="form.sort" :min="0" placeholder="请输入排序" />
+                <el-input style="width: 100%" v-model.number.trim="form.sort"  placeholder="请输入排序" />
             </el-form-item>
             <el-form-item label="备注">
                 <el-input v-model.trim="form.remark" clearable :rows="2" type="textarea" placeholder="请输入备注" />
@@ -56,12 +56,13 @@ const actionClassesOptions = ref([])
 const rules = {
     actionClass: [{ required: true, message: '请选择任务执行器', trigger: 'change' }],
     timerName: [{ required: true, message: '请输入任务名称', trigger: 'blur' }],
-    cron: [{ required: true, message: '任务表达式', trigger: 'blur' }],
-    sort: [{ required: true, message: '排序号', trigger: 'blur' }],
-    date: [{ required: true, message: '日期不可为空', trigger: 'blur' }],
+    cron: [{ required: true, message: '请输入任务表达式', trigger: 'blur' }],
+    sort: [{ required: true, message: '请输入排序', trigger: 'blur' }],
+    date: [{ required: true, message: '请输入日期', trigger: 'blur' }],
 }
 
 const open = (text: string, data?: anyObj) => {
+    formRef.value?.resetFields()
     title.value = text
     dialogVisible.value = true
     if (data) {
diff --git a/src/views/system/scheduledTasks/index.vue b/src/views/system/scheduledTasks/index.vue
index deb8f58..225ddc1 100644
--- a/src/views/system/scheduledTasks/index.vue
+++ b/src/views/system/scheduledTasks/index.vue
@@ -1,206 +1,208 @@
-<template>
-    <div class="default-main">
-        <div>
-            <TableHeader ref="TableHeaderRef">
-                <template #select>
-                    <el-form-item label="任务名称">
-                        <el-input v-model="tableStore.table.params.searchValue" maxlength="32" show-word-limit clearable
-                            placeholder="请输入任务名称" />
-                    </el-form-item>
-                    <el-form-item label="任务状态:">
-                        <el-select v-model="tableStore.table.params.searchState" clearable placeholder="请选择任务状态">
-                            <el-option label="运行" :value="1"></el-option>
-                            <el-option label="停止" :value="2"></el-option>
-                        </el-select>
-                    </el-form-item>
-                </template>
-                <template #operation>
-                    <el-button icon="el-icon-Plus" type="primary" @click="add">新增定时任务</el-button>
-                </template>
-            </TableHeader>
-            <Table ref="tableRef" />
-        </div>
-        <!-- 新增 -->
-        <taskForm ref="taskFormRef" @submit="tableStore.index()" />
-        <!-- 补招 -->
-        <el-dialog v-model="dialogVisible" title="选择补招时间" width="500">
-            <el-date-picker v-model="formDate.date" type="date" value-format="YYYY-MM-DD" placeholder="选择日期">
-            </el-date-picker>
-            <template #footer>
-
-                <el-button @click="dialogVisible = false">取消</el-button>
-                <el-button type="primary" @click="okRun">
-                    确认
-                </el-button>
-            </template>
-        </el-dialog>
-    </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 taskForm from '@/views/system/scheduledTasks/form.vue'
-import { formatDate } from '@/utils/formatTime'
-import { ElMessage, ElMessageBox, ElDatePicker } from 'element-plus'
-import { timerRun, runTimer, deleteTimer, stop, start } from '@/api/system-boot/csDictData'
-defineOptions({
-    name: 'Distributedphotovoltaic/templateConfiguration'
-})
-const formDate = ref({
-    date: '',
-    id: ''
-})
-const taskFormRef = ref()
-const dialogVisible = ref(false)
-const selectedTime = ref('')
-const tableStore: any = new TableStore({
-    url: '/system-boot/timer/list',
-    method: 'POST',
-    isWebPaging: true,
-    column: [
-        { field: 'timerName', title: '任务名称', },
-        { field: 'actionClass', title: '任务执行器' },
-        { field: 'cron', title: '定时任务表达式' },
-        { field: 'remark', title: '备注' },
-        // {
-        //     field: 'jobStatus', title: '状态', width: '100',
-        //     render: 'tag',
-        //     custom: {
-        //         0: 'danger',
-        //         1: 'success',
-        //         2: 'danger'
-        //     },
-        //     replaceValue: {
-        //         0: '未启动',
-        //         1: '运行中',
-        //         2: '未启动',
-        //     }
-        // },
-        {
-            title: '状态',
-            render: 'switch',
-            width: 100,
-            field: 'jobStatus',
-            activeText: '运行中',
-            activeValue: '1',
-            inactiveText: '未启动',
-            inactiveValue: '2',
-            onChangeField: (row: any, value: any) => {
-                if (row.jobStatus == 1) {
-                    stop({ id: row.id }).then(res => {
-                        ElMessage.success(res.message)
-                        tableStore.index()
-                    })
-                }else{
-                    start({ id: row.id }).then(res => {
-                        ElMessage.success(res.message)
-                        tableStore.index()
-                    })  
-                }
-
-
-            }
-        },
-        { field: 'sort', title: '排序', width: '80' },
-        {
-            title: '操作',
-            width: '220',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'primary',
-                    title: '执行',
-                    type: 'primary',
-                    icon: 'el-icon-Delete',
-                    render: 'confirmButton',
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'primary',
-                        title: '是否确认执行该定时任务'
-                    },
-                    click: row => {
-                        timerRun({ id: row.id }).then(res => {
-                            ElMessage.success('执行成功')
-                            tableStore.index()
-
-                        })
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '编辑',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-
-                    click: async row => {
-                        taskFormRef.value.open('编辑定时任务', row)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '补招',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-
-                    click: async row => {
-                        formDate.value.date = formatDate(new Date(), 'YYYY-MM-DD')
-                        formDate.value.id = row.id
-                        dialogVisible.value = true
-                    }
-                },
-                {
-                    name: 'del',
-                    text: '删除',
-                    type: 'danger',
-                    icon: 'el-icon-Delete',
-                    render: 'confirmButton',
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'danger',
-                        title: '确定删除？'
-                    },
-                    click: row => {
-                        deleteTimer([row.id]).then(res => {
-                            ElMessage.success('删除成功')
-                            tableStore.index()
-                        })
-                    }
-                },
-
-
-
-
-            ]
-        }
-    ],
-
-    loadCallback: () => { }
-})
-tableStore.table.params.searchValue = ''
-tableStore.table.params.searchState = ''
-
-provide('tableStore', tableStore)
-
-const add = () => {
-
-    setTimeout(() => {
-        taskFormRef.value.open('新增定时任务')
-    }, 10)
-}
-const okRun = () => {
-    runTimer(formDate.value).then(res => {
-        ElMessage.success('操作成功')
-        dialogVisible.value = false
-        tableStore.index()
-    })
-}
-onMounted(() => {
-    tableStore.index()
-})
-</script>
+<template>
+    <div class="default-main">
+        <div>
+            <TableHeader ref="TableHeaderRef">
+                <template #select>
+                    <el-form-item label="任务名称">
+                        <el-input
+                            v-model="tableStore.table.params.searchValue"
+                            maxlength="32"
+                            show-word-limit
+                            clearable
+                            placeholder="请输入任务名称"
+                        />
+                    </el-form-item>
+                    <el-form-item label="任务状态:">
+                        <el-select v-model="tableStore.table.params.searchState" clearable placeholder="请选择任务状态">
+                            <el-option label="运行" :value="1"></el-option>
+                            <el-option label="停止" :value="2"></el-option>
+                        </el-select>
+                    </el-form-item>
+                </template>
+                <template #operation>
+                    <el-button icon="el-icon-Plus" type="primary" @click="add">新增定时任务</el-button>
+                </template>
+            </TableHeader>
+            <Table ref="tableRef" />
+        </div>
+        <!-- 新增 -->
+        <taskForm ref="taskFormRef" @submit="tableStore.index()" />
+        <!-- 补招 -->
+        <el-dialog v-model="dialogVisible" title="选择补招时间" width="500">
+            <el-date-picker
+                v-model="formDate.date"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="选择日期"
+            ></el-date-picker>
+            <template #footer>
+                <el-button @click="dialogVisible = false">取消</el-button>
+                <el-button type="primary" @click="okRun">确认</el-button>
+            </template>
+        </el-dialog>
+    </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 taskForm from '@/views/system/scheduledTasks/form.vue'
+import { formatDate } from '@/utils/formatTime'
+import { ElMessage, ElMessageBox, ElDatePicker } from 'element-plus'
+import { timerRun, runTimer, deleteTimer, stop, start } from '@/api/system-boot/csDictData'
+defineOptions({
+    name: 'Distributedphotovoltaic/templateConfiguration'
+})
+const formDate = ref({
+    date: '',
+    id: ''
+})
+const taskFormRef = ref()
+const dialogVisible = ref(false)
+const selectedTime = ref('')
+const tableStore: any = new TableStore({
+    url: '/system-boot/timer/list',
+    method: 'POST',
+    isWebPaging: true,
+    column: [
+        { field: 'timerName', title: '任务名称' },
+        { field: 'actionClass', title: '任务执行器' },
+        { field: 'cron', title: '定时任务表达式' },
+        { field: 'remark', title: '备注' },
+        // {
+        //     field: 'jobStatus', title: '状态', width: '100',
+        //     render: 'tag',
+        //     custom: {
+        //         0: 'danger',
+        //         1: 'success',
+        //         2: 'danger'
+        //     },
+        //     replaceValue: {
+        //         0: '未启动',
+        //         1: '运行中',
+        //         2: '未启动',
+        //     }
+        // },
+        {
+            title: '状态',
+            render: 'switch',
+            width: 100,
+            field: 'jobStatus',
+            activeText: '运行中',
+            activeValue: '1',
+            inactiveText: '未启动',
+            inactiveValue: '2',
+            onChangeField: (row: any, value: any) => {
+                if (row.jobStatus == 1) {
+                    stop({ id: row.id }).then(res => {
+                        ElMessage.success(res.message)
+                        tableStore.index()
+                    })
+                } else {
+                    start({ id: row.id }).then(res => {
+                        ElMessage.success(res.message)
+                        tableStore.index()
+                    })
+                }
+            }
+        },
+        { field: 'sort', title: '排序', width: '80' },
+        {
+            title: '操作',
+            width: '220',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'primary',
+                    title: '执行',
+                    type: 'primary',
+                    icon: 'el-icon-Delete',
+                    render: 'confirmButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'primary',
+                        title: '是否确认执行该定时任务'
+                    },
+                    click: row => {
+                        timerRun({ id: row.id }).then(res => {
+                            ElMessage.success('执行成功')
+                            tableStore.index()
+                        })
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+
+                    click: async row => {
+                        taskFormRef.value.open('编辑定时任务', row)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '补招',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+
+                    click: async row => {
+                        formDate.value.date = formatDate(new Date(), 'YYYY-MM-DD')
+                        formDate.value.id = row.id
+                        dialogVisible.value = true
+                    }
+                },
+                {
+                    name: 'del',
+                    text: '删除',
+                    type: 'danger',
+                    icon: 'el-icon-Delete',
+                    render: 'confirmButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定删除？'
+                    },
+                    click: row => {
+                        deleteTimer([row.id]).then(res => {
+                            ElMessage.success('删除成功')
+                            tableStore.index()
+                        })
+                    }
+                }
+            ]
+        }
+    ],
+
+    loadCallback: () => {}
+})
+tableStore.table.params.searchValue = ''
+tableStore.table.params.searchState = ''
+
+provide('tableStore', tableStore)
+
+const add = () => {
+    setTimeout(() => {
+        taskFormRef.value.open('新增定时任务')
+    }, 10)
+}
+const okRun = () => {
+    if (!formDate.value?.date) {
+        ElMessage.warning('请选择补招时间')
+        return
+    }
+    runTimer(formDate.value).then(res => {
+        ElMessage.success('操作成功')
+        dialogVisible.value = false
+        tableStore.index()
+    })
+}
+onMounted(() => {
+    tableStore.index()
+})
+</script>