修改24小时功率曲线图，修复固定侧边栏影响页面样式

.env.development

@@ -1,10 +1,7 @@
 
-# VUE_APP_API=http://192.168.1.105:6060
-# VUE_APP_Matrix=http://192.168.1.105:6060
+VUE_APP_API=http://192.168.1.105:6060
 
-VUE_APP_API=http://10.81.3.153:6060
-# # 经济运行 全景监视 
-VUE_APP_Matrix=http://10.81.3.153:6060
+# VUE_APP_API=http://10.81.3.153:6060
 
 
 VUE_APP_ADAPTERURL=http://10.81.3.155:8011

.env.production

@@ -1,5 +1,5 @@
 VUE_APP_API=http://10.81.3.153:6060
-VUE_APP_Matrix=http://10.81.3.153:6060
+VUE_APP_API=http://10.81.3.153:6060
 VUE_APP_ADAPTERURL=http://10.81.3.155:8011
 
 

src/App.vue

@@ -77,7 +77,10 @@
           </el-sub-menu>
         </el-menu>
       </div>
-      <div class="main-body" :style="{ paddingLeft: isFixed ? '52px' : 0 }">
+      <div
+        class="main-body"
+        :style="{ paddingLeft: isFixed && menuLength > 0 ? '52px' : 0 }"
+      >
         <router-view />
       </div>
     </div>
@@ -140,6 +143,9 @@ export default {
     isFixed() {
       return this.$store.state.isFixed;
     },
+    menuLength() {
+      return this.$store.state.menuData.length;
+    },
   },
   created() {
     let that = this;

src/api/cockpit/matrix/index.js

@@ -2,7 +2,7 @@ import request from "../../../tools/request";
 //获取驾驶舱基础信息
 const findBasicDataInfo = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `genreset/findBasicDataInfo?id=${data.id}`,
     method: "get",
   });
@@ -10,21 +10,21 @@ const findBasicDataInfo = (data) => {
 //获取驾驶舱功率曲线图和电量柱状图信息
 const FindPowerInfo = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `cockpit/Powercurve24?wpId=${data.id}`,
     method: "get",
   });
 };
 const findInfo = (subUrl, data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `${subUrl}?id=${data.id}`,
     method: "get",
   });
 };
 const findInfos = (subUrl, data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `${subUrl}?id=${data.id}&targetName=${data.targetName}`,
     method: "get",
   });
@@ -32,7 +32,7 @@ const findInfos = (subUrl, data) => {
 //预测风速电量
 const forecastwindspeedInfo = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `genreset/getForecastwindspeedInfo?wpId=${data.wpId}`,
     method: "get",
   });
@@ -40,7 +40,7 @@ const forecastwindspeedInfo = (data) => {
 //未来5天天气预报功能
 const weatherRealDay5Info = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `genreset/getWeatherRealDay5Info?wpId=${data.wpId}`,
     method: "get",
   });
@@ -48,7 +48,7 @@ const weatherRealDay5Info = (data) => {
 //基础矩阵
 const matrixPush = (query) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `matrix/basic?company=${query.company}&type=${query.type}`,
     method: "get",
   });
@@ -56,7 +56,7 @@ const matrixPush = (query) => {
 // 明细矩阵
 const matrixDetailPush = (query) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `matrix/detailed?company=${query.company}&type=${query.type}&wpid=`,
     method: "get",
   });
@@ -64,7 +64,7 @@ const matrixDetailPush = (query) => {
 // 单场矩阵
 const matrixSinglePush = (query) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `matrix/single?wpid=${query.wpid}`,
     method: "get",
   });
@@ -72,7 +72,7 @@ const matrixSinglePush = (query) => {
 // 单场矩阵
 const matrixSinglePushFL = (query) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `Photovoltaic/monitor?wpId=${query.wpid}&type=${query.type}`,
     method: "get",
   });
@@ -80,7 +80,7 @@ const matrixSinglePushFL = (query) => {
 //全风场简单矩阵
 const findSimpleMatrixAll = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `matrix/findSimpleMatrixAll?wpId=${data.wpId}`,
     method: "get",
   });
@@ -88,7 +88,7 @@ const findSimpleMatrixAll = (data) => {
 //风机信息
 const findWtInfo = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `monitorwt/findWtInfo?wtId=${data.wtId}`,
     method: "get",
   });
@@ -97,7 +97,7 @@ const findWtInfo = (data) => {
 // const matrixDetialPush = (showLoading) => {
 //   return request({
 //     showLoading,
-//     baseURL: process.env.VUE_APP_Matrix,
+//     baseURL: process.env.VUE_APP_API,
 //     url: `matrix/matrixDetialPush`,
 //     method: "get",
 //   });
@@ -105,7 +105,7 @@ const findWtInfo = (data) => {
 //
 const findWtWarnInfo = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `monitorwt/findWtWarnInfo?wtId=${data.wtId}`,
     method: "get",
   });
@@ -114,7 +114,7 @@ const findWtWarnInfo = (data) => {
 const matrixQfPush = (showLoading) => {
   return request({
     showLoading,
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `matrix/matrixQfPush`,
     method: "get",
   });
@@ -123,7 +123,7 @@ const matrixQfPush = (showLoading) => {
 const monitor = (showLoading) => {
   return request({
     showLoading,
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `monitor/monitor`,
     method: "get",
   });
@@ -132,14 +132,14 @@ const monitor = (showLoading) => {
 const getAgcValues = (showLoading) => {
   return request({
     showLoading,
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `genreset/getAgcValues`,
     method: "get",
   });
 };
 const windfarmAllAjax = () => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `powercompare/windfarmAllAjax`,
     method: "get",
   });
@@ -148,7 +148,7 @@ const windfarmAllAjax = () => {
 const findWtInfoList = (showLoading, data) => {
   return request({
     showLoading,
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `monitorwt/findWtInfoList?wpId=${data.wpId}`,
     method: "get",
   });
@@ -156,7 +156,7 @@ const findWtInfoList = (showLoading, data) => {
 //测风塔
 const monitorFindCftInfo = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `monitor/findCftInfo?wpId=${data.wpId}`,
     method: "get",
   });
@@ -164,28 +164,28 @@ const monitorFindCftInfo = (data) => {
 
 const powercompareWindfarmAllAjax = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `powercompare/windfarmAllAjax`,
     method: "get",
   });
 };
 const windfarmByCmAjax = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `powercompare/windfarmByCmAjax?cmId=${data.cmId}`,
     method: "get",
   });
 };
 const companysAjax = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `powercompare/companysAjax`,
     method: "get",
   });
 };
 const genresetFindPowerInfo = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `genreset/findPowerInfo?id=${data.id}`,
     method: "get",
   });
@@ -194,7 +194,7 @@ const genresetFindPowerInfo = (data) => {
 //风场矩阵
 const matrixMatrixByWpIdPush = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `matrix/matrixByWpIdPush?wpId=${data.wpId}`,
     method: "get",
   });
@@ -202,7 +202,7 @@ const matrixMatrixByWpIdPush = (data) => {
 //光伏矩阵
 const matrixByWpIdPush = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `matrix/matrixByWpIdPush?wpId=${data.wpId}`,
     method: "get",
   });
@@ -210,7 +210,7 @@ const matrixByWpIdPush = (data) => {
 //总样貌
 const monitorFindGeneralAppearance = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `monitor/findGeneralAppearance?wpId=${data.wpId}`,
     method: "get",
   });
@@ -218,7 +218,7 @@ const monitorFindGeneralAppearance = (data) => {
 //光伏所有矩阵信息
 const findPVSimpleMatrixAll = () => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `matrix/findPVSimpleMatrixAll`,
     method: "get",
   });
@@ -226,7 +226,7 @@ const findPVSimpleMatrixAll = () => {
 //逆变器监视
 const findInverterInfo = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `monitorinverter/findInverterInfo?wtId=${data.wtId}`,
     method: "get",
   });
@@ -234,7 +234,7 @@ const findInverterInfo = (data) => {
 //逆变器开网频率
 const findInverterPowerLine = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `monitorinverter/findInverterPowerLine?wtId=${data.wtId}`,
     method: "get",
   });
@@ -243,7 +243,7 @@ const findInverterPowerLine = (data) => {
 const matrixDetialGfPush = (showLoading) => {
   return request({
     showLoading,
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `matrix/matrixDetialGfPush`,
     method: "get",
   });
@@ -251,7 +251,7 @@ const matrixDetialGfPush = (showLoading) => {
 //多风机参数对比风机点获取
 const findSameIndexList = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `matrix/findSameIndexList?wtId=${data.wtId}`,
     method: "get",
   });
@@ -259,7 +259,7 @@ const findSameIndexList = (data) => {
 //多风机参数对比风机参数获取
 const findSameIndexValueList = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `matrix/findSameIndexValueList?wtId=${data.wtId}&code=${data.code}`,
     method: "get",
   });
@@ -267,7 +267,7 @@ const findSameIndexValueList = (data) => {
 //场站监视数据获取
 const findWpInfoBywpId = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `monitor/findWpInfoBywpId?wpId=${data.wpId}`,
     method: "get",
   });
@@ -275,7 +275,7 @@ const findWpInfoBywpId = (data) => {
 //获取日度损失电量分析
 const findLossWpBar = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `monitor/findLossWpBar?wpId=${data.wpId}`,
     method: "get",
   });
@@ -283,7 +283,7 @@ const findLossWpBar = (data) => {
 //获取完成电量
 const findPowerWpBar = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `monitor/findPowerWpBar?wpId=${data.wpId}`,
     method: "get",
   });
@@ -291,7 +291,7 @@ const findPowerWpBar = (data) => {
 //获取月发电量对比
 const findMonthPowerWpBar = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `monitor/findMonthPowerWpBar?wpId=${data.wpId}`,
     method: "get",
   });
@@ -299,7 +299,7 @@ const findMonthPowerWpBar = (data) => {
 //获取期次风机
 const windturbineByPjIdAjax = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/powercompare/windturbineByPjIdAjax?pjId=${data.pjId}`,
     method: "get",
   });
@@ -307,7 +307,7 @@ const windturbineByPjIdAjax = (data) => {
 //首页 地区悬浮信息
 const homeSuspensionWindows = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/genreset/homeSuspensionWindows`,
     method: "get",
   });
@@ -315,7 +315,7 @@ const homeSuspensionWindows = (data) => {
 //首页 地区悬浮信息 穿透场站 http://10.81.3.155:8170/genreset/Stationinformation?wpId=GJY_FDC
 const Stationinformation = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/genreset/Stationinformation?wpId=${data.wpId}`,
     method: "get",
   });

src/api/curveAnalyse.js

@@ -3,7 +3,7 @@ import request from "@/tools/request";
 //公司
 export function companys() {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/benchmarking/companys`,
     method: "get",
   });
@@ -12,7 +12,7 @@ export function companys() {
 //三率-状态转换率
 export function conversionRate(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/threerate/state-conversion-rate?companyId=${data.companyId}&beginDate=${data.beginDate}&endDate=${data.endDate}`,
     method: "get",
   });
@@ -20,7 +20,7 @@ export function conversionRate(data) {
 //三率-复位及时率
 export function timelyRate(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/threerate/reset-timely-rate?companyId=${data.companyId}&beginDate=${data.beginDate}&endDate=${data.endDate}`,
     method: "get",
   });
@@ -28,7 +28,7 @@ export function timelyRate(data) {
 //三率-消缺及时率
 export function eliminatRate(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/threerate/defects-eliminat-rate?companyId=${data.companyId}&beginDate=${data.beginDate}&endDate=${data.endDate}`,
     method: "get",
   });
@@ -36,7 +36,7 @@ export function eliminatRate(data) {
 //专题分析-MTBF分析  "124.70.75.91:6060/specific/mtbfList?companys=SD_SXNY_ZGS&type=-1&year=2022",
 export function mtbfList(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/specific/mtbfList?companys=${data.companys}&type=${data.type}&year=${data.year}`,
     method: "get",
   });
@@ -44,7 +44,7 @@ export function mtbfList(data) {
 //专题分析-风能利用率
 export function fnlylList(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/specific/fnlylList?companys=${data.companys}&type=${data.type}&year=${data.year}`,
     method: "get",
   });
@@ -52,7 +52,7 @@ export function fnlylList(data) {
 //专题分析-故障损失率
 export function gzsslList(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/specific/gzsslList?companys=${data.companys}&type=${data.type}&year=${data.year}`,
     method: "get",
   });
@@ -60,7 +60,7 @@ export function gzsslList(data) {
 //专题分析-维护损失率
 export function whsslList(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/specific/whsslList?companys=${data.companys}&type=${data.type}&year=${data.year}`,
     method: "get",
   });
@@ -68,7 +68,7 @@ export function whsslList(data) {
 //专题分析-限电损失率
 export function xdsslList(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/specific/xdsslList?companys=${data.companys}&type=${data.type}&year=${data.year}`,
     method: "get",
   });
@@ -76,7 +76,7 @@ export function xdsslList(data) {
 //专题分析-性能损失率
 export function xnsslList(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/specific/xnsslList?companys=${data.companys}&type=${data.type}&year=${data.year}`,
     method: "get",
   });
@@ -84,7 +84,7 @@ export function xnsslList(data) {
 //专题分析-受累损失率
 export function slsslList(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/specific/slsslList?companys=${data.companys}&type=${data.type}&year=${data.year}`,
     method: "get",
   });
@@ -92,7 +92,7 @@ export function slsslList(data) {
 //专题分析-复位及时率
 export function fwjslList(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/specific/fwjslList?companys=${data.companys}&type=${data.type}&year=${data.year}`,
     method: "get",
   });
@@ -100,7 +100,7 @@ export function fwjslList(data) {
 //专题分析-状态转换率
 export function ztzhlList(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/specific/ztzhlList?companys=${data.companys}&type=${data.type}&year=${data.year}`,
     method: "get",
   });
@@ -108,7 +108,7 @@ export function ztzhlList(data) {
 //专题分析-消缺及时率
 export function xqjslList(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/specific/xqjslList?companys=${data.companys}&type=${data.type}&year=${data.year}`,
     method: "get",
   });
@@ -116,7 +116,7 @@ export function xqjslList(data) {
 //专题分析-系统效率
 export function xtxlList(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/specific/xtxlList?companys=${data.companys}&type=${data.type}&year=${data.year}`,
     method: "get",
   });
@@ -124,7 +124,7 @@ export function xtxlList(data) {
 //专题分析-离散率
 export function lslList(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/specific/lslList?companys=${data.companys}&type=${data.type}&year=${data.year}`,
     method: "get",
   });
@@ -132,7 +132,7 @@ export function lslList(data) {
 //专题分析-转换效率
 export function zhxlList(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/specific/zhxlList?companys=${data.companys}&type=${data.type}&year=${data.year}`,
     method: "get",
   });
@@ -140,7 +140,7 @@ export function zhxlList(data) {
 //专题分析-MTTR分析
 export function mttrList(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/specific/mttrList?companys=${data.companys}&type=${data.type}&year=${data.year}`,
     method: "get",
   });
@@ -148,7 +148,7 @@ export function mttrList(data) {
 //专题分析-发电量分析
 export function fdlList(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/specific/fdlList?companys=${data.companys}&type=${data.type}&year=${data.year}`,
     method: "get",
   });
@@ -156,7 +156,7 @@ export function fdlList(data) {
 //专题分析-综合厂用电量
 export function zhcydlList(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/specific/zhcydlList?companys=${data.companys}&type=${data.type}&year=${data.year}`,
     method: "get",
   });

src/api/economic/index.js

@@ -33,7 +33,7 @@ const benchmarking = (data) => {
 
 const getStationPersis = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/stationPersis/getStationPersis?station=${data.station}&startdate=${data.startdate}&enddate=${data.enddate}`,
     method: "get",
   });
@@ -404,7 +404,7 @@ const specificZhcydlList = (data) => {
 
 const powercompareWindfarmAjax = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/powercompare/windfarmAjax`,
     method: "get",
   });
@@ -412,7 +412,7 @@ const powercompareWindfarmAjax = (data) => {
 
 const goodnessWindturbinegoodness = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/goodness/windturbinegoodness?wpId=${
       data.wpId
     }&isAsc=${JSON.stringify(data.tablepar)}&recorddate=${data.recorddate}`,
@@ -422,7 +422,7 @@ const goodnessWindturbinegoodness = (data) => {
 
 const powercompareWindturbineAjax = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/powercompare/windturbineAjax?wpId=${data.wpId}`,
     method: "get",
   });
@@ -430,7 +430,7 @@ const powercompareWindturbineAjax = (data) => {
 
 const goodnessGoodhistorylist = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/goodness/goodhistorylist?wpId=${data.wpId}&wtId=${data.wtId}&beginDate=${data.beginDate}&endDate=${data.endDate}`,
     method: "post",
   });
@@ -440,7 +440,7 @@ const goodnessGoodhistorylist = (data) => {
 
 const goodnessFindWtRealPowerChar = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/goodness/findWtRealPowerChar?wtId=${data.wtId}&recorddate=${data.recorddate}`,
     method: "get",
   });
@@ -448,7 +448,7 @@ const goodnessFindWtRealPowerChar = (data) => {
 
 const goodnessGetplotBands = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `goodness/getplotBands?wtId=${data.wtId}&recorddate=${data.recorddate}`,
     method: "get",
   });
@@ -456,7 +456,7 @@ const goodnessGetplotBands = (data) => {
 
 const goodnessPlotBandAjax = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/goodness/plotBandAjax?wtId=${data.wtId}&beginDate=${data.beginDate}&endDate=${data.endDate}`,
     method: "get",
   });
@@ -464,7 +464,7 @@ const goodnessPlotBandAjax = (data) => {
 
 const goodnessFindRealPowerCharBy24 = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/goodness/findRealPowerCharBy24?wtId=${data.wtId}&recorddate=${data.recorddate}`,
     method: "get",
   });
@@ -472,7 +472,7 @@ const goodnessFindRealPowerCharBy24 = (data) => {
 
 const goodnessBjjllist = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/goodness/bjjllist?wtId=${data.wtId}&recorddate=${data.recorddate}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
     method: "post",
   });
@@ -480,7 +480,7 @@ const goodnessBjjllist = (data) => {
 
 const goodnessGzjllist = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/goodness/gzjllist?wtId=${data.wtId}&recorddate=${data.recorddate}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
     method: "post",
   });
@@ -488,7 +488,7 @@ const goodnessGzjllist = (data) => {
 
 const goodnessXdjllist = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/goodness/xdjllist?wtId=${data.wtId}&recorddate=${data.recorddate}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
     method: "post",
   });
@@ -496,7 +496,7 @@ const goodnessXdjllist = (data) => {
 
 const goodnessWadAjax = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/goodness/wadAjax?wtId=${data.wtId}&recorddate=${data.recorddate}`,
     method: "get",
   });
@@ -504,7 +504,7 @@ const goodnessWadAjax = (data) => {
 
 const goodnessBphlist = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/goodness/bjphlist?wtId=${data.wtId}&recorddate=${data.recorddate}`,
     method: "post",
   });
@@ -512,7 +512,7 @@ const goodnessBphlist = (data) => {
 
 const goodnessGlchat = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/goodness/glchat?wtId=${data.wtId}&recorddate=${data.recorddate}`,
     method: "get",
   });
@@ -520,7 +520,7 @@ const goodnessGlchat = (data) => {
 
 const goodnessFjfzy = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/goodness/fjfzy?wtId=${data.wtId}&recorddate=${data.recorddate}`,
     method: "get",
   });
@@ -528,7 +528,7 @@ const goodnessFjfzy = (data) => {
 
 const requestData1 = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/${data.subUrl}?wpId=${data.data.wtId}&wtId=${data.data.wtId}&recorddate=${data.data.recorddate}&type=${data.data.type}`,
     method: "get",
   });
@@ -538,7 +538,7 @@ const requestData1 = (data) => {
 
 const singleanalysisSingleanalysisSub = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/singleanalysis/singleanalysisSub?wtId=${data.wtId}&year=${data.year}&month=${data.month}`,
     method: "get",
   });
@@ -546,7 +546,7 @@ const singleanalysisSingleanalysisSub = (data) => {
 
 const singleanalysisSingleanalysisChart = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/singleanalysis/singleanalysisChart?wtId=${data.wtId}&year=${data.year}&month=${data.month}`,
     method: "get",
   });
@@ -556,7 +556,7 @@ const singleanalysisSingleanalysisChart = (data) => {
 
 const singleanalysisSingleanalysisMain = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `singleanalysis/singleanalysisMain?wpId=${data.wpId}&isAsc=${data.isAsc}&year=${data.year}&month=${data.month}`,
     method: "post",
   });
@@ -568,7 +568,7 @@ const singleanalysisSingleanalysisMain = (data) => {
 
 const powercompareWindfarmAllAjax2 = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/powercompare/windfarmAllAjax`,
     method: "get",
   });
@@ -576,7 +576,7 @@ const powercompareWindfarmAllAjax2 = (data) => {
 
 const weatherWeatherInfo = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/weather/weatherInfo?wpId=${data.wpId}`,
     method: "get",
   });
@@ -584,7 +584,7 @@ const weatherWeatherInfo = (data) => {
 
 const weatherPowerChart = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/weather/powerChart`,
     method: "get",
   });
@@ -762,7 +762,7 @@ const curvefitting = (data) => {
 
 //     return request({
 
-//         baseURL: process.env.VUE_APP_Matrix,
+//         baseURL: process.env.VUE_APP_API,
 
 // 		// url:/stationPersis/getStationPersis?station=${data.station}&startdate=${data.startdate}&enddate=${data.enddate},
 
@@ -776,7 +776,7 @@ const curvefitting = (data) => {
 
 const getPointPerSisList = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     // url: `/pointpersis/getPointPerSisList?wtid=${data.wtid}&beginDate=${data.beginDate}&endDate=${data.endDate}&interval=10&uniformcodes=${data.uniformcodes}`,
     url: `/pointpersis/getPointPerSisList?wtid=${data.wtid}&beginDate=${data.beginDate}&endDate=${data.endDate}&interval=${data.interval}&uniformcodes=${data.uniformcodes}`,
     method: "get",
@@ -787,7 +787,7 @@ const getPointPerSisList = (data) => {
 
 const getpoints = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/pointpersis/getpoints`,
     method: "get",
   });
@@ -797,7 +797,7 @@ const getpoints = (data) => {
 
 const geteleperanalysislist = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/eleperanalysis/geteleperanalysislist?station=${data.wpId}&year=${data.year}&month=${data.month}&regionid=${data.regionId}&companyid=${data.companyId}`,
     method: "get",
   });
@@ -807,7 +807,7 @@ const geteleperanalysislist = (data) => {
 
 const getebapersislist = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/ebapersis/getebapersislist?station=${data.wpId}&year=${data.year}&month=${data.month}&regionid=${data.regionId}&companyid=${data.companyId}`,
     method: "get",
   });
@@ -819,7 +819,7 @@ const getebapersislist = (data) => {
 
 const getLonShutdownevent = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/fault/getLonShutdownevent?wpId=${data.wpId}&wtId=${data.wtId}&pageNum=${data.pageNum}&pageSize=${data.pageSize}&beginDate=${data.beginDate}&endDate=${data.endDate}&type=${data.type}`,
     method: "get",
   });
@@ -829,7 +829,7 @@ const getLonShutdownevent = (data) => {
 
 const getCompany = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `Companys/listByPage?id=${data.companyId}`,
     method: "get",
   });
@@ -841,7 +841,7 @@ const getCompany = (data) => {
 
 const getRegion = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/Region/list?companyid=${data.companyid}`,
     method: "get",
   });
@@ -851,7 +851,7 @@ const getRegion = (data) => {
 
 const getStation = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/windpowerstation/list?companyid=${data.companyId}&regionid=${data.regionId}`,
     method: "get",
   });
@@ -1051,5 +1051,4 @@ export default {
   getRegion,
 
   getStation,
-
 };

src/api/economy.js

@@ -3,7 +3,7 @@ import request from "@/tools/request";
 //获取
 const homePage = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/economy/home-page?regionId=${data.regionId}&staType=${data.staType}&dateType=${data.dateType}&pointCode=${data.pointCode}&foreignKeyId=${data.foreignKeyId}&companyId=${data.companyId}`,
     method: "get",
   });
@@ -11,7 +11,7 @@ const homePage = (data) => {
 //获取
 const pointCodeList = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/pro-econ-point-code/point_code_list`,
     method: "get",
   });
@@ -19,7 +19,7 @@ const pointCodeList = (data) => {
 //获取排行榜
 const pointRanking = (data) => {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/economy/point-ranking?dateType=${data.dateType}&foreignKeyId=${data.foreignKeyId}&pointCode=${data.pointCode}&popup=${data.popup}&staType=${data.staType}`,
     method: "get",
   });

src/api/factoryMonitor/index.js

@@ -2,7 +2,7 @@ import request from "@/tools/request.js";
 //根据公司获取场站数据
 export function GetStationByCompany(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `benchmarking/wpByCplist?companyids=${data.companyids}&type=${data.type}`,
     method: "get",
   });
@@ -10,7 +10,7 @@ export function GetStationByCompany(data) {
 //获取所有数据指标
 export function GetWtTargets(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `comprehensive/wttargets?type=${data.type}&${
       data.part.length ? `part=${data.part}` : "part="
     }`,
@@ -20,7 +20,7 @@ export function GetWtTargets(data) {
 //数据指标列表查询
 export function GetWtTargetsList(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `comprehensive/wtlisting?company=${data.company}&targets=${data.targets}&type=${data.type}&wpid=${data.wpid}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
     method: "get",
   });
@@ -28,7 +28,7 @@ export function GetWtTargetsList(data) {
 //场站信息查询
 export function GetWpInfos(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `station/caldata?wpid=${data.wpid}`,
     method: "get",
   });
@@ -36,7 +36,7 @@ export function GetWpInfos(data) {
 //场站完成电量
 export function GetWpHisdata(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `station/hisdata?wpid=${data.wpid}`,
     method: "get",
   });
@@ -44,7 +44,7 @@ export function GetWpHisdata(data) {
 //设备详情-左侧树形
 export function GetWtlistTree(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/detail/tree?wpid=${data.wpid}`,
     method: "get",
   });
@@ -52,7 +52,7 @@ export function GetWtlistTree(data) {
 //设备详情-监测信息
 export function GetWtMonitorInfo(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/detail/info?wtid=${data.wtid}`,
     method: "get",
   });
@@ -60,7 +60,7 @@ export function GetWtMonitorInfo(data) {
 //设备详情-遥测遥信
 export function GetWtTelemeteryInfo(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/detail/getuniformcode?part=${data.part}&wtid=${data.wtid}`,
     method: "get",
   });
@@ -68,7 +68,7 @@ export function GetWtTelemeteryInfo(data) {
 //场站期次查询设备
 export function GetProjectLandforms(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/landforms/data?foreignkeyid=${data.foreignkeyid}`,
     method: "get",
   });
@@ -76,7 +76,7 @@ export function GetProjectLandforms(data) {
 //场站期次查询阵区
 export function GetZhenquByPj(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `landforms/sqByPj?pjid=${data.pjid}`,
     method: "get",
   });
@@ -85,7 +85,7 @@ export function GetZhenquByPj(data) {
 //根据场站查询id
 export function GetTowerByWpid(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `tower/towerByWp?wpid=${data.wpid}`,
     method: "get",
   });
@@ -93,7 +93,7 @@ export function GetTowerByWpid(data) {
 //根据id查询测风塔数据
 export function GetTowerinfoById(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `tower/info?weatherid=${data.weatherid}`,
     method: "get",
   });
@@ -101,7 +101,7 @@ export function GetTowerinfoById(data) {
 //查询全部场站功率预测曲线数据
 export function GetAllPowerData(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `Forecast/shorttype?type=${data.type}&beginDate=${data.beginDate}&endDate=${data.endDate}`,
     method: "get",
   });
@@ -109,7 +109,7 @@ export function GetAllPowerData(data) {
 //查询单场站功率预测曲线数据
 export function GetPowerData(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `Forecast/short?wpId=${data.wpId}&beginDate=${data.beginDate}&endDate=${data.endDate}`,
     method: "get",
   });

src/api/home/home.js

@@ -13,35 +13,35 @@ export function FindRealtimeInfo(data) {
 }
 export function FindPowerInfo(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `cockpit/Powercurve24?wpId=${data.id}`,
     method: "get",
   });
 }
 export function FindUtilizationhours(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `cockpit/Utilizationhours?wpId=${data.wpId}&timetype=${data.timetype}`,
     method: "get",
   });
 }
 export function FindPlanproject(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `cockpit/Planproject?wpId=${data.wpId}&timetype=${data.timetype}`,
     method: "get",
   });
 }
 export function FindProjectplan(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `cockpit/projectplan?wpId=${data.wpId}`,
     method: "get",
   });
 }
 export function FindGroupRealtime(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `cockpit/GroupRealtime?wpId=${data.wpId}&uniformCode=${data.uniformCode}`,
     method: "get",
   });

src/api/monthlyPerformanceAnalysis.js

@@ -3,7 +3,7 @@ import request from "@/tools/request";
 // 获取公司列表
 export function getApicompanyslist(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: "/benchmarking/companys",
     method: "GET",
   });
@@ -11,7 +11,7 @@ export function getApicompanyslist(params) {
 // 获取场站列表
 export function getApiwpByCplistlist(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/benchmarking/wpByCplist?companyids=${params.companyid}&type=${params.type}`,
     method: "GET",
   });
@@ -19,7 +19,7 @@ export function getApiwpByCplistlist(params) {
 // 获取期次列表
 export function getApipjByWplist(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/benchmarking/pjByWplist?wpids=${params.wpids}`,
     method: "GET",
   });
@@ -27,7 +27,7 @@ export function getApipjByWplist(params) {
 // 获取线路列表
 export function getApilnByPjlist(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/benchmarking/lnByPjlist?pjids=${params.pjids}`,
     method: "GET",
   });
@@ -35,7 +35,7 @@ export function getApilnByPjlist(params) {
 // 获取风机列表
 export function getApiequipmentList(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/pro-basic-equipment/equipment-list?companyId=${params.companyId}&windpowerstationIds=${params.wpIds}&projectIds=${params.projectIds}&lineIds=${params.lineIds}&type=${params.type}`,
     method: "GET",
   });
@@ -43,7 +43,7 @@ export function getApiequipmentList(params) {
 // 通过场站获取风机列表
 export function getApiequipmentListByWp(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/pro-basic-equipment/equipmentsByWpid?wpid=${params.wpid}`,
     method: "GET",
   });
@@ -52,7 +52,7 @@ export function getApiequipmentListByWp(params) {
 // 获取单机性能总览------列表
 export function getApiwindturbinegoodnesslist(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: "/goodness/windturbinegoodness",
     method: "POST",
     headers: {
@@ -64,7 +64,7 @@ export function getApiwindturbinegoodnesslist(params) {
 // 获取单机性能总览------光伏列表
 export function getApiwindturbinegoodnesslistGf(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/goodness/pvgoodness?wpid=${params.wpId}&recorddate=${params.recorddate}&companys=${params.cmId}&target=''&sort=''`,
     method: "GET",
   });
@@ -72,7 +72,7 @@ export function getApiwindturbinegoodnesslistGf(params) {
 // 获取单机性能总览------历史列表
 export function getApihistorywindturbinegoodnesslist(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: "/goodness/goodhistorylist",
     method: "POST",
     headers: {
@@ -84,7 +84,7 @@ export function getApihistorywindturbinegoodnesslist(params) {
 // 获取单机性能总览------光伏历史列表
 export function getApihistorywindturbinegoodnesslistGf(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/goodness/pvgoodnesshis?wpid=${params.wpId}&beginDate=${params.beginDate}&wtid=${params.wtId}&target=''&sort=''&endDate=${params.endDate}`,
     method: "GET",
   });
@@ -92,7 +92,7 @@ export function getApihistorywindturbinegoodnesslistGf(params) {
 // 获取单机性能详情------查询功率曲线数据信息
 export function getApifindWtRealPowerChar(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/goodness/findWtRealPowerChar?recorddate=${params.recorddate}&wtId=${params.wtId}`,
     method: "GET",
   });
@@ -100,7 +100,7 @@ export function getApifindWtRealPowerChar(params) {
 // 获取单机性能详情------获得曲线区间区分功能数据
 export function getApigetplotBands(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/goodness/getplotBands?recorddate=${params.recorddate}&wtId=${params.wtId}`,
     method: "GET",
   });
@@ -108,7 +108,7 @@ export function getApigetplotBands(params) {
 // 获取单机性能详情------获取区域弹出列表信息
 export function getApiplotBandAjax(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/goodness/plotBandAjax?beginDate=${params.beginDate}&endDate=${params.endDate}&wtId=${params.wtId}`,
     method: "GET",
   });
@@ -116,21 +116,21 @@ export function getApiplotBandAjax(params) {
 // 获取单机性能详情------获取风场风机玫瑰图
 export function getApiComMGTWP(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `${params.url}?recorddate=${params.recorddate}&wpId=${params.wpId}`,
     method: "GET",
   });
 }
 export function getApiComMGTWT(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `${params.url}?recorddate=${params.recorddate}&wtId=${params.wtId}`,
     method: "GET",
   });
 }
 export function getApiComPie(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `${params.url}?recorddate=${params.recorddate}&wtId=${params.wtId}&type=${params.type}`,
     method: "GET",
   });
@@ -138,7 +138,7 @@ export function getApiComPie(params) {
 // 获取单机性能详情------获取24小时功率曲线
 export function getApifindRealPowerCharBy24(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/goodness/findRealPowerCharBy24?recorddate=${params.recorddate}&wtId=${params.wtId}`,
     method: "GET",
   });
@@ -146,7 +146,7 @@ export function getApifindRealPowerCharBy24(params) {
 // 获取单机性能详情------单台风机当日报警记录
 export function getApibjjllist(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: "/goodness/bjjllist",
     method: "POST",
     headers: {
@@ -158,7 +158,7 @@ export function getApibjjllist(params) {
 // 获取单机性能详情------单台风机当日故障停机记录
 export function getApigzjllist(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: "/goodness/gzjllist",
     method: "POST",
     headers: {
@@ -170,7 +170,7 @@ export function getApigzjllist(params) {
 // 获取单机性能详情------单台风机当日限电记录
 export function getApixdjllist(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: "/goodness/xdjllist",
     method: "POST",
     headers: {
@@ -182,7 +182,7 @@ export function getApixdjllist(params) {
 // 获取单机性能详情------查询明细页面显示信息
 export function getApiwadAjax(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/goodness/wadAjax?recorddate=${params.recorddate}&wtId=${params.wtId}`,
     method: "GET",
   });
@@ -190,7 +190,7 @@ export function getApiwadAjax(params) {
 // 获取单机性能详情------单台风机当月报警排行
 export function getApibjphlist(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: "/goodness/bjphlist",
     method: "POST",
     headers: {
@@ -202,7 +202,7 @@ export function getApibjphlist(params) {
 // 获取单机性能详情------获取明细页面功率曲线
 export function getApiglchat(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/goodness/glchat?recorddate=${params.recorddate}&wtId=${params.wtId}`,
     method: "GET",
   });
@@ -210,7 +210,7 @@ export function getApiglchat(params) {
 // 获取单机性能详情------获取风机风资源
 export function getApifjfzy(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/goodness/fjfzy?recorddate=${params.recorddate}&wtId=${params.wtId}`,
     method: "GET",
   });
@@ -220,7 +220,7 @@ export function getApifjfzy(params) {
 // 获取单机月度分析数据------列表
 export function getApisingleanalysisMainlist(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: "/singleanalysis/singleanalysisMain",
     method: "POST",
     headers: {
@@ -232,7 +232,7 @@ export function getApisingleanalysisMainlist(params) {
 // 获取单机月度分析数据------查询单机性能分析子页面
 export function getApisingleanalysisSub(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: "/singleanalysis/singleanalysisSub",
     method: "GET",
     params,
@@ -241,7 +241,7 @@ export function getApisingleanalysisSub(params) {
 // 单机信息总览图表接口(3个) 发电量和风速、五项损失、静风频率和待机时间
 export function getApisingleanalysisChart(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: "/singleanalysis/singleanalysisChart",
     method: "GET",
     params,
@@ -252,7 +252,7 @@ export function getApisingleanalysisChart(params) {
 // 获取切入切出管理------列表
 export function getApioutputSpeedlist(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: "/outputspeed/outputSpeedlist",
     method: "POST",
     headers: {
@@ -264,7 +264,7 @@ export function getApioutputSpeedlist(params) {
 // 获取切入切出管理------历史列表
 export function getApioutputSpeedhistorylist(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: "/outputspeed/outputspeedhistorylist",
     method: "POST",
     headers: {
@@ -278,7 +278,7 @@ export function getApioutputSpeedhistorylist(params) {
 // 单机横向对比列表
 export function getApiequipmentPerformaCompare(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/performa-compare/equipment-performa-compare?type=${params.type}&dateType=${params.dateType}&windturbineIds=${params.wtIds}&date=${params.date}`,
     method: "GET",
   });
@@ -286,7 +286,7 @@ export function getApiequipmentPerformaCompare(params) {
 // 单机横向对比echarts
 export function getApicurveFitting(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/performa-compare/curve-fitting?windturbineIds=${params.wtIds}`,
     method: "GET",
   });
@@ -295,21 +295,21 @@ export function getApicurveFitting(params) {
 // ------------------------------------------------------------等级评估------------------------------------------------------------------------
 export function getApiequipmentinfoDayList(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/pro-econ-equipment-info-day-top/equipmentinfo-day-list?companyId=${params.companyId}&date=${params.date}&staType=${params.staType}&types=${params.types}&type=${params.type}&windpowerstationId=${params.wpId}&pageNum=${params.pageNum}&pageSize=${params.pageSize}`,
     method: "GET",
   });
 }
 export function getApiequipmentinfoDayHistoryList(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/pro-econ-equipment-info-day-top/equipmentinfo-day-history-list?beginDate=${params.beginDate}&endDate=${params.endDate}&types=${params.types}&windturbineId=${params.wtId}`,
     method: "GET",
   });
 }
 export function getApiequipmentinfoDayCompareList(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/pro-econ-equipment-info-day-top/equipmentinfo-day-compare-list?ids=${params.oid}&ids=${params.tid}&types=${params.types}`,
     // url: '/pro-econ-equipment-info-day-top/equipmentinfo-day-compare-list?ids=1595968732880998402&ids=1595968732939718671&types=1',
     method: "GET",
@@ -319,7 +319,7 @@ export function getApiequipmentinfoDayCompareList(params) {
 // ------------------------------------------------------------功率曲线拟合------------------------------------------------------------------------
 export function getApiPerformancecurvefitting(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/performance/curvefitting?dateType=${params.dateType}&type=${params.type}&windturbineIds=${params.wtId}`,
     method: "GET",
   });
@@ -328,14 +328,14 @@ export function getApiPerformancecurvefitting(params) {
 // ------------------------------------------------------------综合分析------------------------------------------------------------------------
 export function getApimaintoplist(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/specific/maintoplist?companys=${params.companys}&type=${params.type}&month=${params.month}`,
     method: "GET",
   });
 }
 export function getApimaincenterlist(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/specific/maincenterlist?companys=${params.companys}&type=${params.type}&month=${params.month}`,
     method: "GET",
   });
@@ -343,7 +343,7 @@ export function getApimaincenterlist(params) {
 //查询全域当年电量
 export function getMonthElectricAnalyse(params) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/electricity/statistics?wpId=${params.wpId}&timetype=month`,
     method: "GET",
   });

src/api/performance.js

@@ -3,7 +3,7 @@ import request from "@/tools/request";
 //获取场站
 export function getStation(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/benchmarking/wpByCplist?companyids=${data.companyids}&type=${
       data.type || "-1"
     }`,
@@ -14,7 +14,7 @@ export function getStation(data) {
 //获取项目
 export function getProject(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/benchmarking/pjByWplist?wpids=${data.wpids}`,
     method: "get",
   });
@@ -23,7 +23,7 @@ export function getProject(data) {
 //获取线路
 export function getLine(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/benchmarking/lnByPjlist?pjids=${data.pjids}`,
     method: "get",
   });
@@ -32,7 +32,7 @@ export function getLine(data) {
 //风机绩效榜
 export function performance(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/benchmarking/performance?companyid=${data.companyid}&getype=${data.getype}&sttype=${data.sttype}&beginDate=${data.beginDate}&endDate=${data.endDate}&wpids=${data.wpids}&projectids=${data.projectids}&lineids=${data.lineids}&target=${data.target}&sort=${data.sort}`,
     method: "get",
   });
@@ -41,7 +41,7 @@ export function performance(data) {
 //风机绩效榜明细
 export function performanceMX(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/benchmarking/performanceMX?companyid=${data.companyid}&getype=${data.getype}&sttype=${data.sttype}&beginDate=${data.beginDate}&endDate=${data.endDate}&wpids=${data.wpids}&projectids=${data.projectids}&lineids=${data.lineids}&target=${data.target}&sort=${data.sort}`,
     method: "get",
   });
@@ -50,7 +50,7 @@ export function performanceMX(data) {
 //场际对标
 export function cjdb(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/benchmarking/cjdb?companys=${data.companys}&type=${data.type}&wpids=${data.wpids}&beginDate=${data.beginDate}&endDate=${data.endDate}&target=${data.target}&sort=${data.sort}&pageSize=${data.pageSize}&pageNum=${data.pageNum}`,
     method: "get",
   });
@@ -59,7 +59,7 @@ export function cjdb(data) {
 //对标详情
 export function details(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/benchmarking/details?id=${data.id}&beginDate=${data.beginDate}&endDate=${data.endDate}&target=${data.target}&sort=${data.sort}&pageSize=${data.pageSize}&pageNum=${data.pageNum}`,
     method: "get",
   });
@@ -68,7 +68,7 @@ export function details(data) {
 //场内对标
 export function cndb(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/benchmarking/cndb?companys=${data.companys}&type=${data.type}&wpid=${data.wpids}&beginDate=${data.beginDate}&endDate=${data.endDate}&target=${data.target}&sort=${data.sort}&pageSize=${data.pageSize}&pageNum=${data.pageNum}`,
     method: "get",
   });
@@ -77,7 +77,7 @@ export function cndb(data) {
 //项目对标
 export function xmdb(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/benchmarking/xmdb?companys=${data.companys}&type=${data.type}&wpids=${data.wpids}&projectids=${data.projectids}&beginDate=${data.beginDate}&endDate=${data.endDate}&target=${data.target}&sort=${data.sort}&pageSize=${data.pageSize}&pageNum=${data.pageNum}`,
     method: "get",
   });
@@ -86,7 +86,7 @@ export function xmdb(data) {
 //线路对标
 export function xldb(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/benchmarking/xldb?companys=${data.companys}&type=${data.type}&wpids=${data.wpids}&projectids=${data.projectids}&lineids=${data.lineids}&beginDate=${data.beginDate}&endDate=${data.endDate}&target=${data.target}&sort=${data.sort}&pageSize=${data.pageSize}&pageNum=${data.pageNum}`,
     method: "get",
   });
@@ -95,7 +95,7 @@ export function xldb(data) {
 //五项损失率
 export function wxssl(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/benchmarking/wxssl?companys=${data.companys}&type=${data.type}&wpids=${data.wpids}&projectids=${data.projectids}&lineids=${data.lineids}&beginDate=${data.beginDate}&endDate=${data.endDate}&target=${data.target}&sort=${data.sort}`,
     method: "get",
   });
@@ -104,7 +104,7 @@ export function wxssl(data) {
 //同环比
 export function thb(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/benchmarking/cndbthb?companys=${data.companys}&type=${data.type}&wpid=${data.wpids}&pageSize=${data.pageSize}&pageNum=${data.pageNum}`,
     method: "get",
   });
@@ -113,7 +113,7 @@ export function thb(data) {
 //值际对标
 export function zjdb(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `/pro-econ-benchmarking-between/zjwxssl?beginDate=${data.beginDate}&endDate=${data.endDate}`,
     method: "get",
   });

src/api/points/index.js

@@ -8,7 +8,7 @@ export function GetPointFitting(data) {
     data.endTime = "";
   }
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `findPointFitting?pointIds=${data.pointIds}&interval=${data.interval}&begin=${data.begin}&end=${data.end}`,
     method: "get",
   });
@@ -16,7 +16,7 @@ export function GetPointFitting(data) {
 //获取测点曲线数据
 export function GetWtPoints(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `findWtPoints?wtid=${data.wtid}&uniformcodes=${data.uniformcodes}`,
     method: "get",
   });
@@ -24,7 +24,7 @@ export function GetWtPoints(data) {
 //获取场站测点曲线数据
 export function GetWpPoints(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `findWpPoints?wpid=${data.wpid}&uniformcodes=${data.uniformcodes}`,
     method: "get",
   });
@@ -32,7 +32,7 @@ export function GetWpPoints(data) {
 //获取调度场站测点曲线数据
 export function GetSubPoints(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `findSubPoints?wpid=${data.wpid}&uniformcodes=${data.uniformcodes}`,
     method: "get",
   });
@@ -40,7 +40,7 @@ export function GetSubPoints(data) {
 //获取场站期次测点曲线数据
 export function GetProPoints(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `findProPoints?wpid=${data.wpid}&uniformcodes=${data.uniformcodes}`,
     method: "get",
   });
@@ -48,7 +48,7 @@ export function GetProPoints(data) {
 //获取统一编码数据
 export function GetPointsData(data) {
   return request({
-    baseURL: process.env.VUE_APP_Matrix,
+    baseURL: process.env.VUE_APP_API,
     url: `findPointDatas?pointIds=${data.pointIds}`,
     method: "get",
   });

src/api/reportForms.js

@@ -1,50 +1,58 @@
-import request from '@/tools/request'
+import request from "@/tools/request";
 
 // 新能源日报
 export function getNemDailyReportData(data) {
-    return request({
-        url: process.env.VUE_APP_Matrix + `/reports/GetNemDailyReportData?date=${data}`,
-        method: 'get'
-    })
+  return request({
+    url:
+      process.env.VUE_APP_API + `/reports/GetNemDailyReportData?date=${data}`,
+    method: "get",
+  });
 }
 
 // 新能源月报
 export function getNemMonthReportData(data) {
-    return request({
-        url: process.env.VUE_APP_Matrix + `/reports/GetNemMonthReportData?date=${data.date}&stationId=${data.stationId}`,
-        method: 'get'
-    })
+  return request({
+    url:
+      process.env.VUE_APP_API +
+      `/reports/GetNemMonthReportData?date=${data.date}&stationId=${data.stationId}`,
+    method: "get",
+  });
 }
 
 // 获取公司列表
 export function getApicompanyslist(data) {
-    return request({
-        url: process.env.VUE_APP_Matrix + `/assets/GetCompanyList?type=${data.type}`,
-        method: 'get',
-    })
+  return request({
+    url: process.env.VUE_APP_API + `/assets/GetCompanyList?type=${data.type}`,
+    method: "get",
+  });
 }
 
-
 // 获取场站列表
 export function getApiwpByCplistlist(data) {
-    return request({
-        url: process.env.VUE_APP_Matrix + `/assets/GetPowerStation?companyCode=${data.companyCode}&stationType=${data.stationType}`,
-        method: 'get',
-    })
+  return request({
+    url:
+      process.env.VUE_APP_API +
+      `/assets/GetPowerStation?companyCode=${data.companyCode}&stationType=${data.stationType}`,
+    method: "get",
+  });
 }
 
 // 各风场生产月报
 export function getPowerStationMonthReportData(data) {
-    return request({
-        url: process.env.VUE_APP_Matrix + `/reports/GetPowerStationMonthReportData?date=${data.date}&stationId=${data.stationId}`,
-        method: 'get',
-    })
+  return request({
+    url:
+      process.env.VUE_APP_API +
+      `/reports/GetPowerStationMonthReportData?date=${data.date}&stationId=${data.stationId}`,
+    method: "get",
+  });
 }
 
 // 各风场生产月报
 export function getEquipmentReportData(data) {
-    return request({
-        url: process.env.VUE_APP_Matrix + `/reports/GetEquipmentReportData?date=${data.date}&stationId=${data.stationId}`,
-        method: 'get',
-    })
+  return request({
+    url:
+      process.env.VUE_APP_API +
+      `/reports/GetEquipmentReportData?date=${data.date}&stationId=${data.stationId}`,
+    method: "get",
+  });
 }

src/api/wisdomOverhaul/fault/index.js

@@ -2,38 +2,37 @@ import request from "../../../tools/request";
 
 //等级评估--获取表格数据
 const powercompareProjectAjax = (data) => {
-    return request({
-        baseURL: process.env.VUE_APP_NEW_WISDOM,
-        url: `powercompare/projectAjax?wpIds=${data.wpIds}`,
-        method: "get",
-    });
+  return request({
+    baseURL: process.env.VUE_APP_NEW_WISDOM,
+    url: `powercompare/projectAjax?wpIds=${data.wpIds}`,
+    method: "get",
+  });
 };
 const stopanalysisStopAnalysisList = (data) => {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `health/stopAnalysisList?wpId=${data.wpId}&isAsc=${data.isAsc}&modelId=${data.modelId}&typeId=${data.typeId}`,
-        method: "get",
-    });
+  return request({
+    baseURL: process.env.VUE_APP_API,
+    url: `health/stopAnalysisList?wpId=${data.wpId}&isAsc=${data.isAsc}&modelId=${data.modelId}&typeId=${data.typeId}`,
+    method: "get",
+  });
 };
 const stopanalysisStopAnalysisTree = (data) => {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `health/stopAnalysisTree?mainId=${data.mainId}&wtId=${data.wtId}&values=${data.values}`,
-        method: "get",
-    });
-};  
+  return request({
+    baseURL: process.env.VUE_APP_API,
+    url: `health/stopAnalysisTree?mainId=${data.mainId}&wtId=${data.wtId}&values=${data.values}`,
+    method: "get",
+  });
+};
 const eventGetShutdownevent = (data) => {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `/fault/getShutdownevent?pageNum=${data.tablepar.pageNum}&pageSize=${data.tablepar.pageSize}&beginDate=${data.beginDate}&endDate=${data.endDate}&wpId=${data.wpId}&type=${data.type}&wtId=${data.wtId}`,
-        method: "post",
-    });
+  return request({
+    baseURL: process.env.VUE_APP_API,
+    url: `/fault/getShutdownevent?pageNum=${data.tablepar.pageNum}&pageSize=${data.tablepar.pageSize}&beginDate=${data.beginDate}&endDate=${data.endDate}&wpId=${data.wpId}&type=${data.type}&wtId=${data.wtId}`,
+    method: "post",
+  });
 };
 
-
 export default {
-    powercompareProjectAjax,
-    stopanalysisStopAnalysisList,
-    stopanalysisStopAnalysisTree,
-    eventGetShutdownevent,
-}
+  powercompareProjectAjax,
+  stopanalysisStopAnalysisList,
+  stopanalysisStopAnalysisTree,
+  eventGetShutdownevent,
+};

src/api/wisdomOverhaul/index.js

@@ -1,72 +1,69 @@
 import request from "../../tools/request";
 
 const sandtableFindWtInfo = (data) => {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `sandtable/findWtInfo?wpId=${data.wpId}`,
-        method: "POST",
-    });
+  return request({
+    baseURL: process.env.VUE_APP_API,
+    url: `sandtable/findWtInfo?wpId=${data.wpId}`,
+    method: "POST",
+  });
 };
 const sandtableJudgeWpHealth = (data) => {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `sandtable/judgeWpHealth?wpId=${data.wpId}`,
-        method: "POST",
-    });
+  return request({
+    baseURL: process.env.VUE_APP_API,
+    url: `sandtable/judgeWpHealth?wpId=${data.wpId}`,
+    method: "POST",
+  });
 };
 const queryAlltotal = (data) => {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `alarm/count/query/alltotal?stationid=${data.stationid}`,
-        method: "get",
-    });
+  return request({
+    baseURL: process.env.VUE_APP_API,
+    url: `alarm/count/query/alltotal?stationid=${data.stationid}`,
+    method: "get",
+  });
 };
 const countAlltotal = (data) => {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `shutdown/count/alltotal?stId=${data.stId}`,
-        method: "get",
-    });
+  return request({
+    baseURL: process.env.VUE_APP_API,
+    url: `shutdown/count/alltotal?stId=${data.stId}`,
+    method: "get",
+  });
 };
 const inventoryGroupcount = (data) => {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `inventory/groupcount?stId=${data.stId}`,
-        method: "get",
-    });
+  return request({
+    baseURL: process.env.VUE_APP_API,
+    url: `inventory/groupcount?stId=${data.stId}`,
+    method: "get",
+  });
 };
 const equoperationrecordEquupdatecount = (data) => {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `equoperationrecord/equupdatecount?stId=${data.stId}`,
-        method: "get",
-    });
+  return request({
+    baseURL: process.env.VUE_APP_API,
+    url: `equoperationrecord/equupdatecount?stId=${data.stId}`,
+    method: "get",
+  });
 };
 const equoperationrecordTop4 = (data) => {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `equoperationrecord/top4?stId=${data.stId}`,
-        method: "get",
-    });
+  return request({
+    baseURL: process.env.VUE_APP_API,
+    url: `equoperationrecord/top4?stId=${data.stId}`,
+    method: "get",
+  });
 };
 const benchmarkZyzb = (data) => {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `benchmark/zyzb?windPowerStation=${data.windPowerStation}`,
-        method: "get",
-    });
+  return request({
+    baseURL: process.env.VUE_APP_API,
+    url: `benchmark/zyzb?windPowerStation=${data.windPowerStation}`,
+    method: "get",
+  });
 };
 
 export default {
-    sandtableFindWtInfo,
-    sandtableJudgeWpHealth,
-    queryAlltotal,
-    countAlltotal,
-    inventoryGroupcount,
-    equoperationrecordEquupdatecount,
-    equoperationrecordTop4,
-    benchmarkZyzb,
-    
-
-
-}
+  sandtableFindWtInfo,
+  sandtableJudgeWpHealth,
+  queryAlltotal,
+  countAlltotal,
+  inventoryGroupcount,
+  equoperationrecordEquupdatecount,
+  equoperationrecordTop4,
+  benchmarkZyzb,
+};

src/api/wisdomOverhaul/lifecycle/index.js

@@ -1,47 +1,45 @@
 import request from "../../../tools/request";
 
-
 const companiesList = (data) => {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `/reliability/companies`,
-        method: "get",
-    });
+  return request({
+    baseURL: process.env.VUE_APP_API,
+    url: `/reliability/companies`,
+    method: "get",
+  });
 };
 const warehouseList = (data) => {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `/health/warehouse`,
-        method: "get",
-    });
+  return request({
+    baseURL: process.env.VUE_APP_API,
+    url: `/health/warehouse`,
+    method: "get",
+  });
 };
 const polineList = (data) => {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `reliability/poline?vendor=${data.vendor}&ponum=${data.ponum}&warehouse=${data.warehouse}&starttime=${data.starttime}&endtime=${data.endtime}&pagenum=${data.pagenum}&pagesize=${data.pagesize}`,
-        method: "post",
-    });
+  return request({
+    baseURL: process.env.VUE_APP_API,
+    url: `reliability/poline?vendor=${data.vendor}&ponum=${data.ponum}&warehouse=${data.warehouse}&starttime=${data.starttime}&endtime=${data.endtime}&pagenum=${data.pagenum}&pagesize=${data.pagesize}`,
+    method: "post",
+  });
 };
 const windturbineList = (data) => {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `/reliability/windturbine?wtnum=${data.wtid}`,
-        method: "get",
-    });
+  return request({
+    baseURL: process.env.VUE_APP_API,
+    url: `/reliability/windturbine?wtnum=${data.wtid}`,
+    method: "get",
+  });
 };
 const equoperationrecordList = (data) => {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `/reliability/equoperationrecordList?wtid=${data.wtid}&starttime=${data.starttime}&endtime=${data.endtime}&type=${data.type}&pagenum=${data.pagenum}&pagesize=${data.pagesize}`,
-        method: "post",
-    });
+  return request({
+    baseURL: process.env.VUE_APP_API,
+    url: `/reliability/equoperationrecordList?wtid=${data.wtid}&starttime=${data.starttime}&endtime=${data.endtime}&type=${data.type}&pagenum=${data.pagenum}&pagesize=${data.pagesize}`,
+    method: "post",
+  });
 };
 
 export default {
-    companiesList,
-    warehouseList,
-    polineList,
-    windturbineList,
-    equoperationrecordList
-
-}
+  companiesList,
+  warehouseList,
+  polineList,
+  windturbineList,
+  equoperationrecordList,
+};

src/api/wisdomOverhaul/one/index.js

@@ -1,13 +1,13 @@
 import request from "../../../tools/request";
 
 const analysisDetail = (data) => {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `/health/analysis/detail?station=${data.station}&startTs=${data.startTs}&endTs=${data.endTs}&interval=${data.interval}&wtId=${data.wtId}&name=${data.name}`,
-        method: "get",
-    });
+  return request({
+    baseURL: process.env.VUE_APP_API,
+    url: `/health/analysis/detail?station=${data.station}&startTs=${data.startTs}&endTs=${data.endTs}&interval=${data.interval}&wtId=${data.wtId}&name=${data.name}`,
+    method: "get",
+  });
 };
 
 export default {
-    analysisDetail
-}
+  analysisDetail,
+};

src/api/wisdomOverhaul/reliability/index.js

@@ -1,74 +1,74 @@
 import request from "../../../tools/request";
 
 const analysisDetail = (data) => {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `/health/analysis/detail?station=${data.station}&startTs=${data.startTs}&endTs=${data.endTs}&interval=${data.interval}&wtId=${data.wtId}&name=${data.name}`,
-        method: "get",
-    });
+  return request({
+    baseURL: process.env.VUE_APP_API,
+    url: `/health/analysis/detail?station=${data.station}&startTs=${data.startTs}&endTs=${data.endTs}&interval=${data.interval}&wtId=${data.wtId}&name=${data.name}`,
+    method: "get",
+  });
 };
-const countQuery = (showLoading,data) => {
-    return request({
-        showLoading,
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `alarm/findEarlyWarningAnalysis?stationid=${data.stationid}&startdate=${data.startdate}&enddate=${data.enddate}`,
-        method: "get",
-    });
+const countQuery = (showLoading, data) => {
+  return request({
+    showLoading,
+    baseURL: process.env.VUE_APP_API,
+    url: `alarm/findEarlyWarningAnalysis?stationid=${data.stationid}&startdate=${data.startdate}&enddate=${data.enddate}`,
+    method: "get",
+  });
 };
 // 预警分析
-const radarGzfx = (showLoading,data) => {
-    return request({
-        showLoading,
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `radar/gzfx?stId=${data.stId}&Date=${data.Date}`,
-        method: "get",
-    });
+const radarGzfx = (showLoading, data) => {
+  return request({
+    showLoading,
+    baseURL: process.env.VUE_APP_API,
+    url: `radar/gzfx?stId=${data.stId}&Date=${data.Date}`,
+    method: "get",
+  });
 };
 const treeType = (data) => {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `/alarm/treeType`,
-        method: "get",
-    });
+  return request({
+    baseURL: process.env.VUE_APP_API,
+    url: `/alarm/treeType`,
+    method: "get",
+  });
 };
 const shutdownList = (data) => {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `alarm/findRecentFault?stId=${data.stId}&endDate=${data.endDate}&startDate=${data.startDate}`,
-        method: "get",
-    });
+  return request({
+    baseURL: process.env.VUE_APP_API,
+    url: `alarm/findRecentFault?stId=${data.stId}&endDate=${data.endDate}&startDate=${data.startDate}`,
+    method: "get",
+  });
 };
 const earlyWarn = (data) => {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `/reliability/earlyWarn?wpid=${data.wpid}&date=${data.date}`,
-        method: "get",
-    });
+  return request({
+    baseURL: process.env.VUE_APP_API,
+    url: `/reliability/earlyWarn?wpid=${data.wpid}&date=${data.date}`,
+    method: "get",
+  });
 };
 const failurestatistics = (data) => {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `/reliability/failurestatistics?wpid=${data.wpid}&date=${data.date}`,
-        method: "get",
-    });
+  return request({
+    baseURL: process.env.VUE_APP_API,
+    url: `/reliability/failurestatistics?wpid=${data.wpid}&date=${data.date}`,
+    method: "get",
+  });
 };
 
 // 雷达图
 const radarYjfx = (data) => {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `/health/radar/yjfx?stationid=${data.stationid}&date=${data.date}`,
-        method: "get",
-    });
+  return request({
+    baseURL: process.env.VUE_APP_API,
+    url: `/health/radar/yjfx?stationid=${data.stationid}&date=${data.date}`,
+    method: "get",
+  });
 };
 
 export default {
-    analysisDetail,
-    countQuery,
-    treeType,
-    shutdownList,
-    earlyWarn,
-    failurestatistics,
-    radarGzfx,
-    radarYjfx
-}
+  analysisDetail,
+  countQuery,
+  treeType,
+  shutdownList,
+  earlyWarn,
+  failurestatistics,
+  radarGzfx,
+  radarYjfx,
+};

src/api/wisdomOverhaul/windResources/index.js

@@ -1,44 +1,44 @@
 import request from "../../../tools/request";
 const scatterAjax = (data) => {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `scatter/scatterAjax?wpId=${data.wpId}&pjId=${data.pjId}&lnId=${data.lnId}&year=${data.year}&wpId=${data.month}&month=${data.month}`,
-        method: "get",
-    });
+  return request({
+    baseURL: process.env.VUE_APP_API,
+    url: `scatter/scatterAjax?wpId=${data.wpId}&pjId=${data.pjId}&lnId=${data.lnId}&year=${data.year}&wpId=${data.month}&month=${data.month}`,
+    method: "get",
+  });
 };
 const projectAjax = (data) => {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `powercompare/projectAjax?wpIds=${data.wpIds}`,
-        method: "get",
-    });
+  return request({
+    baseURL: process.env.VUE_APP_API,
+    url: `powercompare/projectAjax?wpIds=${data.wpIds}`,
+    method: "get",
+  });
 };
 const lineWpIdAjax = (data) => {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `powercompare/lineWpIdAjax?wpId=${data.wpId}`,
-        method: "get",
-    });
+  return request({
+    baseURL: process.env.VUE_APP_API,
+    url: `powercompare/lineWpIdAjax?wpId=${data.wpId}`,
+    method: "get",
+  });
 };
 const getWinddirection = (data) => {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `winddirection/getWinddirection?wpId=${data.wpId}&recorddate=${data.recorddate}`,
-        method: "get",
-    });
+  return request({
+    baseURL: process.env.VUE_APP_API,
+    url: `winddirection/getWinddirection?wpId=${data.wpId}&recorddate=${data.recorddate}`,
+    method: "get",
+  });
 };
-const goodness = (url,data) => {
-    return request({
-        baseURL: process.env.VUE_APP_Matrix,
-        url: `${url}?wpId=${data.wpId}&recorddate=${data.recorddate}`,
-        method: "get",
-    });
+const goodness = (url, data) => {
+  return request({
+    baseURL: process.env.VUE_APP_API,
+    url: `${url}?wpId=${data.wpId}&recorddate=${data.recorddate}`,
+    method: "get",
+  });
 };
 
 export default {
-    scatterAjax,
-    projectAjax,
-    lineWpIdAjax,
-    getWinddirection,
-    goodness,
-}
+  scatterAjax,
+  projectAjax,
+  lineWpIdAjax,
+  getWinddirection,
+  goodness,
+};

src/components/chart/powerEcharts.vue

@@ -7,7 +7,7 @@
   >
     24小时功率曲线
   </div>
-  <div id="main" :style="{ width: width, height: height }"></div>
+  <div :id="'main' + id" :style="{ width: width, height: height }"></div>
 </template>
 
 <script>
@@ -16,6 +16,10 @@ import dayjs from "dayjs";
 export default {
   name: "powerEcharts",
   props: {
+    id: {
+      type: String,
+      default: "",
+    },
     showTitle: {
       type: Boolean,
       default: true,
@@ -61,7 +65,7 @@ export default {
   },
   methods: {
     getChart() {
-      var chartDom = document.getElementById("main");
+      var chartDom = document.getElementById(`main${this.id}`);
       var myChart = echarts.init(chartDom); // 绘制图表
       var options = {
         title: {},
@@ -159,7 +163,7 @@ export default {
           if (item.value) {
             result = {
               dateTime: item.dateTime,
-              value: (item.value / this.ratio).toFixed(2),
+              value: item.value,
             };
           } else {
             result = item;
@@ -196,98 +200,45 @@ export default {
       return timeStamp;
     },
     series() {
-      if (this.predictFlag) {
-        let series = [
-          {
-            name: "预测功率",
-            type: "line",
-            smooth: true,
-            symbol: "none",
-            lineStyle: {
-              width: 1,
-            },
-            color: "#05BB4C",
-            data: this.getData(this.CurveValues[0]?.value),
-          },
-          {
-            name: "保证功率",
-            type: "line",
-            smooth: true,
-            symbol: "none",
-            lineStyle: {
-              width: 1,
-            },
-            color: "#C530C8",
-            data: this.getData(this.CurveValues[1]?.value),
-          },
-          {
-            name: "理论功率",
-            type: "line",
-            smooth: true,
-            symbol: "none",
-            lineStyle: {
-              width: 1,
-            },
-            color: "#FF8700FF",
-            data: this.getData(this.CurveValues[2]?.value),
-          },
-          {
-            name: "实际功率",
-            type: "line",
-            smooth: true,
-            symbol: "none",
-            lineStyle: {
-              width: 1,
-            },
-            color: "#1C99FFFF",
-            textStyle: {
-              color: "red",
-            },
-            data: this.getData(this.CurveValues[3]?.value),
+      let series = [
+        {
+          name: "预测功率",
+          type: "line",
+          smooth: true,
+          symbol: "none",
+          lineStyle: {
+            width: 1,
           },
-        ];
-        return series;
-      } else {
-        let series = [
-          {
-            name: "保证功率",
-            type: "line",
-            smooth: true,
-            symbol: "none",
-            lineStyle: {
-              width: 1,
-            },
-            color: "#C530C8",
-            data: this.getData(this.CurveValues[0]?.value),
+          color: "#C530C8",
+          data: this.getData(this.CurveValues[0]?.value),
+        },
+        {
+          name: "理论功率",
+          type: "line",
+          smooth: true,
+          symbol: "none",
+          lineStyle: {
+            width: 1,
           },
-          {
-            name: "理论功率",
-            type: "line",
-            smooth: true,
-            symbol: "none",
-            lineStyle: {
-              width: 1,
-            },
-            color: "#FF8700FF",
-            data: this.getData(this.CurveValues[1]?.value),
+          color: "#FF8700FF",
+          data: this.getData(this.CurveValues[1]?.value),
+        },
+        {
+          name: "实际功率",
+          type: "line",
+          smooth: true,
+          symbol: "none",
+          lineStyle: {
+            width: 1,
           },
-          {
-            name: "实际功率",
-            type: "line",
-            smooth: true,
-            symbol: "none",
-            lineStyle: {
-              width: 1,
-            },
-            color: "#1C99FFFF",
-            textStyle: {
-              color: "red",
-            },
-            data: this.getData(this.CurveValues[2]?.value),
+          color: "#1C99FFFF",
+          textStyle: {
+            color: "red",
           },
-        ];
-        return series;
-      }
+          data: this.getData(this.CurveValues[2]?.value),
+        },
+      ];
+      return series;
     },
   },
   watch: {

src/views/Home/components/map.vue

@@ -9,7 +9,11 @@
       :isShows="false"
     />
     <!-- 山西左侧信息 -->
-    <div v-if="currentTitle != '全国'" class="sx-left-box">
+    <div
+      v-if="currentTitle != '全国'"
+      class="sx-left-box"
+      :style="{ zIndex: dialogShow ? 6 : 5 }"
+    >
       <div class="security-days safe_power">
         <div class="text">安全天数:</div>
         <div class="num">
@@ -322,7 +326,11 @@
           </li>
         </ul>
       </div>
-      <div class="my_echarts safe_power" v-if="penetrateType == 3">
+      <div
+        class="my_echarts safe_power"
+        v-if="penetrateType == 3"
+        @dblclick="handleShowCharts(currentTitle)"
+      >
         <power-echarts
           :CurveValues="CurveValues"
           width="680px"
@@ -333,6 +341,33 @@
         />
       </div>
     </div>
+    <el-dialog
+      class="dialogs"
+      width="80%"
+      top="100px"
+      v-model="dialogShow"
+      :show-close="true"
+      destroy-on-close
+    >
+      <template #title>
+        <div class="dialog-title">
+          <img class="dialog-title-img" src="@assets/imgs/dialog-title.png" />
+          <div class="title">{{ showName }}</div>
+        </div>
+      </template>
+      <div class="dialog-body" style="height: 600px">
+        <img class="dialog-img" src="@assets/imgs/dialog.png" />
+        <power-echarts
+          :id="'show-chart'"
+          :showTitle="false"
+          :CurveValues="showCharts"
+          width="100%"
+          height="560px"
+          :unit="'MW'"
+          :orient="'horizontal'"
+        />
+      </div>
+    </el-dialog>
     <!-- 全国左侧信息 -->
     <div class="leftBox" v-if="currentTitle == '全国'">
       <div
@@ -684,7 +719,11 @@
       </div>
     </div>
     <!-- 展示当前场站名称 -->
-    <div class="name-box" v-if="currentTitle != '全国'">
+    <div
+      class="name-box"
+      :style="{ zIndex: dialogShow || dialogVisible || dialogElectric ? 2 : 7 }"
+      v-if="currentTitle != '全国'"
+    >
       <div class="name-box-title">
         {{ currentTitle }}
       </div>
@@ -692,6 +731,7 @@
     <!-- 返回按钮 -->
     <div
       class="return"
+      :style="{ zIndex: dialogShow || dialogVisible || dialogElectric ? 2 : 7 }"
       @click="
         backMap(
           stationList[currents - 1]?.wpId,
@@ -1495,6 +1535,15 @@ export default {
       unit: "", //实时负荷弹窗单位
       wpId: "KGDL_FGS",
       wpIds: "KGDL_FGS0",
+      dialogShow: false,
+      showCharts: {
+        value: [
+          {
+            title: "",
+            value: [],
+          },
+        ],
+      },
     };
   },
   emits: {
@@ -1503,6 +1552,14 @@ export default {
   },
   // 函数
   methods: {
+    //放大24小时功率曲线
+    handleShowCharts(title) {
+      //   console.log(title);
+
+      this.showCharts = this.CurveValues;
+      this.showName = `${title}24小时功率预测曲线`;
+      this.dialogShow = true;
+    },
     // 点击地图展示类型
     mapClick(wpId, activeTab) {
       clearInterval(this.timmer);
@@ -1823,10 +1880,10 @@ export default {
         if (res.data) {
           let Powertrend = {
             // 图表所用单位
-            units: ["(万KWh)", "(风速)"],
+            units: ["(万KWh)", ""],
             value: [
               {
-                title: "保证功率",
+                title: "预测功率",
                 smooth: true, // 使用单位
                 value: [],
               },

src/views/Home/index.vue

@@ -105,6 +105,9 @@ export default {
   }
   .sx-left-box {
     padding-left: 30px;
+    position: relative;
+    // z-index: 6;
+    max-width: 650px;
   }
   .security-days {
     // position: absolute;

src/views/economicsOperation/monthElectricAnalyse/index.vue

@@ -41,7 +41,7 @@
       v-loading="loading"
       element-loading-background="rgba(4, 12, 11, 0.8)"
     >
-      <img src="@/assets/imgs/glycfx-bg.png" alt="" />
+      <img src="@/assets/imgs/glycfx-bg1.png" alt="" />
       <div class="line clearfix">
         <div class="leftContent">
           <span>{{ selectValue }}</span>
@@ -240,7 +240,7 @@ export default {
   .search {
     display: flex;
     flex-direction: row;
-    padding-top: 20px;
+    padding: 15px 0;
     align-items: center;
     justify-content: space-between;
 
@@ -286,17 +286,14 @@ export default {
   }
   .parcel-content {
     width: 100%;
-    height: calc(100% - 77px);
+    height: calc(100% - 88px);
     position: relative;
-    padding-top: 15px;
-    // background: url("~@/assets/imgs/yfdl-bg.png") no-repeat;
     img {
       position: absolute;
-      top: 50%;
-      left: 50%;
-      transform: translate(-50%, -50%);
-      //   min-width: 100%;
-      //   min-height: 100%;
+      top: 0;
+      left: 0;
+      width: 100%;
+      height: 100%;
     }
     .line {
       .leftContent {

src/views/layout/Menu.vue

@@ -761,7 +761,7 @@ export default {
   position: absolute;
   top: 0;
   left: 50px;
-  width: 158px;
+  width: 184px;
   height: 100%;
   padding-top: 10px;
   background: fade(#192a26, 75);
@@ -784,7 +784,7 @@ export default {
         display: flex;
         width: 100%;
         height: 100%;
-        padding: 0 20px;
+        padding: 0 10px;
         font-size: 14px;
         text-decoration: unset;
         white-space: nowrap;
@@ -813,7 +813,7 @@ export default {
       }
 
       .sub-menu-text {
-        margin-left: 1.1111vh;
+        margin-left: 10px;
         color: @gray-l;
       }
 

src/views/stateMonitor/factoryMonitor/photovoltaic/lightBoosterStation/components/fangshansunjiashan.vue

@@ -7,7 +7,6 @@
           xmlns="http://www.w3.org/2000/svg"
           xmlns:xlink="http://www.w3.org/1999/xlink"
           viewBox="0 0 1920 1080"
-          style="background: rgb(4, 12, 11)"
         >
           <g>
             <path

src/views/stateMonitor/factoryMonitor/photovoltaic/lightBoosterStation/components/tianzhenxusheng.vue

@@ -7,7 +7,6 @@
           xmlns="http://www.w3.org/2000/svg"
           xmlns:xlink="http://www.w3.org/1999/xlink"
           viewBox="0 0 1920 1080"
-          style="background: rgb(4, 12, 11)"
         >
           <g>
             <g

src/views/stateMonitor/factoryMonitor/photovoltaic/lightBoosterStation/components/youyuyouwei.vue

@@ -7,7 +7,6 @@
           xmlns="http://www.w3.org/2000/svg"
           xmlns:xlink="http://www.w3.org/1999/xlink"
           viewBox="0 0 1920 1080"
-          style="background: rgb(4, 12, 11)"
         >
           <g>
             <path

src/views/stateMonitor/factoryMonitor/windPowerPlant/boosterStation/components/BHB.vue

@@ -7,7 +7,7 @@
           xmlns="http://www.w3.org/2000/svg"
           xmlns:xlink="http://www.w3.org/1999/xlink"
           viewBox="0 0 1920 1080"
-          style="background: rgb(4, 12, 11)"
+          
         >
           <g>
             <path

src/views/stateMonitor/factoryMonitor/windPowerPlant/boosterStation/components/BHBSQ.vue

@@ -7,7 +7,7 @@
           xmlns="http://www.w3.org/2000/svg"
           xmlns:xlink="http://www.w3.org/1999/xlink"
           viewBox="0 0 1920 1080"
-          style="background: rgb(4, 12, 11)"
+         
         >
           <g>
             <path

src/views/stateMonitor/factoryMonitor/windPowerPlant/boosterStation/components/GJY.vue

@@ -7,7 +7,7 @@
           xmlns="http://www.w3.org/2000/svg"
           xmlns:xlink="http://www.w3.org/1999/xlink"
           viewBox="0 0 1920 1080"
-          style="background: rgb(4, 12, 11)"
+          
         >
           <g>
             <path

src/views/stateMonitor/factoryMonitor/windPowerPlant/boosterStation/components/MLJ.vue

@@ -7,7 +7,7 @@
           xmlns="http://www.w3.org/2000/svg"
           xmlns:xlink="http://www.w3.org/1999/xlink"
           viewBox="0 0 1920 1080"
-          style="background: rgb(0, 0, 0)"
+          
         >
           <g>
             <path

src/views/stateMonitor/factoryMonitor/windPowerPlant/boosterStation/components/PTZ.vue

@@ -7,7 +7,6 @@
           xmlns="http://www.w3.org/2000/svg"
           xmlns:xlink="http://www.w3.org/1999/xlink"
           viewBox="0 0 1920 1080"
-          style="background: rgb(0, 0, 0)"
         >
           <g>
             <path

src/views/stateMonitor/factoryMonitor/windPowerPlant/boosterStation/components/YTY.vue

@@ -7,7 +7,6 @@
           xmlns="http://www.w3.org/2000/svg"
           xmlns:xlink="http://www.w3.org/1999/xlink"
           viewBox="0 0 1920 1080"
-          style="background: rgb(4, 12, 11)"
         >
           <g>
             <path

src/views/stateMonitor/factoryMonitor/windPowerPlant/boosterStation/components/ZK.vue

@@ -7,7 +7,6 @@
           xmlns="http://www.w3.org/2000/svg"
           xmlns:xlink="http://www.w3.org/1999/xlink"
           viewBox="0 0 1920 1080"
-          style="background: rgb(4, 12, 11)"
         >
           <g>
             <path

src/views/stateMonitor/factoryMonitor/windPowerPlant/windPower/components/windEchart.vue

@@ -1,7 +1,5 @@
 <template>
-  <div>
-    <div id="maine" style="width: 100%; height: 250px"></div>
-  </div>
+  <div :id="'maine' + id" :style="{ width, height }"></div>
 </template>
 
 <script>
@@ -11,10 +9,13 @@ import dayjs from "dayjs";
 export default {
   name: "windEcharts",
   props: {
+    id: { type: String, default: "" },
     CurveValues: {
       type: Array,
       required: true,
     },
+    height: { type: String, default: "" },
+    width: { type: String, default: "" },
     ratio: {
       type: Number,
       default: 1,
@@ -32,7 +33,7 @@ export default {
   },
   methods: {
     getChart() {
-      var chartDom = document.getElementById("maine");
+      var chartDom = document.getElementById(`maine${this.id}`);
       var myChart = echarts.init(chartDom); // 绘制图表
       var options = {
         title: {},
@@ -121,24 +122,13 @@ export default {
             lineStyle: {
               width: 1,
             },
-            color: "#1C99FFFF",
+            color: "#C530C8",
             textStyle: {
               color: "red",
             },
             data: this.getData(this.CurveValues[0]?.value),
           },
           {
-            name: "保证功率",
-            type: "line",
-            smooth: true,
-            symbol: "none",
-            lineStyle: {
-              width: 1,
-            },
-            color: "#05BB4C",
-            data: this.getData(this.CurveValues[1]?.value),
-          },
-          {
             name: "理论功率",
             type: "line",
             smooth: true,
@@ -146,8 +136,8 @@ export default {
             lineStyle: {
               width: 1,
             },
-            color: "#C530C8",
-            data: this.getData(this.CurveValues[2]?.value),
+            color: "#FF8700FF",
+            data: this.getData(this.CurveValues[1]?.value),
           },
           {
             name: "实际功率",
@@ -157,8 +147,8 @@ export default {
             lineStyle: {
               width: 1,
             },
-            color: "#FF8700FF",
-            data: this.getData(this.CurveValues[3]?.value),
+            color: "#1C99FFFF",
+            data: this.getData(this.CurveValues[2]?.value),
           },
         ],
       };

src/views/stateMonitor/factoryMonitor/windPowerPlant/windPower/index.vue

@@ -117,21 +117,44 @@
         <thermometers :b="towerInfo?.sd" />
         <p>湿度</p>
       </div>
-      <div style="position: absolute; bottom: 1%; width: 95%">
+      <div
+        style="position: absolute; bottom: 1%; width: 95%"
+        @dblclick="handleClick"
+      >
         <div class="indicator-title">
           <div class="point point-left bottom"></div>
           <div class="point point-right bottom"></div>
           <div class="status-title">24小时功率曲线</div>
         </div>
 
+        <wind-echart :CurveValues="CurveValues" width="100%" height="300px" />
+      </div>
+    </div>
+    <el-dialog
+      class="dialogs"
+      width="80%"
+      top="100px"
+      v-model="dialogShow"
+      :show-close="true"
+      @close="handleClose"
+      destroy-on-close
+    >
+      <template #title>
+        <div class="dialog-title">
+          <img class="dialog-title-img" src="@assets/imgs/dialog-title.png" />
+          <div class="title">{{ showName }}</div>
+        </div>
+      </template>
+      <div class="dialog-body" style="height: 600px">
+        <img class="dialog-img" src="@assets/imgs/dialog.png" />
         <wind-echart
           :CurveValues="CurveValues"
           width="100%"
-          :ratio="1000"
-          height="160px"
+          height="580px"
+          :id="'show-chart'"
         />
       </div>
-    </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -141,6 +164,7 @@ import {
   GetTowerByWpid,
   GetTowerinfoById,
 } from "@/api/factoryMonitor/index.js";
+import { FindPowerInfo } from "@/api/home/home.js";
 import { GetWpPoints, GetPointFitting } from "@/api/points/index.js";
 import Thermometer from "./components/thermometer";
 import Thermometers from "./components/thermometers";
@@ -234,6 +258,9 @@ export default {
           show: true,
         },
       },
+      dialogShow: false,
+      showName: "24小时功率曲线",
+      showCharts: {},
     };
   },
   computed: {
@@ -283,7 +310,7 @@ export default {
         this.stationCode = stationCode;
         this.stationName = stationName;
         this.getSubstationByStationCode();
-        this.getPowerStationAssets();
+        this.getPoints();
       } else {
         this.towerInfo = {};
         this.CurveValues = [];
@@ -308,59 +335,68 @@ export default {
       this.activeCode = id;
       this.getTowerInfo(id);
     },
-    // 获取场站测点
-    getPowerStationAssets() {
-      GetWpPoints({
-        wpid: this.stationCode,
-        uniformcodes: "FCFGDQDT0001,SSZBZGL,SSZNHGLZS,SSZGL",
-      }).then(({ data }) => {
-        this.tmpData.forEach((item) => {
-          data.data.forEach((i) => {
-            if (item.sts == i.uniformCode) {
-              item.sts = i.nemCode;
-              item.statiomName = i.name;
-            }
-          });
-        });
-        let pointIds = "";
-        data.data.forEach((value) => {
-          pointIds += value.nemCode + ",";
-        });
-        pointIds = pointIds.substring(0, pointIds.length - 1);
-        this.pointIds = pointIds;
-        this.getPoints(pointIds);
-      });
+    handleClick() {
+      this.showCharts = this.CurveValues;
+      this.dialogShow = true;
+      this.showName = this.stationName + this.showName;
+    },
+    handleClose() {
+      this.showName = "24小时功率曲线";
     },
     // 查询24小时功率数据
-    getPoints(pointIds) {
-      GetPointFitting({
-        begin: dayjs().startOf("date").format("YYYY-MM-DD HH:mm:ss"),
-        end: dayjs().format("YYYY-MM-DD HH:mm:ss"),
-        interval: 60 * 30,
-        pointIds,
-      }).then((res) => {
-        if (res.data.data.length) {
-          let powerLineChartData = [];
-          let resData = res.data.data;
-          resData.forEach((value, index) => {
-            var option = {
-              title:
-                this.ined == 3
-                  ? this.tmpData[index].stse + this.tmpData[index].statiomName
-                  : this.tmpData[index].statiomName,
-              tagName: this.tmpData[index].sts,
-              yAxisIndex: 0,
-              value: value.map((item) => {
-                return {
-                  dateTime: item.pointTime,
-                  value: item.pointValueInDouble,
-                };
-              }),
-              noRatio: true,
+    getPoints() {
+      FindPowerInfo({ id: this.stationCode }).then((res) => {
+        if (res.data) {
+          let Powertrend = {
+            // 图表所用单位
+            units: ["(万KWh)", ""],
+            value: [
+              {
+                title: "预测功率",
+                smooth: true, // 使用单位
+                value: [],
+              },
+              {
+                title: "理论功率",
+                smooth: true, // 使用单位
+                value: [],
+              },
+              {
+                title: "实际功率",
+                smooth: true, // 使用单位
+                value: [],
+              },
+            ],
+          };
+
+          Powertrend.value[0].value = res.data.map((item) => {
+            return {
+              dateTime: dayjs()
+                .startOf("date")
+                .add(item.hours, "hour")
+                .format("YYYY-MM-DD HH:mm:ss"),
+              value: item.bzgl,
+            };
+          });
+          Powertrend.value[1].value = res.data.map((item) => {
+            return {
+              dateTime: dayjs()
+                .startOf("date")
+                .add(item.hours, "hour")
+                .format("YYYY-MM-DD HH:mm:ss"),
+              value: item.llgl,
             };
-            powerLineChartData.push(option);
           });
-          this.CurveValues = powerLineChartData;
+          Powertrend.value[2].value = res.data.map((item) => {
+            return {
+              dateTime: dayjs()
+                .startOf("date")
+                .add(item.hours, "hour")
+                .format("YYYY-MM-DD HH:mm:ss"),
+              value: item.sjgl,
+            };
+          });
+          this.CurveValues = Powertrend.value;
         }
       });
     },
@@ -575,6 +611,9 @@ img {
   height: 100%;
   width: 100%;
   z-index: 2;
+  p {
+    margin: 0;
+  }
   .tower-list {
     display: flex;
     width: 100%;

src/views/stateMonitor/factoryMonitor/windPowerPlant/windhome/index.vue

@@ -78,9 +78,7 @@
             v-if="showFlag"
           >
             <power-echarts
-              :predictFlag="true"
               :CurveValues="powerList"
-              :ratio="1000"
               width="100%"
               unit="MW"
               height="100%"
@@ -290,6 +288,7 @@ import BarCharts from "@/views/stateMonitor/factoryMonitor/windPowerPlant/compon
 import LineCharts from "../components/lineCharts.vue";
 import { GetWpInfos, GetWpHisdata } from "@/api/factoryMonitor/index.js";
 import { GetWpPoints, GetPointFitting } from "@/api/points/index.js";
+import { FindPowerInfo } from "@/api/home/home.js";
 import dayjs from "dayjs";
 export default {
   name: "windPowerPlant", //风电场站
@@ -617,6 +616,7 @@ export default {
     }, 5000);
     this.time2 = setInterval(() => {
       this.getPowerStationAssets();
+      this.getPoints();
       this.getLossValuesAnalyse(this.dates);
       this.getBarValuesFDL();
     }, 1000 * 60 * 15);
@@ -635,6 +635,7 @@ export default {
         this.stationCode = this.localWpid || wpid;
         this.getSingleMatrix(true);
         this.getPowerStationAssets();
+        this.getPoints();
         this.getBarValuesFDL();
       } else {
         clearInterval(this.timer);
@@ -756,42 +757,96 @@ export default {
         pointId = data.data[data.data.length - 1].nemCode;
         this.pointIds = pointIds;
         this.pointId = pointId;
-        this.getPoints(pointIds);
+        // this.getPoints(pointIds);
         this.getJrPoints(pointId);
       });
     },
     // 查询24小时功率数据
-    getPoints(pointIds) {
-      GetPointFitting({
-        begin: dayjs().startOf("date").format("YYYY-MM-DD HH:mm:ss"),
-        end: dayjs().format("YYYY-MM-DD HH:mm:ss"),
-        interval: 60 * 30,
-        pointIds,
-      }).then((res) => {
-        if (res.data.data.length) {
-          let powerLineChartData = [];
-          let resData = res.data.data;
-          resData.forEach((value, index) => {
-            var option = {
-              title:
-                this.ined == 3
-                  ? this.tmpData[index].stse + this.tmpData[index].statiomName
-                  : this.tmpData[index].statiomName,
-              tagName: this.tmpData[index].sts,
-              yAxisIndex: 0,
-              value: value.map((item) => {
-                return {
-                  dateTime: item.pointTime,
-                  value: item.pointValueInDouble,
-                };
-              }),
-              noRatio: true,
+    getPoints() {
+      FindPowerInfo({ id: this.stationCode }).then((res) => {
+        if (res.data) {
+          let Powertrend = {
+            // 图表所用单位
+            units: ["(万KWh)", ""],
+            value: [
+              {
+                title: "预测功率",
+                smooth: true, // 使用单位
+                value: [],
+              },
+              {
+                title: "理论功率",
+                smooth: true, // 使用单位
+                value: [],
+              },
+              {
+                title: "实际功率",
+                smooth: true, // 使用单位
+                value: [],
+              },
+            ],
+          };
+
+          Powertrend.value[0].value = res.data.map((item) => {
+            return {
+              dateTime: dayjs()
+                .startOf("date")
+                .add(item.hours, "hour")
+                .format("YYYY-MM-DD HH:mm:ss"),
+              value: item.bzgl,
+            };
+          });
+          Powertrend.value[1].value = res.data.map((item) => {
+            return {
+              dateTime: dayjs()
+                .startOf("date")
+                .add(item.hours, "hour")
+                .format("YYYY-MM-DD HH:mm:ss"),
+              value: item.llgl,
+            };
+          });
+          Powertrend.value[2].value = res.data.map((item) => {
+            return {
+              dateTime: dayjs()
+                .startOf("date")
+                .add(item.hours, "hour")
+                .format("YYYY-MM-DD HH:mm:ss"),
+              value: item.sjgl,
             };
-            powerLineChartData.push(option);
           });
-          this.powerList = powerLineChartData;
+          this.powerList = Powertrend.value;
         }
       });
+      //   GetPointFitting({
+      //     begin: dayjs().startOf("date").format("YYYY-MM-DD HH:mm:ss"),
+      //     end: dayjs().format("YYYY-MM-DD HH:mm:ss"),
+      //     interval: 60 * 30,
+      //     pointIds,
+      //   }).then((res) => {
+      //     if (res.data.data.length) {
+      //       let powerLineChartData = [];
+      //       let resData = res.data.data;
+      //       resData.forEach((value, index) => {
+      //         var option = {
+      //           title:
+      //             this.ined == 3
+      //               ? this.tmpData[index].stse + this.tmpData[index].statiomName
+      //               : this.tmpData[index].statiomName,
+      //           tagName: this.tmpData[index].sts,
+      //           yAxisIndex: 0,
+      //           value: value.map((item) => {
+      //             return {
+      //               dateTime: item.pointTime,
+      //               value: item.pointValueInDouble,
+      //             };
+      //           }),
+      //           noRatio: true,
+      //         };
+      //         powerLineChartData.push(option);
+      //       });
+      //       this.powerList = powerLineChartData;
+      //     }
+      //   });
     },
     // 查询今日24小时实际功率数据
     getJrPoints(pointId) {

src/views/stateMonitor/focus/syzDetails.vue

@@ -459,7 +459,7 @@ export default {
         };
       } else if (type === "Z") {
         return {
-          height: "300px",
+          height: "285px",
         };
       } else {
         return {
@@ -576,8 +576,10 @@ export default {
   }
 
   .showAllSvgMsg {
-    border: 3px solid #646464;
-    border-radius: 10px;
+    // border: 3px solid #646464;
+    background: url("~@/assets/imgs/syz-bg.png") no-repeat;
+    background-size: contain;
+    border-radius: 4px;
     margin-right: 15px;
     margin-bottom: 15px;
     position: relative;
@@ -599,10 +601,11 @@ export default {
     .booster-station-body {
       height: calc(100% - 40px);
       width: 100%;
+      padding: 2px;
     }
     .showAllSvgMsg_bot {
       background: #3a3a3a;
-      border-radius: 0 0 8px 8px;
+      border-radius: 0 0 4px 4px;
       height: 40px;
       text-align: center;
 

src/views/stateMonitor/powerPredictMatrix/components/multiple-line-chart.vue

@@ -4,9 +4,7 @@
 
 <script>
 import util from "@/helper/util.js";
-import partten from "@/helper/partten.js";
 import * as echarts from "echarts";
-import { right } from "@antv/x6/lib/registry/port-layout/main";
 
 export default {
   name: "multiple-line-chart",
@@ -32,11 +30,11 @@ export default {
       id: "",
       chart: null,
       chartName: [
-        { name: "实际功率", name1: "实际功率", code: "sjgl", color: "#4B55AE" },
-        { name: "理论功率", name1: "理论功率", code: "llgl", color: "#1C99FF" },
-        { name: "预测功率", name1: "预测功率", code: "ycgl", color: "#F8DE5B" },
+        { name: "实际功率", name1: "实际功率", code: "sjgl", color: "#1c99ff" },
+        { name: "理论功率", name1: "理论功率", code: "llgl", color: "#ff8700" },
+        { name: "预测功率", name1: "预测功率", code: "ycgl", color: "#c530c8" },
         { name: "实际风速", name1: "实际光照", code: "pjfs", color: "#05BB4C" },
-        { name: "预测风速", name1: "预测光照", code: "ycfs", color: "#FF8300" },
+        { name: "预测风速", name1: "预测光照", code: "ycfs", color: "#f8de5b" },
       ],
     };
   },

src/views/stateMonitor/powerPredictMatrix/index.vue

@@ -2,28 +2,31 @@
   <div class="page-wrapper">
     <!-- 头部按钮选项 -->
     <HeaderNav @firstRender="firstRender" :isAll="true" />
-    <div
-      class="chart-wrapper"
-      v-loading="loading"
-      element-loading-background="rgba(4, 12, 11, 0.8)"
-    >
+    <div class="wrapper">
       <div
-        class="chart-item"
-        v-for="(item, index) in list"
-        :key="index"
-        @dblclick="handleClick(list[index]?.name, index)"
+        class="chart-wrapper"
+        :style="{ overflowX: isFixed ? 'auto' : 'unset' }"
+        v-loading="loading"
+        element-loading-background="rgba(4, 12, 11, 0.8)"
       >
-        <div class="chart-item-name">
-          <p class="text">{{ list[index]?.name }}</p>
-        </div>
-        <div class="chart-item-chart">
-          <multipleLineChartVue
-            ref="multipLineChart"
-            height="100%"
-            width="100%"
-            :type="activeTab"
-            :chartData="list[index]"
-          />
+        <div
+          class="chart-item"
+          v-for="(item, index) in list"
+          :key="index"
+          @dblclick="handleClick(list[index]?.name, index)"
+        >
+          <div class="chart-item-name">
+            <p class="text">{{ list[index]?.name }}</p>
+          </div>
+          <div class="chart-item-chart">
+            <multipleLineChartVue
+              ref="multipLineChart"
+              height="100%"
+              width="100%"
+              :type="activeTab"
+              :chartData="list[index]"
+            />
+          </div>
         </div>
       </div>
     </div>
@@ -33,6 +36,7 @@
       top="120px"
       v-model="displayDialog"
       :show-close="true"
+      @close="handleClose"
       destroy-on-close
     >
       <template #title>
@@ -194,11 +198,11 @@ export default {
       for (let key in resData) {
         resData[key] = {
           name: "",
-          pjfs: [],
-          ycfs: [],
-          sjgl: [],
           ycgl: [],
           llgl: [],
+          sjgl: [],
+          pjfs: [],
+          ycfs: [],
           xAxis: [],
         };
       }
@@ -239,16 +243,26 @@ export default {
           } else if (Object.keys(res.data).length >= 2) {
             this.isDouble = true;
             this.doubleChartData = this.dealRes(res.data);
-            console.log(this.doubleChartData);
           }
         }
       });
     },
+    handleClose() {
+      this.showName = "";
+      this.showWpid = "";
+      this.singleChartData = [];
+      this.doubleChartData = [];
+    },
     handleSearch() {
       this.isSearch = true;
       this.getPowerData();
     },
   },
+  computed: {
+    isFixed() {
+      return this.$store.state.isFixed;
+    },
+  },
 };
 </script>
 
@@ -277,24 +291,23 @@ export default {
   text-align: center;
 }
 
-.el-carousel__item:nth-child(2n) {
-  //   background-color: #99a9bf;
-}
-
-.el-carousel__item:nth-child(2n + 1) {
-  //   background-color: #d3dce6;
-}
 .page-wrapper {
   height: 100%;
+  width: 100%;
+  .wrapper {
+    height: calc(100% - 57px);
+    width: 100%;
+    padding: 0 20px 10px 20px;
+    overflow-y: auto;
+  }
 }
 .chart-wrapper {
-  height: calc(100% - 57px);
-  overflow: auto;
-  padding: 0 20px 10px 20px;
   display: grid;
   grid-template-columns: auto auto;
   grid-auto-rows: 256px;
   grid-gap: 20px;
+  padding-bottom: 10px;
+  overflow-x: auto;
   .chart-item {
     width: 935px;
     height: 256px;