Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
a74d8071 by lxs Committed by lihua
Options

serviceTenantGuid参数改为tenantGuid

1 parent f162d592
Inline Side-by-side
Showing 8 changed files with 38 additions and 38 deletions
src/views/data_asset/certificateManagement.vue
......@@ -193,7 +193,7 @@ const tableBtnClick = (scope, btn) => {
} if (type === 'path_detail') { // 详情
router.push({
name: 'certificateDetail',
query: { guid: row.registerGuid, certificateGuid: row.guid, type: 'certificate', serviceTenantGuid: row.tenantGuid }
query: { guid: row.registerGuid, certificateGuid: row.guid, type: 'certificate', tenantGuid: row.tenantGuid }
});
}
};
......
src/views/data_asset/qualityEvaluate.vue
......@@ -298,18 +298,18 @@ const tableBtnClick = (scope, btn) => {
if (row.registerApproveState == 'Y') {
router.push({
name: 'registerDetail',
query: { guid: row.registerGuid, evaGuid: row.guid, type: 'qualityEvaluate', serviceTenantGuid: row.tenantGuid }
query: { guid: row.registerGuid, evaGuid: row.guid, type: 'qualityEvaluate', tenantGuid: row.tenantGuid }
});
} else {
router.push({
name: 'evaCatalogDetail',
query: { guid: row.damGuid, evaGuid: row.guid, type: 'qualityEvaluate', serviceTenantGuid: row.tenantGuid }
query: { guid: row.damGuid, evaGuid: row.guid, type: 'qualityEvaluate', tenantGuid: row.tenantGuid }
});
}
} else if (type == 'productDetail') {
router.push({
name: 'registerCatalogDetail',
query: { guid: row.damGuid, serviceTenantGuid: row.tenantGuid }
query: { guid: row.damGuid, tenantGuid: row.tenantGuid }
});
}
};
......
src/views/data_asset/registerCatalogDetail.vue
......@@ -85,7 +85,7 @@ const processInstanceId = ref('');
const getDetailInfo = () => {
fullscreenLoading.value = true;
getRegisterCatalogDetail({ guid: catalogGuid, serviceTenantGuid: route.query.serviceTenantGuid }).then((res: any) => {
getRegisterCatalogDetail({ guid: catalogGuid, serviceTenantGuid: route.query.tenantGuid }).then((res: any) => {
if (res.code == proxy.$passCode) {
const data = res.data || {};
detailInfo.value = data;
......@@ -109,7 +109,7 @@ const getDetailInfo = () => {
}
});
if (evaGuid) {
getEvaDetail({ guid: evaGuid, serviceTenantGuid: route.query.serviceTenantGuid }).then((res: any) => {
getEvaDetail({ guid: evaGuid, serviceTenantGuid: route.query.tenantGuid }).then((res: any) => {
if (res.code == proxy.$passCode) {
const data = res.data || {};
evaDetailInfo.value = data;
......@@ -121,7 +121,7 @@ const getDetailInfo = () => {
});
}
if (costAssessGuid) {
getCostDetail({ guid: costAssessGuid, serviceTenantGuid: route.query.serviceTenantGuid }).then((res: any) => {
getCostDetail({ guid: costAssessGuid, serviceTenantGuid: route.query.tenantGuid }).then((res: any) => {
if (res.code == proxy.$passCode) {
const data = res.data || {};
costAssessDetail.value = data;
......@@ -635,7 +635,7 @@ const passDialogBtnClick = (btn, info) => {
approveSuggest: info.approveSuggest,
approveStaffGuid: userData.staffGuid,
}
submitPromise.value = passFlowData(params, route.query.serviceTenantGuid).then((res: any) => {
submitPromise.value = passFlowData(params, route.query.tenantGuid).then((res: any) => {
submitPromise.value = null;
passDialogInfo.value.footer.btns[1].loading = false;
if (res?.code == proxy.$passCode) {
......@@ -671,7 +671,7 @@ const passDialogBtnClick = (btn, info) => {
url: file.url
}
}) || []
}, route.query.serviceTenantGuid).then((res: any) => {
}, route.query.tenantGuid).then((res: any) => {
passDialogInfo.value.footer.btns[1].loading = false;
submitPromise.value = null;
if (res?.code == proxy.$passCode) {
......@@ -705,7 +705,7 @@ const passDialogBtnClick = (btn, info) => {
url: file.url
}
}) || [],
}, route.query.serviceTenantGuid).then((res: any) => {
}, route.query.tenantGuid).then((res: any) => {
submitPromise.value = null;
if (res?.code == proxy.$passCode) {
if (res.data) {
......@@ -776,7 +776,7 @@ const rejectDialogBtnClick = (btn, info) => {
approveStaffGuid: userData.staffGuid,
}
rejectDialogInfo.value.footer.btns[1].loading = true;
rejectFlowData(params, route.query.serviceTenantGuid).then((res: any) => {
rejectFlowData(params, route.query.tenantGuid).then((res: any) => {
rejectDialogInfo.value.footer.btns[1].loading = false;
if (res?.code == proxy.$passCode) {
if (res.data) {
......@@ -842,7 +842,7 @@ const passCommonDialogBtnClick = (btn, info) => {
approveStaffGuid: userData.staffGuid,
}
passCommonDialogInfo.value.footer.btns[1].loading = true;
passFlowData(params, route.query.serviceTenantGuid).then((res: any) => {
passFlowData(params, route.query.tenantGuid).then((res: any) => {
passCommonDialogInfo.value.footer.btns[1].loading = false;
if (res?.code == proxy.$passCode) {
if (res.data) {
......
src/views/data_asset/registerDetail.vue
......@@ -36,6 +36,7 @@ const router = useRouter();
const route = useRoute();
const fullPath = route.fullPath;
const assetGuid = route.query.guid;
const tenantGuid = route.query.tenantGuid;
const { proxy } = getCurrentInstance() as any;
......@@ -50,7 +51,6 @@ const detailType: any = ref(route.query.type);
const evaGuid: any = ref(route.query.evaGuid);
const costAssessGuid: any = ref(route.query.costAssessGuid);
const certificateGuid: any = ref(route.query.certificateGuid);
const serviceTenantGuid: any = ref(route.query.serviceTenantGuid);
const contentRef = ref();
const tabsInfo = ref({
......@@ -77,7 +77,7 @@ const getDetailInfo = () => {
fullscreenLoading.value = true;
if (detailType.value == 'qualityEvaluate') {
let ps: any = [];
ps.push(getEvaDetail({ guid: evaGuid.value, serviceTenantGuid: serviceTenantGuid.value }).then((res: any) => {
ps.push(getEvaDetail({ guid: evaGuid.value, serviceTenantGuid: tenantGuid }).then((res: any) => {
if (res.code == proxy.$passCode) {
const data = res.data || {};
evaDetailInfo.value = data;
......@@ -107,7 +107,7 @@ const getDetailInfo = () => {
}).catch(() => {
fullscreenLoading.value = false;
}));
ps.push(getRegiaterDetail({ guid: assetGuid, serviceTenantGuid: serviceTenantGuid.value }).then((res: any) => {
ps.push(getRegiaterDetail({ guid: assetGuid, serviceTenantGuid: tenantGuid }).then((res: any) => {
if (res.code == proxy.$passCode) {
const data = res.data || {};
assetDetailInfo.value = data;
......@@ -123,7 +123,7 @@ const getDetailInfo = () => {
})
} else if (detailType.value == 'costAssess') {
let ps: any = [];
ps.push(getCostAssessDetail({ guid: costAssessGuid.value, serviceTenantGuid: serviceTenantGuid.value }).then((res: any) => {
ps.push(getCostAssessDetail({ guid: costAssessGuid.value, serviceTenantGuid: tenantGuid }).then((res: any) => {
if (res.code == proxy.$passCode) {
const data = res.data || {};
costAssessDetailInfo.value = data;
......@@ -174,7 +174,7 @@ const getDetailInfo = () => {
}).catch(() => {
fullscreenLoading.value = false;
}));
ps.push(getRegiaterDetail({ guid: assetGuid, serviceTenantGuid: serviceTenantGuid.value }).then((res: any) => {
ps.push(getRegiaterDetail({ guid: assetGuid, serviceTenantGuid: tenantGuid }).then((res: any) => {
if (res.code == proxy.$passCode) {
const data = res.data || {};
assetDetailInfo.value = data;
......@@ -190,7 +190,7 @@ const getDetailInfo = () => {
})
} else if (detailType.value == 'certificate') {
let ps: any = [], tentData = {};
ps.push(getCertificateDetail({ guid: certificateGuid.value, serviceTenantGuid: serviceTenantGuid.value }).then((res: any) => {
ps.push(getCertificateDetail({ guid: certificateGuid.value, serviceTenantGuid: tenantGuid }).then((res: any) => {
if (res.code == proxy.$passCode) {
const data = res.data || {};
detailInfo.value = data;
......@@ -207,7 +207,7 @@ const getDetailInfo = () => {
}
let qualityPs: any = [];
if (detailInfo.value.qualityEvaluationGuid) {
qualityPs.push(getEvaDetail({ guid: detailInfo.value.qualityEvaluationGuid, serviceTenantGuid: serviceTenantGuid.value }).then((res: any) => {
qualityPs.push(getEvaDetail({ guid: detailInfo.value.qualityEvaluationGuid, serviceTenantGuid: tenantGuid }).then((res: any) => {
if (res.code == proxy.$passCode) {
const data = res.data || {};
evaDetailInfo.value = data;
......@@ -231,7 +231,7 @@ const getDetailInfo = () => {
}));
}
if (detailInfo.value.costAccessmentGuid) {
qualityPs.push(getCostAssessDetail({ guid: detailInfo.value.costAccessmentGuid, serviceTenantGuid: serviceTenantGuid.value }).then((res: any) => {
qualityPs.push(getCostAssessDetail({ guid: detailInfo.value.costAccessmentGuid, serviceTenantGuid: tenantGuid }).then((res: any) => {
if (res.code == proxy.$passCode) {
const data = res.data || {};
costAssessDetailInfo.value = data;
......@@ -259,7 +259,7 @@ const getDetailInfo = () => {
ElMessage.error(res.msg);
}
}));
ps.push(getRegiaterDetail({ guid: assetGuid, serviceTenantGuid: serviceTenantGuid.value }).then((res: any) => {
ps.push(getRegiaterDetail({ guid: assetGuid, serviceTenantGuid: tenantGuid }).then((res: any) => {
if (res.code == proxy.$passCode) {
const data = res.data || {};
assetDetailInfo.value = data;
......@@ -292,7 +292,7 @@ const getDetailInfo = () => {
})
} else {
let ps: any = []
ps.push(getRegiaterDetail({ guid: assetGuid, serviceTenantGuid: serviceTenantGuid.value }).then((res: any) => {
ps.push(getRegiaterDetail({ guid: assetGuid, serviceTenantGuid: tenantGuid }).then((res: any) => {
if (res.code == proxy.$passCode) {
const data = res.data || {};
if (fullPath === route.fullPath) {
......@@ -356,7 +356,7 @@ const tentData = ref<any>({});
const getTenantInformation = () => {
const ps: any = [];
ps.push(getTenantDetailInfo(serviceTenantGuid.value).then((res: any) => {
ps.push(getTenantDetailInfo(tenantGuid).then((res: any) => {
if (res.code === proxy.$passCode) {
const data = res.data ?? {};
tentData.value = { ...tentData.value, ...data };
......@@ -981,7 +981,7 @@ const passDialogBtnClick = (btn, info) => {
approveSuggest: info.approveSuggest,
approveStaffGuid: userData.staffGuid
}
submitPromise.value = passFlowData(params, serviceTenantGuid.value).then((res: any) => {
submitPromise.value = passFlowData(params, tenantGuid).then((res: any) => {
submitPromise.value = null;
if (res?.code == proxy.$passCode) {
if (res.data) {
......@@ -1015,7 +1015,7 @@ const passDialogBtnClick = (btn, info) => {
url: file.url
}
}) || [],
}, serviceTenantGuid.value).then((res: any) => {
}, tenantGuid).then((res: any) => {
submitPromise.value = null;
if (res?.code == proxy.$passCode) {
if (res.data) {
......@@ -1048,7 +1048,7 @@ const passDialogBtnClick = (btn, info) => {
url: file.url
}
}) || []
}, serviceTenantGuid.value).then((res: any) => {
}, tenantGuid).then((res: any) => {
submitPromise.value = null;
if (res?.code == proxy.$passCode) {
if (res.data) {
......@@ -1140,7 +1140,7 @@ const rejectDialogBtnClick = (btn, info) => {
approveSuggest: info.approveSuggest,
approveStaffGuid: userData.staffGuid
}
rejectFlowData(params, serviceTenantGuid.value).then((res: any) => {
rejectFlowData(params, tenantGuid).then((res: any) => {
rejectDialogInfo.value.footer.btns[1].loading = false;
if (res?.code == proxy.$passCode) {
if (res.data) {
......@@ -1224,7 +1224,7 @@ const passCommonDialogBtnClick = (btn, info) => {
approveStaffGuid: userData.staffGuid
}
passCommonDialogInfo.value.footer.btns[1].loading = true;
passFlowData(params, serviceTenantGuid.value).then((res: any) => {
passFlowData(params, tenantGuid).then((res: any) => {
passCommonDialogInfo.value.footer.btns[1].loading = false;
if (res?.code == proxy.$passCode) {
if (res.data) {
......
src/views/data_asset/registerManagemant.vue
......@@ -264,7 +264,7 @@ const tableBtnClick = (scope, btn) => {
} else if (type === 'detail') { // 详情, 若是草稿中，详情就是编辑，
router.push({
name: 'registerInfoDetail',
query: { guid: row.guid, name: row.daName, serviceTenantGuid: row.tenantGuid, tenantName: row.tenantName, type: 'asset' }
query: { guid: row.guid, name: row.daName, tenantGuid: row.tenantGuid, tenantName: row.tenantName, type: 'asset' }
});
} else if (type === 'pass') {
passDialogInfo.value.visible = true;
......
src/views/data_asset/valueEvaluate.vue
......@@ -400,18 +400,18 @@ const tableBtnClick = (scope, btn) => {
if (row.registerApproveState == 'Y') {
router.push({
name: 'registerValueDetail',
query: { guid: row.registerGuid, costAssessGuid: row.guid, type: 'costAssess', serviceTenantGuid: row.tenantGuid }
query: { guid: row.registerGuid, costAssessGuid: row.guid, type: 'costAssess', tenantGuid: row.tenantGuid }
});
} else {
router.push({
name: 'costAssessDetail',
query: { guid: row.damGuid, costAssessGuid: row.guid, type: 'costAssess', serviceTenantGuid: row.tenantGuid }
query: { guid: row.damGuid, costAssessGuid: row.guid, type: 'costAssess', tenantGuid: row.tenantGuid }
});
}
} else if (type == 'productDetail') {
router.push({
name: 'registerCatalogDetail',
query: { guid: row.damGuid, serviceTenantGuid: row.tenantGuid }
query: { guid: row.damGuid, tenantGuid: row.tenantGuid }
});
}
else if (type === 'pass') {
......
src/views/data_product/productListing.vue
......@@ -327,7 +327,7 @@ const tableBtnClick = (scope, btn) => {
type: 'detail',
name: row.damName,
exchangeGuid: row.exchangeGuid ? row.exchangeGuid : '',
serviceTenantGuid: row.tenantGuid
tenantGuid: row.tenantGuid
}
});
}
......@@ -342,7 +342,7 @@ const tableBtnClick = (scope, btn) => {
case: '1',
name: row.damName,
exchangeGuid: row.exchangeGuid,
serviceTenantGuid: row.tenantGuid
tenantGuid: row.tenantGuid
}
})
} else {
......@@ -353,7 +353,7 @@ const tableBtnClick = (scope, btn) => {
type: type == 'edit' ? 'edit' : 'redit',
case: '2',
name: row.damName,
serviceTenantGuid: row.tenantGuid
tenantGuid: row.tenantGuid
}
});
}
......@@ -470,7 +470,7 @@ const tableBtnClick = (scope, btn) => {
case: '1',
name: row.damName,
exchangeGuid: row.exchangeGuid,
serviceTenantGuid: row.tenantGuid
tenantGuid: row.tenantGuid
}
})
} else {
......@@ -481,7 +481,7 @@ const tableBtnClick = (scope, btn) => {
type: type == 'edit' ? 'edit' : 'redit',
case: '2',
name: row.damName,
serviceTenantGuid: row.tenantGuid
tenantGuid: row.tenantGuid
}
});
}
......
src/views/data_product/productListingDetail.vue
......@@ -664,7 +664,7 @@ const getTableInfo = () => {
const getProductDetail = async () => {
flowDetailLoading.value = true;
getListingDetail({ guid: guid, serviceTenantGuid: route.query.serviceTenantGuid }).then((res: any) => {
getListingDetail({ guid: guid, serviceTenantGuid: route.query.tenantGuid }).then((res: any) => {
flowDetailLoading.value = false;
if (res.code == proxy.$passCode) {
const data = res.data || {}
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!