From 38b4f01e917d90645d00ecf5243f9300e08fb3e9 Mon Sep 17 00:00:00 2001
From: lipeng <lipeng@wodcloud.com>
Date: Fri, 7 Jul 2023 18:11:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/page/main/system-admin/menu/index.vue     | 10 +++++-----
 src/page/main/system-admin/menu/menu-form.vue | 20 +++++++++++++++----
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/page/main/system-admin/menu/index.vue b/src/page/main/system-admin/menu/index.vue
index df928d5..e21a874 100644
--- a/src/page/main/system-admin/menu/index.vue
+++ b/src/page/main/system-admin/menu/index.vue
@@ -155,7 +155,7 @@ watch(
 ); // 树形搜索值
 
 const getMenuTree = (type, id) => {
-  axios.get(`/apaas/system/v5/menu/tree`).then((res) => {
+  axios.get(`/v1/api/menu/tree`).then((res) => {
     if (res.data.code == 200) {
       state.data = res.data.data || [];
       nextTick().then(() => {
@@ -409,7 +409,7 @@ const fileAction = (val, data, parent, disabled = false) => {
 
 const deleteData = () => {
   if (state.selectData.id) {
-    axios.delete(`/apaas/system/v5/menu/${state.selectData.id}`).then((res) => {
+    axios.delete(`/v1/api/menu/${state.selectData.id}`).then((res) => {
       if (res.data.code == 200) {
         ElMessage.success(res.data.msg);
         state.selectData = null;
@@ -446,7 +446,7 @@ const changeSort = (data, nextObj) => {
       sort: data.sort,
     },
   ];
-  axios.put(`/apaas/system/v5/menu/sort`, params).then((res) => {
+  axios.put(`/v1/api/menu/sort`, params).then((res) => {
     if (res.data.code == 200) {
       ElMessage.success(res.data.msg);
       getMenuTree();
@@ -477,7 +477,7 @@ const saveMenu = (el, type) => {
       };
       if (state.selectData.id) {
         // 编辑
-        axios.put(`/apaas/system/v5/menu/${state.selectData.id}`, params).then((res) => {
+        axios.put(`/v1/api/menu/${state.selectData.id}`, params).then((res) => {
           if (res.data.code == 200) {
             ElMessage.success(res.data.msg);
             getMenuTree();
@@ -500,7 +500,7 @@ const saveMenu = (el, type) => {
           // 新增下级
           params.p_menu_id = state.selectParentData.menu_id;
         }
-        axios.post(`/apaas/system/v5/menu/add`, params).then((res) => {
+        axios.post(`/v1/api/menu/add`, params).then((res) => {
           if (res.data.code == 200) {
             ElMessage.success(res.data.msg);
             state.selectData = null;
diff --git a/src/page/main/system-admin/menu/menu-form.vue b/src/page/main/system-admin/menu/menu-form.vue
index 54d973b..9f222f7 100644
--- a/src/page/main/system-admin/menu/menu-form.vue
+++ b/src/page/main/system-admin/menu/menu-form.vue
@@ -19,7 +19,7 @@
     </el-form-item>
     <el-form-item label="分组" prop="dict_group_id" v-if="!topLevel">
       <el-select v-model="menuForm.dict_group_id" :disabled="groupFlag" placeholder="请选择分组">
-        <el-option v-for="item in groupList" :key="item.dict_id" :label="item.dict_name" :value="item.dict_id" />
+        <el-option v-for="item in groupList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
     </el-form-item>
     <el-form-item label="跳转方式" prop="new_window" v-if="menuForm.menu_type != 0">
@@ -33,7 +33,7 @@
     </el-form-item>
     <el-form-item label="系统类型" prop="system_type" v-if="topLevel">
       <el-select v-model="menuForm.system_type" placeholder="请选择系统类型">
-        <el-option v-for="item in systemGroupList" :key="item.dict_id" :label="item.dict_name" :value="item.dict_id" />
+        <el-option v-for="item in systemGroupList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
     </el-form-item>
     <el-form-item label="是否启用" prop="state">
@@ -140,7 +140,13 @@ const state = reactive({
 
 const getGroupList = () => {
   axios
-    .get(`/apaas/system/v5/menu/group/dict`)
+    .get(`/v1/api/dict`, {
+      params: {
+        class: 5,
+        page: 1,
+        page_size: 100,
+      },
+    })
     .then((res) => {
       if (res.data.code == 200) {
         state.groupList = res.data.data || [];
@@ -155,7 +161,13 @@ const getGroupList = () => {
 
 const getSystemGroup = () => {
   axios
-    .get(`/apaas/system/v5/menu/system/dict`)
+    .get(`/v1/api/dict`, {
+      params: {
+        class: 4,
+        page: 1,
+        page_size: 100,
+      },
+    })
     .then((res) => {
       if (res.data.code == 200) {
         state.systemGroupList = res.data.data || [];
-- 
2.26.0