Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
7bc0c5be by fanguang
Options

Merge branch 'develop' of http://117.78.60.236:8000/csbr-daop/fe-data-asset-management into develop

2 parents 38a56aaf 68c69fc5
Inline Side-by-side
Showing 2 changed files with 6 additions and 6 deletions
src/views/data_meta/dimTableCreateManual.vue
......@@ -110,9 +110,9 @@ onBeforeMount(() => {
getCharacterListData();
if (route.query.metaStandard) {
tableCreateInfo.value.tableData[0].chName = route.query.standardName;
tableCreateInfoLoading.value = true;
fullscreenLoading.value = true;
getMetaStandardDsField(route.query.metaStandard).then((res: any) => {
tableCreateInfoLoading.value = false;
fullscreenLoading.value = false;
if (res.code == proxy.$passCode) {
tableCreateInfo.value.tableFields = res.data?.map((d, i) => {
d.orderNum = i;
......@@ -637,7 +637,7 @@ const tableSelectFields = computed(() => {
</script>
<template>
<div class="table_tool_wrap" v-loading.fullscreen.lock="fullscreenLoading">
<div class="table_tool_wrap" v-loading="fullscreenLoading">
<div class="tools_btns">
<!-- <el-button type="primary" :disabled="isLook" @click="saveDraftTable" v-preReClick>保存为草稿</el-button> -->
<el-button type="primary" :disabled="isLook" @click="saveTable" v-preReClick>提交</el-button>
......
src/views/data_meta/tableCreateManual.vue
......@@ -112,9 +112,9 @@ onBeforeMount(() => {
getCharacterListData();
if (route.query.metaStandard) {
tableCreateInfo.value.tableData[0].chName = route.query.standardName;
tableCreateInfoLoading.value = true;
fullscreenLoading.value = true;
getMetaStandardDsField(route.query.metaStandard).then((res: any) => {
tableCreateInfoLoading.value = false;
fullscreenLoading.value = false;
if (res.code == proxy.$passCode) {
tableCreateInfo.value.tableFields = res.data?.map((d, i) => {
d.orderNum = i;
......@@ -689,7 +689,7 @@ const expandDialogValueChange = (val) => {
</script>
<template>
<div class="table_tool_wrap" v-loading.fullscreen.lock="fullscreenLoading">
<div class="table_tool_wrap" v-loading="fullscreenLoading">
<div class="tools_btns">
<!-- <el-button type="primary" :disabled="isLook" @click="saveDraftTable" v-preReClick>保存为草稿</el-button> -->
<el-button type="primary" :disabled="isLook" @click="saveTable" v-preReClick>提交</el-button>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!