update

src/App.vue

@@ -565,15 +565,8 @@ body {
 .el-table__body tr.hover-row > td.el-table__cell {
   background-color: rgba(2, 2, 2) !important;
 }
-.main-body .el-table th,
-.df-table .el-table th,
-.main-body .custom-table.el-table th,
-.df-table .custom-table.el-table th,
-.main-body .el-table tr,
-.df-table .el-table tr,
-.main-body .custom-table.el-table tr,
-.df-table .custom-table.el-table tr {
-  background-color: #040c0b;
-  border: 0px;
+#appBody.light .el-table th.el-table__cell > .cell{
+  height: 8.2vh!important;
 }
+
 </style>

src/api/economic/index.js

@@ -305,30 +305,32 @@ const specificZhcydlList = (data) => {
 // 单机信息总览
 const powercompareWindfarmAjax = (data) => {
     return request({
-        url: `/consumer/powercompare/windfarmAjax`,
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `/powercompare/windfarmAjax`,
         method: "get",
     });
 };
 const goodnessWindturbinegoodness = (data) => {
     return request({
-        url: `/consumer/goodness/windturbinegoodness`,
-        method: "post",
-        data: data
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `/goodness/windturbinegoodness?wpId=${data.wpId}&isAsc=${JSON.stringify(data.tablepar)}&recorddate=${data.recorddate}`,
+        method: "get",
     });
 };
 
 const powercompareWindturbineAjax = (data) => {
     return request({
-        url: `/consumer/powercompare/windturbineAjax?wpId=${data.wpId}`,
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `/powercompare/windturbineAjax?wpId=${data.wpId}`,
         method: "get",
     });
 };
 
 const goodnessGoodhistorylist = (data) => {
     return request({
-        url: `/consumer/goodness/goodhistorylist`,
-        method: "post",
-        data: data
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `/goodness/goodhistorylist?wpId=${data.wpId}&wtId=${data.wtId}&beginDate=${data.beginDate}&endDate=${data.endDate}`,
+        method: "get",
     });
 };
 // 单机信息总览详情
@@ -449,21 +451,23 @@ const singleanalysisSingleanalysisMain = (data) => {
 //forecast-system.vue
 const powercompareWindfarmAllAjax2 = (data) => {
     return request({
-        url: `/consumer/powercompare/windfarmAllAjax`,
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `/powercompare/windfarmAllAjax`,
         method: "get",
     });
 };
 const weatherWeatherInfo = (data) => {
     return request({
-        url: `/consumer/weather/weatherInfo?wpId=${data.wpId}`,
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `/weather/weatherInfo?wpId=${data.wpId}`,
         method: "get",
     });
 };
-const weatherWatherChart = (data) => {
+const weatherPowerChart = (data) => {
     return request({
-        url: `/consumer/weather/weatherChart`,
-        method: "post",
-        data: data
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `/weather/powerChart`,
+        method: "get",
     });
 };
 
@@ -657,7 +661,7 @@ export default {
     singleanalysisSingleanalysisMain,
     powercompareWindfarmAllAjax2,
     weatherWeatherInfo,
-    weatherWatherChart,
+    weatherPowerChart,
     statisticAnalysis,
     analysisplusTjfxlist,
     analysisplusBdzlist,

src/components/coms/collapse/collapse-list.vue

@@ -142,7 +142,6 @@ export default {
       this.itemIndex = -1;
     },
     itemClick(item, index) {
-      console.log(111111111,item);
       this.itemIndex = index;
       this.wpId = item.wpId;
       this.wtId = item.id;

src/router/index.js

@@ -360,23 +360,25 @@ const routes = [{
 		component: () =>
 			import( /* webpackChunkName: "fs" */ "../views/NewPages/forecast-system.vue"),
 	},
+
+	
 	// 报表管理-统计分析
 	{
-		path: "/decision/statisticAnalysis",
+		path: "/others/statisticAnalysis",
 		name: "statisticAnalysis",
 		component: () =>
 			import( /* webpackChunkName: "fs" */ "../views/NewPages/statisticAnalysis.vue"),
 	},
 	//报表管理-统计分析-表底
 	{
-		path: "/decision/statisticAnalysis/form",
+		path: "/others/statisticAnalysis/form",
 		name: "fr",
 		component: () =>
 			import( /* webpackChunkName: "windsitehome" */ "../views/NewPages/form.vue"),
 	},
 	//报表管理-统计分析-场站
 	{
-		path: "/decision/statisticAnalysis/station",
+		path: "/others/statisticAnalysis/station",
 		name: "cz",
 		component: () =>
 			import( /* webpackChunkName: "windsitehome" */ "../views/NewPages/station.vue"),
@@ -384,7 +386,7 @@ const routes = [{
 
 	//报表管理-统计分析-新能源日报
 	{
-		path: "/decision/statisticAnalysis/daily",
+		path: "/others/statisticAnalysis/daily",
 		name: "ny",
 		component: () =>
 			import( /* webpackChunkName: "windsitehome" */ "../views/NewPages/daily.vue"),

src/views/NewPages/daily.vue

@@ -3,16 +3,7 @@
     <h1 class="tit">国电电力河北新能源日报</h1>
     <div class="daily-table">
       <el-table
-        :header-cell-style="{
-          height: '40px',
-          background: 'rgba(100, 100, 130, 0.2)',
-          color: '#b2bdc0',
-          'border-bottom': '0px solid red',
-        }"
-        :cell-style="{
-          height: '40px',
-          'border-bottom': 'solid 0px #242424',
-        }"
+       
         :data="tableData"
         :row-class-name="tableRowClassName"
       >

src/views/NewPages/forecast-system.vue

@@ -199,11 +199,17 @@ export default {
       }
     },
     async getChart1() {
-      const res = await this.API.requestData({
-        method: "POST",
-        subUrl: "weather/powerChart",
-        data: { wpId: this.wpId },
+
+      // -----------------------------------------------------------------
+      const res = await  
+       api.weatherPowerChart({
+        wpId: this.wpId,
       });
+      // this.API.requestData({
+      //   method: "POST",
+      //   subUrl: "weather/powerChart",
+      //   data: { wpId: this.wpId },
+      // });
       if (res) {
         const fdlValue = { title: "电量", yAxisIndex: 0, value: [] };
         const glValue = { title: "功率", yAxisIndex: 1, value: [] };

src/views/Others/index.vue

@@ -33,7 +33,13 @@
 
       <!-- card-2 -->
       <!-- card-3 -->
-      <el-carousel-item :style="$store.state.themeName === 'dark' ? 'padding: 20px; background: rgb(4, 12, 11)' : 'padding: 20px; background: #fff'">
+      <el-carousel-item
+        :style="
+          $store.state.themeName === 'dark'
+            ? 'padding: 20px; background: rgb(4, 12, 11)'
+            : 'padding: 20px; background: #fff'
+        "
+      >
         <div class="itemBox">
           <p class="itemTitle">数据查询</p>
           <div class="df-table" @click="jumpUrl('/others/realSearch')">
@@ -49,7 +55,13 @@
         </div>
       </el-carousel-item>
 
-      <el-carousel-item :style="$store.state.themeName === 'dark' ? 'padding: 20px; background: rgb(4, 12, 11)' : 'padding: 20px; background: #fff'">
+      <el-carousel-item
+        :style="
+          $store.state.themeName === 'dark'
+            ? 'padding: 20px; background: rgb(4, 12, 11)'
+            : 'padding: 20px; background: #fff'
+        "
+      >
         <div class="itemBox">
           <p class="itemTitle">
             报表管理
@@ -64,7 +76,11 @@
               />
               <p class="imgTitle">统计分析</p>
             </div> -->
-            <div class="imgItem1" @click="jumpUrl('/decision/statisticAnalysis')">
+            <div
+              class="imgItem1"
+              @click="jumpUrl('/decision/statisticAnalysis')"
+              v-if="$store.state.themeName === 'dark'"
+            >
               <el-image
                 class="img1"
                 src="./static/img/o表底值查询.png"
@@ -72,10 +88,39 @@
               />
               <p class="imgTitle">报表管理</p>
             </div>
-            <div class="imgItem1" @click="jumpUrl('/decision/statisticAnalysis/daily')">
+            <div
+              class="imgItem1"
+              @click="jumpUrl('/decision/statisticAnalysis')"
+              v-if="$store.state.themeName === 'light'"
+            >
+              <el-image
+                class="img1"
+                src="./static/img/表底查询.png"
+                fit="fill"
+              />
+              <p class="imgTitle">报表管理</p>
+            </div>
+
+            <div
+              class="imgItem1"
+              @click="jumpUrl('/decision/statisticAnalysis/daily')"
+              v-if="$store.state.themeName === 'dark'"
+            >
               <el-image
                 class="img1"
-                src="./static/img/o新能源日报.png"
+                src="./static/img/o新能源月报.png"
+                fit="fill"
+              />
+              <p class="imgTitle">新能源日报</p>
+            </div>
+            <div
+              class="imgItem1"
+              @click="jumpUrl('/decision/statisticAnalysis/daily')"
+              v-if="$store.state.themeName === 'light'"
+            >
+              <el-image
+                class="img1"
+                src="./static/img/新能源报表.png"
                 fit="fill"
               />
               <p class="imgTitle">新能源日报</p>
@@ -107,7 +152,6 @@
           </div>
         </div>
       </el-carousel-item>
-      
 
       <!-- card-4 -->
       <!-- <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
@@ -134,7 +178,13 @@
           </div>
         </div>
       </el-carousel-item> -->
-      <el-carousel-item :style="$store.state.themeName === 'dark' ? 'padding: 20px; background: rgb(4, 12, 11)' : 'padding: 20px; background: #fff'">
+      <el-carousel-item
+        :style="
+          $store.state.themeName === 'dark'
+            ? 'padding: 20px; background: rgb(4, 12, 11)'
+            : 'padding: 20px; background: #fff'
+        "
+      >
         <div class="itemBox">
           <p class="itemTitle">
             专家知识
@@ -144,6 +194,19 @@
             <div
               class="imgItem1"
               @click="jumpUrl('/others/knowledge/knowledge')"
+              v-if="$store.state.themeName === 'light'"
+            >
+              <el-image
+                class="img1"
+                src="./static/img/故障体系.png"
+                fit="fill"
+              />
+              <p class="imgTitle">故障体系</p>
+            </div>
+            <div
+              class="imgItem1"
+              @click="jumpUrl('/others/knowledge/knowledge')"
+              v-if="$store.state.themeName === 'dark'"
             >
               <el-image
                 class="img1"
@@ -152,9 +215,23 @@
               />
               <p class="imgTitle">故障体系</p>
             </div>
+
+            <div
+              class="imgItem1"
+              @click="jumpUrl('/others/knowledge/knowledge7')"
+              v-if="$store.state.themeName === 'light'"
+            >
+              <el-image
+                class="img1"
+                src="./static/img/预警知识.png"
+                fit="fill"
+              />
+              <p class="imgTitle">预警知识</p>
+            </div>
             <div
               class="imgItem1"
               @click="jumpUrl('/others/knowledge/knowledge7')"
+              v-if="$store.state.themeName === 'dark'"
             >
               <el-image
                 class="img1"
@@ -163,9 +240,23 @@
               />
               <p class="imgTitle">预警知识</p>
             </div>
+
             <div
               class="imgItem1"
               @click="jumpUrl('/others/knowledge/knowledge5')"
+              v-if="$store.state.themeName === 'light'"
+            >
+              <el-image
+                class="img1"
+                src="./static/img/特征参数.png"
+                fit="fill"
+              />
+              <p class="imgTitle">特征参数</p>
+            </div>
+            <div
+              class="imgItem1"
+              @click="jumpUrl('/others/knowledge/knowledge5')"
+              v-if="$store.state.themeName === 'dark'"
             >
               <el-image
                 class="img1"
@@ -174,9 +265,23 @@
               />
               <p class="imgTitle">特征参数</p>
             </div>
+
             <div
               class="imgItem1"
               @click="jumpUrl('/others/knowledge/knowledge6')"
+              v-if="$store.state.themeName === 'light'"
+            >
+              <el-image
+                class="img1"
+                src="./static/img/排查检修方案.png"
+                fit="fill"
+              />
+              <p class="imgTitle">排查、检修方案</p>
+            </div>
+            <div
+              class="imgItem1"
+              @click="jumpUrl('/others/knowledge/knowledge6')"
+               v-if="$store.state.themeName === 'dark'"
             >
               <el-image
                 class="img1"
@@ -185,6 +290,7 @@
               />
               <p class="imgTitle">排查、检修方案</p>
             </div>
+
             <!-- <div
               class="imgItem1"
               @click="jumpUrl('/health/gzzd/malfunctionDiagnose')"

src/views/layout/Menu.vue

@@ -336,24 +336,7 @@ export default {
               icon: "svg-qxfx",
               path: "/decision/fs",
             },
-            // {
-            //   text: "报表管理",
-            //   icon: "svg-统计分析",
-            //   path: "/decision/statisticAnalysis",
-            //    children: [
-            //     {
-            //       text: "统计分析",
-            //       icon: "svg-matrix",
-            //       path: "/decision/statisticAnalysis",
-            //     },
-            //     {
-            //       text: "新能源日报",
-            //       icon: "svg-matrix",
-            //       path: "/decision/statisticAnalysis/daily",
-            //     },
-             
-            //   ],
-            // },
+          
             // {
             //   text: "电量预测",
             //   icon: "svg-dlyc",
@@ -1051,6 +1034,24 @@ export default {
             //     // }
             //   ],
             // },
+              {
+              text: "报表管理",
+              icon: "svg-统计分析",
+              path: "/others/statisticAnalysis",
+               children: [
+                {
+                  text: "统计分析",
+                  icon: "svg-matrix",
+                  path: "/others/statisticAnalysis",
+                },
+                {
+                  text: "新能源日报",
+                  icon: "svg-matrix",
+                  path: "/others/statisticAnalysis/daily",
+                },
+             
+              ],
+            },
           ],
         },
       ],

src/views/performanceAnalysis/index.vue

@@ -425,7 +425,7 @@ export default {
       api.powercompareWindfarmAjax({}).then((res) => {
         this.wpArray = res.data;
         this.wpId = res.data[0].id;
-        this.getOutputSpeedList(that.wpId);
+        this.getOutputSpeedList(this.wpId);
       });
 
       // let that = this;
@@ -441,17 +441,19 @@ export default {
     },
 
     getOutputSpeedList(wpId) {
-      let that = this;
-      if (!that.wpId || !that.recorddate) {
-        that.BASE.showMsg({
+      if (!this.wpId || !this.recorddate) {
+        this.BASE.showMsg({
           msg: "场站与日期不可为空",
         });
       } else {
+        let tablepar = { tablepar: { isAsc: 'desc' } };
+
         api
           .goodnessWindturbinegoodness({
+            tablepar,
             wpId,
-            isAsc: that.isAsc,
-            recorddate: that.recorddate,
+            isAsc: this.isAsc,
+            recorddate: this.recorddate,
           })
           .then((res) => {
             this.tableData.data = res.data.list;
@@ -479,7 +481,6 @@ export default {
         })
         .then((res) => {
           this.wtArray = res.data;
-
           this.wpId2 = item.windtpowerstationid;
           this.wtId = item.windturbineid;
           this.beginDate = new Date().formatDate("yyyy-MM") + "-01";
@@ -596,18 +597,20 @@ export default {
       } else {
         // -------------------------------------------------
 
-        api.goodnessGoodhistorylist({
-         wpId: this.wpId2,
+        api
+          .goodnessGoodhistorylist({
+            wpId: this.wpId2,
             wtId: this.wtId,
             beginDate: this.beginDate,
             endDate: this.endDate,
-      }).then((res) => {
-          res.data.forEach((ele) => {
+          })
+          .then((res) => {
+            res.data.forEach((ele) => {
               ele.time = new Date(ele.recorddate).formatDate("yyyy-MM-dd");
             });
             this.historyTableData.data = res.data;
             this.dialogShow = true;
-      });
+          });
 
         // that.API.requestData({
         //   method: "POST",

src/views/realSearch/index.vue

@@ -367,9 +367,7 @@ export default {
         this.menus.push(JSFW,CL_FDC, KB_FDC, DX_FDC, SY_FDC);
       });
     },
-    jsfw() {
-      console.log(999);
-    },
+   
 
     // 获取表格数据
     getTableData() {