Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-ui/src/views/micro/pages/acid/index.vue

@@ -1,11 +1,7 @@
 <template>
   <div class="acid-container">
     <div class="acid-sidebar">
-      <el-menu
-        :default-active="activeMenu"
-        class="sidebar-menu"
-        @select="handleMenuSelect"
-      >
+      <el-menu :default-active="activeMenu" class="sidebar-menu" @select="handleMenuSelect">
         <el-menu-item index="inventory">
           <i class="el-icon-box"></i>
           <span slot="title">库存</span>
@@ -34,6 +30,10 @@
           <i class="el-icon-date"></i>
           <span slot="title">计划</span>
         </el-menu-item>
+        <el-menu-item index="tracking">
+          <i class="el-icon-location-outline"></i>
+          <span slot="title">跟踪</span>
+        </el-menu-item>
         <el-menu-item index="actualPerformance">
           <i class="el-icon-data-analysis"></i>
           <span slot="title">实绩</span>
@@ -54,10 +54,6 @@
           <i class="el-icon-alarm-clock"></i>
           <span slot="title">app</span>
         </el-menu-item>
-        <el-menu-item index="tracking">
-          <i class="el-icon-location-outline"></i>
-          <span slot="title">跟踪</span>
-        </el-menu-item>
       </el-menu>
     </div>
     <div style="flex: 1; overflow: hidden;">