From cb98b23f4596c733d859ac8112c7cda5b0f0ba5a Mon Sep 17 00:00:00 2001 From: Vce Date: Thu, 20 Jun 2024 10:06:08 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=88=A4=E6=96=AD=E7=8E=B0=E5=9C=BA?= =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E9=9B=84=E6=9C=AC=E5=9C=B0=E4=B8=8E=E9=9E=8D?= =?UTF-8?q?=E9=92=A2=E6=AD=A3=E5=BC=8F=E5=92=8C=E6=B5=8B=E8=AF=95=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E7=9A=84=E9=A1=B9=E7=9B=AESn=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../liveScreen/centerBottomLeft.vue | 15 ++++++----- .../liveScreen/centerBottomRight.vue | 27 ++++++++----------- .../agjtLiveScreen/liveScreen/centerTop.vue | 19 +++++++------ src/views/agjtLiveScreen/liveScreen/index.vue | 15 ++++++----- .../agjtLiveScreen/liveScreen/leftBottom.vue | 12 +++++---- .../agjtLiveScreen/liveScreen/leftCenter.vue | 13 ++++----- .../agjtLiveScreen/liveScreen/leftTop.vue | 16 ++++++----- .../agjtLiveScreen/liveScreen/rightBottom.vue | 12 +++++---- .../agjtLiveScreen/liveScreen/rightTop.vue | 12 ++++++--- 9 files changed, 74 insertions(+), 67 deletions(-) diff --git a/src/views/agjtLiveScreen/liveScreen/centerBottomLeft.vue b/src/views/agjtLiveScreen/liveScreen/centerBottomLeft.vue index b214661..e44a386 100644 --- a/src/views/agjtLiveScreen/liveScreen/centerBottomLeft.vue +++ b/src/views/agjtLiveScreen/liveScreen/centerBottomLeft.vue @@ -49,6 +49,7 @@ import { selectWorkerTeamAndDepartmentStatisticsApi, } from "@/api/modules/agjtLiveApi"; const store = GlobalStore(); +const BASEURL = import.meta.env.VITE_API_URL //获取劳务实名制信息 const lwInfo1 = ref({} as any) @@ -56,12 +57,14 @@ const lwInfo2 = ref({} as any) async function getLwInfo() { //获取企业Id await getEnterpriseIdApi().then(res => { - // console.log("获取企业id",res.result.id) + 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: store.sn, - projectSn: 'BD3137498CB84BF0969979E0342CDBCA', // yh001 - // projectSn: '471568F45EB247A3912A0D10EA1BFCEB', // agjt正式环境&&agjt测试环境---共用的 + projectSn: data.projectSn, }).then(res1 => { if(res1.success){ if(res1.result){ @@ -70,9 +73,7 @@ async function getLwInfo() { } }) selectWorkerTeamAndDepartmentStatisticsApi({ - // projectSn: store.sn, - projectSn: 'BD3137498CB84BF0969979E0342CDBCA', // yh001 - // projectSn: '471568F45EB247A3912A0D10EA1BFCEB', // agjt正式环境&&agjt测试环境---共用的 + projectSn: data.projectSn, }).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 ed4bc54..4682078 100644 --- a/src/views/agjtLiveScreen/liveScreen/centerBottomRight.vue +++ b/src/views/agjtLiveScreen/liveScreen/centerBottomRight.vue @@ -40,27 +40,22 @@ import { qualityPageApi, } from "@/api/modules/agjtLiveApi"; const store = GlobalStore(); +const BASEURL = import.meta.env.VITE_API_URL //获取质量待办信息 const qualityData = ref([] as any) async function getQualityData() { - - //获取企业Id - await getEnterpriseIdApi().then(res => { + let data = { + page: 1, + pageSize: 9999, + status: 60, + 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' + qualityPageApi(data).then(res => { if(res.success){ - qualityPageApi({ - page: 1, - pageSize: 9999, - status: 60, - // enterpriseId: res.result.id, - // projectSn: store.sn, - projectSn: 'BD3137498CB84BF0969979E0342CDBCA', // yh001 - // projectSn: '471568F45EB247A3912A0D10EA1BFCEB', // agjt正式环境&&agjt测试环境---共用的 - }).then(res2 => { - if(res2.success){ - qualityData.value = res2.result.page.records - } - }); + qualityData.value = res.result.page.records } }); }; diff --git a/src/views/agjtLiveScreen/liveScreen/centerTop.vue b/src/views/agjtLiveScreen/liveScreen/centerTop.vue index 8fa171e..fdea7f5 100644 --- a/src/views/agjtLiveScreen/liveScreen/centerTop.vue +++ b/src/views/agjtLiveScreen/liveScreen/centerTop.vue @@ -39,6 +39,7 @@ import setVideoDialog from "@/components/setVideoDialog.vue"; import { configWeekVideoListApi } from "@/api/modules/agjtLiveApi"; import moment from "moment"; const store = GlobalStore(); +const BASEURL = import.meta.env.VITE_API_URL const videoList = ref([] as any); // ts type Props = { @@ -67,7 +68,7 @@ watch( } ); -const BASEURL = import.meta.env.VITE_API_URL; +// const BASEURL = import.meta.env.VITE_API_URL; // 显示视频 // const showVideo = ref(1 as any); const showVideo = ref(2 as any); @@ -79,15 +80,13 @@ const updateConfig = () => { }; // 获取一周的配置视频数据 const configWeekVideoListFn = async (showLoading: boolean) => { - const res: any = await configWeekVideoListApi( - { - // projectSn: store.sn, - projectSn: 'BD3137498CB84BF0969979E0342CDBCA', // yh001 - // projectSn: '471568F45EB247A3912A0D10EA1BFCEB', // agjt正式环境&&agjt测试环境---共用的 - type: 3 - }, - showLoading - ); + let data = { + projectSn: '', + type: 3 + } + 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' + const res: any = await configWeekVideoListApi(data, showLoading); if (res.result) { // 星期参数 const today = moment().format("d"); diff --git a/src/views/agjtLiveScreen/liveScreen/index.vue b/src/views/agjtLiveScreen/liveScreen/index.vue index 2eb932f..e4f0570 100644 --- a/src/views/agjtLiveScreen/liveScreen/index.vue +++ b/src/views/agjtLiveScreen/liveScreen/index.vue @@ -43,6 +43,7 @@ import { countTaskProgressApi, } from "@/api/modules/agjtLiveApi"; const store = GlobalStore(); +const BASEURL = import.meta.env.VITE_API_URL const statisticsCount = ref(null as any); const projectData = ref(null as any); @@ -58,13 +59,13 @@ async function countTaskProgress() { //获取企业Id await getEnterpriseIdApi().then(res => { if(res.success){ - // console.log("获取企业id",res.result.id) - countTaskProgressApi({ - enterpriseId: res.result.id, - // projectSn: store.sn, - projectSn: 'BD3137498CB84BF0969979E0342CDBCA', // yh001 - // projectSn: '471568F45EB247A3912A0D10EA1BFCEB', // agjt正式环境&&agjt测试环境---共用的 - }).then(res2 => { + 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' + countTaskProgressApi(data).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 681a388..e34a56a 100644 --- a/src/views/agjtLiveScreen/liveScreen/leftBottom.vue +++ b/src/views/agjtLiveScreen/liveScreen/leftBottom.vue @@ -24,6 +24,7 @@ import { getStatBySpecialApi, } from "@/api/modules/agjtLiveApi"; const store = GlobalStore(); +const BASEURL = import.meta.env.VITE_API_URL const isShow = ref(false as any) @@ -38,11 +39,12 @@ const outPie = ref([ //获取特殊作业情况信息 async function getSpecialInfo() { - await getStatBySpecialApi({ - // projectSn: store.sn, - projectSn: 'BD3137498CB84BF0969979E0342CDBCA', // yh001 - // projectSn: '471568F45EB247A3912A0D10EA1BFCEB', // agjt正式环境&&agjt测试环境---共用的 - }).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' + await getStatBySpecialApi(data).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 d6f430d..ad207a6 100644 --- a/src/views/agjtLiveScreen/liveScreen/leftCenter.vue +++ b/src/views/agjtLiveScreen/liveScreen/leftCenter.vue @@ -29,6 +29,7 @@ import { selectAIPageListApi, } from "@/api/modules/agjtLiveApi"; const store = GlobalStore(); +const BASEURL = import.meta.env.VITE_API_URL //是否有数据 const isData = ref(false as any) @@ -39,16 +40,16 @@ async function getAlarmInfo() { //获取企业Id await getEnterpriseIdApi().then(res => { if(res.success){ - // console.log("获取企业id",res.result.id) - selectAIPageListApi({ + let data = { pageNo: 1, pageSize: 1, enterpriseId: res.result.id, isPushed: 1, - // projectSn: store.sn, - projectSn: 'BD3137498CB84BF0969979E0342CDBCA', // yh001 - // projectSn: '471568F45EB247A3912A0D10EA1BFCEB', // agjt正式环境&&agjt测试环境---共用的 - }).then(res2 => { + 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' + selectAIPageListApi(data).then(res2 => { if(res2.success){ if(res2.result.records && res2.result.records.length !== 0){ alarmInfo.value = res2.result.records[0] diff --git a/src/views/agjtLiveScreen/liveScreen/leftTop.vue b/src/views/agjtLiveScreen/liveScreen/leftTop.vue index 142c4a7..9cdb7b2 100644 --- a/src/views/agjtLiveScreen/liveScreen/leftTop.vue +++ b/src/views/agjtLiveScreen/liveScreen/leftTop.vue @@ -47,19 +47,21 @@ import { getEnterpriseInfoByIdApi, } from "@/api/modules/agjtLiveApi"; const store = GlobalStore(); +const BASEURL = import.meta.env.VITE_API_URL const cbsProjectInfo = ref({} as any) async function getCbsProjectInfo() { + console.log("BASEURL===>",BASEURL) //获取企业Id await getEnterpriseIdApi().then(res => { if(res.success){ - // console.log("获取企业id",res.result.id) - getEnterpriseInfoByIdApi({ - enterpriseId: res.result.id, - // projectSn: store.sn, - projectSn: 'BD3137498CB84BF0969979E0342CDBCA', // yh001 - // projectSn: '471568F45EB247A3912A0D10EA1BFCEB', // agjt正式环境&&agjt测试环境---共用的 - }).then(res2 => { + 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 }) } diff --git a/src/views/agjtLiveScreen/liveScreen/rightBottom.vue b/src/views/agjtLiveScreen/liveScreen/rightBottom.vue index 09af74e..e2e9d88 100644 --- a/src/views/agjtLiveScreen/liveScreen/rightBottom.vue +++ b/src/views/agjtLiveScreen/liveScreen/rightBottom.vue @@ -51,18 +51,20 @@ import { securityPageApi, } from "@/api/modules/agjtLiveApi"; const store = GlobalStore(); +const BASEURL = import.meta.env.VITE_API_URL //获取安全待办信息 const securityData = ref([] as any) async function getSecurityData() { - await securityPageApi({ + let data = { page: 1, pageSize: 9999, status: 60, - // projectSn: store.sn, - projectSn: 'BD3137498CB84BF0969979E0342CDBCA', // yh001 - // projectSn: '471568F45EB247A3912A0D10EA1BFCEB', // agjt正式环境&&agjt测试环境---共用的 - }).then(res => { + 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' + await securityPageApi(data).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 3900ec1..b3efc86 100644 --- a/src/views/agjtLiveScreen/liveScreen/rightTop.vue +++ b/src/views/agjtLiveScreen/liveScreen/rightTop.vue @@ -51,17 +51,21 @@ import { emergencyPageApi } from "@/api/modules/agjtLiveApi"; const store = GlobalStore(); +const BASEURL = import.meta.env.VITE_API_URL //获取应急记录信息 const emergencyData = ref([] as any) async function getEmergencyDataData() { - await emergencyPageApi({ + let data = { page: 1, pageSize: 9999, // inDispositionStatus: '', // 数据类型：字符串，1：待救援、2：救援中、3：已救援 - // projectSn: store.sn, - projectSn: 'BD3137498CB84BF0969979E0342CDBCA', // yh001 - // projectSn: '471568F45EB247A3912A0D10EA1BFCEB', // agjt正式环境&&agjt测试环境---共用的 + 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' + await emergencyPageApi({ + }).then(res => { if(res.success){ emergencyData.value = res.result.records