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/quest/node.js b/src/api/quest/node.js index 256d934..f070b95 100644 --- a/src/api/quest/node.js +++ b/src/api/quest/node.js @@ -37,17 +37,25 @@ export function updateNode(data) { } // 删除节点管理 -export function delNode(id, taskCode) { +export function delNodeByIds(ids) { return request({ - url: '/quest/node/' + id + '/' + taskCode, + url: '/quest/node/' + ids, + method: 'delete' + }) +} + +// 删除节点管理 +export function delNodeByTaskCodeAndNodeCodes(taskCode,nodeCodes) { + return request({ + url: '/quest/node/' + taskCode + '/' + nodeCodes, method: 'delete' }) } // 批量删除新增节点管理 -export function batch(data) { +export function batch(data,taskCode) { return request({ - url: '/quest/node/batch', + url: '/quest/node/batch/'+taskCode, method: 'post', data: data }) 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..542f5d1 100644 --- a/src/api/tableData/data.js +++ b/src/api/tableData/data.js @@ -1,45 +1,72 @@ 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) { +// // 查询结构详细 +// 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 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/' + id, + url: '/source/data/selectStructureById/' + id, method: 'get' }) } - -// 新增结构 -export function addData(data) { +export function findTableInfo() { return request({ - url: '/source/data', - method: 'post', - data: data + url: '/source/tableInfo/findTableInfo', + method: 'get' }) } - -// 修改结构 -export function updateData(data) { +export function findTableInfoList() { return request({ - url: '/source/data', - method: 'put', - data: data - }) -} - -// 删除结构 -export function delData(id) { - return request({ - url: '/source/data/' + id, - method: 'delete' + url: '/source/tableInfo/findTableInfoList', + method: 'get', }) } 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/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/quest/node/Home.vue b/src/views/quest/node/Home.vue index d425138..dbd2c04 100644 --- a/src/views/quest/node/Home.vue +++ b/src/views/quest/node/Home.vue @@ -6,7 +6,7 @@ type="primary" @click="save">保存修改 返回 + @click="returnBack">返回
@@ -53,6 +53,10 @@ export default { nodeList:[], lineList:[] }, + checkData: { + nodeList:[], + lineList:[] + }, selectedList: [], jsplumbSetting: jsplumbSetting, jsplumbConnectOptions: jsplumbConnectOptions, @@ -70,7 +74,8 @@ export default { height: 0, width: 0 }, - taskCode: this.$route.query.taskCode + taskCode: this.$route.query.taskCode, + flag: true }; }, mounted() { @@ -120,9 +125,8 @@ export default { } }) }) - // console.log(data) - console.log(this.data) }) + this.flag = true }, // 保存修改按钮 save() { @@ -147,16 +151,42 @@ export default { preLine = line.from } }) - let newNode = flowNode.methods.toMysqlNode(node,preLine,nextLine) - newNode.taskCode = this.$route.query.taskCode - nodeData.push(newNode) + nodeData.push(flowNode.methods.toMysqlNode(node,preLine,nextLine,this.taskCode)) + }) + // 3. 激活接口将参数传递到后端 + batch(nodeData,this.$route.query.taskCode).then(res => { + this.$message.success(res.msg) + this.flag = true }) console.log(nodeData) - // 3. 激活接口将参数传递到后端 - batch(nodeData).then(res => { - alert(res.msg) - }) }, + returnBack() { + if (this.flag){ + this.$router.push({path: '/quest/task'}) + }else{ + this.checkReturn() + } + + }, + checkReturn() { + this.$confirm('更改未保存,是否保存?', '未保存提示', { + confirmButtonText: '保存', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.save() + }).catch(() => { + this.$message({ + type: 'success', + message: '返回成功' + }); + }); + this.$router.push({path: '/quest/task'}) + }, + // 修改状态更新 + checkFlag(){ + this.flag = false + } } }; @@ -209,12 +239,12 @@ export default { .auxiliary-line-x { position: absolute; border: .5px dashed #2ab1e8; - z-index: 1008; + z-index: 998; } .auxiliary-line-y { position: absolute; border: .5px dashed #2ab1e8; - z-index: 1008; + z-index: 998; } } } @@ -223,7 +253,7 @@ export default { 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..bedb4c7 --- /dev/null +++ b/src/views/type/index.vue @@ -0,0 +1,120 @@ + + +