整合框架，功率预测，发电能力分析，报表项目合并；开发黑色版本与白色版本

components.d.ts

@@ -40,13 +40,11 @@ declare module 'vue' {
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
-    ElSpace: typeof import('element-plus/es')['ElSpace']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     ElTabPane: typeof import('element-plus/es')['ElTabPane']
     ElTabs: typeof import('element-plus/es')['ElTabs']
-    ElText: typeof import('element-plus/es')['ElText']
     ElTimeSelect: typeof import('element-plus/es')['ElTimeSelect']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']

src/App.vue

@@ -158,12 +158,15 @@
                 }
                 this.$emit('swichFn', this.switchTheme)
             }
-            if (this.$route.path.indexOf('powerPrediction') > -1) {
-                this.showMenuData = this.powerPreDatas
-            } else if (this.$route.path.indexOf('intelligentReport') > -1) {
-                this.showMenuData = this.intelligentReportDatas
-            } else if (this.$route.path.indexOf('generatingCap') > -1) {
-                this.showMenuData = this.generatingCapDatas
+            if (window.sessionStorage.getItem('headerRoute')) {
+                let str = window.sessionStorage.getItem('headerRoute')
+                if (str.indexOf('powerPrediction') > -1) {
+                    this.showMenuData = this.powerPreDatas
+                } else if (str.indexOf('intelligentReport') > -1) {
+                    this.showMenuData = this.intelligentReportDatas
+                } else if (str.indexOf('generatingCap') > -1) {
+                    this.showMenuData = this.generatingCapDatas
+                }
             }
         },
         methods: {

src/api/api.js

@@ -1,10 +1,10 @@
 // 导入axios实例
 import httpRequest from '@/utils/request.js'
-httpRequest.defaults.baseURL = process.env.VUE_APP_BASE_URL;
 
 // 导出数据接口
 export function apiGetExportMsg(url, params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: url,
         method: 'get',
         responseType: 'blob',
@@ -14,6 +14,7 @@ export function apiGetExportMsg(url, params) {
 // 导出模版接口
 export function apiGetModel(url, params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: url,
         method: 'get',
         params: params
@@ -25,6 +26,7 @@ export function apiGetModel(url, params) {
 // 获取验证码
 export function apiGetUserInfo() {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'captchaImage',
         method: 'get'
     })
@@ -32,6 +34,7 @@ export function apiGetUserInfo() {
 // 登录接口
 export function toLoginApi(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'toLogin',
         method: 'post',
         params: params
@@ -40,6 +43,7 @@ export function toLoginApi(params) {
 // 天气Api接口
 export function apiGetWeather(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/wfc/getWeatherForecastDataOne',
         method: 'get',
         params: params
@@ -49,6 +53,7 @@ export function apiGetWeather(params) {
 //----------------------------------------头部接口------------------------------------------------
 export function apiGetpersonalInformation(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/uic/personalInformation',
         method: 'post',
         params: params
@@ -60,6 +65,7 @@ export function apiGetpersonalInformation(params) {
 // 获取场站信息
 export function apiGetStation() {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/share/getStationsAll',
         method: 'get'
     })
@@ -67,6 +73,7 @@ export function apiGetStation() {
 // 获取场站信息 ----- 功率
 export function apiGetStationGL() {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/share/getGlStationsAll',
         method: 'get'
     })
@@ -74,6 +81,7 @@ export function apiGetStationGL() {
 // 获取场站信息 ----- 电量
 export function apiGetStationDL() {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/share/getDlStationsAll',
         method: 'get'
     })
@@ -81,6 +89,7 @@ export function apiGetStationDL() {
 // 获取今日功率预测
 export function apiGetPowerPrediction() {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/sc/todayPowerForecast',
         method: 'get'
     })
@@ -88,6 +97,7 @@ export function apiGetPowerPrediction() {
 // 获取今日风速预测
 export function apiGetWindSpeed() {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/sc/todayWindSpeedForecast',
         method: 'get'
     })
@@ -95,6 +105,7 @@ export function apiGetWindSpeed() {
 // 获取今日辐照度预测
 export function apiGetirradianceForecast() {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/sc/todayIrradianceForecast',
         method: 'get'
     })
@@ -102,6 +113,7 @@ export function apiGetirradianceForecast() {
 //装机，并网，实时，可用电量
 export function apiGetCapacity() {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/sc/installedCapacity',
         method: 'get'
     })
@@ -109,6 +121,7 @@ export function apiGetCapacity() {
 //预测考核分数
 export function apiGetAssessmentScore(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/sc/predictedAssessmentScores',
         method: 'get',
         params: params
@@ -117,6 +130,7 @@ export function apiGetAssessmentScore(params) {
 //全域功率预测echarts
 export function apiGetglobalPowerCharts(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/sc/globalPowerPredictionChartData',
         method: 'get',
         params: params
@@ -125,6 +139,7 @@ export function apiGetglobalPowerCharts(params) {
 //全域功率预测table
 export function apiGetglobalPowerTable(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/sc/globalPowerPredictionTableData',
         method: 'get',
         params: params
@@ -133,6 +148,7 @@ export function apiGetglobalPowerTable(params) {
 //全域风速预测echarts
 export function apiGetglobalWindSpeedCharts(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/sc/globalWindSpeedForecastChartData',
         method: 'get',
         params: params
@@ -141,6 +157,7 @@ export function apiGetglobalWindSpeedCharts(params) {
 //全域辐照度预测echarts
 export function apiGetglobalIrradianceCharts(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/sc/globalIrradianceForecastChartData',
         method: 'get',
         params: params
@@ -149,6 +166,7 @@ export function apiGetglobalIrradianceCharts(params) {
 //全域风速预测table
 export function apiGetglobalWindSpeedTable(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/sc/globalWindSpeedForecastTableData',
         method: 'get',
         params: params
@@ -157,6 +175,7 @@ export function apiGetglobalWindSpeedTable(params) {
 //全域辐照度预测table
 export function apiGetglobalIrradianceTable(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/sc/globalIrradianceForecastTableData',
         method: 'get',
         params: params
@@ -165,6 +184,7 @@ export function apiGetglobalIrradianceTable(params) {
 //预警服务
 export function apiGetEarlyWarningInfo(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/share/getEarlyWarningInfo',
         method: 'get',
         params: params
@@ -173,6 +193,7 @@ export function apiGetEarlyWarningInfo(params) {
 //获取所有场站天气
 export function apiGetallWeatherInfo(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/wfc/getWeatherForecastAllTerminalData',
         method: 'get',
         params: params
@@ -181,6 +202,7 @@ export function apiGetallWeatherInfo(params) {
 //获取所有场站天气
 export function apiGetStatusInfoAll(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: '/predict/api/share/getUnitStatusInfoAll',
         method: 'get',
         params: params
@@ -191,6 +213,7 @@ export function apiGetStatusInfoAll(params) {
 //全景功率页面echarts
 export function apiGetpanoramicPowerCharts() {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/ppc/panoramicPower',
         method: 'get'
     })
@@ -200,6 +223,7 @@ export function apiGetpanoramicPowerCharts() {
 //装机，并网，实时，可用电量
 export function apiGetinstalledCapacity(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/ppc/installedCapacity',
         method: 'get',
         params: params
@@ -208,6 +232,7 @@ export function apiGetinstalledCapacity(params) {
 //装机，并网，实时，可用电量
 export function apiGetpredictedAssessmentScores(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/ppc/predictedAssessmentScores',
         method: 'get',
         params: params
@@ -216,6 +241,7 @@ export function apiGetpredictedAssessmentScores(params) {
 //仪表盘，玫瑰图
 export function apiGetmeteorologicalElements(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/ppc/meteorologicalElements',
         method: 'get',
         params: params
@@ -223,6 +249,7 @@ export function apiGetmeteorologicalElements(params) {
 }
 export function apiGetwindRosetteChart(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/ppc/windRosetteChart',
         method: 'get',
         params: params
@@ -230,6 +257,7 @@ export function apiGetwindRosetteChart(params) {
 }
 export function apiGetUnitStatusInfoByStationNo(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/share/getUnitStatusInfoByStationNo',
         method: 'get',
         params: params
@@ -239,6 +267,7 @@ export function apiGetUnitStatusInfoByStationNo(params) {
 //----------------------------------------电量预测页接口------------------------------------------------
 export function apiGetdailyPowerGenerationForecast(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/efc/dailyPowerGenerationForecast',
         method: 'get',
         params: params
@@ -246,6 +275,7 @@ export function apiGetdailyPowerGenerationForecast(params) {
 }
 export function apiGetmonthlyDailyPowerGenerationForecast(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/efc/monthlyDailyPowerGenerationForecast',
         method: 'get',
         params: params
@@ -253,6 +283,7 @@ export function apiGetmonthlyDailyPowerGenerationForecast(params) {
 }
 export function apiGetannualMonthlyElectricityGenerationForecast(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/efc/annualMonthlyElectricityGenerationForecast',
         method: 'get',
         params: params
@@ -260,6 +291,7 @@ export function apiGetannualMonthlyElectricityGenerationForecast(params) {
 }
 export function apiGettodayPowerGenerationForecast(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/efc/todayPowerGenerationForecast',
         method: 'get',
         params: params
@@ -267,6 +299,7 @@ export function apiGettodayPowerGenerationForecast(params) {
 }
 export function apiGetdailyPowerComparisonChartData(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/efc/dailyPowerGenerationForecastComparisonChartData',
         method: 'get',
         params: params
@@ -274,6 +307,7 @@ export function apiGetdailyPowerComparisonChartData(params) {
 }
 export function apiGetdailyPowerComparisonTableData(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/efc/dailyPowerGenerationForecastComparisonTableData',
         method: 'get',
         params: params
@@ -281,6 +315,7 @@ export function apiGetdailyPowerComparisonTableData(params) {
 }
 export function apiGetmonthlyDailyPowerComparisonChartData(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/efc/monthlyDailyPowerGenerationForecastComparisonChartData',
         method: 'get',
         params: params
@@ -288,6 +323,7 @@ export function apiGetmonthlyDailyPowerComparisonChartData(params) {
 }
 export function apiGetyearlyDailyPowerComparisonChartData(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/efc/annualMonthlyElectricityGenerationForecastComparisonChartData',
         method: 'get',
         params: params
@@ -295,6 +331,7 @@ export function apiGetyearlyDailyPowerComparisonChartData(params) {
 }
 export function apiGetmonthlyDailyPowerComparisonTableData(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/efc/monthlyDailyPowerGenerationForecastComparisonTableData',
         method: 'get',
         params: params
@@ -302,6 +339,7 @@ export function apiGetmonthlyDailyPowerComparisonTableData(params) {
 }
 export function apiGetyearlyDailyPowerComparisonTableData(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/efc/annualMonthlyElectricityGenerationForecastComparisonTableData',
         method: 'get',
         params: params
@@ -312,6 +350,7 @@ export function apiGetyearlyDailyPowerComparisonTableData(params) {
 //风机状态服务
 export function apiGetWturByStationNo(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/configureShare/getWturByStationNo',
         method: 'get',
         params: params
@@ -320,6 +359,7 @@ export function apiGetWturByStationNo(params) {
 //风场详情页概览服务
 export function apiGetterminalOverview(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/pmc/terminalOverview',
         method: 'get',
         params: params
@@ -328,6 +368,7 @@ export function apiGetterminalOverview(params) {
 //功率预测--期次服务
 export function apiGetpowerPredictionQc(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/pmc/powerPredictionQc',
         method: 'get',
         params: params
@@ -336,6 +377,7 @@ export function apiGetpowerPredictionQc(params) {
 //功率预测--集电线服务
 export function apiGetpowerPredictionJdx(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/pmc/powerPredictionJdx',
         method: 'get',
         params: params
@@ -344,6 +386,7 @@ export function apiGetpowerPredictionJdx(params) {
 //功率预测--风机服务
 export function apiGetpowerPredictionFj(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/pmc/powerPredictionFj',
         method: 'get',
         params: params
@@ -352,6 +395,7 @@ export function apiGetpowerPredictionFj(params) {
 //电量预测--期次服务
 export function apiGetelectricityForecastQc(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/pmc/electricityForecastQc',
         method: 'get',
         params: params
@@ -360,6 +404,7 @@ export function apiGetelectricityForecastQc(params) {
 //电量预测--集电线服务
 export function apiGetelectricityForecastJdx(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/pmc/electricityForecastJdx',
         method: 'get',
         params: params
@@ -368,6 +413,7 @@ export function apiGetelectricityForecastJdx(params) {
 //电量预测--风机服务
 export function apiGetelectricityForecastFj(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/pmc/electricityForecastFj',
         method: 'get',
         params: params
@@ -376,6 +422,7 @@ export function apiGetelectricityForecastFj(params) {
 //获取所有并网停机的风机
 export function apiGetcanCarriedOutDowntime(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/pmc/canCarriedOutDowntime',
         method: 'get',
         params: params
@@ -383,6 +430,7 @@ export function apiGetcanCarriedOutDowntime(params) {
 }
 export function apiGetWturByWindplantprojectNo(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/configureShare/getWturByWindplantprojectNo',
         method: 'get',
         params: params
@@ -390,6 +438,7 @@ export function apiGetWturByWindplantprojectNo(params) {
 }
 export function apiGetWturByCollectorwireprojectNo(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/configureShare/getWturByCollectorwireprojectNo',
         method: 'get',
         params: params
@@ -398,6 +447,7 @@ export function apiGetWturByCollectorwireprojectNo(params) {
 // 提交并网停机设置服务
 export function apiGetgridConnection(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/pmc/gridConnection',
         method: 'get',
         params: params
@@ -406,6 +456,7 @@ export function apiGetgridConnection(params) {
 // 提交停机设置服务
 export function apiGetshutdownSettings(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/pmc/shutdownSettings',
         method: 'get',
         params: params
@@ -416,6 +467,7 @@ export function apiGetshutdownSettings(params) {
 // 天气服务
 export function apiGetWeatherForecast(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/wfc/getWeatherForecastData',
         method: 'get',
         params: params
@@ -426,6 +478,7 @@ export function apiGetWeatherForecast(params) {
 // 月发电量及功率预测--曲线图
 export function apiGetmonthlyPower(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/ssc/monthlyPowerGenerationReport',
         method: 'get',
         params: params
@@ -434,6 +487,7 @@ export function apiGetmonthlyPower(params) {
 // 获取年发电量数据
 export function apiGetannualPower(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/ssc/annualPowerGenerationReport',
         method: 'get',
         params: params
@@ -444,6 +498,7 @@ export function apiGetannualPower(params) {
 // 获取注册区域信息列表
 export function apiGetgetRegistrationAreaList() {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/smhc/getRegistrationAreaList',
         method: 'post'
     })
@@ -451,6 +506,7 @@ export function apiGetgetRegistrationAreaList() {
 // 智慧配置
 export function apiGetwisdomConfiguration(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/smhc/wisdomConfiguration',
         method: 'post',
         params: params
@@ -459,6 +515,7 @@ export function apiGetwisdomConfiguration(params) {
 // 发电计划配置
 export function apiGetgenerationScheduleConfiguration(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/smhc/generationScheduleConfiguration',
         method: 'post',
         params: params
@@ -469,6 +526,7 @@ export function apiGetgenerationScheduleConfiguration(params) {
 // 获取区域信息配置数据
 export function apiGetAreaList(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/rmc/getAreaList',
         method: 'post',
         params: params
@@ -477,6 +535,7 @@ export function apiGetAreaList(params) {
 // 新增区域信息配置数据
 export function apiGetaddArea(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/rmc/addArea',
         method: 'post',
         params: params
@@ -485,6 +544,7 @@ export function apiGetaddArea(params) {
 // 修改区域信息配置数据
 export function apiGetupdateArea(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/rmc/updateArea',
         method: 'post',
         params: params
@@ -493,6 +553,7 @@ export function apiGetupdateArea(params) {
 // 删除区域信息配置数据
 export function apiGetdeleteArea(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/rmc/deleteArea',
         method: 'post',
         params: params
@@ -502,6 +563,7 @@ export function apiGetdeleteArea(params) {
 // 获取场站信息配置数据
 export function apiGetgetStationsList(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/smc/getStationsList',
         method: 'post',
         params: params
@@ -510,6 +572,7 @@ export function apiGetgetStationsList(params) {
 // 新增场站信息配置数据
 export function apiGetaddStations(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/smc/addStations',
         method: 'post',
         params: params
@@ -518,6 +581,7 @@ export function apiGetaddStations(params) {
 // 修改场站信息配置数据
 export function apiGetupdateStations(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/smc/updateStations',
         method: 'post',
         params: params
@@ -526,6 +590,7 @@ export function apiGetupdateStations(params) {
 // 删除场站信息配置数据
 export function apiGetdeleteStations(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/smc/deleteStations',
         method: 'post',
         params: params
@@ -534,6 +599,7 @@ export function apiGetdeleteStations(params) {
 // 获取场站类型数据
 export function apiGetgetEnumerateMenu(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/configureShare/getEnumerateMenu',
         method: 'get',
         params: params
@@ -542,6 +608,7 @@ export function apiGetgetEnumerateMenu(params) {
 // 获取风区类型数据
 export function apiGetgetAreaAll(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/configureShare/getAreaAll',
         method: 'get',
         params: params
@@ -551,6 +618,7 @@ export function apiGetgetAreaAll(params) {
 // 获取期次信息配置数据
 export function apiGetWindplantprojectList(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/smc/getWindplantprojectList',
         method: 'post',
         params: params
@@ -559,6 +627,7 @@ export function apiGetWindplantprojectList(params) {
 // 新增期次信息配置数据
 export function apiGetaddWindplantproject(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/smc/addWindplantproject',
         method: 'post',
         params: params
@@ -567,6 +636,7 @@ export function apiGetaddWindplantproject(params) {
 // 修改期次信息配置数据
 export function apiGetupdateWindplantproject(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/smc/updateWindplantproject',
         method: 'post',
         params: params
@@ -575,6 +645,7 @@ export function apiGetupdateWindplantproject(params) {
 // 删除期次信息配置数据
 export function apiGetdeleteWindplantproject(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/smc/deleteWindplantproject',
         method: 'post',
         params: params
@@ -583,6 +654,7 @@ export function apiGetdeleteWindplantproject(params) {
 // 根据风场获取期次数据
 export function apiGetWindplantprojectListByWindplantNo(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/configureShare/getWindplantprojectByStationNo',
         method: 'get',
         params: params
@@ -591,6 +663,7 @@ export function apiGetWindplantprojectListByWindplantNo(params) {
 // 获取风电场数据
 export function apiGetgetWindFarmAll(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/configureShare/getWindFarmAll',
         method: 'get',
         params: params
@@ -599,6 +672,7 @@ export function apiGetgetWindFarmAll(params) {
 // 校验遥测号是否唯一---------待定
 export function apiGetcheckWindplantprojectAnalogNoUnique(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/sc/checkWindplantprojectAnalogNoUnique',
         method: 'post',
         params: params
@@ -607,6 +681,7 @@ export function apiGetcheckWindplantprojectAnalogNoUnique(params) {
 // 校验期次编号是否唯一
 export function apiGetcheckProjectNoUnique(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/sc/checkProjectNoUnique',
         method: 'post',
         params: params
@@ -616,6 +691,7 @@ export function apiGetcheckProjectNoUnique(params) {
 // 获取集电线信息配置数据
 export function apiGetCollectorwireprojectList(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/smc/getCollectorwireprojectList',
         method: 'post',
         params: params
@@ -624,6 +700,7 @@ export function apiGetCollectorwireprojectList(params) {
 // 新增集电线信息配置数据
 export function apiGetaddCollectorwireproject(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/smc/addCollectorwireproject',
         method: 'post',
         params: params
@@ -632,6 +709,7 @@ export function apiGetaddCollectorwireproject(params) {
 // 修改集电线信息配置数据
 export function apiGetupdateCollectorwireproject(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/smc/updateCollectorwireproject',
         method: 'post',
         params: params
@@ -640,6 +718,7 @@ export function apiGetupdateCollectorwireproject(params) {
 // 删除集电线信息配置数据
 export function apiGetdeleteCollectorwireproject(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/smc/deleteCollectorwireproject',
         method: 'post',
         params: params
@@ -648,6 +727,7 @@ export function apiGetdeleteCollectorwireproject(params) {
 // 根据期次查询集电线
 export function apiGetCollectorwireprojectByProjectNo(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/configureShare/getCollectorwireprojectByProjectNo',
         method: 'get',
         params: params
@@ -656,6 +736,7 @@ export function apiGetCollectorwireprojectByProjectNo(params) {
 // 校验遥测号是否唯一---------待定
 export function apiGetcheckCollectorwireprojectAnalogNoUnique(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/sc/checkCollectorwireprojectAnalogNoUnique',
         method: 'get',
         params: params
@@ -665,6 +746,7 @@ export function apiGetcheckCollectorwireprojectAnalogNoUnique(params) {
 // 获取机组信息配置数据
 export function apiGetgetWturList(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/cmc/getWturList',
         method: 'post',
         params: params
@@ -673,6 +755,7 @@ export function apiGetgetWturList(params) {
 // 删除机组信息配置数据
 export function apiGetdeleteWtur(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/cmc/deleteWtur',
         method: 'post',
         params: params
@@ -681,6 +764,7 @@ export function apiGetdeleteWtur(params) {
 // 根据风区号选择场站
 export function apiGetgetStationsByAreaNo(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/configureShare/getGlStationsByAreaNo',
         method: 'get',
         params: params
@@ -691,6 +775,7 @@ export function apiGetgetStationsByAreaNo(params) {
 // 获取计算模型信息配置数据
 export function apiGetgetUnitMeasuringPointList(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/umpmc/getUnitMeasuringPointList',
         method: 'post',
         params: params
@@ -699,6 +784,7 @@ export function apiGetgetUnitMeasuringPointList(params) {
 // 删除机组测点信息配置数据
 export function apiGetdeleteUnitMeasuringPoint(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/umpmc/deleteUnitMeasuringPoint',
         method: 'post',
         params: params
@@ -709,6 +795,7 @@ export function apiGetdeleteUnitMeasuringPoint(params) {
 // 获取场站功率测点信息配置数据
 export function apiGetgetStationPowerMeasurementPointList(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/spmpmc/getStationPowerMeasurementPointList',
         method: 'post',
         params: params
@@ -717,6 +804,7 @@ export function apiGetgetStationPowerMeasurementPointList(params) {
 // 删除场站功率测点信息配置数据
 export function apiGetdeleteStationPowerMeasurementPoint(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/spmpmc/deleteStationPowerMeasurementPoint',
         method: 'post',
         params: params
@@ -727,6 +815,7 @@ export function apiGetdeleteStationPowerMeasurementPoint(params) {
 // 获取规范测点信息配置数据
 export function apiGetgetStandardPointManagementList(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/smpmc/getStandardPointManagementList',
         method: 'post',
         params: params
@@ -735,6 +824,7 @@ export function apiGetgetStandardPointManagementList(params) {
 // 删除规范测点信息配置数据
 export function apiGetdeleteStandardPointManagement(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/smpmc/deleteStandardPointManagement',
         method: 'post',
         params: params
@@ -745,6 +835,7 @@ export function apiGetdeleteStandardPointManagement(params) {
 // 获取计算模型信息配置数据
 export function apiGetCalculationModelList(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/cmc/getCalculationModelList',
         method: 'post',
         params: params
@@ -753,6 +844,7 @@ export function apiGetCalculationModelList(params) {
 // 新增计算模型信息配置数据
 export function apiGetaddCalculationModel(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/cmc/addCalculationModel',
         method: 'post',
         params: params
@@ -761,6 +853,7 @@ export function apiGetaddCalculationModel(params) {
 // 修改计算模型信息配置数据
 export function apiGetupdateCalculationModel(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/cmc/updateCalculationModel',
         method: 'post',
         params: params
@@ -769,6 +862,7 @@ export function apiGetupdateCalculationModel(params) {
 // 删除计算模型信息配置数据
 export function apiGetdeleteCalculationModel(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/cmc/deleteCalculationModel',
         method: 'post',
         params: params
@@ -779,6 +873,7 @@ export function apiGetdeleteCalculationModel(params) {
 // 获取数值天气预报信息配置数据
 export function apiGetgetWfFileConfigList(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/nwmc/getWfFileConfigList',
         method: 'post',
         params: params
@@ -787,6 +882,7 @@ export function apiGetgetWfFileConfigList(params) {
 // 新增数值天气预报信息配置数据
 export function apiGetaddWfFileConfig(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/nwmc/addWfFileConfig',
         method: 'post',
         params: params
@@ -795,6 +891,7 @@ export function apiGetaddWfFileConfig(params) {
 // 修改数值天气预报信息配置数据
 export function apiGetupdateWfFileConfig(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/nwmc/updateWfFileConfig',
         method: 'post',
         params: params
@@ -803,6 +900,7 @@ export function apiGetupdateWfFileConfig(params) {
 // 删除数值天气预报信息配置数据
 export function apiGetdeleteWfFileConfig(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/nwmc/deleteWfFileConfig',
         method: 'post',
         params: params
@@ -813,6 +911,7 @@ export function apiGetdeleteWfFileConfig(params) {
 // 获取发电计划管理信息配置数据
 export function apiGetgetProjectplanList(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/pgpmc/getProjectplanList',
         method: 'post',
         params: params
@@ -821,6 +920,7 @@ export function apiGetgetProjectplanList(params) {
 // 新增发电计划管理信息配置数据
 export function apiGetaddProjectplan(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/pgpmc/addProjectplan',
         method: 'post',
         params: params
@@ -829,6 +929,7 @@ export function apiGetaddProjectplan(params) {
 // 修改发电计划管理信息配置数据
 export function apiGetupdateProjectplan(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/pgpmc/updateProjectplan',
         method: 'post',
         params: params
@@ -837,6 +938,7 @@ export function apiGetupdateProjectplan(params) {
 // 删除发电计划管理信息配置数据
 export function apiGetdeleteProjectplan(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/pgpmc/deleteProjectplan',
         method: 'post',
         params: params
@@ -847,6 +949,7 @@ export function apiGetdeleteProjectplan(params) {
 // 获取预测上报管理信息配置数据
 export function apiGetgetForecastReportList(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/frmc/getForecastReportList',
         method: 'post',
         params: params
@@ -855,6 +958,7 @@ export function apiGetgetForecastReportList(params) {
 // 新增预测上报管理信息配置数据
 export function apiGetaddForecastReport(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/frmc/addForecastReport',
         method: 'post',
         params: params
@@ -863,6 +967,7 @@ export function apiGetaddForecastReport(params) {
 // 修改预测上报管理信息配置数据
 export function apiGetupdateForecastReport(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/frmc/updateForecastReport',
         method: 'post',
         params: params
@@ -871,6 +976,7 @@ export function apiGetupdateForecastReport(params) {
 // 删除预测上报管理信息配置数据
 export function apiGetdeleteForecastReport(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/frmc/deleteForecastReport',
         method: 'post',
         params: params
@@ -880,6 +986,7 @@ export function apiGetdeleteForecastReport(params) {
 //----------------------------------------人员配置接口------------------------------------------------
 export function apiGetuserList(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/us/userList',
         method: 'post',
         params: params
@@ -889,6 +996,7 @@ export function apiGetuserList(params) {
 //----------------------------------------单点登录接口------------------------------------------------
 export function apiGetsinglePointToLogin(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'singlePointToLogin',
         method: 'post',
         params: params
@@ -897,6 +1005,7 @@ export function apiGetsinglePointToLogin(params) {
 // 插入登录信息
 export function apiGetinsertLoginInformation(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/us/insertLoginInformation',
         method: 'post',
         params: params
@@ -905,6 +1014,7 @@ export function apiGetinsertLoginInformation(params) {
 // 用户信息
 export function apiGetinsertLogoutInformation(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/us/insertLogoutInformation',
         method: 'post',
         params: params
@@ -915,6 +1025,7 @@ export function apiGetinsertLogoutInformation(params) {
 // 用户管理列表
 export function apiGetgetPersonList(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/umc/getUserList',
         method: 'post',
         params: params
@@ -923,6 +1034,7 @@ export function apiGetgetPersonList(params) {
 // 用户管理新增
 export function apiGetgetaddPersonMsg(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/umc/addUser',
         method: 'post',
         params: params
@@ -931,6 +1043,7 @@ export function apiGetgetaddPersonMsg(params) {
 // 用户管理修改
 export function apiGetgetuploadPersonMsg(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/umc/editUser',
         method: 'post',
         params: params
@@ -939,6 +1052,7 @@ export function apiGetgetuploadPersonMsg(params) {
 // 用户管理删除
 export function apiGetgetdeletePersonMsg(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/umc/delUser',
         method: 'post',
         params: params
@@ -949,6 +1063,7 @@ export function apiGetgetdeletePersonMsg(params) {
 // 角色管理列表
 export function apiGetgetRoleList(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/rmc/getRoleList',
         method: 'post',
         params: params
@@ -957,6 +1072,7 @@ export function apiGetgetRoleList(params) {
 // 角色管理新增
 export function apiGetgetaddPersonRoleMsg(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/rmc/addRole',
         method: 'post',
         params: params
@@ -965,6 +1081,7 @@ export function apiGetgetaddPersonRoleMsg(params) {
 // 角色管理修改
 export function apiGetgetuploadPersonRoleMsg(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/rmc/editRole',
         method: 'post',
         params: params
@@ -973,6 +1090,7 @@ export function apiGetgetuploadPersonRoleMsg(params) {
 // 角色管理删除
 export function apiGetgetdeletePersonRoleMsg(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/rmc/delRole',
         method: 'post',
         params: params
@@ -983,6 +1101,7 @@ export function apiGetgetdeletePersonRoleMsg(params) {
 // 菜单管理列表
 export function apiGetgetMenuList(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/mmc/getMenuList',
         method: 'post',
         params: params
@@ -991,6 +1110,7 @@ export function apiGetgetMenuList(params) {
 // 菜单管理新增
 export function apiGetgetaddmenuMsg(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/mmc/addMenu',
         method: 'post',
         params: params
@@ -999,6 +1119,7 @@ export function apiGetgetaddmenuMsg(params) {
 // 菜单管理修改
 export function apiGetgetuploadmenuMsg(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/mmc/editMenu',
         method: 'post',
         params: params
@@ -1007,6 +1128,7 @@ export function apiGetgetuploadmenuMsg(params) {
 // 菜单管理删除
 export function apiGetgetdeletemenuMsg(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
         url: 'predict/api/mmc/delMenu',
         method: 'post',
         params: params

src/api/gengra.js

@@ -1,9 +1,9 @@
 import httpRequest from '@/utils/request.js'
-httpRequest.defaults.baseURL = process.env.VUE_APP_GENERAT_URL;
 
 // 风电数据准备页面
 export function apiGetbaseStation() {
     return httpRequest({
+        baseURL: process.env.VUE_APP_GENERAT_URL,
         url: 'base/station',
         method: 'get'
     })
@@ -11,6 +11,7 @@ export function apiGetbaseStation() {
 
 export function apiGetbaseWindturbine(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_GENERAT_URL,
         url: 'base/windturbine',
         method: 'get',
         params: params
@@ -19,6 +20,7 @@ export function apiGetbaseWindturbine(params) {
 
 export function apiGetpowerpreparedata(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_GENERAT_URL,
         url: 'power/prepare/data',
         method: 'get',
         params: params
@@ -27,6 +29,7 @@ export function apiGetpowerpreparedata(params) {
 
 export function apiGetpowerpreparetree() {
     return httpRequest({
+        baseURL: process.env.VUE_APP_GENERAT_URL,
         url: 'power/prepare/tree',
         method: 'get'
     })
@@ -34,6 +37,7 @@ export function apiGetpowerpreparetree() {
 
 export function apiGetpowerprepareshow(params) {
     return httpRequest({
+        baseURL: process.env.VUE_APP_GENERAT_URL,
         url: 'power/prepare/show',
         method: 'get',
         params: params

src/api/report.js

@@ -1,27 +1,29 @@
 import httpRequest from '@/utils/request.js'
-httpRequest.defaults.baseURL = process.env.VUE_APP_REPORT_URL;
 
 // 保存脚本
 export function save(param, data) {
-  return httpRequest({
-    url: 'script/save',
-    method: 'post',
-    params: param,
-    data: data
-  })
+    return httpRequest({
+        baseURL: process.env.VUE_APP_REPORT_URL,
+        url: 'script/save',
+        method: 'post',
+        params: param,
+        data: data
+    })
 }
 // 读取脚本
 export function read() {
-  return httpRequest({
-    url: 'script/read',
-    method: 'get'
-  })
+    return httpRequest({
+        baseURL: process.env.VUE_APP_REPORT_URL,
+        url: 'script/read',
+        method: 'get'
+    })
 }
 // 运行脚本
 export function run(data) {
-  return httpRequest({
-    url: 'script/run',
-    method: 'post',
-    data: data
-  })
+    return httpRequest({
+        baseURL: process.env.VUE_APP_REPORT_URL,
+        url: 'script/run',
+        method: 'post',
+        data: data
+    })
 }

src/assets/css/eleCss/el-dialogB.less

@@ -12,6 +12,10 @@
 
             .el-dialog__body {
                 padding: 10px 20px;
+
+                .el-loading-mask {
+                    background-color: #040c0b;
+                }
             }
         }
 

src/assets/css/eleCss/el-dialogW.less

@@ -4,17 +4,17 @@
         .el-dialog,
         .windLifeDialog {
             margin-top: 5vh !important;
-            // background: #fff;
+            background: #fff;
 
-            // .el-dialog__header {
-            //     .el-dialog__title {
-            //         color: #000 !important;
-            //     }
-            // }
+            .el-dialog__header {
+                .el-dialog__title {
+                    color: #000 !important;
+                }
+            }
 
-            // .el-dialog__body {
-            //     padding: 10px 20px;
-            // }
+            .el-dialog__body {
+                padding: 10px 20px;
+            }
         }
 
     }

src/components/commonHeaders.vue

@@ -130,21 +130,18 @@
             showHeader(route) {
                 this.menuData.forEach(it => {
                     if (route.path.indexOf('powerPrediction') > -1) {
-                        httpRequest.defaults.baseURL = process.env.VUE_APP_BASE_URL;
                         if (it.name === '功率预测') {
                             it.showBac = true
                         } else {
                             it.showBac = false
                         }
                     } else if (route.path.indexOf('intelligentReport') > -1) {
-                        httpRequest.defaults.baseURL = process.env.VUE_APP_REPORT_URL;
                         if (it.name === '智能报表') {
                             it.showBac = true
                         } else {
                             it.showBac = false
                         }
                     } else if (route.path.indexOf('generatingCap') > -1) {
-                        httpRequest.defaults.baseURL = process.env.VUE_APP_GENERAT_URL;
                         if (it.name === '发电能力分析') {
                             it.showBac = true
                         } else {

src/components/powerPredictionComponent/batteryDivinerDialog/dayBatterDialog.vue

@@ -1,7 +1,7 @@
 <template>
-    <el-dialog :custom-class="from === 'index'? 'globalDia' : 'globalDiaWhite'" :title="title" v-model="dialogVisible"
-        width="90%" :close-on-click-modal="false" @close="closeDialog">
-        <div class="globalDiaMain">
+    <el-dialog custom-class="windLifeDialog" :title="title" v-model="dialogVisible" width="90%"
+        :close-on-click-modal="false" @close="closeDialog">
+        <div class="globalDiaMain" :class="!theme ? 'themeDark' : 'themeLight'">
             <div class="main_top">
                 <div class="main_top_left">
                     <div class="exceed">
@@ -34,8 +34,8 @@
                 <div class="main_charts">
                     <div id="centerCharts" class="chartsStyle"></div>
                 </div>
-                <div class="main_table">
-                    <el-table :data="tableData" ref="report-table_day" border style="width: 100%">
+                <div class="main_table warn-table">
+                    <el-table :data="tableData" ref="report-table_day" border max-height="400px" style="width: 100%">
                         <el-table-column prop="dataTime" label="时间" align="center" width="160"></el-table-column>
                         <el-table-column prop="theoreticalPower" label="理论电量" align="center"></el-table-column>
                         <el-table-column prop="availablePower" label="可用电量" align="center"></el-table-column>
@@ -98,7 +98,19 @@
                 default: () => {
                     return [];
                 },
-            }
+            },
+            echartsTheme: {
+                type: String,
+                default: () => {
+                    return '';
+                },
+            },
+            theme: {
+                type: Boolean,
+                default: () => {
+                    return false;
+                },
+            },
         },
         data() {
             return {
@@ -225,10 +237,13 @@
                 if (this.from === 'index') {
                     option.backgroundColor = ''
                 }
+                if (!this.theme) {
+                    option.backgroundColor = ''
+                }
                 // 基于准备好的dom，初始化echarts实例
                 let dom = document.getElementById(name);
-                dom.removeAttribute("_echarts_instance_")
-                let myChart = this.$echarts.init(dom);
+                dom.removeAttribute("_echarts_instance_") ? dom.removeAttribute("_echarts_instance_") : ''
+                let myChart = this.$echarts.init(dom, this.echartsTheme);
                 myChart.setOption(option);
                 window.addEventListener("resize", function () {
                     myChart.resize()
@@ -431,10 +446,6 @@
 </script>
 
 <style lang="less">
-    @import '../SecondaryPageStyle/globalblackStyle.less';
-    @import '../SecondaryPageStyle/globalwhiteStyle.less';
-</style>
-<style lang="less">
     .globalDiaMain {
         .main_top {
             .main_top_left {
@@ -448,4 +459,25 @@
             }
         }
     }
+
+    .themeDark {
+
+        .main_top {
+            .main_top_left {
+                .exceed {
+                    color: #fff;
+                }
+            }
+        }
+    }
+
+    .themeLight {
+        .main_top {
+            .main_top_left {
+                .exceed {
+                    color: #000;
+                }
+            }
+        }
+    }
 </style>

src/components/powerPredictionComponent/batteryDivinerDialog/monthAndYearBatterDialog.vue

@@ -1,7 +1,7 @@
 <template>
-    <el-dialog custom-class="globalDiaWhite" :title="title" v-model="dialogVisible" width="90%"
+    <el-dialog custom-class="windLifeDialog" :title="title" v-model="dialogVisible" width="90%"
         :close-on-click-modal="false" @close="closeDialog">
-        <div class="globalDiaMain" v-loading="loading">
+        <div class="globalDiaMain" v-loading="loading" :class="!theme ? 'themeDark' : 'themeLight'">
             <div class="main_top">
                 <div class="main_top_left">
                     <div class="exceed">
@@ -28,8 +28,8 @@
             <div class="main_charts">
                 <div id="centersCharts" class="chartsStyle"></div>
             </div>
-            <div class="main_table">
-                <el-table :data="tableData" ref="report-table" border style="width: 100%">
+            <div class="main_table warn-table">
+                <el-table :data="tableData" ref="report-table" border max-height="400px" style="width: 100%">
                     <el-table-column prop="dataTime" label="时间" align="center" width="160"></el-table-column>
                     <el-table-column label="当期数据" align="center">
                         <el-table-column prop="veryShortTermForecastDq" label="计划发电" align="center"></el-table-column>
@@ -93,7 +93,19 @@
                 default: () => {
                     return [];
                 },
-            }
+            },
+            echartsTheme: {
+                type: String,
+                default: () => {
+                    return '';
+                },
+            },
+            theme: {
+                type: Boolean,
+                default: () => {
+                    return false;
+                },
+            },
         },
         data() {
             return {
@@ -215,10 +227,13 @@
                 if (this.from === 'index') {
                     option.backgroundColor = ''
                 }
+                if (!this.theme) {
+                    option.backgroundColor = ''
+                }
                 // 基于准备好的dom，初始化echarts实例
                 let dom = document.getElementById(name);
-                dom.removeAttribute("_echarts_instance_")
-                let myChart = this.$echarts.init(dom);
+                dom.removeAttribute("_echarts_instance_") ? dom.removeAttribute("_echarts_instance_") : ''
+                let myChart = this.$echarts.init(dom, this.echartsTheme);
                 myChart.setOption(option);
                 window.addEventListener("resize", function () {
                     myChart.resize()
@@ -390,4 +405,25 @@
             }
         }
     }
+
+    .themeDark {
+
+        .main_top {
+            .main_top_left {
+                .exceed {
+                    color: #fff;
+                }
+            }
+        }
+    }
+
+    .themeLight {
+        .main_top {
+            .main_top_left {
+                .exceed {
+                    color: #000;
+                }
+            }
+        }
+    }
 </style>

src/components/powerPredictionComponent/panoramicPowerDialog/panoramaPowerDialogPage.vue

@@ -1,7 +1,7 @@
 <template>
-    <el-dialog :custom-class="from === 'index'? 'globalDia' : 'globalDiaWhite'" :title="title" v-model="dialogVisible"
-        width="90%" :close-on-click-modal="false">
-        <div class="globalDiaMain">
+    <el-dialog custom-class="windLifeDialog" :title="title" v-model="dialogVisible" width="90%"
+        :close-on-click-modal="false">
+        <div class="globalDiaMain" :class="!theme ? 'themeDark' : 'themeLight'">
             <div class="main_top">
                 <div class="main_top_left">
                     <div class="exceed">
@@ -31,8 +31,8 @@
                         <div id="windCharts" class="chartsStyle"></div>
                     </el-col>
                 </el-row>
-                <div class="main_table">
-                    <el-table :data="tableData" ref="report-table" border style="width: 100%">
+                <div class="main_table warn-table">
+                    <el-table :data="tableData" ref="report-table" border max-height="400px" style="width: 100%">
                         <el-table-column prop="dataTime" label="时间" align="center" width="160"></el-table-column>
                         <el-table-column prop="theoreticalPower" label="理论功率" align="center"></el-table-column>
                         <el-table-column prop="availablePower" label="可用功率" align="center"></el-table-column>
@@ -101,6 +101,18 @@
                     return [];
                 },
             },
+            echartsTheme: {
+                type: String,
+                default: () => {
+                    return '';
+                },
+            },
+            theme: {
+                type: Boolean,
+                default: () => {
+                    return false;
+                },
+            },
         },
         data() {
             return {
@@ -263,10 +275,13 @@
                 if (this.from === 'index') {
                     option.backgroundColor = ''
                 }
+                if (!this.theme) {
+                    option.backgroundColor = ''
+                }
                 // 基于准备好的dom，初始化echarts实例
                 let dom = document.getElementById(name);
-                dom.removeAttribute("_echarts_instance_")
-                let myChart = this.$echarts.init(dom);
+                dom.removeAttribute("_echarts_instance_") ? dom.removeAttribute("_echarts_instance_") : ''
+                let myChart = this.$echarts.init(dom, this.echartsTheme);
                 myChart.setOption(option);
                 myChart.on('mousemove', this.setTooltip('centerCharts', 'windCharts', 0))
                 window.addEventListener("resize", function () {
@@ -412,6 +427,24 @@
 </script>
 
 <style lang="less">
-    @import '../SecondaryPageStyle/globalblackStyle.less';
-    @import '../SecondaryPageStyle/globalwhiteStyle.less';
+    .themeDark {
+
+        .main_top {
+            .main_top_left {
+                .exceed {
+                    color: #fff;
+                }
+            }
+        }
+    }
+
+    .themeLight {
+        .main_top {
+            .main_top_left {
+                .exceed {
+                    color: #000;
+                }
+            }
+        }
+    }
 </style>

src/components/powerPredictionComponent/powerPredictionDialog/predictionDialogPage.vue

@@ -1,7 +1,7 @@
 <template>
-    <el-dialog :custom-class="from === 'index'? 'globalDia' : 'globalDiaWhite'" :title="title" v-model="dialogVisible"
-        width="90%" :close-on-click-modal="false" @close="closeDialog">
-        <div class="globalDiaMain">
+    <el-dialog custom-class="windLifeDialog" :title="title" v-model="dialogVisible" width="90%"
+        :close-on-click-modal="false" @close="closeDialog">
+        <div class="globalDiaMain" :class="!theme ? 'themeDark' : 'themeLight'">
             <div class="main_top">
                 <div class="main_top_left">
                     <div class="exceed">
@@ -29,8 +29,8 @@
                 <div class="main_charts">
                     <div id="centerCharts" class="chartsStyle"></div>
                 </div>
-                <div class="main_table" v-show="isPower">
-                    <el-table :data="tableData" ref="report-table_power" border style="width: 100%">
+                <div class="main_table warn-table" v-show="isPower">
+                    <el-table :data="tableData" ref="report-table_power" border max-height="400px" style="width: 100%">
                         <el-table-column prop="dataTime" label="时间" align="center" width="160"></el-table-column>
                         <el-table-column prop="theoreticalPower" label="理论功率" align="center"></el-table-column>
                         <el-table-column prop="availablePower" label="可用功率" align="center"></el-table-column>
@@ -64,8 +64,8 @@
                         </el-table-column>
                     </el-table>
                 </div>
-                <div class="main_table" v-show="!isPower">
-                    <el-table :data="tableData" ref="report-table_wind" border style="width: 100%">
+                <div class="main_table warn-table" v-show="!isPower">
+                    <el-table :data="tableData" ref="report-table_wind" border max-height="400px" style="width: 100%">
                         <el-table-column prop="dataTime" label="时间" align="center" width="160"></el-table-column>
                         <el-table-column label="当期数据" align="center">
                             <el-table-column prop="actualWindSpeedDq" label="实际风速" align="center"></el-table-column>
@@ -129,7 +129,19 @@
                 default: () => {
                     return [];
                 },
-            }
+            },
+            echartsTheme: {
+                type: String,
+                default: () => {
+                    return '';
+                },
+            },
+            theme: {
+                type: Boolean,
+                default: () => {
+                    return false;
+                },
+            },
         },
         data() {
             return {
@@ -307,8 +319,8 @@
                 let dark = this.from === 'index' ? 'dark' : ''
                 let yxname = title === '功率' ? '兆瓦(Mw)' : 'm/s'
                 let dom = document.getElementById(name);
-                dom.removeAttribute("_echarts_instance_")
-                let myChart = this.$echarts.init(dom, dark);
+                dom.removeAttribute("_echarts_instance_") ? dom.removeAttribute("_echarts_instance_") : ''
+                let myChart = this.$echarts.init(dom, this.echartsTheme);
                 let option = {
                     title: {
                         text: title
@@ -341,6 +353,9 @@
                 if (this.from === 'index') {
                     option.backgroundColor = ''
                 }
+                if (!this.theme) {
+                    option.backgroundColor = ''
+                }
                 // 基于准备好的dom，初始化echarts实例
                 myChart.setOption(option);
                 window.addEventListener("resize", function () {

src/utils/request.js

@@ -18,7 +18,7 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例
 const service = axios.create({
     // axios中请求配置有baseURL选项，表示请求URL公共部分
-    baseURL: process.env.VUE_APP_BASE_URL,
+    baseURL: process.env.VUE_APP_GENERAT_URL,
     // 超时
     timeout: 3000,
     headers: {
@@ -82,18 +82,29 @@ service.interceptors.response.use(
     }
   },
   error => {
-    // 响应失败要处理的地方
+      // 响应失败要处理的地方
     console.log('err' + error)
-    let { message } = error;
-    if (message == "Network Error") {
-      message = "后端接口连接异常";
-    } else if (message.includes("timeout")) {
-      message = "系统接口请求超时";
-    } else if (message.includes("Request failed with status code")) {
-      message = "系统接口" + message.substr(message.length - 3) + "异常";
-    }
-    ElMessage({ message: message, type: 'error', duration: 3 * 1000 })
-    return Promise.reject(error)
+        let { message } = error;
+        if (message.indexOf('401') != -1) {
+            ElMessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {
+                confirmButtonText: '重新登录',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                // this.$route.replace({ path: '/login' })
+                let str = `${window.location.origin}/#/login`
+                window.location = str
+            })
+        }
+        if (message == "Network Error") {
+            message = "后端接口连接异常";
+        } else if (message.includes("timeout")) {
+            message = "系统接口请求超时";
+        } else if (message.includes("Request failed with status code")) {
+            message = "系统接口" + message.substr(message.length - 3) + "异常";
+        }
+        ElMessage({ message: message, type: 'error', duration: 3 * 1000 })
+        return Promise.reject(error)
   }
 )
 

src/views/generatingCapacity/dataAnalysis/hotAnalysis/index.vue

@@ -59,7 +59,7 @@
                 </div>
             </div>
         </div>
-        <el-dialog draggable width="80%" v-model="dialog" :title="actDiaTitle">
+        <el-dialog custom-class="windLifeDialog" draggable width="80%" v-model="dialog" :title="actDiaTitle">
             <el-form class="whitespace-nowrap" :inline="true" :model="queryForm">
                 <el-form-item label="" class="!mb-0">
                     <el-select v-model="queryForm.checkIds" clearable @clear="checkAll = false" collapse-tags multiple>
@@ -74,17 +74,16 @@
                 </el-form-item>
             </el-form>
             <div v-loading="exportLoading">
-                <div ref="diaPanelRef"
-                    class="flex flex-wrap justify-center items-center h-[650px] overflow-y-auto overflow-x-hidden">
+                <div ref="diaPanelRef" style="height: 650px">
                     <component :is="item.actCop" :width="actCopList.length > 1 ? '50%' : '100%'" height="100%"
                         v-for="item in actCopList" :key="item.id" :xAxis="item.xAxis" :subtext="item.subtext"
                         :title="item.title" :series="item.series" :isDiaAlone="(actCopList.length === 1)"
                         @dblclick="funDbClick(item)" :yAxis="item.yAxis" :dataset="item.dataset" :brush="item.isBrush"
-                        @getSelected="funChartSelect"></component>
+                        :theme="theme" :echartsTheme="echartsTheme" @getSelected="funChartSelect"></component>
                 </div>
             </div>
         </el-dialog>
-        <el-dialog v-model="wtDialog" draggable title="风机功率点位">
+        <el-dialog custom-class="windLifeDialog warn-table" v-model="wtDialog" draggable title="风机功率点位">
             <el-tabs v-model="wtTab">
                 <el-tab-pane label="数据" name="table">
                     <el-table :data="wtData" row-key="id" :max-height="550">

src/views/generatingCapacity/dataAnalysis/lineAnalysis/components/barChart.vue

@@ -73,6 +73,7 @@
     const option = computed({
         get() {
             return {
+                backgroundColor: '',
                 color: props.colors.length ? props.colors : [
                     "rgb(50,93,171)",
                     "rgb(222,132,82)",
@@ -190,17 +191,25 @@
 
     onMounted(() => {
         nextTick(() => {
-            echarts.registerTheme('chartTheme', chartTheme)
-            const echartIns = echarts.init(document.getElementById(chartId), props.echartsTheme)
-            chartIns.value = echartIns
-            echartIns.setOption(option.value)
-            funBrushChange(props.brush)
-            window.addEventListener('resize', () => {
-                echartIns.resize()
-            })
+            init()
         })
     })
+
+    watch(() => props.echartsTheme, (newVal, oldVal) => init())
+
+    const init = () => {
+        echarts.registerTheme('chartTheme', chartTheme)
+        const echartIns = echarts.init(document.getElementById(chartId), props.echartsTheme)
+        document.getElementById(chartId).removeAttribute("_echarts_instance_") ? document.getElementById(chartId)
+            .removeAttribute("_echarts_instance_") : ''
+        chartIns.value = echartIns
+        echartIns.setOption(option.value)
+        funBrushChange(props.brush)
+        window.addEventListener('resize', () => {
+            echartIns.resize()
+        })
+    }
 </script>
 <template>
-    <div :id="chartId" :style="{ height: props.height, width: props.width }"></div>
+    <div :id="chartId" style="height: 400px; width: 990px"></div>
 </template>

src/views/generatingCapacity/dataAnalysis/lineAnalysis/index.vue

@@ -37,7 +37,7 @@
                 </div>
             </div>
         </div>
-        <el-dialog draggable width="1000px" v-model="tmDialog" title="时间占比">
+        <el-dialog custom-class="windLifeDialog" draggable width="1000px" v-model="tmDialog" title="时间占比">
             <el-tabs v-model="activeTab">
                 <el-tab-pane label="运行时间" name="1">
                 </el-tab-pane>
@@ -53,13 +53,13 @@
                 </div>
             </el-tabs>
         </el-dialog>
-        <el-dialog draggable width="1000px" v-model="powerDialog" title="额定功率">
+        <el-dialog custom-class="windLifeDialog" draggable width="1000px" v-model="powerDialog" title="额定功率">
             <bar-chart-cop height="350px" :colors='[]' width="100%" :xAxis="powerxAxis" :yAxis="countyAxis"
-                :series="countSeries"></bar-chart-cop>
+                :theme="theme" :echartsTheme="echartsTheme" :series="countSeries"></bar-chart-cop>
             <bar-chart-cop height="350px" :colors='[]' width="100%" :xAxis="powerxAxis" :yAxis="poweryAxis"
-                :series="powerSeries"></bar-chart-cop>
+                :theme="theme" :echartsTheme="echartsTheme" :series="powerSeries"></bar-chart-cop>
         </el-dialog>
-        <el-dialog draggable v-model="wtDialog" title="曲线偏差率">
+        <el-dialog custom-class="windLifeDialog warn-table" draggable v-model="wtDialog" title="曲线偏差率">
             <el-table :data="wtData" row-key="id" :max-height="600">
                 <el-table-column property="windturbineId" align="center" label="风机" />
                 <el-table-column property="pc5ratio" sortable align="center" label="3~5m" />

src/views/generatingCapacity/dataAnalysis/rateAnalysis/index.vue

@@ -47,7 +47,7 @@
                 </div>
             </div>
         </div>
-        <el-dialog v-model="wtDialog" draggable title="风机功率点位">
+        <el-dialog custom-class="windLifeDialog" v-model="wtDialog" draggable title="风机功率点位">
             <el-tabs v-model="wtTab">
                 <el-tab-pane label="数据" name="table">
                     <el-table :data="wtData" row-key="id" :max-height="550">
@@ -67,7 +67,7 @@
                 </el-tab-pane>
             </el-tabs>
         </el-dialog>
-        <el-dialog draggable width="80%" v-model="dialog" :title="actDiaTitle">
+        <el-dialog custom-class="windLifeDialog" draggable width="80%" v-model="dialog" :title="actDiaTitle">
             <el-form class="whitespace-nowrap" :inline="true" :model="queryForm">
                 <el-form-item label="" class="!mb-0">
                     <el-select v-model="queryForm.checkIds" clearable @clear="checkAll = false" collapse-tags multiple>
@@ -82,13 +82,13 @@
                 </el-form-item>
             </el-form>
             <div v-loading="exportLoading">
-                <div ref="diaPanelRef"
-                    class="flex flex-wrap justify-center items-center h-[650px] overflow-y-auto overflow-x-hidden">
+                <div ref="diaPanelRef" style="height: 650px">
                     <component :is="item.actCop" :width="actCopList.length > 1 ? '50%' : '100%'" height="100%"
                         v-for="item in actCopList" :key="item.id" :xAxis="item.xAxis" :subtext="item.subtext"
-                        :isRadar="item.isRadar" :title="item.title" :series="item.series"
-                        :isDiaAlone="(actCopList.length === 1)" @dblclick="funDbClick(item)" :yAxis="item.yAxis"
-                        :dataset="item.dataset" :brush="item.isBrush" @getSelected="funChartSelect"></component>
+                        :isRadar="item.isRadar" :title="item.title" :series="item.series" :theme="theme"
+                        :echartsTheme="echartsTheme" :isDiaAlone="(actCopList.length === 1)"
+                        @dblclick="funDbClick(item)" :yAxis="item.yAxis" :dataset="item.dataset" :brush="item.isBrush"
+                        @getSelected="funChartSelect"></component>
                 </div>
             </div>
         </el-dialog>

src/views/generatingCapacity/dataAnalysis/spaceAnalysis/index.vue

@@ -36,7 +36,7 @@
                 </div>
             </div>
         </div>
-        <el-dialog draggable width="80%" v-model="dialog" :title="actDiaTitle">
+        <el-dialog custom-class="windLifeDialog" draggable width="80%" v-model="dialog" :title="actDiaTitle">
             <el-form class="whitespace-nowrap" :inline="true" :model="queryForm">
                 <el-form-item label="" class="!mb-0">
                     <el-select v-model="queryForm.checkIds" clearable @clear="checkAll = false" collapse-tags multiple>
@@ -51,13 +51,12 @@
                 </el-form-item>
             </el-form>
             <div v-loading="exportLoading">
-                <div ref="diaPanelRef"
-                    class="flex flex-wrap justify-center items-center h-[650px] overflow-y-auto overflow-x-hidden">
+                <div ref="diaPanelRef" style="height: 650px">
                     <component :is="item.actCop" :width="actCopList.length > 1 ? '50%' : '100%'" height="100%"
                         v-for="item in actCopList" :key="item.id" :xAxis="item.xAxis" :subtext="item.subtext"
                         :title="item.title" :series="item.series" :isDiaAlone="(actCopList.length === 1)"
                         @dblclick="funDbClick(item)" :yAxis="item.yAxis" :dataset="item.dataset" :brush="item.isBrush"
-                        @getSelected="funChartSelect"></component>
+                        :theme="theme" :echartsTheme="echartsTheme" @getSelected="funChartSelect"></component>
                 </div>
             </div>
         </el-dialog>

src/views/generatingCapacity/dataAnalysis/windAnalysis/index.vue

@@ -20,7 +20,7 @@
                             <el-tab-pane label="图表展示" name="2">
                             </el-tab-pane>
                             <table-cop class="" v-show="activeTab === '1'" :data="tableData" :showSummary="true"
-                                :summaryMethod="funSummary" :column="tableColumn" :loading="tableLoading"
+                                :summaryMethod="funSummary" :column="tableColumn" :loading="tableLoading" :theme="theme"
                                 :height="tableHeight" :tableId="tableShowId" :tableName="tableName"></table-cop>
                             <div v-show="activeTab === '2'"
                                 :style="{ height: typeof tableHeight === 'string' ? tableHeight : tableHeight + 'px' }"
@@ -260,6 +260,7 @@
     const funGetTree = async () => {
         actTreeNode.value = null
         const res = await httpRequest.get("/power/prepare/tree")
+        debugger
         treeData.value = funRepeatMap(res.data)
         excelList.value = []
         if (actTreeNode.value) {

src/views/generatingCapacity/dataFilter/prepare/index.vue

@@ -47,6 +47,9 @@
     import {
         useStore
     } from 'vuex';
+    import {
+        apiGetpowerpreparetree
+    } from '@/api/gengra'
     // import {
     //     baseURL,
     //     socketURL
@@ -104,7 +107,8 @@
     }
     const funGetTree = async () => {
         actTreeNode.value = null
-        const res = await httpRequest.get("/power/prepare/tree")
+        // const res = await httpRequest.get("/power/prepare/tree")
+        const res = await apiGetpowerpreparetree()
         treeData.value = funRepeatMap(res.data)
         excelList.value = []
         if (actTreeNode.value) {

src/views/powerPrediction/batteryDivinerPage.vue

@@ -49,8 +49,10 @@
                 </el-col>
             </el-row>
         </div>
-        <day-batter-dialog ref="dayBatter" :ExceedTimeList="ExceedTimeList"></day-batter-dialog>
-        <month-and-year-batter-dialog ref="moothYear" :ExceedTimeList="ExceedTimeList"></month-and-year-batter-dialog>
+        <day-batter-dialog ref="dayBatter" :ExceedTimeList="ExceedTimeList" :theme="theme" :echartsTheme="echartsTheme">
+        </day-batter-dialog>
+        <month-and-year-batter-dialog ref="moothYear" :ExceedTimeList="ExceedTimeList" :theme="theme"
+            :echartsTheme="echartsTheme"></month-and-year-batter-dialog>
     </div>
 </template>
 

src/views/powerPrediction/homePageNoMap.vue

@@ -541,13 +541,15 @@
                 handler: function (newVal, oldVal) {
                     this.theme = newVal
                     this.echartsTheme = !newVal ? 'dark' : ''
-                    this.getPowerPrediction()
-                    this.getWindSpeed('风速')
-                    this.getCapacity()
-                    this.getAssessmentScore(0)
-                    this.getAllStationWeather()
-                    this.getWarningInfo()
-                    this.getWindStstus()
+                    if (oldVal != undefined) {
+                        this.getPowerPrediction()
+                        this.getWindSpeed('风速')
+                        this.getCapacity()
+                        this.getAssessmentScore(0)
+                        this.getAllStationWeather()
+                        this.getWarningInfo()
+                        this.getWindStstus()
+                    }
                 },
                 immediate: true
             }
@@ -1299,7 +1301,7 @@
                 }
                 // 基于准备好的dom，初始化echarts实例
                 let dom = document.getElementById(name);
-                dom.removeAttribute("_echarts_instance_")
+                dom.removeAttribute("_echarts_instance_") ? dom.removeAttribute("_echarts_instance_") : ''
                 let myChart = this.$echarts.init(dom, this.echartsTheme);
                 myChart.setOption(option);
                 myChart.on('mousemove', this.setTooltip('lineChart', 'lineChart1', this.windShow ? 3 : 0))
@@ -1465,7 +1467,7 @@
                 }
                 // 基于准备好的dom，初始化echarts实例
                 let dom = document.getElementById(name);
-                dom.removeAttribute("_echarts_instance_")
+                dom.removeAttribute("_echarts_instance_") ? dom.removeAttribute("_echarts_instance_") : ''
                 let myChart = this.$echarts.init(dom, this.echartsTheme);
                 myChart.setOption(option);
                 window.addEventListener("resize", function () {

src/views/powerPrediction/panoramicPower.vue

@@ -34,7 +34,8 @@
                 </el-col>
             </el-row>
         </div>
-        <panorama-dialog ref="panorama" from="panoramicPower" :ExceedTimeList="ExceedTimeList"></panorama-dialog>
+        <panorama-dialog ref="panorama" from="panoramicPower" :ExceedTimeList="ExceedTimeList"
+            :echartsTheme="echartsTheme" :theme="theme"></panorama-dialog>
     </div>
 </template>
 

src/views/powerPrediction/powerPredictionPage.vue

@@ -66,7 +66,8 @@
                 </el-col>
             </el-row>
         </div>
-        <power-prediction-dialog ref="prediction" :ExceedTimeList="ExceedTimeList"></power-prediction-dialog>
+        <power-prediction-dialog ref="prediction" :ExceedTimeList="ExceedTimeList" :echartsTheme="echartsTheme"
+            :theme="theme"></power-prediction-dialog>
     </div>
 </template>
 

src/views/powerPrediction/statisticalSummaryPage.vue

@@ -43,7 +43,7 @@
                             <div style="display:flex;margin:10px 0">
                                 <!-- <el-button type="primary" disabled>年发电量报告</el-button> -->
                             </div>
-                            <div class="tablestyle" style="margin-top:30px">
+                            <div class="tablestyle warn-table" style="margin-top:30px">
                                 <el-table :data="tableData" border style="width: 100%"
                                     element-loading-background="rgba(0,0,0,.5)"
                                     :header-cell-style="{'text-align':'center'}">
@@ -580,7 +580,6 @@
                     }],
                     series: series
                 };
-                debugger
                 if (!this.theme) {
                     option.backgroundColor = ''
 

vue.config.js

@@ -39,28 +39,32 @@ module.exports = defineConfig({
   // 默认情况下 babel-loader 会忽略所有 node_modules 中的文件。你可以启用本选项，以避免构建后的代码中出现未转译的第三方依赖（对所有的依赖都进行转译可能会降低构建速度）
   transpileDependencies: false,
   // webpack-dev-server 相关配置
-  devServer: {
-    host: '0.0.0.0',
-    port: port,
-    open: true,
-    proxy: {
-        // detail: https://cli.vuejs.org/config/#devserver-proxy
-        // [process.env.VUE_APP_GENERAT_URL]: {
-        //     // target: 'http://123.60.219.66:9002',
-        //     target: 'http://192.168.2.12:9002',
-        //     changeOrigin: true, //开启代理
-        //     pathRewrite: {
-        //         [process.env.VUE_APP_GENERAT_URL]: ''
-        //     }
-        // },
-        // [process.env.VUE_APP_BASE_URL]: {
-        //     target: 'http://123.60.219.66:8086',
-        //     changeOrigin: true,
-        //     pathRewrite: {
-        //         [process.env.VUE_APP_BASE_URL]: ''
-        //     }
-        // }
-    }
+    devServer: {
+        client: {
+            progress: true,
+            overlay: false
+        },
+        host: '0.0.0.0',
+        port: port,
+        open: true,
+        proxy: {
+            // detail: https://cli.vuejs.org/config/#devserver-proxy
+            // [process.env.VUE_APP_GENERAT_URL]: {
+            //     // target: 'http://123.60.219.66:9002',
+            //     target: 'http://192.168.2.12:9002',
+            //     changeOrigin: true, //开启代理
+            //     pathRewrite: {
+            //         [process.env.VUE_APP_GENERAT_URL]: ''
+            //     }
+            // },
+            // [process.env.VUE_APP_BASE_URL]: {
+            //     target: 'http://123.60.219.66:8086',
+            //     changeOrigin: true,
+            //     pathRewrite: {
+            //         [process.env.VUE_APP_BASE_URL]: ''
+            //     }
+            // }
+        }
   },
   // 和webpapck属性完全一致，最后会进行合并
   configureWebpack:{