Merge remote-tracking branch 'origin/master'

src/api/source/source.js

@@ -61,14 +61,13 @@ export function synchronous(data) {
 //根据基础表ID和SQL语句查询数据
 export function findTableValue(basicId,sql) {
   return request({
-    url: '/source/value/findTableValue',
+    url: "/source/value/findTableValue?basicId="+basicId+"&sql="+sql,
     method: 'post',
-    params: {basicId:basicId,sql:sql}
   })
 }
 export function findByTableName() {
   return request({
-    url: '/source/tableInfo/findTableInfo',
+    url: '/source/tableInfo/findAssetByTableName',
     method: 'GET',
   })
 }

src/api/tableData/data.js

@@ -59,13 +59,13 @@ export function selectTableData(id) {
 }
 export function findTableInfo() {
   return request({
-    url: '/source/tableInfo/findTableInfo',
+    url: '/source/tableInfo/findAssetByTableName',
     method: 'get'
   })
 }
 export function findTableInfoList() {
   return request({
-    url: '/source/tableInfo/findTableInfoList',
+    url: '/source/tableInfo/findAsset',
     method: 'get',
   })
 }

src/views/show/index.vue

@@ -81,6 +81,7 @@
 </template>
 <script setup>
 import {findByTableName, findTableValueList} from "@/api/source/source";
+import {findTableInfoList} from "@/api/tableData/data";
 
 export default {
   name: 'Show',
@@ -102,18 +103,25 @@ export default {
   },
   created() {
    this.findByTableName();
+   this.findTableInfoList();
   },
   methods: {
     findByTableName(){
-      findByTableName().then((res)=>{
-        this.data = res.data
-
+      findByTableName().then(res=>{
+        this.data=res.data
+        console.log(res.data);
+      })
+    },
+    findTableInfoList(){
+      findTableInfoList().then(res=>{
+        this.data=res.data
+        console.log(res.data);
       })
     },
     handleNodeClick(data) {
-      console.log("...." + data)
       this.tableBasic = data
       if (data.children == null) {
+        console.log(data);
         findTableValueList(data.basicId, data.tableName).then(res => {
           this.assetShowList = res.data;
           this.DataValue = res.data;

src/views/type/index.vue

@@ -89,16 +89,9 @@ export default {
   },
   created() {
   this.findTableInfoList();
-  this.selectColumnList();
 
   },
   methods: {
-    selectColumnList(){
-      selectColumn().then(res=>{
-        console.log(res.data)
-        this.columnList=res.data
-      })
-    },
    findTableInfoList(){
      findTableInfoList().then(res=>{
        this.dataList=res.data