diff --git a/hchyun-ui/src/api/test/a.js b/hchyun-ui/src/api/test/a.js new file mode 100644 index 0000000..dee1003 --- /dev/null +++ b/hchyun-ui/src/api/test/a.js @@ -0,0 +1,54 @@ +import request from '@/utils/request' + + +// 查询测试a列表 +export function listA(data) { + return request({ + url: '/test/a/list', + method: 'put', + data: data + }) +} + +// 导出测试a +export function exportA(data) { + return request({ + url: '/test/a/export', + method: 'put', + data: data + }) +} + +// 查询测试a详细 +export function getA(aid) { + return request({ + url: '/test/a/' + aid, + method: 'get' + }) +} + +// 新增测试a +export function addA(data) { + return request({ + url: '/test/a', + method: 'post', + data: data + }) +} + +// 修改测试a +export function updateA(data) { + return request({ + url: '/test/a', + method: 'put', + data: data + }) +} + +// 删除测试a +export function delA(aid) { + return request({ + url: '/test/a/' + aid, + method: 'delete' + }) +} \ No newline at end of file diff --git a/hchyun-ui/src/api/tool/associated.js b/hchyun-ui/src/api/tool/associated.js deleted file mode 100644 index a4f5b39..0000000 --- a/hchyun-ui/src/api/tool/associated.js +++ /dev/null @@ -1,32 +0,0 @@ -import request from "@/utils/request"; - -/** - * 获取表信息 - * @returns {AxiosPromise} - */ -export function getTableInfos() { - return request({ - url: '/ass/tableinfos', - method: 'get' - }) -} - -/** - * 获取关联表表的字段信息 - * @param tableName 关联表表名 - * @param tableId 关联表id - * @returns {AxiosPromise} - */ -export function getAssColumns(tableName,tableId){ - return request({ - url: '/ass/'+tableName+'/'+tableId, - method: 'get' - }) -} - -export function getAssColumnsByTableId(tableId){ - return request({ - url:'/ass/'+tableId, - method: 'get' - }) -} diff --git a/hchyun-ui/src/views/test/a/index.vue b/hchyun-ui/src/views/test/a/index.vue new file mode 100644 index 0000000..a2df804 --- /dev/null +++ b/hchyun-ui/src/views/test/a/index.vue @@ -0,0 +1,379 @@ + + + diff --git a/hchyun-ui/src/views/tool/gen/editTable.vue b/hchyun-ui/src/views/tool/gen/editTable.vue index f9bca9a..a0681c2 100644 --- a/hchyun-ui/src/views/tool/gen/editTable.vue +++ b/hchyun-ui/src/views/tool/gen/editTable.vue @@ -152,8 +152,7 @@ export default { data() { return { // 选中选项卡的 name - // activeName: "cloum", - activeName: "genInfo", + activeName: "cloum", // 表格的高度 tableHeight: document.documentElement.scrollHeight - 245 + "px", // 表信息 @@ -206,9 +205,7 @@ export default { submitForm() { const basicForm = this.$refs.basicInfo.$refs.basicInfoForm; const genForm = this.$refs.genInfo.$refs.genInfoForm; - const assCloumnTable = this.$refs.genInfo.$refs.assCloumnTable; const relTables = this.$refs.genInfo.relTables; - console.log(relTables) for (let i=0;i { const validateResult = res.every(item => !!item); if (validateResult) { const genTable = Object.assign({}, basicForm.model, genForm.model); genTable.columns = this.cloumns; - genTable.assColumns = assColumns; genTable.relTables = relTables genTable.params = { treeCode: genTable.treeCode, diff --git a/hchyun-ui/src/views/tool/gen/genInfoForm.vue b/hchyun-ui/src/views/tool/gen/genInfoForm.vue index c9b8656..d6c45f0 100644 --- a/hchyun-ui/src/views/tool/gen/genInfoForm.vue +++ b/hchyun-ui/src/views/tool/gen/genInfoForm.vue @@ -8,7 +8,6 @@ - @@ -214,164 +213,6 @@ - -
- -

关联关系

- - - - 主表id - - - - - - - - - - - - - 关联表表名 - - - - - - - - - - - - - 关联表表名 - - - - - - - - - - - - - 关联查询方式 - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -582,7 +423,6 @@