fix
Showing
4 changed files
with
9 additions
and
8 deletions
| ... | @@ -114,8 +114,8 @@ pipeline { | ... | @@ -114,8 +114,8 @@ pipeline { |
| 114 | //调用Publish Over SSH插件,上传docker-compose.yaml文件并且执行deploy脚本 | 114 | //调用Publish Over SSH插件,上传docker-compose.yaml文件并且执行deploy脚本 |
| 115 | sshPublisher(publishers: [sshPublisherDesc(configName: "csbr20", transfers: [sshTransfer(cleanRemote: false, excludes: '', execCommand: """ | 115 | sshPublisher(publishers: [sshPublisherDesc(configName: "csbr20", transfers: [sshTransfer(cleanRemote: false, excludes: '', execCommand: """ |
| 116 | #使用k8s构建 | 116 | #使用k8s构建 |
| 117 | kubectl delete -f /mnt/k8s/develop/daop-jgjf/fe-data-asset-management.yaml | 117 | kubectl delete -f /mnt/k8s/develop/daop-zcgl/fe-data-asset-management.yaml |
| 118 | kubectl apply -f /mnt/k8s/develop/daop-jgjf/fe-data-asset-management.yaml | 118 | kubectl apply -f /mnt/k8s/develop/daop-zcgl/fe-data-asset-management.yaml |
| 119 | """, execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: '/mnt/csbr/data', remoteDirectorySDF: false, removePrefix: '', sourceFiles: 'output/*.*')], usePromotionTimestamp: false, useWorkspaceInPromotion: false, verbose: false)]) | 119 | """, execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: '/mnt/csbr/data', remoteDirectorySDF: false, removePrefix: '', sourceFiles: 'output/*.*')], usePromotionTimestamp: false, useWorkspaceInPromotion: false, verbose: false)]) |
| 120 | 120 | ||
| 121 | echo 'Depoly ${SVN_FOLD} success ...' | 121 | echo 'Depoly ${SVN_FOLD} success ...' | ... | ... |
| ... | @@ -106,7 +106,7 @@ const systemRoutes: RouteRecordRaw[] = [ | ... | @@ -106,7 +106,7 @@ const systemRoutes: RouteRecordRaw[] = [ |
| 106 | const asyncRoutes: Route.recordMainRaw[] = [ | 106 | const asyncRoutes: Route.recordMainRaw[] = [ |
| 107 | { | 107 | { |
| 108 | meta:{ | 108 | meta:{ |
| 109 | title: '首页', | 109 | title: '数据资产看板', |
| 110 | }, | 110 | }, |
| 111 | children: [ | 111 | children: [ |
| 112 | ...AssetIndex, | 112 | ...AssetIndex, | ... | ... |
| ... | @@ -237,13 +237,11 @@ const useUserStore = defineStore( | ... | @@ -237,13 +237,11 @@ const useUserStore = defineStore( |
| 237 | mark = 'data-quality' | 237 | mark = 'data-quality' |
| 238 | } else if (item.meta.title == '数据盘点') { | 238 | } else if (item.meta.title == '数据盘点') { |
| 239 | mark = 'data-inventory' | 239 | mark = 'data-inventory' |
| 240 | } else if (item.meta.title == '首页') { | 240 | } else if (item.meta.title == '数据资产看板') { |
| 241 | mark = 'data-asset-index' | 241 | mark = 'data-asset-index' |
| 242 | } else if (item.meta.title == '数据资产登记') { | 242 | } else if (item.meta.title == '数据资产登记') { |
| 243 | mark = 'data-asset-register' | 243 | mark = 'data-asset-register' |
| 244 | } else if (item.meta.title == '首页') { | 244 | } else if (item.meta.title == '数据产品管理') { |
| 245 | mark = 'data-asset-index' | ||
| 246 | } else if (item.meta.title == '数据产品管理') { | ||
| 247 | mark = 'data-asset' | 245 | mark = 'data-asset' |
| 248 | } else if (item.meta.title == '入表交易融资') { | 246 | } else if (item.meta.title == '入表交易融资') { |
| 249 | mark = 'data-transaction' | 247 | mark = 'data-transaction' | ... | ... |
| ... | @@ -298,6 +298,8 @@ const baseInfoFormRules = ref({ | ... | @@ -298,6 +298,8 @@ const baseInfoFormRules = ref({ |
| 298 | sceneDescription: [required('请填写应用场景描述')], | 298 | sceneDescription: [required('请填写应用场景描述')], |
| 299 | sceneLimit: [required('请填写应用场景限制')], | 299 | sceneLimit: [required('请填写应用场景限制')], |
| 300 | rightMain: [required('请填写权利主体')], | 300 | rightMain: [required('请填写权利主体')], |
| 301 | dataSources: [required('请选择数据来源')], | ||
| 302 | isPublicData: [required('请选择是否公共数据')], | ||
| 301 | }); | 303 | }); |
| 302 | 304 | ||
| 303 | const getTableFieldPromise: any = ref({}); | 305 | const getTableFieldPromise: any = ref({}); |
| ... | @@ -525,7 +527,7 @@ onBeforeMount(() => { | ... | @@ -525,7 +527,7 @@ onBeforeMount(() => { |
| 525 | if (res.code == proxy.$passCode) { | 527 | if (res.code == proxy.$passCode) { |
| 526 | detailInfo.value = res.data || {}; | 528 | detailInfo.value = res.data || {}; |
| 527 | baseInfoFormItems.value.forEach((item: any) => { | 529 | baseInfoFormItems.value.forEach((item: any) => { |
| 528 | item.default = detailInfo.value[item.field] || ''; | 530 | item.default = detailInfo.value[item.field] == null ? '' : detailInfo.value[item.field]; |
| 529 | if (item.field == 'subjectDomain') { | 531 | if (item.field == 'subjectDomain') { |
| 530 | let tree = detailInfo.value.subjectDomainTree?.[0]; | 532 | let tree = detailInfo.value.subjectDomainTree?.[0]; |
| 531 | if (tree) { | 533 | if (tree) { |
| ... | @@ -581,6 +583,7 @@ onBeforeMount(() => { | ... | @@ -581,6 +583,7 @@ onBeforeMount(() => { |
| 581 | baseInfoFormItems.value[5].disabled = true; | 583 | baseInfoFormItems.value[5].disabled = true; |
| 582 | } | 584 | } |
| 583 | } | 585 | } |
| 586 | console.log(baseInfoFormRef.value, baseInfoFormRef.value.ruleFormRef, 'ruleFormRefbaseInfoFormRef'); | ||
| 584 | checkedInfo.value = {}; | 587 | checkedInfo.value = {}; |
| 585 | nextTick(() => { | 588 | nextTick(() => { |
| 586 | baseInfoFormRules.value.damName[1] = checkExistName(checkedInfo.value, existDamName, detailInfo.value, 'damName'); | 589 | baseInfoFormRules.value.damName[1] = checkExistName(checkedInfo.value, existDamName, detailInfo.value, 'damName'); | ... | ... |
-
Please register or sign in to post a comment