0bc96dcb by xukangle

fix

1 parent 50188ad8
......@@ -85,6 +85,7 @@ export const getProduct = (params) => request({
// 查看平台会员信息
export const getTenantInfo = (params) => request({
// url: `${import.meta.env.VITE_APP_PERSONAL_URL}/tenant/getByGuid/${params}`,
// url: `http://localhost:9000/circulation/ms-data-circulation-portal-service/enterprise/detail-by-name`,
url: `http://192.168.6.22:29900/circulation/ms-data-circulation-portal-service/enterprise/detail-by-name`,
method: 'get',
params
......
......@@ -169,7 +169,7 @@ const getDetailInfo = () => {
isTextTruncated();
})
} else if (detailType.value == 'certificate') {
let ps: any = [];
let ps: any = [], tentData = {};
ps.push(getCertificateDetail({ guid: certificateGuid.value }).then((res: any) => {
if (res.code == proxy.$passCode) {
const data = res.data || {};
......@@ -249,8 +249,25 @@ const getDetailInfo = () => {
}).catch(() => {
fullscreenLoading.value = false;
}));
ps.push(getTenantDetailInfo(userData.tenantGuid).then((res: any) => {
if (res.code == proxy.$passCode) {
const data = res.data ?? {};
tentData = { ...tentData, ...data };
} else {
ElMessage.error(res.msg);
}
}));
ps.push(getTenantInfo({ tenantName: userData.tenantName }).then((res: any) => {
if (res.code == proxy.$passCode) {
const data = res.data ?? {};
tentData = { ...tentData, ...data };
} else {
ElMessage.error(res.msg);
}
}))
Promise.all(ps).then(() => {
fullscreenLoading.value = false;
tenantDetail.value = tentData;
isTextTruncated();
})
} else {
......@@ -1268,7 +1285,7 @@ const formattedDate = (dateVal) => {
</div>
<div class="list_item" v-if="assetDetailInfo.damGuid">
<span class="item_label">数据库类型:</span>
<span class="item_value">{{ assetDetailInfo.databaseType ?? '--' }}</span>
<span class="item_value">{{ assetDetailInfo.databaseType || '--' }}</span>
</div>
</div>
<div class="last-col">
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!