Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
22d5d599 by lihua
Options

修复全国不能选择的问题

1 parent 38bfb485
Inline Side-by-side
Showing 5 changed files with 108 additions and 63 deletions
src/api/modules/dataAsset.ts
......@@ -246,7 +246,7 @@ export const getServiceDetail = (params) => request({
/** 获取可使用的资产目录列表 */
export const getRegisterCatalogList = () => request({
url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-catalog-table/dam-list?isRegister=${'Y'}`,
url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-catalog-table/dam-list?isRegister=${'Y'}&foundMode=4`,
method: 'get'
})
......
src/views/data_asset/registerJSZQDetail.vue
......@@ -1324,8 +1324,8 @@ const passCommonDialogBtnClick = (btn, info) => {
</div>
</div>
</div>
<div class="label-main" v-if="assetDetailInfo.productKeywords">
<div class="key-label" v-for="(item, index) in assetDetailInfo.productKeywords?.split(',') || []" :style="{ 'margin-left': index > 0 ? '4px' : '0px' }">{{ item }}</div>
<div class="label-main" v-if="assetDetailInfo.productKeywords?.length">
<div class="key-label" v-for="(item, index) in assetDetailInfo.productKeywords || []" :style="{ 'margin-left': index > 0 ? '4px' : '0px' }">{{ item }}</div>
</div>
<div class="applicationScenarios"
:style="{ 'margin-right': (isTruncated && !isExpanded) ? '30px' : '0px', WebkitLineClamp: (!isTruncated ? 'inherit' : (isExpanded ? 'inherit' : 2)), WebkitBoxOrient: 'vertical' }">
......
src/views/data_asset/registerManagemant.vue
......@@ -227,17 +227,10 @@ const currTableData: any = ref({});
const btnClick = (btn) => {
const type = btn.value;
if (type == 'create') {
if (btn.exchangeName.includes('数交所（勿删）') || btn.exchangeName.includes('江苏省数据交易所')) {
router.push({
name: 'registerStartJS',
query: { exchangeGuid: btn.exchangeGuid, type }
});
} else {
router.push({
name: 'registerStart',
query: { exchangeGuid: btn.exchangeGuid, type }
});
}
router.push({
name: 'registerStartJS',
query: { exchangeGuid: btn.exchangeGuid, type }
});
} else if (type == 'search') {
exchangGuid.value = btn.exchangeGuid;
pageInfo.value.curr = 1;
......
src/views/data_asset/registerStart.vue
......@@ -379,18 +379,6 @@ const getRegisterCatalogListData = (dam: any = {}) => {
dataScaleItem.disabled = false;
}
}
if (draftDetailInfo.value.damGuid) {
let da = registerCatalogList.value.find(r => r.guid == draftDetailInfo.value.damGuid);
if (da && da.dataCount != null) {
dataScaleItem.disabled = true;
if (draftDetailInfo.value.dataScale == null) {
draftDetailInfo.value.dataScale = da.dataCount;
setBaseFormItemsValue(draftDetailInfo.value);
}
} else {
dataScaleItem.disabled = false;
}
}
} else {
ElMessage.error(res.msg);
}
......
src/views/data_asset/registerStartJS.vue
......@@ -20,6 +20,9 @@ import {
registerUpdate,
getRegiaterDetail
} from '@/api/modules/dataAssetZq'
import {
getRegisterCatalogList
} from '@/api/modules/dataAsset'
import useUserStore from "@/store/modules/user";
import { getCamundaDeploymentId } from "@/api/modules/workFlowService"
import useDataAssetStore from "@/store/modules/dataAsset";
......@@ -45,8 +48,8 @@ const dictListMap = ref({});
/** 所属疾病的下拉列表 */
const diseaseListData: any = ref([]);
/** 产品应用方向字典列表 */
const productDirectionListData: any = ref([]);
/** 可下拉选择的资产名称 */
const registerCatalogList: any = ref([]);
const formRef = ref();
......@@ -60,7 +63,25 @@ const productBaseInfoItems = ref([{
placeholder: "请输入",
required: true,
clearable: true
}, {
},
// {
// label: '数据资产名称',
// type: 'select',
// placeholder: '请选择',
// options: [],
// field: 'productName',
// maxlength: 50,
// allowCreate: true,
// default: '',
// filterable: true,
// props: {
// value: 'guid',
// label: 'damName'
// },
// clearable: true,
// required: true
// },
{
label: '产品编码',
type: 'input',
placeholder: '自动生成',
......@@ -276,7 +297,7 @@ const productBaseInfoItems = ref([{
type: 'select',
placeholder: '请选择',
field: 'productDirection',
options: productDirectionListData.value,
options: dictListMap.value['productDirection'],
props: {
value: 'value',
label: 'label'
......@@ -300,7 +321,7 @@ const productBaseInfoItems = ref([{
label: "产品关键词",
field: 'productKeywords',
default: [],
maxlength: 200,
maxlength: 50,
placeholder: "请输入关键词，按回车键确认",
required: true,
clearable: true,
......@@ -334,7 +355,9 @@ const productBaseInfoFormRules = ref({
dataCoverage: [required('请选择数据覆盖范围')],
productDirection: [required('请选择产品应用方向')],
versionName: [required('请输入版本名称')],
productKeywords: [required('请输入产品关键词')],
productKeywords: [{
type: 'array', required: true, message: '请输入产品关键词', trigger: 'change',
}],
productDesc: [required('请输入产品描述')]
});
......@@ -361,6 +384,8 @@ const handleProductBaseFormSelectChange = (val, row, info) => {
if (row.field == 'domain') {
info.scenario = ''; //清空下应用场景
setProductBaseFormItems(info);
} else if (row.field == 'productName') {
// TODO， 带出资产登记的所有信息。
}
}
......@@ -1391,38 +1416,40 @@ const setRegisterFormItems = (formValue, isEdit = false) => {
item.options = !formValue['industry'] ? [] : (dictListMap.value['industry'].find(v => v.value == formValue['industry']).childDictList || []);
} else if (item.field == 'coverageArea') {
item && item.children?.length && (item.children[0].visible = formValue['coverageArea'] != 'all');
let coverageArea = formValue.coverageArea;
if (coverageArea && Array.isArray(coverageArea) && coverageArea.length > 0) {
if (coverageArea[0][0] == 'all') {
item.default = 'all';
if (item.children?.length) {
item.children[0].visible = false;
item.children[0].default = [];
}
} else {
item.default = '';
if (item.children?.length) {
item.children[0].visible = true;
item.children[0].default = coverageArea[0] as any;
let p: any = [];
coverageArea?.forEach(area => {
if (p.includes(area[0])) {
return;
if (isEdit) {
let coverageArea = formValue.coverageArea;
if (coverageArea && Array.isArray(coverageArea) && coverageArea.length > 0) {
if (coverageArea[0][0] == 'all') {
item.default = 'all';
if (item.children?.length) {
item.children[0].visible = false;
item.children[0].default = [];
}
} else {
item.default = '';
if (item.children?.length) {
item.children[0].visible = true;
item.children[0].default = coverageArea[0] as any;
let p: any = [];
coverageArea?.forEach(area => {
if (p.includes(area[0])) {
return;
}
p.push(area[0]);
getArea({ value: area[0], level: 1 }, () => { })
});
let ps: any = []
for (const key in getAreaDataPromise.value) {
ps.push(getAreaDataPromise.value[key])
}
p.push(area[0]);
getArea({ value: area[0], level: 1 }, () => { })
});
let ps: any = []
for (const key in getAreaDataPromise.value) {
ps.push(getAreaDataPromise.value[key])
Promise.all(ps).then(() => {
item.children[0].default = coverageArea[0];
});
}
Promise.all(ps).then(() => {
item.children[0].default = coverageArea[0];
});
}
} else {
item.default = '';
}
} else {
item.default = '';
}
} else if (item.field == 'sensitiveInformation') {
item.inputOptions && (item.inputOptions.default = formValue[item.inputOptions.field]);
......@@ -1867,8 +1894,9 @@ onBeforeMount(async () => {
fullscreenLoading.value = false;
if (res?.code == proxy.$passCode) {
detailInfo.value = res.data || {};
getRegisterCatalogListData();
detailInfo.value.dataSources = (detailInfo.value.dataSources || '') + '';
detailInfo.value.productKeywords = !detailInfo.value.productKeywords ? [] : detailInfo.value.productKeywords.split(',');
detailInfo.value.productKeywords = detailInfo.value.productKeywords || [];
let dataCoverage = detailInfo.value.dataCoverage;
if (dataCoverage.length == 1 && dataCoverage[0] == '1') {
detailInfo.value.dataCoverages = '1';
......@@ -1949,9 +1977,39 @@ onBeforeMount(async () => {
}).catch(() => {
fullscreenLoading.value = false;
})
} else {
getRegisterCatalogListData();
}
})
const getRegisterCatalogListData = () => {
getRegisterCatalogList().then((res: any) => {
if (res.code == proxy.$passCode) {
const data = res.data || [];
productBaseInfoItems.value[0].options = registerCatalogList.value = data;
if (guid) {
const opt = detailInfo.value.damGuid && data.find(item => item.guid == detailInfo.value.damGuid);
productBaseInfoItems.value[0].default = opt ? opt.guid : detailInfo.value.productName;
}
// let dataScaleItem = baseFormItems.value.find(item => item.field == 'dataScale');
// if (draftDetailInfo.value.damGuid) {
// let da = registerCatalogList.value.find(r => r.guid == draftDetailInfo.value.damGuid);
// if (da && da.dataCount != null) {
// dataScaleItem.disabled = true;
// if (draftDetailInfo.value.dataScale == null) {
// draftDetailInfo.value.dataScale = da.dataCount;
// setBaseFormItemsValue(draftDetailInfo.value);
// }
// } else {
// dataScaleItem.disabled = false;
// }
// }
} else {
proxy.$ElMessage.error(res.msg);
}
});
}
const cancel = () => {
proxy.$openMessageBox("当前页面尚未保存，确定放弃修改吗？", () => {
userStore.setTabbar(userStore.tabbar.filter((tab: any) => tab.fullPath !== fullPath));
......@@ -1990,7 +2048,7 @@ const saveDraft = () => {
Object.assign(params, {
...baseInfoValue,
dataCoverage: baseInfoValue.dataCoverages == '1' ? ['1'] : baseInfoValue.dataCoverage,
productKeywords: baseInfoValue.productKeywords.join(',')
productKeywords: baseInfoValue.productKeywords || []
}, {
reqParamListRQVOS: inputParamsData.value,
respParamListRQVOS: respParamsData.value,
......@@ -2014,6 +2072,12 @@ const saveDraft = () => {
} else if (!registerInfoValue.coverageArea) {
params.registerRQVO.coverageArea = [registerInfoValue.coverageAreas];
}
// let productName = params.productName;
// let da = registerCatalogList.value.find(r => r.guid == productName);
// if (da) {
// params.damGuid = da.guid;
// params.productName = da.damName;
// }
fullscreenLoading.value = true;
if (guid) {
params.guid = guid;
......@@ -2184,7 +2248,7 @@ const save = () => {
Object.assign(params, {
...baseInfoValue,
dataCoverage: baseInfoValue.dataCoverages == '1' ? ['1'] : baseInfoValue.dataCoverage,
productKeywords: baseInfoValue.productKeywords.join(',')
productKeywords: baseInfoValue.productKeywords || []
}, {
reqParamListRQVOS: inputParamsData.value,
respParamListRQVOS: respParamsData.value,
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!