Merge branch 'sqy_dev' into 'main'

fix:修改平台账号角色回显问题，以及删除无用代码，优化代码

See merge request huang/yun-teng-iot-front!45

@@ -58,6 +58,7 @@ export interface RoleListItem {
   name: string;
   name: string;
   status: number;
   status: number;
   createTime: string;
   createTime: string;
+  roleType: string;
 }
 }
 
 
 export interface RoleReqDTO {
 export interface RoleReqDTO {

@@ -14,6 +14,7 @@ import {
   AccountListModel,
   AccountListModel,
   RoleOrOrganizationParam,
   RoleOrOrganizationParam,
   ChangeAccountParams,
   ChangeAccountParams,
+  RoleListItem,
 } from './model/systemModel';
 } from './model/systemModel';
 import { defHttp } from '/@/utils/http/axios';
 import { defHttp } from '/@/utils/http/axios';
 
 
@@ -79,20 +80,30 @@ export const getRoleListByPage = (params?: RolePageParams) =>
 export const getTenantRoleListByPage = (params?: RolePageParams) =>
 export const getTenantRoleListByPage = (params?: RolePageParams) =>
   defHttp.get<RolePageListGetResultModel>({ url: Api.RolePageList, params });
   defHttp.get<RolePageListGetResultModel>({ url: Api.RolePageList, params });
 
 
-export const getAllRoleList = (params?: RoleParams) =>
-  defHttp.post<RoleListGetResultModel>({ url: Api.GetAllRoleList, params });
+export const getAllRoleList = async (params?: RoleParams) => {
+  return defHttp.post<RoleListGetResultModel>({ url: Api.GetAllRoleList, params });
+};
 
 
-export const setRoleStatus = (id: number, status: number) =>
-  defHttp.put({ url: Api.setRoleStatus + id + '/' + status });
-export const saveOrUpdateRoleInfoWithMenu = async (roleRequestDto: RoleReqDTO) => {
-  await defHttp.post({ url: Api.SaveOrUpdateRoleInfoWithMenu, params: roleRequestDto });
+// 过滤角色列表----过滤掉不是PLATFORM_ADMIN的角色
+export const filterRoleList = async (params?: RoleParams) => {
+  const res = await defHttp.post<RoleListGetResultModel>({ url: Api.GetAllRoleList, params });
+  const options = res.filter((item) => item.roleType === 'PLATFORM_ADMIN');
+  return Promise.resolve<RoleListItem[]>(options);
 };
 };
 
 
-export const isAccountExist = (account: string) =>
-  defHttp.get({ url: Api.IsAccountExist + account }, { errorMessageMode: 'none' });
+export const setRoleStatus = (id: number, status: number) => {
+  return defHttp.put({ url: Api.setRoleStatus + id + '/' + status });
+};
+export const saveOrUpdateRoleInfoWithMenu = (roleRequestDto: RoleReqDTO) => {
+  return defHttp.post({ url: Api.SaveOrUpdateRoleInfoWithMenu, params: roleRequestDto });
+};
+
+export const isAccountExist = (account: string) => {
+  return defHttp.get({ url: Api.IsAccountExist + account }, { errorMessageMode: 'none' });
+};
 
 
-export const delRole = async (roleIds: string[]) => {
-  await defHttp.delete({ url: Api.DeleteRole, params: roleIds });
+export const delRole = (roleIds: string[]) => {
+  return defHttp.delete({ url: Api.DeleteRole, params: roleIds });
 };
 };
 
 
 /**
 /**

-<template>
-  <div class="lg:flex">
-    <Avatar :src="userinfo.avatar || headerImg" :size="72" class="!mx-auto !block" />
-    <div class="md:ml-6 flex flex-col justify-center md:mt-0 mt-2">
-      <h1 class="md:text-lg text-md">早安, {{ userinfo.realName }}, 开始您一天的工作吧！</h1>
-      <span class="text-secondary"> 今日晴，20℃ - 32℃！ </span>
-    </div>
-    <div class="flex flex-1 justify-end md:mt-0 mt-4">
-      <div class="flex flex-col justify-center text-right">
-        <span class="text-secondary"> 待办 </span>
-        <span class="text-2xl">2/10</span>
-      </div>
-
-      <div class="flex flex-col justify-center text-right md:mx-16 mx-12">
-        <span class="text-secondary"> 项目 </span>
-        <span class="text-2xl">8</span>
-      </div>
-      <div class="flex flex-col justify-center text-right md:mr-10 mr-4">
-        <span class="text-secondary"> 团队 </span>
-        <span class="text-2xl">300</span>
-      </div>
-    </div>
-  </div>
-</template>
-<script lang="ts" setup>
-  import { computed } from 'vue';
-  import { Avatar } from 'ant-design-vue';
-  import { useUserStore } from '/@/store/modules/user';
-  import headerImg from '/@/assets/images/header.jpg';
-
-  const userStore = useUserStore();
-  const userinfo = computed(() => userStore.getUserInfo);
-</script>

 <template>
 <template>
-  <div class="md:flex">
+  <div class="md:flex justify-between">
     <template v-for="(item, index) in growCardList" :key="item.title">
     <template v-for="(item, index) in growCardList" :key="item.title">
       <div
       <div
-        class="growCardItem md:w-1/3 w-full !md:mt-0 !mt-4 !md:mr-4"
-        :class="[index + 1 < 3 && '!md:mr-4']"
+        class="growCardItem md:w-1/3 w-full !md:mt-0 !mt-4"
+        :class="index === 0 ? '!md:ml-0' : '!md:ml-4'"
       >
       >
         <div class="growCardItem-top">
         <div class="growCardItem-top">
           <img :src="item.imgUrl" style="width: 90px; height: 90px" />
           <img :src="item.imgUrl" style="width: 90px; height: 90px" />

@@ -20,7 +20,6 @@
   import { DescDetailSchema } from './config.d';
   import { DescDetailSchema } from './config.d';
   import {
   import {
     noticeByIdGetInfo,
     noticeByIdGetInfo,
-    notifyMyGetrReadApi,
     notifyMyGetDetailApi,
     notifyMyGetDetailApi,
   } from '/@/api/stationnotification/stationnotifyApi';
   } from '/@/api/stationnotification/stationnotifyApi';
   export default defineComponent({
   export default defineComponent({
@@ -42,7 +41,6 @@
         data: dataSource,
         data: dataSource,
       });
       });
       const handleClose = async () => {
       const handleClose = async () => {
-        console.log(dataSource.value);
         await notifyMyGetDetailApi(dataSource.value.id);
         await notifyMyGetDetailApi(dataSource.value.id);
         emit('success');
         emit('success');
       };
       };

@@ -63,7 +63,6 @@
           rowId.value = data.record.id;
           rowId.value = data.record.id;
           const roleParams = new RoleOrOrganizationParam(rowId.value, true, false);
           const roleParams = new RoleOrOrganizationParam(rowId.value, true, false);
           findCurrentUserRelation(roleParams).then((result) => {
           findCurrentUserRelation(roleParams).then((result) => {
-            console.log(result);
             Reflect.set(data.record, 'roleIds', result);
             Reflect.set(data.record, 'roleIds', result);
             Reflect.set(data.record, 'password', '******');
             Reflect.set(data.record, 'password', '******');
             setFieldsValue(data.record);
             setFieldsValue(data.record);
@@ -84,7 +83,6 @@
         try {
         try {
           const { createMessage } = useMessage();
           const { createMessage } = useMessage();
           const values = await validate();
           const values = await validate();
-          console.log(values);
           values.accountExpireTime =
           values.accountExpireTime =
             typeof values.accountExpireTime != 'undefined' && values.accountExpireTime != null
             typeof values.accountExpireTime != 'undefined' && values.accountExpireTime != null
               ? values.accountExpireTime.format('YYYY-MM-DD HH:mm:ss')
               ? values.accountExpireTime.format('YYYY-MM-DD HH:mm:ss')

-import { getAllRoleList, isAccountExist } from '/@/api/system/system';
+import { filterRoleList, isAccountExist } from '/@/api/system/system';
 import { BasicColumn } from '/@/components/Table';
 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
 import { emailRule, phoneRule, ChineseRegexp, EmailRegexp } from '/@/utils/rules';
 import { emailRule, phoneRule, ChineseRegexp, EmailRegexp } from '/@/utils/rules';
@@ -116,7 +116,7 @@ export const accountFormSchema: FormSchema[] = [
     colProps: { span: 12 },
     colProps: { span: 12 },
     componentProps: {
     componentProps: {
       mode: 'multiple',
       mode: 'multiple',
-      api: getAllRoleList,
+      api: filterRoleList,
       labelField: 'name',
       labelField: 'name',
       valueField: 'id',
       valueField: 'id',
     },
     },
@@ -127,7 +127,6 @@ export const accountFormSchema: FormSchema[] = [
         type: 'array',
         type: 'array',
       },
       },
     ],
     ],
-    required: true,
   },
   },
   {
   {
     label: '手机号',
     label: '手机号',

@@ -44,8 +44,6 @@
           await setFieldsValue({
           await setFieldsValue({
             ...data.record,
             ...data.record,
           });
           });
-        }
-        if (isUpdate.value) {
           organizationId = Reflect.get(data.record, 'id');
           organizationId = Reflect.get(data.record, 'id');
         }
         }
         let treeData = await getOrganizationList();
         let treeData = await getOrganizationList();
@@ -70,7 +68,10 @@
           if (isUpdate.value) {
           if (isUpdate.value) {
             Reflect.set(values, 'id', organizationId);
             Reflect.set(values, 'id', organizationId);
           }
           }
-          await saveOrUpdateOrganization(values, isUpdate.value);
+          await saveOrUpdateOrganization(
+            { ...values, parentId: values.parentId ?? null },
+            isUpdate.value
+          );
           closeDrawer(); //关闭侧框
           closeDrawer(); //关闭侧框
           emit('success');
           emit('success');
         } finally {
         } finally {

@@ -82,6 +82,7 @@
         resetFields();
         resetFields();
         roleId.value = '';
         roleId.value = '';
         setDrawerProps({ confirmLoading: false });
         setDrawerProps({ confirmLoading: false });
+        isUpdate.value = data.isUpdate;
         // 需要在setFieldsValue之前先填充treeData，否则Tree组件可能会报key not exist警告
         // 需要在setFieldsValue之前先填充treeData，否则Tree组件可能会报key not exist警告
         if (unref(treeData).length === 0) {
         if (unref(treeData).length === 0) {
           // 获取全部的菜单
           // 获取全部的菜单