Merge branch 'yx' of http://61.161.152.110:10101/r/electronic-map into yx

src/views/LightMatrix3/LightMatrix3.vue

@@ -85,9 +85,9 @@
                   </div>
                   <div class="num">
                     <i class="svg-icon svg-icon-sm" :class="cItem.color != 'red' ? 'svg-icon-' + cItem.color : 'svg-icon-white'">
-                      <!-- <SvgIcon svgid="svg-R"></SvgIcon> -->
+                      <SvgIcon svgid="svg-R"></SvgIcon>
                     </i>
-                    <span>{{ cItem.fdl || "&nbsp;" }}</span>
+                    <span>{{ cItem.fdjzs.toFixed(2) }}</span>
                   </div>
                   <div class="num">
                     <i class="svg-icon svg-icon-sm" :class="cItem.color != 'red' ? 'svg-icon-' + cItem.color : 'svg-icon-white'">

src/views/WindSite/WindSite.vue

@@ -49,14 +49,14 @@ export default {
         //   icon: "svg-agc",
         //   path: "/monitor/windsite/matrix",
         // },
-        {
-          icon: "svg-agc",
-          path: "/monitor/windsite/lightmatrix",
-        },
-        {
-          icon: "svg-intranet-involvement",
-          path: "/monitor/windsite/box",
-        },
+        // {
+        //   icon: "svg-agc",
+        //   path: "/monitor/windsite/lightmatrix",
+        // },
+        // {
+        //   icon: "svg-intranet-involvement",
+        //   path: "/monitor/windsite/box",
+        // },
         // {
         //   icon: "svg-matrix",
         //   path: "/monitor/windsite/info",

src/views/layout/Menu.vue

@@ -17,7 +17,7 @@
       </li>
     </ul>
   </div>
-  <!-- <div class="sub-menu" v-show="isShowSubMenu">
+  <div class="sub-menu" v-show="isShowSubMenu">
     <ul class="menu-list">
       <li class="menu-item" v-for="(menu, index) of subMenu" @click="subclick(index)" :key="menu" :class="{ active: subIndex == index }">
         <router-link :to="menu.path">
@@ -28,7 +28,7 @@
         </router-link>
       </li>
     </ul>
-  </div> -->
+  </div>
 </template>
 <script>
 import SvgIcon from "@com/coms/icon/svg-icon.vue";
@@ -105,31 +105,33 @@ export default {
               text: "健康管理",
               icon: "svg-wind-site",
               path: "/health",
-            },
-            // {
-            //   text: "健康管理1",
-            //   icon: "svg-wind-site",
-            //   path: "/health/health1",
-            // },
-            {
-              text: "健康管理2",
-              icon: "svg-wind-site",
-              path: "/health/health2",
-            },
-            // {
-            //   text: "健康管理3",
-            //   icon: "svg-wind-site",
-            //   path: "/health/health3",
-            // },
-            {
-              text: "健康管理5",
-              icon: "svg-wind-site",
-              path: "/health/health5",
-            },
-            {
-              text: "健康管理6",
-              icon: "svg-wind-site",
-              path: "/health/health6",
+              children: [
+                 {
+                  text: "健康推荐",
+                  icon: "svg-wind-site",
+                  path: "/health",
+                },
+                {
+                  text: "健康首页",
+                  icon: "svg-wind-site",
+                  path: "/health/health2",
+                },
+                {
+                  text: "健康总览",
+                  icon: "svg-wind-site",
+                  path: "/health/health6",
+                },
+                {
+                  text: "健康矩阵",
+                  icon: "svg-wind-site",
+                  path: "/health/health5",
+                },
+                // {
+                //   text: "健康列表",
+                //   icon: "svg-wind-site",
+                //   path: "/health/health6",
+                // }
+              ],
             },
           ],
         },