Explorar el Código

1、系统图编辑器相关开发
2、对接登录接口
3、挪动axiosUtils.ts和httpUtils.ts的位置
4、兼容后台接口返回的新格式

niuheng hace 3 años
padre
commit
0a3c416927

+ 19 - 10
public/systemConf.js

@@ -5,8 +5,17 @@ var __systemConf = {
   baseServiceUrl: 'http://develop.ysbdtp.com',
   //系统图服务域名
   sysGraphServiceUrl: 'http://develop.ysbdtp.com/adm-diagram',
+  //登录服务域名
+  loginServiceUrl: 'http://develop.ysbdtp.com/adm-server',
+  //文件服务域名
+  fileServiceUrl: 'http://develop.ysbdtp.com/adm-server',
   // 地图key
   mapKey: 'd42beb96e0e4fb0d49482975abeae1b7',
+  //登录相关配置
+  loginConfig: {
+    loginDeviceType: 1, //登录设备类型 1 :pc 2 :Android 3 :ios 4 :其他
+    loginType: 2        //登录方式  1 :用户名密码方式(默认是ldap用户) 2 :使用手机号登录 3 :钉钉扫码登录
+  },
   //系统图的默认配置
   systemGraph: {
     //配电类
@@ -24,36 +33,36 @@ var __systemConf = {
     "id": "ready",
     "name": "信息录入工具",
     "orders": 1,
-    child: [{
+    children: [{
       "id": "build_floor",
       "name": "建筑楼层管理",
       "orders": 2,
-      "url": "/ready/buildfloor",
+      "path": "/ready/buildfloor",
       "type": "menu",
       "icon": "icon-jianzhu"
     },{
       "id": "equipment",
       "name": "设备台账",
       "orders": 3,
-      "url": "/ledger/facility"
+      "path": "/ledger/facility"
     },
     {
       "id": "system",
       "name": "系统台账",
       "orders": 4,
-      "url": "/ledger/list"
+      "path": "/ledger/list"
     },{
       "id": "overview",
       "name": "全部关系总览",
       "orders": 5,
-      "url": "/relation/overview",
+      "path": "/relation/overview",
       "icon": "icon-jiqixuexi-"
     }
     ,{
       "id": "projectmanage",
       "name": "项目信息管理",
       "orders": 6,
-      "url": "/project/manage",
+      "path": "/project/manage",
       "icon": "icon-jiqixuexi-"
     }
   ]
@@ -61,22 +70,22 @@ var __systemConf = {
     "id": "xianchangjiaofugongjv",
     "name": "现场交付工具",
     "orders": 6,
-    child: [{
+    children: [{
       "id": "CADtuzhiguanli",
       "name": "CAD核查图纸管理",
       "orders": 7,
-      "url": "/deliveryTools/cadDrawingManage",
+      "path": "/deliveryTools/cadDrawingManage",
       "icon": "icon-topology"
     }]
   }, {
     "id": "draw",
     "name": "绘图工具",
     "orders": 8,
-    child: [{
+    children: [{
       "id": "xitongtubianji",
       "name": "系统图编辑工具",
       "orders": 9,
-      "url": "/systemGraph",
+      "path": "/systemGraph",
       "icon": "icon-topology"
     }]
   }]

+ 4 - 4
src/components/frame/leftMenu.vue

@@ -2,7 +2,7 @@
   <div>
     <el-submenu
       :index="menu.orders.toString()"
-      v-if="menu.child && menu.child.length > 0"
+      v-if="menu.children && menu.children.length > 0"
     >
       <template slot="title">
         <i
@@ -14,13 +14,13 @@
       </template>
       <leftMenu
         :menu="subMenu"
-        v-for="subMenu in menu.child"
+        v-for="subMenu in menu.children"
         :key="subMenu.id"
       ></leftMenu>
     </el-submenu>
     <el-menu-item
-      :index="menu.url"
-      v-if="!menu.child || menu.child.length == 0"
+      :index="menu.path"
+      v-if="!menu.children || menu.children.length == 0"
     >
       <i
         class="menuIcon"

+ 14 - 16
src/components/frame/login.vue

@@ -8,7 +8,7 @@
         <div class="form">
           <div class="item">
             <i class="el-icon-user"></i>
-            <input type="text" placeholder="请输入用户名" v-model="userName" />
+            <input type="text" placeholder="请输入手机号" v-model="userName" />
           </div>
           <div class="item">
             <i class="el-icon-lock"></i>
@@ -54,26 +54,24 @@ export default {
       if (!this.userPass) return Message.warning("请填写密码");
       this.fullscreenLoading = true;
       try {
-        let userControllerInstance = new userController();
-        let loginResult = await userControllerInstance.login(
+        let loginResult = await userController.login(
           this.userName,
           this.userPass
         );
 
-        if (loginResult.result != logicConfig.resultObj.success)
-          return (
-            (this.fullscreenLoading = false),
-            Message.error("登录失败,原因:" + loginResult.reason)
-          );
+        if (loginResult.result != logicConfig.resultObj.success) {
+          this.fullscreenLoading = false;
+          Message.error("登录失败,原因:" + loginResult.message);
+          return;
+        }
 
-        var _userInfo = loginResult.content[0] || {};
-        var userId = _userInfo.userId;
-        if (!userId)
-          return (
-            (this.fullscreenLoading = false),
-            Message.error("登录失败,原因:无效的用户ID")
-          );
-        sessionStore.userId = _userInfo.userId;
+        var userToken = loginResult.data;
+        if (!userToken) {
+          this.fullscreenLoading = false;
+          Message.error("登录失败,原因:缺失用户token");
+          return;
+        }
+        sessionStore.userToken = userToken;
 
         this.$router.replace({ path: vueStore.state.fromPath });
       } catch (err) {

+ 1 - 1
src/components/frame/pageLeft.vue

@@ -21,7 +21,7 @@
           </template>
           <leftMenu
             :menu="subMenu"
-            v-for="subMenu in menu.child"
+            v-for="subMenu in menu.children"
             :key="subMenu.id"
             :index="subMenu.id"
           ></leftMenu>

+ 1 - 1
src/components/systemGraph/addGraph.vue

@@ -165,7 +165,7 @@ export default {
         var createResult = await sysGraphController.createSysGraph(_paramObj);
         switch (createResult.result) {
           case logicConfig.resultObj.failure:
-            Message.error("操作失败,原因:" + createResult.reason);
+            Message.error("操作失败,原因:" + createResult.message);
             break;
           case logicConfig.resultObj.success:
             // this.$emit("created", createResult.data);

+ 5 - 5
src/components/systemGraph/edit.vue

@@ -528,7 +528,7 @@ export default {
       );
       if (resultObj.result != logicConfig.resultObj.success) {
         this.fullscreenLoading = false;
-        Message.error(resultObj.reason);
+        Message.error(resultObj.message);
         return;
       }
       this.graphOriginInfo = JSON.parse(JSON.stringify(resultObj.data));
@@ -586,7 +586,7 @@ export default {
       this.fullscreenLoading = false;
       switch (saveResultObj.result) {
         case logicConfig.resultObj.failure:
-          Message.error("保存失败:" + (saveResultObj.reason || ""));
+          Message.error("保存失败:" + (saveResultObj.message || ""));
           return;
         case logicConfig.resultObj.success:
           Message.success("保存成功");
@@ -613,7 +613,7 @@ export default {
           this.graphInfo.extraProps.state = graphStateEnum.Publish;
           return Message.success("上架成功");
         case logicConfig.resultObj.failure:
-          return Message.success("上架失败,原因:" + (resultObj.reason || ""));
+          return Message.success("上架失败,原因:" + (resultObj.message || ""));
       }
     },
     //下架系统图
@@ -627,7 +627,7 @@ export default {
           this.graphInfo.extraProps.state = graphStateEnum.Draft;
           return Message.success("下架成功");
         case logicConfig.resultObj.failure:
-          return Message.success("下架失败,原因:" + (resultObj.reason || ""));
+          return Message.success("下架失败,原因:" + (resultObj.message || ""));
       }
     },
     //删除系统图
@@ -656,7 +656,7 @@ export default {
               return;
             case logicConfig.resultObj.failure:
               return Message.success(
-                "删除图纸失败,原因:" + (resultObj.reason || "")
+                "删除图纸失败,原因:" + (resultObj.message || "")
               );
           }
         })

+ 9 - 9
src/controller/systemGraph/sysGraphController.ts

@@ -26,7 +26,7 @@ export class sysGraphController {
         //先取得所有的系统图,注:没有分页
         var resultObj = await this.sysGraphHttpUtilsInstance.postRequest('/diagram/getDiagrams', { name: grpphName });
         if (resultObj.result != logicConfig.resultObj.success)
-            console.error(resultObj.reason);
+            console.error(resultObj.message);
 
         //key为系统类型编码,值为系统类型数据
         var _tempSystemTypeObj = {};
@@ -151,7 +151,7 @@ export class sysGraphController {
         var url = '/diagram/major/system/instance?projectId=' + projectId + '&groupCode=' + groupCode;
         var resultObj = await this.sysGraphHttpUtilsInstance.postRequest(url, {});
         if (resultObj.result != logicConfig.resultObj.success)
-            console.error(resultObj.reason);
+            console.error(resultObj.message);
         var dataArr = resultObj.data || [];
         this.zhuanyeArr = dataArr;
         var newDataArr = [];
@@ -185,7 +185,7 @@ export class sysGraphController {
         var url = '/diagram/systemType/template';
         var resultObj = await this.sysGraphHttpUtilsInstance.postRequest(url, { system: sysTypeCode });
         if (resultObj.result != logicConfig.resultObj.success)
-            console.error(resultObj.reason);
+            console.error(resultObj.message);
         var dataArr = resultObj.data || [];
         var newDataArr = [];
 
@@ -212,26 +212,26 @@ export class sysGraphController {
         var url = '/diagram/newDiagram';
         var resultObj = await this.sysGraphHttpUtilsInstance.postRequest(url, _paramObj);
         if (resultObj.result != logicConfig.resultObj.success) {
-            resultObj.reason = '新建系统图失败:' + resultObj.reason;
+            resultObj.message = '新建系统图失败:' + resultObj.message;
             return resultObj;
         }
 
         var dataObj = resultObj.data || {};
         if (!dataObj.id)
-            return { result: logicConfig.resultObj.failure, reason: '缺少系统图ID' };
+            return { result: logicConfig.resultObj.failure, message: '缺少系统图ID' };
 
         //新增成功后,要加载数据
         var loadDataUrl = '/diagram/loadData';
         var loadResultObj = await this.sysGraphHttpUtilsInstance.postRequest(loadDataUrl, { id: dataObj.id });
         if (loadResultObj.result != logicConfig.resultObj.success) {
-            loadResultObj.reason = '加载模板数据失败:' + loadResultObj.reason;
+            loadResultObj.message = '加载模板数据失败:' + loadResultObj.message;
             return loadResultObj;
         }
 
         //加载数据成功后保存数据
         var saveResultObj = await this.saveSysGraph(loadResultObj.data);
         if (saveResultObj.result != logicConfig.resultObj.success) {
-            saveResultObj.reason = '保存系统图数据失败:' + saveResultObj.reason;
+            saveResultObj.message = '保存系统图数据失败:' + saveResultObj.message;
             return saveResultObj;
         }
 
@@ -257,13 +257,13 @@ export class sysGraphController {
         var url = '/diagram/getDiagram?diagramId=' + id;
         var resultObj = await this.sysGraphHttpUtilsInstance.getRequest(url, {});
         if (resultObj.result != logicConfig.resultObj.success) {
-            console.error(resultObj.reason);
+            console.error(resultObj.message);
             return resultObj;
         }
 
         var dataObj = resultObj.data || {};
         if (!dataObj.id)
-            return { result: logicConfig.resultObj.failure, reason: '缺少系统图ID' };
+            return { result: logicConfig.resultObj.failure, message: '缺少系统图ID' };
 
         //取得专业>系统类型>系统实例  以和系统图列表中的系统类型编码 对应以获取系统实例名称
         if (this.zhuanyeArr.length == 0) {

+ 335 - 312
src/controller/userController.ts

@@ -3,325 +3,348 @@
  */
 
 import { customHttpUtils } from "@/utils/http/customHttpUtils";
+import { toolUtils } from "@/utils/toolUtils";
 import { sessionStore } from "@/store/sessionStore";
 
 export class userController {
-    /**
-     * 登录
-     * @param userName 
-     * @param userPass 
-     * @returns 
-     */
-    async login(userName: string, userPass: string) {
-        var _dataStr = JSON.stringify({
-            loginName: userName,
-            password: userPass,
-            loginDevice: "PC",
-            longitude: 1,
-            latitude: 1,
-        });
 
-        let requestUrl = (window as any).__systemConf.baseServiceUrl + "/login-service";
-        let requestHeaders = {
-            "Content-Type": "application/x-www-form-urlencoded",
-        };
-        let requestData = "jsonString=" + _dataStr;
-        let requestMethod = "post";
+  /**
+   * 登录
+   * @param userName 
+   * @param userPass 
+   * @returns 
+   */
+  static async login(userName: string, userPass: string) {
+    var httpUrl = (window as any).__systemConf.loginServiceUrl;
+    httpUrl = toolUtils.getBaseHttpUrl(httpUrl, 'auth/login/loginInfo');
 
-        let customHttpUtilsInstance = new customHttpUtils();
+    let requestMethod = "post";
 
-        let loginResult = await customHttpUtilsInstance.customRequest(
-            requestUrl,
-            requestHeaders,
-            requestData,
-            requestMethod
-        );
-        return loginResult;
+    var loginConfig = (window as any).__systemConf.loginConfig;
+    var paramObj = {
+      "phone": userName,
+      "passWord": userPass,
+      "loginDeviceType": loginConfig.loginDeviceType,
+      "loginType": loginConfig.loginType
     };
 
-    async getUserInfoById(){
-        let userId = sessionStore.userId;
-        return {
-            result:'success',
-            content:[{
-                userId: userId,
-                userName: 'adm',
-                projects:[
-                    {
-                      "projectLocalName": "银泰中心",
-                      "projName": "银泰中心",
-                      "latitude": "36.5",
-                      "productLine": "",
-                      "projectCode": "",
-                      "detailAddress": "001号",
-                      "projectLocalID": "1101050031",
-                      "functionType": "230",
-                      "partitionAbbr": "银泰中心",
-                      "projectName": "银泰中心",
-                      "projectId": "Pj1101050031",
-                      "liveStatus": "1",
-                      "longitude": "102.12",
-                      "totalArea": null,
-                      "groupCode": "BR"
-                    },
-                    {
-                      "projectLocalName": "博锐尚格",
-                      "projName": "博锐尚格",
-                      "latitude": "36.5",
-                      "productLine": "1",
-                      "projectCode": "",
-                      "detailAddress": "北京市海淀区建材城中路27号金隅智造工场N2-3层",
-                      "projectLocalID": "1101080259",
-                      "functionType": "230",
-                      "partitionAbbr": "博锐尚格",
-                      "projectName": "博锐尚格",
-                      "projectId": "Pj1101080259",
-                      "liveStatus": "1",
-                      "longitude": "102.12",
-                      "totalArea": null,
-                      "groupCode": "BR"
-                    },
-                    {
-                      "projectLocalName": "禹数科技公司",
-                      "projName": "禹数科技公司",
-                      "latitude": "36.5",
-                      "productLine": "",
-                      "projectCode": null,
-                      "detailAddress": "金隅智造工厂N2楼3层",
-                      "projectLocalID": "1101101230",
-                      "functionType": "230",
-                      "partitionAbbr": "禹数科技公司",
-                      "projectName": "禹数科技公司",
-                      "projectId": "Pj1101101230",
-                      "liveStatus": "1",
-                      "longitude": "102.12",
-                      "totalArea": null,
-                      "groupCode": "BR"
-                    },
-                    {
-                      "projectLocalName": "北京万科半岛广场",
-                      "projName": "北京万科半岛广场",
-                      "latitude": "36.5",
-                      "productLine": "1",
-                      "projectCode": "",
-                      "detailAddress": "广阳新路9号院1号楼1-4层(商业部分)",
-                      "projectLocalID": "1101110003",
-                      "functionType": "230",
-                      "partitionAbbr": "北京万科半岛广场",
-                      "projectName": "北京万科半岛广场",
-                      "projectId": "Pj1101110003",
-                      "liveStatus": "1",
-                      "longitude": "102.12",
-                      "totalArea": null,
-                      "groupCode": "BR"
-                    },
-                    {
-                      "projectLocalName": "测试项目1",
-                      "projName": null,
-                      "latitude": "36.5",
-                      "productLine": "",
-                      "projectCode": "",
-                      "detailAddress": "",
-                      "projectLocalID": "1208001",
-                      "functionType": "200",
-                      "partitionAbbr": null,
-                      "projectName": "测试项目1",
-                      "projectId": "Pj1208001",
-                      "liveStatus": "1",
-                      "longitude": "102.12",
-                      "totalArea": null,
-                      "groupCode": "BR"
-                    },
-                    {
-                      "projectLocalName": "测试项目2",
-                      "projName": null,
-                      "latitude": "36.5",
-                      "productLine": "",
-                      "projectCode": null,
-                      "detailAddress": "",
-                      "projectLocalID": "1208002",
-                      "functionType": "200",
-                      "partitionAbbr": null,
-                      "projectName": "测试项目2",
-                      "projectId": "Pj1208002",
-                      "liveStatus": "0",
-                      "longitude": "102.12",
-                      "totalArea": null,
-                      "groupCode": "BR"
-                    },
-                    {
-                      "projectLocalName": "上海国际航空服务中心",
-                      "projName": "上海国际航空服务中心",
-                      "latitude": "36.5",
-                      "productLine": null,
-                      "projectCode": null,
-                      "detailAddress": null,
-                      "projectLocalID": "3101040002",
-                      "functionType": "230",
-                      "partitionAbbr": "上海国际航空服务中心",
-                      "projectName": "上海国际航空服务中心",
-                      "projectId": "Pj3101040002",
-                      "liveStatus": "1",
-                      "longitude": "102.12",
-                      "totalArea": null,
-                      "groupCode": "BR"
-                    },
-                    {
-                      "projectLocalName": "济南印象城",
-                      "projName": "济南印象城",
-                      "latitude": "36.5",
-                      "productLine": "1",
-                      "projectCode": null,
-                      "detailAddress": " 花园路136号7号楼(印象城)",
-                      "projectLocalID": "3701020004",
-                      "functionType": "230",
-                      "partitionAbbr": "济南印象城",
-                      "projectName": "济南印象城",
-                      "projectId": "Pj3701020004",
-                      "liveStatus": "1",
-                      "longitude": "102.12",
-                      "totalArea": null,
-                      "groupCode": "BR"
-                    },
-                    {
-                      "projectLocalName": "香港置地约克北郡",
-                      "projName": "香港置地约克北郡",
-                      "latitude": "36.5",
-                      "productLine": "1",
-                      "projectCode": "",
-                      "detailAddress": "重庆市渝北区0003项目",
-                      "projectLocalID": "5001120003",
-                      "functionType": "230",
-                      "partitionAbbr": "香港置地约克北郡",
-                      "projectName": "香港置地约克北郡",
-                      "projectId": "Pj5001120003",
-                      "liveStatus": "1",
-                      "longitude": "102.12",
-                      "totalArea": null,
-                      "groupCode": "BR"
-                    },
-                    {
-                      "projectLocalName": "不知道做什么的2",
-                      "projName": null,
-                      "latitude": "36.5",
-                      "productLine": "",
-                      "projectCode": "",
-                      "detailAddress": "",
-                      "projectLocalID": "5555567890",
-                      "functionType": "230",
-                      "partitionAbbr": null,
-                      "projectName": "不知道做什么的2",
-                      "projectId": "Pj5555567890",
-                      "liveStatus": "1",
-                      "longitude": "102.12",
-                      "totalArea": null,
-                      "groupCode": "BR"
-                    },
-                    {
-                      "projectLocalName": "不知道做什么的3",
-                      "projName": null,
-                      "latitude": "36.5",
-                      "productLine": "",
-                      "projectCode": null,
-                      "detailAddress": "",
-                      "projectLocalID": "6666667777",
-                      "functionType": "230",
-                      "partitionAbbr": null,
-                      "projectName": "不知道做什么的3",
-                      "projectId": "Pj6666667777",
-                      "liveStatus": "1",
-                      "longitude": "102.12",
-                      "totalArea": null,
-                      "groupCode": "BR"
-                    },
-                    {
-                      "projectLocalName": "龙华交付测试项目",
-                      "projName": "龙华模拟交付",
-                      "latitude": "36.5",
-                      "productLine": "",
-                      "projectCode": null,
-                      "detailAddress": "",
-                      "projectLocalID": "8888888801",
-                      "functionType": "230",
-                      "partitionAbbr": "龙华模拟交付",
-                      "projectName": "龙华交付测试项目",
-                      "projectId": "Pj8888888801",
-                      "liveStatus": "1",
-                      "longitude": "102.12",
-                      "totalArea": null,
-                      "groupCode": "BR"
-                    },
-                    {
-                      "projectLocalName": "京东测试项目",
-                      "projName": "京东测试项目",
-                      "latitude": "36.5",
-                      "productLine": "",
-                      "projectCode": null,
-                      "detailAddress": "",
-                      "projectLocalID": "9909990002",
-                      "functionType": "230",
-                      "partitionAbbr": "京东测试项目",
-                      "projectName": "京东测试项目",
-                      "projectId": "Pj9909990002",
-                      "liveStatus": "1",
-                      "longitude": "102.12",
-                      "totalArea": null,
-                      "groupCode": "BR"
-                    },
-                    {
-                      "projectLocalName": "不知道做什么的4",
-                      "projName": null,
-                      "latitude": "36.5",
-                      "productLine": "",
-                      "projectCode": "",
-                      "detailAddress": "",
-                      "projectLocalID": "9909990003",
-                      "functionType": "230",
-                      "partitionAbbr": null,
-                      "projectName": "不知道做什么的4",
-                      "projectId": "Pj9909990003",
-                      "liveStatus": "1",
-                      "longitude": "102.12",
-                      "totalArea": null,
-                      "groupCode": "BR"
-                    },
-                    {
-                      "projectLocalName": "京东本地测试项目",
-                      "projName": "京东本地测试项目",
-                      "latitude": "36.5",
-                      "productLine": "",
-                      "projectCode": null,
-                      "detailAddress": "",
-                      "projectLocalID": "9909990004",
-                      "functionType": "230",
-                      "partitionAbbr": "京东本地测试项目",
-                      "projectName": "京东本地测试项目",
-                      "projectId": "Pj9909990004",
-                      "liveStatus": "1",
-                      "longitude": "102.12",
-                      "totalArea": null,
-                      "groupCode": "BR"
-                    },
-                    {
-                      "projectLocalName": "测试003",
-                      "projName": null,
-                      "latitude": "39.93",
-                      "productLine": "",
-                      "projectCode": null,
-                      "detailAddress": "",
-                      "projectLocalID": "test003",
-                      "functionType": "111",
-                      "partitionAbbr": null,
-                      "projectName": "测试003",
-                      "projectId": "Pj129003",
-                      "liveStatus": "0",
-                      "longitude": "116.42",
-                      "totalArea": null,
-                      "groupCode": "BR"
-                    }
-                  ]
-            }],
-            reason: ''
-        };
+    let customHttpUtilsInstance = new customHttpUtils();
+
+    let loginResult = await customHttpUtilsInstance.customRequest(
+      httpUrl,
+      null,
+      paramObj,
+      requestMethod
+    );
+    return loginResult;
+  };
+
+  static async getUserInfoById() {
+    var loginConfig = (window as any).__systemConf.loginConfig;
+    let userToken = sessionStore.userToken;
+
+    var httpUrl = (window as any).__systemConf.baseServiceUrl;
+    httpUrl = (httpUrl.lastIndexOf('/') == httpUrl.length - 1 ? httpUrl : httpUrl + '/') + this.urlPathPrefix + 'auth/login/loginInfo';
+
+    let requestHeaders = {
+      "Content-Type": "application/x-www-form-urlencoded",
+      token: userToken,
+      loginDeviceType: loginConfig.loginDeviceType
+    };
+    let requestMethod = "post";
+
+    let customHttpUtilsInstance = new customHttpUtils();
+
+    let loginResult = await customHttpUtilsInstance.customRequest(
+      httpUrl,
+      requestHeaders,
+      null,
+      requestMethod
+    );
+    return loginResult;
+
+
+    return {
+      result: 'success',
+      content: [{
+        userId: userToken,
+        userName: 'adm',
+        projects: [
+          {
+            "projectLocalName": "银泰中心",
+            "projName": "银泰中心",
+            "latitude": "36.5",
+            "productLine": "",
+            "projectCode": "",
+            "detailAddress": "001号",
+            "projectLocalID": "1101050031",
+            "functionType": "230",
+            "partitionAbbr": "银泰中心",
+            "projectName": "银泰中心",
+            "projectId": "Pj1101050031",
+            "liveStatus": "1",
+            "longitude": "102.12",
+            "totalArea": null,
+            "groupCode": "BR"
+          },
+          {
+            "projectLocalName": "博锐尚格",
+            "projName": "博锐尚格",
+            "latitude": "36.5",
+            "productLine": "1",
+            "projectCode": "",
+            "detailAddress": "北京市海淀区建材城中路27号金隅智造工场N2-3层",
+            "projectLocalID": "1101080259",
+            "functionType": "230",
+            "partitionAbbr": "博锐尚格",
+            "projectName": "博锐尚格",
+            "projectId": "Pj1101080259",
+            "liveStatus": "1",
+            "longitude": "102.12",
+            "totalArea": null,
+            "groupCode": "BR"
+          },
+          {
+            "projectLocalName": "禹数科技公司",
+            "projName": "禹数科技公司",
+            "latitude": "36.5",
+            "productLine": "",
+            "projectCode": null,
+            "detailAddress": "金隅智造工厂N2楼3层",
+            "projectLocalID": "1101101230",
+            "functionType": "230",
+            "partitionAbbr": "禹数科技公司",
+            "projectName": "禹数科技公司",
+            "projectId": "Pj1101101230",
+            "liveStatus": "1",
+            "longitude": "102.12",
+            "totalArea": null,
+            "groupCode": "BR"
+          },
+          {
+            "projectLocalName": "北京万科半岛广场",
+            "projName": "北京万科半岛广场",
+            "latitude": "36.5",
+            "productLine": "1",
+            "projectCode": "",
+            "detailAddress": "广阳新路9号院1号楼1-4层(商业部分)",
+            "projectLocalID": "1101110003",
+            "functionType": "230",
+            "partitionAbbr": "北京万科半岛广场",
+            "projectName": "北京万科半岛广场",
+            "projectId": "Pj1101110003",
+            "liveStatus": "1",
+            "longitude": "102.12",
+            "totalArea": null,
+            "groupCode": "BR"
+          },
+          {
+            "projectLocalName": "测试项目1",
+            "projName": null,
+            "latitude": "36.5",
+            "productLine": "",
+            "projectCode": "",
+            "detailAddress": "",
+            "projectLocalID": "1208001",
+            "functionType": "200",
+            "partitionAbbr": null,
+            "projectName": "测试项目1",
+            "projectId": "Pj1208001",
+            "liveStatus": "1",
+            "longitude": "102.12",
+            "totalArea": null,
+            "groupCode": "BR"
+          },
+          {
+            "projectLocalName": "测试项目2",
+            "projName": null,
+            "latitude": "36.5",
+            "productLine": "",
+            "projectCode": null,
+            "detailAddress": "",
+            "projectLocalID": "1208002",
+            "functionType": "200",
+            "partitionAbbr": null,
+            "projectName": "测试项目2",
+            "projectId": "Pj1208002",
+            "liveStatus": "0",
+            "longitude": "102.12",
+            "totalArea": null,
+            "groupCode": "BR"
+          },
+          {
+            "projectLocalName": "上海国际航空服务中心",
+            "projName": "上海国际航空服务中心",
+            "latitude": "36.5",
+            "productLine": null,
+            "projectCode": null,
+            "detailAddress": null,
+            "projectLocalID": "3101040002",
+            "functionType": "230",
+            "partitionAbbr": "上海国际航空服务中心",
+            "projectName": "上海国际航空服务中心",
+            "projectId": "Pj3101040002",
+            "liveStatus": "1",
+            "longitude": "102.12",
+            "totalArea": null,
+            "groupCode": "BR"
+          },
+          {
+            "projectLocalName": "济南印象城",
+            "projName": "济南印象城",
+            "latitude": "36.5",
+            "productLine": "1",
+            "projectCode": null,
+            "detailAddress": " 花园路136号7号楼(印象城)",
+            "projectLocalID": "3701020004",
+            "functionType": "230",
+            "partitionAbbr": "济南印象城",
+            "projectName": "济南印象城",
+            "projectId": "Pj3701020004",
+            "liveStatus": "1",
+            "longitude": "102.12",
+            "totalArea": null,
+            "groupCode": "BR"
+          },
+          {
+            "projectLocalName": "香港置地约克北郡",
+            "projName": "香港置地约克北郡",
+            "latitude": "36.5",
+            "productLine": "1",
+            "projectCode": "",
+            "detailAddress": "重庆市渝北区0003项目",
+            "projectLocalID": "5001120003",
+            "functionType": "230",
+            "partitionAbbr": "香港置地约克北郡",
+            "projectName": "香港置地约克北郡",
+            "projectId": "Pj5001120003",
+            "liveStatus": "1",
+            "longitude": "102.12",
+            "totalArea": null,
+            "groupCode": "BR"
+          },
+          {
+            "projectLocalName": "不知道做什么的2",
+            "projName": null,
+            "latitude": "36.5",
+            "productLine": "",
+            "projectCode": "",
+            "detailAddress": "",
+            "projectLocalID": "5555567890",
+            "functionType": "230",
+            "partitionAbbr": null,
+            "projectName": "不知道做什么的2",
+            "projectId": "Pj5555567890",
+            "liveStatus": "1",
+            "longitude": "102.12",
+            "totalArea": null,
+            "groupCode": "BR"
+          },
+          {
+            "projectLocalName": "不知道做什么的3",
+            "projName": null,
+            "latitude": "36.5",
+            "productLine": "",
+            "projectCode": null,
+            "detailAddress": "",
+            "projectLocalID": "6666667777",
+            "functionType": "230",
+            "partitionAbbr": null,
+            "projectName": "不知道做什么的3",
+            "projectId": "Pj6666667777",
+            "liveStatus": "1",
+            "longitude": "102.12",
+            "totalArea": null,
+            "groupCode": "BR"
+          },
+          {
+            "projectLocalName": "龙华交付测试项目",
+            "projName": "龙华模拟交付",
+            "latitude": "36.5",
+            "productLine": "",
+            "projectCode": null,
+            "detailAddress": "",
+            "projectLocalID": "8888888801",
+            "functionType": "230",
+            "partitionAbbr": "龙华模拟交付",
+            "projectName": "龙华交付测试项目",
+            "projectId": "Pj8888888801",
+            "liveStatus": "1",
+            "longitude": "102.12",
+            "totalArea": null,
+            "groupCode": "BR"
+          },
+          {
+            "projectLocalName": "京东测试项目",
+            "projName": "京东测试项目",
+            "latitude": "36.5",
+            "productLine": "",
+            "projectCode": null,
+            "detailAddress": "",
+            "projectLocalID": "9909990002",
+            "functionType": "230",
+            "partitionAbbr": "京东测试项目",
+            "projectName": "京东测试项目",
+            "projectId": "Pj9909990002",
+            "liveStatus": "1",
+            "longitude": "102.12",
+            "totalArea": null,
+            "groupCode": "BR"
+          },
+          {
+            "projectLocalName": "不知道做什么的4",
+            "projName": null,
+            "latitude": "36.5",
+            "productLine": "",
+            "projectCode": "",
+            "detailAddress": "",
+            "projectLocalID": "9909990003",
+            "functionType": "230",
+            "partitionAbbr": null,
+            "projectName": "不知道做什么的4",
+            "projectId": "Pj9909990003",
+            "liveStatus": "1",
+            "longitude": "102.12",
+            "totalArea": null,
+            "groupCode": "BR"
+          },
+          {
+            "projectLocalName": "京东本地测试项目",
+            "projName": "京东本地测试项目",
+            "latitude": "36.5",
+            "productLine": "",
+            "projectCode": null,
+            "detailAddress": "",
+            "projectLocalID": "9909990004",
+            "functionType": "230",
+            "partitionAbbr": "京东本地测试项目",
+            "projectName": "京东本地测试项目",
+            "projectId": "Pj9909990004",
+            "liveStatus": "1",
+            "longitude": "102.12",
+            "totalArea": null,
+            "groupCode": "BR"
+          },
+          {
+            "projectLocalName": "测试003",
+            "projName": null,
+            "latitude": "39.93",
+            "productLine": "",
+            "projectCode": null,
+            "detailAddress": "",
+            "projectLocalID": "test003",
+            "functionType": "111",
+            "partitionAbbr": null,
+            "projectName": "测试003",
+            "projectId": "Pj129003",
+            "liveStatus": "0",
+            "longitude": "116.42",
+            "totalArea": null,
+            "groupCode": "BR"
+          }
+        ]
+      }],
+      reason: ''
     };
+  };
 }

+ 0 - 69
src/store/modules/layout.ts

@@ -178,74 +178,5 @@ export default {
         );
       });
     },
-    /**
-     * 根据登录返回code获取用户信息和项目信息
-     */
-    loadUserInfo({ state }) {
-      return new Promise(async (resolve, reject) => {
-        /**
-         * 改为调用运维平台的根据用户ID获取用户信息的接口
-         * nh 2021.10.25
-         */
-        // let userId = store.state.ssoToken
-        //   ? store.state.ssoToken
-        //   : lStorage.get("ssoToken");
-
-        let pd = lStorage.get("ssoPd");
-        const user = new userController();
-        var infoData = await user.getUserInfoById();
-        if (infoData.result === "success") {
-          const data: any = (infoData.content || [])[0] || {};
-          state.userInfo = {
-            userName: data.userName,
-            userId: data.userId,
-          };
-          state.userId = data.userId;
-          state.projects = []; //初始化项目列表
-          storage.set("user_name", data.userName);
-          storage.set("user_id", data.userId);
-          // 获取系统菜单成功
-          if (data.authorizations && data.authorizations.length) {
-            var menuArr = tools.formatMenu(data.authorizations);
-            state.menus = menuArr;
-          } else {
-            state.menus = [];
-          }
-
-          // 获取项目信息成功
-          if (data.projects && data.projects.length) {
-            // 设置项目列表
-            data.projects.forEach((proj) =>
-              state.projects.push({
-                id: proj.projectId,
-                name: proj.projectLocalName,
-                pwd: proj.secret ? proj.secret : "",
-                group_code: proj.groupCode,
-              })
-            );
-          }
-          resolve(infoData);
-        } else {
-          state.userInfo = {
-            userName: "yanruolan",
-            userId: "06328a53c69a41bb8f5bb1a552c6e8d6",
-          };
-          resolve(infoData);
-        }
-        return;
-      });
-    },
-    setBreadcrumb: {
-      root: true,
-      handler({ state, commit }, val) {
-        let label = val[0].label;
-        if (label === "消息中心") {
-          commit("setSidebarSelected", "message"); // 当进入消息中心页面的时候不选中导航栏
-        }
-        state.breadcrumb = [];
-        state.breadcrumb = val;
-        storage.set(KEY_PAGE_BRANDCRUMB, val);
-      },
-    },
   },
 };

+ 2 - 2
src/store/sessionStore.ts

@@ -2,11 +2,11 @@ import {logicConfig} from '@/logicConfig'
 
 export class sessionStore{
 
-    public static get userId(){
+    public static get userToken(){
         return sessionStorage.getItem(logicConfig.tokenKeyName);
     }
 
-    public static set userId(val){
+    public static set userToken(val){
         sessionStorage.setItem(logicConfig.tokenKeyName, val);
     }
 

+ 12 - 12
src/utils/authUtils.ts

@@ -19,39 +19,38 @@ export class authUtils {
     }
 
     //如果sessionStore里没有用户ID,说明用户没有登录,此时跳转到登录页
-    var userId = sessionStore.userId;
-    if (!userId) {
+    var userToken = sessionStore.userToken;
+    if (!userToken) {
       vueStore.commit("updateFromPath", to.path);
       next({ path: logicConfig.routerNameConfig.loginRouteName });
       return;
     }
 
-    //如果vueStore里存在用户ID,说明已经缓存的有用户信息,不需要再次获取
+    //如果vueStore里存在用户token,说明已经缓存的有用户信息,不需要再次获取
     if (vueStore.state.user.id) {
       //更新面包屑数据
       vueStore.commit("updateBreadcrumbs", { to: to.path });
       return next();
     }
 
-    let userControllerInstance = new userController();
-    let userInfoResult = await userControllerInstance.getUserInfoById();
+    let userInfoResult = await userController.getUserInfoById();
 
     if (userInfoResult.result != logicConfig.resultObj.success) {
-      console.error("获取用户信息失败,原因:" + userInfoResult.reason);
+      console.error("获取用户信息失败,原因:" + userInfoResult.message);
       return next({ path: logicConfig.routerNameConfig.loginRouteName });
     }
 
-    var _userInfo = (userInfoResult.content[0] || {}) as any;
-    if (!_userInfo.userId) {
+    var _userInfo = (userInfoResult.data || {}) as any;
+    if (!_userInfo.id) {
       console.error("获取用户信息失败,原因:无效的用户ID");
       return next({ path: logicConfig.routerNameConfig.loginRouteName });
     }
 
     vueStore.commit("updateUser", {
-      id: _userInfo.userId,
-      name: _userInfo.userName,
+      id: _userInfo.id,
+      name: _userInfo.name,
     });
-    vueStore.commit("updateMenus", (window as any).__systemConf.menus);
+    vueStore.commit("updateMenus", _userInfo.menus || (window as any).__systemConf.menus);
 
     //更新面包屑数据
     vueStore.commit("updateBreadcrumbs", { to: to.path });
@@ -60,8 +59,9 @@ export class authUtils {
     _userInfo.projects.forEach((_c) => {
       projects.push({
         id: _c.projectId,
-        name: _c.projectLocalName,
+        name: _c.projectName,
         groupCode: _c.groupCode,
+        groupName: _c.groupName,
       });
     });
     vueStore.commit("updateProjects", projects);

+ 1 - 1
src/utils/http/baseHttpUtils.ts

@@ -3,7 +3,7 @@
  * nh 2021.12.23
  */
 
-import { httpUtils } from "./httpUtils";
+import { httpUtils } from "./basic/httpUtils";
 
 export class baseHttpUtils extends httpUtils {
     constructor() {

+ 1 - 1
src/utils/http/axiosUtils.ts

@@ -133,7 +133,7 @@ export class axiosUtils {
       console.error(err);
       return {
         result: logicConfig.resultObj.failure,
-        reason: '请求异常'
+        message: '请求异常'
       };
     }
   }

+ 1 - 1
src/utils/http/httpUtils.ts

@@ -4,7 +4,7 @@
  */
 
 import { axiosUtils } from "./axiosUtils";
-import { toolUtils } from "../toolUtils";
+import { toolUtils } from "@/utils/toolUtils";
 
 export class httpUtils extends axiosUtils {
   protected constructor(baseUrl: string) {

+ 1 - 1
src/utils/http/customHttpUtils.ts

@@ -3,7 +3,7 @@
  * nh 2021.12.28
  */
 
- import { httpUtils } from "./httpUtils";
+ import { httpUtils } from "./basic/httpUtils";
 
  export class customHttpUtils extends httpUtils {
 

+ 1 - 1
src/utils/http/sysGraphHttpUtils.ts

@@ -3,7 +3,7 @@
  * nh 2022.1.5
  */
 
-import { httpUtils } from "./httpUtils";
+import { httpUtils } from "./basic/httpUtils";
 
 export class sysGraphHttpUtils extends httpUtils {
     constructor() {