Skip to content

csbr-daop / fe-data-trusted-space

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

Merge branch 'develop' into release-test

2 parents cdcecf1c e0eee7fe
Inline Side-by-side
Showing 4 changed files with 115 additions and 135 deletions
.env.development
......@@ -8,6 +8,8 @@ VITE_API_BASEURL = https://daop-zcgl-test.zgsjzc.com/
VITE_IDASS_BASEURL = https://daop-test.zgsjzc.com/portalLogin
VITE_IDASS_BASEURL = https://idaas-test.csbr.cn/login
# 平台用户 接口请地址
VITE_APP_USER_API_BASEURL = gateway-server
......
src/views/data_asset/registerDetail.vue
......@@ -1298,7 +1298,7 @@ const passCommonDialogBtnClick = (btn, info) => {
<span class="item_value">{{ (assetDetailInfo.dataProtection == 6 ? assetDetailInfo.dataProtectionOther :
assetDetailInfo.dataProtectionName) ?? '--' }}</span>
</div>
<div class="list_item">
<div class="list_item" v-if="detailType != 'asset'">
<span class="item_label">所属行业:</span>
<span class="item_value"><ellipsis-tooltip
:content="(assetDetailInfo.ownIndustryName?.filter(u => u != '其他')?.join(',') +
......
src/views/data_asset/registerManagemant.vue
......@@ -409,7 +409,7 @@ const passDialogInfo = ref({
{
label: '',
type: "textarea",
placeholder: "请填写通过理由（必填）",
placeholder: "请填写通过理由（非必填）",
field: "approveSuggest",
clearable: true,
block: true,
......
src/views/data_asset/registerStart.vue
......@@ -56,6 +56,7 @@ const damTypes: any = ref([]);
const subjectDomainListData: any = ref([]);
const qualityEvaluationData: any = ref([]);
const costAssessmentData: any = ref([]);
const updateFrequencyListData: any = ref([]);
const getParentAreaPromise: any = ref(null);
const getAreaDataPromise: any = ref({});
......@@ -241,12 +242,6 @@ const setBaseFormItemsValue = (info) => {
}
} else if (item.field == 'updateFrequency') {
item.default = info[item.field] || [];
item.inputOptions.default = info['updateFrequencyOther'];
if (info['updateFrequency']?.includes(7)) {
item.inputOptions.visible = true;
} else {
item.inputOptions.visible = false;
}
} else if (item.field == 'ownIndustry') {
item.default = info[item.field] || [];
item.inputOptions.default = info['ownIndustryOther'];
......@@ -971,131 +966,93 @@ const baseFormItems: any = ref([
required: true
},
required: true,
}, {
label: "数据更新频率",
type: "checkbox-group-row",
placeholder: "",
field: "updateFrequency",
default: [],
block: true,
col: 'other-group-flex',
children: [
{
label: "每秒",
value: 1,
},
{
label: "每小时",
value: 2,
},
{
label: "每天",
value: 3,
},
{
label: "每周",
value: 4,
},
{
label: "每月",
value: 5,
},
{
label: "每年",
value: 6,
}, {
label: "其他",
value: 7,
},
],
inputOptions: {
label: '',
type: 'input',
placeholder: '请输入',
col: 'other-input',
field: 'updateFrequencyOther',
default: '',
visible: false,
required: true
},
required: true,
},
{
label: "数据所属行业",
label: "数据更新频率",
type: "checkbox-group-row",
placeholder: "",
col: 'other-group-flex',
field: "ownIndustry",
field: "updateFrequency",
default: [],
children: [
{
label: "能源",
value: 1,
},
{
label: "金融",
value: 2,
},
{
label: "环境",
value: 3,
},
{
label: "其他，手动填写",
value: 4,
},
],
inputOptions: {
label: '',
type: 'input',
placeholder: '请输入',
col: 'other-input',
field: 'ownIndustryOther',
default: '',
visible: false,
required: true
},
children: updateFrequencyListData.value,
required: true,
block: true,
},
{
label: "业务归属",
type: "checkbox-group-row",
placeholder: "",
col: 'other-group-flex',
field: "bizOwn",
default: [],
children: [
{
label: "生产类业务数据",
value: 1,
},
{
label: "管理类业务数据",
value: 2,
},
{
label: "经营分析类业务数据",
value: 3,
},
{
label: "其他，手动填写",
value: 4,
},
],
inputOptions: {
label: '',
type: 'input',
placeholder: '请输入',
col: 'other-input',
field: 'bizOwnOther',
default: '',
visible: false,
required: true
},
required: true,
block: true,
}
// {
// label: "数据所属行业",
// type: "checkbox-group-row",
// placeholder: "",
// col: 'other-group-flex',
// field: "ownIndustry",
// default: [],
// children: [
// {
// label: "能源",
// value: 1,
// },
// {
// label: "金融",
// value: 2,
// },
// {
// label: "环境",
// value: 3,
// },
// {
// label: "其他，手动填写",
// value: 4,
// },
// ],
// inputOptions: {
// label: '',
// type: 'input',
// placeholder: '请输入',
// col: 'other-input',
// field: 'ownIndustryOther',
// default: '',
// visible: false,
// required: true
// },
// required: true,
// block: true,
// },
// {
// label: "业务归属",
// type: "checkbox-group-row",
// placeholder: "",
// col: 'other-group-flex',
// field: "bizOwn",
// default: [],
// children: [
// {
// label: "生产类业务数据",
// value: 1,
// },
// {
// label: "管理类业务数据",
// value: 2,
// },
// {
// label: "经营分析类业务数据",
// value: 3,
// },
// {
// label: "其他，手动填写",
// value: 4,
// },
// ],
// inputOptions: {
// label: '',
// type: 'input',
// placeholder: '请输入',
// col: 'other-input',
// field: 'bizOwnOther',
// default: '',
// visible: false,
// required: true
// },
// required: true,
// block: true,
// }
])
const baseFormRules = ref({
......@@ -1125,7 +1082,7 @@ const baseFormRules = ref({
{ required: true, trigger: 'blur', message: "请填写数据取得方式其他内容" }
],
updateFrequency: [
{ type: 'array', required: true, trigger: 'change', message: "请填写数据更新频率" }
{ type: 'array', required: true, trigger: 'change', message: "请选择数据更新频率" }
],
updateFrequencyOther: [
{ required: true, trigger: 'blur', message: "请填写数据更新频率其他内容" }
......@@ -1291,11 +1248,11 @@ const porpertyInfoFormRef = ref();
const propertyFormItems: any = ref([
{
label: "产权类型",
type: "checkbox-group-row",
placeholder: "",
type: "select",
placeholder: "请选择",
field: "propertyType",
default: [],
children: [
options: [
{
label: "数据资源持有权",
value: 1,
......@@ -1309,16 +1266,18 @@ const propertyFormItems: any = ref([
value: 3,
}
],
multiple: true,
tagsTooltip: true,
collapse: true,
required: true,
},
{
label: "权利内容",
type: "checkbox-group-row",
placeholder: "",
type: "select",
placeholder: "请选择",
field: "rightsContent",
col: 'col2',
default: [],
children: [
options: [
{
label: "可转让",
value: 1,
......@@ -1340,6 +1299,9 @@ const propertyFormItems: any = ref([
value: 5,
}
],
multiple: true,
tagsTooltip: true,
collapse: true,
required: true,
},
{
......@@ -1347,8 +1309,8 @@ const propertyFormItems: any = ref([
type: "radio-group",
placeholder: "",
field: "isPledged",
default: 'N',
col: 'mr8',
default: 'N',
options: [
{
label: "是",
......@@ -1363,7 +1325,7 @@ const propertyFormItems: any = ref([
},
{
label: "持有状态",
type: "radio-group",
type: "select",
placeholder: "",
field: "holdingStatus",
default: 1,
......@@ -1412,6 +1374,7 @@ const propertyFormItems: any = ref([
placeholder: "",
field: "propertyTerm",
default: 'N',
col: 'mr8',
block: true,
options: [
{
......@@ -1446,6 +1409,9 @@ const propertyFormItems: any = ref([
clearable: true,
required: true,
visible: false,
style: {
'margin-right': '0px'
}
},
{
label: '公司名称',
......@@ -1972,6 +1938,8 @@ const save = () => {
});
}
onActivated(() => {
// getRegisterCatalogListData();
})
......@@ -2177,6 +2145,16 @@ onBeforeMount(() => {
proxy.$ElMessage.error(res.msg);
}
})
getParamsList({ dictType: '更新周期' }).then((res: any) => {
if (res.code == proxy.$passCode) {
const data = res.data || [];
updateFrequencyListData.value = data;
let item = baseFormItems.value.find(item => item.field == 'updateFrequency');
item && (item.children = updateFrequencyListData.value);
} else {
proxy.$ElMessage.error(res.msg);
}
})
});
onMounted(() => {
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!