Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
6a97d339 by xukangle
Options

Merge branch 'dev_20241202_xukangle' into develop

2 parents 3ce663e6 21ddfd96
Inline Side-by-side
Showing 1 changed file with 5 additions and 5 deletions
src/views/data_inventory/classifyGradeCatalogue.vue
...@@ -28,7 +28,7 @@ import { ...@@ -28,7 +28,7 @@ import {
28 import { TableColumnWidth } from "@/utils/enum"; 28 import { TableColumnWidth } from "@/utils/enum";
29 import router from "@/router"; 29 import router from "@/router";
30 import { download } from "@/utils/common"; 30 import { download } from "@/utils/common";
31 import { da } from "element-plus/es/locale"; 31 import { da, sl } from "element-plus/es/locale";
32 32
33 33
34 const currentPath = ref<string[]>([]); 34 const currentPath = ref<string[]>([]);
...@@ -1346,8 +1346,8 @@ const getDataBaseTableData = async (params = {}) => { ...@@ -1346,8 +1346,8 @@ const getDataBaseTableData = async (params = {}) => {
1346 pageSize: dataBasePage.value.limit, 1346 pageSize: dataBasePage.value.limit,
1347 isDataAsset: checked.value ? 'Y' : 'N', 1347 isDataAsset: checked.value ? 'Y' : 'N',
1348 execGuid: execGuidInfo.value.execGuid, 1348 execGuid: execGuidInfo.value.execGuid,
1349 tableGuid: tableGuid.value || selectedA.value || '', 1349 tableGuid: tableGuid.value || selectedB.value || '',
1350 databaseGuid: dataBaseGuid.value || selectedB.value || '', 1350 databaseGuid: dataBaseGuid.value || selectedA.value || '',
1351 fieldGuid: "", 1351 fieldGuid: "",
1352 labelGuid: "", 1352 labelGuid: "",
1353 classifyDetailGuid: "", 1353 classifyDetailGuid: "",
...@@ -1396,8 +1396,8 @@ const getDataBaseFieldData = async (params = {}) => { ...@@ -1396,8 +1396,8 @@ const getDataBaseFieldData = async (params = {}) => {
1396 pageIndex: dataFieldPage.value.curr, 1396 pageIndex: dataFieldPage.value.curr,
1397 pageSize: dataFieldPage.value.limit, 1397 pageSize: dataFieldPage.value.limit,
1398 execGuid: execGuidInfo.value.execGuid, 1398 execGuid: execGuidInfo.value.execGuid,
1399 tableGuid: tableGuid.value || selectedA.value || '', 1399 tableGuid: tableGuid.value || selectedB.value || '',
1400 databaseGuid: dataBaseGuid.value || selectedB.value || '', 1400 databaseGuid: dataBaseGuid.value || selectedA.value || '',
1401 fieldGuid: "", 1401 fieldGuid: "",
1402 labelGuid: "", 1402 labelGuid: "",
1403 classifyDetailGuid: "", 1403 classifyDetailGuid: "",
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!