菜单修改

src/views/LightMatrix/LightMatrix.vue

@@ -148,7 +148,7 @@ export default {
             key2: "gfqxjclnum",
           },
           {
-            color: "purple",
+            color: "pink",
             name: "限电",
             nameIcon: "svg-limit-power",
             numIcon: "svg-downtime",
@@ -316,7 +316,7 @@ export default {
           return "orange";
           break;
         case 5:
-          return "purple";
+          return "pink";
           break;
         case 6:
           return "write";

src/views/Status/Status.vue

@@ -118,7 +118,7 @@ export default {
           },
           {
             name: "AGC指令",
-            field: "aGCzl",
+            field: "agczl",
             unit: "MW",
             is_num: true,
             is_light: false,

src/views/WindSite/WindSite.vue

@@ -44,7 +44,7 @@ export default {
         {
           icon: "svg-matrix",
           path: "/windsite/draughtfanlist",
-        },
+        },/*
         {
           icon: "svg-agc",
           path: "/windsite/matrix",
@@ -56,7 +56,7 @@ export default {
         {
           icon: "svg-intranet-involvement",
           path: "/windsite/box",
-        },
+        },*/
         {
           icon: "svg-matrix",
           path: "/windsite/info",
@@ -64,7 +64,7 @@ export default {
         {
           icon: "svg-easy-compass",
           path: "/windsite/tower",
-        },
+        },/*
         {
           icon: "svg-easy-compass",
           path: "/windsite/Inverter-Info",
@@ -76,7 +76,7 @@ export default {
         {
           icon: "svg-easy-compass",
           path: "/windsite/map1",
-        },
+        },*/
       ],
     };
   },

src/views/WindSite/pages/Tower.vue

@@ -7,7 +7,7 @@
     <Windmill class="windmill-4"></Windmill>
     <Windmill class="windmill-5"></Windmill>
     <WindTower :data="cftmap"></WindTower>
-    <dash-pie-chart class="pie-left" title="密度" :value="cftmap.KQMD || 0" height="9.722vh" width="9.722vh" />
+    <dash-pie-chart class="pie-left" title="空气密度" :value="cftmap.KQMD || 0" height="9.722vh" width="9.722vh" />
     <dash-pie-chart class="pie-right" title="压强" :value="cftmap.FCCFTYQ || 0" height="9.722vh" width="9.722vh" />
     <Panel class="panel-top" title="日资源玫瑰图">
       <div class="direction-chart">
@@ -27,12 +27,12 @@
         </div>
       </div>
     </Panel>
-    <toolbar-panel class="rose-chart" title="月资源玫瑰图">
+    <toolbar-panel class="rose-chart" title="功率曲线">
       <template v-slot:tools>
         <div class="tools">
           <div class="tool-block">
             <div class="legend bg-green"></div>
-            <div class="legend-text">风速</div>
+            <div class="legend-text">应发功率</div>
           </div>
           <div class="tool-block">
             <div class="legend bg-purple"></div>
@@ -44,15 +44,15 @@
           </div>
           <div class="tool-block">
             <div class="legend bg-yellow"></div>
-            <div class="legend-text">保证功率</div>
+            <div class="legend-text">预测功率4小时</div>
           </div>
           <div class="tool-block">
             <div class="legend bg-blue"></div>
-            <div class="legend-text">预测功率4小时</div>
+            <div class="legend-text">保证功率</div>
           </div>
           <div class="tool-block">
             <div class="legend bg-pink"></div>
-            <div class="legend-text">预测功率72小时</div>
+            <div class="legend-text">风速</div>
           </div>
         </div>
       </template>
@@ -211,21 +211,13 @@ export default {
               title: "平均风速",
               yAxisIndex: 1, // 使用单位
               value: []
-            }, {
-              title: "72小时预测功率",
-              yAxisIndex: 0, // 使用单位
-              value: []
-            }, {
-              title: "最优功率",
-              yAxisIndex: 0, // 使用单位
-              value: []
             }]
           };
 
           keyArray.forEach((key, keyIndex) => {
             res.data.glvos.forEach(ele => {
               Powertrend.value[keyIndex].value.push({
-                text: new Date(ele.time).formatDate("yyyy-MM-dd"),
+                text: new Date(ele.time).formatDate("hh:mm"),
                 value: ele[key],
               })
             });

src/views/WindSite/pages/Tower/WindTower.vue

@@ -29,51 +29,51 @@
       y="16" />
     <g>
       <use xlink:href="#wind-tower" y="30" />
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="123" y="47">{{cftMap.FCCFTFS80 || 0}}°</text>
+      <text fill="#ffffff" font-size="14" stroke-width="0" x="123" y="47">{{cftMap.FCCFTFS80 || 0}}m/s</text>
       <text fill="#ffffff" font-size="14" stroke-width="0" x="196" y="47">80米风速</text>
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="529" y="47">{{cftMap.FCCFTFX80 || 0}}°</text>
+      <text fill="#ffffff" font-size="14" stroke-width="0" x="529" y="47">{{cftMap.FCCFTFX80 || 0}}度</text>
       <text fill="#ffffff" font-size="14" stroke-width="0" x="438" y="47">80米风向</text>
     </g>
     <g>
       <use xlink:href="#wind-tower" y="110" />
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="123" y="127">{{cftMap.FCCFTFS70 || 0}}°</text>
+      <text fill="#ffffff" font-size="14" stroke-width="0" x="123" y="127">{{cftMap.FCCFTFS70 || 0}}m/s</text>
       <text fill="#ffffff" font-size="14" stroke-width="0" x="196" y="127">70米风速</text>
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="529" y="127">{{cftMap.FCCFTFX70 || 0}}°</text>
+      <text fill="#ffffff" font-size="14" stroke-width="0" x="529" y="127">{{cftMap.FCCFTFX70 || 0}}度</text>
       <text fill="#ffffff" font-size="14" stroke-width="0" x="438" y="127">70米风向</text>
     </g>
     <g>
       <use xlink:href="#wind-tower" y="190" />
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="123" y="207">{{cftMap.FCCFTFS60 || 0}}°</text>
+      <text fill="#ffffff" font-size="14" stroke-width="0" x="123" y="207">{{cftMap.FCCFTFS60 || 0}}m/s</text>
       <text fill="#ffffff" font-size="14" stroke-width="0" x="196" y="207">60米风速</text>
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="529" y="207">{{cftMap.FCCFTFX60 || 0}}°</text>
+      <text fill="#ffffff" font-size="14" stroke-width="0" x="529" y="207">{{cftMap.FCCFTFX60 || 0}}度</text>
       <text fill="#ffffff" font-size="14" stroke-width="0" x="438" y="207">60米向</text>
     </g>
     <g>
       <use xlink:href="#wind-tower" y="270" />
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="123" y="287">{{cftMap.FCCFTFS50 || 0}}°</text>
+      <text fill="#ffffff" font-size="14" stroke-width="0" x="123" y="287">{{cftMap.FCCFTFS50 || 0}}m/s</text>
       <text fill="#ffffff" font-size="14" stroke-width="0" x="196" y="287">50米风速</text>
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="529" y="287">{{cftMap.FCCFTFX50 || 0}}°</text>
+      <text fill="#ffffff" font-size="14" stroke-width="0" x="529" y="287">{{cftMap.FCCFTFX50 || 0}}度</text>
       <text fill="#ffffff" font-size="14" stroke-width="0" x="438" y="287">50米风向</text>
     </g>
     <g>
       <use xlink:href="#wind-tower" y="350" />
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="123" y="367">{{cftMap.FCCFTFS40 || 0}}°</text>
+      <text fill="#ffffff" font-size="14" stroke-width="0" x="123" y="367">{{cftMap.FCCFTFS40 || 0}}m/s</text>
       <text fill="#ffffff" font-size="14" stroke-width="0" x="196" y="367">40米风速</text>
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="529" y="367">{{cftMap.FCCFTFX40 || 0}}°</text>
+      <text fill="#ffffff" font-size="14" stroke-width="0" x="529" y="367">{{cftMap.FCCFTFX40 || 0}}度</text>
       <text fill="#ffffff" font-size="14" stroke-width="0" x="438" y="367">40米风向</text>
     </g>
     <g>
       <use xlink:href="#wind-tower" y="430" />
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="123" y="447">{{cftMap.FCCFTFS30 || 0}}°</text>
+      <text fill="#ffffff" font-size="14" stroke-width="0" x="123" y="447">{{cftMap.FCCFTFS30 || 0}}m/s</text>
       <text fill="#ffffff" font-size="14" stroke-width="0" x="196" y="447">30米风速</text>
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="529" y="447">{{cftMap.FCCFTFX30 || 0}}°</text>
+      <text fill="#ffffff" font-size="14" stroke-width="0" x="529" y="447">{{cftMap.FCCFTFX30 || 0}}度</text>
       <text fill="#ffffff" font-size="14" stroke-width="0" x="438" y="447">30米风向</text>
     </g>
     <g>
       <use xlink:href="#wind-tower" y="510" />
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="123" y="527">{{cftMap.FCCFTFS10 || 0}}°</text>
+      <text fill="#ffffff" font-size="14" stroke-width="0" x="123" y="527">{{cftMap.FCCFTFS10 || 0}}m/s</text>
       <text fill="#ffffff" font-size="14" stroke-width="0" x="196" y="527">10米风速</text>
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="529" y="527">{{cftMap.FCCFTFX10 || 0}}°</text>
+      <text fill="#ffffff" font-size="14" stroke-width="0" x="529" y="527">{{cftMap.FCCFTFX10 || 0}}度</text>
       <text fill="#ffffff" font-size="14" stroke-width="0" x="438" y="527">10米风向</text>
     </g>
   </svg>

src/views/layout/Header.vue

@@ -5,6 +5,7 @@
         {{ menu.text }}
       </li>
     </ul>
+    <!--
     <ul class="header-menu-dropdown" :class="{ dropdown: dropdown }">
       <li class="header-menu-dropdown-title" @click="clickMenu()"><i class="fa fa-gear"></i>菜单<i class="fa fa-sort-down down"></i></li>
       <ul class="header-menu-dropdown-list">
@@ -12,9 +13,9 @@
           {{ menu.text }}
         </li>
       </ul>
-    </ul>
+    </ul> -->
     <ul class="header-menu-user">
-      <li class="header-menu-user-title"><i class="fa fa-user"></i>Administrator</li>
+      <li class="header-menu-user-title"><i class="fa fa-user"></i>王军</li>
     </ul>
   </div>
 </template>
@@ -67,7 +68,7 @@ export default {
         },
       ],
       activeIndex: 0,
-      menusDropdown: [
+     /* menusDropdown: [
         {
           text: "子菜单1",
           code: "submenu1",
@@ -81,7 +82,7 @@ export default {
           code: "submenu3",
         },
       ],
-      dropdown: false,
+      dropdown: false,*/
     };
   },
   emits: {

src/views/layout/Menu.vue

@@ -46,41 +46,41 @@ export default {
           text: "状态监视",
           data: [
             {
-              text: "领导驾驶舱",
+              text: "驾驶舱",
               icon: "svg-lead-cockpit",
               path: "/",
             },
             {
-              text: "矩阵",
-              icon: "svg-matrix",
-              path: "/lightmatrix",
-            },
-            {
-              text: "矩阵",
+              text: "基础矩阵",
               icon: "svg-matrix",
               path: "/lightmatrix1",
             },
             {
-              text: "矩阵",
+              text: "风场明细矩阵",
               icon: "svg-matrix",
               path: "/lightmatrix2",
             },
             {
-              text: "矩阵",
+              text: "欠发矩阵",
               icon: "svg-matrix",
               path: "/lightmatrix3",
             },
             {
-              text: "Agc",
-              icon: "svg-agc",
-              path: "/agc",
+              text: "光伏明细矩阵",
+              icon: "svg-matrix",
+              path: "/lightmatrix",
             },
-            {
-              text: "链路",
+           {
+              text: "状态监视",
               icon: "svg-periodic-line",
               path: "/status",
             },
             {
+              text: "Agc",
+              icon: "svg-agc",
+              path: "/agc",
+            },
+          /*   {
               text: "网络",
               icon: "svg-agc",
               path: "/",
@@ -116,14 +116,14 @@ export default {
               text: "关于",
               icon: "svg-agc",
               path: "/about",
-            },
+            },*/
           ],
         },
         {
           id: "datacenter",
           text: "数据管理",
           data: [
-            {
+            /*{
               text: "矩阵",
               icon: "svg-matrix",
               path: "/lightmatrix",
@@ -132,7 +132,7 @@ export default {
               text: "矩阵",
               icon: "svg-matrix",
               path: "/lightmatrix1",
-            },
+            },*/
           ],
         },
         {
@@ -148,7 +148,7 @@ export default {
               text: "健康管理1",
               icon: "svg-wind-site",
               path: "/health1",
-            },
+            }/*,
             {
               text: "健康管理2",
               icon: "svg-wind-site",
@@ -163,7 +163,7 @@ export default {
               text: "健康管理4",
               icon: "svg-wind-site",
               path: "/health4",
-            },
+            },*/
           ],
         },
         {
@@ -174,7 +174,7 @@ export default {
               text: "决策支持1",
               icon: "svg-matrix",
               path: "/decision1",
-            },
+            },/*
             {
               text: "决策支持2",
               icon: "svg-matrix",
@@ -189,7 +189,7 @@ export default {
               text: "决策支持4",
               icon: "svg-matrix",
               path: "/decision4",
-            },
+            },*/
           ],
         },
         {