Merge branch 'dev-ft' into 'main'

feat:告警配置新增通过组织获取告警联系人租户配置新增权限标识 See merge request huang/yun-teng-iot-front!306

Merge branch 'dev-ft' into 'main'
feat:告警配置新增通过组织获取告警联系人租户配置新增权限标识 See merge request huang/yun-teng-iot-front!306
xp.Huang
2 parents 37658165 a4fe715a
Showing 5 changed files with 77 additions and 29 deletions
src/api/alarm/config/alarmConfig.ts
src/views/alarm/config/ContactDrawer.vue
src/views/alarm/config/config.data.ts
src/views/system/menu/menu.data.ts
src/views/tenant/list/TenantAdminDrawer.vue
--- a/src/api/alarm/config/alarmConfig.ts
View file @a3355c0
+++ b/src/api/alarm/config/alarmConfig.ts
View file @a3355c0
@@ -15,8 +15,16 @@ enum API {
   deleteAlarmConfig = '/alarm/profile',
   getAlarmConfig = '/alarm/profile',
   getAlarmConfigStatus = '/alarm/profile',
+  byOrgIdGetAlarmContactApi = '/alarmContact/',
 }
+//根据组织id获取对应告警联系人
+export const byOrgIdGetAlarmContact = (params) => {
+  return defHttp.get({
+    url: API.byOrgIdGetAlarmContactApi + params,
+  });
+};
+
 // 获取
 export const getAlarmContact = (params: ContactPageParams) => {
   return getPageData<ContactModal>(params, API.alarmContact);
--- a/src/views/alarm/config/ContactDrawer.vue
View file @a3355c0
+++ b/src/views/alarm/config/ContactDrawer.vue
View file @a3355c0
@@ -15,7 +15,7 @@
   import { BasicForm, useForm } from '/@/components/Form';
   import { formSchema } from './config.data';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import { saveOrEditAlarmConfig } from '/@/api/alarm/config/alarmConfig';
+  import { saveOrEditAlarmConfig, byOrgIdGetAlarmContact } from '/@/api/alarm/config/alarmConfig';
   import { useMessage } from '/@/hooks/web/useMessage';
   export default defineComponent({
@@ -26,7 +26,7 @@
       const isUpdate = ref(true);
       let allData: any = reactive({});
       const editId = ref('');
-      const [registerForm, { validate, setFieldsValue, resetFields }] = useForm({
+      const [registerForm, { validate, setFieldsValue, resetFields, updateSchema }] = useForm({
         labelWidth: 120,
         schemas: formSchema,
         showActionButtonGroup: false,
@@ -40,16 +40,32 @@
           editId.value = data.record?.id;
         }
         if (unref(isUpdate)) {
-          if (data.record.organizationDTO) {
-            await setFieldsValue(data.record);
-          } else {
-            await setFieldsValue(data.record);
-            await setFieldsValue({
-              alarmContactId: data.record?.alarmContactId.split(','),
-              messageMode: data.record?.messageMode.split(','),
+          const res = await byOrgIdGetAlarmContact(data.record.organizationId);
+          if (res.length !== 0) {
+            const opts = res.map((m) => {
+              return { label: m.username, value: m.id };
+            });
+            updateSchema({
+              field: 'alarmContactId',
+              componentProps: {
+                mode: 'multiple',
+                options: opts,
+              },
             });
           }
+          await setFieldsValue(data.record);
+          await setFieldsValue({
+            alarmContactId: data.record?.alarmContactId.split(','),
+            messageMode: data.record?.messageMode.split(','),
+          });
         } else {
+          updateSchema({
+            field: 'alarmContactId',
+            componentProps: {
+              mode: 'multiple',
+              options: [],
+            },
+          });
         }
       });
--- a/src/views/alarm/config/config.data.ts
View file @a3355c0
+++ b/src/views/alarm/config/config.data.ts
View file @a3355c0
@@ -2,7 +2,7 @@ import { BasicColumn, FormSchema } from '/@/components/Table';
 import { getOrganizationList } from '/@/api/system/system';
 import { copyTransFun } from '/@/utils/fnUtils';
 import { findDictItemByCode } from '/@/api/system/dict';
-import { alarmContactGetPage } from '/@/api/device/deviceConfigApi';
+import { byOrgIdGetAlarmContact } from '/@/api/alarm/config/alarmConfig';
 // 表格列数据
 export const columns: BasicColumn[] = [
@@ -101,27 +101,43 @@ export const formSchema: FormSchema[] = [
     label: '所属组织',
     component: 'ApiTreeSelect',
     required: true,
-    componentProps: {
-      api: async () => {
-        const data = await getOrganizationList();
-        copyTransFun(data as any as any[]);
-        return data;
-      },
+    componentProps: ({ formActionType }) => {
+      const { updateSchema, setFieldsValue } = formActionType;
+      return {
+        maxLength: 250,
+        placeholder: '请选择所属组织',
+        api: async () => {
+          const data = await getOrganizationList();
+          copyTransFun(data as any as any[]);
+          return data;
+        },
+        async onChange(e) {
+          setFieldsValue({
+            alarmContactId: [],
+          });
+          const res = await byOrgIdGetAlarmContact(e);
+          let opts = [];
+          if (res.length !== 0) {
+            opts = res.map((m) => {
+              return { label: m.username, value: m.id };
+            });
+            updateSchema({
+              field: 'alarmContactId',
+              componentProps: {
+                mode: 'multiple',
+                options: opts,
+              },
+            });
+          }
+        },
+      };
     },
   },
   {
     field: 'alarmContactId',
-    label: '告警通知联系人',
-    component: 'ApiSelect',
+    label: '告警联系人',
+    component: 'Select',
     required: true,
-    componentProps: {
-      mode: 'multiple',
-      placeholder: '请选择告警通知联系人',
-      api: alarmContactGetPage,
-      labelField: 'username',
-      valueField: 'id',
-      resultField: 'items',
-    },
   },
   {
     field: 'messageMode',
--- a/src/views/system/menu/menu.data.ts
View file @a3355c0
+++ b/src/views/system/menu/menu.data.ts
View file @a3355c0
@@ -12,7 +12,7 @@ export const columns: BasicColumn[] = [
     title: t('routes.common.system.tableTitleSystemMenuName'), //菜单名称
     // title:'菜单名称',
     dataIndex: 'meta.title',
-    width: 200,
+    width: 180,
     align: 'left',
     customRender: ({ record }) => {
       record = t(record.meta.title); //国际化处理
@@ -32,11 +32,12 @@ export const columns: BasicColumn[] = [
     title: t('routes.common.system.tableTitleSystemPermissionTag'), //权限标识
     // title:'权限标识',
     dataIndex: 'permission',
-    width: 180,
+    width: 220,
   },
   {
     title: t('routes.common.system.tableTitleSystemComponents'), //'组件'
     // title:'组件',
+    width: 120,
     dataIndex: 'component',
   },
   {
--- a/src/views/tenant/list/TenantAdminDrawer.vue
View file @a3355c0
+++ b/src/views/tenant/list/TenantAdminDrawer.vue
View file @a3355c0
@@ -8,7 +8,9 @@
   >
     <BasicTable @register="tenantAdminTable">
       <template #toolbar>
-        <a-button type="primary" @click="handleCreateTenantAdmin">新增租户管理员</a-button>
+        <Authority value="api:yt:user:saveTenantAdmin:post">
+          <a-button type="primary" @click="handleCreateTenantAdmin">新增租户管理员</a-button>
+        </Authority>
       </template>
       <template #action="{ record }">
         <TableAction
@@ -37,12 +39,14 @@
               label: '编辑',
               icon: 'clarity:note-edit-line',
               tooltip: '编辑',
+              auth: 'api:yt:user:saveTenantAdmin:update',
               onClick: handleEdit.bind(null, record),
             },
             {
               label: '删除',
               icon: 'ant-design:delete-outlined',
               tooltip: '删除',
+              auth: 'api:yt:user:saveTenantAdmin:delete',
               color: 'error',
               popConfirm: {
                 title: '是否确认删除',
@@ -90,6 +94,8 @@
   import { MessageTypeEnum, SendResetPasswordEmailMsg } from '/@/api/tenant/tenantInfo';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { RoleEnum } from '/@/enums/roleEnum';
+  import { Authority } from '/@/components/Authority';
+
   export default defineComponent({
     name: 'TenantAdminDrawer',
     components: {
@@ -98,6 +104,7 @@
       TenantAdminFormDrawer,
       Tag,
       TableAction,
+      Authority,
     },
     emits: ['register'],
     setup() {