Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
4fffc142 by lihua
Options

Merge branch 'develop' into release-test

2 parents 6c31e844 2ee7a970
Inline Side-by-side
Showing 4 changed files with 167 additions and 145 deletions
src/App.vue
......@@ -39,7 +39,7 @@ watch([
], () => {
if (settingsStore.settings.app.enableDynamicTitle && settingsStore.title) {
const title = typeof settingsStore.title === 'function' ? settingsStore.title() : settingsStore.title
document.title = `${title}`
document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
}
else {
document.title = import.meta.env.VITE_APP_TITLE
......
src/api/modules/queryService.ts
......@@ -96,6 +96,13 @@ export const getTenantDetailInfo = (params) => request({
method: 'get'
})
// 查看人员详情
export const getStaffDetailInfo = (params) => request({
url: `${import.meta.env.VITE_APP_PERSONAL_URL}/staff/getByGuid/${params}`,
method: 'get'
})
/**
* 日志管理
......
src/views/data_asset/qualityEvaluate.vue
......@@ -13,10 +13,13 @@ import {
saveQuality,
qualityAllow,
deleteQuality,
updatQuality
updatQuality,
} from "@/api/modules/dataAsset";
import useUserStore from "@/store/modules/user";
import useDataAssetStore from "@/store/modules/dataAsset";
import {
getStaffDetailInfo
} from "@/api/modules/queryService";
import { rejectFlowData, revokeFlowData, getCamundaDeploymentId, getProcessNodesPromise } from "@/api/modules/workFlowService";
const assetStore = useDataAssetStore();
......@@ -41,7 +44,7 @@ const tableFields = ref([
const deploymentId = ref('');
onBeforeMount(() => {
onMounted(() => {
getCamundaDeploymentId('10018', userData.tenantGuid, userData.staffGuid).then((res: any) => {
if (res.code == proxy.$passCode) {
deploymentId.value = res.data;
......@@ -413,57 +416,64 @@ const dialogBtnClick = (btn, info) => {
processInstanceId: null,
}).then((res: any) => {
if (res?.code == proxy.$passCode) {
if (dialogInfo.value.type == 'reSubmit') {
updatQuality({
guid: currTableData.value.guid,
tenantGuid: userData.tenantGuid,
damGuid: currTableData.value.damGuid,
daName: currTableData.value.daName,
immediateApprove: true,
evaluationAgencyGuid: res.data?.[1]?.candidateUsers?.[0]?.staffGuid,
qualityEvaluationFile: info.qualityEvaluationFile?.map(file => {
return {
name: file.name,
url: file.url
}
}) || []
}).then((res: any) => {
dialogInfo.value.footer.btns[1].loading = false;
if (res?.code == proxy.$passCode) {
ElMessage.success('该资产质量评价重新提交成功');
dialogInfo.value.visible = false;
page.value.curr = 1;
getTableData();
getStaffDetailInfo(res.data?.[1]?.candidateUsers?.[0]?.staffGuid).then((resUser: any) => {
if (resUser?.code == proxy.$passCode) {
if (dialogInfo.value.type == 'reSubmit') {
updatQuality({
guid: currTableData.value.guid,
tenantGuid: userData.tenantGuid,
damGuid: currTableData.value.damGuid,
daName: currTableData.value.daName,
immediateApprove: true,
evaluationAgencyGuid: resUser.data?.tenantGuid,
qualityEvaluationFile: info.qualityEvaluationFile?.map(file => {
return {
name: file.name,
url: file.url
}
}) || []
}).then((res: any) => {
dialogInfo.value.footer.btns[1].loading = false;
if (res?.code == proxy.$passCode) {
ElMessage.success('该资产质量评价重新提交成功');
dialogInfo.value.visible = false;
page.value.curr = 1;
getTableData();
} else {
ElMessage.error(res.msg);
}
})
} else {
ElMessage.error(res.msg);
let daInfo = assetListData.value.find(a => a.guid == info.damGuid);
saveQuality({
tenantGuid: userData.tenantGuid,
damGuid: info.damGuid,
daName: daInfo.damName,
immediateApprove: true,
evaluationAgencyGuid: resUser.data?.tenantGuid,
qualityEvaluationFile: info.qualityEvaluationFile?.map(file => {
return {
name: file.name,
url: file.url
}
}) || []
}).then((res: any) => {
dialogInfo.value.footer.btns[1].loading = false;
if (res?.code == proxy.$passCode) {
ElMessage.success('质量评价发起成功');
dialogInfo.value.visible = false;
page.value.curr = 1;
getTableData();
} else {
ElMessage.error(res.msg);
}
})
}
})
} else {
let daInfo = assetListData.value.find(a => a.guid == info.damGuid);
saveQuality({
tenantGuid: userData.tenantGuid,
damGuid: info.damGuid,
daName: daInfo.damName,
immediateApprove: true,
evaluationAgencyGuid: res.data?.[1]?.candidateUsers?.[0]?.staffGuid,
qualityEvaluationFile: info.qualityEvaluationFile?.map(file => {
return {
name: file.name,
url: file.url
}
}) || []
}).then((res: any) => {
} else {
dialogInfo.value.footer.btns[1].loading = false;
if (res?.code == proxy.$passCode) {
ElMessage.success('质量评价发起成功');
dialogInfo.value.visible = false;
page.value.curr = 1;
getTableData();
} else {
ElMessage.error(res.msg);
}
})
}
ElMessage.error(res.msg);
}
})
} else {
dialogInfo.value.footer.btns[1].loading = false;
ElMessage.error(res.msg);
......
src/views/data_asset/valueEvaluate.vue
......@@ -17,7 +17,7 @@ import {
costAssessAllow
} from "@/api/modules/dataAsset";
import {
getTenantAttach
getStaffDetailInfo
} from "@/api/modules/queryService";
import useUserStore from "@/store/modules/user";
import useDataAssetStore from "@/store/modules/dataAsset";
......@@ -741,106 +741,111 @@ const dialogBtnClick = (btn, info) => {
deploymentId: deploymentId.value,
processInstanceId: null,
}).then((res: any) => {
console.log('res', res);
if (dialogInfo.value.type == 'reSubmit') {
if (reSubmitPromise.value) {
return;
}
reSubmitPromise.value = updateCostAssess({
guid: currTableData.value.guid,
immediateApprove: true,
tenantGuid: userData.tenantGuid,
daName: currTableData.value.daName,
damGuid: currTableData.value.damGuid,
costAssessmentFile: info.costAssessmentFile?.map(file => {
return {
name: file.name,
url: file.url
}
}) || [],
evaluationFile: info.evaluationFile?.map(file => {
return {
name: file.name,
url: file.url
getStaffDetailInfo(res.data?.[1]?.candidateUsers?.[0]?.staffGuid).then((resUser: any) => {
if (resUser?.code == proxy.$passCode) {
if (dialogInfo.value.type == 'reSubmit') {
if (reSubmitPromise.value) {
return;
}
}) || [],
qualityScore: info.qualityScore || null,
evaluationRangeStart: info.evaluationRange ? info.evaluationRange[0] : null,
evaluationRangeEnd: info.evaluationRange ? info.evaluationRange[1] : null,
evaluationNote: info.evaluationNote || null,
evaluationAgencyGuid: res.data?.[1]?.candidateUsers?.[0]?.staffGuid,
}).then((res: any) => {
reSubmitPromise.value = null;
if (res?.code == proxy.$passCode) {
ElMessage.success('该资产价值评估重新提交成功');
dialogInfo.value.visible = false;
page.value.curr = 1;
getTableData();
formItems.value[4].placeholder = `本次评估数据资产总体质量得分为**分\n准确性：\n一致性：\n可访问性：\n规范性：\n完整性：`;
reSubmitPromise.value = updateCostAssess({
guid: currTableData.value.guid,
immediateApprove: true,
tenantGuid: userData.tenantGuid,
daName: currTableData.value.daName,
damGuid: currTableData.value.damGuid,
costAssessmentFile: info.costAssessmentFile?.map(file => {
return {
name: file.name,
url: file.url
}
}) || [],
evaluationFile: info.evaluationFile?.map(file => {
return {
name: file.name,
url: file.url
}
}) || [],
qualityScore: info.qualityScore || null,
evaluationRangeStart: info.evaluationRange ? info.evaluationRange[0] : null,
evaluationRangeEnd: info.evaluationRange ? info.evaluationRange[1] : null,
evaluationNote: info.evaluationNote || null,
evaluationAgencyGuid: resUser.data?.tenantGuid,
}).then((res: any) => {
reSubmitPromise.value = null;
if (res?.code == proxy.$passCode) {
ElMessage.success('该资产价值评估重新提交成功');
dialogInfo.value.visible = false;
page.value.curr = 1;
getTableData();
formItems.value[4].placeholder = `本次评估数据资产总体质量得分为**分\n准确性：\n一致性：\n可访问性：\n规范性：\n完整性：`;
} else {
ElMessage.error(res.msg);
}
})
} else {
ElMessage.error(res.msg);
}
})
} else {
if (savePromise.value) {
return;
}
let params: any = {};
let daInfo = assetListData.value.find(a => a.guid == info.registerGuid);
if (daInfo.qualityEvaluationGuid) {
//通过质量评估发起资产申请
params = {
immediateApprove: true,
tenantGuid: userData.tenantGuid,
daName: daInfo.damName,
damGuid: daInfo.guid,
costAssessmentFile: info.costAssessmentFile?.map(file => {
return {
name: file.name,
url: file.url
if (savePromise.value) {
return;
}
let params: any = {};
let daInfo = assetListData.value.find(a => a.guid == info.registerGuid);
if (daInfo.qualityEvaluationGuid) {
//通过质量评估发起资产申请
params = {
immediateApprove: true,
tenantGuid: userData.tenantGuid,
daName: daInfo.damName,
damGuid: daInfo.guid,
costAssessmentFile: info.costAssessmentFile?.map(file => {
return {
name: file.name,
url: file.url
}
}) || [],
evaluationAgencyGuid: resUser.data?.tenantGuid,
}
}) || [],
evaluationAgencyGuid: res.data?.[1]?.candidateUsers?.[0]?.staffGuid,
}
} else {
//未通过质量评估发起资产申请
params = {
immediateApprove: true,
tenantGuid: userData.tenantGuid,
daName: daInfo.damName,
damGuid: daInfo.guid,
costAssessmentFile: info.costAssessmentFile?.map(file => {
return {
name: file.name,
url: file.url
} else {
//未通过质量评估发起资产申请
params = {
immediateApprove: true,
tenantGuid: userData.tenantGuid,
daName: daInfo.damName,
damGuid: daInfo.guid,
costAssessmentFile: info.costAssessmentFile?.map(file => {
return {
name: file.name,
url: file.url
}
}) || [],
evaluationFile: info.evaluationFile?.map(file => {
return {
name: file.name,
url: file.url
}
}) || [],
qualityScore: info.qualityScore,
evaluationRangeStart: info.evaluationRange ? info.evaluationRange[0] : null,
evaluationRangeEnd: info.evaluationRange ? info.evaluationRange[1] : null,
evaluationNote: info.evaluationNote,
evaluationAgencyGuid: res.data?.[1]?.candidateUsers?.[0]?.staffGuid,
}
}) || [],
evaluationFile: info.evaluationFile?.map(file => {
return {
name: file.name,
url: file.url
}
console.log('daInfo', daInfo, info);
savePromise.value = saveCostAssess(params).then((res: any) => {
savePromise.value = null;
if (res?.code == proxy.$passCode) {
ElMessage.success('价值评估发起成功');
dialogInfo.value.visible = false;
page.value.curr = 1;
getTableData();
} else {
ElMessage.error(res.msg);
}
}) || [],
qualityScore: info.qualityScore,
evaluationRangeStart: info.evaluationRange ? info.evaluationRange[0] : null,
evaluationRangeEnd: info.evaluationRange ? info.evaluationRange[1] : null,
evaluationNote: info.evaluationNote,
evaluationAgencyGuid: res.data?.[1]?.candidateUsers?.[0]?.staffGuid,
})
}
} else {
ElMessage.error(res.msg);
}
console.log('daInfo', daInfo, info);
savePromise.value = saveCostAssess(params).then((res: any) => {
savePromise.value = null;
if (res?.code == proxy.$passCode) {
ElMessage.success('价值评估发起成功');
dialogInfo.value.visible = false;
page.value.curr = 1;
getTableData();
} else {
ElMessage.error(res.msg);
}
})
}
});
})
} else if (btn.value == 'cancel') {
dialogInfo.value.visible = false;
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!