合并解决冲突

This commit is contained in:
yujicun
2023-08-08 17:00:48 +08:00
4 changed files with 16 additions and 6 deletions

View File

@@ -471,15 +471,15 @@
<router-link to="/employeelearning">员工学习数据</router-link>
</a-menu-item>
</a-sub-menu>
</a-sub-menu> -->
<a-menu-item key="sub16" v-if="checkMenu('OldSystemManage')">
</a-sub-menu>
<a-menu-item key="sub16">
<div class="imgBox">
<img
style="width: 22px; height: 22px"
src="../assets/images/navleft/review.png"
/>
</div>
<a :href="oldManage">旧版管理员界面</a>
<a target="_blank" :href="oldManage">旧版管理员界面</a>
<!-- <router-link target="_blank" to="/oldsystemmanage">旧版管理员界面</router-link> -->
</a-menu-item>
<a-menu-item key="sub17" v-if="checkMenu('ReadingClubManage')">
@@ -487,7 +487,7 @@
<img
style="width: 22px; height: 22px"
src="../assets/images/navleft/review.png"
/>¡
/>
</div>
<router-link to="/readingclubmanage">业务支援读书会管理</router-link>
</a-menu-item>