问题修改

components.d.ts

@@ -166,7 +166,7 @@ declare module 'vue' {
     StrightLineChart: typeof import('./src/components/chart/line/stright-line-chart.vue')['default']
     SubmitBtn: typeof import('./src/components/generatingCapacityComponent/SubmitBtn.vue')['default']
     SvgDraw: typeof import('./src/components/coms/icon/svg-draw.vue')['default']
-    SvgIcon: typeof import('./src/components/powerPredictionComponent/svgIcon/index.vue')['default']
+    SvgIcon: typeof import('./src/components/coms/icon/svg-icon.vue')['default']
     SvgPageShow: typeof import('./src/components/powerPredictionComponent/powerControlSvg/svgPageShow.vue')['default']
     Tab: typeof import('./src/components/coms/tabs/tab.vue')['default']
     Table: typeof import('./src/components/generatingCapacityComponent/table.vue')['default']

src/App.vue

@@ -873,14 +873,14 @@ export default {
               index: "/integratedAlarm/realwarning",
             },
             {
-              name: "报警查询",
-              index: "/integratedAlarm/historyWarning",
-            },
-            {
               name: "预警查询",
               index: "/integratedAlarm/customWarning",
             },
             {
+              name: "报警查询",
+              index: "/integratedAlarm/historyWarning",
+            },
+            {
               name: "停机查询",
               index: "/integratedAlarm/stopQuery",
             },
@@ -923,13 +923,13 @@ export default {
               index: "/integratedAlarm/historyConfig",
             },
             {
-              name: "规则修改日志",
-              index: "/integratedAlarm/logs",
-            },
-            {
               name: "预警排查方案",
               index: "/integratedAlarm/earlyWarning",
             },
+            {
+              name: "规则修改日志",
+              index: "/integratedAlarm/logs",
+            },
           ],
         },
         {

src/components/powerPredictionComponent/homePageAssembly/globalDialogPage.vue

@@ -39,7 +39,13 @@
                     <div id="centerCharts" class="chartsStyle"></div>
                 </div>
                 <div class="warn-table" style="margin-top: 20px" v-show="title === '功率预测'">
-                    <el-table :data="tableData" ref="report-table_power" max-height="50vh" style="width: 100%">
+                    <el-table :data="tableData" ref="report-table_power" max-height="50vh" style="width: 100%"
+                        :header-cell-style="{
+                        padding: '4px',
+                        fontSize: '16px',
+                        fontWeight: bold,
+                        border: '0.5px solid rgba(0,0,0,.5) !important',
+                        }">
                         <el-table-column prop="dataTime" label="时间" align="center" width="160"></el-table-column>
                         <el-table-column prop="theoreticalPower" label="理论功率" align="center"></el-table-column>
                         <el-table-column prop="availablePower" label="可用功率" align="center"></el-table-column>
@@ -74,7 +80,13 @@
                     </el-table>
                 </div>
                 <div class="warn-table" v-show="title === '风速预测' || title === '辐照度预测'">
-                    <el-table :data="tableData" ref="report-table_wind" max-height="400px" style="width: 100%">
+                    <el-table :data="tableData" ref="report-table_wind" max-height="400px" style="width: 100%"
+                        :header-cell-style="{
+                        padding: '4px',
+                        fontSize: '16px',
+                        fontWeight: bold,
+                        border: '0.5px solid rgba(0,0,0,.5) !important',
+                        }">
                         <el-table-column prop="dataTime" label="时间" align="center" width="160"></el-table-column>
                         <el-table-column label="当期数据" align="center">
                             <el-table-column prop="actualWindSpeedDq" label="实际" align="center"></el-table-column>

src/components/powerPredictionComponent/panoramicPowerDialog/panoramaPowerDialogPage.vue

@@ -32,7 +32,13 @@
                     </el-col>
                 </el-row>
                 <div class="main_table warn-table" style="margin-top: 20px">
-                    <el-table :data="tableData" ref="report-table" border max-height="50vh" style="width: 100%">
+                    <el-table :data="tableData" ref="report-table" border max-height="50vh" style="width: 100%"
+                        :header-cell-style="{
+                        padding: '4px',
+                        fontSize: '16px',
+                        fontWeight: bold,
+                        border: '0.5px solid rgba(0,0,0,.5) !important',
+                        }">
                         <el-table-column prop="dataTime" label="时间" align="center" width="160"></el-table-column>
                         <el-table-column prop="theoreticalPower" label="理论功率" align="center"></el-table-column>
                         <el-table-column prop="availablePower" label="可用功率" align="center"></el-table-column>

src/components/powerPredictionComponent/powerPredictionDialog/predictionDialogPage.vue

@@ -30,7 +30,13 @@
                     <div id="centerCharts" class="chartsStyle"></div>
                 </div>
                 <div class="main_table warn-table" style="margin-top: 20px" v-show="isPower">
-                    <el-table :data="tableData" ref="report-table_power" border max-height="50vh" style="width: 100%">
+                    <el-table :data="tableData" ref="report-table_power" border max-height="50vh" style="width: 100%"
+                        :header-cell-style="{
+                        padding: '4px',
+                        fontSize: '16px',
+                        fontWeight: bold,
+                        border: '0.5px solid rgba(0,0,0,.5) !important',
+                        }">
                         <el-table-column prop="dataTime" label="时间" align="center" width="160"></el-table-column>
                         <el-table-column prop="theoreticalPower" label="理论功率" align="center"></el-table-column>
                         <el-table-column prop="availablePower" label="可用功率" align="center"></el-table-column>
@@ -65,7 +71,13 @@
                     </el-table>
                 </div>
                 <div class="main_table warn-table" v-show="!isPower">
-                    <el-table :data="tableData" ref="report-table_wind" border max-height="400px" style="width: 100%">
+                    <el-table :data="tableData" ref="report-table_wind" border max-height="400px" style="width: 100%"
+                        :header-cell-style="{
+                        padding: '4px',
+                        fontSize: '16px',
+                        fontWeight: bold,
+                        border: '0.5px solid rgba(0,0,0,.5) !important',
+                        }">
                         <el-table-column prop="dataTime" label="时间" align="center" width="160"></el-table-column>
                         <el-table-column label="当期数据" align="center">
                             <el-table-column prop="actualWindSpeedDq" label="实际风速" align="center"></el-table-column>

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

@@ -95,7 +95,7 @@
             :xAxis="barxAxis"
             :yAxis="baryAxis"
             :series="barSeries"
-            :colors="['#22a6b3', '#05bc4c', '#C531C7', '#4b55ae', '#fa8c16', '#1DA0D7','#DD5044']"
+            :colors="['#22a6b3', '#05bc4c', '#C531C7', '#4b55ae', '#fa8c16', '#1DA0D7','#DD5044','#1467e3']"
           >
           </bar-chart-cop>
         </div>
@@ -551,6 +551,12 @@ const barSeries = ref([
     data: [],
   },
   {
+    name: "0~3m风速",
+    type: "bar",
+    stack: "a",
+    data: [],
+  },
+  {
     name: "3~5m风速",
     type: "bar",
     stack: "a",
@@ -622,6 +628,12 @@ const funTimeArea = () => {
               data: [],
             },
             {
+              name: "0~3m风速",
+              type: "bar",
+              stack: "a",
+              data: [],
+            },
+            {
               name: "3~5m风速",
               type: "bar",
               stack: "a",
@@ -722,6 +734,12 @@ const funTimeArea = () => {
             data: [],
           },
           {
+            name: "0~3m风速",
+            type: "bar",
+            stack: "a",
+            data: [],
+          },
+          {
             name: "3~5m风速",
             type: "bar",
             stack: "a",