From b8a043314eb644f45e3e110c75c29b19218c2ae8 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 18 十二月 2025 09:43:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 UI-Project/src/views/User/permissions.vue |   90 ++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 76 insertions(+), 14 deletions(-)

diff --git a/UI-Project/src/views/User/permissions.vue b/UI-Project/src/views/User/permissions.vue
index 4fc96e2..4d40bda 100644
--- a/UI-Project/src/views/User/permissions.vue
+++ b/UI-Project/src/views/User/permissions.vue
@@ -20,17 +20,27 @@
 const currentRow = reactive({}); // 褰撳墠琛岀殑鏁版嵁 
 const tableData = ref([])
 const slot = ref('')
- request.get("/loadGlass/sys/menu/nav").then((res) => {
- if (res.code == 200) {
- tableData.value = res.data.tree
- } else {
- ElMessage.warning(res.msg)
- }
- });
+  const fetchList = async () => {  
+  try {  
+      const response = await request.get('/loadGlass/sys/menu/getMenuTree', {
+      params: {
+        key: -1
+      }
+    });
+    if (response.code === 200) {  
+    tableData.value = response.data
+    } else {  
+      ElMessage.warning(response.data);  
+    }  
+  } catch (error) {  
+    console.error('Error fetching options:', error);  
+  }  
+}; 
 const titleSelectJsona = ref({
   processType: [],
 })
 onMounted(() => {
+  fetchList()
   fetchOptionsa('');  
 }); 
   // 瑙掕壊涓嬫媺閫�  
@@ -79,17 +89,30 @@
 }
 // 娣诲姞涓�绾ц彍鍗�
 const getTableRow = async () => {
+   if (!menuName.value) {
+    ElMessage.error(t('customer.inmenu'))
+    return
+  }
+   if (!url.value) {
+    ElMessage.error(t('customer.inlink'))
+    return
+  }
+   if (!listSort.value) {
+    ElMessage.error(t('customer.insort'))
+    return
+  }
   try {
     const response = await request.post('/loadGlass/sys/menu/save', {
       menuName: menuName.value,
       listSort: listSort.value,
       url: url.value,
+      parentId: 0
     }); 
  
     if (response.code === 200) {
       ElMessage.success(response.message);
       add.value = false;
-      tableData.value = response.data;
+      fetchList()
       menuName.value = '';
       listSort.value = '';
       url.value = '';
@@ -102,6 +125,18 @@
 };
 // 娣诲姞浜岀骇鑿滃崟
 const getTableRowb = async () => {
+   if (!menuName.value) {
+    ElMessage.error(t('customer.inmenu'))
+    return
+  }
+   if (!url.value) {
+    ElMessage.error(t('customer.inlink'))
+    return
+  }
+   if (!listSort.value) {
+    ElMessage.error(t('customer.insort'))
+    return
+  }
   try {
     const dataToSend = {  
       parentId: currentRow.id,
@@ -113,7 +148,7 @@
     if (response.code === 200) {
       ElMessage.success(response.message);
       addb.value = false;
-     tableData.value = response.data;
+      fetchList()
        menuName.value = '';
        listSort.value = '';
        url.value = '';
@@ -140,6 +175,18 @@
 }  
 // 缂栬緫
 const getTableRowa = async () => {
+   if (!menuName.value) {
+    ElMessage.error(t('customer.inmenu'))
+    return
+  }
+   if (!url.value) {
+    ElMessage.error(t('customer.inlink'))
+    return
+  }
+   if (!listSort.value) {
+    ElMessage.error(t('customer.insort'))
+    return
+  }
   try {
     const response = await request.post('/loadGlass/sys/menu/updateMenu', {
       parentId: currentRow.id,
@@ -150,7 +197,7 @@
     if (response.code === 200) {
       ElMessage.success(response.message);
       adda.value = false;
-      tableData.value = response.data;
+      fetchList()
       menuName.value = '';
       listSort.value = '';
       url.value = '';
@@ -163,6 +210,18 @@
 }; 
 // 缂栬緫浜岀骇鑿滃崟
 const getTableRowac = async () => {
+   if (!menuName.value) {
+    ElMessage.error(t('customer.inmenu'))
+    return
+  }
+   if (!url.value) {
+    ElMessage.error(t('customer.inlink'))
+    return
+  }
+   if (!listSort.value) {
+    ElMessage.error(t('customer.insort'))
+    return
+  }
   try {
     const response = await request.post('/loadGlass/sys/menu/updateMenu', {
       menuName: menuName.value,
@@ -172,7 +231,7 @@
     if (response.code === 200) {
       ElMessage.success(response.message);
       addc.value = false;
-      tableData.value = response.data;
+      fetchList()
       menuName.value = '';
       listSort.value = '';
       url.value = '';
@@ -196,11 +255,14 @@
       } 
     );
     if (confirmResult === 'confirm') {
-      const response = await request.post("/loadGlass/sys/menu/deleteMenu", {
-        menuId: row.id,
-    })
+      const url = "/loadGlass/sys/menu/deleteMenu?menuId=" + row.id;
+      const response = await request.post(url);
+    //   const response = await request.post("/loadGlass/sys/menu/deleteMenu", {
+    //     menuId: row.id,
+    // })
     if (response.code === 200) {
       ElMessage.success(response.message);
+      fetchList()
       } else {
       ElMessage.error(response.msg);
       }  

--
Gitblit v1.8.0