Merge branch 'perf/wechat-message' into 'main_dev'

perf:告警联系人微信添加提示

See merge request yunteng/thingskit-front!1042

@@ -4,6 +4,9 @@ import { defHttp } from '/@/utils/http/axios';
 enum Api {
 enum Api {
   DEVICE_PROFILE_CATEGORY = '/device_profile/category',
   DEVICE_PROFILE_CATEGORY = '/device_profile/category',
 }
 }
+// export enum CATEGORY_POST {
+
+// }
 
 
 /**
 /**
  * 新增产品分类
  * 新增产品分类

@@ -8,6 +8,7 @@ import {
 enum MessageRecordsApi {
 enum MessageRecordsApi {
   SMS_RECORDS = '/sms_log',
   SMS_RECORDS = '/sms_log',
   EMAIL_RECORDS = '/mail_log',
   EMAIL_RECORDS = '/mail_log',
+  MESSAGE_RECORDS = '/message_log',
 }
 }
 
 
 /**
 /**
@@ -16,7 +17,7 @@ enum MessageRecordsApi {
  */
  */
 export const smsLogPage = (params: MessageRecordsParams) => {
 export const smsLogPage = (params: MessageRecordsParams) => {
   return defHttp.get<SmsLogModelResult>({
   return defHttp.get<SmsLogModelResult>({
-    url: MessageRecordsApi.SMS_RECORDS,
+    url: MessageRecordsApi.MESSAGE_RECORDS,
     params,
     params,
   });
   });
 };
 };
@@ -49,7 +50,7 @@ export const deleteMailLog = (ids: string[]) =>
  */
  */
 export const deleteSmsLog = (ids: string[]) =>
 export const deleteSmsLog = (ids: string[]) =>
   defHttp.delete({
   defHttp.delete({
-    url: MessageRecordsApi.SMS_RECORDS,
+    url: MessageRecordsApi.MESSAGE_RECORDS,
     data: {
     data: {
       ids: ids,
       ids: ids,
     },
     },

@@ -7,7 +7,19 @@
     width="30%"
     width="30%"
     @ok="handleSubmit"
     @ok="handleSubmit"
   >
   >
-    <BasicForm @register="registerForm" />
+    <BasicForm @register="registerForm">
+      <template #wechatMessage>
+        <div>
+          <Typography>
+            <TypographyParagraph
+              class="w-99/100"
+              :ellipsis="{ rows: 1, expandable: true, symbol: '展开' }"
+              content="注意事项:微信通知人必须在thingskit小程序中绑定使用账号,未绑定则接收不到通知"
+            />
+          </Typography>
+        </div>
+      </template>
+    </BasicForm>
   </BasicDrawer>
   </BasicDrawer>
 </template>
 </template>
 <script lang="ts">
 <script lang="ts">
@@ -17,10 +29,11 @@
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import { saveOrEditAlarmContact } from '/@/api/alarm/contact/alarmContact';
   import { saveOrEditAlarmContact } from '/@/api/alarm/contact/alarmContact';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { TypographyParagraph, Typography } from 'ant-design-vue';
 
 
   export default defineComponent({
   export default defineComponent({
     name: 'ContactDrawer',
     name: 'ContactDrawer',
-    components: { BasicDrawer, BasicForm },
+    components: { BasicDrawer, BasicForm, TypographyParagraph, Typography },
     emits: ['success', 'register'],
     emits: ['success', 'register'],
     setup(_, { emit }) {
     setup(_, { emit }) {
       const isUpdate = ref(true);
       const isUpdate = ref(true);
@@ -74,3 +87,10 @@
     },
     },
   });
   });
 </script>
 </script>
+
+<style lang="less" scoped>
+  :deep(.ant-typography-single-line) {
+    white-space: normal;
+    margin-bottom: 0 !important;
+  }
+</style>

@@ -114,6 +114,13 @@ export const formSchema: FormSchema[] = [
     },
     },
   },
   },
   {
   {
+    field: 'wechatMessage',
+    label: ' ',
+    slot: 'wechatMessage',
+    component: 'Input',
+    ifShow: ({ model }) => model.wechat,
+  },
+  {
     field: 'dingtalk',
     field: 'dingtalk',
     label: '钉钉',
     label: '钉钉',
     component: 'Input',
     component: 'Input',

@@ -25,7 +25,6 @@
   const recordInfo = ref<any>({});
   const recordInfo = ref<any>({});
 
 
   const [register, { closeModal, setModalProps }] = useModalInner(async (data) => {
   const [register, { closeModal, setModalProps }] = useModalInner(async (data) => {
-    console.log(123131, data);
     setModalProps({ confirmLoading: false, loading: true });
     setModalProps({ confirmLoading: false, loading: true });
     isUpdate.value = data?.isUpdate;
     isUpdate.value = data?.isUpdate;
     recordInfo.value = data?.record;
     recordInfo.value = data?.record;

@@ -78,7 +78,7 @@
       </template>
       </template>
       <template #action="{ record }">
       <template #action="{ record }">
         <Button type="link" :disabled="categoryId === record.id" @click="handleChecked(record)">{{
         <Button type="link" :disabled="categoryId === record.id" @click="handleChecked(record)">{{
-          categoryId === record.id ? '已选择' : '选择'
+          categoryId === record?.id ? '已选择' : '选择'
         }}</Button>
         }}</Button>
       </template>
       </template>
     </BasicTable>
     </BasicTable>

@@ -58,7 +58,6 @@
     importCsvDeviceProfileId,
     importCsvDeviceProfileId,
     excelExport,
     excelExport,
   } from '/@/api/device/modelOfMatter';
   } from '/@/api/device/modelOfMatter';
-  // import XLSX, { CellObject } from 'xlsx';
   import { useLoading } from '/@/components/Loading';
   import { useLoading } from '/@/components/Loading';
   import JSONImage from '/@/assets/svg/JSON.svg';
   import JSONImage from '/@/assets/svg/JSON.svg';
   import CSVImage from '/@/assets/svg/excel.svg';
   import CSVImage from '/@/assets/svg/excel.svg';