修改测试问题

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

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

src/components/cockpit/governanceReport/index.vue

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

src/components/cockpit/listOfMainMonitoringPoints/index.vue

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

src/components/tree/govern/deviceTree.vue

@@ -140,7 +140,7 @@ const info = (type?: string) => {
                 if (type == '2') {
                     //初始化选中
 
-                    treRef.value?.treeRef4.setCurrentKey(arr4[0].id)
+                    treRef.value?.treeRef4.setCurrentKey(arr4[0]?.id)
                     // 注册父组件事件
                     emit('init', {
                         level: 2,
@@ -150,7 +150,7 @@ const info = (type?: string) => {
                     return
                 }
                 if (arr.length > 0) {
-                    treRef.value.treeRef1.setCurrentKey(arr[0].id)
+                    treRef.value.treeRef1.setCurrentKey(arr[0]?.id)
                     // 注册父组件事件
                     emit('init', {
                         level: 2,
@@ -158,7 +158,7 @@ const info = (type?: string) => {
                     })
                     return
                 } else if (arr2.length > 0) {
-                    treRef.value.treeRef2.setCurrentKey(arr2[0].id)
+                    treRef.value.treeRef2.setCurrentKey(arr2[0]?.id)
                     // 注册父组件事件
                     emit('init', {
                         level: 2,

src/components/tree/govern/getMarketList.vue

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

src/components/tree/govern/officialUserTree.vue

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

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

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

src/layouts/admin/index.vue

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

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

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

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

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

src/views/govern/alarm/index.vue

@@ -7,15 +7,15 @@
             <el-tab-pane label="前置告警" name="2">
                 <Front v-if="activeName == '2'" :deviceTree="deviceTree" :key="key" />
             </el-tab-pane>
-            <!-- <el-tab-pane label="稳态越限告警" name="3">
+            <el-tab-pane label="稳态越限告警" name="3">
                 <Steady v-if="activeName == '3'" :deviceTree="deviceTree" :key="key" />
-            </el-tab-pane> -->
+            </el-tab-pane>
             <el-tab-pane label="暂态事件" name="4">
                 <Transient v-if="activeName == '4'" :deviceTree="deviceTree" :key="key" />
             </el-tab-pane>
-            <!-- <el-tab-pane label="异常事件" name="5">
+            <el-tab-pane label="异常事件" name="5">
                 <Abnormal v-if="activeName == '5'" :deviceTree="deviceTree" :key="key" />
-            </el-tab-pane> -->
+            </el-tab-pane>
         </el-tabs>
     </div>
 </template>

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

@@ -386,6 +386,7 @@ const saveIndicator = () => {
         .then((res: any) => {
             ElMessage.success(`保存成功`)
             loading.value = false
+            tableStore.index()
         })
         .catch(() => {
             loading.value = false

src/views/govern/cloudDeviceEntry/index.vue

@@ -2710,7 +2710,7 @@ const volGradeChange = (e, row) => {
             capacity = 750
             break
         case '35':
-            capacity = 259
+            capacity = 250
             break
         case '10':
             capacity = 100
@@ -2730,9 +2730,7 @@ const volGradeChange = (e, row) => {
         case '750':
             capacity = 7000
             break
-        case '800':
+       
-            capacity = 7000
-            break
         case '1000':
             capacity = 9000
             break

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

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

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

@@ -171,6 +171,7 @@ const defaultProps = {
     label: 'name'
 }
 const selectUser = (e: any) => {
+      if (e == undefined) return (loading.value = false)
     user.value = e
     loading.value = true
 

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

@@ -28,7 +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'
+import { debounce } from 'lodash-es'
 const pageHeight = mainHeight(60)
 const loading = ref(true)
 const defaultCheckedKeys: any = ref([])
@@ -36,7 +36,7 @@ const tableData = ref([])
 const treeRef = ref(null)
 const ignoreCheckChange = ref(false)
 const checkChange = (data: any) => {
-    console.log('🚀 ~ checkChange ~ data:', data)
+    if (data == undefined) return (loading.value = false)
     if (data.data.pName == '便携式设备') {
         if (ignoreCheckChange.value) {
             ignoreCheckChange.value = false // 清除标记，不影响后续正常触发
@@ -57,7 +57,7 @@ const checkChange = (data: any) => {
         updateVisitorConfigs()
     }
 }
-const updateVisitorConfigs = debounce (() => {
+const updateVisitorConfigs = debounce(() => {
     const result = Array.from(new Set(defaultCheckedKeys.value))
     updateVisitorConfig(
         result.map(item => {
@@ -70,7 +70,7 @@ const updateVisitorConfigs = debounce (() => {
             getVisitorConfigs()
         }
     })
-},500)
+}, 500)
 const getVisitorConfigs = () => {
     getVisitorConfig().then((res: any) => {
         if (res.code === 'A0000') {

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

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

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

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

src/views/govern/manage/factory.vue

@@ -3,8 +3,12 @@
         <TableHeader>
             <template v-slot:select>
                 <el-form-item label="关键字筛选">
-                    <el-input v-model.trim="tableStore.table.params.searchValue" style="width: 200px" clearable
+                    <el-input
-                        placeholder="请输入设备名称/网络设备ID" />
+                        v-model.trim="tableStore.table.params.searchValue"
+                        style="width: 200px"
+                        clearable
+                        placeholder="请输入设备名称/网络设备ID"
+                    />
                 </el-form-item>
                 <!-- <el-form-item label="流程阶段">
                     <el-select v-model.trim="tableStore.table.params.process" clearable placeholder="请选择状态">
@@ -14,7 +18,11 @@
                     </el-select>
                 </el-form-item> -->
                 <el-form-item label="物联状态">
-                    <el-select v-model.trim="tableStore.table.params.connectStatus" clearable placeholder="请选择物联状态">
+                    <el-select
+                        v-model.trim="tableStore.table.params.connectStatus"
+                        clearable
+                        placeholder="请选择物联状态"
+                    >
                         <el-option label="已连接" :value="1"></el-option>
                         <el-option label="未连接" :value="0"></el-option>
                     </el-select>
@@ -77,40 +85,77 @@
                 <el-button type="primary" @click="downLoadFile1" class="ml10" icon="el-icon-Download">
                     模版下载
                 </el-button>
-                <el-upload style="display: inline-block" action="" accept=".xlsx" class="upload-demo"
+                <el-upload
-                    :show-file-list="false" :auto-upload="false" :on-change="bulkImport">
+                    style="display: inline-block"
+                    action=""
+                    accept=".xlsx"
+                    class="upload-demo"
+                    :show-file-list="false"
+                    :auto-upload="false"
+                    :on-change="bulkImport"
+                >
                     <el-button type="primary" class="ml10" icon="el-icon-Tickets">批量导入</el-button>
                 </el-upload>
                 <el-button type="primary" class="ml10" @click="add" icon="el-icon-Plus">新增设备</el-button>
-                <el-button type="primary" class="ml10" icon="el-icon-Download" @click="downLoadQrCode"
+                <el-button
-                    :disabled="!showQrCode">
+                    type="primary"
+                    class="ml10"
+                    icon="el-icon-Download"
+                    @click="downLoadQrCode"
+                    :disabled="!showQrCode"
+                >
                     批量下载二维码
                 </el-button>
             </template>
         </TableHeader>
         <Table ref="tableRef" :checkbox-config="checkboxConfig" :key="tableKey" @sort-change="handleSortChange"></Table>
 
-        <el-dialog :title="dialogTitle" v-model.trim="dialogFormVisible" :close-on-click-modal="false"
+        <el-dialog
-            :before-close="resetForm" draggable width="800px">
+            :title="dialogTitle"
+            v-model.trim="dialogFormVisible"
+            :close-on-click-modal="false"
+            :before-close="resetForm"
+            draggable
+            width="800px"
+        >
             <el-form :model="form" label-width="auto" :rules="rules" ref="ruleFormRef" class="form-two">
                 <el-form-item label="设备名称:" prop="name">
-                    <el-input maxlength="32" show-word-limit v-model.trim="form.name" autocomplete="off" clearable
+                    <el-input
-                        placeholder="请输入（项目名称+设备名称）"></el-input>
+                        maxlength="32"
+                        show-word-limit
+                        v-model.trim="form.name"
+                        autocomplete="off"
+                        clearable
+                        placeholder="请输入（项目名称+设备名称）"
+                    ></el-input>
                 </el-form-item>
                 <el-form-item label="网络设备ID:" prop="ndid" class="top">
-                    <el-input maxlength="32" show-word-limit v-model.trim="form.ndid" autocomplete="off"
+                    <el-input
-                        placeholder="请输入"></el-input>
+                        maxlength="32"
+                        show-word-limit
+                        v-model.trim="form.ndid"
+                        autocomplete="off"
+                        placeholder="请输入"
+                    ></el-input>
                 </el-form-item>
                 <el-form-item label="设备类型:" prop="devType" class="top">
                     <el-select v-model.trim="form.devType" placeholder="请选择" @change="formDevTypeChange" clearable>
-                        <el-option v-for="item in formDevTypeOptions" :key="item.value" :label="item.label || item.name"
+                        <el-option
-                            :value="item.value || item.id"></el-option>
+                            v-for="item in formDevTypeOptions"
+                            :key="item.value"
+                            :label="item.label || item.name"
+                            :value="item.value || item.id"
+                        ></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="设备型号:" prop="devModel" class="top">
                     <el-select v-model.trim="form.devModel" filterable placeholder="请选择" clearable>
-                        <el-option v-for="item in formDevModelOptionsFilter" :key="item.value" :label="item.label"
+                        <el-option
-                            :value="item.value"></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="devAccessMethod" class="top">
@@ -120,8 +165,13 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="关联项目:" class="top">
-                    <el-cascader v-model.trim="form.association" filterable :options="engineeringList" :props="props"
+                    <el-cascader
-                        clearable />
+                        v-model.trim="form.association"
+                        filterable
+                        :options="engineeringList"
+                        :props="props"
+                        clearable
+                    />
                 </el-form-item>
                 <el-form-item label="排序:" class="top" prop="sort">
                     <el-input maxlength="32" show-word-limit-number v-model.trim="form.sort" :min="0" />
@@ -722,17 +772,23 @@ const tableStore = new TableStore({
                 },
                 {
                     name: 'edit',
-                    title: '重启',
+                    title: '重置',
                     type: 'primary',
                     icon: 'el-icon-EditPen',
                     render: 'basicButton',
 
                     click: async row => {
-                        resetFactory({
+                        ElMessageBox.confirm('确定重置该设备吗?', '提示', {
-                            nDid: row.ndid
+                            confirmButtonText: '确认',
-                        }).then(res => {
+                            cancelButtonText: '取消',
-                            ElMessage.success('重启成功!')
+                            type: 'warning'
-                            tableStore.onTableAction('search', {})
+                        }).then(() => {
+                            resetFactory({
+                                nDid: row.ndid
+                            }).then(res => {
+                                ElMessage.success('重置成功!')
+                                tableStore.onTableAction('search', {})
+                            })
                         })
                     }
                 },
@@ -754,7 +810,7 @@ const tableStore = new TableStore({
                                     tableStore.onTableAction('search', {})
                                 })
                             })
-                            .catch(e => { })
+                            .catch(e => {})
                     }
                 }
             ]
@@ -985,10 +1041,10 @@ onMounted(() => {
         })
     })
 
-    setTimeout(() => { }, 100)
+    setTimeout(() => {}, 100)
 })
 
-const addMenu = () => { }
+const addMenu = () => {}
 </script>
 <style lang="scss" scoped>
 .qrcode-label {

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

@@ -27,7 +27,7 @@
                 ></vxe-column>
             </template>
         </Table>
-        <el-dialog width="600px" v-model.trim="dialogVisible" title="新增版本">
+        <el-dialog width="500px" v-model.trim="dialogVisible" title="新增版本">
             <el-form :inline="false" :model="form" ref="formRef" label-width="auto" class="form-one" :rules="rules">
                 <el-form-item label="版本号:" prop="appVersion">
                     <el-input

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