Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
16de1226 by xukangle
Options

fix

1 parent 6ff7ed66
Inline Side-by-side
Showing 6 changed files with 204 additions and 170 deletions
src/views/data_asset/registerCatalogManagement.vue
......@@ -86,7 +86,7 @@ const searchItemList = ref([
label: "",
field: "dataSources",
default: "",
placeholder: "数据来源",
placeholder: "产品来源",
clearable: true,
filterable: true,
options: dataSources.value,
......@@ -423,7 +423,7 @@ const handleWindowResize = () => {
<div class="right">{{ item.damTypeName || '--' }}</div>
</div>
<div class="mid-content">
<div class="left">数据来源</div>
<div class="left">产品来源</div>
<div class="right">{{ item.foundMode ? (item.foundMode === 1 ? '自建' : '加工交付') : '--'
}}</div>
</div>
......
src/views/data_asset/registerStart.vue
......@@ -168,44 +168,44 @@ const tenantDetail: any = ref({});
/** 获取当前登录会员，服务商，企业等详情。 */
const getTenantDetail = () => {
let ps: any = [], tentData = {};
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(() => {
tenantDetail.value = tentData;
propertyFormItems.value.forEach((item, index) => {
if (item.field == 'address' || item.field == 'socialCreditCode' || item.field == 'registrationDate' || item.field == 'businessLicenseStartDate' || item.field == 'businessLicenseEndDate') {//在会员详情处获取。
item.default = tenantDetail.value[item.field];
} else if (item.field == 'businessLicenseJson') {
item.default = tenantDetail.value[item.field] || [];
if (!item.default.length) {
item.visible = false;
} else {
item.visible = true;
}
} else if (item.field == 'officeLocation') {
if (!guid && tenantDetail.value.province) {
item.default = [[tenantDetail.value.province, tenantDetail.value.city]];
}
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(() => {
tenantDetail.value = tentData;
propertyFormItems.value.forEach((item, index) => {
if (item.field == 'address' || item.field == 'socialCreditCode' || item.field == 'registrationDate' || item.field == 'businessLicenseStartDate' || item.field == 'businessLicenseEndDate') {//在会员详情处获取。
item.default = tenantDetail.value[item.field];
} else if (item.field == 'businessLicenseJson') {
item.default = tenantDetail.value[item.field] || [];
if (!item.default.length) {
item.visible = false;
} else {
item.visible = true;
}
});
}).catch(() => {
fullscreenLoading.value = false;
} else if (item.field == 'officeLocation') {
if (!guid && tenantDetail.value.province) {
item.default = [[tenantDetail.value.province, tenantDetail.value.city]];
}
}
});
}).catch(() => {
fullscreenLoading.value = false;
});
}
const setBaseFormItemsValue = (info) => {
......@@ -310,28 +310,28 @@ const setUploadFormItemsValue = (info) => {
uploadFormItems.value.forEach(item => {
if (item.field == 'registerLetter') {
let registerLetter = attach.registerLetter ? attach.registerLetter : [];
if(registerLetter.length){
if (registerLetter.length) {
registerLetter[0].name = registerLetter[0].name
}
item.default = registerLetter;
item.templateUrl = attachDataInfo.value.register_letter;
} else if (item.field == 'evaluationFile') {
let evaluationFile = attach.evaluationFile ? attach.evaluationFile : [];
if(evaluationFile.length){
if (evaluationFile.length) {
evaluationFile[0].name = evaluationFile[0].name
}
item.default = evaluationFile;
item.templateUrl = attachDataInfo.value.quality_evaluation_file;
} else if (item.field == 'assessmentFile') {
let assessmentFile = attach.assessmentFile ? attach.assessmentFile : [];
if(assessmentFile.length){
if (assessmentFile.length) {
assessmentFile[0].name = assessmentFile[0].name
}
item.default = assessmentFile;
item.templateUrl = attachDataInfo.value.cost_assessment_file;
} else if (item.field === 'commitmentLetter') {
let commitmentLetter = attach.commitmentLetter ? attach.commitmentLetter : [];
if(commitmentLetter.length){
if (commitmentLetter.length) {
commitmentLetter[0].name = commitmentLetter[0].name
}
item.default = commitmentLetter;
......@@ -423,7 +423,7 @@ onActivated(() => {
})
onBeforeMount(() => {
restart.value = localStorage.getItem('isRestart')?true:false;
restart.value = localStorage.getItem('isRestart') ? true : false;
if (guid) {
fullscreenLoading.value = true;
getRegiaterDetail({ guid: guid }).then((res: any) => {
......@@ -1939,19 +1939,19 @@ const saveDraft = () => {
name: u.name
}
}) || [],
evaluationFile: uploadFormInline['evaluationFile']?.map(u => {
evaluationFile: uploadFormInline['evaluationFile']?.map(u => {
return {
url: u.url,
name: u.name
}
}) || [],
assessmentFile: uploadFormInline['assessmentFile']?.map(u => {
assessmentFile: uploadFormInline['assessmentFile']?.map(u => {
return {
url: u.url,
name: u.name
}
}) || [],
commitmentLetter: uploadFormInline['commitmentLetter']?.map(u => {
commitmentLetter: uploadFormInline['commitmentLetter']?.map(u => {
return {
url: u.url,
name: u.name
......@@ -2041,30 +2041,30 @@ const save = () => {
let uploadFormInline = uploadFormRef.value.formInline;
let registerAttachment: any = {
// fileHash: uploadFormInline.fileHash,
registerLetter: uploadFormInline['registerLetter']?.map(u => {
return {
url: u.url,
name: u.name
}
}) || [],
evaluationFile: uploadFormInline['evaluationFile']?.map(u => {
return {
url: u.url,
name: u.name
}
}) || [],
assessmentFile: uploadFormInline['assessmentFile']?.map(u => {
return {
url: u.url,
name: u.name
}
}) || [],
commitmentLetter: uploadFormInline['commitmentLetter']?.map(u => {
return {
url: u.url,
name: u.name
}
}) || [],
registerLetter: uploadFormInline['registerLetter']?.map(u => {
return {
url: u.url,
name: u.name
}
}) || [],
evaluationFile: uploadFormInline['evaluationFile']?.map(u => {
return {
url: u.url,
name: u.name
}
}) || [],
assessmentFile: uploadFormInline['assessmentFile']?.map(u => {
return {
url: u.url,
name: u.name
}
}) || [],
commitmentLetter: uploadFormInline['commitmentLetter']?.map(u => {
return {
url: u.url,
name: u.name
}
}) || [],
}
if (qualityEvaluationInstitution.value) {
registerAttachment.qualityEvaluationInstitution = qualityEvaluationInstitution.value
......
src/views/data_product/productListing.vue
......@@ -360,91 +360,114 @@ const tableBtnClick = (scope, btn) => {
}
if (type == 'up') {
// tableSwitchChange('Y', scope, 'listingStatus')
console.log('上架', scope)
let params: any = {}
if (scope.row.exchangeGuid) {
// 数交所上架 [params.commitmentLetterInfo[0].url]
params = {
guid: scope.row.guid,
accreditFile: scope.row.accreditFile,
caseNumber: scope.row.caseNumber,
commitmentLetter: scope.row.commitmentLetter,
content: scope.row.productDesc,
costAssessmentInstitution: scope.row.costAssessmentInstitution,
costAssessmentInstitutionGuid: scope.row.costAssessmentInstitutionGuid,
coverageArea: scope.row.coverageArea,
damCode: scope.row.damCode,
damGuid: scope.row.damGuid,
damName: scope.row.damName,
damType: scope.row.damType,
dataScale: scope.row.dataScale,
deliveryWay: scope.row.deliveryWay,
evaluationFile: scope.row.evaluationFile,
exchangeGuid: scope.row.exchangeGuid,
feeDesc: scope.row.feeDesc,
immediateApprove: true,
priceUnit: scope.row.priceUnit,
pricingWay: scope.row.pricingWay,
productPic: scope.row.productPic,
productPrice: scope.row.productPrice,
qualityEvaluationInstitution: scope.row.qualityEvaluationInstitution,
qualityEvaluationInstitutionGuid: scope.row.qualityEvaluationInstitutionGuid,
timeAreaStart: scope.row.timeAreaStart,
timeAreaEnd: scope.row.timeAreaEnd,
registrationCertificate: scope.row.registrationCertificate,
productDetail: scope.row.productDetail,
assessmentFile: scope.row.assessmentFile,
}
listingUpdate(params).then((res: any) => {
if (res.code == proxy.$passCode) {
ElMessage({
type: "success",
message: '提交成功',
});
getTableData();
} else {
ElMessage({
type: "error",
message: res.msg,
});
// console.log('上架', scope)
// let params: any = {}
// if (scope.row.exchangeGuid) {
// // 数交所上架 [params.commitmentLetterInfo[0].url]
// params = {
// guid: scope.row.guid,
// accreditFile: scope.row.accreditFile,
// caseNumber: scope.row.caseNumber,
// commitmentLetter: scope.row.commitmentLetter,
// content: scope.row.productDesc,
// costAssessmentInstitution: scope.row.costAssessmentInstitution,
// costAssessmentInstitutionGuid: scope.row.costAssessmentInstitutionGuid,
// coverageArea: scope.row.coverageArea,
// damCode: scope.row.damCode,
// damGuid: scope.row.damGuid,
// damName: scope.row.damName,
// damType: scope.row.damType,
// dataScale: scope.row.dataScale,
// deliveryWay: scope.row.deliveryWay,
// evaluationFile: scope.row.evaluationFile,
// exchangeGuid: scope.row.exchangeGuid,
// feeDesc: scope.row.feeDesc,
// immediateApprove: true,
// priceUnit: scope.row.priceUnit,
// pricingWay: scope.row.pricingWay,
// productPic: scope.row.productPic,
// productPrice: scope.row.productPrice,
// qualityEvaluationInstitution: scope.row.qualityEvaluationInstitution,
// qualityEvaluationInstitutionGuid: scope.row.qualityEvaluationInstitutionGuid,
// timeAreaStart: scope.row.timeAreaStart,
// timeAreaEnd: scope.row.timeAreaEnd,
// registrationCertificate: scope.row.registrationCertificate,
// productDetail: scope.row.productDetail,
// assessmentFile: scope.row.assessmentFile,
// }
// listingUpdate(params).then((res: any) => {
// if (res.code == proxy.$passCode) {
// ElMessage({
// type: "success",
// message: '提交成功',
// });
// getTableData();
// } else {
// ElMessage({
// type: "error",
// message: res.msg,
// });
// }
// })
// } else {
// // 门户数据专区上架
// params = {
// guid: scope.row.guid,
// caseNumber: scope.row.caseNumber,
// content: scope.row.productDesc,
// coverageArea: scope.row.coverageArea,
// damGuid: scope.row.damGuid,
// damName: scope.row.damName,
// damType: scope.row.damType,
// dataScale: scope.row.dataScale,
// deliveryWay: scope.row.deliveryWay,
// feeDesc: scope.row.feeDesc,
// immediateApprove: true,
// priceUnit: scope.row.priceUnit,
// pricingWay: scope.row.pricingWay,
// productPic: scope.row.productPic,
// productPrice: scope.row.productPrice,
// timeAreaStart: scope.row.timeAreaStart,
// timeAreaEnd: scope.row.timeAreaEnd,
// }
// listingUpdateGateway(params).then((res: any) => {
// if (res.code == proxy.$passCode) {
// ElMessage({
// type: "success",
// message: '提交成功',
// });
// getTableData();
// } else {
// ElMessage({
// type: "error",
// message: res.msg,
// });
// }
// })
// console.log('上架', scope)
// }
if (row.exchangeGuid) {
router.push({
name: 'productListingDetail',
query: {
guid: row.guid,
exchangeName: row.exchangeName,
type: type == 'edit' ? 'edit' : 'redit',
case: '1',
name: row.damName,
exchangeGuid: row.exchangeGuid
}
})
} else {
// 门户数据专区上架
params = {
guid: scope.row.guid,
caseNumber: scope.row.caseNumber,
content: scope.row.productDesc,
coverageArea: scope.row.coverageArea,
damGuid: scope.row.damGuid,
damName: scope.row.damName,
damType: scope.row.damType,
dataScale: scope.row.dataScale,
deliveryWay: scope.row.deliveryWay,
feeDesc: scope.row.feeDesc,
immediateApprove: true,
priceUnit: scope.row.priceUnit,
pricingWay: scope.row.pricingWay,
productPic: scope.row.productPic,
productPrice: scope.row.productPrice,
timeAreaStart: scope.row.timeAreaStart,
timeAreaEnd: scope.row.timeAreaEnd,
}
listingUpdateGateway(params).then((res: any) => {
if (res.code == proxy.$passCode) {
ElMessage({
type: "success",
message: '提交成功',
});
getTableData();
} else {
ElMessage({
type: "error",
message: res.msg,
});
router.push({
name: 'productListingDetail',
query: {
guid: row.guid,
type: type == 'edit' ? 'edit' : 'redit',
case: '2',
name: row.damName
}
})
console.log('上架', scope)
});
}
}
......
src/views/data_product/productListingDetail.vue
......@@ -72,6 +72,7 @@ const getArea = (node, resolve) => {
return;
}
if (!getAreaDataPromise.value[node.value]) {
console.log('getAreaDataPromise', getAreaDataPromise.value);
getAreaDataPromise.value[node.value] = getAreaData(params).then((res: any) => {
getAreaDataPromise.value[node.value] = null;
node.loaded = true;
......@@ -264,13 +265,14 @@ const formInfo = ref<any>({
clearable: true,
required: true,
col: 'checkbox-right',
visible: true
visible: false
}
],
clearable: false,
required: true,
col: 'checkbox-cascader'
}, {
},
{
label: "交付方式",
type: "select",
placeholder: "请选择",
......@@ -1191,6 +1193,7 @@ const setFormItems = (row: any = null, isDetail = false) => {
const selectChange = async (val, row, info) => {
if (row.field == 'damName') {
console.log(val, row, info, '--------1123123---------');
const data = row.options.filter(o => o.damName == val);
let coverageArea = (data.length && data[0].coverageArea) ? data[0].coverageArea : [];
await setFormItems({ ...info, coverageArea: coverageArea });
......@@ -1483,9 +1486,17 @@ onBeforeMount(async () => {
if (route.query.exchangeGuid) {
getTemplateInfo();
}
setTimeout(() => {
formInfo.value.items.forEach(item => {
if (item.field == 'coverageAreas') {
item.children[0].visible = true
}
})
}, 0);
})
const pageLIstInfo = ref<any>();
const getTableData = async () => {
const res: any = await getListingList({
......@@ -1508,13 +1519,13 @@ const getTemplateInfo = () => {
if (res.code == proxy.$passCode) {
formInfo.value.items.forEach(item => {
if (item.field == 'commitmentLetterInfo') {
item.templateUrl = res.data.commitment_letter || '';
item.templateUrl = res.data?.commitment_letter || '';
}
if (item.field == 'accreditFileInfo') {
item.templateUrl = res.data.authorization_file || '';
item.templateUrl = res.data?.authorization_file || '';
}
if (item.field == 'productDetailInfo') {
item.templateUrl = res.data.detail_file || '';
item.templateUrl = res.data?.detail_file || '';
}
})
} else {
......
src/views/indexNewBigScreen.vue
......@@ -91,18 +91,18 @@ const cardList = ref([
label: "最近入表时间",
unit: "",
},
{
name: "dataCategoryNum",
value: 0,
label: "数据分类",
unit: "",
},
{
name: "dataGradeNum",
value: 0,
label: "数据分级",
unit: "",
},
// {
// name: "dataCategoryNum",
// value: 0,
// label: "数据分类",
// unit: "",
// },
// {
// name: "dataGradeNum",
// value: 0,
// label: "数据分级",
// unit: "",
// },
]);
const checkImage = () => {
......@@ -869,7 +869,7 @@ const handleChangeTime = (val) => {
<div class="row-per">
<div class="header">
<div class="left-pd"></div>
<div class="header-title">资产授信情况</div>
<div class="header-title">数据产品调用情况</div>
</div>
<div style="height: calc(100% - 40px);">
<Table class="drak-table" v-if="!financingTableInfo.loading1" :tableInfo="financingTableInfo"
......
src/views/security_menu/index.vue
......@@ -56,7 +56,7 @@ const tableInfo = ref({
},
{
label: "合规评估报告", field: "complianceEvaluateReport", width: 120, type: 'text_btn', value: 'complianceEvaluateReport', columClass: 'text_btn', getName: (scope) => {
console.log('scope合规评估报告', scope);
const value = scope.row.complianceEvaluateReport?.length > 0;
return scope.row.complianceEvaluateReport?.length > 0 ? '预览' : '--';
}
},
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!