diff --git a/src/api/source/total.js b/src/api/source/total.js
index 46c4326..c608e3b 100644
--- a/src/api/source/total.js
+++ b/src/api/source/total.js
@@ -337,12 +337,13 @@ export const getWeather = () => {
};
// 首页改版总览 20221208----------------------------------------------------------------
+const isMock = true;//是否模拟数据
//业务区及塔台总人数 - 业务区(封闭运行)
export const getAllJZByDate = (date) => {
return request({
- url: "/getAllJZByDate",
+ url: "/epiHome/getAllJZByDate",
method: "get",
- params: {date},
+ params: { date },
});
};
//获取胶州机关行政人员总人数
@@ -350,7 +351,7 @@ export const getJZAdminByDate = (date) => {
return request({
url: "/epiHome/getJZAdminByDate",
method: "get",
- params: {date},
+ params: { date },
});
};
//在青、外地总人数
@@ -358,7 +359,7 @@ export const getIsLeaveByDate = (date) => {
return request({
url: "/epiHome/getIsLeaveByDate",
method: "get",
- params: {date},
+ params: { date },
});
};
//休假外出/出差人数
@@ -366,7 +367,7 @@ export const getLeaveByDate = (date) => {
return request({
url: "/epiHome/getLeaveByDate",
method: "get",
- params: {date},
+ params: { date },
});
};
//备勤、居家总人数
@@ -374,7 +375,7 @@ export const getAllBQByDate = (date) => {
return request({
url: "/epiHome/getAllBQByDate",
method: "get",
- params: {date},
+ params: { date },
});
};
//流亭总人数
@@ -382,7 +383,7 @@ export const getAllLTByDate = (date) => {
return request({
url: "/epiHome/getAllLTByDate",
method: "get",
- params: {date},
+ params: { date },
});
};
//流亭台站总人数
@@ -390,7 +391,7 @@ export const getAllLTTZByDate = (date) => {
return request({
url: "/epiHome/getAllLTTZByDate",
method: "get",
- params: {date},
+ params: { date },
});
};
//集中隔离 - 获取今日健康码、行程码信息
@@ -398,31 +399,85 @@ export const getCodeByDate = (date) => {
return request({
url: "/epiHome/epi-code/getCodeByDate",
method: "get",
- params: {date},
+ params: { date },
});
};
//公寓使用情况
export const getDorInfo = (date) => {
- return request({
- url: "/epiHome/epi-report/getDorInfo",
- method: "get",
- params: {date},
- });
+ if (isMock) {
+ return new Promise((reslove) => {
+ reslove({
+ "success": true,
+ "message": "获取公寓使用情况成功",
+ "code": 200,
+ "result": {
+ "业务区": {
+ "管制": 33,
+ "技保": 7,
+ "气象": 5,
+ "常驻": 0,
+ "空余": 4,
+ "其他": 4
+ },
+ "塔台": {
+ "管制": 8,
+ "技保": 1,
+ "气象": 0,
+ "常驻": 0,
+ "空余": 0,
+ "其他": 0
+ },
+ "倒班宿舍": {
+ "气象": 6,
+ "空余": 20,
+ "技保": 5,
+ "管制": 32,
+ "其他": 5,
+ "常驻": 104
+ }
+ },
+ "timestamp": 1669705240184
+ })
+ })
+ } else {
+ return request({
+ url: "/epiHome/epi-report/getDorInfo",
+ method: "get",
+ params: { date },
+ });
+ }
};
//航班
export const getPlaneInfo = (date) => {
- return request({
- url: "/epiHome/epi-report/getPlaneInfo",
- method: "get",
- params: {date},
- });
+ if (isMock) {
+ return new Promise((reslove) => {
+ reslove({
+ "success": true,
+ "message": "查看航班数据成功",
+ "code": 200,
+ "result": {
+ "planNum": 153, //今日
+ "placeNum": 168, //昨日本场
+ "areaNum": 664 //昨日区域
+ },
+ "timestamp": 1669705267056
+ })
+ })
+ }
+ else {
+ return request({
+ url: "/epiHome/epi-report/getPlaneInfo",
+ method: "get",
+ params: { date },
+ });
+ }
};
//访客
export const getGardenAndApprove = (date) => {
return request({
url: "/epiHome/epidemicback/getGardenAndApprove",
method: "get",
- params: {date},
+ params: { date },
});
};
/**
@@ -430,72 +485,1687 @@ export const getGardenAndApprove = (date) => {
*/
//获取业务区以及塔台人员(管制部分)
export const getGZWorkPersonByJ = (date) => {
- return request({
- url: "/epiHome/getGZWorkPersonByJ",
- method: "get",
- params: {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 {
+ return request({
+ url: "/epiHome/getGZWorkPersonByJ",
+ method: "get",
+ params: { date },
+ });
+ }
};
//获取各台站运行人员
export const getTowerPerson = (date) => {
- return request({
- url: "/epiHome/getTowerPerson",
- method: "get",
- params: {date},
- });
+ if (isMock) {
+ 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 {
+ return request({
+ url: "/epiHome/getTowerPerson",
+ method: "get",
+ params: { date },
+ });
+ }
};
//获取运行管理人员
export const getRunAdminPersonByJ = (date) => {
- return request({
- url: "/epiHome/getRunAdminPersonByJ",
- method: "get",
- params: {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 {
+ return request({
+ url: "/epiHome/getRunAdminPersonByJ",
+ method: "get",
+ params: { date },
+ });
+ }
};
//获取业务区保障人员
export const getSafePersonByJ = (date) => {
- return request({
- url: "/epiHome/getSafePersonByJ",
- method: "get",
- params: {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
+ })
+ })
+ } else {
+ return request({
+ url: "/epiHome/getSafePersonByJ",
+ method: "get",
+ params: { date },
+ });
+ }
};
/**
* 流亭及备勤
*/
//获取流亭-园区人员
export const getGardenPersonByL = (date) => {
- return request({
- url: "/epiHome/getGardenPersonByL",
- method: "get",
- params: {date},
- });
+ if (isMock) {
+ 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
+ })
+ })
+ } else {
+ return request({
+ url: "/epiHome/getGardenPersonByL",
+ method: "get",
+ params: { date },
+ });
+ }
};
//获取流亭-备勤人员
export const getDormitoryPersonByL = (date) => {
- return request({
- url: "/epiHome/getDormitoryPersonByL",
- method: "get",
- params: {date},
- });
+ if (isMock) {
+ 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 {
+ return request({
+ url: "/epiHome/getDormitoryPersonByL",
+ method: "get",
+ params: { date },
+ });
+ }
};
/**
* 行政办公
*/
//行政办公人员
export const getPersonByJ = (date) => {
- return request({
- url: "/epiHome/getPersonByJ",
- method: "get",
- params: {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
+ })
+ })
+ } else {
+ return request({
+ url: "/epiHome/getPersonByJ",
+ method: "get",
+ params: { date },
+ });
+ }
};
//当日报修情况
export const getRepair = (date) => {
return request({
url: "/epiHome/epidemicback/getRepair",
method: "get",
- params: {date},
+ params: { date },
});
};
//共享资源
@@ -503,7 +2173,7 @@ export const getShare = (date) => {
return request({
url: "/epiHome/epidemicback/getShare",
method: "get",
- params: {date},
+ params: { date },
});
};
//车辆资源
@@ -511,7 +2181,7 @@ export const getCarInfo = (date) => {
return request({
url: "/epiHome/epidemicback/getCarInfo",
method: "get",
- params: {date},
+ params: { date },
});
};
//今日就餐情况
@@ -519,30 +2189,62 @@ export const getGardenEat = (date) => {
return request({
url: "/epiHome/epidemicback/getGardenEat",
method: "get",
- params: {date},
+ params: { date },
});
};
//防疫要求-每日情况//0 正常 1 封闭运行 2 分区域运行
export const getReportByDate = (date) => {
- return request({
- url: "/epiHome/epi-report/getReportByDate",
- method: "get",
- params: {date},
- });
+ if (isMock) {
+ 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": "请大家严格遵守防疫政策" //今日防疫安排内容
+ },
+ "timestamp": 1669705317227
+ })
+ })
+ }
+ else {
+ return request({
+ url: "/epiHome/epi-report/getReportByDate",
+ method: "get",
+ params: { date },
+ });
+ }
};
//节假日判断
export const isHolidays = (date) => {
- return request({
- url: "/epiHome/epi-report/isHolidays",
- method: "get",
- params: {date},
- });
+ if (isMock) {
+ return new Promise(reslove => {
+ reslove({
+ "success": true,
+ "message": "判断是否为节假日成功",
+ "code": 200,
+ "result": false, //true 是节假日 false 是工作日
+ "timestamp": 1669705433410
+ })
+ })
+ }
+ else {
+ return request({
+ url: "/epiHome/epi-report/isHolidays",
+ method: "get",
+ params: { date },
+ });
+ }
};
//获取疫苗接种情况
export const getYMInfo = (date) => {
return request({
url: "/epiHome/getYMInfo",
method: "get",
- params: {date},
+ params: { date },
});
};
\ No newline at end of file
diff --git a/src/views/garden/generalizePatternNew.vue b/src/views/garden/generalizePatternNew.vue
index d3c7828..33bb83b 100644
--- a/src/views/garden/generalizePatternNew.vue
+++ b/src/views/garden/generalizePatternNew.vue
@@ -3,7 +3,7 @@
-
工作日
+
{{ isHolidays ? '节假日' : '工作日' }}
{{ weatherData.weather }}
@@ -13,7 +13,9 @@
温度:{{ weatherData.temperature }}
- 运行状态:正常
+ 运行状态:{{ (reportFangyi.status == 2 ? '分区域运行' : reportFangyi.status == 2 ? '封闭运行' :
+ '正常')
+ }}
@@ -47,7 +49,8 @@
集中隔离/居家隔离/小区封控:
-
0/0/75人
+
0/0/75人
健康码/行程码:
@@ -67,20 +70,22 @@
-
212 架
+
{{ planeInfo.planNum }} 架
今日起降
-
+
-
昨日本场174次
+
昨日本场{{ planeInfo.placeNum
+ }}次

11%
-
昨日本场174次
+
昨日区域{{ planeInfo.areaNum
+ }}次

20%
@@ -274,8 +279,8 @@

防疫要求
-
- 请大家严格遵守每日核酸检测规定请大家严格遵守每日核酸检测请大家严格遵守每日核酸检测规定请大家严格遵守每日核酸检测请大家严格遵守每日核酸检测规定请大家严格遵守每日核酸检测
+
+ {{reportFangyi.content}}
@@ -329,12 +334,14 @@ export default {
data() {
return {
carData: {}, //车辆
- warnType: "",
- warnTypeOptions: [
- { label: "全部", value: "" },
- { label: "设备告警", value: 2 },
- { label: "事件告警", value: 1 },
- ], //告警类型
+ reportFangyi: {},//防疫要求-每日情况//0 正常 1 封闭运行 2 分区域运行
+ isHolidays: false,//节假日判断
+ yqPeopleTotal: 0, //园区人员总数
+ parkData: {}, //停车场数据
+ weatherData: {}, //天气
+ echartsColors: ["#4A92FF", "#48CB96", "#08B6F3", "#FFC976", "#7D55FF", "#BFBFBF"],//图表色值
+ currentDate: dateFormat(new Date(), 'yyyy-MM-dd'),
+ planeInfo: {},//航班
ywDevice: {
电: {
code: "0100",
@@ -377,40 +384,20 @@ export default {
icon: require("../../../public/img/monitoring/nav_11-1.png"),
},
}, //业务模型设备类型
- yqPeopleTotal: 0, //园区人员总数
- yqPeopleData: [], //园区人员分布统计
- listData: [], //告警信息列表
- securityData: {}, //安防态势
- listData1: [], //园区报警信息
- classOption: {
- step: 0.3,
- limitMoveNum: 3,
- }, //报警信息轮播速度配置
- nhfxData: {}, //能耗分析
- dsnActive: "electricity", //当前电/水/暖
- leftData: "0.2rem",
- rightData: "0.2rem",
- bottomData: "auto",
- parkData: {}, //停车场数据
- classifyData: [], //设备类型数据
- weatherData: {}, //天气
- echartsColors: ["#4A92FF", "#48CB96", "#08B6F3", "#FFC976", "#7D55FF", "#BFBFBF"],//图表色值
- currentDate: dateFormat(new Date(), 'yyyy-MM-dd'),
};
},
mounted() {
- this.getCar();
- this.getYqPeople();
- this.getDorInfo();
- this.getRunSafe();
- this.getLtOrBeiqin();
- this.getXz();
- this.getWeekPeople();
- this.getSankey();
- this.getBx();
- this.getGxzy();
- this.getJiuCan();
- this.getDoor();
+ this.getCar();//车辆出入
+ this.getYqPeople();//园区总人数
+ this.getDorInfo();//公寓使用情况
+ this.getRunSafe();//运行保障
+ this.getLtOrBeiqin();//流亭备勤
+ this.getXz();//行政办公人员
+ this.getWeekPeople();//一周趋势
+ this.getSankey();//桑基图
+ this.getBx();//报修情况
+ this.getJiuCan();//就餐
+ this.getDoor();//门禁
this.getBaseData();//基础数据查询
},
methods: {
@@ -420,42 +407,35 @@ export default {
getWeather().then((res) => {
this.weatherData = res.data.data;
});
- //业务区及塔台总人数
- getAllJZByDate(this.currentDate).then((res) => {
+ // //业务区及塔台总人数
+ // getAllJZByDate(this.currentDate).then((res) => {
- })
- //备勤、居家总人数
- getAllBQByDate(this.currentDate).then((res) => {
+ // })
+ // //备勤、居家总人数
+ // getAllBQByDate(this.currentDate).then((res) => {
- })
- //流亭总人数
- getAllLTByDate(this.currentDate).then((res) => {
+ // })
+ // //流亭总人数
+ // getAllLTByDate(this.currentDate).then((res) => {
- })
- //流亭台站总人数
- getAllLTTZByDate(this.currentDate).then((res) => {
+ // })
+ // //流亭台站总人数
+ // getAllLTTZByDate(this.currentDate).then((res) => {
- })
- //集中隔离
- getCodeByDate(this.currentDate).then((res) => {
+ // })
+ // //集中隔离
+ // getCodeByDate(this.currentDate).then((res) => {
- })
- //入园车辆
- getCar().then((res) => {
- this.carData = res.data.data;
- });
+ // })
//航班
getPlaneInfo(this.currentDate).then((res) => {
-
+ this.planeInfo = res.result;
})
//访客
getGardenAndApprove(this.currentDate).then((res) => {
})
- //共享资源
- getShare(this.currentDate).then((res) => {
-
- })
+ this.getGxzy();//共享资源
//车辆资源
getCarInfo(this.currentDate).then((res) => {
@@ -466,15 +446,19 @@ export default {
})
//防疫要求
getReportByDate(this.currentDate).then((res) => {
-
+ this.reportFangyi = res.result;
})
//节假日判断
- // isHolidays(this.currentDate).then((res) => {
-
- // })
+ isHolidays(this.currentDate).then((res) => {
+ this.isHolidays = res.result;
+ })
},
//共享资源
getGxzy() {
+ //共享资源
+ getShare(this.currentDate).then((res) => {
+
+ })
var myChart = this.$echarts.init(document.getElementById("radar1"));
myChart.setOption({
color: ['#2BF7AC', '#07A6FF'],
@@ -743,6 +727,9 @@ export default {
},
//报修
getBx() {
+ getRepair(this.currentDate).then((res) => {
+
+ })
var myChart = this.$echarts.init(document.getElementById("rightBar1"));
myChart.setOption({
color: ['#EB6877', '#4A92FF', '#48CB96'],
@@ -856,465 +843,11 @@ export default {
})
},
// 运行保障人员
- getRunSafe() {
- var res1 = {
- "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
- }
- var res2 = {
- "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
- }
- var res3 = {
- "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
- }
- var res4 = {
- "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
- }
+ async getRunSafe() {
+ var res1 = await getGZWorkPersonByJ(this.currentDate);
+ 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 runData = [];
@@ -1432,331 +965,10 @@ export default {
})
},
//流亭及备勤
- getLtOrBeiqin() {
- var res1 = {
- "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
- };
- var res2 = {
- "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
- };
- var res3 = {
- "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
- }
+ async getLtOrBeiqin() {
+ var res1 = await getGardenPersonByL(this.currentDate);
+ 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;
@@ -1781,7 +993,7 @@ export default {
tzData.push({ name: item.deptName, value: item.allUserNum });
}
})
- console.log(ltData, bqData, tzData)
+ // console.log(ltData, bqData, tzData)
var myChart = this.$echarts.init(document.getElementById("bar2"));
myChart.setOption({
color: ['#FFC976', '#7D55FF', '#22E59D'],
@@ -1893,1024 +1105,113 @@ export default {
},
//行政办公人员
getXz() {
- var res1 = {
- "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 //三类人数
+ getPersonByJ(this.currentDate).then((res1) => {
+ let totalData = [];
+ let sjData = [];
+ let xCategory = [];
+ res1.result.map((item, index) => {
+ xCategory.push(item.postName);
+ totalData.push({ name: item.postName, value: item.totalUserNum });
+ sjData.push({ name: item.postName, value: item.allUserNum });
+ })
+ var myChart = this.$echarts.init(document.getElementById("bar3"));
+ myChart.setOption({
+ color: ['#7D55FF', '#2BF7AC'],
+ title: {
+ text: "行政及办公人员",
+ left: '3%',
+ top: '6%',
+ textStyle: {
+ color: '#07E6ED',
+ fontFamily: 'Microsoft YaHei',
+ fontSize: 14
+ }
},
- {
- "personList": [
- {
- "userId": "YanYangDe",
- "name": "闫旸德",
- "status": 1
- },
- {
- "userId": "B57E06F4784AD322",
- "name": "刘鹏",
- "status": 1
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'shadow'
+ }
+ },
+ legend: {
+ top: '6%',
+ right: '3%',
+ itemWidth: 12,
+ itemHeight: 3,
+ itemGap: 15,
+ textStyle: {
+ color: "rgba(255,255,255,0.5)",
+ fontSize: 12,
+ },
+ },
+ grid: {
+ top: '20%',
+ left: '6%',
+ right: '3%',
+ bottom: '3%',
+ containLabel: true
+ },
+ xAxis: [
+ {
+ type: 'category',
+ axisLine: {
+ show: true,
+ lineStyle: { color: "rgba(255,255,255,0.2)" },
},
- {
- "userId": "yangjun",
- "name": "杨军",
- "status": 1
+ axisTick: {
+ inside: true,
+ lineStyle: { color: "rgba(255,255,255,0.2)" },
},
- {
- "userId": "8478644AE0D12AC8",
- "name": "许允东",
- "status": 1
+ axisLabel: {
+ interval: 0,
+ rotate: -90,
+ color: "rgba(255,255,255,0.7)",
},
- {
- "userId": "shenping",
- "name": "申苹",
- "status": 1
+ data: xCategory,
+ },
+ ],
+ yAxis: [
+ {
+ type: 'value',
+ splitLine: { show: false },
+ axisTick: {
+ show: true,
+ inside: true,
+ length: 3,
+ lineStyle: { color: "rgba(255,255,255,0.2)" },
},
- {
- "userId": "6E88081E82859861",
- "name": "刘坤",
- "status": 1
+ axisLine: {
+ show: true,
+ lineStyle: { color: "rgba(255,255,255,0.2)" },
},
- {
- "userId": "A4DCEDC60FBA9A05",
- "name": "岳凤英",
- "status": 1
+ axisLabel: {
+ color: "rgba(255,255,255,0.7)",
},
- {
- "userId": "SunShanShan",
- "name": "孙珊珊",
- "status": 1
+ },
+ ],
+ series: [
+ {
+ name: '部门总人数',
+ type: 'bar',
+ barWidth: 10,
+ barGap: '-100%',
+ z: '-1',
+ emphasis: {
+ focus: 'series'
},
- {
- "userId": "3B0D05D6DF8BCE86",
- "name": "徐箫",
- "status": 1
+ data: totalData
+ },
+ {
+ name: '行政',
+ type: 'bar',
+ barWidth: 10,
+ emphasis: {
+ focus: 'series'
},
- {
- "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
- };
- let totalData = [];
- let sjData = [];
- let xCategory = [];
- res1.result.map((item, index) => {
- xCategory.push(item.postName);
- totalData.push({ name: item.postName, value: item.totalUserNum });
- sjData.push({ name: item.postName, value: item.allUserNum });
- })
- var myChart = this.$echarts.init(document.getElementById("bar3"));
- myChart.setOption({
- color: ['#7D55FF', '#2BF7AC'],
- title: {
- text: "行政及办公人员",
- left: '3%',
- top: '6%',
- textStyle: {
- color: '#07E6ED',
- fontFamily: 'Microsoft YaHei',
- fontSize: 14
- }
- },
- tooltip: {
- trigger: 'axis',
- axisPointer: {
- type: 'shadow'
- }
- },
- legend: {
- top: '6%',
- right: '3%',
- itemWidth: 12,
- itemHeight: 3,
- itemGap: 15,
- textStyle: {
- color: "rgba(255,255,255,0.5)",
- fontSize: 12,
- },
- },
- grid: {
- top: '20%',
- left: '6%',
- right: '3%',
- bottom: '3%',
- containLabel: true
- },
- xAxis: [
- {
- type: 'category',
- axisLine: {
- show: true,
- lineStyle: { color: "rgba(255,255,255,0.2)" },
- },
- axisTick: {
- inside: true,
- lineStyle: { color: "rgba(255,255,255,0.2)" },
- },
- axisLabel: {
- interval: 0,
- rotate: -90,
- color: "rgba(255,255,255,0.7)",
- },
- data: xCategory,
- },
- ],
- yAxis: [
- {
- type: 'value',
- splitLine: { show: false },
- axisTick: {
- show: true,
- inside: true,
- length: 3,
- lineStyle: { color: "rgba(255,255,255,0.2)" },
- },
- axisLine: {
- show: true,
- lineStyle: { color: "rgba(255,255,255,0.2)" },
+ data: sjData
},
- axisLabel: {
- color: "rgba(255,255,255,0.7)",
- },
- },
- ],
- series: [
- {
- name: '部门总人数',
- type: 'bar',
- barWidth: 10,
- barGap: '-100%',
- z: '-1',
- emphasis: {
- focus: 'series'
- },
- data: totalData
- },
- {
- name: '行政',
- type: 'bar',
- barWidth: 10,
- emphasis: {
- focus: 'series'
- },
- data: sjData
- },
- ]
+ ]
+ })
})
},
//一周人员趋势
@@ -3135,104 +1436,74 @@ export default {
},
// 公寓使用情况
getDorInfo() {
- var myChart = this.$echarts.init(document.getElementById("dorInfoPie"));
- var res = {
- "success": true,
- "message": "获取公寓使用情况成功",
- "code": 200,
- "result": {
- "业务区": {
- "管制": 33,
- "技保": 7,
- "气象": 5,
- "常驻": 0,
- "空余": 4,
- "其他": 4
+ getDorInfo(this.currentDate).then((res) => {
+ var myChart = this.$echarts.init(document.getElementById("dorInfoPie"));
+ let keys = Object.keys(res.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] });
+ })
+ series.push(
+ {
+ name: keys,
+ type: "pie",
+ radius: ["50%", "75%"],
+ top: index * 30 + '%',
+ width: '100%',
+ height: '30%',
+ left: 'center',
+ label: {
+ formatter: "{c}",
+ color: this.echartsColors[index],
+ textBorderWidth: 0,
+ },
+ labelLine: {
+ length: 12,
+ length2: 6,
+ lineStyle: {
+ color: "rgba(255,255,255,0.5)",
+ showAbove: true,
+ },
+ },
+ data: dataList,
+ }
+ );
+ })
+ myChart.setOption({
+ color: this.echartsColors,
+ tooltip: {
+ trigger: "item",
},
- "塔台": {
- "管制": 8,
- "技保": 1,
- "气象": 0,
- "常驻": 0,
- "空余": 0,
- "其他": 0
+ legend: {
+ bottom: '0',
+ itemWidth: 16,
+ itemHeight: 5,
+ padding: 20,
+ itemGap: 15,
+ textStyle: {
+ color: "rgba(255,255,255,0.5)",
+ fontSize: 12,
+ },
},
- "倒班宿舍": {
- "气象": 6,
- "空余": 20,
- "技保": 5,
- "管制": 32,
- "其他": 5,
- "常驻": 104
- }
- },
- "timestamp": 1669705240184
- };
- let keys = Object.keys(res.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] });
- })
- series.push(
- {
- name: keys,
- type: "pie",
- radius: ["50%", "75%"],
- top: index * 30 + '%',
- width: '100%',
- height: '30%',
- left: 'center',
- label: {
- formatter: "{c}",
- color: this.echartsColors[index],
- textBorderWidth: 0,
- },
- labelLine: {
- length: 12,
- length2: 6,
- lineStyle: {
- color: "rgba(255,255,255,0.5)",
- showAbove: true,
+ title: keys.map((item, index) => {
+ return {
+ subtext: "" + item,
+ left: "center",
+ top: (index * 30 + 12) + "%",
+ subtextStyle: {
+ color: "rgba(255,255,255,0.7)",
+ align: "center",
+ fontSize: 14,
+ fontFamily: "Microsoft YaHei",
},
- },
- data: dataList,
- }
- );
+ }
+ })
+ ,
+ series: series,
+ });
})
- myChart.setOption({
- color: this.echartsColors,
- tooltip: {
- trigger: "item",
- },
- legend: {
- bottom: '0',
- itemWidth: 16,
- itemHeight: 5,
- padding: 20,
- itemGap: 15,
- textStyle: {
- color: "rgba(255,255,255,0.5)",
- fontSize: 12,
- },
- },
- title: keys.map((item, index) => {
- return {
- subtext: "" + item,
- left: "center",
- top: (index * 30 + 12) + "%",
- subtextStyle: {
- color: "rgba(255,255,255,0.7)",
- align: "center",
- fontSize: 14,
- fontFamily: "Microsoft YaHei",
- },
- }
- })
- ,
- series: series,
- });
},
/**
* 判断当前时间所在时间段
@@ -3398,15 +1669,16 @@ export default {
color: rgba(255, 255, 255, 0.7);
background: rgba(0, 0, 0, 0.1);
margin: 0.29rem 0.21rem 0.13rem 0.31rem;
- padding: 0.16rem 0;
+ padding: 0.12rem 0;
overflow-y: auto;
.box_item {
- margin-bottom: 0.1rem;
+ margin-bottom: 0.05rem;
.item_label {
+ font-size: 0.12rem;
display: inline-block;
- width: 0.96rem;
+ width: 1rem;
padding-right: 0.1rem;
text-align: right;
}