diff --git a/src/assets/js/api/zhongjianFourth.js b/src/assets/js/api/zhongjianFourth.js index 5825372a..21596306 100644 --- a/src/assets/js/api/zhongjianFourth.js +++ b/src/assets/js/api/zhongjianFourth.js @@ -29,3 +29,10 @@ export const getTodayInspectionInfo = params => get('xmgl/inspectTaskRecord/getT * @returns */ export const listProgressOfTheTask = params => get('xmgl/progressItem/getScheduleList', params); + + +/* --------------安全管理------------ */ +// 人员管理 +export const getWorkerNumApi = data => get('xmgl/workerInfo/getPersonnelNum',data) +// 时间区间查询人员增长趋势 +export const getWorkerGrowthApi = data => get('xmgl/workerInfo/getPersonnelGrowth',data) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 33741fa7..696c502b 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -41,8 +41,8 @@ if (process.env.NODE_ENV == 'development') { // tag: 本地 // axios.defaults.baseURL = 'http://192.168.34.174:6023/' // 老大本地 // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1 - axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地 - // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上 + // axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地 + axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上 // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1 // axios.defaults.baseURL = 'http://192.168.34.216:18070/' // 邱平毅本地 // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地 diff --git a/src/views/projectAdmin/zjsj/command/rightOne.vue b/src/views/projectAdmin/zjsj/command/rightOne.vue index ed7072b6..758fe7b5 100644 --- a/src/views/projectAdmin/zjsj/command/rightOne.vue +++ b/src/views/projectAdmin/zjsj/command/rightOne.vue @@ -55,7 +55,7 @@ export default { return { // 巡检数据 pollingData: { - rectificationNum: undefined, // 完成整改数 + rectificationNum: '', // 完成整改数 totalNum: undefined, // 巡检总数 closeRatio: undefined, // 占比 days: undefined, // 安全生产天数 diff --git a/src/views/projectAdmin/zjsj/security/centerTop.vue b/src/views/projectAdmin/zjsj/security/centerTop.vue index 3f016b46..d77d87c0 100644 --- a/src/views/projectAdmin/zjsj/security/centerTop.vue +++ b/src/views/projectAdmin/zjsj/security/centerTop.vue @@ -4,35 +4,35 @@
总人数 -

14521

+

{{WorkerNum.sumNumber}}

实际出勤人数 -

14521

+

{{WorkerNum.attendanceNumber}}

未出勤人数 -

14521

+

{{WorkerNum.noAttendanceNumber}}

实名制人数 -

14521

+

{{WorkerNum.realNameNumber}}

入职培训人数 -

14521

+

{{WorkerNum.inductionTrainingNumber}}

特殊工种人数 -

14521

+

{{WorkerNum.specialNumber}}

普通工种人数 -

14521

+

{{WorkerNum.commonNumber}}

管理人员人数 -

14521

+

{{WorkerNum.managerNumber}}

@@ -44,6 +44,8 @@ range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" + value-format="yyyy-MM-DD" + @change="getTime1" >
@@ -55,6 +57,8 @@ range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" + value-format="yyyy-MM-DD" + @change="getTime2" >
@@ -66,11 +70,15 @@