From 9911888e79652f31af75d12b2c99cb2a9e462b6d Mon Sep 17 00:00:00 2001
From: fuguobin <fgbin2008@163.com>
Date: Fri, 15 Dec 2023 16:17:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=95=B0=E5=80=BC=E5=8F=98?=
 =?UTF-8?q?=E5=8C=96=E7=AE=AD=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/logotype.png                       | Bin 0 -> 6020 bytes
 src/types/auto-imports.d.ts                   |   4 ++++
 src/views/dataScreen/components/header.vue    |   1 +
 src/views/monitoring/components/header.vue    |   1 +
 .../devicemanage/components/header.vue        |   1 +
 .../monitoring/screen/components/main.vue     |  20 ++++++++++++------
 6 files changed, 20 insertions(+), 7 deletions(-)
 create mode 100644 src/assets/logotype.png

diff --git a/src/assets/logotype.png b/src/assets/logotype.png
new file mode 100644
index 0000000000000000000000000000000000000000..fdb41313dccf002e2dc401b9ade42b89ab2b270a
GIT binary patch
literal 6020
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

literal 0
HcmV?d00001

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;
 };