Merge branch 'ft-dev' into 'main'

fix:修复账号管理中的用户详情，点击跳转404问题

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

 <template>
 <template>
   <div>
   <div>
-    <PageWrapper :title="`用户资料`" contentBackground @back="goBack">
-      <Description size="middle" @register="register" />
-    </PageWrapper>
+    <BasicModal
+      width="650px"
+      v-bind="$attrs"
+      @register="registerModal"
+      :title="getTitle"
+      @ok="handleSubmit"
+    >
+      <PageWrapper :title="`用户资料`" contentBackground @back="goBack">
+        <Description size="middle" @register="register" />
+      </PageWrapper>
+    </BasicModal>
   </div>
   </div>
 </template>
 </template>
 
 
 <script>
 <script>
-  import { defineComponent } from 'vue';
-  import { useRoute } from 'vue-router';
+  import { defineComponent, ref } from 'vue';
+  // import { useRoute } from 'vue-router';
   import { PageWrapper } from '/@/components/Page';
   import { PageWrapper } from '/@/components/Page';
   import { useGo } from '/@/hooks/web/usePage';
   import { useGo } from '/@/hooks/web/usePage';
   import { Description } from '../../../components/Description';
   import { Description } from '../../../components/Description';
@@ -16,14 +24,18 @@
   import { getAccountInfo } from '../../../api/system/system';
   import { getAccountInfo } from '../../../api/system/system';
   import { accountSchema } from './account.detail.data';
   import { accountSchema } from './account.detail.data';
   import { useDescription } from '../../../components/Description';
   import { useDescription } from '../../../components/Description';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+
   const accountData = {};
   const accountData = {};
   export default defineComponent({
   export default defineComponent({
     name: 'AccountDetail',
     name: 'AccountDetail',
-    components: { PageWrapper, Description },
+    components: { PageWrapper, Description, BasicModal },
     setup() {
     setup() {
-      const route = useRoute();
+      // const route = useRoute();
       const go = useGo();
       const go = useGo();
       const { setTitle } = useTabs();
       const { setTitle } = useTabs();
+      const getId = ref('');
+      const getTitle = ref('');
       const [register, methods] = useDescription({
       const [register, methods] = useDescription({
         title: '账号基础信息',
         title: '账号基础信息',
         data: accountData,
         data: accountData,
@@ -31,30 +43,35 @@
         schema: accountSchema,
         schema: accountSchema,
         column: 3,
         column: 3,
       });
       });
-      getAccountInfo(route.params?.id).then((result) => {
-        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);
-        Reflect.set(accountData, 'deptId', result.deptId);
-        // 设置Tab的标题（不会影响页面标题）
-        setTitle('详情：用户' + result.realName);
-        methods.setDescProps(accountData);
+
+      const [registerModal] = useModalInner(async (data) => {
+        getId.value = await data.record.id;
+        getAccountInfo(getId.value).then((result) => {
+          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);
+          Reflect.set(accountData, 'deptId', result.deptId);
+          // 设置Tab的标题（不会影响页面标题）
+          setTitle('详情：用户' + result.realName);
+          getTitle.value = '详情：用户' + result.realName;
+          methods.setDescProps(accountData);
+        });
       });
       });
       // 页面左侧点击返回链接时的操作
       // 页面左侧点击返回链接时的操作
       function goBack() {
       function goBack() {
         // 本例的效果时点击返回始终跳转到账号列表页，实际应用时可返回上一页
         // 本例的效果时点击返回始终跳转到账号列表页，实际应用时可返回上一页
         go('/system/account');
         go('/system/account');
       }
       }
-      return { goBack, accountSchema, accountData, register };
+      return { goBack, accountSchema, accountData, register, registerModal, getTitle };
     },
     },
   });
   });
 </script>
 </script>

@@ -62,6 +62,7 @@
         </template>
         </template>
       </BasicTable>
       </BasicTable>
       <AccountModal @register="registerModal" @success="handleSuccess" />
       <AccountModal @register="registerModal" @success="handleSuccess" />
+      <AccountDetail @register="registerDetailModal" @success="handleSuccess" />
     </PageWrapper>
     </PageWrapper>
   </div>
   </div>
 </template>
 </template>
@@ -74,17 +75,26 @@
   import { Tag } from 'ant-design-vue';
   import { Tag } from 'ant-design-vue';
   import { useModal } from '/@/components/Modal';
   import { useModal } from '/@/components/Modal';
   import AccountModal from './AccountModal.vue';
   import AccountModal from './AccountModal.vue';
-
+  import AccountDetail from './AccountDetail.vue';
   import { columns, searchFormSchema } from './account.data';
   import { columns, searchFormSchema } from './account.data';
-  import { useGo } from '/@/hooks/web/usePage';
+  // import { useGo } from '/@/hooks/web/usePage';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
 
 
   export default defineComponent({
   export default defineComponent({
     name: 'AccountManagement',
     name: 'AccountManagement',
-    components: { BasicTable, PageWrapper, OrganizationIdTree, AccountModal, TableAction, Tag },
+    components: {
+      BasicTable,
+      PageWrapper,
+      OrganizationIdTree,
+      AccountModal,
+      TableAction,
+      Tag,
+      AccountDetail,
+    },
     setup() {
     setup() {
-      const go = useGo();
+      // const go = useGo();
       const [registerModal, { openModal }] = useModal();
       const [registerModal, { openModal }] = useModal();
+      const [registerDetailModal, { openModal: openDetailModal }] = useModal();
       const { createMessage } = useMessage();
       const { createMessage } = useMessage();
       let searchInfo = reactive<Recordable>({});
       let searchInfo = reactive<Recordable>({});
       const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
       const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
@@ -147,10 +157,14 @@
       }
       }
 
 
       function handleView(record: Recordable) {
       function handleView(record: Recordable) {
-        go('/system/account_detail/' + record.id);
+        openDetailModal(true, {
+          record,
+        });
+        // go('/system/account_detail/' + record.id);
       }
       }
 
 
       return {
       return {
+        registerDetailModal,
         registerTable,
         registerTable,
         registerModal,
         registerModal,
         handleCreate,
         handleCreate,