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(() => { ...@@ -110,9 +110,9 @@ onBeforeMount(() => {
110 getCharacterListData(); 110 getCharacterListData();
111 if (route.query.metaStandard) { 111 if (route.query.metaStandard) {
112 tableCreateInfo.value.tableData[0].chName = route.query.standardName; 112 tableCreateInfo.value.tableData[0].chName = route.query.standardName;
113 tableCreateInfoLoading.value = true; 113 fullscreenLoading.value = true;
114 getMetaStandardDsField(route.query.metaStandard).then((res: any) => { 114 getMetaStandardDsField(route.query.metaStandard).then((res: any) => {
115 tableCreateInfoLoading.value = false; 115 fullscreenLoading.value = false;
116 if (res.code == proxy.$passCode) { 116 if (res.code == proxy.$passCode) {
117 tableCreateInfo.value.tableFields = res.data?.map((d, i) => { 117 tableCreateInfo.value.tableFields = res.data?.map((d, i) => {
118 d.orderNum = i; 118 d.orderNum = i;
...@@ -637,7 +637,7 @@ const tableSelectFields = computed(() => { ...@@ -637,7 +637,7 @@ const tableSelectFields = computed(() => {
637 </script> 637 </script>
638 638
639 <template> 639 <template>
640 <div class="table_tool_wrap" v-loading.fullscreen.lock="fullscreenLoading"> 640 <div class="table_tool_wrap" v-loading="fullscreenLoading">
641 <div class="tools_btns"> 641 <div class="tools_btns">
642 <!-- <el-button type="primary" :disabled="isLook" @click="saveDraftTable" v-preReClick>保存为草稿</el-button> --> 642 <!-- <el-button type="primary" :disabled="isLook" @click="saveDraftTable" v-preReClick>保存为草稿</el-button> -->
643 <el-button type="primary" :disabled="isLook" @click="saveTable" v-preReClick>提交</el-button> 643 <el-button type="primary" :disabled="isLook" @click="saveTable" v-preReClick>提交</el-button>
......
src/views/data_meta/tableCreateManual.vue
...@@ -112,9 +112,9 @@ onBeforeMount(() => { ...@@ -112,9 +112,9 @@ onBeforeMount(() => {
112 getCharacterListData(); 112 getCharacterListData();
113 if (route.query.metaStandard) { 113 if (route.query.metaStandard) {
114 tableCreateInfo.value.tableData[0].chName = route.query.standardName; 114 tableCreateInfo.value.tableData[0].chName = route.query.standardName;
115 tableCreateInfoLoading.value = true; 115 fullscreenLoading.value = true;
116 getMetaStandardDsField(route.query.metaStandard).then((res: any) => { 116 getMetaStandardDsField(route.query.metaStandard).then((res: any) => {
117 tableCreateInfoLoading.value = false; 117 fullscreenLoading.value = false;
118 if (res.code == proxy.$passCode) { 118 if (res.code == proxy.$passCode) {
119 tableCreateInfo.value.tableFields = res.data?.map((d, i) => { 119 tableCreateInfo.value.tableFields = res.data?.map((d, i) => {
120 d.orderNum = i; 120 d.orderNum = i;
...@@ -689,7 +689,7 @@ const expandDialogValueChange = (val) => { ...@@ -689,7 +689,7 @@ const expandDialogValueChange = (val) => {
689 </script> 689 </script>
690 690
691 <template> 691 <template>
692 <div class="table_tool_wrap" v-loading.fullscreen.lock="fullscreenLoading"> 692 <div class="table_tool_wrap" v-loading="fullscreenLoading">
693 <div class="tools_btns"> 693 <div class="tools_btns">
694 <!-- <el-button type="primary" :disabled="isLook" @click="saveDraftTable" v-preReClick>保存为草稿</el-button> --> 694 <!-- <el-button type="primary" :disabled="isLook" @click="saveDraftTable" v-preReClick>保存为草稿</el-button> -->
695 <el-button type="primary" :disabled="isLook" @click="saveTable" v-preReClick>提交</el-button> 695 <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!