Merge branch 'master' into dev_duxiangyu

public/systemConf.js

@@ -2,9 +2,9 @@ var __systemConf = {
   //路由根路径
   baseRouteUrl: 'adm-frontend',
   //基础数据根域名
-  baseServiceUrl: '/baseService',
+  baseServiceUrl: 'http://develop.ysbdtp.com',
   //系统图服务域名
-  sysGraphServiceUrl: '/sysGraphService',
+  sysGraphServiceUrl: 'http://develop.ysbdtp.com/adm-diagram',
   // 地图key
   mapKey: 'd42beb96e0e4fb0d49482975abeae1b7',
   //系统图的默认配置
@@ -88,8 +88,4 @@ if (typeof window != 'undefined') {
 
 if (typeof module != 'undefined') {
   module.exports = __systemConf;
-}
-
-// if (typeof export != 'undefined') {
-//   module.exports = __systemConf;
-// }
+}

src/store/modules/layout.ts

@@ -187,9 +187,9 @@ export default {
          * 改为调用运维平台的根据用户ID获取用户信息的接口
          * nh 2021.10.25
          */
-        let userId = store.state.ssoToken
-          ? store.state.ssoToken
-          : lStorage.get("ssoToken");
+        // let userId = store.state.ssoToken
+        //   ? store.state.ssoToken
+        //   : lStorage.get("ssoToken");
 
         let pd = lStorage.get("ssoPd");
         const user = new userController();