From 2281d24f201070dd7c562df409c812814ba5da37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=AE=87=E8=88=AA?= <653809315@qq.com>
Date: Wed, 26 Jun 2024 11:02:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gan-ui/src/api/app/message.js          | 2 +-
 gan-ui/src/api/app/skill.js            | 4 ++--
 gan-ui/src/api/app/user.js             | 2 +-
 gan-ui/src/views/app/dynamic/index.vue | 8 ++++----
 gan-ui/src/views/app/message/index.vue | 2 +-
 gan-ui/src/views/app/school/index.vue  | 2 +-
 gan-ui/src/views/app/skill/index.vue   | 3 +++
 gan-ui/src/views/app/topic/index.vue   | 4 +++-
 8 files changed, 16 insertions(+), 11 deletions(-)

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"
         >
-          <el-option label="未置顶" value="0"></el-option>
-          <el-option label="置顶" value="1"></el-option>
+          <el-option label="置顶" value="0"></el-option>
+          <el-option label="未置顶" value="1"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -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)"
           ></el-switch>
         </template>
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 @@
       <el-table-column label="类型" align="center" prop="type">
         <template slot-scope="scope">
           <span v-if="scope.row.type === 0">系统通知</span>
-          <span v-if="scope.row.type === 1">活动通知</span>
+          <span v-if="scope.row.type === 1">广播</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
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(() => {});
     },