From 81bc9c5175b15278434afb094630f92a4b5cabec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E8=B0=83?= <3084898776@qq.com> Date: Thu, 29 Aug 2024 16:58:12 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/dict/dictData.js | 11 ++ src/api/dict/dictType.js | 25 +++ src/api/source/source.js | 2 +- src/api/tableData/data.js | 27 +++ src/views/data/index.vue | 336 ------------------------------------- src/views/source/index.vue | 8 +- src/views/type/index.vue | 120 +++++++++++++ 7 files changed, 191 insertions(+), 338 deletions(-) create mode 100644 src/api/dict/dictData.js create mode 100644 src/api/dict/dictType.js delete mode 100644 src/views/data/index.vue create mode 100644 src/views/type/index.vue diff --git a/src/api/dict/dictData.js b/src/api/dict/dictData.js new file mode 100644 index 0000000..5b8b3b3 --- /dev/null +++ b/src/api/dict/dictData.js @@ -0,0 +1,11 @@ +import request from '@/utils/request' + + +// 根据数据库结构ID查询数据源列表 +export function listChildren(query) { + return request({ + url: '/source/children/list', + method: 'get', + params: query + }) +} diff --git a/src/api/dict/dictType.js b/src/api/dict/dictType.js new file mode 100644 index 0000000..ef84aec --- /dev/null +++ b/src/api/dict/dictType.js @@ -0,0 +1,25 @@ +import request from '@/utils/request' + + +// 根据数据源id查询字典类型数据 +export function getDictDataList(id) { + return request({ + url: '/source/dictType/getDictDataList/' + id, + method: 'get' + }) +} +// 查询数据字典类型对象 +export function getDictData(data) { + return request({ + url: '/source/dictType/getDictData', + method: 'post', + data: data + }) +} +// 查询数据库类型 +export function getTypeList() { + return request({ + url: '/source/dataType/getTypeList', + method: 'get' + }) +} diff --git a/src/api/source/source.js b/src/api/source/source.js index 40ca468..ae8d9cf 100644 --- a/src/api/source/source.js +++ b/src/api/source/source.js @@ -53,7 +53,7 @@ export function delSource(id) { //同步资产结构 export function synchronous(data) { return request({ - url: '/source/source/synchronous', + url: '/source/source/syncAssetStructure', method: 'post', data: data }) diff --git a/src/api/tableData/data.js b/src/api/tableData/data.js index 9cf2cd8..b983523 100644 --- a/src/api/tableData/data.js +++ b/src/api/tableData/data.js @@ -42,5 +42,32 @@ export function delData(id) { method: 'delete' }) } +//修改字段是否为字典值 +export function updIsDict(data) { + return request({ + url: '/source/data/updIsDict', + method: 'put', + data: data + }) +} +//根据childrenId查询表结构 +export function selectTableData(id) { + return request({ + url: '/source/data/selectTableData/' + id, + method: 'get' + }) +} +export function findTableInfo() { + return request({ + url: '/source/tableInfo/findTableInfo', + method: 'get' + }) +} +export function findTableInfoList() { + return request({ + url: '/source/tableInfo/findTableInfoList', + method: 'get', + }) +} diff --git a/src/views/data/index.vue b/src/views/data/index.vue deleted file mode 100644 index d03e508..0000000 --- a/src/views/data/index.vue +++ /dev/null @@ -1,336 +0,0 @@ - - - diff --git a/src/views/source/index.vue b/src/views/source/index.vue index 6868b63..d02da4a 100644 --- a/src/views/source/index.vue +++ b/src/views/source/index.vue @@ -179,7 +179,13 @@ - + + 是 + 否 + + + + diff --git a/src/views/type/index.vue b/src/views/type/index.vue new file mode 100644 index 0000000..5a756d8 --- /dev/null +++ b/src/views/type/index.vue @@ -0,0 +1,120 @@ + + + From efb4e62701d0e09b7a026a5ed1efcf2434d463b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E8=B0=83?= <3084898776@qq.com> Date: Thu, 29 Aug 2024 19:31:59 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/tableData/data.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/tableData/data.js b/src/api/tableData/data.js index b983523..6a05d4f 100644 --- a/src/api/tableData/data.js +++ b/src/api/tableData/data.js @@ -53,7 +53,7 @@ export function updIsDict(data) { //根据childrenId查询表结构 export function selectTableData(id) { return request({ - url: '/source/data/selectTableData/' + id, + url: '/source/data/selectStructureById/' + id, method: 'get' }) } From fddc3a350d6529bc15078235575cbcbc803994a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E8=B0=83?= <3084898776@qq.com> Date: Thu, 29 Aug 2024 19:36:13 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/type/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/type/index.vue b/src/views/type/index.vue index 5a756d8..bedb4c7 100644 --- a/src/views/type/index.vue +++ b/src/views/type/index.vue @@ -35,7 +35,7 @@ - + @@ -50,7 +50,7 @@ @@ -59,7 +59,7 @@ @@ -77,7 +77,7 @@ import {findTableInfoList, selectTableData} from "@/api/tableData/data"; export default { name: 'Type', - dicts: ['yes_no'], + dicts: ['sys_yes_no'], data() { return { tableData:[], From 6ffcd8f400d55aaa445671ced26e26ed1ced872d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E8=B0=83?= <3084898776@qq.com> Date: Thu, 29 Aug 2024 19:47:47 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/tableData/data.js | 96 ++++++++++++++++++------------------ src/views/accredit/index.vue | 43 ++++++++++++++++ src/views/show/index.vue | 44 +++++++++++++++++ 3 files changed, 135 insertions(+), 48 deletions(-) create mode 100644 src/views/accredit/index.vue create mode 100644 src/views/show/index.vue diff --git a/src/api/tableData/data.js b/src/api/tableData/data.js index 6a05d4f..542f5d1 100644 --- a/src/api/tableData/data.js +++ b/src/api/tableData/data.js @@ -1,56 +1,56 @@ import request from '@/utils/request' -// 查询结构列表 -export function listData(query) { - return request({ - url: '/source/data/list', - method: 'get', - params: query - }) -} +// // 查询结构列表 +// export function listData(query) { +// return request({ +// url: '/source/data/list', +// method: 'get', +// params: query +// }) +// } -// 查询结构详细 -export function getData(id) { - return request({ - url: '/source/data/' + id, - method: 'get' - }) -} +// // 查询结构详细 +// export function getData(id) { +// return request({ +// url: '/source/data/' + id, +// method: 'get' +// }) +// } -// 新增结构 -export function addData(data) { - return request({ - url: '/source/data', - method: 'post', - data: data - }) -} +// // 新增结构 +// export function addData(data) { +// return request({ +// url: '/source/data', +// method: 'post', +// data: data +// }) +// } -// 修改结构 -export function updateData(data) { - return request({ - url: '/source/data', - method: 'put', - data: data - }) -} - -// 删除结构 -export function delData(id) { - return request({ - url: '/source/data/' + id, - method: 'delete' - }) -} -//修改字段是否为字典值 -export function updIsDict(data) { - return request({ - url: '/source/data/updIsDict', - method: 'put', - data: data - }) -} -//根据childrenId查询表结构 +// // 修改结构 +// export function updateData(data) { +// return request({ +// url: '/source/data', +// method: 'put', +// data: data +// }) +// } +// +// // 删除结构 +// export function delData(id) { +// return request({ +// url: '/source/data/' + id, +// method: 'delete' +// }) +// } +// //修改字段是否为字典值 +// export function updIsDict(data) { +// return request({ +// url: '/source/data/updIsDict', +// method: 'put', +// data: data +// }) +// } +//根据表ID查询表结构 export function selectTableData(id) { return request({ url: '/source/data/selectStructureById/' + id, diff --git a/src/views/accredit/index.vue b/src/views/accredit/index.vue new file mode 100644 index 0000000..8154db3 --- /dev/null +++ b/src/views/accredit/index.vue @@ -0,0 +1,43 @@ + + + diff --git a/src/views/show/index.vue b/src/views/show/index.vue new file mode 100644 index 0000000..38d406d --- /dev/null +++ b/src/views/show/index.vue @@ -0,0 +1,44 @@ + + + + From 60102643ae35e2541a2aaef0c172be3d26fd420a Mon Sep 17 00:00:00 2001 From: chentaisen <14615430+chentaisen@user.noreply.gitee.com> Date: Thu, 29 Aug 2024 22:04:15 +0800 Subject: [PATCH 5/6] Changes --- src/views/rule/rule/version.vue | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue index 2e039ba..0f30d5d 100644 --- a/src/views/rule/rule/version.vue +++ b/src/views/rule/rule/version.vue @@ -32,7 +32,6 @@ - {{ rule.name }}