Merge branch 'fix/DEFEC-1823' into 'main_dev'

fix: 修改告警记录信息清楚未确认选项 See merge request yunteng/thingskit-front!1125

Merge branch 'fix/DEFEC-1823' into 'main_dev'
fix: 修改告警记录信息清楚未确认选项 See merge request yunteng/thingskit-front!1125
xp.Huang
2 parents d89a9f01 80b46a8c
Showing 7 changed files with 64 additions and 13 deletions
src/enums/messageEnum.ts
src/views/alarm/log/config/detail.config.ts
src/views/dataview/publicApi/list.vue
src/views/message/config/ConfigDrawer.vue
src/views/message/config/config.data.ts
src/views/message/template/TemplateDrawer.vue
src/views/message/template/template.data.ts
--- a/src/enums/messageEnum.ts
View file @1ccf953
+++ b/src/enums/messageEnum.ts
View file @1ccf953
@@ -2,4 +2,5 @@ export enum MessageEnum {
   IS_SMS = 'PHONE_MESSAGE',
   IS_EMAIL = 'EMAIL_MESSAGE',
   IS_DINGTALK = 'DING_TALK_MESSAGE',
+  IS_VOICE = 'VOICE_MESSAGE',
 }
--- a/src/views/alarm/log/config/detail.config.ts
View file @1ccf953
+++ b/src/views/alarm/log/config/detail.config.ts
View file @1ccf953
@@ -17,7 +17,7 @@ export const getAlarmSearchSchemas = (deviceAlaramDetailMode?: boolean): FormSch
         '激活未确认: 可以处理，清除',
         '激活已确认: 只可清除，已经处理',
         '清除未确认: 只可处理，已经清除',
-        '清除已确认: 不需要做处理和清除',
+        // '清除已确认: 不需要做处理和清除',
       ],
       componentProps: {
         popupClassName: 'alarm-stauts-cascader',
@@ -26,10 +26,10 @@ export const getAlarmSearchSchemas = (deviceAlaramDetailMode?: boolean): FormSch
             value: '0',
             label: '清除',
             children: [
-              {
-                value: AlarmStatus.CLEARED_UN_ACK,
-                label: '清除未确认',
-              },
+              // {
+              //   value: AlarmStatus.CLEARED_UN_ACK,
+              //   label: '清除未确认',
+              // },
               {
                 value: AlarmStatus.CLEARED_ACK,
                 label: '清除已确认',
--- a/src/views/dataview/publicApi/list.vue
View file @1ccf953
+++ b/src/views/dataview/publicApi/list.vue
View file @1ccf953
@@ -30,7 +30,9 @@
             cancel-text="取消"
             @confirm="handleBatchPublish('batchPublish')"
           >
-            <a-button color="error" :disabled="hasBatchPublish"> 批量发布 </a-button>
+            <a-button :style="publishButtonBg" :disabled="hasBatchPublish">
+              <span :style="publishButtonTextColor">批量发布</span>
+            </a-button>
           </Popconfirm>
         </Authority>
         <!-- <Popconfirm
@@ -93,7 +95,7 @@
   <PublicApiForm @register="registerDrawer" @success="handleSuccess" />
 </template>
 <script lang="ts" setup name="list">
-  import { h, ref } from 'vue';
+  import { h, ref, computed } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { useDrawer } from '/@/components/Drawer';
   import { columns, searchFormSchema } from './config/config';
@@ -150,6 +152,14 @@
   const { createMessage } = useMessage();
+  const publishButtonBg = computed(() => {
+    return { backgroundColor: `rgba(0, 128, 0, ${hasBatchPublish.value ? 0.5 : 1})` };
+  });
+
+  const publishButtonTextColor = computed(() => {
+    return { color: `rgba(255, 255, 255, ${hasBatchPublish.value ? 0.5 : 1})` };
+  });
+
   const handleSuccess = () => {
     reload();
     setStatusIsTrue();
--- a/src/views/message/config/ConfigDrawer.vue
View file @1ccf953
+++ b/src/views/message/config/ConfigDrawer.vue
View file @1ccf953
@@ -80,6 +80,11 @@
               clientId: values?.clientId,
               clientSecret: values?.clientSecret,
             };
+          } else if (values.messageType === 'VOICE_MESSAGE') {
+            config = {
+              accessKeyId: values.accessKeyId,
+              accessKeySecret: values.accessKeySecret,
+            };
           }
           Reflect.set(values, 'config', config);
           let saveMessage = '添加成功';
--- a/src/views/message/config/config.data.ts
View file @1ccf953
+++ b/src/views/message/config/config.data.ts
View file @1ccf953
@@ -82,6 +82,9 @@ export const isEmail = (type: string) => {
 export const isDingtalk = (type: string) => {
   return type === MessageEnum.IS_DINGTALK;
 };
+export const isVoice = (type: string) => {
+  return type === MessageEnum.IS_VOICE;
+};
 export const messageTypeIsTencentCloud = (type: string) => {
   return type === 'TENCENT_CLOUD';
 };
@@ -122,9 +125,13 @@ export const formSchema: FormSchema[] = [
           try {
             const result = await findDictItemByCode(params as any);
             if (isMessage(Reflect.get(formModel, 'messageType')))
-              return result.filter((item) => item.itemValue !== 'DING_TALK');
+              return result.filter(
+                (item) => item.itemValue !== 'DING_TALK' && item.itemValue !== 'ALI_VOICE'
+              );
             if (isDingtalk(Reflect.get(formModel, 'messageType')))
               return result.filter((item) => item.itemValue === 'DING_TALK');
+            if (isVoice(Reflect.get(formModel, 'messageType')))
+              return result.filter((item) => item.itemValue === 'ALI_VOICE');
           } catch (e) {
             // eslint-disable-next-line no-console
             console.error(e);
@@ -140,7 +147,8 @@ export const formSchema: FormSchema[] = [
     },
     ifShow: ({ values }) =>
       isMessage(Reflect.get(values, 'messageType')) ||
-      isDingtalk(Reflect.get(values, 'messageType')),
+      isDingtalk(Reflect.get(values, 'messageType')) ||
+      isVoice(Reflect.get(values, 'messageType')),
   },
   {
     field: 'appId',
@@ -187,7 +195,8 @@ export const formSchema: FormSchema[] = [
       placeholder: '请输入accessKeyId',
     },
     ifShow: ({ values }) =>
-      isMessage(Reflect.get(values, 'messageType')) &&
+      (isMessage(Reflect.get(values, 'messageType')) ||
+        isVoice(Reflect.get(values, 'messageType'))) &&
       !messageTypeIsTencentCloud(Reflect.get(values, 'platformType')),
   },
   {
@@ -201,7 +210,8 @@ export const formSchema: FormSchema[] = [
     component: 'InputPassword',
     ifShow: ({ values }) =>
-      isMessage(Reflect.get(values, 'messageType')) &&
+      (isMessage(Reflect.get(values, 'messageType')) ||
+        isVoice(Reflect.get(values, 'messageType'))) &&
       !messageTypeIsTencentCloud(Reflect.get(values, 'platformType')),
   },
   {
--- a/src/views/message/template/TemplateDrawer.vue
View file @1ccf953
+++ b/src/views/message/template/TemplateDrawer.vue
View file @1ccf953
@@ -19,6 +19,8 @@
   import { saveOrEditMessageTemplate } from '/@/api/message/template';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { findMessageConfig } from '/@/api/message/config';
+  import { MessageEnum } from '/@/enums/messageEnum';
+
   export default defineComponent({
     name: 'TemplateDrawer',
     components: { BasicDrawer, BasicForm },
@@ -41,6 +43,14 @@
             Reflect.set(data.record, key + '', config[key]);
           }
           await setFieldsValue(data.record);
+          if (
+            Reflect.get(data.record, 'messageType') === MessageEnum.IS_VOICE &&
+            Reflect.get(data.record, 'signName')
+          ) {
+            setFieldsValue({
+              voiceSignName: data.record['signName'],
+            });
+          }
           const res = await findMessageConfig({});
           const options = res.map((item) => {
             return {
@@ -122,6 +132,9 @@
             };
           }
           Reflect.set(values, 'config', config);
+          if (Reflect.get(values, 'messageType') === MessageEnum.IS_VOICE) {
+            Reflect.set(values, 'signName', values['voiceSignName']);
+          }
           let saveMessage = '添加成功';
           let updateMessage = '修改成功';
           await saveOrEditMessageTemplate(values, unref(isUpdate));
--- a/src/views/message/template/template.data.ts
View file @1ccf953
+++ b/src/views/message/template/template.data.ts
View file @1ccf953
@@ -2,7 +2,7 @@ import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { findMessageConfig } from '/@/api/message/config';
-import { isDingtalk, isMessage } from '/@/views/message/config/config.data';
+import { isDingtalk, isMessage, isVoice } from '/@/views/message/config/config.data';
 export enum PlateFormTypeEnum {
   ali_cound = 'ALI_CLOUD',
@@ -206,7 +206,19 @@ export const formSchema: FormSchema[] = [
       placeholder: '请输入模板编号',
     },
-    ifShow: ({ values }) => isMessage(Reflect.get(values, 'messageType')),
+    ifShow: ({ values }) =>
+      isMessage(Reflect.get(values, 'messageType')) || isVoice(Reflect.get(values, 'messageType')),
+  },
+  {
+    field: 'voiceSignName',
+    label: '专属号码',
+    component: 'Input',
+    helpMessage: ['只有在模板为专属模式外呼下填入此参数，否则无效'],
+    componentProps: {
+      maxLength: 20,
+      placeholder: '请输入专属号码',
+    },
+    ifShow: ({ values }) => isVoice(Reflect.get(values, 'messageType')),
   },
   {
     field: 'signName',