diff --git a/src/api/modules/agjtLiveApi.ts b/src/api/modules/agjtLiveApi.ts index 559f958..571b686 100644 --- a/src/api/modules/agjtLiveApi.ts +++ b/src/api/modules/agjtLiveApi.ts @@ -3,56 +3,70 @@ import http from "@/api"; const BASEURL = import.meta.env.VITE_API_URL; //获取企业Id的API -export const getEnterpriseIdApi = (params: {}, showLoading: boolean) => { - return http.post(BASEURL + `/xmgl/enterpriseInfo/getXzSupplierInfo`, { headers: { noLoading: showLoading } }); +export const getEnterpriseIdApi = ( noLoading: boolean) => { + return http.post(BASEURL + `/xmgl/enterpriseInfo/getXzSupplierInfo`, { headers: { noLoading: noLoading } }); +}; + +//获取区域名字的API +export const getRegionNameApi = (param: {}, noLoading: boolean) => { + return http.get(BASEURL + `/xmgl/qualityRegion/queryBindRegion`, param, { headers: { noLoading: noLoading } }); }; //获取AI报警情况信息API -export const countTaskProgressApi = (params: {}, showLoading: boolean) => { - return http.post(BASEURL + `/xmgl/xzTaskProgress/countTaskProgress`, params, { headers: { noLoading: showLoading } }); +export const countTaskProgressApi = (params: {}, noLoading: boolean) => { + return http.post(BASEURL + `/xmgl/xzTaskProgress/countTaskProgress`, params, { headers: { noLoading: noLoading } }); +}; + +//获取承包商信息列表API +export const countProjectEnterpriseApi = (params: {}, noLoading: boolean) => { + return http.post(BASEURL + `/xmgl/projectEnterprise/list`, params, { headers: { noLoading: noLoading } }); }; //获取企业信息API -export const getEnterpriseInfoByIdApi = (params: {}, showLoading: boolean) => { - return http.post(BASEURL + `/xmgl/enterpriseInfo/getEnterpriseInfoById`, params, { headers: { noLoading: showLoading } }); +export const getEnterpriseInfoByIdApi = (params: {}, noLoading: boolean) => { + return http.post(BASEURL + `/xmgl/enterpriseInfo/getEnterpriseInfoById`, params, { headers: { noLoading: noLoading } }); }; //获取AI报警情况信息API -export const selectAIPageListApi = (params: {}, showLoading: boolean) => { - return http.post(BASEURL + `/xmgl/aiAnalyseHardWareAlarmRecord/selectPageList`, params, { headers: { noLoading: showLoading } }); +export const selectAIPageListApi = (params: {}, noLoading: boolean) => { + // return http.post(BASEURL + `/xmgl/aiAnalyseHardWareAlarmRecord/selectPageList`, params, { headers: { noLoading: noLoading } }); + // return http.get(BASEURL + `/xmgl/aiAnalyseHardWareAlarmRecord/getAllocateNewestRecord`, params, { headers: { noLoading: noLoading } }); + return http.get(BASEURL + `/xmgl/agjtLiveScreen/getAllocateNewestRecord`, params, { headers: { noLoading: noLoading } }); }; //安全教育视频API -export const configWeekVideoListApi = (params: {}, showLoading: boolean) => { - return http.get(BASEURL + `/xmgl/educationConfigWeekVideo/list`, params, { headers: { noLoading: showLoading } }); +export const configWeekVideoListApi = (params: {}, noLoading: boolean) => { + return http.get(BASEURL + `/xmgl/educationConfigWeekVideo/list`, params, { headers: { noLoading: noLoading } }); }; //获取劳务实名制信息API---上 -export const selectPersonTypeAndEduStatisticsApi = (params: {}, showLoading: boolean) => { - return http.post(BASEURL + `/xmgl/workerInfo/selectPersonTypeAndEduStatistics`, params, { headers: { noLoading: showLoading } }); +export const selectPersonTypeAndEduStatisticsApi = (params: {}, noLoading: boolean) => { + return http.post(BASEURL + `/xmgl/workerInfo/selectPersonTypeAndEduStatistics`, params, { headers: { noLoading: noLoading } }); }; //获取劳务实名制信息API---下 -export const selectWorkerTeamAndDepartmentStatisticsApi = (params: {}, showLoading: boolean) => { - return http.post(BASEURL + `/xmgl/workerInfo/selectWorkerTeamAndDepartmentStatistics`, params, { headers: { noLoading: showLoading } }); +export const selectWorkerTeamAndDepartmentStatisticsApi = (params: {}, noLoading: boolean) => { + return http.post(BASEURL + `/xmgl/workerInfo/selectWorkerTeamAndDepartmentStatistics`, params, { headers: { noLoading: noLoading } }); }; //获取质量待办信息API -export const qualityPageApi = (params: {}, showLoading: boolean) => { - return http.post(BASEURL + `/xmgl/qualityInspectionRecord/page`, params, { headers: { noLoading: showLoading } }); +export const qualityPageApi = (params: {}, noLoading: boolean) => { + return http.post(BASEURL + `/xmgl/qualityInspectionRecord/page`, params, { headers: { noLoading: noLoading } }); }; //获取安全待办信息API -export const securityPageApi = (params: {}, showLoading: boolean) => { - return http.post(BASEURL + `/xmgl/xzSecurityQualityInspectionRecord/page`, params, { headers: { noLoading: showLoading } }); +export const securityPageApi = (params: {}, noLoading: boolean) => { + return http.post(BASEURL + `/xmgl/xzSecurityQualityInspectionRecord/page`, params, { headers: { noLoading: noLoading } }); }; //获取应急记录信息API -export const emergencyPageApi = (params: {}, showLoading: boolean) => { - return http.get(BASEURL + `/xmgl/xzEmergencyRecord/page`, params, { headers: { noLoading: showLoading } }); +export const emergencyPageApi = (params: {}, noLoading: boolean) => { + // return http.get(BASEURL + `/xmgl/xzEmergencyRecord/page`, params, { headers: { noLoading: noLoading } }); + return http.get(BASEURL + `/xmgl/agjtLiveScreen/getXzEmergencyRecordPage`, params, { headers: { noLoading: noLoading } }); }; -//获取应急记录信息API -export const getStatBySpecialApi = (params: {}, showLoading: boolean) => { - return http.get(BASEURL + `/xmgl/xzFlow/getStatBySpecial`, params, { headers: { noLoading: showLoading } }); +//特殊作业数据信息API +export const getStatBySpecialApi = (params: {}, noLoading: boolean) => { + // return http.get(BASEURL + `/xmgl/xzFlow/getStatBySpecial`, params, { headers: { noLoading: noLoading } }); + return http.post(BASEURL + `/xmgl/xzSpecial/countSpecialByFinalStatus`, params, { headers: { noLoading: noLoading } }); }; diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts index f6ec076..2f4fdda 100644 --- a/src/routers/modules/staticRouter.ts +++ b/src/routers/modules/staticRouter.ts @@ -311,7 +311,7 @@ export const staticRouter: RouteRecordRaw[] = [ ], meta: { // title: "数字化项目监管平台" - title: "智慧工厂安全生产监管平台" //指挥部大屏 + title: "智慧工厂安全生产监管平台" //鞍钢项目 } } diff --git a/src/views/agjtLiveScreen/indexLive.vue b/src/views/agjtLiveScreen/indexLive.vue index 34de72b..5c25b37 100644 --- a/src/views/agjtLiveScreen/indexLive.vue +++ b/src/views/agjtLiveScreen/indexLive.vue @@ -5,10 +5,10 @@
-

{{cbsProjectInfo.projectBuildArea || '现场大屏'}}

+

{{cbsProjectInfo ? cbsProjectInfo.regionName : '现场大屏'}}
-
数字化项目监管平台
+
智慧工厂安全生产监管平台
{{ nowTime }}
@@ -51,6 +51,7 @@ import { COMPANY } from "@/config/config"; import { getEnterpriseIdApi, getEnterpriseInfoByIdApi, + getRegionNameApi, } from "@/api/modules/agjtLiveApi"; const BASEURL = import.meta.env.VITE_API_URL; const store = GlobalStore(); @@ -89,24 +90,11 @@ const navigateTo = (path, type) => { }; const cbsProjectInfo = ref({} as any) async function getCbsProjectInfo() { - console.log("BASEURL===>",BASEURL) - //获取企业Id - await getEnterpriseIdApi().then(res => { + getRegionNameApi({},true).then(res => { if(res.success){ - let data = { - enterpriseId: res.result.id, - projectSn: '', - } - if(BASEURL == 'http://182.90.224.237:51234' || BASEURL == 'http://192.168.34.221:9111') data.projectSn = 'BD3137498CB84BF0969979E0342CDBCA' - if(BASEURL == 'http://42.180.188.17:9809' || BASEURL == 'http://42.180.188.17:11211') data.projectSn = '471568F45EB247A3912A0D10EA1BFCEB' - getEnterpriseInfoByIdApi(data).then(res2 => { - cbsProjectInfo.value = res2.result.projectEnterprise - console.log(22222222222222222222222222) - console.log(res2) - console.log(22222222222222222222222222) - }) + cbsProjectInfo.value = res.result } - }); + }) }; onMounted(async () => { await getCbsProjectInfo() diff --git a/src/views/agjtLiveScreen/liveScreen/centerBottomLeft.vue b/src/views/agjtLiveScreen/liveScreen/centerBottomLeft.vue index e5f94a3..a592c8f 100644 --- a/src/views/agjtLiveScreen/liveScreen/centerBottomLeft.vue +++ b/src/views/agjtLiveScreen/liveScreen/centerBottomLeft.vue @@ -16,7 +16,44 @@
-
+
+
+
+ +
+
+
{{i + 1}}
+
{{item.name}}
+
+
{{item.attendancePersonTotal}}/{{item.totalPerson}}
+
+ +
+
+
+ +
+
+
+
{{i + 1}}
+
{{item.name}}
+
+
{{item.attendancePersonTotal}}/{{item.totalPerson}}
+
+
+ +
+
+ +

暂无数据

@@ -42,6 +79,7 @@ import { ref, watch, onMounted } from "vue"; import { getStageOption } from "@/api/modules/projectOverview"; import { GlobalStore } from "@/stores"; import { COMPANY } from "@/config/config"; +import { Vue3SeamlessScroll } from "vue3-seamless-scroll"; //引入现场大屏API import { getEnterpriseIdApi, @@ -55,33 +93,28 @@ const BASEURL = import.meta.env.VITE_API_URL const lwInfo1 = ref({} as any) const lwInfo2 = ref({} as any) async function getLwInfo() { - //获取企业Id - await getEnterpriseIdApi().then(res => { - let data = { - projectSn: '', - } - if(BASEURL == 'http://182.90.224.237:51234' || BASEURL == 'http://192.168.34.221:9111') data.projectSn = 'BD3137498CB84BF0969979E0342CDBCA' - if(BASEURL == 'http://42.180.188.17:9809' || BASEURL == 'http://42.180.188.17:11211') data.projectSn = '471568F45EB247A3912A0D10EA1BFCEB' - selectPersonTypeAndEduStatisticsApi({ - enterpriseId: res.result.id, - projectSn: data.projectSn, - }).then(res1 => { - if(res1.success){ - if(res1.result){ - lwInfo1.value = res1.result.personType - } - } - }) + // let data = { + // projectSn: store.sn, + // } + // selectPersonTypeAndEduStatisticsApi({ + // projectSn: data.projectSn, + // },true).then(res1 => { + // if(res1.success){ + // if(res1.result){ + // lwInfo1.value = res1.result.personType + // } + // } + // }) selectWorkerTeamAndDepartmentStatisticsApi({ - projectSn: data.projectSn, - }).then(res2 => { + projectSn: store.sn, + },true).then(res2 => { if(res2.success){ if(res2.result){ lwInfo2.value = res2.result } } }) - }); + // }); }; //父组件调用需要无感刷新的方法 @@ -101,6 +134,11 @@ onMounted( async () => {