Merge remote-tracking branch 'origin/master'

portal-manager-ui/admin/src/mixins/menu.js

@@ -85,8 +85,6 @@ export default {
           // console.log(this.menuListData);
           // console.log(this.menuTreeData);
           // this.getMenuDict();   //弃用
-        } else {
-          this.$message.error(res.msg);
         }
       });
     },

portal-manager-ui/admin/src/request/request.js

@@ -38,7 +38,7 @@ axios.interceptors.response.use(
     if (response.data.code !== undefined && response.data.msg !== undefined) {
       // 取出数据
       let { code, msg } = response.data;
-      if (code === -1) {
+      if (code === -1 || code === 405) {
         message.error({
           content: msg,
           maxCount: 1,

portal-manager-ui/admin/src/views/thePlatformIsSet/components/menuManagement/menuMgmt.vue

@@ -212,6 +212,7 @@ export default {
         page: this.tablePagination.current,
         size: -1,
       });
+      if (res.code != 1) return;
       let { data, total, dict } = res.data;
       let { menuType } = dict;
       this.tablePagination.total = total;
@@ -410,4 +411,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>

portal-manager-ui/admin/src/views/thePlatformIsSet/components/permissionsModel/ResourceManage.vue

@@ -251,11 +251,21 @@ export default {
     },
     // 刷新资源
     async refSresource() {
-      let res = await refreshUrl();
-      if (res.code == 1) {
-        this.$message.success(res.msg);
-        this.getResourceList();
-      }
+      let _this = this;
+      this.$confirm({
+        title: "系统提示",
+        content: "确定要刷新资源吗?",
+        okText: "是",
+        cancelText: "否",
+        centered: true,
+        async onOk() {
+          let res = await refreshUrl();
+          if (res.code == 1) {
+            _this.$message.success(res.msg);
+            _this.getResourceList();
+          }
+        },
+      });
     },
   },
 };