diff --git a/.env.development b/.env.development index e882d6a..647f3c7 100644 --- a/.env.development +++ b/.env.development @@ -11,9 +11,9 @@ VITE_APP_ENV = 'development' # 李陈杰 209 # VITE_APP_BASE_API = 'http://192.168.110.209:8899' # 曾涛 -# VITE_APP_BASE_API = 'http://192.168.110.149:8899' +VITE_APP_BASE_API = 'http://192.168.110.209:8899' # 罗成 -VITE_APP_BASE_API = 'http://192.168.110.149:8899' +# VITE_APP_BASE_API = 'http://192.168.110.209:8899' # 朱银 # VITE_APP_BASE_API = 'http://192.168.110.149:8899' #曾涛 diff --git a/src/views/enterpriseLarge/digitalizationScreen/components/leftPage.vue b/src/views/enterpriseLarge/digitalizationScreen/components/leftPage.vue index 1eb2b48..6264c41 100644 --- a/src/views/enterpriseLarge/digitalizationScreen/components/leftPage.vue +++ b/src/views/enterpriseLarge/digitalizationScreen/components/leftPage.vue @@ -205,7 +205,9 @@ const getProjectAttendanceCount = async () => { try { const res = await allAttendanceCount(); const { data, code } = res; - if (code === 0 && data) { + if (code === 200) { + console.log(data, 222222222); + // 直接使用接口返回的数据 attendanceCount.value = data.attendanceCount || 0; attendanceRate.value = data.attendanceRate || 0; diff --git a/src/views/enterpriseLarge/digitalizationScreen/components/optionList.ts b/src/views/enterpriseLarge/digitalizationScreen/components/optionList.ts index 95c05d1..e05f29e 100644 --- a/src/views/enterpriseLarge/digitalizationScreen/components/optionList.ts +++ b/src/views/enterpriseLarge/digitalizationScreen/components/optionList.ts @@ -90,7 +90,7 @@ export let barOption = { trigger: 'axis', // formatter: '{b0}:{c0}万元', formatter: (params: any) => { - console.log(params); + // console.log(params); const projectName = params[0].name; // params 是数组,对应每条柱子 // return params.map((p: any) => `${p.name}
${p.seriesName}:${Number(p.value).toFixed(2)} MW`).join('
'); diff --git a/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue b/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue index 02c597b..cd73184 100644 --- a/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue +++ b/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue @@ -155,7 +155,7 @@ const initPieChart = () => { const getOutputData = async () => { const res = await outpuProgress(); if (res.code == 200) { - designAreaData.value = res.data.map((item: any) => Number(item.plannedCapacity * item.progressPercentage)); + designAreaData.value = res.data.map((item: any) => Number((item.plannedCapacity * item.progressPercentage) / 100)); transferAreaData.value = res.data.map((item: any) => Number(item.plannedCapacity)); barNames.value = res.data.map((item: any) => item.projectName); initLineChart();