0bc96dcb by xukangle

fix

1 parent 50188ad8
...@@ -85,6 +85,7 @@ export const getProduct = (params) => request({ ...@@ -85,6 +85,7 @@ export const getProduct = (params) => request({
85 // 查看平台会员信息 85 // 查看平台会员信息
86 export const getTenantInfo = (params) => request({ 86 export const getTenantInfo = (params) => request({
87 // url: `${import.meta.env.VITE_APP_PERSONAL_URL}/tenant/getByGuid/${params}`, 87 // url: `${import.meta.env.VITE_APP_PERSONAL_URL}/tenant/getByGuid/${params}`,
88 // url: `http://localhost:9000/circulation/ms-data-circulation-portal-service/enterprise/detail-by-name`,
88 url: `http://192.168.6.22:29900/circulation/ms-data-circulation-portal-service/enterprise/detail-by-name`, 89 url: `http://192.168.6.22:29900/circulation/ms-data-circulation-portal-service/enterprise/detail-by-name`,
89 method: 'get', 90 method: 'get',
90 params 91 params
......
...@@ -169,7 +169,7 @@ const getDetailInfo = () => { ...@@ -169,7 +169,7 @@ const getDetailInfo = () => {
169 isTextTruncated(); 169 isTextTruncated();
170 }) 170 })
171 } else if (detailType.value == 'certificate') { 171 } else if (detailType.value == 'certificate') {
172 let ps: any = []; 172 let ps: any = [], tentData = {};
173 ps.push(getCertificateDetail({ guid: certificateGuid.value }).then((res: any) => { 173 ps.push(getCertificateDetail({ guid: certificateGuid.value }).then((res: any) => {
174 if (res.code == proxy.$passCode) { 174 if (res.code == proxy.$passCode) {
175 const data = res.data || {}; 175 const data = res.data || {};
...@@ -249,8 +249,25 @@ const getDetailInfo = () => { ...@@ -249,8 +249,25 @@ const getDetailInfo = () => {
249 }).catch(() => { 249 }).catch(() => {
250 fullscreenLoading.value = false; 250 fullscreenLoading.value = false;
251 })); 251 }));
252 ps.push(getTenantDetailInfo(userData.tenantGuid).then((res: any) => {
253 if (res.code == proxy.$passCode) {
254 const data = res.data ?? {};
255 tentData = { ...tentData, ...data };
256 } else {
257 ElMessage.error(res.msg);
258 }
259 }));
260 ps.push(getTenantInfo({ tenantName: userData.tenantName }).then((res: any) => {
261 if (res.code == proxy.$passCode) {
262 const data = res.data ?? {};
263 tentData = { ...tentData, ...data };
264 } else {
265 ElMessage.error(res.msg);
266 }
267 }))
252 Promise.all(ps).then(() => { 268 Promise.all(ps).then(() => {
253 fullscreenLoading.value = false; 269 fullscreenLoading.value = false;
270 tenantDetail.value = tentData;
254 isTextTruncated(); 271 isTextTruncated();
255 }) 272 })
256 } else { 273 } else {
...@@ -1268,7 +1285,7 @@ const formattedDate = (dateVal) => { ...@@ -1268,7 +1285,7 @@ const formattedDate = (dateVal) => {
1268 </div> 1285 </div>
1269 <div class="list_item" v-if="assetDetailInfo.damGuid"> 1286 <div class="list_item" v-if="assetDetailInfo.damGuid">
1270 <span class="item_label">数据库类型:</span> 1287 <span class="item_label">数据库类型:</span>
1271 <span class="item_value">{{ assetDetailInfo.databaseType ?? '--' }}</span> 1288 <span class="item_value">{{ assetDetailInfo.databaseType || '--' }}</span>
1272 </div> 1289 </div>
1273 </div> 1290 </div>
1274 <div class="last-col"> 1291 <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!