diff --git a/gan-ui/src/api/app/message.js b/gan-ui/src/api/app/message.js index aad96f1..b5ef139 100644 --- a/gan-ui/src/api/app/message.js +++ b/gan-ui/src/api/app/message.js @@ -29,7 +29,7 @@ export function addMessage(data) { // 修改系统消息 export function updateMessage(data) { return request({ - url: '/app/message', + url: '/app/message/edit', method: 'put', data: data }) diff --git a/gan-ui/src/api/app/skill.js b/gan-ui/src/api/app/skill.js index 9359fc1..a689c8b 100644 --- a/gan-ui/src/api/app/skill.js +++ b/gan-ui/src/api/app/skill.js @@ -20,7 +20,7 @@ export function getSkill(id) { // 新增标签信息 export function addSkill(data) { return request({ - url: 'app/app/skill', + url: 'app/app/skill/add', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addSkill(data) { // 修改标签信息 export function updateSkill(data) { return request({ - url: 'app/app/skill', + url: 'app/app/skill/edit', method: 'put', data: data }) diff --git a/gan-ui/src/api/app/user.js b/gan-ui/src/api/app/user.js index d4ce7fc..838be7e 100644 --- a/gan-ui/src/api/app/user.js +++ b/gan-ui/src/api/app/user.js @@ -29,7 +29,7 @@ export function addUser(data) { // 修改app用户 export function updateUser(data) { return request({ - url: '/app/user', + url: '/app/user/edit', method: 'put', data: data }) diff --git a/gan-ui/src/views/app/dynamic/index.vue b/gan-ui/src/views/app/dynamic/index.vue index d53bde1..ae8e5e7 100644 --- a/gan-ui/src/views/app/dynamic/index.vue +++ b/gan-ui/src/views/app/dynamic/index.vue @@ -23,8 +23,8 @@ clearable @keyup.enter.native="handleQuery" > - - + + @@ -73,8 +73,8 @@ v-model="scope.row.isTop" active-color="#13ce66" inactive-color="#ff4949" - active-text="置顶" - inactive-text="非置顶" + active-text="非置顶" + inactive-text="置顶" @change="handleStatusChange(scope.row)" > diff --git a/gan-ui/src/views/app/message/index.vue b/gan-ui/src/views/app/message/index.vue index 3421f5d..092bb51 100644 --- a/gan-ui/src/views/app/message/index.vue +++ b/gan-ui/src/views/app/message/index.vue @@ -38,7 +38,7 @@ diff --git a/gan-ui/src/views/app/school/index.vue b/gan-ui/src/views/app/school/index.vue index 720f2ae..73d4ccd 100644 --- a/gan-ui/src/views/app/school/index.vue +++ b/gan-ui/src/views/app/school/index.vue @@ -223,7 +223,7 @@ export default { // 设置上传的请求头部 headers: { Authorization: "Bearer " + getToken() }, // 上传的地址 - url: process.env.VUE_APP_BASE_API + "app/school/importData", + url: process.env.VUE_APP_BASE_API + "/app/school/importData", uploadUrl: process.env.VUE_APP_BASE_API + "/app/api/oss/upload", }, }; diff --git a/gan-ui/src/views/app/skill/index.vue b/gan-ui/src/views/app/skill/index.vue index a28567b..8849533 100644 --- a/gan-ui/src/views/app/skill/index.vue +++ b/gan-ui/src/views/app/skill/index.vue @@ -296,7 +296,9 @@ export default { updateSkill(this.form).then(response => { this.$modal.msgSuccess("修改成功"); this.openUpdate = false; + this.queryParams.parentId = null ; this.getList(); + this.reset(); }); } else { addSkill(this.form).then(response => { @@ -304,6 +306,7 @@ export default { this.open = false; this.queryParams.parentId = null ; this.getList(); + this.reset(); }); } } diff --git a/gan-ui/src/views/app/topic/index.vue b/gan-ui/src/views/app/topic/index.vue index fcdca69..2c05445 100644 --- a/gan-ui/src/views/app/topic/index.vue +++ b/gan-ui/src/views/app/topic/index.vue @@ -238,6 +238,7 @@ export default { }, // 取消按钮 cancel() { + this.openUpdate = false; this.open = false; this.reset(); }, @@ -320,7 +321,8 @@ export default { this.$modal.confirm('是否确认删除话题信息编号为"' + ids + '"的数据项?').then(function() { return delTopic(ids); }).then(() => { - this.getList(); + this.reset(); + this.getAppTopic(); this.$modal.msgSuccess("删除成功"); }).catch(() => {}); },