Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
f7ed181b by lxs
Options

Merge branch 'develop' of http://117.78.60.236:8000/csbr-daop/fe-data-asset-management into develop

2 parents 430f6da1 88f63da2
Inline Side-by-side
Showing 4 changed files with 86 additions and 21 deletions
src/components/ApprovalProcess/src/ApprovalProcess.vue
......@@ -161,8 +161,10 @@ watch(() => props.processInstanceId, () => {
return;
}
renderProcessNodes();
}, {
immediate: true
})
onMounted(() => {
renderProcessNodes();
})
onBeforeRouteLeave((to, from) =>{
......
src/components/Form/index.vue
......@@ -1348,7 +1348,7 @@ const panelChange = (scope, row) => {
v-else-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'jpg' || file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'jpeg'">
<img class="file-img" src="../../assets/images/jpg.png" />
</template>
<div class="file-name">
<div class="file-name" :style="{ width: ['pdf', 'png', 'jpg', 'jpeg'].includes(file?.name?.substring(file.name.lastIndexOf('.') + 1).toLowerCase() ?? '') ? 'calc(100% - 140px)' : 'calc(100% - 130px)' }">
<ellipsis-tooltip :content="file.name" class-name="w100f"
:refName="'tooltipOver' + file.name"></ellipsis-tooltip>
</div>
......@@ -1426,7 +1426,7 @@ const panelChange = (scope, row) => {
v-else-if="file?.name?.substring(file.name.lastIndexOf('.') + 1).toLowerCase() === 'jpg' || file?.name?.substring(file.name.lastIndexOf('.') + 1).toLowerCase() === 'jpeg'">
<img class="file-img" src="../../assets/images/jpg.png" />
</template>
<div class="file-name">
<div class="file-name" :style="{ width: ['pdf', 'png', 'jpg', 'jpeg'].includes(file?.name?.substring(file.name.lastIndexOf('.') + 1).toLowerCase() ?? '') ? 'calc(100% - 140px)' : 'calc(100% - 130px)' }">
<ellipsis-tooltip :content="file?.name ?? ''" class-name="w100f"
:refName="'tooltipOver' + file?.name"></ellipsis-tooltip>
</div>
......
src/views/data_product/productListing.vue
......@@ -605,7 +605,10 @@ const getFirstPageData = () => {
onActivated(() => {
if (assetStore.isRefresh) {//如果是首次加载，则不需要调用
getFirstPageData();
getListingCountData();
page.value.curr = 1
tableInfo.value.page.curr = 1;
getTableData(currExchangeGuid.value);
assetStore.set(false);
}
})
......
src/views/data_product/productListingDetail.vue
......@@ -1210,32 +1210,42 @@ const setFormItems = (row: any = null, isDetail = false) => {
const selectChange = async (val, row, info) => {
if (row.field == 'damName') {
console.log(val, row, info, '--------1123123---------');
if (!val) {
return;
}
const data = row.options.filter(o => o.damName == val);
let coverageArea = (data.length && data[0].coverageArea) ? data[0].coverageArea : [];
await setFormItems({ ...info, coverageArea: coverageArea });
const res: any = await getFileByDamGuid({ damGuid: data[0].damGuid });
if (res.code == proxy.$passCode) {
formInfo.value.items.forEach((item: any) => {
// if (item.field == 'qualityEvaluationInstitution') {
// item.default = res.data.qualityEvaluationInstitution || [];
// }
// if (item.field == 'costAssessmentInstitution') {
// item.default = res.data.costAssessmentInstitution || [];
// }
formInfo.value.items.forEach((item: any) => {
if (item.field == 'costAssessmentFileInfo') {
item.default = res.data.assessmentFile || [];
item.default = data?.[0]?.assessmentFile || [];
} else if (item.field == 'qualityEvaluationFileInfo') {
item.default = data?.[0]?.evaluationFile || [];
} else if (item.field == 'qualityEvaluationFileInfo') {
item.default = data?.[0]?.evaluationFile || [];
} else if (item.field == 'commitmentLetterInfo') {
item.default = data?.[0]?.commitmentLetter || [];
} else if (item.field == 'qualityEvaluationInstitution') {
item.default = data?.[0]?.qualityEvaluationInstitution || '';
} else if (item.field == 'costAssessmentInstitution') {
item.default = data?.[0]?.costAssessmentInstitution || '';
}
if (item.field == 'qualityEvaluationFileInfo') {
item.default = res.data.evaluationFile || [];
}
});
}
// else if (item.field == 'pricingWay') {
// item.default = data?.[0]?.fixPriceWay || '';
// } else if (item.field == 'productPrice') {
// item.default = data?.[0]?.pricingAmount || '';
// } else if (item.field == 'priceUnit') {
// item.default = data?.[0]?.priceUnit || '';
// }
});
formInfo.value.items.at(0).default = val;
formInfo.value.items.at(1).default = data.length ? data[0].damType : '';
// formInfo.value.items.at(2).default = data.length ? data[0].subjectDomain : '';
formInfo.value.items.at(2).default = data.length ? data[0].damCode : '';
if (data?.[0]?.dataStartDate) {
formInfo.value.items.at(3).default = [data?.[0]?.dataStartDate, data?.[0]?.dataEndDate];
}
formInfo.value.items.at(4).defaultValue = data.length ? data[0].dataScale : '';
formInfo.value.items.at(4).default = data.length && data[0].dataScale != null ? changeNum(data[0].dataScale, 0) : '';
formInfo.value.items.at(5).defaultValue = data.length ? data[0].caseNumber : '';
......@@ -2308,6 +2318,51 @@ const rejectDialogBtnClick = (btn, info) => {
</div>
</div>
</div>
<div class="panel_wrap" v-if="(detailType == 'detail') && flowDetail.complianceInfoMap && Object.keys(flowDetail.complianceInfoMap).length > 0">
<div class="panel_header">
<div class="header_title">
<span class="title_text">
<span>审批合规信息</span>
</span>
</div>
</div>
<div class="panel_body" :class="{ collapse: collapseIcon3 }">
<div class="list_panel">
<div class="list_item">
<span class="item_label">是否遵守隐私法律和数据保护法规:</span>
<span class="item_value">{{ flowDetail.complianceInfoMap?.[1] ? (flowDetail.complianceInfoMap?.[1] == 'Y' ? '是' : '否') : '--' }}</span>
</div>
<div class="list_item">
<span class="item_label">是否存在侵犯他人版权的信息:</span>
<span class="item_value">{{ flowDetail.complianceInfoMap?.[2] ? (flowDetail.complianceInfoMap?.[2] == 'Y' ? '是' : '否') : '--' }}</span>
</div>
<div class="list_item">
<span class="item_label">是否符合研究伦理:</span>
<span class="item_value">{{ flowDetail.complianceInfoMap?.[3] ? (flowDetail.complianceInfoMap?.[3] == 'Y' ? '是' : '否') : '--' }}</span>
</div>
<div class="list_item">
<span class="item_label">是否遵守道德标准:</span>
<span class="item_value">{{ flowDetail.complianceInfoMap?.[4] ? (flowDetail.complianceInfoMap?.[4] == 'Y' ? '是' : '否') : '--' }}</span>
</div>
<div class="list_item">
<span class="item_label">数据来源是否合规:</span>
<span class="item_value">{{ flowDetail.complianceInfoMap?.[5] ? (flowDetail.complianceInfoMap?.[5] == 'Y' ? '是' : '否') : '--' }}</span>
</div>
<div class="list_item">
<span class="item_label">相关文档审查是否合规:</span>
<span class="item_value">{{ flowDetail.complianceInfoMap?.[6] ? (flowDetail.complianceInfoMap?.[6] == 'Y' ? '是' : '否') : '--' }}</span>
</div>
<div class="list_item">
<span class="item_label">是否符合国家标准及要求:</span>
<span class="item_value">{{ flowDetail.complianceInfoMap?.[7] ? (flowDetail.complianceInfoMap?.[7] == 'Y' ? '是' : '否') : '--' }}</span>
</div>
<div class="list_item">
<span class="item_label">数据内容是否合规:</span>
<span class="item_value">{{ flowDetail.complianceInfoMap?.[8] ? (flowDetail.complianceInfoMap?.[8] == 'Y' ? '是' : '否') : '--' }}</span>
</div>
</div>
</div>
</div>
<div class="panel_wrap" v-if="!dGuid">
<div class="panel_header">
<div class="header_title">
......@@ -2465,6 +2520,7 @@ const rejectDialogBtnClick = (btn, info) => {
.item_label {
width: 100px;
text-align: right;
flex-shrink: 0;
}
.file_item {
......@@ -2504,6 +2560,7 @@ const rejectDialogBtnClick = (btn, info) => {
cursor: pointer;
color: var(--el-color-primary);
margin-right: 8px;
white-space: nowrap;
}
}
......@@ -2534,6 +2591,7 @@ const rejectDialogBtnClick = (btn, info) => {
.item_label {
width: 100px;
text-align: right;
flex-shrink: 0;
}
.file_item {
......@@ -2565,6 +2623,7 @@ const rejectDialogBtnClick = (btn, info) => {
.file-name {
color: var(--el-color-regular);
margin-left: 4px;
width: calc(100% - 120px);
}
.file-preview {
......@@ -2572,6 +2631,7 @@ const rejectDialogBtnClick = (btn, info) => {
cursor: pointer;
color: var(--el-color-primary);
margin-right: 8px;
white-space: nowrap;
}
}
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!