From c6c84b7f4f28db15caa6f1d523a55e2a0f30e3fc Mon Sep 17 00:00:00 2001 From: Vce Date: Thu, 20 Jun 2024 00:36:07 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E7=8E=B0=E5=9C=BA=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E6=89=80=E6=9C=89=E6=8E=A5=E5=8F=A3=E6=9A=82=E6=97=B6=E5=86=99?= =?UTF-8?q?=E6=AD=BBprojectSn=EF=BC=8C=E9=83=A8=E7=BD=B2=E6=97=B6=E9=9C=80?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=8E=AF=E5=A2=83=E6=9D=A5=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E7=9B=B8=E5=BA=94=E7=9A=84projectSn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agjtLiveScreen/liveScreen/centerBottomLeft.vue | 6 ++++-- .../agjtLiveScreen/liveScreen/centerBottomRight.vue | 3 ++- src/views/agjtLiveScreen/liveScreen/centerTop.vue | 4 +++- src/views/agjtLiveScreen/liveScreen/index.vue | 13 +++++++------ src/views/agjtLiveScreen/liveScreen/leftBottom.vue | 3 ++- src/views/agjtLiveScreen/liveScreen/leftCenter.vue | 3 ++- src/views/agjtLiveScreen/liveScreen/leftTop.vue | 5 +++-- src/views/agjtLiveScreen/liveScreen/rightBottom.vue | 3 ++- src/views/agjtLiveScreen/liveScreen/rightTop.vue | 3 ++- 9 files changed, 27 insertions(+), 16 deletions(-) diff --git a/src/views/agjtLiveScreen/liveScreen/centerBottomLeft.vue b/src/views/agjtLiveScreen/liveScreen/centerBottomLeft.vue index 1a8ae94..b214661 100644 --- a/src/views/agjtLiveScreen/liveScreen/centerBottomLeft.vue +++ b/src/views/agjtLiveScreen/liveScreen/centerBottomLeft.vue @@ -60,7 +60,8 @@ async function getLwInfo() { selectPersonTypeAndEduStatisticsApi({ enterpriseId: res.result.id, // projectSn: store.sn, - projectSn: 'BD3137498CB84BF0969979E0342CDBCA' // yh001---ProjectSn + projectSn: 'BD3137498CB84BF0969979E0342CDBCA', // yh001 + // projectSn: '471568F45EB247A3912A0D10EA1BFCEB', // agjt正式环境&&agjt测试环境---共用的 }).then(res1 => { if(res1.success){ if(res1.result){ @@ -70,7 +71,8 @@ async function getLwInfo() { }) selectWorkerTeamAndDepartmentStatisticsApi({ // projectSn: store.sn, - projectSn: 'BD3137498CB84BF0969979E0342CDBCA' // yh001---ProjectSn + projectSn: 'BD3137498CB84BF0969979E0342CDBCA', // yh001 + // projectSn: '471568F45EB247A3912A0D10EA1BFCEB', // agjt正式环境&&agjt测试环境---共用的 }).then(res2 => { if(res2.success){ if(res2.result){ diff --git a/src/views/agjtLiveScreen/liveScreen/centerBottomRight.vue b/src/views/agjtLiveScreen/liveScreen/centerBottomRight.vue index ba9686d..ed4bc54 100644 --- a/src/views/agjtLiveScreen/liveScreen/centerBottomRight.vue +++ b/src/views/agjtLiveScreen/liveScreen/centerBottomRight.vue @@ -54,7 +54,8 @@ async function getQualityData() { status: 60, // enterpriseId: res.result.id, // projectSn: store.sn, - projectSn: 'BD3137498CB84BF0969979E0342CDBCA', // yh001---ProjectSn + projectSn: 'BD3137498CB84BF0969979E0342CDBCA', // yh001 + // projectSn: '471568F45EB247A3912A0D10EA1BFCEB', // agjt正式环境&&agjt测试环境---共用的 }).then(res2 => { if(res2.success){ qualityData.value = res2.result.page.records diff --git a/src/views/agjtLiveScreen/liveScreen/centerTop.vue b/src/views/agjtLiveScreen/liveScreen/centerTop.vue index 024b745..8fa171e 100644 --- a/src/views/agjtLiveScreen/liveScreen/centerTop.vue +++ b/src/views/agjtLiveScreen/liveScreen/centerTop.vue @@ -81,7 +81,9 @@ const updateConfig = () => { const configWeekVideoListFn = async (showLoading: boolean) => { const res: any = await configWeekVideoListApi( { - projectSn: store.sn, + // projectSn: store.sn, + projectSn: 'BD3137498CB84BF0969979E0342CDBCA', // yh001 + // projectSn: '471568F45EB247A3912A0D10EA1BFCEB', // agjt正式环境&&agjt测试环境---共用的 type: 3 }, showLoading diff --git a/src/views/agjtLiveScreen/liveScreen/index.vue b/src/views/agjtLiveScreen/liveScreen/index.vue index ebfaa36..2eb932f 100644 --- a/src/views/agjtLiveScreen/liveScreen/index.vue +++ b/src/views/agjtLiveScreen/liveScreen/index.vue @@ -47,10 +47,10 @@ const statisticsCount = ref(null as any); const projectData = ref(null as any); //获取项目信息 -const getProjectInfo = async (showLoading: boolean) => { - const res = await getProjectDetail({ projectSn: store.sn },showLoading); - projectData.value = res.result; -}; +// const getProjectInfo = async (showLoading: boolean) => { +// const res = await getProjectDetail({ projectSn: store.sn },showLoading); +// projectData.value = res.result; +// }; //获取项目剩余天数信息 const remainDays = ref('0' as any) @@ -61,8 +61,9 @@ async function countTaskProgress() { // console.log("获取企业id",res.result.id) countTaskProgressApi({ enterpriseId: res.result.id, - // projectSn: store.sn - projectSn: 'BD3137498CB84BF0969979E0342CDBCA' // yh001---ProjectSn + // projectSn: store.sn, + projectSn: 'BD3137498CB84BF0969979E0342CDBCA', // yh001 + // projectSn: '471568F45EB247A3912A0D10EA1BFCEB', // agjt正式环境&&agjt测试环境---共用的 }).then(res2 => { remainDays.value = res2.result.projectSurplusDayNum.toString() }) diff --git a/src/views/agjtLiveScreen/liveScreen/leftBottom.vue b/src/views/agjtLiveScreen/liveScreen/leftBottom.vue index f3c88f6..681a388 100644 --- a/src/views/agjtLiveScreen/liveScreen/leftBottom.vue +++ b/src/views/agjtLiveScreen/liveScreen/leftBottom.vue @@ -40,7 +40,8 @@ const outPie = ref([ async function getSpecialInfo() { await getStatBySpecialApi({ // projectSn: store.sn, - projectSn: 'BD3137498CB84BF0969979E0342CDBCA', // yh001---ProjectSn + projectSn: 'BD3137498CB84BF0969979E0342CDBCA', // yh001 + // projectSn: '471568F45EB247A3912A0D10EA1BFCEB', // agjt正式环境&&agjt测试环境---共用的 }).then(res => { if(res.success){ if(res.result){ diff --git a/src/views/agjtLiveScreen/liveScreen/leftCenter.vue b/src/views/agjtLiveScreen/liveScreen/leftCenter.vue index e9662ac..d6f430d 100644 --- a/src/views/agjtLiveScreen/liveScreen/leftCenter.vue +++ b/src/views/agjtLiveScreen/liveScreen/leftCenter.vue @@ -46,7 +46,8 @@ async function getAlarmInfo() { enterpriseId: res.result.id, isPushed: 1, // projectSn: store.sn, - projectSn: 'BD3137498CB84BF0969979E0342CDBCA' // yh001---ProjectSn + projectSn: 'BD3137498CB84BF0969979E0342CDBCA', // yh001 + // projectSn: '471568F45EB247A3912A0D10EA1BFCEB', // agjt正式环境&&agjt测试环境---共用的 }).then(res2 => { if(res2.success){ if(res2.result.records && res2.result.records.length !== 0){ diff --git a/src/views/agjtLiveScreen/liveScreen/leftTop.vue b/src/views/agjtLiveScreen/liveScreen/leftTop.vue index eadc59b..142c4a7 100644 --- a/src/views/agjtLiveScreen/liveScreen/leftTop.vue +++ b/src/views/agjtLiveScreen/liveScreen/leftTop.vue @@ -56,8 +56,9 @@ async function getCbsProjectInfo() { // console.log("获取企业id",res.result.id) getEnterpriseInfoByIdApi({ enterpriseId: res.result.id, - // projectSn: store.sn - projectSn: 'BD3137498CB84BF0969979E0342CDBCA' // yh001---ProjectSn + // projectSn: store.sn, + projectSn: 'BD3137498CB84BF0969979E0342CDBCA', // yh001 + // projectSn: '471568F45EB247A3912A0D10EA1BFCEB', // agjt正式环境&&agjt测试环境---共用的 }).then(res2 => { cbsProjectInfo.value = res2.result.projectEnterprise }) diff --git a/src/views/agjtLiveScreen/liveScreen/rightBottom.vue b/src/views/agjtLiveScreen/liveScreen/rightBottom.vue index 55957d6..09af74e 100644 --- a/src/views/agjtLiveScreen/liveScreen/rightBottom.vue +++ b/src/views/agjtLiveScreen/liveScreen/rightBottom.vue @@ -60,7 +60,8 @@ async function getSecurityData() { pageSize: 9999, status: 60, // projectSn: store.sn, - projectSn: 'BD3137498CB84BF0969979E0342CDBCA', // yh001---ProjectSn + projectSn: 'BD3137498CB84BF0969979E0342CDBCA', // yh001 + // projectSn: '471568F45EB247A3912A0D10EA1BFCEB', // agjt正式环境&&agjt测试环境---共用的 }).then(res => { if(res.success){ securityData.value = res.result.page.records diff --git a/src/views/agjtLiveScreen/liveScreen/rightTop.vue b/src/views/agjtLiveScreen/liveScreen/rightTop.vue index 13a5109..3900ec1 100644 --- a/src/views/agjtLiveScreen/liveScreen/rightTop.vue +++ b/src/views/agjtLiveScreen/liveScreen/rightTop.vue @@ -60,7 +60,8 @@ async function getEmergencyDataData() { pageSize: 9999, // inDispositionStatus: '', // 数据类型：字符串，1：待救援、2：救援中、3：已救援 // projectSn: store.sn, - projectSn: 'BD3137498CB84BF0969979E0342CDBCA', // yh001---ProjectSn + projectSn: 'BD3137498CB84BF0969979E0342CDBCA', // yh001 + // projectSn: '471568F45EB247A3912A0D10EA1BFCEB', // agjt正式环境&&agjt测试环境---共用的 }).then(res => { if(res.success){ emergencyData.value = res.result.records