rui.jiang 1 年間 前
コミット
2568d58430
1 ファイル変更12 行追加76 行削除
  1. 12 76
      src/views/home/components/Menu.vue

+ 12 - 76
src/views/home/components/Menu.vue

@@ -10,13 +10,18 @@
           ">
           <SvgIcons name="dnao" class="dnao" width="40px" height="40px" color="#222"></SvgIcons>
         </div>
-<<<<<<< HEAD
-        <span v-if="!isCollapse" @click="
-          handleChangeMenuUrl(
-            { name: '驾驶舱', id: 1, path: 'cockpitManage', iconName: 'gps' },
-            `/home/cockpitManage?name=驾驶舱`
-          )
-          " :class="isCollapse ? 'stop-animation' : 'active-animation'">风机运行管理平台</span>
+        <span
+          v-if="!isCollapse"
+          @click="
+            handleChangeMenuUrl(
+              { name: '驾驶舱', id: 1, path: 'cockpitManage', iconName: 'gps' },
+              `/home/cockpitManage?name=驾驶舱`
+            )
+          "
+          :class="isCollapse ? 'stop-animation' : 'active-animation'"
+        >
+          风机运行管理平台
+        </span>
       </div>
     </div>
     <el-menu collapse-transition ref="menu" class="mt-3 el-menu-vertical-demo" @open="handleOpen" @close="handleClose"
@@ -39,79 +44,11 @@
         <el-menu-item :key="item.id" :index="`/home/${item.path}?id=${item.id}&name=${item.name}`" v-else>
           <i class="el-icon-menu" v-if="isElPrefix(item.iconName)"></i>
           <i v-else class="svnIcon"><svg-icon :icon-class="item.iconName" /></i>
-=======
-        <span
-          v-if="!isCollapse"
-          @click="
-            handleChangeMenuUrl(
-              { name: '驾驶舱', id: 1, path: 'cockpitManage', iconName: 'gps' },
-              `/home/cockpitManage?name=驾驶舱`
-            )
-          "
-          :class="isCollapse ? 'stop-animation' : 'active-animation'"
-        >
-          风机运行管理平台
-        </span>
-      </div>
-    </div>
-    <el-menu
-      collapse-transition
-      ref="menu"
-      class="mt-3 el-menu-vertical-demo"
-      @open="handleOpen"
-      @close="handleClose"
-      background-color="#eff1f3"
-      text-color="#000"
-      active-text-color="#0754a1"
-      :router="true"
-      :default-active="defaultActive"
-      :unique-opened="true"
-      :collapse="isCollapse"
-    >
-      <template v-for="item in routerList">
-        <el-submenu
-          v-if="item.children && item.children.length"
-          :index="item.path"
-        >
-          <template slot="title">
-            <i v-if="isElPrefix(item.iconName)" class="el-icon-menu"></i>
-            <i v-else class="svnIcon">
-              <svg-icon :icon-class="item.iconName" />
-            </i>
-            <span>{{ item.name }}</span>
-          </template>
-          <el-menu-item
-            v-for="child in item.children"
-            v-if="child.meta?.hidden === false"
-            :key="child.id"
-            :index="`/home/${item.path}/${child.path}?id=${child.id}&name=${child.name}`"
-          >
-            <i v-if="isElPrefix(child.iconName)" class="el-icon-menu"></i>
-            <i v-else class="svnIcon">
-              <svg-icon :icon-class="child.iconName" />
-            </i>
-            <span>{{ child.name }}</span>
-          </el-menu-item>
-        </el-submenu>
-        <el-menu-item
-          v-else-if="item.meta?.hidden === false"
-          :key="item.id"
-          :index="`/home/${item.path}?id=${item.id}&name=${item.name}`"
-        >
-          <i v-if="isElPrefix(item.iconName)" class="el-icon-menu"></i>
-          <i v-else class="svnIcon">
-            <svg-icon :icon-class="item.iconName" />
-          </i>
->>>>>>> b3f92a7cfb05c80eef41fd647110691ab5a617cb
           <span>{{ item.name }}</span>
         </el-menu-item>
       </div>
     </el-menu>
     <div class="foldBox flexCenter">
-<<<<<<< HEAD
-      <span v-show="isCollapse" class="el-icon-s-unfold icon" @click="isCollapse = false">展开</span>
-      <span v-show="!isCollapse" class="el-icon-s-fold icon" @click="isCollapse = true">收起</span>
-=======
       <span
         v-show="isCollapse"
         class="el-icon-s-unfold icon"
@@ -126,7 +63,6 @@
       >
         收起
       </span>
->>>>>>> b3f92a7cfb05c80eef41fd647110691ab5a617cb
     </div>
   </el-aside>
 </template>