diff --git a/src/api/modules/agjtLiveApi.ts b/src/api/modules/agjtLiveApi.ts index 571b686f..42c77c81 100644 --- a/src/api/modules/agjtLiveApi.ts +++ b/src/api/modules/agjtLiveApi.ts @@ -41,7 +41,8 @@ export const configWeekVideoListApi = (params: {}, noLoading: boolean) => { //获取劳务实名制信息API---上 export const selectPersonTypeAndEduStatisticsApi = (params: {}, noLoading: boolean) => { - return http.post(BASEURL + `/xmgl/workerInfo/selectPersonTypeAndEduStatistics`, params, { headers: { noLoading: noLoading } }); + // return http.post(BASEURL + `/xmgl/workerInfo/selectPersonTypeAndEduStatistics`, params, { headers: { noLoading: noLoading } }); + return http.post(BASEURL + `/xmgl/workerAttendance/selectEnterpriseAttendanceCount`, params, { headers: { noLoading: noLoading } }); }; //获取劳务实名制信息API---下 @@ -59,6 +60,11 @@ export const securityPageApi = (params: {}, noLoading: boolean) => { return http.post(BASEURL + `/xmgl/xzSecurityQualityInspectionRecord/page`, params, { headers: { noLoading: noLoading } }); }; +// 获取安全评分数据API +export const getStatScoreApi = (params: {}, showLoading: boolean) => { + return http.get(BASEURL + `/xmgl/xzSecurityQualityInspectionRecord/getStatScore`, params, { headers: { noLoading: showLoading } }); +}; + //获取应急记录信息API export const emergencyPageApi = (params: {}, noLoading: boolean) => { // return http.get(BASEURL + `/xmgl/xzEmergencyRecord/page`, params, { headers: { noLoading: noLoading } }); diff --git a/src/assets/images/agjtLive/top-bg.png b/src/assets/images/agjtLive/top-bg.png new file mode 100644 index 00000000..95b18d37 Binary files /dev/null and b/src/assets/images/agjtLive/top-bg.png differ diff --git a/src/views/agjtLiveScreen/liveScreen/centerBottomLeft.vue b/src/views/agjtLiveScreen/liveScreen/centerBottomLeft.vue index a592c8fa..d5addf11 100644 --- a/src/views/agjtLiveScreen/liveScreen/centerBottomLeft.vue +++ b/src/views/agjtLiveScreen/liveScreen/centerBottomLeft.vue @@ -5,14 +5,14 @@
-
今日出勤总人数
-
{{lwInfo2.presencePersonTotal || 0}}
+
今日出勤人数
+
{{lwInfo2.attendancePersonTotal || 0}}
-
在册人数
-
{{lwInfo2.totalPerson || 0}}
+
实时在场人数
+
{{lwInfo2.presencePersonTotal || 0}}
@@ -25,7 +25,8 @@
{{i + 1}}
{{item.name}}
-
{{item.attendancePersonTotal}}/{{item.totalPerson}}
+ +
{{item.attendancePersonTotal}}/{{item.presencePersonTotal}}
@@ -46,7 +47,7 @@
{{i + 1}}
{{item.name}}
-
{{item.attendancePersonTotal}}/{{item.totalPerson}}
+
{{item.attendancePersonTotal}}/{{item.presencePersonTotal}}
@@ -93,21 +94,20 @@ const BASEURL = import.meta.env.VITE_API_URL const lwInfo1 = ref({} as any) const lwInfo2 = ref({} as any) async function getLwInfo() { - // let data = { - // projectSn: store.sn, - // } // selectPersonTypeAndEduStatisticsApi({ - // projectSn: data.projectSn, + // projectSn: store.sn, // },true).then(res1 => { // if(res1.success){ // if(res1.result){ - // lwInfo1.value = res1.result.personType + // lwInfo1.value = res1.result + // // console.log(lwInfo1.value) // } // } // }) selectWorkerTeamAndDepartmentStatisticsApi({ projectSn: store.sn, },true).then(res2 => { + console.log(res2) if(res2.success){ if(res2.result){ lwInfo2.value = res2.result diff --git a/src/views/agjtLiveScreen/liveScreen/centerTop.vue b/src/views/agjtLiveScreen/liveScreen/centerTop.vue index 925b9bcc..32ce2602 100644 --- a/src/views/agjtLiveScreen/liveScreen/centerTop.vue +++ b/src/views/agjtLiveScreen/liveScreen/centerTop.vue @@ -18,7 +18,7 @@ -->
- +
@@ -99,6 +99,10 @@ const configWeekVideoListFn = async () => { if(res.result.length != 0 && today == 6) projectData.value.videoUrl = res.result[0].sat } }; +function playVideo(){ + let video: any = document.getElementById("myVideo"); + video.play(); +} // const getVideoList = async () => { // let res: any = await selectLiveVideoListApi({ // projectSn: store.sn @@ -132,7 +136,8 @@ defineExpose({ onMounted(async () => { // if (COMPANY !== "agjt") showVideo.value = 2; // await getVideoList(); - await configWeekVideoListFn(true); + await configWeekVideoListFn(); + // playVideo() }); diff --git a/src/views/agjtLiveScreen/liveScreen/index.vue b/src/views/agjtLiveScreen/liveScreen/index.vue index 6a3e3e8d..e21a5b52 100644 --- a/src/views/agjtLiveScreen/liveScreen/index.vue +++ b/src/views/agjtLiveScreen/liveScreen/index.vue @@ -19,6 +19,7 @@
+
@@ -32,6 +33,7 @@ import centerTop from "@/views/agjtLiveScreen/liveScreen/centerTop.vue"; import centerBottomLeft from "@/views/agjtLiveScreen/liveScreen/centerBottomLeft.vue"; import centerBottomRight from "@/views/agjtLiveScreen/liveScreen/centerBottomRight.vue"; import rightTop from "@/views/agjtLiveScreen/liveScreen/rightTop.vue"; +import rightCenter from "@/views/agjtLiveScreen/liveScreen/rightCenter.vue"; import rightBottom from "@/views/agjtLiveScreen/liveScreen/rightBottom.vue"; import { GlobalStore } from "@/stores"; import { getWorkerStatisticsCountApi, getProjectDetail } from "@/api/modules/projectOverview"; @@ -82,6 +84,7 @@ const centerTopRef = ref(); const centerBottomLeftRef = ref(); const centerBottomRightRef = ref(); const rightTopRef = ref(); +const rightCenterRef = ref(); const rightBottomRef = ref(); const excuteCount = ref(0) const callChildFn = async () => { @@ -95,6 +98,7 @@ const callChildFn = async () => { centerBottomLeftRef.value.centerBottomLeftMethod() centerBottomRightRef.value.centerBottomRightMethod() rightTopRef.value.rightTopMethod() + rightCenterRef.value.rightCenterMethod() rightBottomRef.value.rightBottomMethod() }) } @@ -171,8 +175,12 @@ onMounted( async () => { .rightTop { height: 32%; } + .rightCenter { + height: 33%; + margin: 3% 0 3% 0; + } .rightBottom { - height: 78.636%; + height: 35.25%; margin: 3% 0 0 0; } } diff --git a/src/views/agjtLiveScreen/liveScreen/leftBottom.vue b/src/views/agjtLiveScreen/liveScreen/leftBottom.vue index f299cbae..829fcd07 100644 --- a/src/views/agjtLiveScreen/liveScreen/leftBottom.vue +++ b/src/views/agjtLiveScreen/liveScreen/leftBottom.vue @@ -46,6 +46,7 @@ async function getSpecialInfo() { if (res.result.total) { // innerPie.value[0].value = res.result.total.running // innerPie.value[1].value = res.result.total.complete + innerPie.value = [] innerPie.value.push({ value: res.result.total.running, name: "进行中" }); innerPie.value.push({ value: res.result.total.complete, name: "已完成" }); } @@ -59,6 +60,10 @@ async function getSpecialInfo() { value:item.num }) }); + // 获取你要清除的图表实例 + let chart = echarts.init(document.getElementById('pieEchart')); + // 使用 clear() 方法清除已绘制的图表 + chart.clear(); drawPie(); } } diff --git a/src/views/agjtLiveScreen/liveScreen/rightBottom.vue b/src/views/agjtLiveScreen/liveScreen/rightBottom.vue index 128ebc8d..3e516257 100644 --- a/src/views/agjtLiveScreen/liveScreen/rightBottom.vue +++ b/src/views/agjtLiveScreen/liveScreen/rightBottom.vue @@ -2,7 +2,7 @@
- +