合并系统后退出登录，修改密码等功能问题修改

lihua
Showing 18 changed files with 76 additions and 89 deletions
.env.development
.env.product
components.d.ts
src/api/modules/dataBasic.ts
src/assets/images/logo.png
src/components/Drawer/index.vue
src/components/Retrievepassword/index.vue
src/layouts/components/Header/index.vue
src/layouts/components/Tools/index.vue
src/layouts/index.vue
src/router/index.ts
src/settings.ts
src/store/modules/idaas.ts
src/store/modules/user.ts
src/types/components.d.ts
src/views/[...all].vue
src/views/data_basic/userManagement.vue
src/views/login.vue
--- a/.env.development
View file @afaa854
+++ b/.env.development
View file @afaa854
 # 页面标题
-VITE_APP_TITLE = 可信数据服务平台
+VITE_APP_TITLE = 可信空间接入连接器
 # 接口域名
 # VITE_API_BASEURL = https://www.zgsjzc.com/api
 # VITE_API_BASEURL = https://swzl-test.csbr.cn/api
 #  VITE_API_BASEURL = http://localhost:9000
-VITE_API_BASEURL = http://10.4.82.30:58053/
+VITE_API_BASEURL = http://10.4.82.18:8053/
-VITE_IDASS_BASEURL = https://idaas-test.csbr.cn/login
 # idaas测试环境
 VITE_API_IDAAS_URL = http://114.115.131.96:18080
--- a/.env.product
View file @afaa854
+++ b/.env.product
View file @afaa854
 # 页面标题
-VITE_APP_TITLE = 可信数据服务平台
+VITE_APP_TITLE = 可信空间接入连接器
 # 接口域名
 VITE_API_BASEURL = http://192.168.6.20:58052/
 # VITE_API_BASEURL = http://49.4.26.201:31709/
-VITE_IDASS_BASEURL = https://develop.zgsjzc.com/login
+# 可信空间连接器通用的平台用户接口地址
+VITE_API_COMMON_URL = ms-connector-trust-data-space-service
 # # 平台用户 接口请地址
 # VITE_APP_USER_API_BASEURL = gateway-server
--- a/components.d.ts
View file @afaa854
+++ b/components.d.ts
View file @afaa854
@@ -23,23 +23,18 @@ declare module '@vue/runtime-core' {
    Dialog_pane: typeof import('./src/components/Dialog/dialog_pane.vue')['default']
    DialogPlus: typeof import('./src/components/DialogPlus/src/DialogPlus.vue')['default']
    Drawer: typeof import('./src/components/Drawer/index.vue')['default']
-    EchartsMap: typeof import('./src/components/EchartsMap/index.vue')['default']
    Editor: typeof import('./src/components/Editor/src/Editor.vue')['default']
    EllipsisTooltip: typeof import('./src/components/EllipsisTooltip.vue')['default']
    FileUpload: typeof import('./src/components/FileUpload/index.vue')['default']
-    FixedActionBar: typeof import('./src/components/FixedActionBar/index.vue')['default']
    Form: typeof import('./src/components/Form/index.vue')['default']
    FormItem: typeof import('./src/components/FormItem/FormItem.vue')['default']
    FormPlus: typeof import('./src/components/FormPlus/src/FormPlus.vue')['default']
-    GraphTopbar: typeof import('./src/components/RelationNetwork/graphTopbar.vue')['default']
-    Header: typeof import('./src/components/Header/index.vue')['default']
    Hour: typeof import('./src/components/Schedule/component/hour.vue')['default']
    ImagePreview: typeof import('./src/components/ImagePreview/index.vue')['default']
    ImagesUpload: typeof import('./src/components/ImagesUpload/index.vue')['default']
    ImageUpload: typeof import('./src/components/ImageUpload/index.vue')['default']
    LineageGraph: typeof import('./src/components/LineageGraph/index.vue')['default']
    ListPanel: typeof import('./src/components/ListPanel/index.vue')['default']
-    Logo: typeof import('./src/components/Logo/index.vue')['default']
    LookBpmn: typeof import('./src/components/ApprovalProcess/src/components/LookBpmn.vue')['default']
    Month: typeof import('./src/components/Schedule/component/month.vue')['default']
    NotAllowed: typeof import('./src/components/NotAllowed/index.vue')['default']
@@ -50,25 +45,19 @@ declare module '@vue/runtime-core' {
    PasswordStrengthMeter: typeof import('./src/components/PasswordStrengthMeter/index.vue')['default']
    PcasCascader: typeof import('./src/components/PcasCascader/index.vue')['default']
    Popover: typeof import('./src/components/Popover/index.vue')['default']
-    RelationNetwork: typeof import('./src/components/RelationNetwork/index.vue')['default']
    Retrievepassword: typeof import('./src/components/Retrievepassword/index.vue')['default']
    RouterLink: typeof import('vue-router')['RouterLink']
    RouterView: typeof import('vue-router')['RouterView']
    Schedule: typeof import('./src/components/Schedule/index.vue')['default']
    SearchBar: typeof import('./src/components/SearchBar/index.vue')['default']
    SecondAndMinute: typeof import('./src/components/Schedule/component/secondAndMinute.vue')['default']
-    SelectPersonnel: typeof import('./src/components/SelectPersonnel/src/SelectPersonnel.vue')['default']
    SplitPane: typeof import('./src/components/SplitPane/index.vue')['default']
    StepBar: typeof import('./src/components/StepBar/index.vue')['default']
    SvgIcon: typeof import('./src/components/SvgIcon/index.vue')['default']
-    SystemInfo: typeof import('./src/components/SystemInfo/index.vue')['default']
    Table: typeof import('./src/components/Table/index.vue')['default']
-    Table_s2: typeof import('./src/components/Antv/table_s2.vue')['default']
-    Table_s2_vue: typeof import('./src/components/Antv/table_s2_vue.vue')['default']
    Table_search: typeof import('./src/components/Tools/table_search.vue')['default']
    Table_tools: typeof import('./src/components/Tools/table_tools.vue')['default']
    Table_v2: typeof import('./src/components/Table/table_v2.vue')['default']
-    TableActions: typeof import('./src/components/TablePlus/src/components/TableActions.vue')['default']
    Tabs: typeof import('./src/components/Tabs/index.vue')['default']
    Toolbar: typeof import('./src/components/LineageGraph/toolbar.vue')['default']
    Topbar: typeof import('./src/components/LineageGraph/topbar.vue')['default']
@@ -77,7 +66,6 @@ declare module '@vue/runtime-core' {
    Tree_v2: typeof import('./src/components/Tree/tree_v2.vue')['default']
    TreeTransfer: typeof import('./src/components/TreeTransfer/index.vue')['default']
    TreeTransferChecked: typeof import('./src/components/TreeTransferChecked/index.vue')['default']
-    Trend: typeof import('./src/components/Trend/index.vue')['default']
    Upload: typeof import('./src/components/Upload/index.vue')['default']
    UploadExcelFile: typeof import('./src/components/FileUpload/uploadExcelFile.vue')['default']
    Week: typeof import('./src/components/Schedule/component/week.vue')['default']
--- a/src/api/modules/dataBasic.ts
View file @afaa854
+++ b/src/api/modules/dataBasic.ts
View file @afaa854
@@ -3,52 +3,52 @@ import { ElMessage } from "element-plus";
 /** 获取租户列表（分页） */
 export const getTenantSinglePage = (params) => request({
-  url: `${import.meta.env.VITE_APP_PERSONAL_URL}/tenant/single-page`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/tenant/single-page`,
  method: 'post',
  data: params
 })
 /** 删除租户 */
 export const removeTenant = (data) => request({
-  url: `${import.meta.env.VITE_APP_PERSONAL_URL}/tenant/remove`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/tenant/remove`,
  method: 'delete',
  data
 })
 export const addTenant = (params) => request({
-  url: `${import.meta.env.VITE_APP_PERSONAL_URL}/tenant/update`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/tenant/update`,
  method: 'post',
  data: params
 })
 export const updateTenant = (params) => request({
-  url: `${import.meta.env.VITE_APP_PERSONAL_URL}/tenant/update`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/tenant/update`,
  method: 'put',
  data: params
 })
 /** 更新租户状态 */
 export const updateTenantState = (guid, state: string = 'Y') => request({
-  url: `${import.meta.env.VITE_APP_PERSONAL_URL}/tenant/update-state?tenantGuid=${guid}&state=${state}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/tenant/update-state?tenantGuid=${guid}&state=${state}`,
  method: 'get'
 })
 /** 获取会员进度列表 */
 export const getMemberGressList = (params) => request({
-  url: `${import.meta.env.VITE_APP_PERSONAL_URL}/pending-task/page-list`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/pending-task/page-list`,
  method: 'post',
  data: params
 })
 /** 获取任务执行日志 */
 export const getTaskExecutionLog = (guid) => request({
-  url: `${import.meta.env.VITE_APP_PERSONAL_URL}/pending-task/task-info?guid=${guid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/pending-task/task-info?guid=${guid}`,
  method: 'get'
 })
 /** 任务重启 */
 export const getTaskRestart = (guid) => request({
-  url: `${import.meta.env.VITE_APP_PERSONAL_URL}/pending-task/restart?guid=${guid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/pending-task/restart?guid=${guid}`,
  method: 'get'
 })
@@ -58,13 +58,13 @@ export const getTaskRestart = (guid) => request({
 * @returns
 */
 export const getOrganisationTreeList =  (params) => request({
-  url: `${import.meta.env.VITE_APP_PERSONAL_URL}/organisation/get-tree-list`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/organisation/get-tree-list`,
  method: 'post',
  data: params
 })
 export const removeOrganisation = (guids) => request({
-  url: `${import.meta.env.VITE_APP_PERSONAL_URL}/organisation/removeListByGuids`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/organisation/removeListByGuids`,
  method: 'delete',
  data: guids
 })
@@ -76,7 +76,7 @@ export const removeOrganisation = (guids) => request({
 * @returns
 */
 export const getOrganisationListApi = (params) => request({
-  url: `${import.meta.env.VITE_APP_PERSONAL_URL}/organisation/singlePage`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/organisation/singlePage`,
  method: 'post',
  data: params
 })
@@ -87,7 +87,7 @@ export const getOrganisationListApi = (params) => request({
 * @returns
 */
 export const updateOrganisation= (params) =>  request({
-  url: `${import.meta.env.VITE_APP_PERSONAL_URL}/organisation/update`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/organisation/update`,
  method: 'put',
  data: params
 });
@@ -98,7 +98,7 @@ export const updateOrganisation= (params) =>  request({
 * @returns
 */
 export const addOrganisation = (params) => request({
-  url: `${import.meta.env.VITE_APP_PERSONAL_URL}/organisation/save`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/organisation/save`,
  method: 'post',
  data: params
 });
@@ -109,7 +109,7 @@ export const addOrganisation = (params) => request({
 * @returns
 */
 export const getStaff = (params) => request({
-  url: `${import.meta.env.VITE_APP_PERSONAL_URL}/staff/singlePage`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/staff/singlePage`,
  method: 'post',
  data: params
 });
@@ -120,7 +120,7 @@ export const getStaff = (params) => request({
 * @returns
 */
 export const removeStaff = (guids:string[]) =>  request({
-  url: `${import.meta.env.VITE_APP_PERSONAL_URL}/staff/removeListByGuids`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/staff/removeListByGuids`,
  method: 'delete',
  data: guids
 })
@@ -154,13 +154,13 @@ export const getOrganisationRelTreeListPromise = (tenantGuid:string):Promise<any
 * @returns
 */
 export const getOrganisationRelTreeList = (param:{tenantGuid:string}) => request({
-  url: `${import.meta.env.VITE_APP_PERSONAL_URL}/organisation/tree-list`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/organisation/tree-list`,
  method: 'post',
  data: param
 });
 export const resetPwd2 = (userGuid) => request({
-  url: `${import.meta.env.VITE_APP_PERSONAL_URL}/user/data/resetPwd?userGuid=${userGuid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/user/data/resetPwd?userGuid=${userGuid}`,
  method: 'put'
 });
@@ -193,7 +193,7 @@ export const getTemplateListPromise = (customParam?: {}): Promise<any> => {
 * @returns
 */
 export const getStaffDetail = (guid: string) => request({
-  url: `${import.meta.env.VITE_APP_PERSONAL_URL}/staff/getByGuid/${guid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/staff/getByGuid/${guid}`,
  method: 'get'
 });
@@ -203,7 +203,7 @@ export const getStaffDetail = (guid: string) => request({
 * @returns
 */
 export const getOrganisationTree = (tenantGuid:string) => request({
-  url: `${import.meta.env.VITE_APP_PERSONAL_URL}/organisation/get-tenant-organisation-staff-tree?tenantGuid=${tenantGuid}`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/organisation/get-tenant-organisation-staff-tree?tenantGuid=${tenantGuid}`,
  method: 'get'
 });
@@ -213,7 +213,7 @@ export const getOrganisationTree = (tenantGuid:string) => request({
 * @returns
 */
 export const addorUpdateStaff = (param) =>  request({
-  url: `${import.meta.env.VITE_APP_PERSONAL_URL}/staff/save-or-update`,
+  url: `${import.meta.env.VITE_API_COMMON_URL}/staff/save-or-update`,
  method: 'put',
  data: param
 });
\ No newline at end of file
--- a/src/assets/images/logo.png
View file @afaa854
+++ b/src/assets/images/logo.png
View file @afaa854
--- a/src/components/Drawer/index.vue
View file @afaa854
+++ b/src/components/Drawer/index.vue
View file @afaa854
@@ -70,24 +70,10 @@ const drawerModalClass = computed(() => {
 const drawerSize = computed(() => {
  return props.drawerInfo.size ?? "30%";
 });
-const drawerType = computed(() => {
-  return props.drawerInfo.type ?? "form";
-});
 const drawerTitle = computed(() => {
  return props.drawerInfo.header.title;
 });
-const selectOptions = computed(() => {
-  return props.drawerInfo.container.relateOptions ?? [];
-});
-const formItems = computed(() => {
-  return props.drawerInfo.container.formItems ?? [];
-});
-const formRules = computed(() => {
-  return props.drawerInfo.container.rules ?? {};
-});
-const selectData = computed(() => {
-  return props.drawerInfo.container.selectData ?? [];
-});
 const contents = computed(() => {
  return props.drawerInfo.container.contents ?? [];
 });
--- a/src/components/Retrievepassword/index.vue
View file @afaa854
+++ b/src/components/Retrievepassword/index.vue
View file @afaa854
@@ -81,6 +81,10 @@ import {
 import useLogin from '@/store/modules/login'
 import PasswordStrengthMeter from '../PasswordStrengthMeter/index.vue'
 import { autoSalt } from '@/utils/common';
+import useUserStore from "@/store/modules/user";
+const userStore = useUserStore();
+const userData = JSON.parse(userStore.userData)
 // const AsyncPasswordStrengthMeter = defineAsyncComponent(() =>
 //   import('../PasswordStrengthMeter/index.vue')
@@ -90,8 +94,8 @@ const loginStore = useLogin()
 const idaasStore = useIdaasStore()
 const { required, phone } = useValidator();
 const { proxy } = getCurrentInstance() as any;
-const mobileNo = computed(()=> idaasStore.idaasUserInfo.principal?.mobileNo || '')
+const mobileNo = computed(()=> idaasStore.idaasUserInfo.principal?.mobileNo || userData.mobileNo || '')
-const logonUser = computed(()=> idaasStore.idaasUserInfo.principal?.logonUser || '')
+const logonUser = computed(()=> idaasStore.idaasUserInfo.principal?.logonUser || localStorage.getItem('logonUser') || '')
 const props = defineProps({
  schemaInfo: {
--- a/src/layouts/components/Header/index.vue
View file @afaa854
+++ b/src/layouts/components/Header/index.vue
View file @afaa854
@@ -74,12 +74,12 @@ const handleShowMessage = () => {
            </template>
          </div>
        </div>
-        <div class="message-setting" @click=handleShowMessage>
+        <!-- <div class="message-setting" @click=handleShowMessage>
          <span v-show="noFinishCnt > 0" class="msg-cnt">{{ noFinishCnt > 99 ? '99+' : noFinishCnt }}</span>
          <el-icon class="message-notify">
            <svg-icon name="message" />
          </el-icon>
-        </div>
+        </div> -->
        <Tools />
      </div>
    </header>
--- a/src/layouts/components/Tools/index.vue
View file @afaa854
+++ b/src/layouts/components/Tools/index.vue
View file @afaa854
 <script lang="ts" setup name="Tools">
-import { useFullscreen } from '@vueuse/core'
 import eventBus from '@/utils/eventBus'
 import useSettingsStore from '@/store/modules/settings'
 import useUserStore from '@/store/modules/user'
 import { USERROLE } from '@/utils/enum'
-import { ElMessage } from 'element-plus'
+import { ElMessage } from 'element-plus';
+import Retrievepassword from '@/components/Retrievepassword/index.vue'
 const router = useRouter()
 const settingsStore = useSettingsStore()
 const userStore = useUserStore()
 const userData = JSON.parse(userStore.userData);
 const mainPage = useMainPage()
-const { isFullscreen, toggle } = useFullscreen()
+const { proxy } = getCurrentInstance() as any;
+// ! 修改密码逻辑
+const retrievepassword = ref({
+  visible: false,
+})
 const dataRole = computed(() => {
  return localStorage.getItem('userRole');
@@ -32,15 +39,15 @@ function userCommand(command: 'home' | 'setting' | 'updatePwd' | 'hotkeys' | 'lo
      })
      break
    case 'updatePwd':
-      router.push({
+      retrievepassword.value.visible = true;
-        name: 'personalEditPassword',
-      })
      break
    case 'hotkeys':
      eventBus.emit('global-hotkeys-intro-toggle')
      break
    case 'logout':
+      proxy.$openMessageBox("确定要退出登录吗？", () => {
        userStore.logout()
+      })
      break
    case 'changeRole':
      selectRole.value = dataRole.value;
@@ -48,9 +55,8 @@ function userCommand(command: 'home' | 'setting' | 'updatePwd' | 'hotkeys' | 'lo
      break;
  }
 }
-function pro() {
-  window.open('https://hooray.gitee.io/fantastic-admin-pro-example/', '_blank')
-}
 const loaclStorageInfo: any = localStorage.getItem("userData")
 onMounted(() => {
  console.log('mounted', JSON.parse(userStore.userData).abbreviation)
@@ -159,6 +165,17 @@ const verifyDialogBtnClick = (btn, info) => {
          </div>
        </div>
        <div class="horizontal-line"></div>
+        <div class="user-setting-menu">
+          <div class="menu-wrapper" @click="userCommand('updatePwd')">
+            <span class="color-21">修改密码</span>
+            <span>
+              <el-icon>
+                <svg-icon name="ep:arrow-right" />
+              </el-icon>
+            </span>
+          </div>
+        </div>
+        <div class="horizontal-line"></div>
        <div class="login-out">
          <div class="login-out-btn" @click="userCommand('logout')">
            {{ '退出登录' }}
@@ -167,6 +184,7 @@ const verifyDialogBtnClick = (btn, info) => {
      </template>
    </el-popover>
+        <Retrievepassword :schemaInfo="retrievepassword"></Retrievepassword>
 <teleport to="body" v-if="verifyDialogInfo.visible">
  <Dialog :dialogInfo="verifyDialogInfo" @btnClick="verifyDialogBtnClick">
--- a/src/layouts/index.vue
View file @afaa854
+++ b/src/layouts/index.vue
View file @afaa854
@@ -308,8 +308,8 @@ const getMsgCnt = () => {
 }
 onMounted(() => {
-  getMsgCnt();
+  // getMsgCnt();
-  createServerConnect();
+  // createServerConnect();
 });
 </script>
--- a/src/router/index.ts
View file @afaa854
+++ b/src/router/index.ts
View file @afaa854
@@ -41,7 +41,7 @@ router.beforeEach(async (to, from, next) => {
        //   name: 'login',
        //   replace: true,
        // })
-        window.location.href = import.meta.env.VITE_IDASS_BASEURL;
+        window.location.href = window.location.origin + '/';
      }
      else if (to.name == 'scenes') {
        next({
@@ -130,7 +130,6 @@ router.beforeEach(async (to, from, next) => {
      next()
    }
    else if (!to.query.code && to.name !== 'login') {
-     // window.location.href = import.meta.env.VITE_IDASS_BASEURL;
      next({
        name: 'login',
        query: {
--- a/src/settings.ts
View file @afaa854
+++ b/src/settings.ts
View file @afaa854
@@ -40,7 +40,7 @@ const globalSettings: Settings.all = {
  },
  "home": {
    "enable": false,
-    "title": "可信数据服务平台"
+    "title": "可信空间接入连接器"
  },
  "breadcrumb": {
    "enable": true
--- a/src/store/modules/idaas.ts
View file @afaa854
+++ b/src/store/modules/idaas.ts
View file @afaa854
@@ -32,7 +32,8 @@ const useIdaas = defineStore(
      return idaasLogin(data).then((res: any) => {
        if (res?.code == '00000') {
       //   ElMessage.success('登录成功');
-          idaasUserInfo.value = res.data.data
+          idaasUserInfo.value = res.data && JSON.parse(res.data) || {};
+          localStorage.setItem('logonUser', idaasUserInfo.value?.principal?.logonUser || '');
          return res.data;
        } else {
          ElMessage.error(res.msg)
@@ -48,7 +49,7 @@ const useIdaas = defineStore(
  {
    persist:{
      storage: localStorage,
-      paths: ['idaasToken','idaasUserInfo']
+      paths: ['idaasToken']
    }
  }
 )
--- a/src/store/modules/user.ts
View file @afaa854
+++ b/src/store/modules/user.ts
View file @afaa854
@@ -27,7 +27,7 @@ const useUserStore = defineStore(
    const isLogin = ref(token.value ? true : false);//退出登录。
    const getTokenPromise: any = ref(null);
    /* idass的登录页面url，退出登录需要跳转到登录页。*/
-    const idassLoginUrl = import.meta.env.VITE_IDASS_BASEURL;
+    const idassLoginUrl = window.location.origin + '/';;
    const timer: any = ref(null);
    const isGetCurrUserInfo = ref(false); //记录登录时是否已经获取登录用户的信息，根据用户信息展示角色选择对话框。
    //获取token.
@@ -212,7 +212,7 @@ const useUserStore = defineStore(
          menuStore.setActived(0)
          tabbar.value = []
          tabbarMap.value = {}
-          window.location.href = idassLoginUrl + '?logout=1';
+          window.location.href = idassLoginUrl;
        });
      } else {
        let hasCode = localStorage.getItem('code');
@@ -232,7 +232,7 @@ const useUserStore = defineStore(
        tabbar.value = []
        tabbarMap.value = {}
        if (hasCode) {
-          window.location.href = idassLoginUrl + '?logout=1';
+          window.location.href = idassLoginUrl;
        } else {
          router.push({
            name: 'login',
--- a/src/types/components.d.ts
View file @afaa854
+++ b/src/types/components.d.ts
View file @afaa854
@@ -26,19 +26,15 @@ declare module '@vue/runtime-core' {
    Editor: typeof import('./../components/Editor/src/Editor.vue')['default']
    EllipsisTooltip: typeof import('./../components/EllipsisTooltip.vue')['default']
    FileUpload: typeof import('./../components/FileUpload/index.vue')['default']
-    FixedActionBar: typeof import('./../components/FixedActionBar/index.vue')['default']
    Form: typeof import('./../components/Form/index.vue')['default']
    FormItem: typeof import('./../components/FormItem/FormItem.vue')['default']
    FormPlus: typeof import('./../components/FormPlus/src/FormPlus.vue')['default']
-    GraphTopbar: typeof import('./../components/RelationNetwork/graphTopbar.vue')['default']
-    Header: typeof import('./../components/Header/index.vue')['default']
    Hour: typeof import('./../components/Schedule/component/hour.vue')['default']
    ImagePreview: typeof import('./../components/ImagePreview/index.vue')['default']
    ImagesUpload: typeof import('./../components/ImagesUpload/index.vue')['default']
    ImageUpload: typeof import('./../components/ImageUpload/index.vue')['default']
    LineageGraph: typeof import('./../components/LineageGraph/index.vue')['default']
    ListPanel: typeof import('./../components/ListPanel/index.vue')['default']
-    Logo: typeof import('./../components/Logo/index.vue')['default']
    LookBpmn: typeof import('./../components/ApprovalProcess/src/components/LookBpmn.vue')['default']
    Month: typeof import('./../components/Schedule/component/month.vue')['default']
    NotAllowed: typeof import('./../components/NotAllowed/index.vue')['default']
@@ -49,25 +45,19 @@ declare module '@vue/runtime-core' {
    PasswordStrengthMeter: typeof import('./../components/PasswordStrengthMeter/index.vue')['default']
    PcasCascader: typeof import('./../components/PcasCascader/index.vue')['default']
    Popover: typeof import('./../components/Popover/index.vue')['default']
-    RelationNetwork: typeof import('./../components/RelationNetwork/index.vue')['default']
    Retrievepassword: typeof import('./../components/Retrievepassword/index.vue')['default']
    RouterLink: typeof import('vue-router')['RouterLink']
    RouterView: typeof import('vue-router')['RouterView']
    Schedule: typeof import('./../components/Schedule/index.vue')['default']
    SearchBar: typeof import('./../components/SearchBar/index.vue')['default']
    SecondAndMinute: typeof import('./../components/Schedule/component/secondAndMinute.vue')['default']
-    SelectPersonnel: typeof import('./../components/SelectPersonnel/src/SelectPersonnel.vue')['default']
    SplitPane: typeof import('./../components/SplitPane/index.vue')['default']
    StepBar: typeof import('./../components/StepBar/index.vue')['default']
    SvgIcon: typeof import('./../components/SvgIcon/index.vue')['default']
-    SystemInfo: typeof import('./../components/SystemInfo/index.vue')['default']
    Table: typeof import('./../components/Table/index.vue')['default']
-    Table_s2: typeof import('./../components/Antv/table_s2.vue')['default']
-    Table_s2_vue: typeof import('./../components/Antv/table_s2_vue.vue')['default']
    Table_search: typeof import('./../components/Tools/table_search.vue')['default']
    Table_tools: typeof import('./../components/Tools/table_tools.vue')['default']
    Table_v2: typeof import('./../components/Table/table_v2.vue')['default']
-    TableActions: typeof import('./../components/TablePlus/src/components/TableActions.vue')['default']
    Tabs: typeof import('./../components/Tabs/index.vue')['default']
    Toolbar: typeof import('./../components/LineageGraph/toolbar.vue')['default']
    Topbar: typeof import('./../components/LineageGraph/topbar.vue')['default']
@@ -76,7 +66,6 @@ declare module '@vue/runtime-core' {
    Tree_v2: typeof import('./../components/Tree/tree_v2.vue')['default']
    TreeTransfer: typeof import('./../components/TreeTransfer/index.vue')['default']
    TreeTransferChecked: typeof import('./../components/TreeTransferChecked/index.vue')['default']
-    Trend: typeof import('./../components/Trend/index.vue')['default']
    Upload: typeof import('./../components/Upload/index.vue')['default']
    UploadExcelFile: typeof import('./../components/FileUpload/uploadExcelFile.vue')['default']
    Week: typeof import('./../components/Schedule/component/week.vue')['default']
--- a/src/views/[...all].vue
View file @afaa854
+++ b/src/views/[...all].vue
View file @afaa854
 <route lang="yaml">
 name: notFound
 meta:
-  title: 可信数据服务平台
+  title: 可信空间接入连接器
  constant: true
  layout: false
 </route>
--- a/src/views/data_basic/userManagement.vue
View file @afaa854
+++ b/src/views/data_basic/userManagement.vue
View file @afaa854
@@ -313,10 +313,12 @@ const currentNodeKey = ref('');
 // 获取公司部门树
 const getTenantList = async () => {
+  treeInfo.value.loading = true;
  let orgTree = await getOrganisationTree({
    useCache: false,
    tenantGuid: tenantGuid.value
  })
+  treeInfo.value.loading = false;
  let tree = [{
    guid: tenantGuid.value,
    name: tenantName.value,
--- a/src/views/login.vue
View file @afaa854
+++ b/src/views/login.vue
View file @afaa854
@@ -154,7 +154,7 @@ function testAccount(logonUser: string) {
        <div>
          <img :src="banner" class="banner">
          <div class="banner_desc">
-            <h4>可信数据服务平台</h4>
+            <h4>可信空间接入连接器</h4>
            <span>激活数据流通体系，释放数据要素新质生产力</span>
          </div>
        </div>