Merge branch 'main_dev' into 'main'

Main dev

See merge request yunteng/thingskit-front!1322

@@ -8,10 +8,10 @@ VITE_GLOB_PUBLIC_PATH = /
 # Please note that no line breaks
 # Please note that no line breaks
 
 
 # 本地
 # 本地
-VITE_PROXY = [["/api","http://localhost:8080/api"],["/thingskit-scada","http://localhost:5173/thingskit-scada"],["/large-designer", "http://localhost:5555/large-designer/"]]
+VITE_PROXY = [["/api","http://222.180.200.114:30480/api"],["/thingskit-scada","http://localhost:5173/thingskit-scada"],["/large-designer", "http://localhost:5555/large-designer/"]]
 
 
 # 实时数据的ws地址
 # 实时数据的ws地址
-VITE_GLOB_WEB_SOCKET = ws://localhost:8080/api/ws/plugins/telemetry?token=
+VITE_GLOB_WEB_SOCKET = ws://222.180.200.114:30480/api/ws/plugins/telemetry?token=
 
 
 # Delete console
 # Delete console
 VITE_GLOB_DROP_CONSOLE = true
 VITE_GLOB_DROP_CONSOLE = true

@@ -44,7 +44,7 @@ export interface DeviceList {
 
 
 export type queryPageParams = BasicPageParams & {
 export type queryPageParams = BasicPageParams & {
   name?: Nullable<string>;
   name?: Nullable<string>;
-  organizationId?: Nullable<number>;
+  organizationId?: string;
   isTemplate?: number;
   isTemplate?: number;
 };
 };
 
 

@@ -57,6 +57,21 @@ enum DeviceManagerApi {
    * @description 批量变更产品
    * @description 批量变更产品
    */
    */
   BATCH_UPDATE_PRODUCT = '/device/batch/update',
   BATCH_UPDATE_PRODUCT = '/device/batch/update',
+
+  /**
+   * @description 批量公开设备
+   */
+  BATCH_PUBLIC_DEVICE = '/batch/customer/public/device/',
+
+  /**
+   * @description 批量私有设备
+   */
+  BATCH_PRIVATE_DEVICE = '/batch/customer/device/',
+
+  /**
+   * @description 批量修改设备
+   */
+  BATCH_UPDATE_DEVICE = '/device/batch/update',
 }
 }
 
 
 export const devicePage = (params: DeviceQueryParam) => {
 export const devicePage = (params: DeviceQueryParam) => {
@@ -398,3 +413,43 @@ export const doBatchUpdateProduct = (params: { deviceIds: string[]; deviceProfil
     { joinPrefix: false }
     { joinPrefix: false }
   );
   );
 };
 };
+
+/**
+ *
+ * @param deviceIds tbDeviceId分割的字符串
+ * @returns
+ */
+export const doBatchPublicDevice = (deviceIds: string) => {
+  return defHttp.post(
+    {
+      url: `${DeviceManagerApi.BATCH_PUBLIC_DEVICE}?deviceIds=${deviceIds}`,
+    },
+    { joinPrefix: false }
+  );
+};
+
+/**
+ *
+ * @param deviceIds tbDeviceId分割的字符串
+ * @returns
+ */
+export const doBatchPrivateDevice = (deviceIds: string) => {
+  return defHttp.post(
+    {
+      url: `${DeviceManagerApi.BATCH_PRIVATE_DEVICE}?deviceIds=${deviceIds}`,
+    },
+    { joinPrefix: false }
+  );
+};
+
+/**
+ *
+ * @param orgId
+ * @returns
+ */
+export const doBatchUpdateDevice = (orgId: string, data: Recordable[]) => {
+  return defHttp.post({
+    url: `${DeviceManagerApi.BATCH_UPDATE_DEVICE}?orgId=${orgId}`,
+    data,
+  });
+};

@@ -53,6 +53,7 @@ export interface DeviceModel {
   customerId?: string;
   customerId?: string;
   alias?: string;
   alias?: string;
   tbDeviceId?: string;
   tbDeviceId?: string;
+  customerName?: string;
 }
 }
 
 
 export interface DeviceProfileModel {
 export interface DeviceProfileModel {
@@ -207,6 +208,9 @@ export interface DeviceRecord {
     manufacturer: string;
     manufacturer: string;
     streamMode: string;
     streamMode: string;
   };
   };
+  customerName?: string;
+  customerId?: string;
+  gatewayId?: string;
 }
 }
 
 
 export interface DeviceModelOfMatterAttrs {
 export interface DeviceModelOfMatterAttrs {

+import { AccountParams } from './model/systemModel';
+import { defHttp } from '/@/utils/http/axios';
+enum Api {
+  GET_TENANT_List = '/user/tenant/page',
+  ADD_TANANT_LIST = '/user/save_common_tenant',
+}
+
+export const getTenantList = (params: AccountParams) => {
+  const url = Api.GET_TENANT_List;
+  return defHttp.get({ url: url, params });
+};
+export const addTenantList = (params: any) => {
+  const url = Api.ADD_TANANT_LIST;
+  return defHttp.post({ url: url, params });
+};

@@ -94,12 +94,17 @@ export const getAllRoleList = async (params?: RoleParams) => {
 };
 };
 
 
 // 过滤角色列表----根据登录的账号所属的角色-过滤掉其他平台类型的角色
 // 过滤角色列表----根据登录的账号所属的角色-过滤掉其他平台类型的角色
-export const filterRoleList = async () => {
-  const res = await defHttp.post<RoleListGetResultModel>({ url: Api.GetAllRoleList });
+export const filterRoleList = async (params?: { roleType: string }) => {
+  const res = await defHttp.post<RoleListGetResultModel>({
+    url: Api.GetAllRoleList,
+    params: params,
+  });
   const userInfo: any = getAuthCache(USER_INFO_KEY);
   const userInfo: any = getAuthCache(USER_INFO_KEY);
   const role = userInfo.roles[0];
   const role = userInfo.roles[0];
   const options = res.filter((item) => {
   const options = res.filter((item) => {
-    if (role === 'SYS_ADMIN' || role === 'PLATFORM_ADMIN') {
+    if (params?.roleType && params.roleType === 'TENANT_ADMIN') {
+      return item;
+    } else if (role === 'SYS_ADMIN' || role === 'PLATFORM_ADMIN') {
       return item.roleType === 'PLATFORM_ADMIN';
       return item.roleType === 'PLATFORM_ADMIN';
     } else {
     } else {
       return item.roleType === 'CUSTOMER_USER';
       return item.roleType === 'CUSTOMER_USER';
@@ -178,7 +183,7 @@ export const resetPassword = (params: ChangeAccountParams) =>
  * 清除密码
  * 清除密码
  * @param params
  * @param params
  */
  */
-export const clearUserPassword = (userId: string) =>
+export const clearUserPassword = (userId: string, level: number) =>
   defHttp.post({
   defHttp.post({
-    url: Api.RESET_USER_PASSWORD + userId,
+    url: Api.RESET_USER_PASSWORD + userId + '/' + level,
   });
   });

@@ -15,6 +15,7 @@ export interface GetTaskListParamsType {
 
 
 export interface CreateTaskRecordType {
 export interface CreateTaskRecordType {
   name: string;
   name: string;
+  organizationId: string;
   targetType: TaskTargetEnum;
   targetType: TaskTargetEnum;
   executeTarget: {
   executeTarget: {
     organizationId?: string;
     organizationId?: string;

@@ -49,7 +49,7 @@
       watch(
       watch(
         () => props.params,
         () => props.params,
         () => {
         () => {
-          isFirstLoaded.value && fetch();
+          fetch();
         },
         },
         { deep: true }
         { deep: true }
       );
       );

@@ -102,7 +102,11 @@
       class="flex-auto"
       class="flex-auto"
       :disabled="controlDisableStatus"
       :disabled="controlDisableStatus"
     />
     />
-    <Popconfirm v-model:visible="popconfirmVisible" v-bind="getPopConfirmProps">
+    <Popconfirm
+      :disabled="disabled"
+      v-model:visible="popconfirmVisible"
+      v-bind="getPopConfirmProps"
+    >
       <Button type="primary" :disabled="disabled">
       <Button type="primary" :disabled="disabled">
         <Icon
         <Icon
           :icon="controlDisableStatus ? 'ant-design:lock-outlined' : 'ant-design:unlock-outlined'"
           :icon="controlDisableStatus ? 'ant-design:lock-outlined' : 'ant-design:unlock-outlined'"

@@ -54,7 +54,7 @@ export const basicProps = {
   },
   },
 
 
   checkedKeys: {
   checkedKeys: {
-    type: Array as PropType<CheckKeys>,
+    type: [Array, Object] as PropType<CheckKeys>,
     default: () => [],
     default: () => [],
   },
   },
 
 

@@ -3,4 +3,5 @@ export enum MessageEnum {
   IS_EMAIL = 'EMAIL_MESSAGE',
   IS_EMAIL = 'EMAIL_MESSAGE',
   IS_DINGTALK = 'DING_TALK_MESSAGE',
   IS_DINGTALK = 'DING_TALK_MESSAGE',
   IS_VOICE = 'VOICE_MESSAGE',
   IS_VOICE = 'VOICE_MESSAGE',
+  IS_ENTERPRISE_WECHAT = 'ENTERPRISE_WECHAT_MESSAGE',
 }
 }

@@ -106,20 +106,21 @@ export const formSchema: FormSchema[] = [
   },
   },
   {
   {
     field: 'wechat',
     field: 'wechat',
-    label: '微信',
+    label: '企业微信',
     component: 'Input',
     component: 'Input',
+    helpMessage: '企业微信通知电话，须在对应企业微信绑定，否则不能收到告警通知。',
     componentProps: {
     componentProps: {
-      placeholder: '请输入微信号',
+      placeholder: '请输入企业微信号',
       maxLength: 255,
       maxLength: 255,
     },
     },
   },
   },
-  {
-    field: 'wechatMessage',
-    label: ' ',
-    slot: 'wechatMessage',
-    component: 'Input',
-    ifShow: ({ model }) => model.wechat,
-  },
+  // {
+  //   field: 'wechatMessage',
+  //   label: ' ',
+  //   slot: 'wechatMessage',
+  //   component: 'Input',
+  //   ifShow: ({ model }) => model.wechat,
+  // },
   {
   {
     field: 'dingtalk',
     field: 'dingtalk',
     label: '钉钉',
     label: '钉钉',

@@ -8,22 +8,26 @@
       '清除未确认: 只可处理，已经清除',
       '清除未确认: 只可处理，已经清除',
       '清除已确认: 不需要做处理和清除',
       '清除已确认: 不需要做处理和清除',
     ] -->
     ] -->
-      <a-button
-        type="primary"
-        class="mr-4"
-        @click="handleAlarm"
-        v-if="alarmStatus !== AlarmStatus.ACTIVE_ACK && alarmStatus !== AlarmStatus.CLEARED_ACK"
-      >
-        处理
-      </a-button>
-      <a-button
-        danger
-        type="primary"
-        @click="clearAlarm"
-        v-if="alarmStatus === AlarmStatus.ACTIVE_ACK"
-      >
-        清除
-      </a-button>
+      <Authority value="api:yt:alarm:single:handle">
+        <a-button
+          type="primary"
+          class="mr-4"
+          @click="handleAlarm"
+          v-if="alarmStatus !== AlarmStatus.ACTIVE_ACK && alarmStatus !== AlarmStatus.CLEARED_ACK"
+        >
+          处理
+        </a-button>
+      </Authority>
+      <Authority value="api:yt:alarm:single:clear">
+        <a-button
+          danger
+          type="primary"
+          @click="clearAlarm"
+          v-if="alarmStatus === AlarmStatus.ACTIVE_ACK"
+        >
+          清除
+        </a-button>
+      </Authority>
     </div>
     </div>
   </BasicDrawer>
   </BasicDrawer>
 </template>
 </template>
@@ -36,11 +40,13 @@
   import { alarmLevel, statusType } from '/@/views/device/list/config/detail.config';
   import { alarmLevel, statusType } from '/@/views/device/list/config/detail.config';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import { AlarmStatus } from '/@/enums/alarmEnum';
   import { AlarmStatus } from '/@/enums/alarmEnum';
+  import { Authority } from '/@/components/Authority';
   export default defineComponent({
   export default defineComponent({
     name: 'AlarmDetailDrawer',
     name: 'AlarmDetailDrawer',
     components: {
     components: {
       BasicForm,
       BasicForm,
       BasicDrawer,
       BasicDrawer,
+      Authority,
     },
     },
     emits: ['success', 'register'],
     emits: ['success', 'register'],
     setup(_, { emit }) {
     setup(_, { emit }) {

@@ -19,12 +19,16 @@
         </Button>
         </Button>
       </template>
       </template>
       <template #toolbar>
       <template #toolbar>
-        <Button @click="handleBatchClear" type="primary" :disabled="getCanBatchClear">
-          <span>批量清除</span>
-        </Button>
-        <Button @click="handleBatchAck" type="primary" :disabled="getCanBatchAck">
-          <span>批量处理</span>
-        </Button>
+        <Authority value="api:yt:alarm:batch:clear">
+          <Button @click="handleBatchClear" type="primary" :disabled="getCanBatchClear">
+            <span>批量清除</span>
+          </Button>
+        </Authority>
+        <Authority value="api:yt:alarm:batch:handle">
+          <Button @click="handleBatchAck" type="primary" :disabled="getCanBatchAck">
+            <span>批量处理</span>
+          </Button>
+        </Authority>
       </template>
       </template>
     </BasicTable>
     </BasicTable>
     <AlarmDetailDrawer @register="registerDetailDrawer" @success="handleSuccess" />
     <AlarmDetailDrawer @register="registerDetailDrawer" @success="handleSuccess" />
@@ -49,6 +53,7 @@
   import { AlarmLogItem } from '/@/api/device/model/deviceConfigModel';
   import { AlarmLogItem } from '/@/api/device/model/deviceConfigModel';
   import { AlarmStatus } from '/@/enums/alarmEnum';
   import { AlarmStatus } from '/@/enums/alarmEnum';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { Authority } from '/@/components/Authority';
 
 
   const props = defineProps<{
   const props = defineProps<{
     deviceId?: string;
     deviceId?: string;

@@ -10,6 +10,7 @@
     <BasicForm @register="registerForm">
     <BasicForm @register="registerForm">
       <!-- 模板选择 -->
       <!-- 模板选择 -->
       <template #templateId="{ model }">
       <template #templateId="{ model }">
+        <span style="display: none">{{ getFieldOrg(model['organizationId']) }}</span>
         <Select
         <Select
           v-model:value="model['templateId']"
           v-model:value="model['templateId']"
           placeholder="请选择模板"
           placeholder="请选择模板"
@@ -35,7 +36,7 @@
   </BasicDrawer>
   </BasicDrawer>
 </template>
 </template>
 <script lang="ts">
 <script lang="ts">
-  import { defineComponent, ref, computed, unref, Ref, onMounted, nextTick } from 'vue';
+  import { defineComponent, ref, computed, unref, Ref, onMounted, nextTick, watch } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicForm, useForm } from '/@/components/Form';
   import { Select } from 'ant-design-vue';
   import { Select } from 'ant-design-vue';
   import { formSchema, PC_DEFAULT_CONTENT, PHONE_DEFAULT_CONTENT, Platform } from './center.data';
   import { formSchema, PC_DEFAULT_CONTENT, PHONE_DEFAULT_CONTENT, Platform } from './center.data';
@@ -61,11 +62,12 @@
 
 
       const selectDeviceProfileRef = ref<InstanceType<typeof SelectDeviceProfile>>();
       const selectDeviceProfileRef = ref<InstanceType<typeof SelectDeviceProfile>>();
 
 
-      const [registerForm, { validate, setFieldsValue, resetFields, updateSchema }] = useForm({
-        labelWidth: 120,
-        schemas: formSchema,
-        showActionButtonGroup: false,
-      });
+      const [registerForm, { validate, setFieldsValue, resetFields, updateSchema, clearValidate }] =
+        useForm({
+          labelWidth: 120,
+          schemas: formSchema,
+          showActionButtonGroup: false,
+        });
 
 
       const updateEnableTemplate = async (enable: number, disabled: boolean) => {
       const updateEnableTemplate = async (enable: number, disabled: boolean) => {
         await setFieldsValue({
         await setFieldsValue({
@@ -90,6 +92,14 @@
             };
             };
           },
           },
         });
         });
+        await updateSchema({
+          field: 'organizationId',
+          componentProps: () => {
+            return {
+              disabled,
+            };
+          },
+        });
       };
       };
 
 
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
@@ -107,6 +117,7 @@
             ];
             ];
           }
           }
           if (data.record.organizationDTO) {
           if (data.record.organizationDTO) {
+            organizationIdStr.value = data.record['organizationId'];
             await setFieldsValue(data.record);
             await setFieldsValue(data.record);
           } else {
           } else {
             Reflect.deleteProperty(data.record, 'organizationId');
             Reflect.deleteProperty(data.record, 'organizationId');
@@ -135,16 +146,41 @@
       //新增修改
       //新增修改
       const templateDisabled = ref(false);
       const templateDisabled = ref(false);
       onMounted(() => {
       onMounted(() => {
-        getTemplate({
-          page: 1,
-          pageSize: 30,
-        });
+        getTemplate(
+          {
+            page: 1,
+            pageSize: 30,
+          },
+          null
+        );
       });
       });
 
 
       const selectTemplateOptions: Ref<any[]> = ref([]);
       const selectTemplateOptions: Ref<any[]> = ref([]);
 
 
-      const getTemplate = async (params: queryPageParams) => {
-        const { items } = await getPage({ ...params, isTemplate: 1 });
+      const organizationIdStr = ref('');
+
+      const getFieldOrg = (org: string) => (organizationIdStr.value = org);
+
+      watch(
+        () => organizationIdStr.value,
+        (newValue) => {
+          getTemplate(
+            {
+              page: 1,
+              pageSize: 30,
+            },
+            newValue
+          );
+          if (!isUpdate.value) {
+            setFieldsValue({
+              templateId: null,
+            });
+          }
+        }
+      );
+
+      const getTemplate = async (params: queryPageParams, organizationId) => {
+        const { items } = await getPage({ ...params, isTemplate: 1, organizationId });
         selectTemplateOptions.value = items.map((item) => ({
         selectTemplateOptions.value = items.map((item) => ({
           ...item,
           ...item,
           label: item.name,
           label: item.name,
@@ -154,6 +190,7 @@
       const selectOptions: Ref<any[]> = ref([]);
       const selectOptions: Ref<any[]> = ref([]);
 
 
       const handleTemplateChange = async (_, option) => {
       const handleTemplateChange = async (_, option) => {
+        clearValidate('templateId');
         const { productAndDevice } = option;
         const { productAndDevice } = option;
         setFieldsValue({ platform: option?.platform });
         setFieldsValue({ platform: option?.platform });
         await nextTick();
         await nextTick();
@@ -249,6 +286,7 @@
         createPickerSearch,
         createPickerSearch,
         selectDeviceProfileRef,
         selectDeviceProfileRef,
         templateDisabled,
         templateDisabled,
+        getFieldOrg,
       };
       };
     },
     },
   });
   });

@@ -20,6 +20,7 @@ export enum ConfigurationPermission {
   // DESIGN = 'api:yt:dataview:center:get_configuration_info:design',
   // DESIGN = 'api:yt:dataview:center:get_configuration_info:design',
   DESIGN = 'api:yt:dataview:center:get_dataview_info:design',
   DESIGN = 'api:yt:dataview:center:get_dataview_info:design',
   PREVIEW = 'api:yt:dataview:center:get_configuration_info:preview',
   PREVIEW = 'api:yt:dataview:center:get_configuration_info:preview',
+  DATAVIEW_PREVIEW = 'api:yt:dataview:center:get_dataview_info:preview', //大屏预览
   PUBLISH = 'api:yt:dataview:center:publish',
   PUBLISH = 'api:yt:dataview:center:publish',
   // CANCEL_PUBLISH = 'api:yt:dataview:center:cancel_publish',
   // CANCEL_PUBLISH = 'api:yt:dataview:center:cancel_publish',
   PUBLISH_INTERFACE = 'api:yt:dataview:center:public_interface',
   PUBLISH_INTERFACE = 'api:yt:dataview:center:public_interface',

@@ -191,6 +191,7 @@
           <template class="ant-card-actions" #actions>
           <template class="ant-card-actions" #actions>
             <Tooltip title="预览">
             <Tooltip title="预览">
               <AuthIcon
               <AuthIcon
+                :auth="ConfigurationPermission.DATAVIEW_PREVIEW"
                 class="!text-lg"
                 class="!text-lg"
                 icon="ant-design:eye-outlined"
                 icon="ant-design:eye-outlined"
                 @click="handlePreview(item)"
                 @click="handlePreview(item)"

@@ -36,7 +36,7 @@ const updateProductHelpMessage = [
   '修改设备产品时，如果"大屏"、"组态"、"看板"、"场景联动"、"数据流转"等有关联设备，请自行调整并保存。',
   '修改设备产品时，如果"大屏"、"组态"、"看板"、"场景联动"、"数据流转"等有关联设备，请自行调整并保存。',
 ];
 ];
 
 
-const updateOrgHelpMessage = [
+export const updateOrgHelpMessage = [
   '注意:',
   '注意:',
   '1、修改设备组织时，如果"大屏"、"组态"、"看板"、"场景联动"、"数据流转"等有关联设备，请自行调整并保存。',
   '1、修改设备组织时，如果"大屏"、"组态"、"看板"、"场景联动"、"数据流转"等有关联设备，请自行调整并保存。',
   '2、网关设备在修改组织时，其关联网关子设备组织归属于网关组织及以下不用修改，否则将同步更新网关子设备组织为网关组织。',
   '2、网关设备在修改组织时，其关联网关子设备组织归属于网关组织及以下不用修改，否则将同步更新网关子设备组织为网关组织。',
@@ -314,6 +314,12 @@ export const step1Schemas: FormSchema[] = [
     ifShow: false,
     ifShow: false,
   },
   },
   {
   {
+    field: 'customerId',
+    label: '用来判断编辑时禁用组织修改',
+    component: 'Input',
+    ifShow: false,
+  },
+  {
     field: 'organizationId',
     field: 'organizationId',
     label: '所属组织',
     label: '所属组织',
     component: 'LockControlGroup',
     component: 'LockControlGroup',
@@ -327,6 +333,7 @@ export const step1Schemas: FormSchema[] = [
       return {
       return {
         component: 'OrgTreeSelect',
         component: 'OrgTreeSelect',
         defaultLockStatus: !!formModel?.isUpdate,
         defaultLockStatus: !!formModel?.isUpdate,
+        disabled: !!formModel?.customerId,
         componentProps: {
         componentProps: {
           apiTreeSelectProps: {
           apiTreeSelectProps: {
             params: {
             params: {

 import { formatToDateTime } from '/@/utils/dateUtil';
 import { formatToDateTime } from '/@/utils/dateUtil';
-import { FormSchema } from '/@/components/Form';
+import { FormSchema, useComponentRegister } from '/@/components/Form';
 import { BasicColumn } from '/@/components/Table';
 import { BasicColumn } from '/@/components/Table';
 import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
 import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
 import { getCustomerList } from '/@/api/device/deviceManager';
 import { getCustomerList } from '/@/api/device/deviceManager';
@@ -7,12 +7,15 @@ import { DescItem } from '/@/components/Description/index';
 import moment from 'moment';
 import moment from 'moment';
 import { CSSProperties, h } from 'vue';
 import { CSSProperties, h } from 'vue';
 import { Button, Tooltip } from 'ant-design-vue';
 import { Button, Tooltip } from 'ant-design-vue';
-import { TypeEnum } from './data';
+import { TypeEnum, updateOrgHelpMessage } from './data';
 import { PageEnum } from '/@/enums/pageEnum';
 import { PageEnum } from '/@/enums/pageEnum';
 import { useGo } from '/@/hooks/web/usePage';
 import { useGo } from '/@/hooks/web/usePage';
 import { useAuthDeviceDetail } from '../hook/useAuthDeviceDetail';
 import { useAuthDeviceDetail } from '../hook/useAuthDeviceDetail';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { isNullOrUnDef } from '/@/utils/is';
 import { isNullOrUnDef } from '/@/utils/is';
+import { OrgTreeSelect } from '/@/views/common/OrgTreeSelect';
+
+useComponentRegister('OrgTreeSelect', OrgTreeSelect);
 
 
 // 设备详情的描述
 // 设备详情的描述
 export const descSchema = (emit: EmitType): DescItem[] => {
 export const descSchema = (emit: EmitType): DescItem[] => {
@@ -407,3 +410,28 @@ export const customerForm: FormSchema[] = [
     colProps: { span: 12 },
     colProps: { span: 12 },
   },
   },
 ];
 ];
+
+export const orgForm: FormSchema[] = [
+  {
+    field: 'sensorOrganizationId',
+    label: '依据网关设备请求的组织数组',
+    component: 'Input',
+    ifShow: false,
+  },
+  {
+    field: 'organizationId',
+    component: 'OrgTreeSelect',
+    helpMessage: updateOrgHelpMessage,
+    label: '选择组织',
+    required: true,
+    componentProps: ({ formModel }) => {
+      return {
+        apiTreeSelectProps: {
+          params: {
+            organizationId: formModel?.sensorOrganizationId,
+          },
+        },
+      };
+    },
+  },
+];

+<template>
+  <BasicModal
+    v-bind="$attrs"
+    @register="registerModal"
+    title="批量修改设备"
+    :canFullscreen="false"
+    centered
+    @ok="dispatchCustomer"
+    @cancel="resetFields"
+    :minHeight="300"
+    okText="确认"
+  >
+    <BasicForm @register="registerForm" />
+  </BasicModal>
+</template>
+
+<script lang="ts">
+  import { defineComponent, ref, nextTick } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { BasicForm, useForm } from '/@/components/Form';
+  import { orgForm } from '../../config/detail.config';
+  import { doBatchUpdateDevice, getGATEWAY } from '/@/api/device/deviceManager';
+  import { useMessage } from '/@/hooks/web/useMessage';
+
+  export default defineComponent({
+    name: 'AlarmDetailModal',
+    components: {
+      BasicModal,
+      BasicForm,
+    },
+    emits: ['reload', 'register'],
+    setup(_, { emit }) {
+      const { createMessage } = useMessage();
+
+      const record = ref([]);
+
+      const [registerModal, { closeModal, setModalProps }] = useModalInner(async (data) => {
+        await nextTick();
+        record.value = data;
+        // 如果是网关子设备
+        const deviceTypeFilterSensor = data
+          .filter((filterItem) => filterItem.deviceType === 'SENSOR')
+          .map((mapItem) => mapItem.tbDeviceId);
+        // 根据gatewayId获取网关所属组织
+        for (let item of deviceTypeFilterSensor) {
+          await getGATEWAYByTbDeviceId(item);
+        }
+      });
+
+      const getGATEWAYByTbDeviceId = async (tbDeviceId: string) => {
+        const result = await getGATEWAY(tbDeviceId);
+        if (!result) return;
+        setFieldsValue({
+          sensorOrganizationId: result.organizationId,
+        });
+      };
+
+      const [registerForm, { validate, resetFields, setFieldsValue }] = useForm({
+        labelWidth: 100,
+        showActionButtonGroup: false,
+        schemas: orgForm,
+      });
+
+      // 分配组织
+      const dispatchCustomer = async () => {
+        setModalProps({ loading: true });
+        try {
+          const value = await validate();
+          if (!value) return;
+          await doBatchUpdateDevice(value.organizationId, record.value);
+          closeModal();
+          resetFields();
+          emit('reload');
+        } finally {
+          setModalProps({ loading: false });
+          createMessage.success('操作成功');
+        }
+      };
+
+      return {
+        registerModal,
+        registerForm,
+        dispatchCustomer,
+        resetFields,
+      };
+    },
+  });
+</script>

@@ -418,6 +418,7 @@
           code: data?.code,
           code: data?.code,
           addressCode: data?.code,
           addressCode: data?.code,
           isUpdate: unref(isUpdate1),
           isUpdate: unref(isUpdate1),
+          customerId: data?.customerId,
         });
         });
       }
       }
       // 父组件调用获取字段值的方法
       // 父组件调用获取字段值的方法

@@ -87,7 +87,8 @@
     const isTcpDevice = unref(props.deviceDetail)?.transportType === TransportTypeEnum.TCP;
     const isTcpDevice = unref(props.deviceDetail)?.transportType === TransportTypeEnum.TCP;
     if (commandType === CommandTypeEnum.CUSTOM) {
     if (commandType === CommandTypeEnum.CUSTOM) {
       if (isTcpDevice) {
       if (isTcpDevice) {
-        return values.tcpCommandValue;
+        const value = values.tcpCommandValue;
+        return value?.replaceAll(/\s/g, '');
       }
       }
       return parseStringToJSON(values.commandValue!).json;
       return parseStringToJSON(values.commandValue!).json;
     } else {
     } else {

@@ -61,7 +61,6 @@
       </span>
       </span>
     </template>
     </template>
   </BasicTable>
   </BasicTable>
-  <BasicTable />
   <BasicModal title="输出参数" @register="registerModal" @ok="closeModal">
   <BasicModal title="输出参数" @register="registerModal" @ok="closeModal">
     <Input.TextArea v-model:value="outputData" :autosize="true" />
     <Input.TextArea v-model:value="outputData" :autosize="true" />
   </BasicModal>
   </BasicModal>

 <script lang="ts" setup>
 <script lang="ts" setup>
+  import { ref } from 'vue';
   import { TaskCard } from '/@/views/task/center/components/TaskCard';
   import { TaskCard } from '/@/views/task/center/components/TaskCard';
   import { formSchemas } from '/@/views/task/center/config';
   import { formSchemas } from '/@/views/task/center/config';
   import { getTaskCenterList } from '/@/api/task';
   import { getTaskCenterList } from '/@/api/task';
@@ -29,6 +30,8 @@
     },
     },
   });
   });
 
 
+  const fromDeviceDetail = ref(true);
+
   const handleRunTask = (record: TaskRecordType) => {
   const handleRunTask = (record: TaskRecordType) => {
     openModal(true, record);
     openModal(true, record);
   };
   };
@@ -50,7 +53,12 @@
         />
         />
       </template>
       </template>
     </BasicCardList>
     </BasicCardList>
-    <RunTaskModal :reload="reload" @register="registerRunTaskModal" />
+    <RunTaskModal
+      :tbDeviceId="tbDeviceId"
+      :fromOrigin="fromDeviceDetail"
+      :reload="reload"
+      @register="registerRunTaskModal"
+    />
   </section>
   </section>
   <!-- </PageWrapper> -->
   <!-- </PageWrapper> -->
 </template>
 </template>

@@ -23,13 +23,14 @@
           >
           >
             <AuthDropDown
             <AuthDropDown
               v-if="authBtn(role)"
               v-if="authBtn(role)"
-              :disabled="!isExistOption"
+              :disabled="isPublicAndPrivateFlag || !isExistOption"
               :dropMenuList="[
               :dropMenuList="[
                 {
                 {
                   text: '删除设备',
                   text: '删除设备',
                   auth: DeviceListAuthEnum.DELETE,
                   auth: DeviceListAuthEnum.DELETE,
                   icon: 'ant-design:delete-outlined',
                   icon: 'ant-design:delete-outlined',
                   event: '',
                   event: '',
+                  disabled: !batchPrivateFlag,
                   popconfirm: {
                   popconfirm: {
                     title: '您确定要批量删除数据',
                     title: '您确定要批量删除数据',
                     onConfirm: () => handleDelete(),
                     onConfirm: () => handleDelete(),
@@ -40,6 +41,7 @@
                   auth: DeviceListAuthEnum.ASSIGN,
                   auth: DeviceListAuthEnum.ASSIGN,
                   icon: 'mdi:account-arrow-left',
                   icon: 'mdi:account-arrow-left',
                   event: '',
                   event: '',
+                  disabled: !batchPrivateFlag,
                   onClick: handleBatchAssign.bind(null),
                   onClick: handleBatchAssign.bind(null),
                 },
                 },
                 {
                 {
@@ -47,12 +49,35 @@
                   auth: DeviceListAuthEnum.UPDATE_PRODUCT,
                   auth: DeviceListAuthEnum.UPDATE_PRODUCT,
                   icon: 'clarity:note-edit-line',
                   icon: 'clarity:note-edit-line',
                   event: '',
                   event: '',
-                  disabled: batchUpdateProductFlag,
+                  disabled: !batchPrivateFlag || batchUpdateProductFlag,
                   onClick: handelOpenBatchUpdateProductModal,
                   onClick: handelOpenBatchUpdateProductModal,
                 },
                 },
+                {
+                  text: '批量公开',
+                  icon: 'ant-design:wallet-outlined',
+                  event: '',
+                  disabled: !batchPrivateFlag,
+                  onClick: handleBatchPublic.bind(null),
+                },
+                {
+                  text: '批量私有',
+                  icon: 'ant-design:wallet-outlined',
+                  event: '',
+                  disabled: batchPrivateFlag,
+                  onClick: handleBatchPrivate.bind(null),
+                },
+                {
+                  text: '批量修改组织',
+                  icon: 'ant-design:wallet-outlined',
+                  event: '',
+                  disabled: !batchPrivateFlag || batchSensorFlag || diffBatchSensorFlag,
+                  onClick: handleBatchOrg.bind(null),
+                },
               ]"
               ]"
             >
             >
-              <Button type="primary" :disabled="!isExistOption">批量操作</Button>
+              <Button type="primary" :disabled="isPublicAndPrivateFlag || !isExistOption"
+                >批量操作</Button
+              >
             </AuthDropDown>
             </AuthDropDown>
           </Authority>
           </Authority>
         </template>
         </template>
@@ -225,6 +250,7 @@
 
 
       <DeviceModal @register="registerModal" @success="handleSuccess" @reload="handleSuccess" />
       <DeviceModal @register="registerModal" @success="handleSuccess" @reload="handleSuccess" />
       <CustomerModal @register="registerCustomerModal" @reload="handleReload" />
       <CustomerModal @register="registerCustomerModal" @reload="handleReload" />
+      <OrgModal @register="registerOrgModal" @reload="handleReload" />
 
 
       <BatchImportModal @register="registerImportModal" @import-finally="handleImportFinally" />
       <BatchImportModal @register="registerImportModal" @import-finally="handleImportFinally" />
 
 
@@ -254,6 +280,8 @@
     getGATEWAY,
     getGATEWAY,
     privateDevice,
     privateDevice,
     publicDevice,
     publicDevice,
+    doBatchPublicDevice,
+    doBatchPrivateDevice,
   } from '/@/api/device/deviceManager';
   } from '/@/api/device/deviceManager';
   import { PageEnum } from '/@/enums/pageEnum';
   import { PageEnum } from '/@/enums/pageEnum';
   import { useGo } from '/@/hooks/web/usePage';
   import { useGo } from '/@/hooks/web/usePage';
@@ -264,6 +292,7 @@
   import { useDrawer } from '/@/components/Drawer';
   import { useDrawer } from '/@/components/Drawer';
   import DeviceDetailDrawer from './cpns/modal/DeviceDetailDrawer.vue';
   import DeviceDetailDrawer from './cpns/modal/DeviceDetailDrawer.vue';
   import CustomerModal from './cpns/modal/CustomerModal.vue';
   import CustomerModal from './cpns/modal/CustomerModal.vue';
+  import OrgModal from './cpns/modal/OrgModal.vue';
   import BatchImportModal from './cpns/modal/BatchImportModal/index.vue';
   import BatchImportModal from './cpns/modal/BatchImportModal/index.vue';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { USER_INFO_KEY } from '/@/enums/cacheEnum';
   import { USER_INFO_KEY } from '/@/enums/cacheEnum';
@@ -292,6 +321,7 @@
   const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
   const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
   const [registerModal, { openModal }] = useModal();
   const [registerModal, { openModal }] = useModal();
   const [registerCustomerModal, { openModal: openCustomerModal }] = useModal();
   const [registerCustomerModal, { openModal: openCustomerModal }] = useModal();
+  const [registerOrgModal, { openModal: openOrgodal }] = useModal();
   const [registerDetailDrawer, { openDrawer }] = useDrawer();
   const [registerDetailDrawer, { openDrawer }] = useDrawer();
   const [registerTbDetailDrawer, { openDrawer: openTbDeviceDrawer }] = useDrawer();
   const [registerTbDetailDrawer, { openDrawer: openTbDeviceDrawer }] = useDrawer();
   const [registerGatewayDetailDrawer, { openDrawer: openGatewayDetailDrawer }] = useDrawer();
   const [registerGatewayDetailDrawer, { openDrawer: openGatewayDetailDrawer }] = useDrawer();
@@ -326,6 +356,14 @@
 
 
   const batchUpdateProductFlag = ref(true);
   const batchUpdateProductFlag = ref(true);
 
 
+  const isPublicAndPrivateFlag = ref(false);
+
+  const batchPrivateFlag = ref(true);
+
+  const batchSensorFlag = ref(false);
+
+  const diffBatchSensorFlag = ref(false);
+
   const [
   const [
     registerTable,
     registerTable,
     {
     {
@@ -376,7 +414,7 @@
     rowSelection: {
     rowSelection: {
       type: 'checkbox',
       type: 'checkbox',
       getCheckboxProps: (record: DeviceModel) => {
       getCheckboxProps: (record: DeviceModel) => {
-        return { disabled: !!record.customerId };
+        return { disabled: !!record.customerId && record.customerName !== 'Public' };
       },
       },
       onSelect(_record, _selected, selectedRows) {
       onSelect(_record, _selected, selectedRows) {
         const [firstItem] = selectedRows as DeviceRecord[];
         const [firstItem] = selectedRows as DeviceRecord[];
@@ -384,6 +422,19 @@
         batchUpdateProductFlag.value =
         batchUpdateProductFlag.value =
           !selectedRows.length ||
           !selectedRows.length ||
           !selectedRows.every((item) => (item as DeviceRecord).deviceType === deviceType);
           !selectedRows.every((item) => (item as DeviceRecord).deviceType === deviceType);
+
+        batchPrivateFlag.value = selectedRows.some((item: DeviceRecord) => !item?.customerId);
+        const filterSensor = selectedRows.map((filterItem: DeviceRecord) => filterItem.deviceType);
+        batchSensorFlag.value =
+          filterSensor.includes('SENSOR') &&
+          (filterSensor.includes('DIRECT_CONNECTION') || filterSensor.includes('GATEWAY')); // 网关子和直连设备或者网关设备，则禁用组织修改
+        const filterGatewayId = selectedRows
+          .filter((filterItem: DeviceRecord) => filterItem.deviceType === 'SENSOR')
+          .map((mapItem: DeviceRecord) => mapItem.gatewayId);
+        diffBatchSensorFlag.value = [...new Set(filterGatewayId)].length > 1; // 数组长度大于1，说明选择的网关子设备所属网关为多个，则禁用组织修改
+        isPublicAndPrivateFlag.value =
+          selectedRows.some((item: DeviceRecord) => !item?.customerId) &&
+          selectedRows.some((item: DeviceRecord) => item?.customerAdditionalInfo?.isPublic);
       },
       },
       onSelectAll(_selected, selectedRows) {
       onSelectAll(_selected, selectedRows) {
         const [firstItem] = selectedRows as DeviceRecord[];
         const [firstItem] = selectedRows as DeviceRecord[];
@@ -391,6 +442,19 @@
         batchUpdateProductFlag.value =
         batchUpdateProductFlag.value =
           !selectedRows.length ||
           !selectedRows.length ||
           !selectedRows.every((item) => (item as DeviceRecord).deviceType === deviceType);
           !selectedRows.every((item) => (item as DeviceRecord).deviceType === deviceType);
+
+        batchPrivateFlag.value = selectedRows.some((item) => !item?.customerId);
+        const filterSensor = selectedRows.map((filterItem) => filterItem.deviceType);
+        batchSensorFlag.value =
+          filterSensor.includes('SENSOR') &&
+          (filterSensor.includes('DIRECT_CONNECTION') || filterSensor.includes('GATEWAY')); // 网关子和直连设备或者网关设备，则禁用组织修改
+        const filterGatewayId = selectedRows
+          .filter((filterItem: DeviceRecord) => filterItem.deviceType === 'SENSOR')
+          .map((mapItem: DeviceRecord) => mapItem.gatewayId);
+        diffBatchSensorFlag.value = [...new Set(filterGatewayId)].length > 1; // 数组长度大于1，说明选择的网关子设备所属网关为多个，则禁用组织修改
+        isPublicAndPrivateFlag.value =
+          selectedRows.some((item) => !item?.customerId) &&
+          selectedRows.some((item) => item?.customerAdditionalInfo?.isPublic);
       },
       },
     },
     },
   });
   });
@@ -492,6 +556,39 @@
     openCustomerModal(true, options);
     openCustomerModal(true, options);
   };
   };
 
 
+  const handleBatchOrg = () => {
+    const options = getSelectRows();
+    openOrgodal(true, options);
+  };
+
+  // 批量公开设备
+  const handleBatchPublic = async () => {
+    setLoading(true);
+    try {
+      const options = getSelectRows();
+      const tbDeviceIdJoinStr = options.map((item) => item.tbDeviceId).join(',');
+      const res = await doBatchPublicDevice(tbDeviceIdJoinStr);
+      createMessage.success(res);
+    } finally {
+      handleReload();
+      setLoading(false);
+    }
+  };
+
+  // 批量私有设备
+  const handleBatchPrivate = async () => {
+    setLoading(true);
+    try {
+      const options = getSelectRows();
+      const tbDeviceIdJoinStr = options.map((item) => item.tbDeviceId).join(',');
+      const res = await doBatchPrivateDevice(tbDeviceIdJoinStr);
+      createMessage.success(res);
+    } finally {
+      handleReload();
+      setLoading(false);
+    }
+  };
+
   const handleDelete = async (record?: DeviceRecord) => {
   const handleDelete = async (record?: DeviceRecord) => {
     let ids: string[] = [];
     let ids: string[] = [];
     if (record) {
     if (record) {

@@ -130,7 +130,11 @@ function handleServiceType(
     functionJson: {
     functionJson: {
       inputData:
       inputData:
         transportType === TransportTypeEnum.TCP
         transportType === TransportTypeEnum.TCP
-          ? [{ [FormFieldsEnum.SERVICE_COMMAND]: serviceCommand } as unknown as StructJSON]
+          ? [
+              {
+                [FormFieldsEnum.SERVICE_COMMAND]: serviceCommand?.replaceAll(/\s/g, ''),
+              } as unknown as StructJSON,
+            ]
           : inputData,
           : inputData,
       outputData,
       outputData,
     },
     },

@@ -185,8 +185,10 @@ export const list = [
   {
   {
     deviceType: '网关/直连/网关子设备',
     deviceType: '网关/直连/网关子设备',
     function: '事件上报',
     function: '事件上报',
-    release: 'v1/devices/event/${deviceId}或${deviceName}/${identifier}',
-    subscribe: 'v1/devices/event/${deviceId}或${deviceName}/${identifier}',
+    release:
+      'v1/devices/event/${deviceId}/${identifier}或v1/devices/event/${deviceName}/${identifier}',
+    subscribe:
+      'v1/devices/event/${deviceId}/${identifier}或v1/devices/event/${deviceName}/${identifier}',
     platform: '订阅',
     platform: '订阅',
     device: '发布',
     device: '发布',
   },
   },

@@ -17,6 +17,7 @@
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import { saveOrEditMessageConfig } from '/@/api/message/config';
   import { saveOrEditMessageConfig } from '/@/api/message/config';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { MessageEnum } from '/@/enums/messageEnum';
 
 
   export default defineComponent({
   export default defineComponent({
     name: 'ConfigDrawer',
     name: 'ConfigDrawer',
@@ -85,6 +86,12 @@
               accessKeyId: values.accessKeyId,
               accessKeyId: values.accessKeyId,
               accessKeySecret: values.accessKeySecret,
               accessKeySecret: values.accessKeySecret,
             };
             };
+          } else if (values.messageType === MessageEnum.IS_ENTERPRISE_WECHAT) {
+            config = {
+              agentId: values.agentId,
+              corpId: values.corpId,
+              corpSecret: values.corpSecret,
+            };
           }
           }
           Reflect.set(values, 'config', config);
           Reflect.set(values, 'config', config);
           let saveMessage = '添加成功';
           let saveMessage = '添加成功';

@@ -85,6 +85,9 @@ export const isDingtalk = (type: string) => {
 export const isVoice = (type: string) => {
 export const isVoice = (type: string) => {
   return type === MessageEnum.IS_VOICE;
   return type === MessageEnum.IS_VOICE;
 };
 };
+
+export const isEnterpriseWechat = (type: string) => type === MessageEnum.IS_ENTERPRISE_WECHAT;
+
 export const messageTypeIsTencentCloud = (type: string) => {
 export const messageTypeIsTencentCloud = (type: string) => {
   return type === 'TENCENT_CLOUD';
   return type === 'TENCENT_CLOUD';
 };
 };
@@ -105,13 +108,20 @@ export const formSchema: FormSchema[] = [
     label: '消息类型',
     label: '消息类型',
     required: true,
     required: true,
     component: 'ApiSelect',
     component: 'ApiSelect',
-    componentProps: {
-      api: findDictItemByCode,
-      params: {
-        dictCode: 'message_type',
-      },
-      labelField: 'itemText',
-      valueField: 'itemValue',
+    componentProps({ formActionType }) {
+      return {
+        api: findDictItemByCode,
+        params: {
+          dictCode: 'message_type',
+        },
+        labelField: 'itemText',
+        valueField: 'itemValue',
+        onChange() {
+          formActionType.setFieldsValue({
+            platformType: null,
+          });
+        },
+      };
     },
     },
   },
   },
   {
   {
@@ -124,13 +134,22 @@ export const formSchema: FormSchema[] = [
         api: async (params: Recordable) => {
         api: async (params: Recordable) => {
           try {
           try {
             const result = await findDictItemByCode(params as any);
             const result = await findDictItemByCode(params as any);
-            if (isMessage(Reflect.get(formModel, 'messageType')))
+            const messageType = Reflect.get(formModel, 'messageType');
+            if (isMessage(messageType))
               return result.filter(
               return result.filter(
-                (item) => item.itemValue !== 'DING_TALK' && item.itemValue !== 'ALI_VOICE'
+                (item) =>
+                  item.itemValue !== 'DING_TALK' &&
+                  item.itemValue !== 'ALI_VOICE' &&
+                  item.itemValue !== 'ENTERPRISE_WECHAT'
               );
               );
-            if (isDingtalk(Reflect.get(formModel, 'messageType')))
+
+            if (isEnterpriseWechat(messageType)) {
+              return result.filter((item) => item.itemValue === 'ENTERPRISE_WECHAT');
+            }
+
+            if (isDingtalk(messageType))
               return result.filter((item) => item.itemValue === 'DING_TALK');
               return result.filter((item) => item.itemValue === 'DING_TALK');
-            if (isVoice(Reflect.get(formModel, 'messageType')))
+            if (isVoice(messageType))
               return result.filter((item) => item.itemValue === 'ALI_VOICE');
               return result.filter((item) => item.itemValue === 'ALI_VOICE');
           } catch (e) {
           } catch (e) {
             // eslint-disable-next-line no-console
             // eslint-disable-next-line no-console
@@ -145,10 +164,15 @@ export const formSchema: FormSchema[] = [
         valueField: 'itemValue',
         valueField: 'itemValue',
       };
       };
     },
     },
-    ifShow: ({ values }) =>
-      isMessage(Reflect.get(values, 'messageType')) ||
-      isDingtalk(Reflect.get(values, 'messageType')) ||
-      isVoice(Reflect.get(values, 'messageType')),
+    ifShow: ({ values }) => {
+      const messageType = Reflect.get(values, 'messageType');
+      return (
+        isMessage(messageType) ||
+        isDingtalk(messageType) ||
+        isVoice(messageType) ||
+        isEnterpriseWechat(messageType)
+      );
+    },
   },
   },
   {
   {
     field: 'appId',
     field: 'appId',
@@ -283,7 +307,10 @@ export const formSchema: FormSchema[] = [
     label: 'agentId',
     label: 'agentId',
     component: 'InputPassword',
     component: 'InputPassword',
     required: true,
     required: true,
-    ifShow: ({ values }) => isDingtalk(Reflect.get(values, 'messageType')),
+    ifShow: ({ values }) => {
+      const messageType = Reflect.get(values, 'messageType');
+      return isDingtalk(messageType) || isEnterpriseWechat(messageType);
+    },
     componentProps: {
     componentProps: {
       maxLength: 36,
       maxLength: 36,
       placeholder: '请输入agentId',
       placeholder: '请输入agentId',
@@ -311,6 +338,27 @@ export const formSchema: FormSchema[] = [
     },
     },
   },
   },
   {
   {
+    field: 'corpId',
+    label: 'corpId',
+    component: 'InputPassword',
+    required: true,
+    ifShow: ({ values }) => isEnterpriseWechat(Reflect.get(values, 'messageType')),
+    componentProps: {
+      maxLength: 18,
+      placeholder: '请输入corpId',
+    },
+  },
+  {
+    field: 'corpSecret',
+    label: 'corpSecret',
+    component: 'InputPassword',
+    required: true,
+    ifShow: ({ values }) => isEnterpriseWechat(Reflect.get(values, 'messageType')),
+    componentProps: {
+      placeholder: '请输入corpSecret',
+    },
+  },
+  {
     field: 'status',
     field: 'status',
     label: '状态',
     label: '状态',
     component: 'RadioButtonGroup',
     component: 'RadioButtonGroup',

@@ -43,7 +43,7 @@
           :actions="[
           :actions="[
             {
             {
               label: '发送',
               label: '发送',
-              auth: 'api:yt:template:sendEmail:post',
+              auth: 'api:yt:template:send:post',
               icon: 'ant-design:send-outlined',
               icon: 'ant-design:send-outlined',
               onClick: handleModal.bind(null, record),
               onClick: handleModal.bind(null, record),
             },
             },

@@ -5,7 +5,6 @@
       @register="registerDrawer"
       @register="registerDrawer"
       :showFooter="false"
       :showFooter="false"
       :title="descInfo?.title"
       :title="descInfo?.title"
-      destroyOnClose
       width="70%"
       width="70%"
     >
     >
       <div v-html="descInfo?.content"></div>
       <div v-html="descInfo?.content"></div>

@@ -20,10 +20,12 @@
   import { BasicTable, useTable } from '/@/components/Table';
   import { BasicTable, useTable } from '/@/components/Table';
   import { viewDeviceColumn } from '../config';
   import { viewDeviceColumn } from '../config';
   import { reportEditDetailPage } from '/@/api/report/reportManager';
   import { reportEditDetailPage } from '/@/api/report/reportManager';
+  import { getDeviceDetail } from '/@/api/device/deviceManager';
+  import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
 
 
   const tableData = ref([]);
   const tableData = ref([]);
 
 
-  const [registerTable] = useTable({
+  const [registerTable, { setLoading }] = useTable({
     columns: viewDeviceColumn,
     columns: viewDeviceColumn,
     showIndexColumn: false,
     showIndexColumn: false,
     clickToRowSelect: false,
     clickToRowSelect: false,
@@ -32,18 +34,68 @@
   });
   });
 
 
   const [register] = useModalInner((data) => {
   const [register] = useModalInner((data) => {
+    setLoading(true);
+    tableData.value = [];
     const getTableData = async () => {
     const getTableData = async () => {
       const res = (await reportEditDetailPage(data.record?.id)) as any;
       const res = (await reportEditDetailPage(data.record?.id)) as any;
-      const resMap = res?.data?.executeAttributes?.map((item) => ({
-        device: item.name,
-        attribute: item.attributes.join(','),
-      }));
-      tableData.value = resMap;
+      const deviceInfo = res?.data?.executeAttributes || [];
+      let attributesList: Recordable[] = [];
+      // 处理为物模型里的标识符名
+      const reflectDeviceList = deviceInfo.map(async (item) => {
+        const { device, attributes } = item as Recordable;
+        if (!device) return;
+        const thingsModel = (await handleDeviceProfileAttributes(item.device)) as Recordable;
+        const { tbDeviceId, attribute } = thingsModel as Recordable;
+        if (!tbDeviceId) return;
+        if (device === tbDeviceId) {
+          attributesList = attributes.reduce((acc, curr) => {
+            attribute.forEach((item: Recordable) => {
+              if (item.identifier === curr) {
+                acc.push({
+                  label: item.name,
+                  value: item.identifier,
+                });
+              }
+            });
+            return [...acc];
+          }, []);
+        }
+        return {
+          device: item.name,
+          attribute: attributesList.map((item: Recordable) => item.label).join(','),
+        };
+      });
+      tableData.value = (await Promise.all(reflectDeviceList)) as any;
+      if (tableData.value) {
+        setLoading(false);
+      }
     };
     };
     nextTick(() => {
     nextTick(() => {
       getTableData();
       getTableData();
     });
     });
   });
   });
+
+  const handleDeviceProfileAttributes = async (entityId: string) => {
+    const deviceDetailRes = await getDeviceDetail(entityId);
+    const { deviceProfileId } = deviceDetailRes;
+    if (!deviceProfileId) return;
+    const attributeRes = await getAttribute(deviceProfileId);
+    return handleDataFormat(deviceDetailRes, attributeRes);
+  };
+
+  const handleDataFormat = (deviceDetail: any, attributes: any) => {
+    const { name, tbDeviceId } = deviceDetail;
+    const attribute = attributes.map((item: any) => ({
+      identifier: item.identifier,
+      name: item.name,
+      detail: item.detail,
+    }));
+    return {
+      name,
+      tbDeviceId,
+      attribute,
+    };
+  };
 </script>
 </script>
 <style lang="less" scoped>
 <style lang="less" scoped>
   :deep(.ant-table-body) {
   :deep(.ant-table-body) {

@@ -9,6 +9,7 @@
     :disabled="disabled"
     :disabled="disabled"
     mode="multiple"
     mode="multiple"
     labelInValue
     labelInValue
+    :max-tag-count="selectDeviceMaxCount"
   />
   />
   <template v-for="(item, index) in deviceList" :key="item.value">
   <template v-for="(item, index) in deviceList" :key="item.value">
     <SelectAttributes
     <SelectAttributes
@@ -25,6 +26,7 @@
   import SelectAttributes from './SelectAttributes.vue';
   import SelectAttributes from './SelectAttributes.vue';
   import { TDeviceList, TSelectOption } from '../type';
   import { TDeviceList, TSelectOption } from '../type';
   import { createPickerSearch } from '/@/utils/pickerSearch';
   import { createPickerSearch } from '/@/utils/pickerSearch';
+  import { useMessage } from '/@/hooks/web/useMessage';
 
 
   const props = defineProps({
   const props = defineProps({
     selectOptions: {
     selectOptions: {
@@ -37,6 +39,8 @@
     },
     },
   });
   });
 
 
+  const { createMessage } = useMessage();
+
   const selectValue = ref([]);
   const selectValue = ref([]);
 
 
   const bindDeviceRef = {
   const bindDeviceRef = {
@@ -52,7 +56,10 @@
   };
   };
 
 
   const handleDeviceChange = (_, options) => {
   const handleDeviceChange = (_, options) => {
-    if (options.length > selectDeviceMaxCount.value) return;
+    if (options.length > selectDeviceMaxCount.value) {
+      createMessage.warn(`限制选择设备数为${selectDeviceMaxCount.value}`);
+      return;
+    }
     deviceList.value = options;
     deviceList.value = options;
   };
   };
 
 

@@ -117,10 +117,12 @@
     );
     );
   };
   };
 
 
-  const getChartsOption = (result: ResponsData) => {
+  const getChartsOption = (result: ResponsData, thingsModel: Recordable) => {
+    const { attribute } = thingsModel;
     const generateInfo = Object.entries(result).map((item) => {
     const generateInfo = Object.entries(result).map((item) => {
       const [attr, val] = item;
       const [attr, val] = item;
-      return { attr, val } as { attr: string; val: { ts: number; value: string }[] };
+      const findAttrName = attribute.find((attrItem) => attrItem.identifier === attr)?.name;
+      return { attr: findAttrName, val } as { attr: string; val: { ts: number; value: string }[] };
     });
     });
     const chartDataConfig =
     const chartDataConfig =
       generateInfo.map((item) => {
       generateInfo.map((item) => {
@@ -216,9 +218,13 @@
             },
             },
           };
           };
 
 
+          const thingsModel = (await handleDeviceProfileAttributes(device)) as Recordable;
           const result = await exportViewChartApi(device, sendParams);
           const result = await exportViewChartApi(device, sendParams);
           item.notFoundData = validateHasData(result);
           item.notFoundData = validateHasData(result);
-          const { xAxisData, series } = getChartsOption(result as unknown as ResponsData);
+          const { xAxisData, series } = getChartsOption(
+            result as unknown as ResponsData,
+            thingsModel as unknown as Recordable
+          );
 
 
           await nextTick();
           await nextTick();
           chartsInstance[device] = echarts.init(
           chartsInstance[device] = echarts.init(
@@ -320,7 +326,8 @@
       const result = await exportViewChartApi(device, sendParams);
       const result = await exportViewChartApi(device, sendParams);
 
 
       item.notFoundData = validateHasData(result);
       item.notFoundData = validateHasData(result);
-      const { xAxisData, series } = getChartsOption(result as unknown as ResponsData);
+      const thingsModel = (await handleDeviceProfileAttributes(device)) as Recordable;
+      const { xAxisData, series } = getChartsOption(result as unknown as ResponsData, thingsModel);
 
 
       chartsInstance[device].setOption({
       chartsInstance[device].setOption({
         series,
         series,

@@ -34,13 +34,14 @@
 
 
   const getValue = async () => {
   const getValue = async () => {
     const record = (await validateFields()) || {};
     const record = (await validateFields()) || {};
-    const { type, remark } = record;
+    const { type, remark, organizationId } = record;
     const datasourceType = Reflect.get(record, BasicInfoFormField.DATA_SOURCE_TYPE);
     const datasourceType = Reflect.get(record, BasicInfoFormField.DATA_SOURCE_TYPE);
     const convertDevices = Reflect.get(record, BasicInfoFormField.DATA_SOURCE_DEVICE);
     const convertDevices = Reflect.get(record, BasicInfoFormField.DATA_SOURCE_DEVICE);
     const convertProducts = Reflect.get(record, BasicInfoFormField.DATA_SOURCE_PRODUCT);
     const convertProducts = Reflect.get(record, BasicInfoFormField.DATA_SOURCE_PRODUCT);
     return {
     return {
       type,
       type,
       remark,
       remark,
+      organizationId,
       datasourceType,
       datasourceType,
       datasourceContent: {
       datasourceContent: {
         convertProducts,
         convertProducts,

-import { FormSchema } from '/@/components/Form';
+import { FormSchema, useComponentRegister } from '/@/components/Form';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { getDeviceProfile } from '/@/api/alarm/position';
 import { getDeviceProfile } from '/@/api/alarm/position';
 import { BasicInfoFormField, DataSourceType } from '../enum';
 import { BasicInfoFormField, DataSourceType } from '../enum';
 import { DeviceRecord } from '/@/api/device/model/deviceModel';
 import { DeviceRecord } from '/@/api/device/model/deviceModel';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { useMessage } from '/@/hooks/web/useMessage';
+import { OrgTreeSelect } from '/@/views/common/OrgTreeSelect';
+
+useComponentRegister('OrgTreeSelect', OrgTreeSelect);
 
 
 export const stepConfig = ['选择流转方式', '完善配置参数'];
 export const stepConfig = ['选择流转方式', '完善配置参数'];
 
 
@@ -57,6 +60,13 @@ export const modeForm = (disabled: boolean): FormSchema[] => {
       },
       },
     },
     },
     {
     {
+      required: true,
+      field: BasicInfoFormField.ORGANIZATION_ID,
+      label: '所属组织',
+      colProps: { span: 24 },
+      component: 'OrgTreeSelect',
+    },
+    {
       field: BasicInfoFormField.DATA_SOURCE_PRODUCT,
       field: BasicInfoFormField.DATA_SOURCE_PRODUCT,
       label: '数据源产品',
       label: '数据源产品',
       component: 'TransferModal',
       component: 'TransferModal',
@@ -108,9 +118,10 @@ export const modeForm = (disabled: boolean): FormSchema[] => {
       componentProps: ({ formModel }) => {
       componentProps: ({ formModel }) => {
         const convertConfigId = formModel[BasicInfoFormField.CONVERT_CONFIG_ID];
         const convertConfigId = formModel[BasicInfoFormField.CONVERT_CONFIG_ID];
         const deviceProfileIds = formModel[BasicInfoFormField.DATA_SOURCE_PRODUCT];
         const deviceProfileIds = formModel[BasicInfoFormField.DATA_SOURCE_PRODUCT];
+        const organizationId = formModel[BasicInfoFormField.ORGANIZATION_ID];
         return {
         return {
           disabled,
           disabled,
-          params: { convertConfigId, deviceProfileIds },
+          params: { convertConfigId, deviceProfileIds, organizationId },
           transformValue: handleGroupDevice,
           transformValue: handleGroupDevice,
           openModalValidate: () => {
           openModalValidate: () => {
             if (!deviceProfileIds || !deviceProfileIds?.length) {
             if (!deviceProfileIds || !deviceProfileIds?.length) {

@@ -8,6 +8,7 @@ export enum BasicInfoFormField {
   DATA_SOURCE_PRODUCT = 'datasourceProduct',
   DATA_SOURCE_PRODUCT = 'datasourceProduct',
   DATA_SOURCE_DEVICE = 'datasourceDevice',
   DATA_SOURCE_DEVICE = 'datasourceDevice',
   CONVERT_CONFIG_ID = 'convertConfigId',
   CONVERT_CONFIG_ID = 'convertConfigId',
+  ORGANIZATION_ID = 'organizationId',
 }
 }
 
 
 export enum DataSourceType {
 export enum DataSourceType {

@@ -128,7 +128,7 @@ export function useBasicDataTransform() {
           description,
           description,
           name,
           name,
         },
         },
-        created: !id?.id,
+        created: !!id?.id,
       },
       },
       {
       {
         id: id?.id || buildUUID(),
         id: id?.id || buildUUID(),
@@ -152,6 +152,7 @@ export function useBasicDataTransform() {
       }
       }
 
 
       const newNode = genNewNodeByData(node, nodeConfig);
       const newNode = genNewNodeByData(node, nodeConfig);
+      newNode.data.isSaved = true;
 
 
       addNodes.push(newNode);
       addNodes.push(newNode);
     }
     }
@@ -206,7 +207,7 @@ export function useBasicDataTransform() {
     return connections;
     return connections;
   }
   }
 
 
-  function getNodes(nodesRef: Ref<GraphNode[]> | GraphNode[], removeId: boolean) {
+  function getNodes(nodesRef: Ref<GraphNode[]> | GraphNode[]) {
     const nodes: BasicNodeBindData[] = [];
     const nodes: BasicNodeBindData[] = [];
 
 
     let offsetX = 0;
     let offsetX = 0;
@@ -220,7 +221,7 @@ export function useBasicDataTransform() {
 
 
       const resultNode = Object.assign(
       const resultNode = Object.assign(
         mergeData(data, nodeData, node),
         mergeData(data, nodeData, node),
-        !nodeData.created || !removeId
+        nodeData?.isSaved
           ? ({
           ? ({
               id: { id: node.id, entityType: RuleChainEntityType.RULE_NODE },
               id: { id: node.id, entityType: RuleChainEntityType.RULE_NODE },
             } as BasicNodeBindData)
             } as BasicNodeBindData)
@@ -264,8 +265,7 @@ export function useBasicDataTransform() {
 
 
   function combineData(
   function combineData(
     nodesRef: Ref<GraphNode[]> | GraphNode[] = [],
     nodesRef: Ref<GraphNode[]> | GraphNode[] = [],
-    edgesRef: Ref<GraphEdge[]> | GraphEdge[] = [],
-    removeId = false
+    edgesRef: Ref<GraphEdge[]> | GraphEdge[] = []
   ) {
   ) {
     const extraIgnoreNodeRef = unref(nodesRef).filter(
     const extraIgnoreNodeRef = unref(nodesRef).filter(
       (item) => !ignoreNodeKeys.includes((item.data as NodeData).config?.key as string)
       (item) => !ignoreNodeKeys.includes((item.data as NodeData).config?.key as string)
@@ -273,7 +273,7 @@ export function useBasicDataTransform() {
 
 
     const connections = getConnections(extraIgnoreNodeRef, edgesRef);
     const connections = getConnections(extraIgnoreNodeRef, edgesRef);
 
 
-    const nodes = getNodes(extraIgnoreNodeRef, removeId);
+    const nodes = getNodes(extraIgnoreNodeRef);
 
 
     const firstNodeIndex = getFirsetNodeIndex(extraIgnoreNodeRef, edgesRef);
     const firstNodeIndex = getFirsetNodeIndex(extraIgnoreNodeRef, edgesRef);
 
 

@@ -170,7 +170,7 @@ export function useContextMenuAction() {
     const { getAddNodesParams } = useAddNodes();
     const { getAddNodesParams } = useAddNodes();
     const { x, y } = position;
     const { x, y } = position;
 
 
-    const value = getAddNodesParams(position, data, { id });
+    const value = getAddNodesParams(position, { ...data, isSaved: false }, { id });
 
 
     setRuleNodeCache({
     setRuleNodeCache({
       nodes: [value],
       nodes: [value],

@@ -50,8 +50,7 @@ export function useSaveAndRedo() {
 
 
     const { connections, nodes, firstNodeIndex } = combineData(
     const { connections, nodes, firstNodeIndex } = combineData(
       flowActionType.getNodes,
       flowActionType.getNodes,
-      flowActionType.getEdges,
-      true
+      flowActionType.getEdges
     );
     );
 
 
     handleSaveRuleChain(connections, nodes, firstNodeIndex, flowActionType);
     handleSaveRuleChain(connections, nodes, firstNodeIndex, flowActionType);
@@ -120,7 +119,6 @@ export function useSaveAndRedo() {
         ? await getImportMetadata()
         ? await getImportMetadata()
         : await getRuleChainData(unref(getRuleChainId));
         : await getRuleChainData(unref(getRuleChainId));
       if (!data) return;
       if (!data) return;
-
       const elements = parseRuleChain(data);
       const elements = parseRuleChain(data);
 
 
       flowActionType.setElements(elements);
       flowActionType.setElements(elements);

@@ -138,6 +138,7 @@ export interface NodeData<T = BasicNodeFormData> {
   config?: NodeItemConfigType;
   config?: NodeItemConfigType;
   data?: T;
   data?: T;
   created?: boolean;
   created?: boolean;
+  isSaved?: boolean;
 }
 }
 
 
 export interface EdgeData {
 export interface EdgeData {

@@ -30,7 +30,7 @@
               auth: 'api:yt:sceneLinkage:update',
               auth: 'api:yt:sceneLinkage:update',
               icon: 'clarity:note-edit-line',
               icon: 'clarity:note-edit-line',
               onClick: handleEdit.bind(null, record),
               onClick: handleEdit.bind(null, record),
-              ifShow: record.creator === userId && record.status !== 1,
+              ifShow: record.status !== 1,
             },
             },
           ]"
           ]"
           :drop-down-actions="[
           :drop-down-actions="[
@@ -39,7 +39,7 @@
               auth: 'api:yt:sceneLinkage:delete',
               auth: 'api:yt:sceneLinkage:delete',
               icon: 'ant-design:delete-outlined',
               icon: 'ant-design:delete-outlined',
               color: 'error',
               color: 'error',
-              ifShow: record.creator === userId && record.status !== 1,
+              ifShow: record.status !== 1,
               popConfirm: {
               popConfirm: {
                 title: '是否确认删除',
                 title: '是否确认删除',
                 confirm: handleDeleteOrBatchDelete.bind(null, record),
                 confirm: handleDeleteOrBatchDelete.bind(null, record),
@@ -82,8 +82,6 @@
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   import { Switch, Popconfirm, Tag } from 'ant-design-vue';
   import { Switch, Popconfirm, Tag } from 'ant-design-vue';
   import { columns, searchFormSchema } from './config/config.data';
   import { columns, searchFormSchema } from './config/config.data';
-  import { USER_INFO_KEY } from '/@/enums/cacheEnum';
-  import { getAuthCache } from '/@/utils/auth';
   import { SceneLinkageDrawer } from './components/SceneLinkageDrawer';
   import { SceneLinkageDrawer } from './components/SceneLinkageDrawer';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { Authority } from '/@/components/Authority';
   import { Authority } from '/@/components/Authority';
@@ -91,8 +89,6 @@
   import { SceneLinkageDrawerDataType } from './components/SceneLinkageDrawer/type';
   import { SceneLinkageDrawerDataType } from './components/SceneLinkageDrawer/type';
   import { DataActionModeEnum } from '/@/enums/toolEnum';
   import { DataActionModeEnum } from '/@/enums/toolEnum';
 
 
-  const userInfo: any = getAuthCache(USER_INFO_KEY);
-  const userId = userInfo.userId;
   const { hasPermission } = usePermission();
   const { hasPermission } = usePermission();
 
 
   const [registerDrawer, { openDrawer }] = useDrawer();
   const [registerDrawer, { openDrawer }] = useDrawer();

@@ -102,7 +102,7 @@ export const searchFormSchema = (syncValue: Fn): FormSchema[] => {
       field: 'createTime',
       field: 'createTime',
       label: '创建时间',
       label: '创建时间',
       component: 'RangePicker',
       component: 'RangePicker',
-      colProps: { span: 10 },
+      colProps: { span: 8 },
       componentProps: {
       componentProps: {
         showTime: {
         showTime: {
           defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
           defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
@@ -128,6 +128,13 @@ export const formSchema: FormSchema[] = [
     },
     },
   },
   },
   {
   {
+    required: true,
+    field: 'organizationId',
+    label: '所属组织',
+    colProps: { span: 24 },
+    component: 'OrgTreeSelect',
+  },
+  {
     field: 'remark',
     field: 'remark',
     label: '说明',
     label: '说明',
     component: 'InputTextArea',
     component: 'InputTextArea',

@@ -27,6 +27,7 @@
     labelWidth: 120,
     labelWidth: 120,
     showAdvancedButton: true,
     showAdvancedButton: true,
     compact: true,
     compact: true,
+    actionColOptions: { span: 4 },
     fieldMapToTime: [['createTime', ['startTime', 'endTime'], 'x']],
     fieldMapToTime: [['createTime', ['startTime', 'endTime'], 'x']],
     submitFunc: async () => {
     submitFunc: async () => {
       const value = getFieldsValue();
       const value = getFieldsValue();

@@ -8,9 +8,8 @@
 
 
 <script>
 <script>
   import { defineComponent } from 'vue';
   import { defineComponent } from 'vue';
-  import { useRoute } from 'vue-router';
+  import { useRoute, useRouter } from 'vue-router';
   import { PageWrapper } from '/@/components/Page';
   import { PageWrapper } from '/@/components/Page';
-  import { useGo } from '/@/hooks/web/usePage';
   import { Description } from '../../../components/Description';
   import { Description } from '../../../components/Description';
   import { getAccountInfo } from '../../../api/system/system';
   import { getAccountInfo } from '../../../api/system/system';
   import { accountSchema } from './account.detail.data';
   import { accountSchema } from './account.detail.data';
@@ -22,7 +21,8 @@
     components: { PageWrapper, Description },
     components: { PageWrapper, Description },
     setup() {
     setup() {
       const route = useRoute();
       const route = useRoute();
-      const go = useGo();
+
+      const ROUTER = useRouter();
       const { setTitle, close } = useTabs();
       const { setTitle, close } = useTabs();
       const [register, { setDescProps }] = useDescription({
       const [register, { setDescProps }] = useDescription({
         title: '账号基础信息',
         title: '账号基础信息',
@@ -52,7 +52,8 @@
       function goBack() {
       function goBack() {
         // 本例的效果时点击返回始终跳转到账号列表页，实际应用时可返回上一页
         // 本例的效果时点击返回始终跳转到账号列表页，实际应用时可返回上一页
         close();
         close();
-        go('/system/account');
+        ROUTER.go(-1);
+        // go('/system/account');
       }
       }
       return { goBack, accountSchema, accountData, register };
       return { goBack, accountSchema, accountData, register };
     },
     },

@@ -245,7 +245,10 @@
               delete postData.email;
               delete postData.email;
             }
             }
           }
           }
-          await SaveOrUpdateUserInfo(postData as any, unref(isUpdate));
+          await SaveOrUpdateUserInfo(
+            { ...postData, roleType: 'PLATFORM_ADMIN' } as any,
+            unref(isUpdate)
+          );
           closeModal();
           closeModal();
           emit('success');
           emit('success');
           createMessage.success(unref(isUpdate) ? '编辑成功' : '新增成功');
           createMessage.success(unref(isUpdate) ? '编辑成功' : '新增成功');

+<template>
+  <div>
+    <PageWrapper :title="`用户资料`" contentBackground @back="goBack">
+      <Description size="middle" @register="register" />
+    </PageWrapper>
+  </div>
+</template>
+
+<script>
+  import { defineComponent } from 'vue';
+  import { useRoute } from 'vue-router';
+  import { PageWrapper } from '/@/components/Page';
+  import { useGo } from '/@/hooks/web/usePage';
+  import { Description } from '/@/components/Description';
+  import { getAccountInfo } from '/@/api/system/system';
+  import { accountSchema } from './account.detail.data';
+  import { useDescription } from '/@/components/Description';
+  import { useTabs } from '/@/hooks/web/useTabs';
+  const accountData = {};
+  export default defineComponent({
+    name: 'AccountDetail',
+    components: { PageWrapper, Description },
+    setup() {
+      const route = useRoute();
+      const go = useGo();
+      const { setTitle, close } = useTabs();
+      const [register, { setDescProps }] = useDescription({
+        title: '账号基础信息',
+        data: accountData,
+        schema: accountSchema,
+        column: 3,
+      });
+      getAccountInfo(route.params?.id).then((result) => {
+        Reflect.set(accountData, 'remark', result.remark);
+        Reflect.set(accountData, 'realName', result.realName);
+        Reflect.set(accountData, 'phoneNumber', result.phoneNumber);
+        Reflect.set(accountData, 'email', result.email);
+        Reflect.set(accountData, 'username', result.username);
+        Reflect.set(
+          accountData,
+          'enabled',
+          result.enabled ? '正常' : !result.enabled ? '禁用' : '已过期'
+        );
+        Reflect.set(accountData, 'accountExpireTime', result.accountExpireTime);
+        Reflect.set(accountData, 'createTime', result.createTime);
+        Reflect.set(accountData, 'updateTime', result.updateTime);
+        // 设置Tab的标题（不会影响页面标题）
+        setTitle('详情：用户' + result.realName);
+        setDescProps(accountData);
+      });
+      // 页面左侧点击返回链接时的操作
+      function goBack() {
+        // 本例的效果时点击返回始终跳转到账号列表页，实际应用时可返回上一页
+        close();
+        go('/system/account');
+      }
+      return { goBack, accountSchema, accountData, register };
+    },
+  });
+</script>
+
+<style scoped>
+  .vben-collapse-container {
+    background-color: white !important;
+  }
+</style>

+<template>
+  <BasicModal
+    width="650px"
+    v-bind="$attrs"
+    @register="registerModal"
+    :title="getTitle"
+    @ok="handleSubmit"
+  >
+    <div style="height: 50vh">
+      <BasicForm @register="registerForm">
+        <template #organizationId="{ model, field }">
+          <Button type="link" @click="handleOpenCreate" style="padding: 0; z-index: 9999"
+            >新增组织
+          </Button>
+          <BasicTree
+            v-if="organizationTreeData.length"
+            :check-strictly="checkStrictly"
+            v-model:value="model[field]"
+            :treeData="organizationTreeData"
+            :checked-keys="checkedKeys"
+            :expandedKeys="treeExpandData"
+            ref="basicTreeRef"
+            @check="handleCheckClick"
+            @unSelectAll="handleUnSelectAll"
+            @strictlyStatus="handleStrictlyStatus"
+            checkable
+            toolbar
+            @change="handleTreeSelect"
+            :replace-fields="{ children: 'children', title: 'name', key: 'id' }"
+          />
+        </template>
+        <template #roleSlot="{ model, field }">
+          <a-select
+            mode="multiple"
+            allowClear
+            placeholder="请选择角色"
+            v-model:value="model[field]"
+            @change="handleRoleSelect"
+            :options="roleOptions.map((item) => ({ value: item.value, label: item.label }))"
+          >
+            <template #dropdownRender="{ menuNode: menu }">
+              <v-nodes :vnodes="menu" />
+              <a-divider style="margin: 4px 0" />
+              <div @click="handleOpenRole" style="padding: 4px 0; cursor: pointer">
+                <plus-outlined />
+                新增角色
+              </div>
+            </template>
+          </a-select>
+        </template>
+      </BasicForm>
+
+      <OrganizationDrawer @register="registerDrawer" @success="handleReload" />
+    </div>
+  </BasicModal>
+  <RoleDrawer @register="registerRoleDrawer" @success="handleSuccess" />
+</template>
+<script lang="ts" setup>
+  import { ref, computed, unref, reactive, onMounted, toRaw } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { BasicForm, useForm } from '/@/components/Form/index';
+  import { accountFormSchema } from './account.data';
+  import { Button } from 'ant-design-vue';
+  import {
+    findCurrentUserRelation,
+    SaveOrUpdateUserInfo,
+    filterRoleList,
+  } from '/@/api/system/system';
+  import { BasicTree, TreeItem, CheckKeys } from '/@/components/Tree';
+  import { findCurrentUserGroups } from '/@/api/system/group';
+  import { RoleOrOrganizationParam } from '/@/api/system/model/systemModel';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { TOption } from '/@/views/rule/linkedge/config/config.data';
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import { useDrawer } from '/@/components/Drawer';
+  import RoleDrawer from '../../role/CustomRoleDrawer.vue';
+  import OrganizationDrawer from '/@/views/system/organization/OrganizationDrawer.vue';
+  import { GroupListResultModel } from '/@/api/system/model/groupModel';
+  import { isArray } from '/@/utils/is';
+
+  const VNodes = (_, { attrs }) => {
+    return attrs.vnodes;
+  };
+
+  const emit = defineEmits(['register', 'success']);
+
+  const checkStrictly = ref(true);
+  const roleOptions = ref<TOption[]>([]);
+  const isUpdate = ref(true);
+  const rowId = ref('');
+  const organizationTreeData = ref<TreeItem[]>([]);
+  const basicTreeRef = ref();
+  const checkedKeys = reactive<CheckKeys>({ checked: [], halfChecked: [] });
+  const treeExpandData = ref([]);
+  const olderPhoneNumber = ref();
+  const postData = reactive({});
+  const singleEditPostPhoneNumber = reactive({
+    phoneNumber: '',
+  });
+  const checkedKeysWithHalfChecked = ref<(string | number)[]>([]);
+  const getRoleList = async () => {
+    const res = await filterRoleList();
+    roleOptions.value = res.map((m) => {
+      return {
+        label: m.name,
+        value: m.id,
+      };
+    });
+  };
+  onMounted(async () => {
+    await getRoleList();
+  });
+  const [registerRoleDrawer, { openDrawer }] = useDrawer();
+
+  const handleOpenRole = () => {
+    openDrawer(true, {
+      isUpdate: false,
+    });
+  };
+  const clearValidateByField = (field: string) => {
+    clearValidate(field);
+  };
+  const handleRoleSelect = (e) => {
+    if (e?.length > 0) clearValidateByField('roleIds');
+    else validateFields(['roleIds']);
+  };
+  const handleTreeSelect = (e) => {
+    if (e) clearValidateByField('organizationIds');
+  };
+  const handleSuccess = async () => {
+    await getRoleList();
+  };
+  const [
+    registerForm,
+    {
+      setFieldsValue,
+      updateSchema,
+      resetFields,
+      validate,
+      getFieldsValue,
+      clearValidate,
+      validateFields,
+    },
+  ] = useForm({
+    labelWidth: 100,
+    schemas: accountFormSchema,
+    showActionButtonGroup: false,
+    actionColOptions: {
+      span: 18,
+    },
+  });
+  //获取所有父级id
+  function findForAllId(data = [], arr = []) {
+    for (const item of data) {
+      arr.push(item.id);
+    }
+    return arr;
+  }
+
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    checkStrictly.value = true;
+    await resetFields();
+    setModalProps({ confirmLoading: false });
+    isUpdate.value = !!data?.isUpdate;
+    const groupListModel = await findCurrentUserGroups();
+    if (!unref(organizationTreeData).length) {
+      organizationTreeData.value = groupListModel;
+      buildNodeMap(toRaw(unref(groupListModel)));
+      const getAllIds = findForAllId(organizationTreeData.value as any, []);
+      //设置要展开的id
+      treeExpandData.value = getAllIds;
+    }
+    if (unref(isUpdate)) {
+      rowId.value = data.record.id;
+      const roleParams = new RoleOrOrganizationParam(rowId.value, true, false);
+      olderPhoneNumber.value = data.record.phoneNumber;
+      singleEditPostPhoneNumber.phoneNumber = data.record.phoneNumber;
+      findCurrentUserRelation(roleParams).then((result) => {
+        Reflect.set(data.record, 'roleIds', result);
+        Reflect.set(data.record, 'password', '******');
+        setFieldsValue(data.record);
+      });
+      const organizationParams = new RoleOrOrganizationParam(rowId.value, false, true);
+      const checked = await findCurrentUserRelation(organizationParams);
+      const halfChecked = getHalfCheckedNode(checked);
+      Object.assign(checkedKeys, { checked, halfChecked });
+      setFieldsValue({ organizationIds: toRaw(checkedKeys) });
+    }
+    await updateSchema([
+      {
+        field: 'username',
+        dynamicDisabled: unref(isUpdate),
+      },
+      {
+        field: 'password',
+        ifShow: !unref(isUpdate),
+      },
+    ]);
+  });
+  const getTitle = computed(() => (!unref(isUpdate) ? '新增客户账号' : '编辑客户账号'));
+
+  const getFormatValues = (values: Recordable) => {
+    const organizationIds = values.organizationIds;
+    if (!organizationIds || isArray(organizationIds)) return values;
+
+    values.organizationIds = values?.organizationIds?.checked;
+
+    return values;
+  };
+
+  async function handleSubmit() {
+    setModalProps({ confirmLoading: true });
+    try {
+      const { createMessage } = useMessage();
+      if (unref(isUpdate)) {
+        Object.assign(postData, singleEditPostPhoneNumber);
+      }
+      const values = await validate([
+        'id',
+        'username',
+        'realName',
+        'password',
+        'roleIds',
+        'email',
+        'accountExpireTime',
+        'enabled',
+        'remark',
+        'organizationIds',
+        olderPhoneNumber.value === getFieldsValue().phoneNumber ? '' : 'phoneNumber',
+      ]);
+
+      values.accountExpireTime =
+        typeof values.accountExpireTime != 'undefined' && values.accountExpireTime != null
+          ? values.accountExpireTime.format('YYYY-MM-DD HH:mm:ss')
+          : null;
+
+      Object.assign(postData, getFormatValues(values));
+      if (unref(isUpdate)) {
+        if (values.email == '') {
+          delete postData.email;
+        }
+      } else {
+        if (values.email == '') {
+          delete postData.email;
+        }
+      }
+      if (!Reflect.get(values, 'accountExpireTime')) {
+        Reflect.deleteProperty(postData, 'accountExpireTime');
+      }
+      await SaveOrUpdateUserInfo(postData as any, unref(isUpdate));
+      closeModal();
+      emit('success');
+      createMessage.success(unref(isUpdate) ? '编辑成功' : '新增成功');
+    } finally {
+      setTimeout(() => {
+        setModalProps({ confirmLoading: false });
+      }, 300);
+    }
+  }
+  // 取消全部的时候清除回显时获取的
+  const handleUnSelectAll = () => {
+    checkedKeysWithHalfChecked.value = [];
+  };
+
+  const strictlyStatus = ref(false); //层级关联或独立的状态 false为层级关联 true为层级独立
+
+  const handleStrictlyStatus = (status) => (strictlyStatus.value = status);
+
+  const handleCheckClick = () => {
+    if (unref(checkStrictly)) {
+      checkStrictly.value = false;
+    }
+  };
+
+  const [registerDrawer, { openDrawer: addOpenDrawer }] = useDrawer();
+
+  const handleOpenCreate = () => {
+    addOpenDrawer(true, { isUpdate: false });
+  };
+  const handleReload = async () => {
+    const groupListModel = await findCurrentUserGroups();
+    organizationTreeData.value = groupListModel;
+    buildNodeMap(toRaw(unref(groupListModel)));
+  };
+
+  const treeNodeMap = ref<Record<string, { parentId?: string; children?: string[] }>>();
+
+  function buildNodeMap(tree: GroupListResultModel) {
+    const nodeMap: Record<string, { parentId?: string; children?: string[] }> = {};
+
+    function traverse(tree: GroupListResultModel) {
+      for (let node of tree) {
+        Reflect.set(nodeMap, node.id, {
+          parentId: node.parentId,
+          children: node.children?.map((item) => item.id),
+        });
+
+        if (node.children && node.children.length) {
+          traverse(node.children);
+        }
+      }
+    }
+    traverse(tree);
+
+    treeNodeMap.value = nodeMap;
+  }
+
+  function getHalfCheckedNode(keys: string[]) {
+    const relation = unref(treeNodeMap) || {};
+    const halfChecked: string[] = [];
+
+    for (const key of keys) {
+      let current = relation[key];
+
+      while (current) {
+        if (keys.includes(current.parentId!) || !current.parentId) {
+          break;
+        }
+
+        halfChecked.push(current.parentId!);
+        current = relation[current.parentId!];
+      }
+    }
+
+    return Array.from(new Set(halfChecked));
+  }
+</script>
+<style scoped lang="less">
+  :deep(.vben-basic-tree) {
+    width: 100% !important;
+    margin-top: -28px !important;
+    padding: 0;
+  }
+
+  :deep(.is-unflod) {
+    display: none !important;
+  }
+
+  :deep(.is-flod) {
+    display: none !important;
+  }
+</style>

+import { isAccountExist, IsPhoneExist } from '/@/api/system/system';
+import { BasicColumn } from '/@/components/Table';
+import { FormSchema } from '/@/components/Table';
+import { emailRule, ChineseRegexp, EmailRegexp, phoneRegexp } from '/@/utils/rules';
+
+let olderPhoneNumber;
+
+export const columns: BasicColumn[] = [
+  {
+    title: '用户名',
+    dataIndex: 'username',
+    width: 120,
+  },
+  {
+    title: '姓名',
+    dataIndex: 'realName',
+    width: 120,
+  },
+  {
+    title: '手机号码',
+    dataIndex: 'phoneNumber',
+    width: 120,
+  },
+  {
+    title: '邮箱',
+    dataIndex: 'email',
+    width: 120,
+  },
+  {
+    title: '创建时间',
+    dataIndex: 'createTime',
+    width: 180,
+  },
+  {
+    title: '状态',
+    dataIndex: 'userStatusEnum',
+    width: 120,
+    slots: { customRender: 'status' },
+  },
+];
+
+export const searchFormSchema: FormSchema[] = [
+  {
+    field: 'username',
+    label: '用户名',
+    component: 'Input',
+    colProps: { span: 8 },
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入用户名',
+    },
+  },
+  {
+    field: 'realName',
+    label: '姓名',
+    component: 'Input',
+    colProps: { span: 8 },
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入姓名',
+    },
+  },
+];
+
+export const accountFormSchema: FormSchema[] = [
+  {
+    field: 'id',
+    label: 'id',
+    component: 'Input',
+    show: false,
+    componentProps: {
+      maxLength: 36,
+    },
+  },
+  {
+    field: 'username',
+    label: '用户名',
+    component: 'Input',
+    colProps: { span: 12 },
+    dynamicDisabled: false,
+    componentProps: {
+      maxLength: 36,
+      placeholder: '请输入用户名',
+    },
+    dynamicRules: ({ values }) => {
+      return [
+        {
+          required: true,
+          validator(_, value) {
+            return new Promise((resolve, reject) => {
+              if (value == '') {
+                reject('请输入用户名');
+              } else if (ChineseRegexp.test(value)) {
+                reject('用户名不能含有中文');
+              } else if (EmailRegexp.test(value)) {
+                reject('用户名不能为电子邮箱格式');
+              } else {
+                if (values.username != undefined && values.id == undefined) {
+                  isAccountExist(value).then(({ data }) => {
+                    if (data != null) {
+                      reject('用户名已存在');
+                    } else {
+                      resolve();
+                    }
+                  });
+                } else {
+                  resolve();
+                }
+              }
+            });
+          },
+        },
+      ];
+    },
+  },
+  {
+    field: 'password',
+    label: '密码',
+    component: 'InputPassword',
+    required: true,
+    colProps: { span: 12 },
+  },
+  {
+    field: 'realName',
+    label: '姓名',
+    component: 'Input',
+    colProps: { span: 12 },
+    required: true,
+    componentProps: {
+      maxLength: 10,
+    },
+  },
+  {
+    label: '角色',
+    field: 'roleIds',
+    component: 'Select',
+    colProps: { span: 12 },
+    slot: 'roleSlot',
+    rules: [
+      {
+        required: true,
+        message: '请选择角色',
+        type: 'array',
+      },
+    ],
+  },
+  {
+    label: '手机号',
+    field: 'phoneNumber',
+    component: 'Input',
+    colProps: { span: 12 },
+    dynamicRules: ({ values }) => {
+      return [
+        {
+          required: true,
+          validator(_, value) {
+            return new Promise((resolve, reject) => {
+              if (value == '') {
+                reject('请输入手机号');
+              } else if (!phoneRegexp.test(value)) {
+                reject('请输入正确的手机号');
+              } else {
+                if (values.phoneNumber != undefined) {
+                  // 此处可以用防抖函数优化性能
+                  IsPhoneExist(value).then(({ data }) => {
+                    if (data != null) {
+                      reject('手机号已存在');
+                    } else {
+                      resolve();
+                    }
+                  });
+                } else {
+                  resolve();
+                }
+              }
+            });
+          },
+        },
+      ];
+    },
+    componentProps({ formActionType }) {
+      const { clearValidate } = formActionType;
+      return {
+        maxlength: 11,
+        onChange(value) {
+          if (value == olderPhoneNumber) {
+            clearValidate('phoneNumber');
+          }
+        },
+      };
+    },
+  },
+  {
+    label: '邮箱',
+    field: 'email',
+    component: 'Input',
+    colProps: { span: 12 },
+    rules: emailRule,
+  },
+  {
+    field: 'accountExpireTime',
+    label: '有效期',
+    component: 'DatePicker',
+    colProps: { span: 12 },
+    componentProps: {
+      showTime: true,
+      format: 'YYYY-MM-DD HH:mm:ss',
+    },
+  },
+  {
+    field: 'enabled',
+    label: '状态',
+    component: 'RadioButtonGroup',
+    colProps: { span: 12 },
+    defaultValue: true,
+    componentProps: {
+      options: [
+        { label: '启用', value: true },
+        { label: '禁用', value: false },
+      ],
+    },
+  },
+  {
+    field: 'remark',
+    label: '备注',
+    component: 'InputTextArea',
+    colProps: { span: 24 },
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入备注',
+    },
+  },
+  {
+    field: 'organizationIds',
+    label: '所属组织',
+    component: 'Input',
+    slot: 'organizationId',
+    required: true,
+  },
+];

+import { DescItem } from '/@/components/Description';
+
+export const accountSchema: DescItem[] = [
+  {
+    field: 'realName',
+    label: '用户姓名',
+  },
+  {
+    field: 'phoneNumber',
+    label: '手机号',
+  },
+  {
+    field: 'email',
+    label: '邮箱',
+  },
+  {
+    field: 'username',
+    label: '账号',
+  },
+  {
+    field: 'enabled',
+    label: '状态',
+  },
+  {
+    field: 'accountExpireTime',
+    label: '有效期',
+  },
+  {
+    field: 'createTime',
+    label: '创建时间',
+  },
+  {
+    field: 'updateTime',
+    label: '更新时间',
+  },
+  {
+    field: 'remark',
+    label: '备注',
+  },
+];

+<template>
+  <div>
+    <PageWrapper dense contentFullHeight contentClass="flex">
+      <OrganizationIdTree @select="handleSelect" ref="organizationIdTreeRef" />
+      <BasicTable
+        style="flex: auto"
+        :clickToRowSelect="false"
+        @register="registerTable"
+        class="w-3/4 xl:w-4/5"
+      >
+        <template #toolbar>
+          <Authority value="api:yt:user:post">
+            <a-button type="primary" @click="handleCreate">新增客户账号</a-button>
+          </Authority>
+          <Authority value="api:yt:user:delete">
+            <Popconfirm
+              title="您确定要批量删除数据"
+              ok-text="确定"
+              cancel-text="取消"
+              @confirm="handleDeleteOrBatchDelete(null)"
+            >
+              <a-button color="error" :disabled="hasBatchDelete"> 批量删除 </a-button>
+            </Popconfirm>
+          </Authority>
+        </template>
+        <template #status="{ record }">
+          <Tag
+            :color="
+              record.userStatusEnum === 'NORMAL'
+                ? 'green'
+                : record.userStatusEnum === 'DISABLED'
+                ? 'red'
+                : 'orange'
+            "
+          >
+            {{
+              record.userStatusEnum === 'NORMAL'
+                ? '正常'
+                : record.userStatusEnum === 'DISABLED'
+                ? '已禁用'
+                : '已过期'
+            }}
+          </Tag>
+        </template>
+        <template #action="{ record }">
+          <TableAction
+            :actions="[
+              {
+                label: '进入',
+                icon: 'ant-design:login-outlined',
+                tooltip: `以${!isAdmin(role) ? '客户' : '平台'}用户身份登录`,
+                onClick: handleLoginCustomAdmin.bind(null, record),
+              },
+              {
+                label: '用户详情',
+                auth: 'api:yt:user:get',
+                icon: 'clarity:info-standard-line',
+                tooltip: '用户详情',
+                onClick: handleView.bind(null, record),
+                ifShow: record.level != 0,
+              },
+              {
+                label: '编辑',
+                auth: 'api:yt:user:update',
+                icon: 'clarity:note-edit-line',
+                tooltip: '编辑',
+                onClick: handleEdit.bind(null, record),
+                ifShow: record.level != 0,
+              },
+            ]"
+            :drop-down-actions="[
+              {
+                label: '删除',
+                auth: 'api:yt:user:delete',
+                icon: 'ant-design:delete-outlined',
+                color: 'error',
+                tooltip: '删除',
+                ifShow: record.level != 0,
+                popConfirm: {
+                  title: '是否确认删除',
+                  confirm: handleDeleteOrBatchDelete.bind(null, record),
+                },
+              },
+              {
+                label: '清除密码',
+                auth: 'api:yt:user:resetPassword',
+                icon: 'ant-design:delete-outlined',
+                color: 'error',
+                tooltip: '清除密码',
+                popConfirm: {
+                  title: '是否确认清除密码',
+                  confirm: handleClearPassword.bind(null, record),
+                },
+              },
+            ]"
+          />
+        </template>
+      </BasicTable>
+      <AccountModal @register="registerModal" @success="handleSuccess" />
+    </PageWrapper>
+  </div>
+</template>
+<script lang="ts">
+  import { defineComponent, reactive, nextTick } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { deleteUser, getAccountList } from '/@/api/system/system';
+  import { PageWrapper } from '/@/components/Page';
+  import { useResetOrganizationTree, OrganizationIdTree } from '/@/views/common/organizationIdTree';
+  import { Tag, Popconfirm } from 'ant-design-vue';
+  import { useModal } from '/@/components/Modal';
+  import AccountModal from './AccountModal.vue';
+  import { columns, searchFormSchema } from './account.data';
+  import { useGo } from '/@/hooks/web/usePage';
+  import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
+  import { Authority } from '/@/components/Authority';
+  import { getAuthCache } from '/@/utils/auth';
+  import { USER_INFO_KEY } from '/@/enums/cacheEnum';
+  import { isAdmin } from '/@/enums/roleEnum';
+  import { TenantListItemRecord } from '/@/api/tenant/tenantInfo';
+  import { useFastEnter } from '/@/hooks/business/useFastEnter';
+  import { clearUserPassword } from '/@/api/system/system';
+  import { useMessage } from '/@/hooks/web/useMessage';
+
+  export default defineComponent({
+    name: 'AccountManagement',
+    components: {
+      BasicTable,
+      PageWrapper,
+      OrganizationIdTree,
+      AccountModal,
+      TableAction,
+      Tag,
+      Authority,
+      Popconfirm,
+    },
+    setup() {
+      const { createMessage } = useMessage();
+      const userInfo: any = getAuthCache(USER_INFO_KEY);
+      const role: string = userInfo?.roles[0];
+
+      const go = useGo();
+      const [registerModal, { openModal }] = useModal();
+      let searchInfo = reactive<Recordable>({});
+      const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
+      const [registerTable, { reload, setProps }] = useTable({
+        title: '账号列表',
+        api: getAccountList,
+        rowKey: 'id',
+        columns,
+        searchInfo,
+        formConfig: {
+          labelWidth: 120,
+          schemas: searchFormSchema,
+          // autoSubmitOnEnter: true,
+          resetFunc: resetFn,
+        },
+        useSearchForm: true,
+        showTableSetting: true,
+        bordered: true,
+        actionColumn: {
+          width: 240,
+          title: '操作',
+          dataIndex: 'action',
+          slots: { customRender: 'action' },
+          fixed: 'right',
+        },
+      });
+      const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
+        deleteUser,
+        handleSuccess,
+        setProps
+      );
+      nextTick(() => {
+        setProps(selectionOptions);
+      });
+
+      function handleCreate() {
+        openModal(true, {
+          isUpdate: false,
+        });
+      }
+      function handleEdit(record: Recordable) {
+        openModal(true, {
+          record,
+          isUpdate: true,
+        });
+      }
+      function handleSuccess() {
+        reload();
+      }
+
+      function handleSelect(organization) {
+        searchInfo.organizationId = organization;
+        reload();
+      }
+
+      function handleView(record: Recordable) {
+        go('/system/account_detail/' + record.id);
+      }
+
+      async function handleLoginCustomAdmin(record: TenantListItemRecord) {
+        try {
+          useFastEnter(record, go);
+        } catch (error) {
+        } finally {
+        }
+      }
+
+      const handleClearPassword = async (record: Recordable) => {
+        try {
+          const { id } = record;
+          if (!id) return;
+          const { message } = await clearUserPassword(id, 3);
+          createMessage.success(message);
+        } finally {
+          handleSuccess();
+        }
+      };
+
+      return {
+        handleLoginCustomAdmin,
+        registerTable,
+        registerModal,
+        handleCreate,
+        handleEdit,
+        handleSuccess,
+        handleSelect,
+        handleView,
+        organizationIdTreeRef,
+        hasBatchDelete,
+        handleDeleteOrBatchDelete,
+        isAdmin,
+        role,
+        handleClearPassword,
+      };
+    },
+  });
+</script>

@@ -209,7 +209,7 @@
       const handleClearPassword = async (record: Recordable) => {
       const handleClearPassword = async (record: Recordable) => {
         const { id } = record;
         const { id } = record;
         if (!id) return;
         if (!id) return;
-        const { message } = await clearUserPassword(id);
+        const { message } = await clearUserPassword(id, 1);
         createMessage.success(message);
         createMessage.success(message);
       };
       };
 
 

+<template>
+  <BasicDrawer
+    v-bind="$attrs"
+    @register="registerDrawer"
+    showFooter
+    :title="getTitle"
+    width="500px"
+    @ok="handleSubmit"
+  >
+    <BasicForm @register="registerForm">
+      <template #menu>
+        <Spin :spinning="spinning">
+          <BasicTree
+            v-if="treeData.length"
+            checkable
+            toolbar
+            ref="treeRef"
+            :treeData="treeData"
+            @check="handleCheckClick"
+            :replace-fields="{ title: 'name', key: 'id' }"
+            :checkedKeys="roleMenus"
+            title="菜单分配"
+          />
+        </Spin>
+      </template>
+    </BasicForm>
+  </BasicDrawer>
+</template>
+<script lang="ts">
+  import { defineComponent, ref, computed, unref, nextTick } from 'vue';
+  import { BasicForm, useForm } from '/@/components/Form/index';
+  import { formSchema, KeysTypeEnum, RoleMenuDictEnum } from './role.data';
+  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+  import { BasicTree, TreeActionType, TreeItem } from '/@/components/Tree';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  const { t } = useI18n(); // 加载国际化
+  // 加载菜单数据
+  import { getMeMenuList, getMenusIdsByRoleId } from '/@/api/sys/menu';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { MenuRecord } from '/@/api/sys/model/menuModel';
+  import { saveOrUpdateRoleInfoWithMenu } from '/@/api/system/system';
+  import { findDictItemByCode } from '/@/api/system/dict';
+  import { RoleEnum } from '/@/enums/roleEnum';
+  import { Spin } from 'ant-design-vue';
+  import { useRole } from '/@/hooks/business/useRole';
+  import { RoleListItem } from '/@/api/system/model/systemModel';
+
+  type TreeData = MenuRecord & TreeItem;
+
+  export default defineComponent({
+    name: 'RoleDrawer',
+    components: { BasicDrawer, BasicForm, BasicTree, Spin },
+    emits: ['success', 'register'],
+    setup(_, { emit }) {
+      const isUpdate = ref<boolean>(true);
+      const treeData = ref<TreeData[]>([]);
+      const roleMenus = ref<string[]>([]);
+      const roleId = ref<string>('');
+      const treeRef = ref<Nullable<TreeActionType>>();
+      const checked = ref<string[]>([]); //需要选中的节点
+      const spinning = ref(false);
+      const checkedKeysWithHalfChecked = ref<string[]>([]);
+
+      const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
+        labelWidth: 100,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+      });
+
+      const transformName = (data: TreeData[]) => {
+        return data.map((item) => {
+          item.name = t(item.name);
+          if (item.children && item.children.length) {
+            item.children = transformName(item.children as unknown as TreeData[]);
+          }
+          return item;
+        });
+      };
+
+      const { isTenantAdmin, isSysadmin, getRole } = useRole();
+      const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(
+        async (data: { isUpdate: boolean; record: RoleListItem }) => {
+          resetFields();
+          roleId.value = '';
+          // 在打开弹窗时清除所有选择的菜单
+          treeRef.value && treeRef.value?.setCheckedKeys([]);
+          isUpdate.value = data.isUpdate;
+          let roleType = unref(getRole) || RoleEnum.SYS_ADMIN;
+
+          // 租户管理员创建角色时 菜单分配为客户菜单
+          if (unref(isTenantAdmin)) {
+            roleType = RoleEnum.TENANT_ADMIN;
+          }
+
+          try {
+            spinning.value = true;
+            // 需要在setFieldsValue之前先填充treeData，否则Tree组件可能会报key not exist警告
+
+            // if (!unref(treeData).length) {
+            // 获取全部的菜单
+            const menuListModel = await getMeMenuList();
+            treeData.value = transformName(menuListModel as unknown as TreeData[]);
+            // }
+
+            const keys = await getPermissionByRole(roleType);
+            const { keyType } = RoleMenuDictEnum[roleType];
+            treeData.value = filterPermissionTreeData(
+              unref(treeData) as unknown as TreeData[],
+              keys,
+              keyType
+            );
+
+            // 如果编辑的是超级管理员 则不再过滤平台管理员禁用的权限
+            // 如果是超级管理员创建角色 创建角色属于平台管理员 因此过滤平台管理员禁用的权限
+            if (data?.record?.roleType !== RoleEnum.SYS_ADMIN && unref(isSysadmin)) {
+              const keys = await getPermissionByRole(RoleEnum.PLATFORM_ADMIN);
+              const { keyType } = RoleMenuDictEnum[RoleEnum.PLATFORM_ADMIN];
+              treeData.value = filterPermissionTreeData(
+                unref(treeData) as unknown as TreeData[],
+                keys,
+                keyType
+              );
+            }
+
+            // 更新
+            if (unref(isUpdate)) {
+              checked.value = [];
+              roleId.value = data.record.id;
+
+              //通过角色id去获取角色对应的菜单的ids
+              checkedKeysWithHalfChecked.value = roleMenus.value = await getMenusIdsByRoleId(
+                data.record.id
+              );
+              excludeHalfCheckedKeys(unref(treeData));
+              await nextTick();
+              unref(treeRef)?.setCheckedKeys(roleMenus.value);
+              setFieldsValue(data.record);
+            } else {
+            }
+          } catch (error) {
+            throw error;
+          } finally {
+            spinning.value = false;
+          }
+        }
+      );
+
+      const getTitle = computed(() => (!unref(isUpdate) ? '新增角色' : '编辑角色'));
+
+      async function handleSubmit() {
+        setDrawerProps({ confirmLoading: true });
+        const { createMessage } = useMessage();
+        try {
+          const values = await validate();
+          const treeCheckedKeys: string[] = (unref(treeRef)?.getCheckedKeys() as string[]) || [];
+          const menu = [...new Set([...unref(checkedKeysWithHalfChecked), ...treeCheckedKeys])];
+          const req = {
+            id: roleId.value,
+            name: values.name,
+            remark: values.remark,
+            status: values.status,
+            menu,
+            roleType: 'TENANT_ADMIN',
+          };
+          if (req.menu == undefined) return createMessage.error('请勾选权限菜单');
+          saveOrUpdateRoleInfoWithMenu(req).then(() => {
+            closeDrawer();
+            emit('success');
+            createMessage.success(`${unref(isUpdate) ? '编辑' : '新增'}成功`);
+          });
+        } finally {
+          setTimeout(() => {
+            setDrawerProps({ confirmLoading: false });
+          }, 300);
+        }
+      }
+
+      const getPermissionByRole = async (roleType: RoleEnum) => {
+        try {
+          const { key } = RoleMenuDictEnum[roleType];
+          const res = await findDictItemByCode({ dictCode: key });
+          return res.map((item) => item.itemValue);
+        } catch (error) {}
+        return [];
+      };
+
+      const filterPermissionTreeData = (
+        data: MenuRecord[],
+        permissionKeys: string[],
+        keysType: KeysTypeEnum
+      ): TreeData[] => {
+        const permissionCompare = (
+          data: MenuRecord[],
+          permissionKeys: string[],
+          keysType: KeysTypeEnum
+        ): TreeData[] => {
+          return data.filter((item) => {
+            item.name = t(item.name);
+            const findFlag = permissionKeys.includes(item.permission);
+
+            item.show = findFlag ? keysType === KeysTypeEnum.ENABLED : undefined;
+
+            if (item.children && item.children.length) {
+              if (item.show) return true;
+              if (item.show === undefined) {
+                item.children = permissionCompare(item.children, permissionKeys, keysType);
+                item.show = item.children.some((item) =>
+                  keysType === KeysTypeEnum.ENABLED
+                    ? item.show
+                    : item.show === undefined
+                    ? true
+                    : item.show
+                );
+                return item.show;
+              }
+            }
+
+            return keysType === KeysTypeEnum.ENABLED
+              ? item.show
+              : item.show === undefined
+              ? true
+              : item.show;
+          }) as unknown as TreeData[];
+        };
+
+        return permissionCompare(data, permissionKeys, keysType);
+      };
+
+      const excludeHalfCheckedKeys = (treeData: MenuRecord[]) => {
+        const needExcludeKeys: string[] = [];
+        const query = (data: MenuRecord[]) => {
+          data.forEach((item) => {
+            item.checked = roleMenus.value.includes(item.id);
+            if (item.children && item.children.length) {
+              query(item.children);
+              item.checked = item.children.every((item) => item.checked);
+            }
+            if (!item.checked) {
+              needExcludeKeys.push(item.id);
+            }
+          });
+        };
+        query(treeData);
+        roleMenus.value = unref(roleMenus).filter((key) => !needExcludeKeys.includes(key));
+        return needExcludeKeys;
+      };
+
+      const handleCheckClick = (selectedKeys: string[], event: CheckEvent) => {
+        checkedKeysWithHalfChecked.value = [
+          ...selectedKeys,
+          ...(event.halfCheckedKeys as string[]),
+        ];
+      };
+
+      return {
+        spinning,
+        registerDrawer,
+        registerForm,
+        getTitle,
+        handleSubmit,
+        treeData,
+        roleMenus,
+        treeRef,
+        handleCheckClick,
+      };
+    },
+  });
+</script>
+
+<style scoped lang="less">
+  :deep(.vben-basic-tree) {
+    width: 100% !important;
+  }
+
+  :deep(.is-unflod) {
+    display: none !important;
+  }
+
+  :deep(.is-flod) {
+    display: none !important;
+  }
+</style>

+<template>
+  <BasicModal
+    width="650px"
+    v-bind="$attrs"
+    @register="registerModal"
+    :title="getTitle"
+    @ok="handleSubmit"
+  >
+    <div style="height: 40vh">
+      <BasicForm @register="registerForm">
+        <template #organizationId="{ model, field }">
+          <Button type="link" @click="handleOpenCreate" style="padding: 0; z-index: 9999"
+            >新增组织
+          </Button>
+          <BasicTree
+            v-if="organizationTreeData.length"
+            :check-strictly="checkStrictly"
+            v-model:value="model[field]"
+            :treeData="organizationTreeData"
+            :checked-keys="checkedKeys"
+            :expandedKeys="treeExpandData"
+            ref="basicTreeRef"
+            @check="handleCheckClick"
+            @unSelectAll="handleUnSelectAll"
+            @strictlyStatus="handleStrictlyStatus"
+            checkable
+            toolbar
+            @change="handleTreeSelect"
+            :replace-fields="{ children: 'children', title: 'name', key: 'id' }"
+          />
+        </template>
+        <template #roleSlot="{ model, field }">
+          <a-select
+            mode="multiple"
+            allowClear
+            placeholder="请选择角色"
+            v-model:value="model[field]"
+            @change="handleRoleSelect"
+            :options="roleOptions.map((item) => ({ value: item.value, label: item.label }))"
+          >
+            <template #dropdownRender="{ menuNode: menu }">
+              <v-nodes :vnodes="menu" />
+              <a-divider style="margin: 4px 0" />
+              <div @click="handleOpenRole" style="padding: 4px 0; cursor: pointer">
+                <plus-outlined />
+                新增角色
+              </div>
+            </template>
+          </a-select>
+        </template>
+      </BasicForm>
+
+      <OrganizationDrawer @register="registerDrawer" @success="handleReload" />
+    </div>
+  </BasicModal>
+  <RoleDrawer @register="registerRoleDrawer" @success="handleSuccess" />
+</template>
+<script lang="ts" setup>
+  import { ref, computed, unref, reactive, onMounted } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { BasicForm, useForm } from '/@/components/Form/index';
+  import { accountFormSchema } from './config';
+  import { Button } from 'ant-design-vue';
+  import { findCurrentUserRelation, filterRoleList } from '/@/api/system/system';
+  import { addTenantList } from '/@/api/system/account';
+  import { BasicTree, TreeItem, CheckKeys } from '/@/components/Tree';
+  import { findCurrentUserGroups } from '/@/api/system/group';
+  import { RoleOrOrganizationParam } from '/@/api/system/model/systemModel';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { TOption } from '/@/views/rule/linkedge/config/config.data';
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import { useDrawer } from '/@/components/Drawer';
+  import RoleDrawer from './RoleDrawer.vue';
+  import OrganizationDrawer from '/@/views/system/organization/OrganizationDrawer.vue';
+  import { useUserStore } from '/@/store/modules/user';
+  import { IsPhoneExist } from '/@/api/system/system';
+  import { phoneRegexp } from '/@/utils/rules';
+  import { GroupListResultModel } from '/@/api/system/model/groupModel';
+  import { toRaw } from 'vue';
+  import { isArray } from '/@/utils/is';
+
+  const VNodes = (_, { attrs }) => {
+    return attrs.vnodes;
+  };
+
+  const emit = defineEmits(['register', 'success']);
+
+  const [registerRoleDrawer, { openDrawer }] = useDrawer();
+  const { createMessage } = useMessage();
+  const userInfo = useUserStore();
+
+  const checkStrictly = ref(true);
+
+  const roleOptions = ref<TOption[]>([]);
+  const isAdd = ref(true);
+  const rowId = ref('');
+  const organizationTreeData = ref<TreeItem[]>([]);
+  const basicTreeRef = ref();
+  const checkedKeys = reactive<CheckKeys>({ checked: [], halfChecked: [] });
+  const treeExpandData = ref([]);
+  const olderPhoneNumber = ref();
+  const singleEditPostPhoneNumber = reactive({
+    phoneNumber: '',
+  });
+  const checkedKeysWithHalfChecked = ref<(string | number)[]>([]);
+  const getRoleList = async () => {
+    const res = await filterRoleList({ roleType: 'TENANT_ADMIN' });
+    roleOptions.value = res.map((m) => {
+      return {
+        label: m.name,
+        value: m.id,
+      };
+    });
+  };
+
+  onMounted(async () => {
+    await getRoleList();
+  });
+  const handleOpenRole = () => {
+    openDrawer(true, {
+      isAdd: false,
+    });
+  };
+  const clearValidateByField = (field: string) => {
+    clearValidate(field);
+  };
+  const handleRoleSelect = (e) => {
+    if (e?.length > 0) clearValidateByField('roleIds');
+    else validateFields(['roleIds']);
+  };
+  const handleTreeSelect = (e) => {
+    if (e) clearValidateByField('organizationIds');
+  };
+  const handleSuccess = async () => {
+    await getRoleList();
+  };
+  const [
+    registerForm,
+    {
+      setFieldsValue,
+      updateSchema,
+      resetFields,
+      validate,
+      getFieldsValue,
+      clearValidate,
+      validateFields,
+    },
+  ] = useForm({
+    labelWidth: 100,
+    schemas: accountFormSchema,
+    showActionButtonGroup: false,
+    actionColOptions: {
+      span: 18,
+    },
+  });
+  //获取所有父级id
+  function findForAllId(data = [], arr = []) {
+    for (const item of data) {
+      arr.push(item.id);
+    }
+    return arr;
+  }
+
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    await resetFields();
+    checkStrictly.value = true;
+    setModalProps({ confirmLoading: false });
+    isAdd.value = !!data?.isAdd;
+    const groupListModel = await findCurrentUserGroups();
+    if (!unref(organizationTreeData).length) {
+      organizationTreeData.value = groupListModel;
+      buildNodeMap(toRaw(unref(organizationTreeData) as GroupListResultModel));
+      const getAllIds = findForAllId(organizationTreeData.value as any, []);
+      //设置要展开的id
+      treeExpandData.value = getAllIds;
+    }
+
+    if (!unref(isAdd)) {
+      rowId.value = data.record.id;
+      const roleParams = new RoleOrOrganizationParam(rowId.value, true, false);
+      olderPhoneNumber.value = data.record.phoneNumber;
+      singleEditPostPhoneNumber.phoneNumber = data.record.phoneNumber;
+      findCurrentUserRelation(roleParams).then((result) => {
+        Reflect.set(data.record, 'roleIds', result);
+        setFieldsValue(data.record);
+      });
+      updateSchema([
+        {
+          field: 'phoneNumber',
+          dynamicRules: () => {
+            return [
+              {
+                required: true,
+                validator(_, value) {
+                  return new Promise((resolve, reject) => {
+                    if (value == '') {
+                      reject('请输入手机号');
+                    } else if (!phoneRegexp.test(value)) {
+                      reject('请输入正确的手机号');
+                    } else {
+                      resolve();
+                    }
+                  });
+                },
+              },
+            ];
+          },
+        },
+      ]);
+      const organizationParams = new RoleOrOrganizationParam(rowId.value, false, true);
+      const checked = await findCurrentUserRelation(organizationParams);
+      const halfChecked = getHalfCheckedNode(checked);
+      Object.assign(checkedKeys, { checked, halfChecked });
+      setFieldsValue({ organizationIds: toRaw(checkedKeys) });
+    } else {
+      updateSchema([
+        {
+          field: 'phoneNumber',
+          dynamicRules: ({ values }) => {
+            return [
+              {
+                required: true,
+                validator(_, value) {
+                  return new Promise((resolve, reject) => {
+                    if (value == '') {
+                      reject('请输入手机号');
+                    } else if (!phoneRegexp.test(value)) {
+                      reject('请输入正确的手机号');
+                    } else {
+                      if (values.phoneNumber != undefined) {
+                        // 此处可以用防抖函数优化性能
+                        IsPhoneExist(value).then(({ data }) => {
+                          if (data != null) {
+                            reject('手机号已存在');
+                          } else {
+                            resolve();
+                          }
+                        });
+                      } else {
+                        resolve();
+                      }
+                    }
+                  });
+                },
+              },
+            ];
+          },
+        },
+      ]);
+    }
+    await updateSchema([
+      {
+        field: 'username',
+        dynamicDisabled: !unref(isAdd),
+      },
+    ]);
+  });
+  const getTitle = computed(() => (unref(isAdd) ? '新增管理员账号' : '编辑管理员账号'));
+
+  const getFormatValues = (values: Recordable) => {
+    const organizationIds = values.organizationIds;
+    if (!organizationIds || isArray(organizationIds)) return values;
+
+    values.organizationIds = values?.organizationIds?.checked;
+
+    return values;
+  };
+
+  async function handleSubmit() {
+    setModalProps({ confirmLoading: true });
+    try {
+      const values = getFieldsValue();
+      if (!('organizationIds' in values)) {
+        createMessage.error('组织必选');
+      }
+
+      await validate();
+      await addTenantList({
+        ...getFormatValues(values),
+        level: 4,
+        tenantId: userInfo.getUserInfo.tenantId!,
+      });
+      createMessage.success(unref(isAdd) ? '新增成功' : '编辑成功');
+      closeModal();
+      emit('success');
+    } finally {
+      setModalProps({ confirmLoading: false });
+    }
+  }
+  // 取消全部的时候清除回显时获取的
+  const handleUnSelectAll = () => {
+    checkedKeysWithHalfChecked.value = [];
+  };
+
+  const strictlyStatus = ref(false); //层级关联或独立的状态 false为层级关联 true为层级独立
+
+  const handleStrictlyStatus = (status) => (strictlyStatus.value = status);
+
+  const handleCheckClick = () => {
+    if (unref(checkStrictly)) {
+      checkStrictly.value = false;
+    }
+  };
+
+  const [registerDrawer, { openDrawer: addOpenDrawer }] = useDrawer();
+
+  const handleOpenCreate = () => {
+    addOpenDrawer(true, { isAdd: false });
+  };
+  const handleReload = async () => {
+    const groupListModel = await findCurrentUserGroups();
+    organizationTreeData.value = groupListModel;
+    buildNodeMap(toRaw(unref(groupListModel)));
+  };
+
+  const treeNodeMap = ref<Record<string, { parentId?: string; children?: string[] }>>();
+
+  function buildNodeMap(tree: GroupListResultModel) {
+    const nodeMap: Record<string, { parentId?: string; children?: string[] }> = {};
+
+    function traverse(tree: GroupListResultModel) {
+      for (let node of tree) {
+        Reflect.set(nodeMap, node.id, {
+          parentId: node.parentId,
+          children: node.children?.map((item) => item.id),
+        });
+
+        if (node.children && node.children.length) {
+          traverse(node.children);
+        }
+      }
+    }
+    traverse(tree);
+
+    treeNodeMap.value = nodeMap;
+  }
+
+  function getHalfCheckedNode(keys: string[]) {
+    const relation = unref(treeNodeMap) || {};
+    const halfChecked: string[] = [];
+
+    for (const key of keys) {
+      let current = relation[key];
+
+      while (current) {
+        if (keys.includes(current.parentId!) || !current.parentId) {
+          break;
+        }
+
+        halfChecked.push(current.parentId!);
+        current = relation[current.parentId!];
+      }
+    }
+
+    return Array.from(new Set(halfChecked));
+  }
+</script>
+<style scoped lang="less">
+  :deep(.vben-basic-tree) {
+    width: 100% !important;
+    margin-top: -28px !important;
+    padding: 0;
+  }
+
+  :deep(.is-unflod) {
+    display: none !important;
+  }
+
+  :deep(.is-flod) {
+    display: none !important;
+  }
+</style>

+import { IsPhoneExist, isAccountExist } from '/@/api/system/system';
+import { BasicColumn, FormSchema } from '/@/components/Table';
+import { ChineseRegexp, EmailRegexp, emailRule, phoneRegexp } from '/@/utils/rules';
+
+let olderPhoneNumber;
+
+export const columns: BasicColumn[] = [
+  {
+    title: '用户名',
+    dataIndex: 'username',
+    width: 120,
+  },
+  {
+    title: '姓名',
+    dataIndex: 'realName',
+    width: 120,
+  },
+  {
+    title: '手机号码',
+    dataIndex: 'phoneNumber',
+    width: 120,
+  },
+  {
+    title: '邮箱',
+    dataIndex: 'email',
+    width: 120,
+  },
+  {
+    title: '状态',
+    dataIndex: 'userStatusEnum',
+    width: 120,
+    slots: { customRender: 'status' },
+  },
+];
+
+export const searchFormSchema: FormSchema[] = [
+  {
+    field: 'username',
+    label: '用户名',
+    component: 'Input',
+    colProps: { span: 8 },
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入用户名',
+    },
+  },
+  {
+    field: 'realName',
+    label: '姓名',
+    component: 'Input',
+    colProps: { span: 8 },
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入姓名',
+    },
+  },
+];
+
+export const accountFormSchema: FormSchema[] = [
+  {
+    field: 'id',
+    label: 'id',
+    component: 'Input',
+    show: false,
+    componentProps: {
+      maxLength: 36,
+    },
+  },
+  {
+    field: 'username',
+    label: '用户名',
+    component: 'Input',
+    colProps: { span: 12 },
+    dynamicDisabled: false,
+    componentProps: {
+      maxLength: 36,
+      placeholder: '请输入用户名',
+    },
+    dynamicRules: ({ values }) => {
+      return [
+        {
+          required: true,
+          validator(_, value) {
+            return new Promise((resolve, reject) => {
+              if (value == '') {
+                reject('请输入用户名');
+              } else if (ChineseRegexp.test(value)) {
+                reject('用户名不能含有中文');
+              } else if (EmailRegexp.test(value)) {
+                reject('用户名不能为电子邮箱格式');
+              } else {
+                if (values.username != undefined && values.id == undefined) {
+                  isAccountExist(value).then(({ data }) => {
+                    if (data != null) {
+                      reject('用户名已存在');
+                    } else {
+                      resolve();
+                    }
+                  });
+                } else {
+                  resolve();
+                }
+              }
+            });
+          },
+        },
+      ];
+    },
+  },
+  // {
+  //   field: 'password',
+  //   label: '密码',
+  //   component: 'InputPassword',
+  //   required: true,
+  //   colProps: { span: 12 },
+  // },
+  {
+    field: 'realName',
+    label: '真实姓名',
+    component: 'Input',
+    colProps: { span: 12 },
+    required: true,
+    componentProps: {
+      maxLength: 10,
+    },
+  },
+
+  {
+    label: '手机号',
+    field: 'phoneNumber',
+    component: 'Input',
+    colProps: { span: 12 },
+    dynamicRules: ({ values }) => {
+      return [
+        {
+          required: true,
+          validator(_, value) {
+            return new Promise((resolve, reject) => {
+              if (value == '') {
+                reject('请输入手机号');
+              } else if (!phoneRegexp.test(value)) {
+                reject('请输入正确的手机号');
+              } else {
+                if (values.phoneNumber != undefined) {
+                  // 此处可以用防抖函数优化性能
+                  IsPhoneExist(value).then(({ data }) => {
+                    if (data != null) {
+                      reject('手机号已存在');
+                    } else {
+                      resolve();
+                    }
+                  });
+                } else {
+                  resolve();
+                }
+              }
+            });
+          },
+        },
+      ];
+    },
+    componentProps({ formActionType }) {
+      const { clearValidate } = formActionType;
+      return {
+        maxlength: 11,
+        onChange(value) {
+          if (value == olderPhoneNumber) {
+            clearValidate('phoneNumber');
+          }
+        },
+      };
+    },
+  },
+  {
+    label: '角色',
+    field: 'roleIds',
+    component: 'Select',
+    colProps: { span: 12 },
+    slot: 'roleSlot',
+    rules: [
+      {
+        required: true,
+        message: '请选择角色',
+        type: 'array',
+      },
+    ],
+  },
+  {
+    label: '邮箱',
+    field: 'email',
+    component: 'Input',
+    colProps: { span: 12 },
+    rules: emailRule,
+  },
+  // {
+  //   field: 'accountExpireTime',
+  //   label: '有效期',
+  //   component: 'DatePicker',
+  //   colProps: { span: 12 },
+  //   componentProps: {
+  //     showTime: true,
+  //     format: 'YYYY-MM-DD HH:mm:ss',
+  //   },
+  // },
+  {
+    field: 'enabled',
+    label: '状态',
+    component: 'RadioButtonGroup',
+    colProps: { span: 12 },
+    defaultValue: true,
+    componentProps: {
+      options: [
+        { label: '启用', value: true },
+        { label: '禁用', value: false },
+      ],
+    },
+  },
+  // {
+  //   field: 'remark',
+  //   label: '备注',
+  //   component: 'InputTextArea',
+  //   colProps: { span: 24 },
+  //   componentProps: {
+  //     maxLength: 255,
+  //     placeholder: '请输入备注',
+  //   },
+  // },
+  {
+    field: 'organizationIds',
+    label: '所属组织',
+    component: 'Input',
+    slot: 'organizationId',
+    required: true,
+  },
+];

+<template>
+  <div>
+    <PageWrapper dense contentFullHeight contentClass="flex">
+      <OrganizationIdTree @select="handleSelect" ref="organizationIdTreeRef" />
+
+      <BasicTable
+        style="flex: auto"
+        :clickToRowSelect="false"
+        @register="registerTable"
+        class="w-3/4 xl:w-4/5"
+      >
+        <template #toolbar>
+          <Authority value="api:yt:user:saveCommonTenant:post">
+            <a-button type="primary" @click="handleCreate">新增管理员账号</a-button>
+          </Authority>
+          <Authority value="api:yt:admin:user:deleteTenantAdmin:delete">
+            <Popconfirm
+              title="您确定要批量删除数据"
+              ok-text="确定"
+              cancel-text="取消"
+              @confirm="handleDeleteOrBatchDelete(null)"
+            >
+              <a-button color="error" :disabled="hasBatchDelete"> 批量删除 </a-button>
+            </Popconfirm>
+          </Authority>
+        </template>
+        <template #status="{ record }">
+          <Tag
+            :color="
+              record.userStatusEnum === 'NORMAL'
+                ? 'green'
+                : record.userStatusEnum === 'DISABLED'
+                ? 'red'
+                : 'orange'
+            "
+          >
+            {{
+              record.userStatusEnum === 'NORMAL'
+                ? '正常'
+                : record.userStatusEnum === 'DISABLED'
+                ? '已禁用'
+                : '已过期'
+            }}
+          </Tag>
+        </template>
+        <template #action="{ record }">
+          <TableAction
+            :actions="[
+              {
+                label: '进入',
+                icon: 'ant-design:login-outlined',
+                tooltip: `以${!isAdmin(role) ? '租户' : '平台'}用户身份登录`,
+                onClick: handleLoginCustomAdmin.bind(null, record),
+              },
+              {
+                label: '编辑',
+                auth: 'api:yt:user:saveCommonTenant:post',
+                icon: 'clarity:note-edit-line',
+                tooltip: '编辑',
+                onClick: handleEdit.bind(null, record),
+                ifShow: record.level != 0,
+              },
+              {
+                label: '删除',
+                auth: 'api:yt:admin:user:deleteTenantAdmin:delete',
+                icon: 'ant-design:delete-outlined',
+                color: 'error',
+                tooltip: '删除',
+                ifShow: record.level != 0,
+                popConfirm: {
+                  title: '是否确认删除',
+                  confirm: handleDeleteOrBatchDelete.bind(null, record),
+                },
+              },
+            ]"
+            :drop-down-actions="[
+              {
+                label: '清除密码',
+                auth: 'api:yt:user:resetPassword',
+                icon: 'ant-design:delete-outlined',
+                color: 'error',
+                tooltip: '清除密码',
+                popConfirm: {
+                  title: '是否确认清除密码',
+                  confirm: handleClearPassword.bind(null, record),
+                },
+              },
+            ]"
+          />
+        </template>
+      </BasicTable>
+      <TenantModal @register="registerModal" @success="handleSuccess" />
+    </PageWrapper>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { getTenantList } from '/@/api/system/account';
+  import { columns, searchFormSchema } from './config';
+  import { useResetOrganizationTree, OrganizationIdTree } from '/@/views/common/organizationIdTree';
+  import { reactive, nextTick } from 'vue';
+  import { Authority } from '/@/components/Authority';
+  import { useUserStore } from '/@/store/modules/user';
+  import { PageWrapper } from '/@/components/Page';
+  import { useGo } from '/@/hooks/web/usePage';
+  import { Tag, Popconfirm } from 'ant-design-vue';
+  import TenantModal from './TenantModal.vue';
+  import { useModal } from '/@/components/Modal';
+  import { useFastEnter } from '/@/hooks/business/useFastEnter';
+  import { TenantListItemRecord } from '/@/api/tenant/tenantInfo';
+  import { isAdmin } from '/@/enums/roleEnum';
+  import { getAuthCache } from '/@/utils/auth';
+  import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
+  import { deleteTenantAdmin } from '/@/api/tenant/tenantApi';
+  import { useMessage } from '/@/hooks/web/useMessage';
+
+  import { USER_INFO_KEY } from '/@/enums/cacheEnum';
+  import { clearUserPassword } from '/@/api/system/system';
+
+  const searchInfo = reactive<Recordable>({});
+  const go = useGo();
+
+  const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
+
+  const userRole: any = getAuthCache(USER_INFO_KEY);
+  const role: string = userRole?.roles[0];
+  const { createMessage } = useMessage();
+
+  const userInfo = useUserStore();
+  const [registerTable, { reload, setProps }] = useTable({
+    title: '管理号账号列表',
+    columns,
+    api: getTenantList,
+    formConfig: {
+      labelWidth: 100,
+      schemas: searchFormSchema,
+      resetFunc: resetFn,
+    },
+
+    beforeFetch: (params) => {
+      return {
+        ...params,
+        tenantId: userInfo.getUserInfo.tenantId!,
+      };
+    },
+    useSearchForm: true,
+    showTableSetting: true,
+    bordered: true,
+    showIndexColumn: false,
+    rowKey: 'id',
+    searchInfo: searchInfo,
+    clickToRowSelect: false,
+    actionColumn: {
+      width: 200,
+      title: '操作',
+      slots: { customRender: 'action' },
+      fixed: 'right',
+    },
+  });
+  const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
+    deleteTenantAdmin,
+    handleSuccess,
+    setProps
+  );
+  nextTick(() => {
+    setProps(selectionOptions);
+  });
+
+  const [registerModal, { openModal }] = useModal();
+
+  function handleSelect(organization) {
+    searchInfo.organizationId = organization;
+    reload();
+  }
+
+  const handleCreate = () => {
+    openModal(true, {
+      isAdd: true,
+    });
+  };
+  const handleLoginCustomAdmin = async (record: TenantListItemRecord) => {
+    try {
+      useFastEnter(record, go);
+    } catch (errpr) {
+    } finally {
+    }
+  };
+  const handleEdit = (record: Recordable) => {
+    openModal(true, {
+      isAdd: false,
+      record,
+    });
+  };
+
+  const handleClearPassword = async (record: Recordable) => {
+    const { id } = record;
+    if (!id) return;
+    const { message } = await clearUserPassword(id, 4);
+    createMessage.success(message);
+    handleSuccess();
+  };
+  // const handleDeleteOrBatchDelete = (record: Recordable) => {
+  //   deleteTenantAdmin([record.id]).then(() => {
+  //         createMessage.success('删除成功');
+  //         handleSuccess();
+  //       });
+  // };
+  // const handleClearPassword = async (record: Recordable) => {
+  //   const { id } = record;
+  //   if (!id) return;
+  //   const { message } = await clearUserPassword(id);
+  //   createMessage.success(message);
+  // };
+  function handleSuccess() {
+    reload();
+  }
+</script>

+import { BasicColumn } from '/@/components/Table';
+import { FormSchema } from '/@/components/Table';
+import { DictEnum } from '/@/enums/dictEnum';
+import { RoleEnum } from '/@/enums/roleEnum';
+
+export enum KeysTypeEnum {
+  DISABLED = 'disabled',
+  ENABLED = 'enabled',
+}
+
+export const RoleMenuDictEnum: Recordable<{ key: string; keyType: KeysTypeEnum }> = {
+  [RoleEnum.PLATFORM_ADMIN]: {
+    key: DictEnum.DISABLED_PLATFORM_ADMIN_AUTH,
+    keyType: KeysTypeEnum.DISABLED,
+  },
+  [RoleEnum.SYS_ADMIN]: { key: DictEnum.ENABLED_SYSADMIN_AUTH, keyType: KeysTypeEnum.ENABLED },
+  [RoleEnum.TENANT_ADMIN]: { key: DictEnum.DISABLED_TENANT_AUTH, keyType: KeysTypeEnum.DISABLED },
+  [RoleEnum.CUSTOMER_USER]: { key: DictEnum.DISABLE_CUSTOMER_AUTH, keyType: KeysTypeEnum.DISABLED },
+};
+
+export const columns: BasicColumn[] = [
+  {
+    title: '角色名称',
+    dataIndex: 'name',
+    width: 200,
+  },
+  {
+    title: '角色Code',
+    dataIndex: 'code',
+    width: 200,
+  },
+  {
+    title: '状态',
+    dataIndex: 'status',
+    width: 120,
+    slots: { customRender: 'status' },
+  },
+
+  {
+    title: '备注',
+    dataIndex: 'remark',
+    width: 240,
+  },
+  {
+    title: '创建时间',
+    dataIndex: 'createTime',
+    width: 180,
+  },
+];
+
+export const searchFormSchema: FormSchema[] = [
+  {
+    field: 'roleName',
+    label: '角色名称',
+    component: 'Input',
+    colProps: { span: 6 },
+    componentProps: {
+      maxLength: 255,
+    },
+  },
+  {
+    field: 'status',
+    label: '状态',
+    component: 'Select',
+    componentProps: {
+      options: [
+        { label: '启用', value: 1 },
+        { label: '停用', value: 0 },
+      ],
+    },
+    colProps: { span: 6 },
+  },
+];
+
+export const formSchema: FormSchema[] = [
+  {
+    field: 'name',
+    label: '角色名称',
+    required: true,
+    component: 'Input',
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入角色名称',
+    },
+  },
+  {
+    field: 'status',
+    label: '状态',
+    component: 'RadioButtonGroup',
+    defaultValue: 1,
+    componentProps: {
+      options: [
+        { label: '启用', value: 1 },
+        { label: '停用', value: 0 },
+      ],
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    component: 'InputTextArea',
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入备注',
+    },
+  },
+  {
+    label: '',
+    field: 'menu',
+    slot: 'menu',
+    component: 'Input',
+  },
+];

@@ -25,6 +25,7 @@
               label: '编辑',
               label: '编辑',
               auth: 'api:yt:organization:update',
               auth: 'api:yt:organization:update',
               icon: 'clarity:note-edit-line',
               icon: 'clarity:note-edit-line',
+              disabled: record.isRoot && getIsChildTenant,
               onClick: handleEdit.bind(null, record),
               onClick: handleEdit.bind(null, record),
             },
             },
             {
             {
@@ -32,6 +33,7 @@
               auth: 'api:yt:organization:delete',
               auth: 'api:yt:organization:delete',
               icon: 'ant-design:delete-outlined',
               icon: 'ant-design:delete-outlined',
               color: 'error',
               color: 'error',
+              disabled: record.isRoot && getIsChildTenant,
               popConfirm: {
               popConfirm: {
                 title: getDeleteTitle(), //是否确认删除//getDeleteTitle()
                 title: getDeleteTitle(), //是否确认删除//getDeleteTitle()
                 confirm: handleDeleteOrBatchDelete.bind(null, record),
                 confirm: handleDeleteOrBatchDelete.bind(null, record),
@@ -45,7 +47,7 @@
   </div>
   </div>
 </template>
 </template>
 <script lang="ts">
 <script lang="ts">
-  import { computed, defineComponent, nextTick } from 'vue';
+  import { computed, defineComponent, nextTick, unref } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   // 加载自定义侧边弹出框 组件
   // 加载自定义侧边弹出框 组件
   import { useDrawer } from '/@/components/Drawer';
   import { useDrawer } from '/@/components/Drawer';
@@ -56,6 +58,8 @@
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   import { Authority } from '/@/components/Authority';
   import { Authority } from '/@/components/Authority';
   import { Popconfirm } from 'ant-design-vue';
   import { Popconfirm } from 'ant-design-vue';
+  import { getJwtToken } from '/@/utils/auth';
+  import jwtDecode from 'jwt-decode';
 
 
   export default defineComponent({
   export default defineComponent({
     name: 'DeptManagement',
     name: 'DeptManagement',
@@ -65,6 +69,11 @@
       const { t } = useI18n(); // 加载国际化
       const { t } = useI18n(); // 加载国际化
       const getI18n = computed(() => t('routes.common.organization.toolCreateOrganization'));
       const getI18n = computed(() => t('routes.common.organization.toolCreateOrganization'));
 
 
+      const getIsChildTenant = computed(() => {
+        const token = getJwtToken();
+        return !!(jwtDecode(token as string) as Recordable)?.isCommonTenant;
+      });
+
       const [registerTable, { reload, expandAll, setProps }] = useTable({
       const [registerTable, { reload, expandAll, setProps }] = useTable({
         title: t('routes.common.organization.toolOrganizationList'),
         title: t('routes.common.organization.toolOrganizationList'),
         api: getOrganizationList,
         api: getOrganizationList,
@@ -76,7 +85,14 @@
         showTableSetting: true,
         showTableSetting: true,
         bordered: true,
         bordered: true,
         showIndexColumn: false,
         showIndexColumn: false,
-        canResize: false,
+        afterFetch: (data: Recordable[]) => {
+          if (data && data.length) {
+            data.forEach((item) => {
+              item.isRoot = true;
+            });
+          }
+          return data;
+        },
         actionColumn: {
         actionColumn: {
           width: 200,
           width: 200,
           title: t('routes.common.common.operation'), //操作
           title: t('routes.common.common.operation'), //操作
@@ -92,7 +108,15 @@
         setProps
         setProps
       );
       );
       nextTick(() => {
       nextTick(() => {
-        setProps(selectionOptions);
+        setProps({
+          ...selectionOptions,
+          rowSelection: {
+            ...selectionOptions.rowSelection,
+            getCheckboxProps: (data) => {
+              return { disabled: data?.isRoot && unref(getIsChildTenant) };
+            },
+          },
+        });
       });
       });
       /**
       /**
        * 获得删除提示框的文字
        * 获得删除提示框的文字
@@ -125,6 +149,7 @@
       }
       }
 
 
       return {
       return {
+        getIsChildTenant,
         getI18n,
         getI18n,
         registerTable,
         registerTable,
         registerModal,
         registerModal,

+import jwtDecode from 'jwt-decode';
 import { BasicColumn } from '/@/components/Table';
 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
 import { useI18n } from '/@/hooks/web/useI18n';
 import { useI18n } from '/@/hooks/web/useI18n';
+import { getJwtToken } from '/@/utils/auth';
 import { createOrganizationSearch } from '/@/utils/organizationSearch';
 import { createOrganizationSearch } from '/@/utils/organizationSearch';
 const { t } = useI18n();
 const { t } = useI18n();
 
 
@@ -32,6 +34,12 @@ export const formSchema: FormSchema[] = [
     field: 'parentId',
     field: 'parentId',
     label: t('routes.common.organization.parentOrganization'),
     label: t('routes.common.organization.parentOrganization'),
     component: 'TreeSelect',
     component: 'TreeSelect',
+    dynamicRules: () => {
+      const token = getJwtToken();
+      const res = jwtDecode(token as string) as Record<'isCommonTenant', boolean>;
+      return [{ required: res?.isCommonTenant, message: '请选择上级组织' }];
+    },
+    rulesMessageJoinLabel: true,
     componentProps: {
     componentProps: {
       replaceFields: {
       replaceFields: {
         title: 'name',
         title: 'name',

+<template>
+  <BasicDrawer
+    v-bind="$attrs"
+    @register="registerDrawer"
+    showFooter
+    :title="getTitle"
+    width="500px"
+    @ok="handleSubmit"
+  >
+    <BasicForm @register="registerForm">
+      <template #menu>
+        <Spin :spinning="spinning">
+          <BasicTree
+            v-if="treeData.length"
+            checkable
+            toolbar
+            ref="treeRef"
+            :treeData="treeData"
+            @check="handleCheckClick"
+            :replace-fields="{ title: 'name', key: 'id' }"
+            :checkedKeys="roleMenus"
+            title="菜单分配"
+          />
+        </Spin>
+      </template>
+    </BasicForm>
+  </BasicDrawer>
+</template>
+<script lang="ts">
+  import { defineComponent, ref, computed, unref, nextTick } from 'vue';
+  import { BasicForm, useForm } from '/@/components/Form/index';
+  import { formSchema, KeysTypeEnum, RoleMenuDictEnum } from './role.data';
+  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+  import { BasicTree, TreeActionType, TreeItem } from '/@/components/Tree';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  const { t } = useI18n(); // 加载国际化
+  // 加载菜单数据
+  import { getMeMenuList, getMenusIdsByRoleId } from '/@/api/sys/menu';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { MenuRecord } from '/@/api/sys/model/menuModel';
+  import { saveOrUpdateRoleInfoWithMenu } from '/@/api/system/system';
+  import { findDictItemByCode } from '/@/api/system/dict';
+  import { RoleEnum } from '/@/enums/roleEnum';
+  import { Spin } from 'ant-design-vue';
+  import { useRole } from '/@/hooks/business/useRole';
+  import { RoleListItem } from '/@/api/system/model/systemModel';
+
+  type TreeData = MenuRecord & TreeItem;
+
+  export default defineComponent({
+    name: 'RoleDrawer',
+    components: { BasicDrawer, BasicForm, BasicTree, Spin },
+    emits: ['success', 'register'],
+    setup(_, { emit }) {
+      const isUpdate = ref<boolean>(true);
+      const treeData = ref<TreeData[]>([]);
+      const roleMenus = ref<string[]>([]);
+      const roleId = ref<string>('');
+      const treeRef = ref<Nullable<TreeActionType>>();
+      const checked = ref<string[]>([]); //需要选中的节点
+      const spinning = ref(false);
+      const checkedKeysWithHalfChecked = ref<string[]>([]);
+
+      const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
+        labelWidth: 100,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+      });
+
+      const transformName = (data: TreeData[]) => {
+        return data.map((item) => {
+          item.name = t(item.name);
+          if (item.children && item.children.length) {
+            item.children = transformName(item.children as unknown as TreeData[]);
+          }
+          return item;
+        });
+      };
+
+      const { isTenantAdmin, isSysadmin, getRole } = useRole();
+      const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(
+        async (data: { isUpdate: boolean; record: RoleListItem }) => {
+          resetFields();
+          roleId.value = '';
+          // 在打开弹窗时清除所有选择的菜单
+          treeRef.value && treeRef.value?.setCheckedKeys([]);
+          isUpdate.value = data.isUpdate;
+          let roleType = unref(getRole) || RoleEnum.SYS_ADMIN;
+
+          // 租户管理员创建角色时 菜单分配为客户菜单
+          if (unref(isTenantAdmin)) {
+            roleType = RoleEnum.CUSTOMER_USER;
+          }
+
+          try {
+            spinning.value = true;
+            // 需要在setFieldsValue之前先填充treeData，否则Tree组件可能会报key not exist警告
+
+            // if (!unref(treeData).length) {
+            // 获取全部的菜单
+            const menuListModel = await getMeMenuList();
+            treeData.value = transformName(menuListModel as unknown as TreeData[]);
+            // }
+
+            const keys = await getPermissionByRole(roleType);
+            const { keyType } = RoleMenuDictEnum[roleType];
+            treeData.value = filterPermissionTreeData(
+              unref(treeData) as unknown as TreeData[],
+              keys,
+              keyType
+            );
+
+            // 如果编辑的是超级管理员 则不再过滤平台管理员禁用的权限
+            // 如果是超级管理员创建角色 创建角色属于平台管理员 因此过滤平台管理员禁用的权限
+            if (data?.record?.roleType !== RoleEnum.SYS_ADMIN && unref(isSysadmin)) {
+              const keys = await getPermissionByRole(RoleEnum.PLATFORM_ADMIN);
+              const { keyType } = RoleMenuDictEnum[RoleEnum.PLATFORM_ADMIN];
+              treeData.value = filterPermissionTreeData(
+                unref(treeData) as unknown as TreeData[],
+                keys,
+                keyType
+              );
+            }
+
+            // 更新
+            if (unref(isUpdate)) {
+              checked.value = [];
+              roleId.value = data.record.id;
+
+              //通过角色id去获取角色对应的菜单的ids
+              checkedKeysWithHalfChecked.value = roleMenus.value = await getMenusIdsByRoleId(
+                data.record.id
+              );
+              excludeHalfCheckedKeys(unref(treeData));
+              await nextTick();
+              unref(treeRef)?.setCheckedKeys(roleMenus.value);
+              setFieldsValue(data.record);
+            } else {
+            }
+          } catch (error) {
+            throw error;
+          } finally {
+            spinning.value = false;
+          }
+        }
+      );
+
+      const getTitle = computed(() => (!unref(isUpdate) ? '新增角色' : '编辑角色'));
+
+      async function handleSubmit() {
+        setDrawerProps({ confirmLoading: true });
+        const { createMessage } = useMessage();
+        try {
+          const values = await validate();
+          const treeCheckedKeys: string[] = (unref(treeRef)?.getCheckedKeys() as string[]) || [];
+          const menu = [...new Set([...unref(checkedKeysWithHalfChecked), ...treeCheckedKeys])];
+          const req = {
+            id: roleId.value,
+            name: values.name,
+            remark: values.remark,
+            status: values.status,
+            menu,
+          };
+          if (req.menu == undefined) return createMessage.error('请勾选权限菜单');
+          saveOrUpdateRoleInfoWithMenu(req).then(() => {
+            closeDrawer();
+            emit('success');
+            createMessage.success(`${unref(isUpdate) ? '编辑' : '新增'}成功`);
+          });
+        } finally {
+          setTimeout(() => {
+            setDrawerProps({ confirmLoading: false });
+          }, 300);
+        }
+      }
+
+      const getPermissionByRole = async (roleType: RoleEnum) => {
+        try {
+          const { key } = RoleMenuDictEnum[roleType];
+          const res = await findDictItemByCode({ dictCode: key });
+          return res.map((item) => item.itemValue);
+        } catch (error) {}
+        return [];
+      };
+
+      const filterPermissionTreeData = (
+        data: MenuRecord[],
+        permissionKeys: string[],
+        keysType: KeysTypeEnum
+      ): TreeData[] => {
+        const permissionCompare = (
+          data: MenuRecord[],
+          permissionKeys: string[],
+          keysType: KeysTypeEnum
+        ): TreeData[] => {
+          return data.filter((item) => {
+            item.name = t(item.name);
+            const findFlag = permissionKeys.includes(item.permission);
+
+            item.show = findFlag ? keysType === KeysTypeEnum.ENABLED : undefined;
+
+            if (item.children && item.children.length) {
+              if (item.show) return true;
+              if (item.show === undefined) {
+                item.children = permissionCompare(item.children, permissionKeys, keysType);
+                item.show = item.children.some((item) =>
+                  keysType === KeysTypeEnum.ENABLED
+                    ? item.show
+                    : item.show === undefined
+                    ? true
+                    : item.show
+                );
+                return item.show;
+              }
+            }
+
+            return keysType === KeysTypeEnum.ENABLED
+              ? item.show
+              : item.show === undefined
+              ? true
+              : item.show;
+          }) as unknown as TreeData[];
+        };
+
+        return permissionCompare(data, permissionKeys, keysType);
+      };
+
+      const excludeHalfCheckedKeys = (treeData: MenuRecord[]) => {
+        const needExcludeKeys: string[] = [];
+        const query = (data: MenuRecord[]) => {
+          data.forEach((item) => {
+            item.checked = roleMenus.value.includes(item.id);
+            if (item.children && item.children.length) {
+              query(item.children);
+              item.checked = item.children.every((item) => item.checked);
+            }
+            if (!item.checked) {
+              needExcludeKeys.push(item.id);
+            }
+          });
+        };
+        query(treeData);
+        roleMenus.value = unref(roleMenus).filter((key) => !needExcludeKeys.includes(key));
+        return needExcludeKeys;
+      };
+
+      const handleCheckClick = (selectedKeys: string[], event: CheckEvent) => {
+        checkedKeysWithHalfChecked.value = [
+          ...selectedKeys,
+          ...(event.halfCheckedKeys as string[]),
+        ];
+      };
+
+      return {
+        spinning,
+        registerDrawer,
+        registerForm,
+        getTitle,
+        handleSubmit,
+        treeData,
+        roleMenus,
+        treeRef,
+        handleCheckClick,
+      };
+    },
+  });
+</script>
+
+<style scoped lang="less">
+  :deep(.vben-basic-tree) {
+    width: 100% !important;
+  }
+
+  :deep(.is-unflod) {
+    display: none !important;
+  }
+
+  :deep(.is-flod) {
+    display: none !important;
+  }
+</style>

@@ -89,7 +89,7 @@
 
 
           // 租户管理员创建角色时 菜单分配为客户菜单
           // 租户管理员创建角色时 菜单分配为客户菜单
           if (unref(isTenantAdmin)) {
           if (unref(isTenantAdmin)) {
-            roleType = RoleEnum.CUSTOMER_USER;
+            roleType = RoleEnum.TENANT_ADMIN;
           }
           }
 
 
           try {
           try {
@@ -160,6 +160,7 @@
             remark: values.remark,
             remark: values.remark,
             status: values.status,
             status: values.status,
             menu,
             menu,
+            roleType: 'PLATFORM_ADMIN',
           };
           };
           if (req.menu == undefined) return createMessage.error('请勾选权限菜单');
           if (req.menu == undefined) return createMessage.error('请勾选权限菜单');
           saveOrUpdateRoleInfoWithMenu(req).then(() => {
           saveOrUpdateRoleInfoWithMenu(req).then(() => {

+<template>
+  <BasicDrawer
+    v-bind="$attrs"
+    @register="registerDrawer"
+    showFooter
+    :title="getTitle"
+    width="500px"
+    @ok="handleSubmit"
+  >
+    <BasicForm @register="registerForm">
+      <template #menu>
+        <Spin :spinning="spinning">
+          <BasicTree
+            v-if="treeData.length"
+            checkable
+            toolbar
+            ref="treeRef"
+            :treeData="treeData"
+            @check="handleCheckClick"
+            :replace-fields="{ title: 'name', key: 'id' }"
+            :checkedKeys="roleMenus"
+            title="菜单分配"
+          />
+        </Spin>
+      </template>
+    </BasicForm>
+  </BasicDrawer>
+</template>
+<script lang="ts">
+  import { defineComponent, ref, computed, unref, nextTick } from 'vue';
+  import { BasicForm, useForm } from '/@/components/Form/index';
+  import { formSchema, KeysTypeEnum, RoleMenuDictEnum } from './role.data';
+  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+  import { BasicTree, TreeActionType, TreeItem } from '/@/components/Tree';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  const { t } = useI18n(); // 加载国际化
+  // 加载菜单数据
+  import { getMeMenuList, getMenusIdsByRoleId } from '/@/api/sys/menu';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { MenuRecord } from '/@/api/sys/model/menuModel';
+  import { saveOrUpdateRoleInfoWithMenu } from '/@/api/system/system';
+  import { findDictItemByCode } from '/@/api/system/dict';
+  import { RoleEnum } from '/@/enums/roleEnum';
+  import { Spin } from 'ant-design-vue';
+  import { useRole } from '/@/hooks/business/useRole';
+  import { RoleListItem } from '/@/api/system/model/systemModel';
+
+  type TreeData = MenuRecord & TreeItem;
+
+  export default defineComponent({
+    name: 'RoleDrawer',
+    components: { BasicDrawer, BasicForm, BasicTree, Spin },
+    emits: ['success', 'register'],
+    setup(_, { emit }) {
+      const isUpdate = ref<boolean>(true);
+      const treeData = ref<TreeData[]>([]);
+      const roleMenus = ref<string[]>([]);
+      const roleId = ref<string>('');
+      const treeRef = ref<Nullable<TreeActionType>>();
+      const checked = ref<string[]>([]); //需要选中的节点
+      const spinning = ref(false);
+      const checkedKeysWithHalfChecked = ref<string[]>([]);
+
+      const [registerForm, { resetFields, setFieldsValue, validate, updateSchema }] = useForm({
+        labelWidth: 100,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+      });
+
+      const transformName = (data: TreeData[]) => {
+        return data.map((item) => {
+          item.name = t(item.name);
+          if (item.children && item.children.length) {
+            item.children = transformName(item.children as unknown as TreeData[]);
+          }
+          return item;
+        });
+      };
+
+      const { isTenantAdmin, isSysadmin, getRole } = useRole();
+      const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(
+        async (data: { isUpdate: boolean; record: RoleListItem }) => {
+          if (data?.record) {
+            updateSchema({
+              field: 'status',
+              componentProps: {
+                options: [
+                  { label: '启用', value: 1 },
+                  { label: '停用', value: 0 },
+                ],
+                disabled: data.record.status == 1 ? true : false,
+              },
+            });
+          }
+
+          resetFields();
+          roleId.value = '';
+          // 在打开弹窗时清除所有选择的菜单
+          treeRef.value && treeRef.value?.setCheckedKeys([]);
+          isUpdate.value = data.isUpdate;
+          let roleType = unref(getRole) || RoleEnum.SYS_ADMIN;
+
+          // 租户管理员创建角色时 菜单分配为客户菜单
+          if (unref(isTenantAdmin)) {
+            roleType = RoleEnum.CUSTOMER_USER;
+          }
+
+          try {
+            spinning.value = true;
+            // 需要在setFieldsValue之前先填充treeData，否则Tree组件可能会报key not exist警告
+
+            // if (!unref(treeData).length) {
+            // 获取全部的菜单
+            const menuListModel = await getMeMenuList();
+            treeData.value = transformName(menuListModel as unknown as TreeData[]);
+            // }
+
+            const keys = await getPermissionByRole(roleType);
+            const { keyType } = RoleMenuDictEnum[roleType];
+            treeData.value = filterPermissionTreeData(
+              unref(treeData) as unknown as TreeData[],
+              keys,
+              keyType
+            );
+
+            // 如果编辑的是超级管理员 则不再过滤平台管理员禁用的权限
+            // 如果是超级管理员创建角色 创建角色属于平台管理员 因此过滤平台管理员禁用的权限
+            if (data?.record?.roleType !== RoleEnum.SYS_ADMIN && unref(isSysadmin)) {
+              const keys = await getPermissionByRole(RoleEnum.PLATFORM_ADMIN);
+              const { keyType } = RoleMenuDictEnum[RoleEnum.PLATFORM_ADMIN];
+              treeData.value = filterPermissionTreeData(
+                unref(treeData) as unknown as TreeData[],
+                keys,
+                keyType
+              );
+            }
+
+            // 更新
+            if (unref(isUpdate)) {
+              checked.value = [];
+              roleId.value = data.record.id;
+
+              //通过角色id去获取角色对应的菜单的ids
+              checkedKeysWithHalfChecked.value = roleMenus.value = await getMenusIdsByRoleId(
+                data.record.id
+              );
+              excludeHalfCheckedKeys(unref(treeData));
+              await nextTick();
+              unref(treeRef)?.setCheckedKeys(roleMenus.value);
+              setFieldsValue(data.record);
+            } else {
+            }
+          } catch (error) {
+            throw error;
+          } finally {
+            spinning.value = false;
+          }
+        }
+      );
+
+      const getTitle = computed(() => (!unref(isUpdate) ? '新增客户角色' : '编辑客户角色'));
+
+      async function handleSubmit() {
+        setDrawerProps({ confirmLoading: true });
+        const { createMessage } = useMessage();
+        try {
+          const values = await validate();
+          const treeCheckedKeys: string[] = (unref(treeRef)?.getCheckedKeys() as string[]) || [];
+          const menu = [...new Set([...unref(checkedKeysWithHalfChecked), ...treeCheckedKeys])];
+          const req = {
+            id: roleId.value,
+            name: values.name,
+            remark: values.remark,
+            status: values.status,
+            menu,
+          };
+          if (req.menu == undefined || !req.menu.length)
+            return createMessage.error('请勾选权限菜单');
+          saveOrUpdateRoleInfoWithMenu(req).then(() => {
+            closeDrawer();
+            emit('success');
+            createMessage.success(`${unref(isUpdate) ? '编辑' : '新增'}成功`);
+          });
+        } finally {
+          setTimeout(() => {
+            setDrawerProps({ confirmLoading: false });
+          }, 300);
+        }
+      }
+
+      const getPermissionByRole = async (roleType: RoleEnum) => {
+        try {
+          const { key } = RoleMenuDictEnum[roleType];
+          const res = await findDictItemByCode({ dictCode: key });
+          return res.map((item) => item.itemValue);
+        } catch (error) {}
+        return [];
+      };
+
+      const filterPermissionTreeData = (
+        data: MenuRecord[],
+        permissionKeys: string[],
+        keysType: KeysTypeEnum
+      ): TreeData[] => {
+        const permissionCompare = (
+          data: MenuRecord[],
+          permissionKeys: string[],
+          keysType: KeysTypeEnum
+        ): TreeData[] => {
+          return data.filter((item) => {
+            item.name = t(item.name);
+            const findFlag = permissionKeys.includes(item.permission);
+
+            item.show = findFlag ? keysType === KeysTypeEnum.ENABLED : undefined;
+
+            if (item.children && item.children.length) {
+              if (item.show) return true;
+              if (item.show === undefined) {
+                item.children = permissionCompare(item.children, permissionKeys, keysType);
+                item.show = item.children.some((item) =>
+                  keysType === KeysTypeEnum.ENABLED
+                    ? item.show
+                    : item.show === undefined
+                    ? true
+                    : item.show
+                );
+                return item.show;
+              }
+            }
+
+            return keysType === KeysTypeEnum.ENABLED
+              ? item.show
+              : item.show === undefined
+              ? true
+              : item.show;
+          }) as unknown as TreeData[];
+        };
+
+        return permissionCompare(data, permissionKeys, keysType);
+      };
+
+      const excludeHalfCheckedKeys = (treeData: MenuRecord[]) => {
+        const needExcludeKeys: string[] = [];
+        const query = (data: MenuRecord[]) => {
+          data.forEach((item) => {
+            item.checked = roleMenus.value.includes(item.id);
+            if (item.children && item.children.length) {
+              query(item.children);
+              item.checked = item.children.every((item) => item.checked);
+            }
+            if (!item.checked) {
+              needExcludeKeys.push(item.id);
+            }
+          });
+        };
+        query(treeData);
+        roleMenus.value = unref(roleMenus).filter((key) => !needExcludeKeys.includes(key));
+        return needExcludeKeys;
+      };
+
+      const handleCheckClick = (selectedKeys: string[], event: CheckEvent) => {
+        checkedKeysWithHalfChecked.value = [
+          ...selectedKeys,
+          ...(event.halfCheckedKeys as string[]),
+        ];
+      };
+
+      return {
+        spinning,
+        registerDrawer,
+        registerForm,
+        getTitle,
+        handleSubmit,
+        treeData,
+        roleMenus,
+        treeRef,
+        handleCheckClick,
+      };
+    },
+  });
+</script>
+
+<style scoped lang="less">
+  :deep(.vben-basic-tree) {
+    width: 100% !important;
+  }
+
+  :deep(.is-unflod) {
+    display: none !important;
+  }
+
+  :deep(.is-flod) {
+    display: none !important;
+  }
+</style>

+<template>
+  <div>
+    <BasicTable
+      :rowSelection="{ type: 'checkbox' }"
+      @register="registerTable"
+      :clickToRowSelect="false"
+    >
+      <template #toolbar>
+        <Authority value="api:yt:custom:role:post">
+          <a-button type="primary" @click="handleCreate">新增客户角色</a-button>
+        </Authority>
+        <Authority value="api:yt:custom:role:delete">
+          <Popconfirm
+            title="您确定要批量删除数据"
+            ok-text="确定"
+            cancel-text="取消"
+            @confirm="handleDeleteOrBatchDelete(null)"
+          >
+            <a-button type="primary" color="error" :disabled="hasBatchDelete"> 批量删除 </a-button>
+          </Popconfirm>
+        </Authority>
+      </template>
+      <template #status="{ record }">
+        <Authority value="api:yt:custom:role:update">
+          <Switch
+            :checked="record.status === 1"
+            :loading="record.pendingStatus"
+            checkedChildren="启用"
+            unCheckedChildren="禁用"
+            @change="(checked:boolean)=>statusChange(checked,record)"
+          />
+        </Authority>
+        <Tag
+          v-if="!hasPermission('api:yt:custom:role:update')"
+          :color="record.status ? 'green' : 'red'"
+        >
+          {{ record.status ? '启用' : '禁用' }}
+        </Tag>
+      </template>
+      <template #action="{ record }">
+        <TableAction
+          :actions="[
+            {
+              label: '编辑',
+              auth: 'api:yt:custom:role:update',
+              icon: 'clarity:note-edit-line',
+              onClick: handleEdit.bind(null, record),
+            },
+            {
+              label: '删除',
+              auth: 'api:yt:custom:role:delete',
+              icon: 'ant-design:delete-outlined',
+              color: 'error',
+              ifShow: record.roleType != RoleEnum.SYS_ADMIN && !record.status,
+              popConfirm: {
+                title: '是否确认删除',
+                confirm: handleDeleteOrBatchDelete.bind(null, record),
+              },
+            },
+          ]"
+        />
+      </template>
+    </BasicTable>
+    <RoleDrawer @register="registerDrawer" @success="handleSuccess" />
+  </div>
+</template>
+<script lang="ts">
+  import { defineComponent, nextTick } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { delRole, getRoleListByPage, setRoleStatus } from '/@/api/system/system';
+  import { useDrawer } from '/@/components/Drawer';
+  import RoleDrawer from './RoleDrawer.vue';
+  import { columns, searchFormSchema } from './role.data';
+  import { RoleEnum } from '/@/enums/roleEnum';
+  import { Authority } from '/@/components/Authority';
+  import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { Switch, Popconfirm, Tag } from 'ant-design-vue';
+  import { usePermission } from '/@/hooks/web/usePermission';
+
+  export default defineComponent({
+    name: 'RoleManagement',
+    components: { BasicTable, RoleDrawer, TableAction, Authority, Switch, Popconfirm, Tag },
+    setup() {
+      const { hasPermission } = usePermission();
+      const [registerDrawer, { openDrawer }] = useDrawer();
+      function handleSuccess() {
+        reload();
+      }
+      const [registerTable, { setProps, reload, setSelectedRowKeys }] = useTable({
+        title: '客户角色列表',
+        api: getRoleListByPage,
+        columns,
+        formConfig: {
+          labelWidth: 120,
+          schemas: searchFormSchema,
+        },
+        useSearchForm: true,
+        showTableSetting: true,
+        bordered: true,
+        showIndexColumn: false,
+        actionColumn: {
+          width: 200,
+          title: '操作',
+          dataIndex: 'action',
+          slots: { customRender: 'action' },
+          fixed: 'right',
+        },
+      });
+      const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions, resetSelectedRowKeys } =
+        useBatchDelete(delRole, handleSuccess, setProps);
+      selectionOptions.rowSelection.getCheckboxProps = (record: Recordable) => {
+        // Demo:status为1的选择框禁用
+        if (record.status === 1) {
+          return { disabled: true };
+        } else {
+          return { disabled: false };
+        }
+      };
+      nextTick(() => {
+        setProps(selectionOptions);
+      });
+
+      function handleCreate() {
+        openDrawer(true, {
+          isUpdate: false,
+        });
+      }
+
+      function handleEdit(record: Recordable) {
+        openDrawer(true, {
+          record,
+          isUpdate: true,
+        });
+      }
+
+      const statusChange = async (checked, record) => {
+        setProps({
+          loading: true,
+        });
+        setSelectedRowKeys([]);
+        resetSelectedRowKeys();
+        const newStatus = checked ? 1 : 0;
+        const { createMessage } = useMessage();
+        try {
+          await setRoleStatus(record.id, newStatus);
+          if (newStatus) {
+            createMessage.success(`启用成功`);
+          } else {
+            createMessage.success('禁用成功');
+          }
+        } finally {
+          setProps({
+            loading: false,
+          });
+          reload();
+        }
+      };
+
+      return {
+        registerTable,
+        registerDrawer,
+        handleCreate,
+        handleEdit,
+        handleSuccess,
+        RoleEnum,
+        hasBatchDelete,
+        handleDeleteOrBatchDelete,
+        statusChange,
+        hasPermission,
+      };
+    },
+  });
+</script>

+import { BasicColumn } from '/@/components/Table';
+import { FormSchema } from '/@/components/Table';
+import { DictEnum } from '/@/enums/dictEnum';
+import { RoleEnum } from '/@/enums/roleEnum';
+
+export enum KeysTypeEnum {
+  DISABLED = 'disabled',
+  ENABLED = 'enabled',
+}
+
+export const RoleMenuDictEnum: Recordable<{ key: string; keyType: KeysTypeEnum }> = {
+  [RoleEnum.PLATFORM_ADMIN]: {
+    key: DictEnum.DISABLED_PLATFORM_ADMIN_AUTH,
+    keyType: KeysTypeEnum.DISABLED,
+  },
+  [RoleEnum.SYS_ADMIN]: { key: DictEnum.ENABLED_SYSADMIN_AUTH, keyType: KeysTypeEnum.ENABLED },
+  [RoleEnum.TENANT_ADMIN]: { key: DictEnum.DISABLED_TENANT_AUTH, keyType: KeysTypeEnum.DISABLED },
+  [RoleEnum.CUSTOMER_USER]: { key: DictEnum.DISABLE_CUSTOMER_AUTH, keyType: KeysTypeEnum.DISABLED },
+};
+
+export const columns: BasicColumn[] = [
+  {
+    title: '角色名称',
+    dataIndex: 'name',
+    width: 200,
+  },
+  {
+    title: '角色Code',
+    dataIndex: 'code',
+    width: 200,
+  },
+  {
+    title: '状态',
+    dataIndex: 'status',
+    width: 120,
+    slots: { customRender: 'status' },
+  },
+
+  {
+    title: '备注',
+    dataIndex: 'remark',
+    width: 240,
+  },
+  {
+    title: '创建时间',
+    dataIndex: 'createTime',
+    width: 180,
+  },
+];
+
+export const searchFormSchema: FormSchema[] = [
+  {
+    field: 'roleName',
+    label: '角色名称',
+    component: 'Input',
+    colProps: { span: 6 },
+    componentProps: {
+      maxLength: 255,
+    },
+  },
+  {
+    field: 'status',
+    label: '状态',
+    component: 'Select',
+    componentProps: {
+      options: [
+        { label: '启用', value: 1 },
+        { label: '停用', value: 0 },
+      ],
+    },
+    colProps: { span: 6 },
+  },
+];
+
+export const formSchema: FormSchema[] = [
+  {
+    field: 'name',
+    label: '角色名称',
+    required: true,
+    component: 'Input',
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入角色名称',
+    },
+  },
+  {
+    field: 'status',
+    label: '状态',
+    component: 'RadioButtonGroup',
+    defaultValue: 1,
+    componentProps: {
+      options: [
+        { label: '启用', value: 1 },
+        { label: '停用', value: 0 },
+      ],
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    component: 'InputTextArea',
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入备注',
+    },
+  },
+  {
+    label: '',
+    field: 'menu',
+    slot: 'menu',
+    component: 'Input',
+  },
+];

@@ -88,7 +88,7 @@
         reload();
         reload();
       }
       }
       const [registerTable, { setProps, reload, setSelectedRowKeys }] = useTable({
       const [registerTable, { setProps, reload, setSelectedRowKeys }] = useTable({
-        title: '角色列表',
+        title: '客户角色列表',
         api: getRoleListByPage,
         api: getRoleListByPage,
         columns,
         columns,
         formConfig: {
         formConfig: {

+<template>
+  <BasicDrawer
+    v-bind="$attrs"
+    @register="registerDrawer"
+    showFooter
+    :title="getTitle"
+    width="500px"
+    @ok="handleSubmit"
+  >
+    <BasicForm @register="registerForm">
+      <template #menu>
+        <Spin :spinning="spinning">
+          <BasicTree
+            v-if="treeData.length"
+            :treeData="treeData"
+            :replaceFields="{ title: 'name', key: 'id' }"
+            :checkedKeys="roleMenus"
+            @check="handleCheckClick"
+            @unSelectAll="handleUnSelectAll"
+            checkable
+            toolbar
+            ref="treeRef"
+            title="权限分配"
+          />
+        </Spin>
+      </template>
+    </BasicForm>
+  </BasicDrawer>
+</template>
+<script lang="ts">
+  import { defineComponent, ref, computed, unref, nextTick } from 'vue';
+  import { BasicForm, useForm } from '/@/components/Form/index';
+  import { formSchema } from './role.data';
+  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+  import { BasicTree, CheckEvent, TreeActionType, TreeItem, CheckKeys } from '/@/components/Tree';
+  const { t } = useI18n(); // 加载国际化
+  // 加载菜单数据
+  import { getAdminMenuList, getMenuList, getMenusIdsByRoleId } from '/@/api/sys/menu';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { MenuRecord } from '/@/api/sys/model/menuModel';
+  import { saveOrUpdateRoleInfoWithMenu } from '/@/api/system/system';
+  import { RoleEnum } from '/@/enums/roleEnum';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { findDictItemByCode } from '/@/api/system/dict';
+  import { Spin } from 'ant-design-vue';
+  import { useRole } from '/@/hooks/business/useRole';
+  import { RoleMenuDictEnum, KeysTypeEnum } from '../custom/role.data';
+
+  type TreeData = MenuRecord & TreeItem;
+
+  export default defineComponent({
+    name: 'RoleDrawer',
+    components: { BasicDrawer, BasicForm, BasicTree, Spin },
+    emits: ['success', 'register'],
+    setup(_, { emit }) {
+      const isUpdate = ref(true);
+      const treeData = ref<TreeData[]>([]);
+      const roleMenus = ref<string[]>([]);
+      const roleId = ref('');
+      const treeRef = ref<Nullable<TreeActionType>>(null);
+      const checked = ref<string[]>([]); //需要选中的节点
+      const spinning = ref(false);
+      const checkedKeysWithHalfChecked = ref<(string | number)[]>([]);
+
+      const [registerForm, { resetFields, setFieldsValue, validate, updateSchema }] = useForm({
+        labelWidth: 90,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+      });
+
+      const transformName = (data: TreeData[]) => {
+        return data.map((item) => {
+          item.name = t(item.name);
+          if (item.children && item.children.length) {
+            item.children = transformName(item.children as unknown as TreeData[]);
+          }
+          return item;
+        });
+      };
+
+      const { isPlatformAdmin } = useRole();
+      const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
+        if (data?.isUpdate) {
+          updateSchema({
+            field: 'status',
+            componentProps: {
+              options: [
+                { label: '启用', value: 1 },
+                { label: '停用', value: 0 },
+              ],
+              disabled: data.record.status == 1 ? true : false,
+            },
+          });
+        } else {
+          updateSchema({
+            field: 'status',
+            componentProps: {
+              options: [
+                { label: '启用', value: 1 },
+                { label: '停用', value: 0 },
+              ],
+              disabled: false,
+            },
+          });
+        }
+        resetFields();
+        roleId.value = '';
+        // 在打开弹窗时清除所有选择的菜单
+        treeRef.value && treeRef.value?.setCheckedKeys([]);
+        isUpdate.value = data.isUpdate;
+        const roleType = RoleEnum.TENANT_ADMIN;
+        try {
+          spinning.value = true;
+
+          if (!unref(treeData).length) {
+            // 获取全部的菜单
+            const menuListModel = unref(isPlatformAdmin)
+              ? await getAdminMenuList()
+              : await getMenuList();
+            treeData.value = transformName(menuListModel as unknown as TreeData[]);
+          }
+          const keys = await getPermissionByRole(roleType);
+          const { keyType } = RoleMenuDictEnum[roleType];
+          treeData.value = filterPermissionTreeData(
+            unref(treeData) as unknown as TreeData[],
+            keys,
+            keyType
+          );
+
+          // 更新
+          if (unref(isUpdate)) {
+            checked.value = [];
+            roleId.value = data.record.id;
+
+            //通过角色id去获取角色对应的菜单的ids
+            checkedKeysWithHalfChecked.value = roleMenus.value = await getMenusIdsByRoleId(
+              data.record.id
+            );
+
+            excludeHalfCheckedKeys(unref(treeData));
+
+            await nextTick();
+            treeRef.value?.setCheckedKeys(roleMenus.value);
+            setFieldsValue(data.record);
+          } else {
+          }
+        } catch (error) {
+          throw error;
+        } finally {
+          spinning.value = false;
+        }
+      });
+      const getTitle = computed(() => (!unref(isUpdate) ? '新增管理员角色' : '编辑管理员角色'));
+
+      // 取消全部的时候清除回显时获取的
+      const handleUnSelectAll = () => {
+        checkedKeysWithHalfChecked.value = [];
+      };
+
+      async function handleSubmit() {
+        setDrawerProps({ loading: true, confirmLoading: true });
+        const { createMessage } = useMessage();
+        let treeCheckedKeys: string[] | CheckKeys =
+          (unref(treeRef)?.getCheckedKeys() as string[] | CheckKeys) || [];
+        //fix 取消层级独立后(unref(treeRef)?.getCheckedKeys() as string[])的数据不是数组，是{checked:[],halfChecked:[]}对象，迭代报错
+        if (!Array.isArray(treeCheckedKeys)) {
+          treeCheckedKeys = treeCheckedKeys?.checked;
+        }
+        const menu = [...new Set([...unref(checkedKeysWithHalfChecked), ...treeCheckedKeys])];
+        try {
+          const values = await validate();
+          const req = {
+            id: roleId.value,
+            name: values.name,
+            remark: values.remark,
+            status: values.status,
+            roleType: RoleEnum.TENANT_ADMIN,
+            menu,
+          };
+          if (req.menu == undefined || !req.menu.length)
+            return createMessage.error('请勾选权限菜单');
+          const res = await saveOrUpdateRoleInfoWithMenu(req);
+          if (res) {
+            closeDrawer();
+            emit('success');
+            createMessage.success(`${unref(isUpdate) ? '编辑' : '新增'}成功`);
+            setDrawerProps({ loading: false });
+            setDrawerProps({ confirmLoading: false });
+          }
+        } finally {
+          setTimeout(() => {
+            setDrawerProps({ loading: false });
+            setDrawerProps({ confirmLoading: false });
+          }, 300);
+        }
+      }
+
+      const getPermissionByRole = async (roleType: RoleEnum) => {
+        try {
+          const { key } = RoleMenuDictEnum[roleType];
+          const res = await findDictItemByCode({ dictCode: key });
+          return res.map((item) => item.itemValue);
+        } catch (error) {}
+        return [];
+      };
+
+      const filterPermissionTreeData = (
+        data: MenuRecord[],
+        permissionKeys: string[],
+        keysType: KeysTypeEnum
+      ): TreeData[] => {
+        const permissionCompare = (
+          data: MenuRecord[],
+          permissionKeys: string[],
+          keysType: KeysTypeEnum
+        ): TreeData[] => {
+          return data.filter((item) => {
+            item.name = t(item.name);
+            const findFlag = permissionKeys.includes(item.permission);
+
+            item.show = findFlag ? keysType === KeysTypeEnum.ENABLED : undefined;
+
+            if (item.children && item.children.length) {
+              if (item.show) return true;
+              if (item.show === undefined) {
+                item.children = permissionCompare(item.children, permissionKeys, keysType);
+                item.show = item.children.some((item) =>
+                  keysType === KeysTypeEnum.ENABLED
+                    ? item.show
+                    : item.show === undefined
+                    ? true
+                    : item.show
+                );
+                return item.show;
+              }
+            }
+
+            return keysType === KeysTypeEnum.ENABLED
+              ? item.show
+              : item.show === undefined
+              ? true
+              : item.show;
+          }) as unknown as TreeData[];
+        };
+
+        return permissionCompare(data, permissionKeys, keysType);
+      };
+
+      const excludeHalfCheckedKeys = (treeData: MenuRecord[]) => {
+        const needExcludeKeys: string[] = [];
+        const query = (data: MenuRecord[]) => {
+          data.forEach((item) => {
+            item.checked = roleMenus.value.includes(item.id);
+            if (item.children && item.children.length) {
+              query(item.children);
+              item.checked = item.children.every((item) => item.checked);
+            }
+            if (!item.checked) {
+              needExcludeKeys.push(item.id);
+            }
+          });
+        };
+        query(treeData);
+        roleMenus.value = unref(roleMenus).filter((key) => !needExcludeKeys.includes(key));
+        return needExcludeKeys;
+      };
+
+      const handleCheckClick = (selectedKeys: CheckKeys, event: CheckEvent) => {
+        //fix 取消层级独立后selectedKeys不是数组，是{checked:[],halfChecked:[]}对象 迭代报错
+        if (!Array.isArray(selectedKeys)) {
+          selectedKeys = selectedKeys?.checked;
+          event.halfCheckedKeys = [];
+        }
+        checkedKeysWithHalfChecked.value = [
+          ...selectedKeys,
+          ...(event.halfCheckedKeys as string[]),
+        ];
+      };
+
+      return {
+        spinning,
+        registerDrawer,
+        registerForm,
+        getTitle,
+        handleSubmit,
+        treeData,
+        roleMenus,
+        treeRef,
+        handleCheckClick,
+        handleUnSelectAll,
+      };
+    },
+  });
+</script>
+
+<style scoped lang="less">
+  :deep(.vben-basic-tree) {
+    width: 100% !important;
+  }
+
+  :deep(.is-unflod) {
+    display: none !important;
+  }
+
+  :deep(.is-flod) {
+    display: none !important;
+  }
+</style>

+<template>
+  <div>
+    <BasicTable
+      @register="registerTable"
+      :rowSelection="{ type: 'checkbox' }"
+      :clickToRowSelect="false"
+    >
+      <template #toolbar>
+        <Authority value="api:yt:tenant:role:post">
+          <a-button type="primary" @click="handleCreate"> 新增管理员角色 </a-button>
+        </Authority>
+        <Authority value="api:yt:tenant:role:delete">
+          <Popconfirm
+            title="您确定要批量删除数据"
+            ok-text="确定"
+            cancel-text="取消"
+            @confirm="handleDeleteOrBatchDelete(null)"
+          >
+            <a-button type="primary" color="error" :disabled="hasBatchDelete"> 批量删除 </a-button>
+          </Popconfirm>
+        </Authority>
+      </template>
+      <template #status="{ record }">
+        <Switch
+          :checked="record.status === 1"
+          :loading="record.pendingStatus"
+          checkedChildren="启用"
+          unCheckedChildren="禁用"
+          @change="(checked:boolean)=>statusChange(checked,record)"
+        />
+      </template>
+      <template #action="{ record }">
+        <TableAction
+          :actions="[
+            {
+              label: '编辑',
+              auth: 'api:yt:tenant:role:update',
+              icon: 'clarity:note-edit-line',
+              onClick: handleEdit.bind(null, record),
+            },
+            {
+              label: '删除',
+              auth: 'api:yt:tenant:role:delete',
+              ifShow: !record.status,
+              icon: 'ant-design:delete-outlined',
+              color: 'error',
+              popConfirm: {
+                title: '是否确认删除',
+                confirm: handleDeleteOrBatchDelete.bind(null, record),
+              },
+            },
+          ]"
+        />
+      </template>
+    </BasicTable>
+    <RoleDrawer @register="registerDrawer" @success="handleSuccess" />
+  </div>
+</template>
+<script lang="ts">
+  import { defineComponent, nextTick } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { delRole, getTenantRoleRoleListByPage, setRoleStatus } from '/@/api/system/system';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { useDrawer } from '/@/components/Drawer';
+  import RoleDrawer from './RoleDrawer.vue';
+  import { columns, searchFormSchema } from './role.data';
+  import { RoleEnum } from '/@/enums/roleEnum';
+  import { Authority } from '/@/components/Authority';
+  import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
+  import { Switch, Popconfirm } from 'ant-design-vue';
+
+  export default defineComponent({
+    name: 'TenantRoleManagement',
+    components: { BasicTable, RoleDrawer, TableAction, Authority, Switch, Popconfirm },
+    setup() {
+      const [registerDrawer, { openDrawer }] = useDrawer();
+      function handleSuccess() {
+        reload();
+      }
+      const [registerTable, { reload, setProps, setSelectedRowKeys }] = useTable({
+        title: '管理员角色列表',
+        api: getTenantRoleRoleListByPage,
+        columns,
+        formConfig: {
+          labelWidth: 120,
+          schemas: searchFormSchema,
+          actionColOptions: { span: 12 },
+        },
+        useSearchForm: true,
+        showTableSetting: true,
+        bordered: true,
+        showIndexColumn: false,
+        actionColumn: {
+          width: 200,
+          title: '操作',
+          dataIndex: 'action',
+          slots: { customRender: 'action' },
+          fixed: 'right',
+        },
+      });
+      const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions, resetSelectedRowKeys } =
+        useBatchDelete(delRole, handleSuccess, setProps);
+      selectionOptions.rowSelection.getCheckboxProps = (record: Recordable) => {
+        // Demo:status为1的选择框禁用
+        if (record.status === 1) {
+          return { disabled: true };
+        } else {
+          return { disabled: false };
+        }
+      };
+      nextTick(() => {
+        setProps(selectionOptions);
+      });
+
+      function handleCreate() {
+        openDrawer(true, {
+          isUpdate: false,
+        });
+      }
+
+      function handleEdit(record: Recordable) {
+        openDrawer(true, {
+          record,
+          isUpdate: true,
+        });
+      }
+      const statusChange = async (checked, record) => {
+        setProps({
+          loading: true,
+        });
+        setSelectedRowKeys([]);
+        resetSelectedRowKeys();
+        const newStatus = checked ? 1 : 0;
+        const { createMessage } = useMessage();
+        try {
+          await setRoleStatus(record.id, newStatus);
+          if (newStatus) {
+            createMessage.success(`启用成功`);
+          } else {
+            createMessage.success('禁用成功');
+          }
+        } finally {
+          setProps({
+            loading: false,
+          });
+          reload();
+        }
+      };
+
+      return {
+        statusChange,
+        registerTable,
+        registerDrawer,
+        handleCreate,
+        handleEdit,
+        handleSuccess,
+        RoleEnum,
+        hasBatchDelete,
+        handleDeleteOrBatchDelete,
+      };
+    },
+  });
+</script>

+import { BasicColumn } from '/@/components/Table';
+import { FormSchema } from '/@/components/Table';
+import { RoleEnum } from '/@/enums/roleEnum';
+export const columns: BasicColumn[] = [
+  {
+    title: '角色名称',
+    dataIndex: 'name',
+    width: 180,
+  },
+  {
+    title: '角色Code',
+    dataIndex: 'code',
+    width: 180,
+  },
+  {
+    title: '状态',
+    dataIndex: 'status',
+    width: 120,
+    slots: { customRender: 'status' },
+  },
+  {
+    title: '备注',
+    dataIndex: 'remark',
+    width: 240,
+  },
+  {
+    title: '创建时间',
+    dataIndex: 'createTime',
+    width: 180,
+  },
+];
+
+export const searchFormSchema: FormSchema[] = [
+  {
+    field: 'roleName',
+    label: '角色名称',
+    component: 'Input',
+    colProps: { span: 6 },
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入角色名称',
+    },
+  },
+
+  {
+    field: 'roleType',
+    label: '',
+    component: 'Input',
+    colProps: { span: 8 },
+    defaultValue: RoleEnum.TENANT_ADMIN,
+    ifShow: false,
+    componentProps: {
+      maxLength: 20,
+    },
+  },
+
+  {
+    field: 'status',
+    label: '状态',
+    component: 'Select',
+    componentProps: {
+      options: [
+        { label: '启用', value: 1 },
+        { label: '停用', value: 0 },
+      ],
+    },
+    colProps: { span: 6 },
+  },
+];
+
+export const formSchema: FormSchema[] = [
+  {
+    field: 'name',
+    label: '角色名称',
+    required: true,
+    component: 'Input',
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入角色名称',
+    },
+  },
+  {
+    field: 'status',
+    label: '状态',
+    component: 'RadioButtonGroup',
+    defaultValue: 1,
+    componentProps: {
+      options: [
+        { label: '启用', value: 1 },
+        { label: '停用', value: 0 },
+      ],
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    component: 'InputTextArea',
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入备注',
+    },
+  },
+  {
+    label: ' ',
+    field: 'menu',
+    slot: 'menu',
+    component: 'Input',
+    componentProps: {
+      maxLength: 255,
+    },
+  },
+];

@@ -14,7 +14,10 @@ import { dateUtil } from '/@/utils/dateUtil';
 import { ProductPicker, validateProductPicker } from '../ProductPicker';
 import { ProductPicker, validateProductPicker } from '../ProductPicker';
 import { useGlobSetting } from '/@/hooks/setting';
 import { useGlobSetting } from '/@/hooks/setting';
 import { TransportTypeEnum } from '/@/enums/deviceEnum';
 import { TransportTypeEnum } from '/@/enums/deviceEnum';
+import { validateTCPCustomCommand } from '/@/components/Form/src/components/ThingsModelForm';
+import { OrgTreeSelect } from '/@/views/common/OrgTreeSelect';
 
 
+useComponentRegister('OrgTreeSelect', OrgTreeSelect);
 useComponentRegister('DevicePicker', DevicePicker);
 useComponentRegister('DevicePicker', DevicePicker);
 useComponentRegister('ProductPicker', ProductPicker);
 useComponentRegister('ProductPicker', ProductPicker);
 useComponentRegister('PollCommandInput', PollCommandInput);
 useComponentRegister('PollCommandInput', PollCommandInput);
@@ -24,6 +27,8 @@ const { disabledTaskCenterExecuteIntervalUnitSecond } = useGlobSetting();
 export enum FormFieldsEnum {
 export enum FormFieldsEnum {
   // 任务名称
   // 任务名称
   NAME = 'name',
   NAME = 'name',
+  // 所属组织
+  ORGANIZATION_ID = 'organizationId',
   // 目标类型
   // 目标类型
   TARGET_TYPE = 'targetType',
   TARGET_TYPE = 'targetType',
   // 设备类型选择
   // 设备类型选择
@@ -98,16 +103,56 @@ export const formSchemas: FormSchema[] = [
     },
     },
   },
   },
   {
   {
+    required: true,
+    field: FormFieldsEnum.ORGANIZATION_ID,
+    label: '所属组织',
+    colProps: { span: 24 },
+    component: 'OrgTreeSelect',
+    componentProps: ({ formActionType }) => {
+      const { setFieldsValue } = formActionType;
+      return {
+        onChange(key: string) {
+          setFieldsValue({
+            [FormFieldsEnum.EXECUTE_TARGET_DATA]: {
+              paramsOrg: key, //传递组织id到DevicePicker组件里进行组织过滤
+              change: true,
+            },
+            [FormFieldsEnum.DEVICE_PROFILE]: {
+              paramsOrg: key, //传递组织id到DevicePicker组件里进行组织过滤
+              change: true,
+            },
+          });
+        },
+        getPopupContainer: () => document.body,
+      };
+    },
+  },
+  {
     field: FormFieldsEnum.TARGET_TYPE,
     field: FormFieldsEnum.TARGET_TYPE,
     component: 'RadioGroup',
     component: 'RadioGroup',
     label: '目标类型',
     label: '目标类型',
     defaultValue: TaskTargetEnum.DEVICES,
     defaultValue: TaskTargetEnum.DEVICES,
     helpMessage: ['执行任务的目标设备，可以是多个指定的设备，也可以是一个设备类型下的所有设备.'],
     helpMessage: ['执行任务的目标设备，可以是多个指定的设备，也可以是一个设备类型下的所有设备.'],
-    componentProps: {
-      options: [
-        { label: TaskTargetNameEnum.DEVICES, value: TaskTargetEnum.DEVICES },
-        { label: TaskTargetNameEnum.PRODUCTS, value: TaskTargetEnum.PRODUCTS },
-      ],
+    componentProps: ({ formActionType, formModel }) => {
+      const { setFieldsValue } = formActionType;
+      return {
+        options: [
+          { label: TaskTargetNameEnum.DEVICES, value: TaskTargetEnum.DEVICES },
+          { label: TaskTargetNameEnum.PRODUCTS, value: TaskTargetEnum.PRODUCTS },
+        ],
+        onChange() {
+          setFieldsValue({
+            [FormFieldsEnum.EXECUTE_TARGET_DATA]: {
+              paramsOrg: formModel[FormFieldsEnum.ORGANIZATION_ID], //传递组织id到DevicePicker组件里进行组织过滤
+              change: true,
+            },
+            [FormFieldsEnum.DEVICE_PROFILE]: {
+              paramsOrg: formModel[FormFieldsEnum.ORGANIZATION_ID], //传递组织id到DevicePicker组件里进行组织过滤
+              change: true,
+            },
+          });
+        },
+      };
     },
     },
   },
   },
   {
   {
@@ -218,7 +263,7 @@ export const formSchemas: FormSchema[] = [
       const rules: Rule[] = [{ required: true, message: '请输入自定义数据流' }];
       const rules: Rule[] = [{ required: true, message: '请输入自定义数据流' }];
       return model[FormFieldsEnum.PUSH_WAY] === PushWayEnum.MQTT
       return model[FormFieldsEnum.PUSH_WAY] === PushWayEnum.MQTT
         ? [...rules, ...JSONEditorValidator()]
         ? [...rules, ...JSONEditorValidator()]
-        : rules;
+        : [...rules, { validator: validateTCPCustomCommand }];
     },
     },
     ifShow: ({ model }) => model[FormFieldsEnum.EXECUTE_CONTENT_TYPE] === TaskTypeEnum.CUSTOM,
     ifShow: ({ model }) => model[FormFieldsEnum.EXECUTE_CONTENT_TYPE] === TaskTypeEnum.CUSTOM,
     valueField: 'value',
     valueField: 'value',

 <script lang="ts" setup>
 <script lang="ts" setup>
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicModal, useModalInner } from '/@/components/Modal';
-  import { formSchemas } from './config';
+  import { FormFieldsEnum, formSchemas } from './config';
   import { nextTick, ref } from 'vue';
   import { nextTick, ref } from 'vue';
   import { composeData, parseData } from './util';
   import { composeData, parseData } from './util';
   import { createTask, updateTask } from '/@/api/task';
   import { createTask, updateTask } from '/@/api/task';
@@ -40,6 +40,18 @@
       if (record && mode === DataActionModeEnum.UPDATE) {
       if (record && mode === DataActionModeEnum.UPDATE) {
         const res = parseData(record);
         const res = parseData(record);
         setFieldsValue({ ...res });
         setFieldsValue({ ...res });
+        setFieldsValue({
+          [FormFieldsEnum.EXECUTE_TARGET_DATA]: {
+            ...res.executeTargetData,
+            paramsOrg: res.organizationId, //传递组织id到DevicePicker组件里进行组织过滤
+            change: false,
+          },
+          [FormFieldsEnum.DEVICE_PROFILE]: {
+            ...res.executeTargetData,
+            paramsOrg: res.organizationId, //传递组织id到DevicePicker组件里进行组织过滤
+            change: false,
+          },
+        });
       }
       }
     }
     }
   );
   );

@@ -92,10 +92,12 @@ export const composeData = (result: Required<FormValueType>): CreateTaskRecordTy
 
 
   return {
   return {
     name,
     name,
+    organizationId: result.organizationId,
     targetType,
     targetType,
     executeContent: {
     executeContent: {
       pushContent: {
       pushContent: {
-        rpcCommand: pushWay === PushWayEnum.MQTT ? JSON.parse(rpcCommand) : rpcCommand,
+        rpcCommand:
+          pushWay === PushWayEnum.TCP ? rpcCommand.replaceAll(/\s/g, '') : JSON.parse(rpcCommand),
       },
       },
       pushWay,
       pushWay,
       type: executeContentType,
       type: executeContentType,
@@ -126,6 +128,7 @@ export const parseData = (result: TaskRecordType): Required<FormValueType> => {
   const { type: executeTimeType, period, periodType, time, pollUnit } = executeTime;
   const { type: executeTimeType, period, periodType, time, pollUnit } = executeTime;
   return {
   return {
     name,
     name,
+    organizationId: result.organizationId,
     targetType,
     targetType,
     rpcCommand: pushWay === PushWayEnum.MQTT ? JSON.stringify(rpcCommand, null, 2) : rpcCommand,
     rpcCommand: pushWay === PushWayEnum.MQTT ? JSON.stringify(rpcCommand, null, 2) : rpcCommand,
     transportType: pushWay,
     transportType: pushWay,

@@ -19,6 +19,7 @@
       value?: Recordable;
       value?: Recordable;
       multiple?: boolean;
       multiple?: boolean;
       max?: 3;
       max?: 3;
+      paramsOrg?: string;
     }>(),
     }>(),
     {
     {
       value: () => ({}),
       value: () => ({}),
@@ -74,7 +75,7 @@
     handleChange(key, value, option);
     handleChange(key, value, option);
     emit('update:value', { ..._value });
     emit('update:value', { ..._value });
   };
   };
-  const [register, { setFieldsValue, getFieldsValue, resetFields }] = useForm({
+  const [register, { setFieldsValue, getFieldsValue, resetFields, updateSchema }] = useForm({
     schemas: [
     schemas: [
       {
       {
         field: FormFieldsEnum.DEVICE_TYPE,
         field: FormFieldsEnum.DEVICE_TYPE,
@@ -206,12 +207,45 @@
   watch(
   watch(
     () => props.value,
     () => props.value,
     () => {
     () => {
+      if (Reflect.has(props.value, 'paramsOrg')) {
+        const { paramsOrg, change } = props.value;
+        nextTick(() => {
+          updateOrgSchema(paramsOrg, change);
+        });
+      }
       setValue();
       setValue();
     },
     },
     {
     {
       immediate: true,
       immediate: true,
     }
     }
   );
   );
+
+  //更新组织，只能选择层级以下
+  const getOrganizationLevelList = async (organizationId) => {
+    const data = await getOrganizationList({ organizationId });
+    copyTransFun(data as any);
+    return data;
+  };
+
+  const updateOrgSchema = async (organizationId: string, change?: boolean) => {
+    const data = await getOrganizationLevelList(organizationId);
+    if (change) {
+      setFieldsValue({
+        [FormFieldsEnum.ORGANIZATION]: null,
+        [FormFieldsEnum.DEVICE]: [],
+      });
+    }
+    updateSchema({
+      field: FormFieldsEnum.ORGANIZATION,
+      componentProps: {
+        treeData: data,
+        onChange(value: string, option: Recordable) {
+          handleEmit(FormFieldsEnum.ORGANIZATION, value, option);
+        },
+      },
+    });
+  };
+  //
 </script>
 </script>
 
 
 <template>
 <template>

@@ -14,6 +14,7 @@
   const props = withDefaults(
   const props = withDefaults(
     defineProps<{
     defineProps<{
       value?: Recordable;
       value?: Recordable;
+      paramsOrg?: string;
     }>(),
     }>(),
     {
     {
       value: () => ({}),
       value: () => ({}),
@@ -42,7 +43,7 @@
     emit('update:value', { ..._value });
     emit('update:value', { ..._value });
   };
   };
 
 
-  const [register, { setFieldsValue, getFieldsValue, resetFields }] = useForm({
+  const [register, { setFieldsValue, getFieldsValue, resetFields, updateSchema }] = useForm({
     schemas: [
     schemas: [
       {
       {
         field: FormFieldsEnum.DEVICE_TYPE,
         field: FormFieldsEnum.DEVICE_TYPE,
@@ -135,12 +136,45 @@
   watch(
   watch(
     () => props.value,
     () => props.value,
     () => {
     () => {
+      if (Reflect.has(props.value, 'paramsOrg')) {
+        nextTick(() => {
+          const { paramsOrg, change } = props.value;
+          updateOrgSchema(paramsOrg, change);
+        });
+      }
       setValue();
       setValue();
     },
     },
     {
     {
       immediate: true,
       immediate: true,
     }
     }
   );
   );
+
+  //更新组织，只能选择层级以下
+  const getOrganizationLevelList = async (organizationId) => {
+    const data = await getOrganizationList({ organizationId });
+    copyTransFun(data as any);
+    return data;
+  };
+
+  const updateOrgSchema = async (organizationId: string, change?: boolean) => {
+    const data = await getOrganizationLevelList(organizationId);
+    if (change) {
+      setFieldsValue({
+        [FormFieldsEnum.ORGANIZATION]: null,
+        [FormFieldsEnum.DEVICE_PROFILE]: [],
+      });
+    }
+    updateSchema({
+      field: FormFieldsEnum.ORGANIZATION,
+      componentProps: {
+        treeData: data,
+        onChange(value: string, option: Recordable) {
+          handleEmit(FormFieldsEnum.ORGANIZATION, value, option);
+        },
+      },
+    });
+  };
+  //
 </script>
 </script>
 
 
 <template>
 <template>

@@ -14,6 +14,7 @@ export enum FormFieldsEnum {
   TASK_TYPE = 'taskType',
   TASK_TYPE = 'taskType',
   TARGET_IDS = 'targetIds',
   TARGET_IDS = 'targetIds',
   TASK_RECORD = 'taskRecord',
   TASK_RECORD = 'taskRecord',
+  TB_DEVICE_ID = 'tbDeviceId',
 }
 }
 
 
 export enum TargetType {
 export enum TargetType {
@@ -61,6 +62,12 @@ export const formSchemas: FormSchema[] = [
     },
     },
   },
   },
   {
   {
+    field: FormFieldsEnum.TB_DEVICE_ID,
+    component: 'Input',
+    label: '',
+    show: false,
+  },
+  {
     field: FormFieldsEnum.TARGET_IDS,
     field: FormFieldsEnum.TARGET_IDS,
     component: 'ApiSelect',
     component: 'ApiSelect',
     label: '指定目标设备',
     label: '指定目标设备',
@@ -68,6 +75,7 @@ export const formSchemas: FormSchema[] = [
     rules: [{ required: true, message: '请选择指定目标设备', type: 'array' }],
     rules: [{ required: true, message: '请选择指定目标设备', type: 'array' }],
     componentProps: ({ formModel }) => {
     componentProps: ({ formModel }) => {
       const record = JSON.parse(formModel[FormFieldsEnum.TASK_RECORD]) as TaskRecordType;
       const record = JSON.parse(formModel[FormFieldsEnum.TASK_RECORD]) as TaskRecordType;
+      const tbDeviceId = formModel[FormFieldsEnum.TB_DEVICE_ID];
       const isDevices = record.targetType === TaskTargetEnum.DEVICES;
       const isDevices = record.targetType === TaskTargetEnum.DEVICES;
       const { executeTarget } = record;
       const { executeTarget } = record;
       const { organizationId, data } = executeTarget;
       const { organizationId, data } = executeTarget;
@@ -79,6 +87,7 @@ export const formSchemas: FormSchema[] = [
               return result.data.map((item) => ({
               return result.data.map((item) => ({
                 label: item.alias || item.name,
                 label: item.alias || item.name,
                 value: item.tbDeviceId,
                 value: item.tbDeviceId,
+                disabled: tbDeviceId ? item.tbDeviceId !== tbDeviceId : false,
               }));
               }));
             } else {
             } else {
               const result = await getMeetTheConditionsDevice({
               const result = await getMeetTheConditionsDevice({

@@ -4,30 +4,54 @@
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { TaskTargetEnum, TaskTypeNameEnum } from '../../config';
   import { TaskTargetEnum, TaskTypeNameEnum } from '../../config';
-  import { FormValue, TargetType, formSchemas } from './config';
+  import { FormFieldsEnum, FormValue, TargetNameType, TargetType, formSchemas } from './config';
   import { unref } from 'vue';
   import { unref } from 'vue';
   import { immediateExecute } from '/@/api/task';
   import { immediateExecute } from '/@/api/task';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
   const props = defineProps<{
   const props = defineProps<{
     reload: Fn;
     reload: Fn;
+    fromOrigin?: boolean;
+    tbDeviceId?: string;
   }>();
   }>();
 
 
   defineEmits(['register']);
   defineEmits(['register']);
 
 
   const dataSource = ref<TaskRecordType>();
   const dataSource = ref<TaskRecordType>();
 
 
+  const updateExecuteTargetType = (options: Recordable[]) => {
+    updateSchema({
+      field: FormFieldsEnum.EXECUTE_TARGET_TYPE,
+      componentProps: {
+        options,
+      },
+    });
+  };
+
   const [registerModal, { closeModal }] = useModalInner((record: TaskRecordType) => {
   const [registerModal, { closeModal }] = useModalInner((record: TaskRecordType) => {
     resetFields();
     resetFields();
     dataSource.value = record;
     dataSource.value = record;
     if (record) {
     if (record) {
       setFieldsValue({ taskRecord: JSON.stringify(record) } as FormValue);
       setFieldsValue({ taskRecord: JSON.stringify(record) } as FormValue);
+      // 如果是从设备详情里面的任务进来的
+      if (props.fromOrigin) {
+        setFieldsValue({ tbDeviceId: props.tbDeviceId } as FormValue);
+        setFieldsValue({ [FormFieldsEnum.EXECUTE_TARGET_TYPE]: TargetType.ASSIGN } as FormValue);
+        setFieldsValue({ [FormFieldsEnum.TARGET_IDS]: [props.tbDeviceId] } as FormValue);
+        updateExecuteTargetType([{ label: TargetNameType.ASSIGN, value: TargetType.ASSIGN }]);
+      } else {
+        updateExecuteTargetType([
+          { label: TargetNameType.ALL, value: TargetType.ALL },
+          { label: TargetNameType.ASSIGN, value: TargetType.ASSIGN },
+        ]);
+      }
     }
     }
   });
   });
 
 
-  const [registerForm, { setFieldsValue, getFieldsValue, resetFields, validate }] = useForm({
-    schemas: formSchemas,
-    showActionButtonGroup: false,
-  });
+  const [registerForm, { setFieldsValue, getFieldsValue, resetFields, validate, updateSchema }] =
+    useForm({
+      schemas: formSchemas,
+      showActionButtonGroup: false,
+    });
 
 
   const composeData = (record: FormValue): ImmediateExecuteTaskType => {
   const composeData = (record: FormValue): ImmediateExecuteTaskType => {
     const { executeTarget, targetIds } = record;
     const { executeTarget, targetIds } = record;

@@ -154,10 +154,13 @@
       }
       }
 
 
       function handleResetPassword(record: Recordable) {
       function handleResetPassword(record: Recordable) {
-        resetPassword(record.id).then(() => {
-          createMessage.success('清空密码成功');
+        try {
+          resetPassword(record.id).then(() => {
+            createMessage.success('清空密码成功');
+          });
+        } finally {
           handleSuccess();
           handleSuccess();
-        });
+        }
       }
       }
       function handleSendMsg(record: Recordable) {
       function handleSendMsg(record: Recordable) {
         const req = new SendResetPasswordEmailMsg(record.id, MessageTypeEnum.PHONE_MESSAGE);
         const req = new SendResetPasswordEmailMsg(record.id, MessageTypeEnum.PHONE_MESSAGE);

@@ -84,6 +84,7 @@
         formConfig: {
         formConfig: {
           labelWidth: 120,
           labelWidth: 120,
           schemas: searchFormSchema,
           schemas: searchFormSchema,
+          actionColOptions: { span: 12 },
         },
         },
         useSearchForm: true,
         useSearchForm: true,
         showTableSetting: true,
         showTableSetting: true,

@@ -8,7 +8,7 @@ export enum MoreActionEvent {
 export enum VisualBoardPermission {
 export enum VisualBoardPermission {
   UPDATE = 'api:yt:data_board:update:update',
   UPDATE = 'api:yt:data_board:update:update',
   DELETE = 'api:yt:data_board:delete',
   DELETE = 'api:yt:data_board:delete',
-  CREATE = '',
+  CREATE = 'api:yt:data_board:add:post',
   SHARE = 'api:yt:data_board:share',
   SHARE = 'api:yt:data_board:share',
   DETAIL = 'api:yt:data_component:list',
   DETAIL = 'api:yt:data_component:list',
 }
 }

@@ -73,6 +73,7 @@
   <main class="w-full h-full flex flex-col justify-center items-center p-2">
   <main class="w-full h-full flex flex-col justify-center items-center p-2">
     <Spin :spinning="loading" wrapper-class-name="video-spin">
     <Spin :spinning="loading" wrapper-class-name="video-spin">
       <XGPlayer
       <XGPlayer
+        class="no-drag"
         :url="playUrl"
         :url="playUrl"
         :stream-type="playType"
         :stream-type="playType"
         :config="{ width: '100%', height: '100%' }"
         :config="{ width: '100%', height: '100%' }"

@@ -196,7 +196,7 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
               });
               });
             }
             }
           },
           },
-          getPopupContainer: () => document.body,
+          ...createPickerSearch(),
         };
         };
       },
       },
     },
     },