From ca22cdd5550cfa0defb0f430c538698182cdaec1 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 30 十二月 2024 16:42:49 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat-ui-vue3
---
src/views/system/app/index.vue | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/src/views/system/app/index.vue b/src/views/system/app/index.vue
index 9ade595..9b29a84 100644
--- a/src/views/system/app/index.vue
+++ b/src/views/system/app/index.vue
@@ -76,15 +76,30 @@
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list">
+ <el-table-column label="应用类型" align="center" prop="type">
+ <template #default="scope">
+ <dict-tag :type="DICT_TYPE.SYSTEM_APP_TYPE" :value="scope.row.type" />
+ </template>
+ </el-table-column>
+ <el-table-column label="应用分组" align="center" prop="groupId">
+ <template #default="scope">
+ <template v-for="item in groupList">
+ <el-tag type="warning" :key="item.id" v-if="item.id === scope.row.groupId">
+ {{ item.name }}
+ </el-tag>
+ </template>
+ </template>
+ </el-table-column>
<el-table-column label="应用编号" align="center" prop="appCode" />
<el-table-column label="应用名称" align="center" prop="appName" />
<el-table-column label="应用域名" align="center" prop="appDomain" />
- <el-table-column label="接口域名" align="center" prop="apiDomain" />
- <el-table-column label="应用账号" align="center" prop="appKey" />
- <el-table-column label="应用分组" align="center" prop="appGroup" />
- <el-table-column label="加载类型" align="center" prop="loadType" />
- <el-table-column label="应用图标" align="center" prop="icon" />
- <el-table-column label="开发者" align="center" prop="devName" />
+<!-- <el-table-column label="接口域名" align="center" prop="apiDomain" />-->
+<!-- <el-table-column label="应用账号" align="center" prop="appKey" />-->
+ <el-table-column label="应用图标" align="center" prop="logo">
+ <template #default="scope">
+ <img width="40px" height="40px" :src="scope.row.icon" />
+ </template>
+ </el-table-column>
<el-table-column label="备注" align="center" prop="remark" width="200" />
<el-table-column
label="创建时间"
@@ -99,7 +114,7 @@
link
type="primary"
@click="openForm('update', scope.row.id)"
- v-hasPermi="['system:tenant:update']"
+ v-hasPermi="['system:app:update']"
>
编辑
</el-button>
@@ -107,7 +122,7 @@
link
type="danger"
@click="handleDelete(scope.row.id)"
- v-hasPermi="['system:tenant:delete']"
+ v-hasPermi="['system:app:delete']"
>
删除
</el-button>
@@ -133,6 +148,8 @@
import download from '@/utils/download'
import * as AppApi from '@/api/system/app'
import AppForm from './AppForm.vue'
+ import * as TenantApi from "@/api/system/tenant";
+ import * as AppGroupApi from "@/api/system/appgroup";
defineOptions({name: 'SystemApp'})
@@ -152,6 +169,9 @@
})
const queryFormRef = ref() // 搜索的表单
const exportLoading = ref(false) // 导出的加载中
+
+ const tenantList = ref([] as TenantApi.TenantVO[]) // 租户列表
+ const groupList = ref([] as AppGroupApi.AppGroupVO[]) // 分组列表
/** 查询列表 */
const getList = async () => {
@@ -215,5 +235,7 @@
/** 初始化 **/
onMounted(async () => {
await getList()
+ tenantList.value = await TenantApi.getSimpleTenant()
+ groupList.value = await AppGroupApi.getAppGroupList()
})
</script>
--
Gitblit v1.9.3