516029e7 by xukangle

fix

1 parent 18d860d7
......@@ -114,8 +114,8 @@ pipeline {
//调用Publish Over SSH插件,上传docker-compose.yaml文件并且执行deploy脚本
sshPublisher(publishers: [sshPublisherDesc(configName: "csbr20", transfers: [sshTransfer(cleanRemote: false, excludes: '', execCommand: """
#使用k8s构建
kubectl delete -f /mnt/k8s/develop/daop-jgjf/fe-data-asset-management.yaml
kubectl apply -f /mnt/k8s/develop/daop-jgjf/fe-data-asset-management.yaml
kubectl delete -f /mnt/k8s/develop/daop-zcgl/fe-data-asset-management.yaml
kubectl apply -f /mnt/k8s/develop/daop-zcgl/fe-data-asset-management.yaml
""", execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: '/mnt/csbr/data', remoteDirectorySDF: false, removePrefix: '', sourceFiles: 'output/*.*')], usePromotionTimestamp: false, useWorkspaceInPromotion: false, verbose: false)])
echo 'Depoly ${SVN_FOLD} success ...'
......
......@@ -106,7 +106,7 @@ const systemRoutes: RouteRecordRaw[] = [
const asyncRoutes: Route.recordMainRaw[] = [
{
meta:{
title: '首页',
title: '数据资产看板',
},
children: [
...AssetIndex,
......
......@@ -237,13 +237,11 @@ const useUserStore = defineStore(
mark = 'data-quality'
} else if (item.meta.title == '数据盘点') {
mark = 'data-inventory'
} else if (item.meta.title == '首页') {
} else if (item.meta.title == '数据资产看板') {
mark = 'data-asset-index'
} else if (item.meta.title == '数据资产登记') {
mark = 'data-asset-register'
} else if (item.meta.title == '首页') {
mark = 'data-asset-index'
} else if (item.meta.title == '数据产品管理') {
} else if (item.meta.title == '数据产品管理') {
mark = 'data-asset'
} else if (item.meta.title == '入表交易融资') {
mark = 'data-transaction'
......
......@@ -298,6 +298,8 @@ const baseInfoFormRules = ref({
sceneDescription: [required('请填写应用场景描述')],
sceneLimit: [required('请填写应用场景限制')],
rightMain: [required('请填写权利主体')],
dataSources: [required('请选择数据来源')],
isPublicData: [required('请选择是否公共数据')],
});
const getTableFieldPromise: any = ref({});
......@@ -525,7 +527,7 @@ onBeforeMount(() => {
if (res.code == proxy.$passCode) {
detailInfo.value = res.data || {};
baseInfoFormItems.value.forEach((item: any) => {
item.default = detailInfo.value[item.field] || '';
item.default = detailInfo.value[item.field] == null ? '' : detailInfo.value[item.field];
if (item.field == 'subjectDomain') {
let tree = detailInfo.value.subjectDomainTree?.[0];
if (tree) {
......@@ -581,6 +583,7 @@ onBeforeMount(() => {
baseInfoFormItems.value[5].disabled = true;
}
}
console.log(baseInfoFormRef.value, baseInfoFormRef.value.ruleFormRef, 'ruleFormRefbaseInfoFormRef');
checkedInfo.value = {};
nextTick(() => {
baseInfoFormRules.value.damName[1] = checkExistName(checkedInfo.value, existDamName, detailInfo.value, 'damName');
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!