From 6a182345e2eb5f26a9948c7f84d45dff2ad21264 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=91=E5=B9=B4=E6=A2=A6=E4=B8=8E=E7=A0=96?= <2847127106@qq.com> Date: Wed, 28 Aug 2024 21:38:21 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/quest/node.js | 16 +- src/views/quest/node/Home.vue | 58 ++++-- src/views/quest/node/components/node-item.vue | 180 ++++++++++-------- src/views/quest/node/config/methods.js | 13 +- src/views/quest/task/index.vue | 2 +- 5 files changed, 168 insertions(+), 101 deletions(-) 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/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 { 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 3/5] =?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 4/5] =?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 5/5] =?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 @@ + + + +