diff --git a/.env.development b/.env.development index a2acb68..c77c6ea 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ NODE_ENV = 'development' # 后端本地 # VITE_API_URL = 'http://192.168.34.221:19111' # VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地 -VITE_API_URL = 'http://182.90.224.237:51234' #雄哥远程 +# VITE_API_URL = 'http://182.90.224.237:51234' #雄哥远程 # VITE_API_URL = 'http://192.168.34.221:28889' # VITE_API_URL = 'http://121.196.214.246/api' # VITE_API_URL = 'http://jxj.zhgdyun.com:100' @@ -24,7 +24,7 @@ VITE_API_URL = 'http://182.90.224.237:51234' #雄哥远程 # VITE_API_URL = 'http://182.90.224.237:15551' # agjt # VITE_API_URL = 'http://42.180.188.17:9809' #生产环境 -# VITE_API_URL = 'http://42.180.188.17:11211' #测试环境 +VITE_API_URL = 'http://42.180.188.17:11211' #测试环境 # VITE_API_URL = 'http://jxj.zhgdyun.com:19812' # 苏立信 # VITE_API_URL = 'http://101.43.164.214:11111' diff --git a/src/api/modules/agjtCommandApi.ts b/src/api/modules/agjtCommandApi.ts index e368eee..a71b007 100644 --- a/src/api/modules/agjtCommandApi.ts +++ b/src/api/modules/agjtCommandApi.ts @@ -97,3 +97,10 @@ export const getStatsDirectorateBigScreenApi = (params: {}) => { export const getStatScoreApi = (params: {}) => { return http.get(BASEURL + `/xmgl/xzSecurityQualityInspectionRecord/getStatScore`, params, { headers: { noLoading: true } }); }; + +// 项目人员考勤 +// 出勤人员/考勤日环比 +export const getPersonTypeAndEduStatisticsApi = (params: {}) => { + return http.post(BASEURL + `/xmgl/workerInfo/selectPersonTypeAndEduStatistics`, params, { headers: { noLoading: true } }); +}; + diff --git a/src/assets/images/mountain-icon.png b/src/assets/images/mountain-icon.png new file mode 100644 index 0000000..7dadabe Binary files /dev/null and b/src/assets/images/mountain-icon.png differ diff --git a/src/views/commandScreen/commandCenter/index.vue b/src/views/commandScreen/commandCenter/index.vue index 9d7c2a2..0213fca 100644 --- a/src/views/commandScreen/commandCenter/index.vue +++ b/src/views/commandScreen/commandCenter/index.vue @@ -42,10 +42,11 @@ const openPeopleCountDialog = (index:any) => { height: 100%; display: flex; .left { - height: 100%; + height: 109.5%; width: 26%; + transform: translateY(-70px); .leftTop { - height: 35%; + height: 24.5%; } .leftBottom { height: 65%; diff --git a/src/views/commandScreen/commandCenter/leftBottom.vue b/src/views/commandScreen/commandCenter/leftBottom.vue index 1986a90..ffb2483 100644 --- a/src/views/commandScreen/commandCenter/leftBottom.vue +++ b/src/views/commandScreen/commandCenter/leftBottom.vue @@ -7,10 +7,20 @@