Merge branch 'CC-system' into 'all'

修改人员分组删除提醒

See merge request skyeye/skyeye_frontend/skyeye-admin!146

src/views/message/constant.ts

@@ -1,29 +1,30 @@
 export const typeName = [
-    { value: 1, label: "平台违规报警" },
-    { value: 2, label: "平台访问统计" },
-    { value: 3, label: "人员访问数据" },
+  { value: 1, label: '平台违规报警' },
+  { value: 2, label: '平台访问统计' },
+  { value: 3, label: '人员访问数据' },
 ];
 export const statisticTypeName = [
-    { value: 1, label: "周报" },
-    { value: 2, label: "月报" },
-    { value: 3, label: "季报" },
-    { value: 4, label: "年报" },
-    { value: 5, label: "自定义" },
+  { value: 1, label: '周报' },
+  { value: 2, label: '月报' },
+  { value: 3, label: '季报' },
+  { value: 4, label: '年报' },
+  { value: 5, label: '自定义' },
 ];
 export const messageTypeName = [
-    { value: 1, label: "报表消息" },
-    { value: 2, label: "报警消息" },
-]
+  { value: 1, label: '报表消息' },
+  { value: 2, label: '报警消息' },
+  { value: 3, label: '系统消息' },
+];
 export const pushChannelName = [
-    { value: 1, label: "蓝信" },
-    { value: 2, label: "平台" },
-]
+  { value: 1, label: '蓝信' },
+  { value: 2, label: '平台' },
+];
 export const recipientTypeName = [
-    { value: 1, label: "全员" },
-    { value: 2, label: "分组" },
-    { value: 3, label: "自定义" }
-]
+  { value: 1, label: '全员' },
+  { value: 2, label: '分组' },
+  { value: 3, label: '自定义' },
+];
 export const statusName = [
-    { value: 0, label: "已推送" },
-    { value: 1, label: "未推送" },
-]
+  { value: 0, label: '已推送' },
+  { value: 1, label: '未推送' },
+];

src/views/message/persongroup/UserGroup.vue

@@ -52,7 +52,7 @@
             :key="index"
             style="display: flex; align-items: center"
           >
-            <span class="dot"></span>{{ getLabel(item.type, item.statisticType, item.messageType) }}
+            <span class="dot"></span>{{ getLabel(item.messageType) }}
           </div>
         </div>
         <div v-if="refGroup && refGroup.length > 3" @click="showAll = !showAll" class="more-button">
@@ -90,18 +90,16 @@ import viewIcon from '@/assets/images/reportmessage/view.png';
 import editIcon from '@/assets/images/reportmessage/edit.png';
 import deleteIcon from '@/assets/images/reportmessage/delete.png';
 import { ElMessage, ElMessageBox } from 'element-plus';
-import { typeName, statisticTypeName, messageTypeName } from '@/views/message/constant';
+import { messageTypeName } from '@/views/message/constant';
 const drawer = ref(false);
 const drawerTitle = ref<string>('新建人员分组');
 const handleCreateGroup = () => {
   drawer.value = true;
   drawerTitle.value = '新建人员分组';
 };
-const getLabel = (type, statisticType, messageType) => {
-  const typeLabel = typeName.find((item) => item.value === type)?.label;
-  const statisticTypeLabel = statisticTypeName.find((item) => item.value === statisticType)?.label;
+const getLabel = (messageType) => {
   const messageTypeLabel = messageTypeName.find((item) => item.value === messageType)?.label;
-  return `${messageTypeLabel}-${typeLabel} - ${statisticTypeLabel}`;
+  return `${messageTypeLabel}`;
 };
 const errorVisible = ref<boolean>(false);
 const showAll = ref<boolean>(false);
@@ -170,7 +168,10 @@ const handleDelete = (record: Recordable) => {
   })
     .then(() => {
       verifyUserGroup(record.userGroupId).then((res) => {
-        refGroup.value = res;
+        const uniqueRes = Array.from(
+          new Map(res.map((item) => [item.messageType, item])).values(),
+        ) as any;
+        refGroup.value = uniqueRes;
         if (refGroup.value?.length! > 0) {
           errorVisible.value = true;
         } else {