From f151f1b080bcc5d3bdb45329c33f39802b4e2de2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=BE=A4?= Date: Mon, 16 Jan 2023 16:42:05 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=94=B9=E7=89=88=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E7=8E=B0=E5=9C=BA=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/source/total.js | 3663 +++++++++++---------- src/router/axios.js | 2 +- src/router/views/index.js | 2 +- src/util/bfHelper.js | 12 +- src/views/garden/generalizePatternNew.vue | 118 +- vue.config.js | 4 +- 6 files changed, 1922 insertions(+), 1879 deletions(-) diff --git a/src/api/source/total.js b/src/api/source/total.js index f6b8f9c..5897e6d 100644 --- a/src/api/source/total.js +++ b/src/api/source/total.js @@ -337,21 +337,22 @@ export const getWeather = () => { }; // 首页改版总览 20221208---------------------------------------------------------------- -const isMock = true;//是否模拟数据 +const isMock = false; //是否模拟数据 //业务区及塔台总人数 - 业务区（封闭运行） export const getAllJZByDate = (date) => { if (isMock) { return new Promise((reslove) => { reslove({ - "success": true, - "message": "获取业务区以及塔台的总人数成功", - "code": 200, - "result": 220, //业务区（封闭运行）总人数 - "timestamp": 1669703332500 - }) - }) - } - else { + data: { + success: true, + message: "获取业务区以及塔台的总人数成功", + code: 200, + result: 220, //业务区（封闭运行）总人数 + timestamp: 1669703332500, + }, + }); + }); + } else { return request({ url: "/epiHome/getAllJZByDate", method: "get", @@ -364,15 +365,16 @@ export const getJZAdminByDate = (date) => { if (isMock) { return new Promise((reslove) => { reslove({ - "success": true, - "message": "获取胶州机关行政人员总人数成功", - "code": 200, - "result": 153, //胶州机关行政总人数 - "timestamp": 1669704319607 - }) - }) - } - else { + data: { + success: true, + message: "获取胶州机关行政人员总人数成功", + code: 200, + result: 153, //胶州机关行政总人数 + timestamp: 1669704319607, + }, + }); + }); + } else { return request({ url: "/epiHome/getJZAdminByDate", method: "get", @@ -385,15 +387,16 @@ export const getAllJJByDate = (date) => { if (isMock) { return new Promise((reslove) => { reslove({ - "success": true, - "message": "获取居家的总人数成功", - "code": 200, - "result": 57, //居家人数 - "timestamp": 1669703291215 - }) - }) - } - else { + data: { + success: true, + message: "获取居家的总人数成功", + code: 200, + result: 57, //居家人数 + timestamp: 1669703291215, + }, + }); + }); + } else { return request({ url: "/epiHome/getAllJJByDate", method: "get", @@ -406,18 +409,19 @@ export const getIsLeaveByDate = (date) => { if (isMock) { return new Promise((reslove) => { reslove({ - "success": true, - "message": "获取在青、在外人数成功", - "code": 200, - "result": { - "inQing": 521, //在青 - "notInQing": 21 //在外 + data: { + success: true, + message: "获取在青、在外人数成功", + code: 200, + result: { + inQing: 521, //在青 + notInQing: 21, //在外 + }, + timestamp: 1669704274056, }, - "timestamp": 1669704274056 - }) - }) - } - else { + }); + }); + } else { return request({ url: "/epiHome/getIsLeaveByDate", method: "get", @@ -430,18 +434,19 @@ export const getLeaveByDate = (date) => { if (isMock) { return new Promise((reslove) => { reslove({ - "success": true, - "message": "获取休假外出/出差人数成功", - "code": 200, - "result": { - "CC": 17, //出差 - "XJWC": 4 //休假外出 + data: { + success: true, + message: "获取休假外出/出差人数成功", + code: 200, + result: { + CC: 17, //出差 + XJWC: 4, //休假外出 + }, + timestamp: 1669704349029, }, - "timestamp": 1669704349029 - }) - }) - } - else { + }); + }); + } else { return request({ url: "/epiHome/getLeaveByDate", method: "get", @@ -454,18 +459,19 @@ export const getAllBQByDate = (date) => { if (isMock) { return new Promise((reslove) => { reslove({ - "success": true, - "message": "获取集中备勤/居家的总人数成功", - "code": 200, - "result": { - "JJCJ": 79, //居家纯净人数 - "JZBQ": 0 //集中备勤人数 + data: { + success: true, + message: "获取集中备勤/居家的总人数成功", + code: 200, + result: { + JJCJ: 79, //居家纯净人数 + JZBQ: 0, //集中备勤人数 + }, + timestamp: 1669703142436, }, - "timestamp": 1669703142436 - }) - }) - } - else { + }); + }); + } else { return request({ url: "/epiHome/getAllBQByDate", method: "get", @@ -478,15 +484,16 @@ export const getAllLTByDate = (date) => { if (isMock) { return new Promise((reslove) => { reslove({ - "success": true, - "message": "获取流亭的总人数成功", - "code": 200, - "result": 89, //流亭总人数 - "timestamp": 1669703368982 - }) - }) - } - else { + data: { + success: true, + message: "获取流亭的总人数成功", + code: 200, + result: 89, //流亭总人数 + timestamp: 1669703368982, + }, + }); + }); + } else { return request({ url: "/epiHome/getAllLTByDate", method: "get", @@ -499,15 +506,16 @@ export const getAllLTTZByDate = (date) => { if (isMock) { return new Promise((reslove) => { reslove({ - "success": true, - "message": "获取流亭台站总人数成功", - "code": 200, - "result": 8, //台站总人数 - "timestamp": 1669703403651 - }) - }) - } - else { + data: { + success: true, + message: "获取流亭台站总人数成功", + code: 200, + result: 8, //台站总人数 + timestamp: 1669703403651, + }, + }); + }); + } else { return request({ url: "/epiHome/getAllLTTZByDate", method: "get", @@ -520,25 +528,26 @@ export const getCodeByDate = (date) => { if (isMock) { return new Promise((reslove) => { reslove({ - "success": true, - "message": "获取今日健康码、行程表信息成功", - "code": 200, - "result": { - "id": 2, - "createTime": "2022-11-29", - "healthYellowCode": 0, //健康码黄码 - "healthRedCode": 0, //健康码红码 - "strokeYellowCode": 0, //行程码黄码 - "strokeRedCode": 0, //行程码红码 - "jzgl": 0, //集中隔离 - "jjgl": 0, //居家隔离 - "fxts": 0 //风险提示人员 + data: { + success: true, + message: "获取今日健康码、行程表信息成功", + code: 200, + result: { + id: 2, + createTime: "2022-11-29", + healthYellowCode: 0, //健康码黄码 + healthRedCode: 0, //健康码红码 + strokeYellowCode: 0, //行程码黄码 + strokeRedCode: 0, //行程码红码 + jzgl: 0, //集中隔离 + jjgl: 0, //居家隔离 + fxts: 0, //风险提示人员 + }, + timestamp: 1669705096367, }, - "timestamp": 1669705096367 - }) - }) - } - else { + }); + }); + } else { return request({ url: "/epiHome/epi-code/getCodeByDate", method: "get", @@ -551,38 +560,40 @@ export const getDorInfo = (date) => { if (isMock) { return new Promise((reslove) => { reslove({ - "success": true, - "message": "获取公寓使用情况成功", - "code": 200, - "result": { - "业务区": { - "管制": 33, - "技保": 7, - "气象": 5, - "常驻": 0, - "空余": 4, - "其他": 4 + data: { + success: true, + message: "获取公寓使用情况成功", + code: 200, + result: { + 业务区: { + 管制: 33, + 技保: 7, + 气象: 5, + 常驻: 0, + 空余: 4, + 其他: 4, + }, + 塔台: { + 管制: 8, + 技保: 1, + 气象: 0, + 常驻: 0, + 空余: 0, + 其他: 0, + }, + 倒班宿舍: { + 气象: 6, + 空余: 20, + 技保: 5, + 管制: 32, + 其他: 5, + 常驻: 104, + }, }, - "塔台": { - "管制": 8, - "技保": 1, - "气象": 0, - "常驻": 0, - "空余": 0, - "其他": 0 - }, - "倒班宿舍": { - "气象": 6, - "空余": 20, - "技保": 5, - "管制": 32, - "其他": 5, - "常驻": 104 - } + timestamp: 1669705240184, }, - "timestamp": 1669705240184 - }) - }) + }); + }); } else { return request({ url: "/epiHome/epi-report/getDorInfo", @@ -596,19 +607,20 @@ export const getPlaneInfo = (date) => { if (isMock) { return new Promise((reslove) => { reslove({ - "success": true, - "message": "查看航班数据成功", - "code": 200, - "result": { - "planNum": 153, //今日 - "placeNum": 168, //昨日本场 - "areaNum": 664 //昨日区域 + data: { + success: true, + message: "查看航班数据成功", + code: 200, + result: { + planNum: 153, //今日 + placeNum: 168, //昨日本场 + areaNum: 664, //昨日区域 + }, + timestamp: 1669705267056, }, - "timestamp": 1669705267056 - }) - }) - } - else { + }); + }); + } else { return request({ url: "/epiHome/epi-report/getPlaneInfo", method: "get", @@ -621,18 +633,19 @@ export const getGardenAndApprove = (date) => { if (isMock) { return new Promise((reslove) => { reslove({ - "success": true, - "message": "获取入园、申请人数成功", - "code": 200, - "result": { - "Garden": 128, - "Approve": 88 + data: { + success: true, + message: "获取入园、申请人数成功", + code: 200, + result: { + Garden: 128, + Approve: 88, + }, + timestamp: 1670575547152, }, - "timestamp": 1670575547152 - }) - }) - } - else { + }); + }); + } else { return request({ url: "/epiHome/getGardenAndApprove", method: "get", @@ -642,103 +655,104 @@ export const getGardenAndApprove = (date) => { }; /** * 运行保障 -*/ + */ //获取业务区以及塔台人员（管制部分） export const getGZWorkPersonByJ = (date) => { if (isMock) { return new Promise((reslove) => { reslove({ - "success": true, - "message": "获取业务区以及塔台人员(管制)", - "code": 200, - "result": [ - { - "deptName": "区域-值班班组", - "personList": [ - { - "id": 78326, - "userId": "D9B846A0850A2DE7", - "name": "王亚星", - "status": -1, - "dormitory": null, - "dutyDate": "2022-11-23T00:00:00", - "postId": 2866, - "restFlag": "Y", - "adjust": null, - "leaveFormId": null - } - ], - "parkUserNum": 32,//实际人数 - "allUserNum": 32 //预计人数 - }, - { - "deptName": "进近-值班班组", - "personList": [ - { - "id": 78440, - "userId": "1C8E8E2D383E7093", - "name": "林宝钢", - "status": 1, - "dormitory": "E320", - "dutyDate": "2022-11-23T00:00:00", - "postId": 2867, - "restFlag": null, - "adjust": null, - "leaveFormId": null - }, - { - "id": 78441, - "userId": "696F327EB6F0E7D4", - "name": "褚晨", - "status": 1, - "dormitory": "E320", - "dutyDate": "2022-11-23T00:00:00", - "postId": 2867, - "restFlag": null, - "adjust": null, - "leaveFormId": null - } - ], - "parkUserNum": 13, - "allUserNum": 13 - }, - { - "deptName": "飞服-值班班组", - "personList": [ - { - "id": 78550, - "userId": "B8FEDE5D14A5D09C", - "name": "尚红斌", - "status": 1, - "dormitory": "E210", - "dutyDate": "2022-11-23T00:00:00", - "postId": 2869, - "restFlag": null, - "adjust": null, - "leaveFormId": null - }, - { - "id": 78551, - "userId": "E257F66CBCAC36E9", - "name": "刘景斌", - "status": 1, - "dormitory": "E111", - "dutyDate": "2022-11-23T00:00:00", - "postId": 2869, - "restFlag": null, - "adjust": null, - "leaveFormId": null - } - ], - "parkUserNum": 5, - "allUserNum": 5 - } - ], - "timestamp": 1669703980614 - }) - }) - } - else { + data: { + success: true, + message: "获取业务区以及塔台人员(管制)", + code: 200, + result: [ + { + deptName: "区域-值班班组", + personList: [ + { + id: 78326, + userId: "D9B846A0850A2DE7", + name: "王亚星", + status: -1, + dormitory: null, + dutyDate: "2022-11-23T00:00:00", + postId: 2866, + restFlag: "Y", + adjust: null, + leaveFormId: null, + }, + ], + parkUserNum: 32, //实际人数 + allUserNum: 32, //预计人数 + }, + { + deptName: "进近-值班班组", + personList: [ + { + id: 78440, + userId: "1C8E8E2D383E7093", + name: "林宝钢", + status: 1, + dormitory: "E320", + dutyDate: "2022-11-23T00:00:00", + postId: 2867, + restFlag: null, + adjust: null, + leaveFormId: null, + }, + { + id: 78441, + userId: "696F327EB6F0E7D4", + name: "褚晨", + status: 1, + dormitory: "E320", + dutyDate: "2022-11-23T00:00:00", + postId: 2867, + restFlag: null, + adjust: null, + leaveFormId: null, + }, + ], + parkUserNum: 13, + allUserNum: 13, + }, + { + deptName: "飞服-值班班组", + personList: [ + { + id: 78550, + userId: "B8FEDE5D14A5D09C", + name: "尚红斌", + status: 1, + dormitory: "E210", + dutyDate: "2022-11-23T00:00:00", + postId: 2869, + restFlag: null, + adjust: null, + leaveFormId: null, + }, + { + id: 78551, + userId: "E257F66CBCAC36E9", + name: "刘景斌", + status: 1, + dormitory: "E111", + dutyDate: "2022-11-23T00:00:00", + postId: 2869, + restFlag: null, + adjust: null, + leaveFormId: null, + }, + ], + parkUserNum: 5, + allUserNum: 5, + }, + ], + timestamp: 1669703980614, + }, + }); + }); + } else { return request({ url: "/epiHome/getGZWorkPersonByJ", method: "get", @@ -749,129 +763,131 @@ export const getGZWorkPersonByJ = (date) => { //获取各台站运行人员 export const getTowerPerson = (date) => { if (isMock) { - return new Promise(reslove => { + return new Promise((reslove) => { reslove({ - "success": true, - "message": "获取流亭-园区人员", - "code": 200, - "result": [ - { - "totalUserNum": 8, //计划人数 - "allUserNum": 8, //实际人数 - "deptName": "各台站值班", - "postMapList": [ - { - "postName": "流亭巡视岗", //岗位名称 - "personList": [ //实际人员列表 - { - "id": 294, - "userId": "7597CAF95F0D3013", - "name": "任传友", - "deptId": 2, - "postName": "流亭巡视岗", - "createTime": "2022-11-23" - } - ] - }, - { - "postName": "即墨雷达", - "personList": [ - { - "id": 346, - "userId": "shenchao", - "name": "申超", - "deptId": 2, - "postName": "即墨雷达", - "createTime": "2022-11-23" - } - ] - }, - { - "postName": "胶东雷达", - "personList": [ - { - "id": 382, - "userId": "yuwei", - "name": "于威", - "deptId": 2, - "postName": "胶东雷达", - "createTime": "2022-11-23" - } - ] - }, - { - "postName": "荣成雷达", - "personList": [ - { - "id": 410, - "userId": "mrz", - "name": "彭振霄", - "deptId": 2, - "postName": "荣成雷达", - "createTime": "2022-11-23" - } - ] - }, - { - "postName": "烟台雷达", - "personList": [ - { - "id": 441, - "userId": "2D6D957F196FF64A", - "name": "赵祥龙", - "deptId": 2, - "postName": "烟台雷达", - "createTime": "2022-11-23" - } - ] - }, - { - "postName": "薛家岛导航", - "personList": [ - { - "id": 472, - "userId": "shaoxin", - "name": "邵鑫", - "deptId": 2, - "postName": "薛家岛导航", - "createTime": "2022-11-23" - } - ] - }, - { - "postName": "黄城导航", - "personList": [ - { - "id": 503, - "userId": "zhaoyg", - "name": "赵永光", - "deptId": 2, - "postName": "黄城导航", - "createTime": "2022-11-23" - } - ] - }, - { - "postName": "东三边导航", - "personList": [ - { - "id": 534, - "userId": "liugang", - "name": "刘刚", - "deptId": 2, - "postName": "东三边导航", - "createTime": "2022-11-23" - } - ] - } - ] - } - ], - "timestamp": 1669704785239 - }) - }) - } - else { + data: { + success: true, + message: "获取流亭-园区人员", + code: 200, + result: [ + { + totalUserNum: 8, //计划人数 + allUserNum: 8, //实际人数 + deptName: "各台站值班", + postMapList: [ + { + postName: "流亭巡视岗", //岗位名称 + personList: [ + //实际人员列表 + { + id: 294, + userId: "7597CAF95F0D3013", + name: "任传友", + deptId: 2, + postName: "流亭巡视岗", + createTime: "2022-11-23", + }, + ], + }, + { + postName: "即墨雷达", + personList: [ + { + id: 346, + userId: "shenchao", + name: "申超", + deptId: 2, + postName: "即墨雷达", + createTime: "2022-11-23", + }, + ], + }, + { + postName: "胶东雷达", + personList: [ + { + id: 382, + userId: "yuwei", + name: "于威", + deptId: 2, + postName: "胶东雷达", + createTime: "2022-11-23", + }, + ], + }, + { + postName: "荣成雷达", + personList: [ + { + id: 410, + userId: "mrz", + name: "彭振霄", + deptId: 2, + postName: "荣成雷达", + createTime: "2022-11-23", + }, + ], + }, + { + postName: "烟台雷达", + personList: [ + { + id: 441, + userId: "2D6D957F196FF64A", + name: "赵祥龙", + deptId: 2, + postName: "烟台雷达", + createTime: "2022-11-23", + }, + ], + }, + { + postName: "薛家岛导航", + personList: [ + { + id: 472, + userId: "shaoxin", + name: "邵鑫", + deptId: 2, + postName: "薛家岛导航", + createTime: "2022-11-23", + }, + ], + }, + { + postName: "黄城导航", + personList: [ + { + id: 503, + userId: "zhaoyg", + name: "赵永光", + deptId: 2, + postName: "黄城导航", + createTime: "2022-11-23", + }, + ], + }, + { + postName: "东三边导航", + personList: [ + { + id: 534, + userId: "liugang", + name: "刘刚", + deptId: 2, + postName: "东三边导航", + createTime: "2022-11-23", + }, + ], + }, + ], + }, + ], + timestamp: 1669704785239, + }, + }); + }); + } else { return request({ url: "/epiHome/getTowerPerson", method: "get", @@ -884,91 +900,93 @@ export const getRunAdminPersonByJ = (date) => { if (isMock) { return new Promise((reslove) => { reslove({ - "success": true, - "message": "获取业务区以及塔台人员", - "code": 200, - "result": [ - { - "allUserNum": 4, //预计人数 - "parkUserNum": 4, //实际人数 - "deptName": "运行管理", - "postMapList": [ - { - "personList": [ //该部门实际人员列表 - { - "id": 77728, - "userId": "4B3317D9D940412E", - "name": "崔善辉", - "status": 1, - "dormitory": null, - "dutyDate": "2022-11-23T00:00:00", - "postId": 2865, - "restFlag": null, - "adjust": null, - "leaveFormId": null - } - ], - "postName": "站值班" //部门名称 - }, - { - "personList": [ - { - "id": 78620, - "userId": "0D1AA9AE615F2C78", - "name": "王策", - "status": 1, - "dormitory": "E203", - "dutyDate": "2022-11-23T00:00:00", - "postId": 2886, - "restFlag": null, - "adjust": null, - "leaveFormId": null - } - ], - "postName": "管制运行部" - }, - { - "personList": [ - { - "id": 77698, - "userId": "ChenZhiFeng", - "name": "陈志峰", - "status": 1, - "dormitory": null, - "dutyDate": "2022-11-23T00:00:00", - "postId": 2862, - "restFlag": null, - "adjust": null, - "leaveFormId": null - } - ], - "postName": "技术保障部" - }, - { - "personList": [ - { - "id": 77713, - "userId": "WangYong", - "name": "王勇", - "status": 1, - "dormitory": null, - "dutyDate": "2022-11-23T00:00:00", - "postId": 2863, - "restFlag": null, - "adjust": null, - "leaveFormId": null - } - ], - "postName": "气象台" - } - ] - } - ], - "timestamp": 1669704566676 - }) - }) - } - else { + data: { + success: true, + message: "获取业务区以及塔台人员", + code: 200, + result: [ + { + allUserNum: 4, //预计人数 + parkUserNum: 4, //实际人数 + deptName: "运行管理", + postMapList: [ + { + personList: [ + //该部门实际人员列表 + { + id: 77728, + userId: "4B3317D9D940412E", + name: "崔善辉", + status: 1, + dormitory: null, + dutyDate: "2022-11-23T00:00:00", + postId: 2865, + restFlag: null, + adjust: null, + leaveFormId: null, + }, + ], + postName: "站值班", //部门名称 + }, + { + personList: [ + { + id: 78620, + userId: "0D1AA9AE615F2C78", + name: "王策", + status: 1, + dormitory: "E203", + dutyDate: "2022-11-23T00:00:00", + postId: 2886, + restFlag: null, + adjust: null, + leaveFormId: null, + }, + ], + postName: "管制运行部", + }, + { + personList: [ + { + id: 77698, + userId: "ChenZhiFeng", + name: "陈志峰", + status: 1, + dormitory: null, + dutyDate: "2022-11-23T00:00:00", + postId: 2862, + restFlag: null, + adjust: null, + leaveFormId: null, + }, + ], + postName: "技术保障部", + }, + { + personList: [ + { + id: 77713, + userId: "WangYong", + name: "王勇", + status: 1, + dormitory: null, + dutyDate: "2022-11-23T00:00:00", + postId: 2863, + restFlag: null, + adjust: null, + leaveFormId: null, + }, + ], + postName: "气象台", + }, + ], + }, + ], + timestamp: 1669704566676, + }, + }); + }); + } else { return request({ url: "/epiHome/getRunAdminPersonByJ", method: "get", @@ -981,173 +999,176 @@ export const getSafePersonByJ = (date) => { if (isMock) { return new Promise((reslove) => { reslove({ - "success": true, - "message": "获取业务区保障人员", - "code": 200, - "result": [ - { - "deptName": "业务区封闭保障", // 封闭保障（内部存在多个岗位） - "postMapList": [ - { - "personList": [ //该岗位实际人员列表 - { - "id": 1916, - "userId": "476940D9A70BFFB7", - "name": "孙祖莲", - "status": 1, - "entrance": "G座", - "dormitory": null, - "deptId": 20, - "type": "胶州", - "postName": "业务区封闭保洁", - "createTime": "2022-11-23" - }, - { - "id": 1917, - "userId": "7219CBE2E9BCDD73", - "name": "匡锦磊", - "status": 1, - "entrance": "G座", - "dormitory": null, - "deptId": 20, - "type": "胶州", - "postName": "业务区封闭保洁", - "createTime": "2022-11-23" - }, - { - "id": 1918, - "userId": "F3171B5C6F24593E", - "name": "代祥燕", - "status": -1, - "entrance": null, - "dormitory": null, - "deptId": 20, - "type": "胶州", - "postName": "业务区封闭保洁", - "createTime": "2022-11-23" - } - ], - "postName": "封闭保洁" //岗位名称 - } - ], - "parkUserNum": 3, //封闭保障 实际人数 - "allUserNum": 3 //封闭保障 预计人数 - }, - { - "deptName": "塔台封闭保障", - "postMapList": [ - { - "personList": [ - { - "id": null, - "userId": "E763B0DAD1985AAD", - "name": "徐立阳", - "status": -1, - "entrance": null, - "dormitory": null, - "deptId": 20, - "type": "胶州", - "postName": "站坪值班员", - "createTime": "2022-11-29" - } - ], - "postName": "站坪值班员" - }, - { - "personList": [ - { - "id": 1915, - "userId": "4ED836B340C2C426", - "name": "刘芳华", - "status": -1, - "entrance": null, - "dormitory": null, - "deptId": 20, - "type": "胶州", - "postName": "塔台封闭保洁", - "createTime": "2022-11-23" - } - ], - "postName": "封闭保洁" - } - ], - "parkUserNum": 2, - "allUserNum": 2 - }, - { - "deptName": "日常保障", - "postMapList": [ - { - "personList": [ - { - "id": 1919, - "userId": "HuangChunHong", - "name": "黄春红", - "status": 1, - "entrance": "A座", - "dormitory": null, - "deptId": 20, - "type": "胶州", - "postName": "业务区物业管家", - "createTime": "2022-11-23" - } - ], - "postName": "物业管家" - }, - { - "personList": [ - { - "id": null, - "userId": "2A0B8204950E7A16", - "name": "邢桂强", - "status": -1, - "entrance": null, - "dormitory": null, - "deptId": 20, - "type": "胶州", - "postName": "业务区维修服务", - "createTime": "2022-11-29" - } - ], - "postName": "维修服务" - }, - { - "personList": [ - { - "id": 1921, - "userId": "4DD29E2F2F3CAC68", - "name": "韩慧萍", - "status": 1, - "entrance": "A座", - "dormitory": null, - "deptId": 20, - "type": "胶州", - "postName": "业务区会议服务", - "createTime": "2022-11-23" - }, - { - "id": null, - "userId": "B8647552D3D73D5F", - "name": "郑巧", - "status": -1, - "entrance": null, - "dormitory": null, - "deptId": 20, - "type": "胶州", - "postName": "业务区会议服务", - "createTime": "2022-11-29" - } - ], - "postName": "会议服务" - } - ], - "parkUserNum": 4, - "allUserNum": 5 - } - ], - "timestamp": 1669704631722 - }) - }) + data: { + success: true, + message: "获取业务区保障人员", + code: 200, + result: [ + { + deptName: "业务区封闭保障", // 封闭保障（内部存在多个岗位） + postMapList: [ + { + personList: [ + //该岗位实际人员列表 + { + id: 1916, + userId: "476940D9A70BFFB7", + name: "孙祖莲", + status: 1, + entrance: "G座", + dormitory: null, + deptId: 20, + type: "胶州", + postName: "业务区封闭保洁", + createTime: "2022-11-23", + }, + { + id: 1917, + userId: "7219CBE2E9BCDD73", + name: "匡锦磊", + status: 1, + entrance: "G座", + dormitory: null, + deptId: 20, + type: "胶州", + postName: "业务区封闭保洁", + createTime: "2022-11-23", + }, + { + id: 1918, + userId: "F3171B5C6F24593E", + name: "代祥燕", + status: -1, + entrance: null, + dormitory: null, + deptId: 20, + type: "胶州", + postName: "业务区封闭保洁", + createTime: "2022-11-23", + }, + ], + postName: "封闭保洁", //岗位名称 + }, + ], + parkUserNum: 3, //封闭保障 实际人数 + allUserNum: 3, //封闭保障 预计人数 + }, + { + deptName: "塔台封闭保障", + postMapList: [ + { + personList: [ + { + id: null, + userId: "E763B0DAD1985AAD", + name: "徐立阳", + status: -1, + entrance: null, + dormitory: null, + deptId: 20, + type: "胶州", + postName: "站坪值班员", + createTime: "2022-11-29", + }, + ], + postName: "站坪值班员", + }, + { + personList: [ + { + id: 1915, + userId: "4ED836B340C2C426", + name: "刘芳华", + status: -1, + entrance: null, + dormitory: null, + deptId: 20, + type: "胶州", + postName: "塔台封闭保洁", + createTime: "2022-11-23", + }, + ], + postName: "封闭保洁", + }, + ], + parkUserNum: 2, + allUserNum: 2, + }, + { + deptName: "日常保障", + postMapList: [ + { + personList: [ + { + id: 1919, + userId: "HuangChunHong", + name: "黄春红", + status: 1, + entrance: "A座", + dormitory: null, + deptId: 20, + type: "胶州", + postName: "业务区物业管家", + createTime: "2022-11-23", + }, + ], + postName: "物业管家", + }, + { + personList: [ + { + id: null, + userId: "2A0B8204950E7A16", + name: "邢桂强", + status: -1, + entrance: null, + dormitory: null, + deptId: 20, + type: "胶州", + postName: "业务区维修服务", + createTime: "2022-11-29", + }, + ], + postName: "维修服务", + }, + { + personList: [ + { + id: 1921, + userId: "4DD29E2F2F3CAC68", + name: "韩慧萍", + status: 1, + entrance: "A座", + dormitory: null, + deptId: 20, + type: "胶州", + postName: "业务区会议服务", + createTime: "2022-11-23", + }, + { + id: null, + userId: "B8647552D3D73D5F", + name: "郑巧", + status: -1, + entrance: null, + dormitory: null, + deptId: 20, + type: "胶州", + postName: "业务区会议服务", + createTime: "2022-11-29", + }, + ], + postName: "会议服务", + }, + ], + parkUserNum: 4, + allUserNum: 5, + }, + ], + timestamp: 1669704631722, + }, + }); + }); } else { return request({ url: "/epiHome/getSafePersonByJ", @@ -1158,180 +1179,166 @@ export const getSafePersonByJ = (date) => { }; /** * 流亭及备勤 -*/ + */ //获取流亭-园区人员 export const getGardenPersonByL = (date) => { if (isMock) { - return new Promise(reslove => { + return new Promise((reslove) => { reslove({ - "success": true, - "message": "获取流亭-园区人员", - "code": 200, - "result": [ - { - "deptName": "流亭办公", - "totalUserNum": 1, //计划人数 - "allUserNum": 31, //实际人数 - "postMapList": [ - { - "personList": [ - - ], - "postName": "站直" //结构与上述接口返回结构一致 - }, - { - "personList": [ - - ], - "postName": "办公室" - }, - { - "personList": [ - - ], - "postName": "人力资源部" - }, - { - "personList": [ - { - "userId": "BD386DF343BAF887", - "name": "张璐", - "status": 1 - } - ], - "postName": "财务部" - }, - { - "personList": [ - - ], - "postName": "党委办公室" - }, - { - "personList": [ - { - "userId": "F2C73B794F6C63E5", - "name": "张军", - "status": -1 - } - ], - "postName": "综合业务部" - }, - { - "personList": [ - - ], - "postName": "安全管理部" - }, - { - "personList": [ - { - "userId": "B751A492A16782DE", - "name": "刘冰", - "status": -1 - } - ], - "postName": "计划基建部" - }, - { - "personList": [ - { - "userId": "A2F5A1644E9A192A", - "name": "戴其峰", - "status": -1 - }, - { - "userId": "D16A04D6106B1908", - "name": "戚克术", - "status": -1 - }, - { - "userId": "zhangyang", - "name": "张洋", - "status": -1 - } - ], - "postName": "后服保障部" - }, - { - "personList": [ - { - "userId": "46F34AD41BBCAEAE", - "name": "王晨", - "status": 1 - }, - { - "userId": "A3613ED51C6D7BC1", - "name": "高平", - "status": 1 - } - ], - "postName": "管制运行部门" - }, - { - "personList": [ - { - "userId": "00C171821457F2CB", - "name": "张颖", - "status": 1 - }, - { - "userId": "A077BD88679A279C", - "name": "吴泽鑫", - "status": -1 - } - ], - "postName": "技术保障部" - }, - { - "personList": [ - - ], - "postName": "气象台" - }, - { - "personList": [ - - ], - "postName": "建设指挥部" - } - ] - }, - { - "postMapList": [ - { - "personList": [ - { - "userId": "EC8CFF17D4B87ACB", - "name": "周义富", - "status": 1 - } - ], - "postName": "公司常驻" - } - ], - "totalUserNum": 85, - "allUserNum": 58, - "parkUserNum": 0, - "deptName": "公司常驻" - }, - { - "deptName": "园区保障", - "totalUserNum": 1, - "postMapList": [ - { - "personList": [ - - ], - "postName": "园区日常保洁" - } - ], - "allUserNum": 0 - } - ], - "timestamp": 1669703700934 - }) - }) + data: { + success: true, + message: "获取流亭-园区人员", + code: 200, + result: [ + { + deptName: "流亭办公", + totalUserNum: 1, //计划人数 + allUserNum: 31, //实际人数 + postMapList: [ + { + personList: [], + postName: "站直", //结构与上述接口返回结构一致 + }, + { + personList: [], + postName: "办公室", + }, + { + personList: [], + postName: "人力资源部", + }, + { + personList: [ + { + userId: "BD386DF343BAF887", + name: "张璐", + status: 1, + }, + ], + postName: "财务部", + }, + { + personList: [], + postName: "党委办公室", + }, + { + personList: [ + { + userId: "F2C73B794F6C63E5", + name: "张军", + status: -1, + }, + ], + postName: "综合业务部", + }, + { + personList: [], + postName: "安全管理部", + }, + { + personList: [ + { + userId: "B751A492A16782DE", + name: "刘冰", + status: -1, + }, + ], + postName: "计划基建部", + }, + { + personList: [ + { + userId: "A2F5A1644E9A192A", + name: "戴其峰", + status: -1, + }, + { + userId: "D16A04D6106B1908", + name: "戚克术", + status: -1, + }, + { + userId: "zhangyang", + name: "张洋", + status: -1, + }, + ], + postName: "后服保障部", + }, + { + personList: [ + { + userId: "46F34AD41BBCAEAE", + name: "王晨", + status: 1, + }, + { + userId: "A3613ED51C6D7BC1", + name: "高平", + status: 1, + }, + ], + postName: "管制运行部门", + }, + { + personList: [ + { + userId: "00C171821457F2CB", + name: "张颖", + status: 1, + }, + { + userId: "A077BD88679A279C", + name: "吴泽鑫", + status: -1, + }, + ], + postName: "技术保障部", + }, + { + personList: [], + postName: "气象台", + }, + { + personList: [], + postName: "建设指挥部", + }, + ], + }, + { + postMapList: [ + { + personList: [ + { + userId: "EC8CFF17D4B87ACB", + name: "周义富", + status: 1, + }, + ], + postName: "公司常驻", + }, + ], + totalUserNum: 85, + allUserNum: 58, + parkUserNum: 0, + deptName: "公司常驻", + }, + { + deptName: "园区保障", + totalUserNum: 1, + postMapList: [ + { + personList: [], + postName: "园区日常保洁", + }, + ], + allUserNum: 0, + }, + ], + timestamp: 1669703700934, + }, + }); + }); } else { return request({ url: "/epiHome/getGardenPersonByL", @@ -1343,47 +1350,48 @@ export const getGardenPersonByL = (date) => { //获取流亭-备勤人员 export const getDormitoryPersonByL = (date) => { if (isMock) { - return new Promise(reslove => { + return new Promise((reslove) => { reslove({ - "success": true, - "message": "获取流亭-倒班宿舍人员", - "code": 200, - "result": [ - { - "totalUserNum": 54, //计划人数 - "allUserNum": 54, //实际人数 - "deptName": "管制备勤", //备勤部门 - "postMapList": [ - { - "postName": "部值班", //备勤岗位 - "personList": [ - { - "id": 768, - "userId": "CEF2766CA8195BB1", - "name": "王广顺", //备勤人员 - "status": -1, //测温情况 -1 未测温 0 测温异常 1 测温正常 - "dormitory": null, - "deptId": 14, - "postName": "部值班", - "createTime": "2022-11-23", - "roomNo": null - } - ] - } - ] - }, - { - "deptName": "倒班宿舍保障", - "totalUserNum": 0, - "postMapList": null, - "allUserNum": 0 - } - ], - "timestamp": 1669703446139 - }) - }) - } - else { + data: { + success: true, + message: "获取流亭-倒班宿舍人员", + code: 200, + result: [ + { + totalUserNum: 54, //计划人数 + allUserNum: 54, //实际人数 + deptName: "管制备勤", //备勤部门 + postMapList: [ + { + postName: "部值班", //备勤岗位 + personList: [ + { + id: 768, + userId: "CEF2766CA8195BB1", + name: "王广顺", //备勤人员 + status: -1, //测温情况 -1 未测温 0 测温异常 1 测温正常 + dormitory: null, + deptId: 14, + postName: "部值班", + createTime: "2022-11-23", + roomNo: null, + }, + ], + }, + ], + }, + { + deptName: "倒班宿舍保障", + totalUserNum: 0, + postMapList: null, + allUserNum: 0, + }, + ], + timestamp: 1669703446139, + }, + }); + }); + } else { return request({ url: "/epiHome/getDormitoryPersonByL", method: "get", @@ -1393,925 +1401,928 @@ export const getDormitoryPersonByL = (date) => { }; /** * 行政办公 -*/ + */ //行政办公人员 export const getPersonByJ = (date) => { if (isMock) { return new Promise((reslove) => { reslove({ - "success": true, - "message": "获取胶州行政人员", - "code": 200, - "result": [ - { - "personList": [ //实际人员列表 - { - "userId": "71964DE8197F07B9", - "name": "杨锡贤", - "status": 1 - }, - { - "userId": "854AC8A273AA04F8", - "name": "孙利强", - "status": 1 - }, - { - "userId": "BE65566ABDE1C45A", - "name": "平炉", - "status": 1 - }, - { - "userId": "HuDongHou", - "name": "胡东侯", - "status": 1 - } - ], - "postName": "站直", //部门 - "totalUserNum": 5, //计划人数 - "allUserNum": 4, //实际人数 - "towNum": 0, //二类人数 - "threeNum": 4 //三类人数 - }, - { - "personList": [ - { - "userId": "YanYangDe", - "name": "闫旸德", - "status": 1 - }, - { - "userId": "B57E06F4784AD322", - "name": "刘鹏", - "status": 1 - }, - { - "userId": "yangjun", - "name": "杨军", - "status": 1 - }, - { - "userId": "8478644AE0D12AC8", - "name": "许允东", - "status": 1 - }, - { - "userId": "shenping", - "name": "申苹", - "status": 1 - }, - { - "userId": "6E88081E82859861", - "name": "刘坤", - "status": 1 - }, - { - "userId": "A4DCEDC60FBA9A05", - "name": "岳凤英", - "status": 1 - }, - { - "userId": "SunShanShan", - "name": "孙珊珊", - "status": 1 - }, - { - "userId": "3B0D05D6DF8BCE86", - "name": "徐箫", - "status": 1 - }, - { - "userId": "2579b4e7761eceb4bd0348172a181f81", - "name": "谭业飞", - "status": 1 - }, - { - "userId": "AB9A460B059514CC", - "name": "熊海云", - "status": 1 - }, - { - "userId": "CD0E1660B620CCAA", - "name": "张延彬", - "status": 1 - } - ], - "postName": "办公室", - "totalUserNum": 14, - "allUserNum": 12, - "towNum": 0, - "threeNum": 12 - }, - { - "personList": [ - { - "userId": "2ADBE90D66229364", - "name": "曹鑫", - "status": 1 - }, - { - "userId": "5B9CAE5A10CB4368", - "name": "李航", - "status": 1 - }, - { - "userId": "B2E1D7247BD58FFE", - "name": "武玲玲", - "status": 1 - }, - { - "userId": "liff", - "name": "李凡凡", - "status": 1 - }, - { - "userId": "caoying", - "name": "曹迎", - "status": 1 - }, - { - "userId": "c21a6cb2100283837573db70c349055f", - "name": "李艺", - "status": 1 - } - ], - "postName": "人力资源部", - "totalUserNum": 6, - "allUserNum": 6, - "towNum": 0, - "threeNum": 6 - }, - { - "personList": [ - { - "userId": "13F96380B983C670", - "name": "吕秀霞", - "status": -1 - }, - { - "userId": "ZhangLei", - "name": "张磊", - "status": 1 - }, - { - "userId": "2865F332800FE7C0", - "name": "王登", - "status": 1 - }, - { - "userId": "4E188A12A6EC3DCC", - "name": "纪雪莲", - "status": 1 - }, - { - "userId": "ZhangJie1", - "name": "张杰", - "status": 1 - }, - { - "userId": "4454BC5491200796", - "name": "李博", - "status": 1 - }, - { - "userId": "3988B55365B61256", - "name": "宋德坤", - "status": 1 - }, - { - "userId": "52C0D8312F26D751", - "name": "严飞", - "status": 1 - } - ], - "postName": "财务部", - "totalUserNum": 9, - "allUserNum": 8, - "towNum": 0, - "threeNum": 8 - }, - { - "personList": [ - { - "userId": "6C1B059DF9CA8C00", - "name": "段皎", - "status": -1 - }, - { - "userId": "LiuJiaHua", - "name": "刘加华", - "status": 1 - }, - { - "userId": "89D209BE8935828C", - "name": "刘丁", - "status": 1 - }, - { - "userId": "EED68EE917A75F61", - "name": "赵蕊芯", - "status": 1 - }, - { - "userId": "F906ABD74B8D16C3", - "name": "张旭博", - "status": 1 - }, - { - "userId": "8997E1C3648FC379", - "name": "马洪波", - "status": 1 - }, - { - "userId": "ZhaoYongJu", - "name": "赵永聚", - "status": 1 - } - ], - "postName": "党委办公室", - "totalUserNum": 7, - "allUserNum": 7, - "towNum": 0, - "threeNum": 7 - }, - { - "personList": [ - { - "userId": "9716C99BD4DCF525", - "name": "刘琰琰", - "status": 1 - }, - { - "userId": "LuJian", - "name": "卢健", - "status": 1 - }, - { - "userId": "RenJianGuo", - "name": "任建国", - "status": 1 - }, - { - "userId": "zoubb", - "name": "邹斌斌", - "status": 1 - }, - { - "userId": "A20DFF813E5BEC39", - "name": "刘莉珊", - "status": 1 - } - ], - "postName": "综合业务部", - "totalUserNum": 5, - "allUserNum": 5, - "towNum": 0, - "threeNum": 5 - }, - { - "personList": [ - { - "userId": "3497117395409599", - "name": "刘杰", - "status": 1 - }, - { - "userId": "FB5CA2A5F2DFEAB9", - "name": "沈希顺", - "status": 1 - }, - { - "userId": "C1F073BB47052B0E", - "name": "杨庆国", - "status": 1 - }, - { - "userId": "68D2640E728E834C", - "name": "杜胜", - "status": 1 - }, - { - "userId": "zhouhui", - "name": "周辉", - "status": 1 - }, - { - "userId": "ZhengBiao", - "name": "郑标", - "status": 1 - } - ], - "postName": "安全管理部", - "totalUserNum": 6, - "allUserNum": 6, - "towNum": 0, - "threeNum": 6 - }, - { - "personList": [ - { - "userId": "E7B5EA7907A10E11", - "name": "王晓刚", - "status": -1 - }, - { - "userId": "0E83C506F6E49E2B", - "name": "田瑛", - "status": 1 - }, - { - "userId": "A4C5B49D3FC70C15", - "name": "赵铁成", - "status": 1 - }, - { - "userId": "CED51692DF3736CC", - "name": "孙嘉莉", - "status": 1 - } - ], - "postName": "计划基建部", - "totalUserNum": 5, - "allUserNum": 4, - "towNum": 0, - "threeNum": 4 - }, - { - "personList": [ - { - "userId": "LiShiWei", - "name": "李世伟", - "status": 1 - }, - { - "userId": "1F95E9EFAD36DE9C", - "name": "刘维海", - "status": 1 - }, - { - "userId": "AFD052887144C8B5", - "name": "姚广义", - "status": 1 - }, - { - "userId": "zhangyang", - "name": "张洋", - "status": 1 - }, - { - "userId": "57A7ADCE000909CC", - "name": "张丽", - "status": 1 - }, - { - "userId": "ZhaoGuangMing", - "name": "赵光明", - "status": 1 - }, - { - "userId": "72DFF423ADD3631F", - "name": "胡青波", - "status": 1 - }, - { - "userId": "8F79795CA2205872", - "name": "田发尧", - "status": 1 - }, - { - "userId": "C7A6BF783BF6A2B2", - "name": "李丹凤", - "status": -1 - }, - { - "userId": "F6BC976B7D4FF8C7", - "name": "叶伟", - "status": -1 - }, - { - "userId": "F04127A8ED5BC152", - "name": "郝卫婷", - "status": -1 - } - ], - "postName": "后服保障部", - "totalUserNum": 15, - "allUserNum": 11, - "towNum": 0, - "threeNum": 11 - }, - { - "personList": [ - { - "userId": "A95279AD8A37D6BC", - "name": "李艳君", - "status": 1 - }, - { - "userId": "0D1AA9AE615F2C78", - "name": "王策", - "status": 1 - }, - { - "userId": "887C5E6C4081FFD3", - "name": "孙明怡", - "status": 1 - }, - { - "userId": "4216AC496D075293", - "name": "来国伟", - "status": 1 - }, - { - "userId": "1E781FF40A33CDE4", - "name": "刘传振", - "status": 1 - }, - { - "userId": "59A6E478DBFE86F3", - "name": "孙志钐", - "status": 1 - }, - { - "userId": "F7FFAF0737A6F33B", - "name": "范杭", - "status": 1 - }, - { - "userId": "F1295EC452FF4CB0", - "name": "徐新", - "status": 1 - }, - { - "userId": "D558D6153CB6063A", - "name": "殷翊航", - "status": 1 - }, - { - "userId": "7D477D5C9709E6DF", - "name": "刘钊", - "status": 1 - }, - { - "userId": "2D380E2F2FE5E274", - "name": "张学谦", - "status": 1 - }, - { - "userId": "F2C4AF867DE4D5A5", - "name": "董绪梁", - "status": 1 - }, - { - "userId": "39E321F0870E5501", - "name": "陈浩男", - "status": 1 - }, - { - "userId": "7EA87CE86BBEC2B8", - "name": "张文斌", - "status": 1 - }, - { - "userId": "3721ECF970E99FEE", - "name": "郭悦", - "status": 1 - }, - { - "userId": "E15C0CF36F5D7463", - "name": "张鑫", - "status": 1 - }, - { - "userId": "E5A9A9BAB82BD685", - "name": "马远晴", - "status": 1 - }, - { - "userId": "4751225FE059AA67", - "name": "栾宇翔", - "status": 1 - }, - { - "userId": "64113615DE2C5834", - "name": "刘紫琪", - "status": 1 - }, - { - "userId": "7AB801E70CAD1EAA", - "name": "郑磊", - "status": 1 - }, - { - "userId": "e698571fb7574ea1eb7c725729c45810", - "name": "赵帅", - "status": 1 - }, - { - "userId": "33C935ECD1B60053", - "name": "李文康", - "status": 1 - }, - { - "userId": "CE259076336741A0", - "name": "张跃", - "status": 1 - }, - { - "userId": "69368EEDD956ACBB", - "name": "郭玉泽", - "status": 1 - }, - { - "userId": "1845F581D4C82CAC", - "name": "陈奕璁", - "status": 1 - }, - { - "userId": "D546B47CFD317009", - "name": "张宗欣", - "status": 1 - }, - { - "userId": "AD5AED44512D881D", - "name": "马贺", - "status": 1 - }, - { - "userId": "B759681FE9E3FD35", - "name": "吕成宇", - "status": 1 - }, - { - "userId": "08A657F8D7D3223D", - "name": "朱泰", - "status": 1 - }, - { - "userId": "DD26316653944BB3", - "name": "徐鑫辉", - "status": 1 - }, - { - "userId": "0A3F353E178EE55A", - "name": "孙庆朝", - "status": 1 - }, - { - "userId": "CEF2766CA8195BB1", - "name": "王广顺", - "status": 1 - }, - { - "userId": "CD5B569DF4EEEC95", - "name": "宋明强", - "status": 1 - }, - { - "userId": "561774260CC34267", - "name": "曹原", - "status": 1 - }, - { - "userId": "6279607CFAF7D7E8", - "name": "邱智博", - "status": -1 - }, - { - "userId": "1C8E8E2D383E7093", - "name": "林宝钢", - "status": -1 - }, - { - "userId": "0F7165A79CA8CD3A", - "name": "谢超", - "status": -1 - }, - { - "userId": "E5CDE64A03F61B3A", - "name": "张恒", - "status": -1 - }, - { - "userId": "3B5728553176AC60", - "name": "赵家浩", - "status": -1 - } - ], - "postName": "管制运行部门", - "totalUserNum": 18, - "allUserNum": 39, - "towNum": 32, - "threeNum": 7 - }, - { - "personList": [ - { - "userId": "Yerh", - "name": "叶婷婷", - "status": -1 - }, - { - "userId": "maling", - "name": "马凌", - "status": 1 - }, - { - "userId": "wangyt", - "name": "王蕴婷", - "status": 1 - }, - { - "userId": "ChenZhiFeng", - "name": "陈志峰", - "status": 1 - }, - { - "userId": "jiangxb", - "name": "姜旭波", - "status": 1 - }, - { - "userId": "92561C8FF2722941", - "name": "段笑月", - "status": 1 - }, - { - "userId": "zhangsj", - "name": "张树剑", - "status": 1 - }, - { - "userId": "wangyz", - "name": "王勇之", - "status": 1 - }, - { - "userId": "wensn", - "name": "温绍楠", - "status": -1 - }, - { - "userId": "80b5d3757fdb4259af36a2e12931e90b", - "name": "刘克", - "status": -1 - }, - { - "userId": "yangxz", - "name": "杨新柱", - "status": -1 - }, - { - "userId": "zhangwj", - "name": "张文杰", - "status": -1 - }, - { - "userId": "2022XinYuanGongTongDaoWangYiChen", - "name": "王翌晨", - "status": -1 - }, - { - "userId": "036c25bf45d570285f9c133135f2b8da", - "name": "于颖丽", - "status": -1 - }, - { - "userId": "782F4301C1CFB291", - "name": "郎贤波", - "status": -1 - }, - { - "userId": "42409b9140ab95c878ad3a4674da40fa", - "name": "王晴", - "status": -1 - } - ], - "postName": "技术保障部", - "totalUserNum": 12, - "allUserNum": 16, - "towNum": 10, - "threeNum": 6 - }, - { - "personList": [ - { - "userId": "EDCA94E20F0C5980", - "name": "悠然", - "status": -1 - }, - { - "userId": "ZhangYinChang", - "name": "张银昌", - "status": 1 - }, - { - "userId": "JiangBiao", - "name": "蒋彪", - "status": 1 - }, - { - "userId": "34746D7B283147AE", - "name": "刘正", - "status": 1 - }, - { - "userId": "6274436D54C8AAFB", - "name": "陈亮", - "status": 1 - }, - { - "userId": "WangXueZhi", - "name": "王学智", - "status": 1 - }, - { - "userId": "LiuShouXin", - "name": "刘寿鑫", - "status": 1 - }, - { - "userId": "ZhangYong", - "name": "张勇", - "status": 1 - }, - { - "userId": "7F5669C4A6435063", - "name": "郭溢阳", - "status": -1 - }, - { - "userId": "XiaoYongMin", - "name": "肖永敏", - "status": -1 - }, - { - "userId": "E813998EDB841357", - "name": "张钰欣", - "status": -1 - }, - { - "userId": "XueWeiTao", - "name": "薛维韬", - "status": -1 - }, - { - "userId": "SongGuangHua", - "name": "宋光华", - "status": -1 - }, - { - "userId": "WangJunXiang", - "name": "王军祥", - "status": -1 - }, - { - "userId": "LiuNing", - "name": "刘宁", - "status": -1 - }, - { - "userId": "YanYing", - "name": "颜颖", - "status": -1 - }, - { - "userId": "YuLuLu", - "name": "于璐璐", - "status": -1 - } - ], - "postName": "气象台", - "totalUserNum": 4, - "allUserNum": 17, - "towNum": 3, - "threeNum": 14 - }, - { - "personList": [], - "postName": "建设指挥部", - "totalUserNum": 6, - "allUserNum": 0, - "towNum": 0, - "threeNum": 0 - }, - { - "personList": [ - { - "userId": "D297316ED4200723", - "name": "袁永明", - "status": 1 - }, - { - "userId": "52D07790B2AF96D2", - "name": "王春波", - "status": 1 - }, - { - "userId": "39FC04E7D9265DAE", - "name": "姚瑞洁", - "status": 1 - }, - { - "userId": "084BC26E499A7FF1", - "name": "纪勇", - "status": 1 - }, - { - "userId": "840C6548EDEA9750", - "name": "王岱松", - "status": 1 - }, - { - "userId": "9372E4F835D94C98", - "name": "邹燕", - "status": 1 - }, - { - "userId": "5D877B79A2329998", - "name": "窦鹏", - "status": 1 - }, - { - "userId": "42B086046E4CFA7D", - "name": "袁崔祥", - "status": 1 - }, - { - "userId": "024678E42962E70F", - "name": "闫明香", - "status": 1 - }, - { - "userId": "BCEC49E611AA1879", - "name": "王婷", - "status": 1 - }, - { - "userId": "7DF8869B03222116", - "name": "刘宇杰", - "status": -1 - }, - { - "userId": "4ED836B340C2C426", - "name": "刘芳华", - "status": -1 - }, - { - "userId": "5D28B66F4D07FC87", - "name": "单亦东", - "status": -1 - }, - { - "userId": "864499EDF2621027", - "name": "周飞旭", - "status": -1 - }, - { - "userId": "D7929C4D547BDE45", - "name": "李萍", - "status": -1 - }, - { - "userId": "1C101734DBBA5933", - "name": "宋晓虹", - "status": -1 - }, - { - "userId": "3F59BD3B686607FE", - "name": "方建田", - "status": -1 - }, - { - "userId": "AC5C48879431FB0E", - "name": "刘木波", - "status": -1 - }, - { - "userId": "F1825ECB771B9295", - "name": "王茂杰", - "status": -1 - }, - { - "userId": "388AA34D867E0D8D", - "name": "刘伟", - "status": -1 - }, - { - "userId": "2501BEC78F511152", - "name": "姜瑞芬", - "status": -1 - } - ], - "postName": "实业公司", - "totalUserNum": 1, - "allUserNum": 21, - "towNum": 0, - "threeNum": 21 - } - ], - "timestamp": 1669707141649 - }) - }) + data: { + success: true, + message: "获取胶州行政人员", + code: 200, + result: [ + { + personList: [ + //实际人员列表 + { + userId: "71964DE8197F07B9", + name: "杨锡贤", + status: 1, + }, + { + userId: "854AC8A273AA04F8", + name: "孙利强", + status: 1, + }, + { + userId: "BE65566ABDE1C45A", + name: "平炉", + status: 1, + }, + { + userId: "HuDongHou", + name: "胡东侯", + status: 1, + }, + ], + postName: "站直", //部门 + totalUserNum: 5, //计划人数 + allUserNum: 4, //实际人数 + towNum: 0, //二类人数 + threeNum: 4, //三类人数 + }, + { + personList: [ + { + userId: "YanYangDe", + name: "闫旸德", + status: 1, + }, + { + userId: "B57E06F4784AD322", + name: "刘鹏", + status: 1, + }, + { + userId: "yangjun", + name: "杨军", + status: 1, + }, + { + userId: "8478644AE0D12AC8", + name: "许允东", + status: 1, + }, + { + userId: "shenping", + name: "申苹", + status: 1, + }, + { + userId: "6E88081E82859861", + name: "刘坤", + status: 1, + }, + { + userId: "A4DCEDC60FBA9A05", + name: "岳凤英", + status: 1, + }, + { + userId: "SunShanShan", + name: "孙珊珊", + status: 1, + }, + { + userId: "3B0D05D6DF8BCE86", + name: "徐箫", + status: 1, + }, + { + userId: "2579b4e7761eceb4bd0348172a181f81", + name: "谭业飞", + status: 1, + }, + { + userId: "AB9A460B059514CC", + name: "熊海云", + status: 1, + }, + { + userId: "CD0E1660B620CCAA", + name: "张延彬", + status: 1, + }, + ], + postName: "办公室", + totalUserNum: 14, + allUserNum: 12, + towNum: 0, + threeNum: 12, + }, + { + personList: [ + { + userId: "2ADBE90D66229364", + name: "曹鑫", + status: 1, + }, + { + userId: "5B9CAE5A10CB4368", + name: "李航", + status: 1, + }, + { + userId: "B2E1D7247BD58FFE", + name: "武玲玲", + status: 1, + }, + { + userId: "liff", + name: "李凡凡", + status: 1, + }, + { + userId: "caoying", + name: "曹迎", + status: 1, + }, + { + userId: "c21a6cb2100283837573db70c349055f", + name: "李艺", + status: 1, + }, + ], + postName: "人力资源部", + totalUserNum: 6, + allUserNum: 6, + towNum: 0, + threeNum: 6, + }, + { + personList: [ + { + userId: "13F96380B983C670", + name: "吕秀霞", + status: -1, + }, + { + userId: "ZhangLei", + name: "张磊", + status: 1, + }, + { + userId: "2865F332800FE7C0", + name: "王登", + status: 1, + }, + { + userId: "4E188A12A6EC3DCC", + name: "纪雪莲", + status: 1, + }, + { + userId: "ZhangJie1", + name: "张杰", + status: 1, + }, + { + userId: "4454BC5491200796", + name: "李博", + status: 1, + }, + { + userId: "3988B55365B61256", + name: "宋德坤", + status: 1, + }, + { + userId: "52C0D8312F26D751", + name: "严飞", + status: 1, + }, + ], + postName: "财务部", + totalUserNum: 9, + allUserNum: 8, + towNum: 0, + threeNum: 8, + }, + { + personList: [ + { + userId: "6C1B059DF9CA8C00", + name: "段皎", + status: -1, + }, + { + userId: "LiuJiaHua", + name: "刘加华", + status: 1, + }, + { + userId: "89D209BE8935828C", + name: "刘丁", + status: 1, + }, + { + userId: "EED68EE917A75F61", + name: "赵蕊芯", + status: 1, + }, + { + userId: "F906ABD74B8D16C3", + name: "张旭博", + status: 1, + }, + { + userId: "8997E1C3648FC379", + name: "马洪波", + status: 1, + }, + { + userId: "ZhaoYongJu", + name: "赵永聚", + status: 1, + }, + ], + postName: "党委办公室", + totalUserNum: 7, + allUserNum: 7, + towNum: 0, + threeNum: 7, + }, + { + personList: [ + { + userId: "9716C99BD4DCF525", + name: "刘琰琰", + status: 1, + }, + { + userId: "LuJian", + name: "卢健", + status: 1, + }, + { + userId: "RenJianGuo", + name: "任建国", + status: 1, + }, + { + userId: "zoubb", + name: "邹斌斌", + status: 1, + }, + { + userId: "A20DFF813E5BEC39", + name: "刘莉珊", + status: 1, + }, + ], + postName: "综合业务部", + totalUserNum: 5, + allUserNum: 5, + towNum: 0, + threeNum: 5, + }, + { + personList: [ + { + userId: "3497117395409599", + name: "刘杰", + status: 1, + }, + { + userId: "FB5CA2A5F2DFEAB9", + name: "沈希顺", + status: 1, + }, + { + userId: "C1F073BB47052B0E", + name: "杨庆国", + status: 1, + }, + { + userId: "68D2640E728E834C", + name: "杜胜", + status: 1, + }, + { + userId: "zhouhui", + name: "周辉", + status: 1, + }, + { + userId: "ZhengBiao", + name: "郑标", + status: 1, + }, + ], + postName: "安全管理部", + totalUserNum: 6, + allUserNum: 6, + towNum: 0, + threeNum: 6, + }, + { + personList: [ + { + userId: "E7B5EA7907A10E11", + name: "王晓刚", + status: -1, + }, + { + userId: "0E83C506F6E49E2B", + name: "田瑛", + status: 1, + }, + { + userId: "A4C5B49D3FC70C15", + name: "赵铁成", + status: 1, + }, + { + userId: "CED51692DF3736CC", + name: "孙嘉莉", + status: 1, + }, + ], + postName: "计划基建部", + totalUserNum: 5, + allUserNum: 4, + towNum: 0, + threeNum: 4, + }, + { + personList: [ + { + userId: "LiShiWei", + name: "李世伟", + status: 1, + }, + { + userId: "1F95E9EFAD36DE9C", + name: "刘维海", + status: 1, + }, + { + userId: "AFD052887144C8B5", + name: "姚广义", + status: 1, + }, + { + userId: "zhangyang", + name: "张洋", + status: 1, + }, + { + userId: "57A7ADCE000909CC", + name: "张丽", + status: 1, + }, + { + userId: "ZhaoGuangMing", + name: "赵光明", + status: 1, + }, + { + userId: "72DFF423ADD3631F", + name: "胡青波", + status: 1, + }, + { + userId: "8F79795CA2205872", + name: "田发尧", + status: 1, + }, + { + userId: "C7A6BF783BF6A2B2", + name: "李丹凤", + status: -1, + }, + { + userId: "F6BC976B7D4FF8C7", + name: "叶伟", + status: -1, + }, + { + userId: "F04127A8ED5BC152", + name: "郝卫婷", + status: -1, + }, + ], + postName: "后服保障部", + totalUserNum: 15, + allUserNum: 11, + towNum: 0, + threeNum: 11, + }, + { + personList: [ + { + userId: "A95279AD8A37D6BC", + name: "李艳君", + status: 1, + }, + { + userId: "0D1AA9AE615F2C78", + name: "王策", + status: 1, + }, + { + userId: "887C5E6C4081FFD3", + name: "孙明怡", + status: 1, + }, + { + userId: "4216AC496D075293", + name: "来国伟", + status: 1, + }, + { + userId: "1E781FF40A33CDE4", + name: "刘传振", + status: 1, + }, + { + userId: "59A6E478DBFE86F3", + name: "孙志钐", + status: 1, + }, + { + userId: "F7FFAF0737A6F33B", + name: "范杭", + status: 1, + }, + { + userId: "F1295EC452FF4CB0", + name: "徐新", + status: 1, + }, + { + userId: "D558D6153CB6063A", + name: "殷翊航", + status: 1, + }, + { + userId: "7D477D5C9709E6DF", + name: "刘钊", + status: 1, + }, + { + userId: "2D380E2F2FE5E274", + name: "张学谦", + status: 1, + }, + { + userId: "F2C4AF867DE4D5A5", + name: "董绪梁", + status: 1, + }, + { + userId: "39E321F0870E5501", + name: "陈浩男", + status: 1, + }, + { + userId: "7EA87CE86BBEC2B8", + name: "张文斌", + status: 1, + }, + { + userId: "3721ECF970E99FEE", + name: "郭悦", + status: 1, + }, + { + userId: "E15C0CF36F5D7463", + name: "张鑫", + status: 1, + }, + { + userId: "E5A9A9BAB82BD685", + name: "马远晴", + status: 1, + }, + { + userId: "4751225FE059AA67", + name: "栾宇翔", + status: 1, + }, + { + userId: "64113615DE2C5834", + name: "刘紫琪", + status: 1, + }, + { + userId: "7AB801E70CAD1EAA", + name: "郑磊", + status: 1, + }, + { + userId: "e698571fb7574ea1eb7c725729c45810", + name: "赵帅", + status: 1, + }, + { + userId: "33C935ECD1B60053", + name: "李文康", + status: 1, + }, + { + userId: "CE259076336741A0", + name: "张跃", + status: 1, + }, + { + userId: "69368EEDD956ACBB", + name: "郭玉泽", + status: 1, + }, + { + userId: "1845F581D4C82CAC", + name: "陈奕璁", + status: 1, + }, + { + userId: "D546B47CFD317009", + name: "张宗欣", + status: 1, + }, + { + userId: "AD5AED44512D881D", + name: "马贺", + status: 1, + }, + { + userId: "B759681FE9E3FD35", + name: "吕成宇", + status: 1, + }, + { + userId: "08A657F8D7D3223D", + name: "朱泰", + status: 1, + }, + { + userId: "DD26316653944BB3", + name: "徐鑫辉", + status: 1, + }, + { + userId: "0A3F353E178EE55A", + name: "孙庆朝", + status: 1, + }, + { + userId: "CEF2766CA8195BB1", + name: "王广顺", + status: 1, + }, + { + userId: "CD5B569DF4EEEC95", + name: "宋明强", + status: 1, + }, + { + userId: "561774260CC34267", + name: "曹原", + status: 1, + }, + { + userId: "6279607CFAF7D7E8", + name: "邱智博", + status: -1, + }, + { + userId: "1C8E8E2D383E7093", + name: "林宝钢", + status: -1, + }, + { + userId: "0F7165A79CA8CD3A", + name: "谢超", + status: -1, + }, + { + userId: "E5CDE64A03F61B3A", + name: "张恒", + status: -1, + }, + { + userId: "3B5728553176AC60", + name: "赵家浩", + status: -1, + }, + ], + postName: "管制运行部门", + totalUserNum: 18, + allUserNum: 39, + towNum: 32, + threeNum: 7, + }, + { + personList: [ + { + userId: "Yerh", + name: "叶婷婷", + status: -1, + }, + { + userId: "maling", + name: "马凌", + status: 1, + }, + { + userId: "wangyt", + name: "王蕴婷", + status: 1, + }, + { + userId: "ChenZhiFeng", + name: "陈志峰", + status: 1, + }, + { + userId: "jiangxb", + name: "姜旭波", + status: 1, + }, + { + userId: "92561C8FF2722941", + name: "段笑月", + status: 1, + }, + { + userId: "zhangsj", + name: "张树剑", + status: 1, + }, + { + userId: "wangyz", + name: "王勇之", + status: 1, + }, + { + userId: "wensn", + name: "温绍楠", + status: -1, + }, + { + userId: "80b5d3757fdb4259af36a2e12931e90b", + name: "刘克", + status: -1, + }, + { + userId: "yangxz", + name: "杨新柱", + status: -1, + }, + { + userId: "zhangwj", + name: "张文杰", + status: -1, + }, + { + userId: "2022XinYuanGongTongDaoWangYiChen", + name: "王翌晨", + status: -1, + }, + { + userId: "036c25bf45d570285f9c133135f2b8da", + name: "于颖丽", + status: -1, + }, + { + userId: "782F4301C1CFB291", + name: "郎贤波", + status: -1, + }, + { + userId: "42409b9140ab95c878ad3a4674da40fa", + name: "王晴", + status: -1, + }, + ], + postName: "技术保障部", + totalUserNum: 12, + allUserNum: 16, + towNum: 10, + threeNum: 6, + }, + { + personList: [ + { + userId: "EDCA94E20F0C5980", + name: "悠然", + status: -1, + }, + { + userId: "ZhangYinChang", + name: "张银昌", + status: 1, + }, + { + userId: "JiangBiao", + name: "蒋彪", + status: 1, + }, + { + userId: "34746D7B283147AE", + name: "刘正", + status: 1, + }, + { + userId: "6274436D54C8AAFB", + name: "陈亮", + status: 1, + }, + { + userId: "WangXueZhi", + name: "王学智", + status: 1, + }, + { + userId: "LiuShouXin", + name: "刘寿鑫", + status: 1, + }, + { + userId: "ZhangYong", + name: "张勇", + status: 1, + }, + { + userId: "7F5669C4A6435063", + name: "郭溢阳", + status: -1, + }, + { + userId: "XiaoYongMin", + name: "肖永敏", + status: -1, + }, + { + userId: "E813998EDB841357", + name: "张钰欣", + status: -1, + }, + { + userId: "XueWeiTao", + name: "薛维韬", + status: -1, + }, + { + userId: "SongGuangHua", + name: "宋光华", + status: -1, + }, + { + userId: "WangJunXiang", + name: "王军祥", + status: -1, + }, + { + userId: "LiuNing", + name: "刘宁", + status: -1, + }, + { + userId: "YanYing", + name: "颜颖", + status: -1, + }, + { + userId: "YuLuLu", + name: "于璐璐", + status: -1, + }, + ], + postName: "气象台", + totalUserNum: 4, + allUserNum: 17, + towNum: 3, + threeNum: 14, + }, + { + personList: [], + postName: "建设指挥部", + totalUserNum: 6, + allUserNum: 0, + towNum: 0, + threeNum: 0, + }, + { + personList: [ + { + userId: "D297316ED4200723", + name: "袁永明", + status: 1, + }, + { + userId: "52D07790B2AF96D2", + name: "王春波", + status: 1, + }, + { + userId: "39FC04E7D9265DAE", + name: "姚瑞洁", + status: 1, + }, + { + userId: "084BC26E499A7FF1", + name: "纪勇", + status: 1, + }, + { + userId: "840C6548EDEA9750", + name: "王岱松", + status: 1, + }, + { + userId: "9372E4F835D94C98", + name: "邹燕", + status: 1, + }, + { + userId: "5D877B79A2329998", + name: "窦鹏", + status: 1, + }, + { + userId: "42B086046E4CFA7D", + name: "袁崔祥", + status: 1, + }, + { + userId: "024678E42962E70F", + name: "闫明香", + status: 1, + }, + { + userId: "BCEC49E611AA1879", + name: "王婷", + status: 1, + }, + { + userId: "7DF8869B03222116", + name: "刘宇杰", + status: -1, + }, + { + userId: "4ED836B340C2C426", + name: "刘芳华", + status: -1, + }, + { + userId: "5D28B66F4D07FC87", + name: "单亦东", + status: -1, + }, + { + userId: "864499EDF2621027", + name: "周飞旭", + status: -1, + }, + { + userId: "D7929C4D547BDE45", + name: "李萍", + status: -1, + }, + { + userId: "1C101734DBBA5933", + name: "宋晓虹", + status: -1, + }, + { + userId: "3F59BD3B686607FE", + name: "方建田", + status: -1, + }, + { + userId: "AC5C48879431FB0E", + name: "刘木波", + status: -1, + }, + { + userId: "F1825ECB771B9295", + name: "王茂杰", + status: -1, + }, + { + userId: "388AA34D867E0D8D", + name: "刘伟", + status: -1, + }, + { + userId: "2501BEC78F511152", + name: "姜瑞芬", + status: -1, + }, + ], + postName: "实业公司", + totalUserNum: 1, + allUserNum: 21, + towNum: 0, + threeNum: 21, + }, + ], + timestamp: 1669707141649, + }, + }); + }); } else { return request({ url: "/epiHome/getPersonByJ", @@ -2325,19 +2336,20 @@ export const getRepair = (date) => { if (isMock) { return new Promise((reslove) => { reslove({ - "success": true, - "message": "获取当日保修情况成功", - "code": 200, - "result": { - "legacy": 15, - "escalation": 61, - "complete": 53 + data: { + success: true, + message: "获取当日保修情况成功", + code: 200, + result: { + legacy: 15, + escalation: 61, + complete: 53, + }, + timestamp: 1670575462396, }, - "timestamp": 1670575462396 - }) - }) - } - else { + }); + }); + } else { return request({ url: "/epiHome/getRepair", method: "get", @@ -2350,22 +2362,23 @@ export const getShare = (date) => { if (isMock) { return new Promise((reslove) => { reslove({ - "success": true, - "message": "获取共享资源成功", - "code": 200, - "result": { - "underCar": 4, - "car": 5, - "washCar": 2, - "pile": 5, - "exercise": 5, - "meeting": 7 + data: { + success: true, + message: "获取共享资源成功", + code: 200, + result: { + underCar: 4, + car: 5, + washCar: 2, + pile: 5, + exercise: 5, + meeting: 7, + }, + timestamp: 1670575582418, }, - "timestamp": 1670575582418 - }) - }) - } - else { + }); + }); + } else { return request({ url: "/epiHome/getShare", method: "get", @@ -2378,24 +2391,25 @@ export const getCarInfo = (date) => { if (isMock) { return new Promise((reslove) => { reslove({ - "success": true, - "message": "获取车辆情况总人数成功", - "code": 200, - "result": { - "胶州": { - "7座及以下": 10, - "17-20座": 3, - "52座": 1 + data: { + success: true, + message: "获取车辆情况总人数成功", + code: 200, + result: { + JZ: { + seven: 10, + seventeen: 3, + fiftyTwo: 1, + }, + LT: { + seven: 1, + }, }, - "流亭": { - "7座及以下": 1 - } + timestamp: 1669703427438, }, - "timestamp": 1669703427438 - }) - }) - } - else { + }); + }); + } else { return request({ url: "/epiHome/getCarInfo", method: "get", @@ -2408,20 +2422,21 @@ export const getGardenEat = (date) => { if (isMock) { return new Promise((reslove) => { reslove({ - "success": true, - "message": "获取今日园区就餐成功", - "code": 200, - "result": { - "TT": 19, - "Garden": 57, - "XZ": 57, - "YW": 51 + data: { + success: true, + message: "获取今日园区就餐成功", + code: 200, + result: { + TT: 19, + Garden: 57, + XZ: 57, + YW: 51, + }, + timestamp: 1670575594189, }, - "timestamp": 1670575594189 - }) - }) - } - else { + }); + }); + } else { return request({ url: "/epiHome/getGardenEat", method: "get", @@ -2432,23 +2447,24 @@ export const getGardenEat = (date) => { //防疫要求-每日情况//0 正常 1 封闭运行 2 分区域运行 export const getReportByDate = (date) => { if (isMock) { - return new Promise(reslove => { + return new Promise((reslove) => { reslove({ - "success": true, - "message": "获取每日情况以及每日防疫安排成功", - "code": 200, - "result": { - "id": 19, - "date": "2022-11-29", - "createBy": "41BD60C033E24E9D", - "status": 2, //0 正常 1 封闭运行 2 分区域运行 - "content": "请大家严格遵守防疫政策" //今日防疫安排内容 + data: { + success: true, + message: "获取每日情况以及每日防疫安排成功", + code: 200, + result: { + id: 19, + date: "2022-11-29", + createBy: "41BD60C033E24E9D", + status: 2, //0 正常 1 封闭运行 2 分区域运行 + content: "请大家严格遵守防疫政策", //今日防疫安排内容 + }, + timestamp: 1669705317227, }, - "timestamp": 1669705317227 - }) - }) - } - else { + }); + }); + } else { return request({ url: "/epiHome/epi-report/getReportByDate", method: "get", @@ -2459,17 +2475,18 @@ export const getReportByDate = (date) => { //节假日判断 export const isHolidays = (date) => { if (isMock) { - return new Promise(reslove => { + return new Promise((reslove) => { reslove({ - "success": true, - "message": "判断是否为节假日成功", - "code": 200, - "result": false, //true 是节假日 false 是工作日 - "timestamp": 1669705433410 - }) - }) - } - else { + data: { + success: true, + message: "判断是否为节假日成功", + code: 200, + result: false, //true 是节假日 false 是工作日 + timestamp: 1669705433410, + }, + }); + }); + } else { return request({ url: "/epiHome/epi-report/isHolidays", method: "get", @@ -2486,10 +2503,10 @@ export const getYMInfo = (date) => { }); }; //获取疫苗接种情况 -export const getDoorAccCount = (startTime,endTime) => { +export const getDoorAccCount = (startTime, endTime) => { return request({ url: "/api/blade-desk/door/get-build-door-acc-count", method: "get", params: { startTime, endTime }, }); -}; \ No newline at end of file +}; diff --git a/src/router/axios.js b/src/router/axios.js index cdd1cdf..6f50964 100644 --- a/src/router/axios.js +++ b/src/router/axios.js @@ -17,7 +17,7 @@ import NProgress from 'nprogress'; import 'nprogress/nprogress.css'; //默认超时时间 -axios.defaults.timeout = 10000; +axios.defaults.timeout = 60*1000; //返回其他状态码 axios.defaults.validateStatus = function (status) { return status >= 200 && status <= 500; diff --git a/src/router/views/index.js b/src/router/views/index.js index 1d3c2bc..61bd781 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -3,7 +3,7 @@ import Layout from '@/page/index/' export default [{ path: '/garden', component: Layout, - redirect: '/garden/home', + redirect: '/garden/index', children: [{ path: 'index', name: '园区监控', diff --git a/src/util/bfHelper.js b/src/util/bfHelper.js index 9d1339c..13ad768 100644 --- a/src/util/bfHelper.js +++ b/src/util/bfHelper.js @@ -2862,12 +2862,12 @@ const loadModel = (i) => { // BimfaceLoaderConfig.APIHost = "http://10.90.100.203:8080"; BimfaceLoaderConfig.dataEnvType = BimfaceEnvOption.Local; BimfaceLoaderConfig.sdkPath = "static/jssdk@3.6.191/jssdk"; - BimfaceLoaderConfig.path = i == 1 ? 'http://47.103.199.45:8000/face/ywq/viewToken.json' : - 'http://47.103.199.45:8000/face/tt/viewToken.json'; - // BimfaceLoaderConfig.path = - // i == 1 - // ? "http://10.90.100.203:8080/ywq/viewToken.json" - // : "http://10.90.100.203:8080/tt/viewToken.json"; + // BimfaceLoaderConfig.path = i == 1 ? 'http://47.103.199.45:8000/face/ywq/viewToken.json' : + // 'http://47.103.199.45:8000/face/tt/viewToken.json'; + BimfaceLoaderConfig.path = + i == 1 + ? "http://10.90.100.203:8080/ywq/viewToken.json" + : "http://10.90.100.203:8080/tt/viewToken.json"; BimfaceSDKLoader.load(BimfaceLoaderConfig, onSDKLoadSucceeded); }; diff --git a/src/views/garden/generalizePatternNew.vue b/src/views/garden/generalizePatternNew.vue index a823ee7..25e7b20 100644 --- a/src/views/garden/generalizePatternNew.vue +++ b/src/views/garden/generalizePatternNew.vue @@ -259,25 +259,55 @@
- +
车辆资源
胶
州
-
+ +
+
{{ carInfo.JZ ? carInfo.JZ.seven : 0 }}辆 +
+
7座及以下
+
+
+
{{ carInfo.JZ ? carInfo.JZ.seventeen : 0 }}辆 +
+
17-20座
+
+
+
{{ carInfo.JZ ? carInfo.JZ.fiftyTwo : 0 }}辆 +
+
52座
流
亭
-
+ +
+
{{ carInfo.LT ? carInfo.LT.seven : 0 }}辆 +
+
7座及以下
+
+
+
0辆 +
+
17-20座
+
+
+
0辆 +
+
52座
@@ -367,7 +397,7 @@ export default { prePlaneInfo: {},//前一天 planeInfo: {},//航班 gardenAndApprove: {},//访客 - cardInfo: {},//车辆资源 + carInfo: {},//车辆资源 ywDevice: { 电: { code: "0100", @@ -410,15 +440,15 @@ export default { icon: require("../../../public/img/monitoring/nav_11-1.png"), }, }, //业务模型设备类型 - isLeaveInfo: {},//在青、外地 - allJzAdminInfo: {},//业务区及塔台总人数 - 业务区（封闭运行） - allJzInfo: {},//获取胶州机关行政人员总人数 + isLeaveInfo: 0,//在青、外地 + allJzAdminInfo: 0,//业务区及塔台总人数 - 业务区（封闭运行） + allJzInfo: 0,//获取胶州机关行政人员总人数 allBqInfo: {},//备勤、居家总人数 - allLtInfo: {},//流亭总人数 + allLtInfo: 0,//流亭总人数 allLtTzInfo: {},//流亭台站总人数 codeInfo: {},//集中隔离 leaveInfo: {},//休假、外出 - allJJInfo: {},//居家总人数 + allJJInfo: 0,//居家总人数 setInterval: null, }; }, @@ -441,71 +471,67 @@ export default { }); //在青、外地总人数 getIsLeaveByDate(this.currentDate).then((res) => { - this.isLeaveInfo = res.result; + this.isLeaveInfo = res.data.result; }) //居家总人数 getAllJJByDate(this.currentDate).then((res) => { - this.allJJInfo = res.result; + this.allJJInfo = res.data.result; }) //休假外出 getLeaveByDate(this.currentDate).then((res) => { - this.leaveInfo = res.result; + this.leaveInfo = res.data.result; }) //业务区及塔台总人数业务区（封闭运行） getJZAdminByDate(this.currentDate).then((res) => { - this.allJzAdminInfo = res.result; + this.allJzAdminInfo = res.data.result; }) //获取胶州机关行政人员总人数 getAllJZByDate(this.currentDate).then((res) => { - this.allJzInfo = res.result; + this.allJzInfo = res.data.result; }) //备勤、居家总人数 getAllBQByDate(this.currentDate).then((res) => { - this.allBqInfo = res.result; + this.allBqInfo = res.data.result; }) //流亭总人数 getAllLTByDate(this.currentDate).then((res) => { - this.allLtInfo = res.result; + this.allLtInfo = res.data.result; }) //流亭台站总人数 getAllLTTZByDate(this.currentDate).then((res) => { - this.allLtTzInfo = res.result; + this.allLtTzInfo = res.data.result; }) //集中隔离 getCodeByDate(this.currentDate).then((res) => { - this.codeInfo = res.result; + this.codeInfo = res.data.result; }) //航班 - 前一天和今天 let dd = new Date(this.currentDate); dd.setDate(dd.getDate() - 1); getPlaneInfo(dateFormat(new Date(dd), 'yyyy-MM-dd')).then((res) => { - res.result.placeNum = 170; - res.result.areaNum = 600; - this.prePlaneInfo = res.result; + res.data.result.placeNum = 170; + res.data.result.areaNum = 600; + this.prePlaneInfo = res.data.result; }) getPlaneInfo(this.currentDate).then((res) => { - this.planeInfo = res.result; + this.planeInfo = res.data.result; }) //访客 getGardenAndApprove(this.currentDate).then((res) => { - this.gardenAndApprove = res.result; + this.gardenAndApprove = res.data.result; }) this.getGxzy();//共享资源 //车辆资源 getCarInfo(this.currentDate).then((res) => { - this.cardInfo = res.result; - }) - //今日就餐 - getGardenEat(this.currentDate).then((res) => { - + this.carInfo = res.data.result; }) //防疫要求 getReportByDate(this.currentDate).then((res) => { - this.reportFangyi = res.result; + this.reportFangyi = res.data.result; }) //节假日判断 isHolidays(this.currentDate).then((res) => { - this.isHolidays = res.result; + this.isHolidays = res.data.result; }) //设别运行统计 this.getDeviceRunningAnalyze(); @@ -526,7 +552,7 @@ export default { getGxzy() { //共享资源 getShare(this.currentDate).then((res) => { - let objData = res.result; + let objData = res.data.result; var myChart = this.$echarts.init(document.getElementById("radar1")); myChart.setOption({ color: ['#2BF7AC', '#07A6FF'], @@ -677,7 +703,7 @@ export default { //园区就餐 getJiuCan() { getGardenEat(this.currentDate).then((res) => { - let objData = res.result; + let objData = res.data.result; var myChart = this.$echarts.init(document.getElementById("rightBar3")); myChart.setOption({ tooltip: { @@ -817,7 +843,7 @@ export default { //报修 getBx() { getRepair(this.currentDate).then((res) => { - let objData = res.result; + let objData = res.data.result; var myChart = this.$echarts.init(document.getElementById("rightBar1")); myChart.setOption({ color: ['#EB6877', '#4A92FF', '#48CB96'], @@ -911,17 +937,17 @@ export default { }, data: [ { - name: '上报', value: '61', itemStyle: { + name: '上报', value: objData.escalation, itemStyle: { color: '#4A92FF' } }, { - name: '完成', value: '53', itemStyle: { + name: '完成', value: objData.complete, itemStyle: { color: '#48CB96' } }, { - name: '遗留', value: '15', itemStyle: { + name: '遗留', value: objData.legacy, itemStyle: { color: '#EB6877' } }, @@ -937,8 +963,8 @@ export default { var res2 = await getTowerPerson(this.currentDate); var res3 = await getRunAdminPersonByJ(this.currentDate); var res4 = await getSafePersonByJ(this.currentDate); - let dataList = res1.result.concat(res2.result).concat(res3.result).concat(res4.result); - let size = res1.result.concat(res2.result).concat(res3.result).length; + let dataList = res1.data.result.concat(res2.data.result).concat(res3.data.result).concat(res4.data.result); + let size = res1.data.result.concat(res2.data.result).concat(res3.data.result).length; let runData = []; let safeData = []; let xCategory = []; @@ -953,7 +979,7 @@ export default { safeData.push({ name: item.deptName, value: item.parkUserNum }); } }) - console.log(runData, safeData) + // console.log(runData, safeData) var myChart = this.$echarts.init(document.getElementById("bar1")); myChart.setOption({ color: ['#07A6FF', '#2BF7AC'], @@ -1059,15 +1085,15 @@ export default { var res2 = await getDormitoryPersonByL(this.currentDate); var res3 = await getTowerPerson(this.currentDate); - let dataList = res1.result.concat(res2.result).concat(res3.result); - let size = res1.result.concat(res2.result).length; + let dataList = res1.data.result.concat(res2.data.result).concat(res3.data.result); + let size = res1.data.result.concat(res2.data.result).length; let ltData = []; let bqData = []; let tzData = []; let xCategory = []; dataList.map((item, index) => { xCategory.push(item.deptName); - if (index < res1.result.length) { + if (index < res1.data.result.length) { ltData.push({ name: item.deptName, value: item.allUserNum }); bqData.push({ name: item.deptName, value: 0 }); tzData.push({ name: item.deptName, value: 0 }); @@ -1198,7 +1224,7 @@ export default { let totalData = []; let sjData = []; let xCategory = []; - res1.result.map((item, index) => { + res1.data.result.map((item, index) => { xCategory.push(item.postName); totalData.push({ name: item.postName, value: item.totalUserNum }); sjData.push({ name: item.postName, value: item.allUserNum }); @@ -1543,12 +1569,12 @@ export default { getDorInfo() { getDorInfo(this.currentDate).then((res) => { var myChart = this.$echarts.init(document.getElementById("dorInfoPie")); - let keys = Object.keys(res.result); + let keys = Object.keys(res.data.result); let series = []; keys.map((item, index) => { let dataList = []; - Object.keys(res.result[item]).map((key, val) => { - dataList.push({ name: key, value: res.result[item][key] }); + Object.keys(res.data.result[item]).map((key, val) => { + dataList.push({ name: key, value: res.data.result[item][key] }); }) series.push( { diff --git a/vue.config.js b/vue.config.js index 78f95a7..b2b03f1 100644 --- a/vue.config.js +++ b/vue.config.js @@ -38,8 +38,8 @@ module.exports = { // target: 'http://180.76.231.175:8000', // target: 'http://192.168.0.105:80', // target: "http://192.168.43.35", - target: 'http://192.168.1.106', - // target: "http://10.90.100.204", + // target: 'http://192.168.1.106', + target: "http://10.90.100.204", // target: "http://rsvz4t.natappfree.cc", //远程演示服务地址,可用于直接启动项目 //target: 'https://saber.bladex.vip/api',