Pre Merge pull request !266 from 奖励一杯巧克力/ts

This commit is contained in:
奖励一杯巧克力 2026-06-01 13:39:13 +00:00 committed by Gitee
commit 76ddf8a044
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 5 additions and 3 deletions

View File

@ -17,6 +17,7 @@
<script setup name="Pagination" lang="ts"> <script setup name="Pagination" lang="ts">
import { scrollTo } from '@/utils/scroll-to'; import { scrollTo } from '@/utils/scroll-to';
import { propTypes } from '@/utils/propTypes'; import { propTypes } from '@/utils/propTypes';
import { computed } from 'vue';
const props = defineProps({ const props = defineProps({
total: propTypes.number, total: propTypes.number,

View File

@ -2,7 +2,7 @@
<div class="app-container home"> <div class="app-container home">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :sm="24" :lg="12" style="padding-left: 20px"> <el-col :sm="24" :lg="12" style="padding-left: 20px">
<h2>RuoYi-Vue-Plus多租户管理系统</h2> <h2>RuoYi-Vue-Plus多租户管理系统这是ts分支</h2>
<p> <p>
RuoYi-Vue-Plus 是基于 RuoYi-Vue 针对 分布式集群 场景升级(不兼容原框架) RuoYi-Vue-Plus 是基于 RuoYi-Vue 针对 分布式集群 场景升级(不兼容原框架)
<br /> <br />

View File

@ -56,10 +56,11 @@
</template> </template>
<script setup name="AuthRole" lang="ts"> <script setup name="AuthRole" lang="ts">
import { getCurrentInstance, nextTick, onMounted, ref } from 'vue';
import { RoleVO } from '@/api/system/role/types'; import { RoleVO } from '@/api/system/role/types';
import { getAuthRole, updateAuthRole } from '@/api/system/user'; import { getAuthRole, updateAuthRole } from '@/api/system/user';
import { UserForm } from '@/api/system/user/types'; import { UserForm } from '@/api/system/user/types';
import { RouteLocationNormalized } from 'vue-router'; import { RouteLocationNormalized, useRoute } from 'vue-router';
import { parseTime } from '@/utils/ruoyi'; import { parseTime } from '@/utils/ruoyi';
const route = useRoute(); const route = useRoute();
@ -111,7 +112,7 @@ const close = () => {
redirectedFrom: undefined, redirectedFrom: undefined,
path: '/system/user' path: '/system/user'
}; };
proxy?.$tab.closeOpenPage(obj); proxy?.$tab.closeOpenPage({ path: obj.path });
}; };
/** 提交按钮 */ /** 提交按钮 */
const submitForm = async () => { const submitForm = async () => {