diff --git a/src/assets/logotype.png b/src/assets/logotype.png
new file mode 100644
index 0000000..fdb4131
Binary files /dev/null and b/src/assets/logotype.png differ
diff --git a/src/types/auto-imports.d.ts b/src/types/auto-imports.d.ts
index e5c7bdb..5742656 100644
--- a/src/types/auto-imports.d.ts
+++ b/src/types/auto-imports.d.ts
@@ -5,6 +5,8 @@ declare global {
   const ElForm: typeof import('element-plus/es')['ElForm']
   const ElMessage: typeof import('element-plus/es')['ElMessage']
   const ElMessageBox: typeof import('element-plus/es')['ElMessageBox']
+  const ElNotification: typeof import('element-plus/es')['ElNotification']
+  const NEllipsis: typeof import('naive-ui')['NEllipsis']
   const asyncComputed: typeof import('@vueuse/core')['asyncComputed']
   const autoResetRef: typeof import('@vueuse/core')['autoResetRef']
   const computed: typeof import('vue')['computed']
@@ -274,6 +276,8 @@ declare module 'vue' {
     readonly ElForm: UnwrapRef<typeof import('element-plus/es')['ElForm']>
     readonly ElMessage: UnwrapRef<typeof import('element-plus/es')['ElMessage']>
     readonly ElMessageBox: UnwrapRef<typeof import('element-plus/es')['ElMessageBox']>
+    readonly ElNotification: UnwrapRef<typeof import('element-plus/es')['ElNotification']>
+    readonly NEllipsis: UnwrapRef<typeof import('naive-ui')['NEllipsis']>
     readonly asyncComputed: UnwrapRef<typeof import('@vueuse/core')['asyncComputed']>
     readonly autoResetRef: UnwrapRef<typeof import('@vueuse/core')['autoResetRef']>
     readonly computed: UnwrapRef<typeof import('vue')['computed']>
diff --git a/src/views/dataScreen/components/header.vue b/src/views/dataScreen/components/header.vue
index be47d60..72a3469 100644
--- a/src/views/dataScreen/components/header.vue
+++ b/src/views/dataScreen/components/header.vue
@@ -298,6 +298,7 @@ function waringConfirm(item: any) {
           getwaringList();
           ElMessage({
             message: res.msg,
+            grouping: true, //分组消息合并
             type: 'success'
           });
         }
diff --git a/src/views/monitoring/components/header.vue b/src/views/monitoring/components/header.vue
index a775a0f..4303d75 100644
--- a/src/views/monitoring/components/header.vue
+++ b/src/views/monitoring/components/header.vue
@@ -320,6 +320,7 @@ function waringConfirm(item: any) {
           getwaringList();
           ElMessage({
             message: res.msg,
+            grouping: true, //分组消息合并
             type: 'success'
           });
         }
diff --git a/src/views/monitoring/devicemanage/components/header.vue b/src/views/monitoring/devicemanage/components/header.vue
index be47d60..72a3469 100644
--- a/src/views/monitoring/devicemanage/components/header.vue
+++ b/src/views/monitoring/devicemanage/components/header.vue
@@ -298,6 +298,7 @@ function waringConfirm(item: any) {
           getwaringList();
           ElMessage({
             message: res.msg,
+            grouping: true, //分组消息合并
             type: 'success'
           });
         }
diff --git a/src/views/monitoring/screen/components/main.vue b/src/views/monitoring/screen/components/main.vue
index 4a8ec5e..e674241 100644
--- a/src/views/monitoring/screen/components/main.vue
+++ b/src/views/monitoring/screen/components/main.vue
@@ -455,13 +455,19 @@ const formatRole: VxeColumnPropTypes.Formatter<HeaderVo> = ({ cellValue }) => {
   // const iconFont=cellValue.changeProp===-1?'<i class="iconfont icon-decline" />':(cellValue.changeProp===1?'<i class="iconfont icon-rise" />':'<i/>')
   // const cellData = `<span class="cellClass ${cellValue.alertProp===1?'warning':''}">${cellValue.val}</span>${iconFont}`;
   // const cellData = `<span class="cellClass ${cellValue.alertProp === 1 ? 'warning' : cellValue.canBeControl === '1' ? 'cellEdit' : ''}">${cellValue.val}</span><i class="iconfont ${cellValue.changeProp === -1 ? 'icon-decline' : cellValue.changeProp === 1 ? 'icon-rise' : ''}" ></i>${cellValue.canBeControl === '1' ? '<i class="iconfont icon-edit-icon"></i>' : ''}`;
-  const cellData = `<span class="cellClass ${
-    cellValue.alertProp === 1 ? 'warning' : cellValue.canBeControl === '1' ? 'cellEdit' : ''
-  }">${
-    cellValue.ctrlPro.valueType != 'bool' ? cellValue.val : cellValue.val === 'true' ? '启' : '停'
-  }</span><i class="iconfont ${
-    cellValue.changeProp === -1 ? 'icon-decline' : cellValue.changeProp === 1 ? 'icon-rise' : ''
-  }" ></i>${cellValue.canBeControl === '1' && controlPerm ? '<i class="iconfont icon-edit-icon"></i>' : ''}`;
+  // const cellData = `
+  // <span class="cellClass ${cellValue.alertProp === 1 ? 'warning' : cellValue.canBeControl === '1' ? 'cellEdit' : ''}">
+  //   ${cellValue.ctrlPro.valueType != 'bool' ? cellValue.val : cellValue.val === 'true' ? '启' : '停'}
+  //   </span>
+  //   <i class="iconfont ${
+  //     cellValue.changeProp === -1 ? 'icon-decline' : cellValue.changeProp === 1 ? 'icon-rise' : ''
+  //   }" ></i>
+  //   ${cellValue.canBeControl === '1' && controlPerm ? '<i class="iconfont icon-edit-icon"></i>' : ''}`;
+  const cellData = `
+  <span class="cellClass ${cellValue.alertProp === 1 ? 'warning' : cellValue.canBeControl === '1' ? 'cellEdit' : ''}">
+    ${cellValue.ctrlPro.valueType != 'bool' ? cellValue.val : cellValue.val === 'true' ? '启' : '停'}
+    </span>
+    ${cellValue.canBeControl === '1' && controlPerm ? '<i class="iconfont icon-edit-icon"></i>' : ''}`;
   return cellData;
 };