修改与华为云部署有关的文件

.env.development

@@ -1,32 +1,50 @@
 
-VUE_APP_TEST=http://10.81.3.155:9002
-VUE_APP_WS=ws://10.81.3.155:9002
-# VUE_APP_TEST=http://192.168.1.101:9002
+VUE_APP_API=http://123.60.223.250:48080
+VUE_APP_TEST=http://123.60.223.250:48080
+VUE_APP_WS='ws://123.60.223.250:48080'
+VUE_APP_ADAPTERURL=http://123.60.223.250:48080
 
 
-# VUE_APP_API=http://192.168.1.116:6060
-VUE_APP_API=http://10.81.3.153:6060
-# VUE_APP_API=http://192.168.1.109:6060
-
-
-VUE_APP_ADAPTERURL=http://10.81.3.155:8011
-
-# 登录方式 0 ==> vue登录页面  1 ==> 统一认证登录页面
-VUE_APP_LOGIN_MODE = 0
-
 # 趋势对比数据条数
 VUE_APP_DIALOG_NUM = 8
 
 #趋势对比鼠标点击
 VUE_APP_DIALOG_POINT = contextmenu
-
-
 # 智慧检修
 # VUE_APP_NEW_WISDOM=http://10.81.3.162:8170
-# VUE_APP_NEW_WISDOM=http://192.168.1.103:8170 # 石林
-VUE_APP_NEW_WISDOM=http://10.81.3.155:8170
+VUE_APP_NEW_WISDOM=http://123.60.223.250:48080
 # 综合报警
-VUE_APP_ALARM=http://10.81.3.154:6015
+VUE_APP_ALARM=http://123.60.223.250:48080
 # 登录
-VUE_APP_VUE_LOGIN_URL=http://10.81.3.127:48080
-# VUE_APP_VUE_LOGIN_URL=http://192.168.1.102:48080
+VUE_APP_VUE_LOGIN_URL=http://123.60.223.250:48080
+# VUE_APP_TEST=http://10.81.3.155:9002
+# VUE_APP_WS=ws://10.81.3.155:9002
+# # VUE_APP_TEST=http://192.168.1.101:9002
+
+
+# # VUE_APP_API=http://192.168.1.116:6060
+# VUE_APP_API=http://10.81.3.153:6060
+# # VUE_APP_API=http://192.168.1.109:6060
+
+
+# VUE_APP_ADAPTERURL=http://10.81.3.155:8011
+
+# # 登录方式 0 ==> vue登录页面  1 ==> 统一认证登录页面
+# VUE_APP_LOGIN_MODE = 0
+
+# # 趋势对比数据条数
+# VUE_APP_DIALOG_NUM = 8
+
+# #趋势对比鼠标点击
+# VUE_APP_DIALOG_POINT = contextmenu
+
+
+# # 智慧检修
+# # VUE_APP_NEW_WISDOM=http://10.81.3.162:8170
+# # VUE_APP_NEW_WISDOM=http://192.168.1.103:8170 # 石林
+# VUE_APP_NEW_WISDOM=http://10.81.3.155:8170
+# # 综合报警
+# VUE_APP_ALARM=http://10.81.3.154:6015
+# # 登录
+# VUE_APP_VUE_LOGIN_URL=http://10.81.3.127:48080
+# # VUE_APP_VUE_LOGIN_URL=http://192.168.1.102:48080

.env.production

@@ -1,7 +1,7 @@
-VUE_APP_API=http://10.81.3.153:6060
-VUE_APP_TEST=http://10.81.3.155:9002
-VUE_APP_WS='ws://10.81.3.155:9002'
-VUE_APP_ADAPTERURL=http://10.81.3.155:8011
+VUE_APP_API=http://123.60.223.250:48080
+VUE_APP_TEST=http://123.60.223.250:48080
+VUE_APP_WS='ws://123.60.223.250:48080'
+VUE_APP_ADAPTERURL=http://123.60.223.250:48080
 
 
 # 趋势对比数据条数
@@ -11,8 +11,26 @@ VUE_APP_DIALOG_NUM = 8
 VUE_APP_DIALOG_POINT = contextmenu
 # 智慧检修
 # VUE_APP_NEW_WISDOM=http://10.81.3.162:8170
-VUE_APP_NEW_WISDOM=http://10.81.3.155:8170
+VUE_APP_NEW_WISDOM=http://123.60.223.250:48080
 # 综合报警
-VUE_APP_ALARM=http://10.81.3.154:6015
+VUE_APP_ALARM=http://123.60.223.250:48080
 # 登录
-VUE_APP_VUE_LOGIN_URL=http://10.81.3.127:48080
+VUE_APP_VUE_LOGIN_URL=http://123.60.223.250:48080
+# VUE_APP_API=http://10.81.3.153:6060
+# VUE_APP_TEST=http://10.81.3.155:9002
+# VUE_APP_WS='ws://10.81.3.155:9002'
+# VUE_APP_ADAPTERURL=http://10.81.3.155:8011
+
+
+# # 趋势对比数据条数
+# VUE_APP_DIALOG_NUM = 8
+
+# #趋势对比鼠标点击
+# VUE_APP_DIALOG_POINT = contextmenu
+# # 智慧检修
+# # VUE_APP_NEW_WISDOM=http://10.81.3.162:8170
+# VUE_APP_NEW_WISDOM=http://10.81.3.155:8170
+# # 综合报警
+# VUE_APP_ALARM=http://10.81.3.154:6015
+# # 登录
+# VUE_APP_VUE_LOGIN_URL=http://10.81.3.127:48080

src/permission.js

@@ -8,26 +8,27 @@ router.beforeEach((to, from, next) => {
     if (to.path == "/login") {
       next({ path: "/home" });
     } else {
-      if (store.getters.roles.length === 0) {
-        // 判断当前用户是否已拉取完user_info信息
-        store
-          .dispatch("user/GetInfo")
-          .then(async () => {
-            let permissions = store.getters.permissions;
-            let accessRoutes = [];
-            accessRoutes = await store.dispatch(
-              "routes/setRoutes",
-              permissions
-            );
-            accessRoutes?.forEach((item) => {
-              router.addRoute(item);
-            });
-            next({ ...to, replace: true });
-          })
-          .catch((err) => {});
-      } else {
-        next();
-      }
+      next();
+      //   if (store.getters.roles.length === 0) {
+      //     // 判断当前用户是否已拉取完user_info信息
+      //     store
+      //       .dispatch("user/GetInfo")
+      //       .then(async () => {
+      //         let permissions = store.getters.permissions;
+      //         let accessRoutes = [];
+      //         accessRoutes = await store.dispatch(
+      //           "routes/setRoutes",
+      //           permissions
+      //         );
+      //         accessRoutes?.forEach((item) => {
+      //           router.addRoute(item);
+      //         });
+      //         next({ ...to, replace: true });
+      //       })
+      //       .catch((err) => {});
+      //   } else {
+      //     next();
+      //   }
     }
   } else if (whiteList.indexOf(to.path) !== -1) {
     next();

src/router/index.js

@@ -9,7 +9,15 @@ export const constantRoutes = [
   },
 ];
 export const asyncRoutes = [
-  { path: "/", redirect: "/home" },
+  {
+    path: "/",
+    redirect: "/home",
+    meta: {
+      title: "首页",
+      icon: "",
+      permissions: ["jn_sy"],
+    },
+  },
   {
     path: "/home", // 驾驶舱
     name: "home",
@@ -1627,209 +1635,209 @@ export const asyncRoutes = [
     ],
   },
   //发电能力分析
-//   {
-//     path: "/powerGenerating",
-//     name: "powerGenerating",
-//     meta: {
-//       title: "发电能力分析",
-//       icon: "",
-//       permissions: ["jn_zhbb"],
-//     },
-//     // component: () => import("@/views/report/index copy.vue"),
-//     component: () => import("@/views/powerGenerating"),
-//     children: [
-//       {
-//         path: "dataFilter",
-//         name: "dataFilter",
-//         meta: {
-//           title: "数据准备",
-//           icon: "svg-prepare",
-//           permissions: ["jn_dlbb"],
-//         },
-//         component: () => import("@/views/powerGenerating/dataFilter"),
-//         children: [
-//           {
-//             path: "prepare",
-//             name: "prepare",
-//             component: () =>
-//               import("@/views/powerGenerating/dataFilter/prepare"),
-//             meta: {
-//               title: "风电数据准备",
-//               icon: "",
-//               permissions: ["jn_dlbb_dmb"],
-//             },
-//           },
-//           {
-//             path: "process",
-//             name: "process",
-//             component: () =>
-//               import("@/views/powerGenerating/dataFilter/process"),
-//             meta: {
-//               title: "风电数据处理",
-//               icon: "",
-//               permissions: ["jn_dlbb_dmb"],
-//             },
-//           },
-//           {
-//             path: "lightPrepare",
-//             name: "lightPrepare",
-//             component: () =>
-//               import("@/views/powerGenerating/dataFilter/lightPrepare"),
-//             meta: {
-//               title: "光伏数据准备",
-//               icon: "",
-//               permissions: ["jn_dlbb_dmb"],
-//             },
-//           },
-//         ],
-//       },
-//       {
-//         path: "windAnalyse",
-//         name: "windAnalyse",
-//         meta: {
-//           title: "风电分析",
-//           icon: "svg-wind-site",
-//           permissions: ["jn_dlbb"],
-//         },
-//         component: () => import("@/views/powerGenerating/windAnalyse"),
-//         children: [
-//           {
-//             path: "combine",
-//             name: "combine",
-//             component: () =>
-//               import("@/views/powerGenerating/windAnalyse/combine"),
-//             meta: {
-//               title: "功率曲线拟合分析",
-//               icon: "",
-//               permissions: ["jn_dlbb_dmb"],
-//             },
-//           },
-//           {
-//             path: "rateAnalysis",
-//             name: "rateAnalysis",
-//             component: () =>
-//               import("@/views/powerGenerating/windAnalyse/rateAnalysis"),
-//             meta: {
-//               title: "对风偏差分析",
-//               icon: "",
-//               permissions: ["jn_dlbb_dmb"],
-//             },
-//           },
-//           {
-//             path: "lineAnalysis",
-//             name: "lineAnalysis",
-//             component: () =>
-//               import("@/views/powerGenerating/windAnalyse/lineAnalysis"),
-//             meta: {
-//               title: "曲线偏差率分析",
-//               icon: "",
-//               permissions: ["jn_dlbb_dmb"],
-//             },
-//           },
-//           {
-//             path: "hotAnalysis",
-//             name: "hotAnalysis",
-//             component: () =>
-//               import("@/views/powerGenerating/windAnalyse/hotAnalysis"),
-//             meta: {
-//               title: "温度与功率分析",
-//               icon: "",
-//               permissions: ["jn_dlbb_dmb"],
-//             },
-//           },
-//           {
-//             path: "loseAnalysis",
-//             name: "loseAnalysis",
-//             component: () =>
-//               import("@/views/powerGenerating/windAnalyse/loseAnalysis"),
-//             meta: {
-//               title: "损失电量分析",
-//               icon: "",
-//               permissions: ["jn_dlbb_dmb"],
-//             },
-//           },
-//           {
-//             path: "posAnalysis",
-//             name: "posAnalysis",
-//             component: () =>
-//               import("@/views/powerGenerating/windAnalyse/posAnalysis"),
-//             meta: {
-//               title: "微观选址分析",
-//               icon: "",
-//               permissions: ["jn_dlbb_dmb"],
-//             },
-//           },
-//           {
-//             path: "spaceAnalysis",
-//             name: "spaceAnalysis",
-//             component: () =>
-//               import("@/views/powerGenerating/windAnalyse/spaceAnalysis"),
-//             meta: {
-//               title: "毛容量分析",
-//               icon: "",
-//               permissions: ["jn_dlbb_dmb"],
-//             },
-//           },
-//           {
-//             path: "angleAnalysis",
-//             name: "angleAnalysis",
-//             component: () =>
-//               import("@/views/powerGenerating/windAnalyse/angleAnalysis"),
-//             meta: {
-//               title: "桨距角分析",
-//               icon: "",
-//               permissions: ["jn_dlbb_dmb"],
-//             },
-//           },
-//           {
-//             path: "agcAnalysis",
-//             name: "agcAnalysis",
-//             component: () =>
-//               import("@/views/powerGenerating/windAnalyse/agcAnalysis"),
-//             meta: {
-//               title: "AGC曲线偏差分析",
-//               icon: "",
-//               permissions: ["jn_dlbb_dmb"],
-//             },
-//           },
-//         ],
-//       },
-//       {
-//         path: "lightAnalyse",
-//         name: "lightAnalyse",
-//         meta: {
-//           title: "光伏分析",
-//           icon: "svg-photovoltaic",
-//           permissions: ["jn_dlbb"],
-//         },
-//         component: () => import("@/views/powerGenerating/lightAnalyse"),
-//         children: [
-//           {
-//             path: "glAnalysis",
-//             name: "glAnalysis",
-//             component: () =>
-//               import("@/views/powerGenerating/lightAnalyse/glAnalysis"),
-//             meta: {
-//               title: "功率曲线分析",
-//               icon: "",
-//               permissions: ["jn_dlbb_dmb"],
-//             },
-//           },
-//           {
-//             path: "glHotAnalysis",
-//             name: "glHotAnalysis",
-//             component: () =>
-//               import("@/views/powerGenerating/lightAnalyse/glHotAnalysis"),
-//             meta: {
-//               title: "功率光照曲线分析",
-//               icon: "",
-//               permissions: ["jn_dlbb_dmb"],
-//             },
-//           },
-//         ],
-//       },
-//     ],
-//   },
+  //   {
+  //     path: "/powerGenerating",
+  //     name: "powerGenerating",
+  //     meta: {
+  //       title: "发电能力分析",
+  //       icon: "",
+  //       permissions: ["jn_zhbb"],
+  //     },
+  //     // component: () => import("@/views/report/index copy.vue"),
+  //     component: () => import("@/views/powerGenerating"),
+  //     children: [
+  //       {
+  //         path: "dataFilter",
+  //         name: "dataFilter",
+  //         meta: {
+  //           title: "数据准备",
+  //           icon: "svg-prepare",
+  //           permissions: ["jn_dlbb"],
+  //         },
+  //         component: () => import("@/views/powerGenerating/dataFilter"),
+  //         children: [
+  //           {
+  //             path: "prepare",
+  //             name: "prepare",
+  //             component: () =>
+  //               import("@/views/powerGenerating/dataFilter/prepare"),
+  //             meta: {
+  //               title: "风电数据准备",
+  //               icon: "",
+  //               permissions: ["jn_dlbb_dmb"],
+  //             },
+  //           },
+  //           {
+  //             path: "process",
+  //             name: "process",
+  //             component: () =>
+  //               import("@/views/powerGenerating/dataFilter/process"),
+  //             meta: {
+  //               title: "风电数据处理",
+  //               icon: "",
+  //               permissions: ["jn_dlbb_dmb"],
+  //             },
+  //           },
+  //           {
+  //             path: "lightPrepare",
+  //             name: "lightPrepare",
+  //             component: () =>
+  //               import("@/views/powerGenerating/dataFilter/lightPrepare"),
+  //             meta: {
+  //               title: "光伏数据准备",
+  //               icon: "",
+  //               permissions: ["jn_dlbb_dmb"],
+  //             },
+  //           },
+  //         ],
+  //       },
+  //       {
+  //         path: "windAnalyse",
+  //         name: "windAnalyse",
+  //         meta: {
+  //           title: "风电分析",
+  //           icon: "svg-wind-site",
+  //           permissions: ["jn_dlbb"],
+  //         },
+  //         component: () => import("@/views/powerGenerating/windAnalyse"),
+  //         children: [
+  //           {
+  //             path: "combine",
+  //             name: "combine",
+  //             component: () =>
+  //               import("@/views/powerGenerating/windAnalyse/combine"),
+  //             meta: {
+  //               title: "功率曲线拟合分析",
+  //               icon: "",
+  //               permissions: ["jn_dlbb_dmb"],
+  //             },
+  //           },
+  //           {
+  //             path: "rateAnalysis",
+  //             name: "rateAnalysis",
+  //             component: () =>
+  //               import("@/views/powerGenerating/windAnalyse/rateAnalysis"),
+  //             meta: {
+  //               title: "对风偏差分析",
+  //               icon: "",
+  //               permissions: ["jn_dlbb_dmb"],
+  //             },
+  //           },
+  //           {
+  //             path: "lineAnalysis",
+  //             name: "lineAnalysis",
+  //             component: () =>
+  //               import("@/views/powerGenerating/windAnalyse/lineAnalysis"),
+  //             meta: {
+  //               title: "曲线偏差率分析",
+  //               icon: "",
+  //               permissions: ["jn_dlbb_dmb"],
+  //             },
+  //           },
+  //           {
+  //             path: "hotAnalysis",
+  //             name: "hotAnalysis",
+  //             component: () =>
+  //               import("@/views/powerGenerating/windAnalyse/hotAnalysis"),
+  //             meta: {
+  //               title: "温度与功率分析",
+  //               icon: "",
+  //               permissions: ["jn_dlbb_dmb"],
+  //             },
+  //           },
+  //           {
+  //             path: "loseAnalysis",
+  //             name: "loseAnalysis",
+  //             component: () =>
+  //               import("@/views/powerGenerating/windAnalyse/loseAnalysis"),
+  //             meta: {
+  //               title: "损失电量分析",
+  //               icon: "",
+  //               permissions: ["jn_dlbb_dmb"],
+  //             },
+  //           },
+  //           {
+  //             path: "posAnalysis",
+  //             name: "posAnalysis",
+  //             component: () =>
+  //               import("@/views/powerGenerating/windAnalyse/posAnalysis"),
+  //             meta: {
+  //               title: "微观选址分析",
+  //               icon: "",
+  //               permissions: ["jn_dlbb_dmb"],
+  //             },
+  //           },
+  //           {
+  //             path: "spaceAnalysis",
+  //             name: "spaceAnalysis",
+  //             component: () =>
+  //               import("@/views/powerGenerating/windAnalyse/spaceAnalysis"),
+  //             meta: {
+  //               title: "毛容量分析",
+  //               icon: "",
+  //               permissions: ["jn_dlbb_dmb"],
+  //             },
+  //           },
+  //           {
+  //             path: "angleAnalysis",
+  //             name: "angleAnalysis",
+  //             component: () =>
+  //               import("@/views/powerGenerating/windAnalyse/angleAnalysis"),
+  //             meta: {
+  //               title: "桨距角分析",
+  //               icon: "",
+  //               permissions: ["jn_dlbb_dmb"],
+  //             },
+  //           },
+  //           {
+  //             path: "agcAnalysis",
+  //             name: "agcAnalysis",
+  //             component: () =>
+  //               import("@/views/powerGenerating/windAnalyse/agcAnalysis"),
+  //             meta: {
+  //               title: "AGC曲线偏差分析",
+  //               icon: "",
+  //               permissions: ["jn_dlbb_dmb"],
+  //             },
+  //           },
+  //         ],
+  //       },
+  //       {
+  //         path: "lightAnalyse",
+  //         name: "lightAnalyse",
+  //         meta: {
+  //           title: "光伏分析",
+  //           icon: "svg-photovoltaic",
+  //           permissions: ["jn_dlbb"],
+  //         },
+  //         component: () => import("@/views/powerGenerating/lightAnalyse"),
+  //         children: [
+  //           {
+  //             path: "glAnalysis",
+  //             name: "glAnalysis",
+  //             component: () =>
+  //               import("@/views/powerGenerating/lightAnalyse/glAnalysis"),
+  //             meta: {
+  //               title: "功率曲线分析",
+  //               icon: "",
+  //               permissions: ["jn_dlbb_dmb"],
+  //             },
+  //           },
+  //           {
+  //             path: "glHotAnalysis",
+  //             name: "glHotAnalysis",
+  //             component: () =>
+  //               import("@/views/powerGenerating/lightAnalyse/glHotAnalysis"),
+  //             meta: {
+  //               title: "功率光照曲线分析",
+  //               icon: "",
+  //               permissions: ["jn_dlbb_dmb"],
+  //             },
+  //           },
+  //         ],
+  //       },
+  //     ],
+  //   },
   // 智能报表
   {
     path: "/report",

src/store/modules/router.js

@@ -1,7 +1,7 @@
 import { filterAsyncRoutes, } from "@/utills/handleRoutes";
 import { asyncRoutes, constantRoutes } from "@/router";
 const state = () => ({
-  routes: [],
+  routes: [...asyncRoutes, ...constantRoutes],
 });
 
 const mutations = {

src/tools/request.js

@@ -40,34 +40,45 @@ service.interceptors.response.use(
   // Loading.close(),
   (response) => {
     const code = response.data.code;
-    if (code == 401) {
-      ElMessageBox.alert(
-        "登录状态已过期，您可以继续留在该页面，或者重新登录",
-        "系统提示",
-        {
-          confirmButtonText: "重新登录",
-          cancelButtonText: "取消",
-          type: "warning",
-          callback: () => {
-            store.dispatch("user/LogOut").then(() => {
-              route.push("/home");
-            });
-          },
-        }
-      );
+    // 处理正常返回数据
+    const { status } = response;
+    if (service.defaults.showLoading) {
+      BASE.closeLoading();
+      service.defaults.showLoading = false;
+    }
+    if (status === 200) {
+      return response.data;
     } else {
-      // 处理正常返回数据
-      const { status } = response;
-      if (service.defaults.showLoading) {
-        BASE.closeLoading();
-        service.defaults.showLoading = false;
-      }
-      if (status === 200) {
-        return response.data;
-      } else {
-        return false;
-      }
+      return false;
     }
+    // if (code == 401) {
+    //   ElMessageBox.alert(
+    //     "登录状态已过期，您可以继续留在该页面，或者重新登录",
+    //     "系统提示",
+    //     {
+    //       confirmButtonText: "重新登录",
+    //       cancelButtonText: "取消",
+    //       type: "warning",
+    //       callback: () => {
+    //         store.dispatch("user/LogOut").then(() => {
+    //           route.push("/home");
+    //         });
+    //       },
+    //     }
+    //   );
+    // } else {
+    //   // 处理正常返回数据
+    //   const { status } = response;
+    //   if (service.defaults.showLoading) {
+    //     BASE.closeLoading();
+    //     service.defaults.showLoading = false;
+    //   }
+    //   if (status === 200) {
+    //     return response.data;
+    //   } else {
+    //     return false;
+    //   }
+    // }
   },
   (error) => {
     // 处理错误并给出相应的错误处理

src/views/layout/Header.vue

@@ -162,7 +162,7 @@ export default {
       let currMenu = [];
       if (stateRoutes.length) {
         stateRoutes.forEach((route) => {
-          if (route.path !== "/login") {
+          if (route.path !== "/login" && route.path !== "/") {
             currMenu.push({
               id: route.name,
               text: route.meta.title,

src/views/layout/login-page.vue

@@ -124,35 +124,44 @@ export default {
           this.$store.commit("user/SET_NAME", that.loginForm.username);
           if (code == 0) {
             this.$store.commit("user/SET_TOKEN", data);
-            let loginSta = new Promise((resolve, reject) => {
-              login1({ token: data.accessToken, userId: data.userId })
-                .then(({ data }) => {
-                  resolve(data);
-                })
-                .catch((e) => {
-                  reject("发生错误");
-                });
-            });
-            let loginHeal = new Promise((resolve, reject) => {
-              login2({ token: data.accessToken, userId: data.userId })
-                .then((res) => {
-                  resolve(res);
-                })
-                .catch((e) => {
-                  reject("发生错误");
-                });
-            });
-            Promise.all([loginSta, loginHeal]).then((res) => {
-              if (res[0].code == 200 && res[1].code == 200) {
-                that.BASE.showMsg({
-                  msg: "登录成功",
-                  type: "success",
-                });
-                this.loading = false;
-                this.$emit("onLogin");
-                that.$router.push(this.redirectUrl); // 跳转到首页
-              }
+            this.loading = false;
+            this.$emit("onLogin");
+            that.BASE.showMsg({
+              msg: "登录成功",
+              type: "success",
             });
+
+            that.$router.push(this.redirectUrl); // 跳转到首页
+
+            // let loginSta = new Promise((resolve, reject) => {
+            //   login1({ token: data.accessToken, userId: data.userId })
+            //     .then(({ data }) => {
+            //       resolve(data);
+            //     })
+            //     .catch((e) => {
+            //       reject("发生错误");
+            //     });
+            // });
+            // let loginHeal = new Promise((resolve, reject) => {
+            //   login2({ token: data.accessToken, userId: data.userId })
+            //     .then((res) => {
+            //       resolve(res);
+            //     })
+            //     .catch((e) => {
+            //       reject("发生错误");
+            //     });
+            // });
+            // Promise.all([loginSta, loginHeal]).then((res) => {
+            //   if (res[0].code == 200 && res[1].code == 200) {
+            //     that.BASE.showMsg({
+            //       msg: "登录成功",
+            //       type: "success",
+            //     });
+            //     this.loading = false;
+            //     this.$emit("onLogin");
+            //     that.$router.push(this.redirectUrl); // 跳转到首页
+            //   }
+            // });
             // login1({ token: data.token, userId: data.userId }).then((res) => {
             //   if (res.data.code == 200) {
             //     that.BASE.showMsg({