diff --git a/.gitignore b/.gitignore
index 91c5d327fb3cb2ecc8a49c66640e148c679055ed..e8d8005c24a96ea486c4605330c9834efb5d6124 100644
--- a/.gitignore
+++ b/.gitignore
@@ -271,3 +271,4 @@ __pycache__/
 /ZR.Admin.WebApi/DataProtection
 /Quartz.NET.WindowsService
 /ZRAdmin-vue
+/ZR.Admin.WebApi/appsettings.Development.json
diff --git a/ZR.Admin.WebApi/Controllers/BaseController.cs b/ZR.Admin.WebApi/Controllers/BaseController.cs
index fe5f6131c2e86a7ec38397427f3dc54152673faf..b85b3048be12bea13a3ea624c6a3d6e736e1b33b 100644
--- a/ZR.Admin.WebApi/Controllers/BaseController.cs
+++ b/ZR.Admin.WebApi/Controllers/BaseController.cs
@@ -63,11 +63,7 @@ namespace ZR.Admin.WebApi.Controllers
         /// <returns></returns>
         protected IActionResult ExportExcel(string path, string fileName)
         {
-            //IWebHostEnvironment webHostEnvironment = (IWebHostEnvironment)App.ServiceProvider.GetService(typeof(IWebHostEnvironment));
-            //string fileDir = Path.Combine(webHostEnvironment.WebRootPath, path, fileName);
-
-            var stream = ff.File.OpenRead(path);  //创建文件流
-            return File(stream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", HttpUtility.UrlEncode(fileName));
+            return SUCCESS(new { path = path, fileName = fileName });
         }
         
         #region 方法
@@ -142,7 +138,7 @@ namespace ZR.Admin.WebApi.Controllers
             Directory.CreateDirectory(Path.GetDirectoryName(fullPath));
 
             MiniExcel.SaveAs(fullPath, list, sheetName: sheetName);
-            return (sFileName, fullPath);
+            return (sFileName, "/export/" + sFileName);
         }
 
         /// <summary>
@@ -160,7 +156,7 @@ namespace ZR.Admin.WebApi.Controllers
             Directory.CreateDirectory(Path.GetDirectoryName(fullPath));
 
             MiniExcel.SaveAs(fullPath, sheets);
-            return (sFileName, fullPath);
+            return (sFileName, "/export/" + sFileName);
         }
 
         /// <summary>
diff --git a/ZR.Admin.WebApi/Properties/launchSettings.json b/ZR.Admin.WebApi/Properties/launchSettings.json
index a3bb2fda73711c84d7bfb70a70a261e3b7c99608..16b84cad979dbbfa371cc094aa75679bdc1cd2e9 100644
--- a/ZR.Admin.WebApi/Properties/launchSettings.json
+++ b/ZR.Admin.WebApi/Properties/launchSettings.json
@@ -1,4 +1,14 @@
-{
+{
+  "profiles": {
+    "ZR.Admin.WebApi": {
+      "commandName": "Project",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "dotnetRunMessages": true,
+      "applicationUrl": "http://localhost:8888"
+    }
+  },
   "$schema": "https://json.schemastore.org/launchsettings.json",
   "iisSettings": {
     "windowsAuthentication": false,
@@ -7,16 +17,5 @@
       "applicationUrl": "http://localhost:63521",
       "sslPort": 44395
     }
-  },
-  "profiles": {
-    "ZR.Admin.WebApi": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchUrl": "",
-      "applicationUrl": "http://localhost:8888",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": ""
-      }
-    }
   }
-}
+}
\ No newline at end of file
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
index f4f5d5aca4b279df7ac6c05da99049abe948829b..9dddbd5764a9e090ff810fa0012dbc05bdcf041f 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
@@ -77,6 +77,7 @@ $end
   </div>
 </template>
 <script>
+import { Loading } from 'element-ui'
 import { 
   list${genTable.BusinessName},
   add${genTable.BusinessName},
@@ -377,12 +378,23 @@ $if(replaceDto.ShowBtnExport)
         cancelButtonText: "取消",
         type: "warning",
       })
-        .then(function () {
-          return export${genTable.BusinessName}(queryParams);
-        })
-        .then((response) => {
-          this.download(response.data.path);
-        });
+      .then(() => {
+        var loadop = {
+          lock: true,
+          text: '正在导出文件...',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)',
+        };
+        const pageLoading = Loading.service(loadop);
+        export${genTable.BusinessName}(queryParams)
+          .then((res) => {
+            const { data } = res;
+            this.download(data.path);
+            pageLoading.close();
+          })
+          .catch((erre) => {
+            pageLoading.close();
+          });
     },
 $end
   },
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt
index 1e1678fc155c40f636c7920d59ec9cde948dc941..90dfbfa9db63facfa3742b9c8c6de91bde592b1f 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt
@@ -2,9 +2,6 @@
 $if(replaceDto.SelectMulti == 1)
 import QS from 'qs'
 $end
-$if(replaceDto.ShowBtnExport)
-import { downFile } from '@/utils/request'
-$end
 
 /**
 * ${genTable.functionName}分页查询
@@ -92,8 +89,12 @@ export function clear${genTable.BusinessName}() {
 }
 
 // 导出${genTable.functionName}
-export async function export${genTable.BusinessName}(query) {
-  await downFile('${genTable.ModuleName}/${genTable.BusinessName}/export', { ...query })
+export function export${genTable.BusinessName}(query) {
+  return request({
+    url: '${genTable.ModuleName}/${genTable.BusinessName}/export',
+    method: 'get',
+    params: query,
+  })
 }
 
 $if(showCustomInput)
diff --git a/ZR.Service/System/SysMenuService.cs b/ZR.Service/System/SysMenuService.cs
index ca28efc03a81a45fc4e47c917e5a365741a29169..caaeb11fcfaa16186d1c990bfda66bd33a1e21a4 100644
--- a/ZR.Service/System/SysMenuService.cs
+++ b/ZR.Service/System/SysMenuService.cs
@@ -1,4 +1,4 @@
-using Infrastructure.Attribute;
+using Infrastructure.Attribute;
 using Infrastructure.Extensions;
 using SqlSugar;
 using System;
@@ -41,7 +41,7 @@ namespace ZR.Service
                 var userRoles = SysRoleService.SelectUserRoles(userId);
                 menuList = SelectTreeMenuListByRoles(menu, userRoles);
             }
-            return menuList;
+            return menuList ?? new List<SysMenu>();
         }
 
         /// <summary>
diff --git a/ZR.Vue/src/views/system/menu/index.vue b/ZR.Vue/src/views/system/menu/index.vue
index 92f97895fd4b46e523d94a59079989853ffe44f6..f4a18c74e8e3a4dc9a83bfbcb96be6e6a4ccb15f 100644
--- a/ZR.Vue/src/views/system/menu/index.vue
+++ b/ZR.Vue/src/views/system/menu/index.vue
@@ -27,6 +27,7 @@
 
     <el-table v-if="refreshTable" v-loading="loading" :data="menuList" :default-expand-all="isExpandAll"
       row-key="menuId"
+      node-key="menuId"
       border
       lazy
       :load="loadMenu"
@@ -276,6 +277,8 @@ export default {
           { required: true, message: "路由地址不能为空", trigger: "blur" },
         ],
       },
+      // table树节点
+      tableTreeNodeMap: new Map(),
     };
   },
   created() {
@@ -397,13 +400,21 @@ export default {
             updateMenu(this.form).then((response) => {
               this.msgSuccess("修改成功");
               this.open = false;
-              this.getList();
+              if (this.form.parentId === 0) {
+                this.getList();
+              } else {
+                this.refreshTableTree(this.form.parentId);
+              }
             });
           } else {
             addMenu(this.form).then((response) => {
               this.msgSuccess("新增成功");
               this.open = false;
-              this.getList();
+              if (this.form.parentId === 0) {
+                this.getList();
+              } else {
+                this.refreshTableTree(this.form.parentId);
+              }
             });
           }
         }
@@ -424,7 +435,11 @@ export default {
           return delMenu(row.menuId);
         })
         .then(() => {
-          this.getList();
+          if (row.parentId === 0) {
+            this.getList();
+          } else {
+            this.refreshTableTree(row.parentId);
+          }
           this.msgSuccess("删除成功");
         });
     },
@@ -462,10 +477,20 @@ export default {
       });
     },
     loadMenu (row, treeNode, resolve) {
+      this.tableTreeNodeMap.set(row.menuId, { row, treeNode, resolve });
       listMenuById(row.menuId).then((res) => {
         resolve(res.data)
       })
-    }
+    },
+    //新增/修改/删除子节点时刷新子节点
+    refreshTableTree(key) {
+      const node = this.tableTreeNodeMap.get(key);
+      if (!node) {
+        return;
+      }
+      const { row, treeNode, resolve } = node;
+      this.loadMenu(row, treeNode, resolve);
+    },
   },
 };
 </script>