Merge remote-tracking branch 'boe121/master-0705' into zcwy-teacher-manage

src/components/NavLeft.vue

@@ -339,7 +339,7 @@
           </a-menu-item>
         </a-sub-menu>
         <!-- 教师专区 -->
-        <a-sub-menu key="sub22" @titleClick="titleClick" v-if="checkMenu('gratefulnotice,gratefulcarousel,teacherempowerment,teachertopic,tooldown,teacheropinion')">
+        <a-sub-menu key="sub22" @titleClick="titleClick" v-if="checkMenu('gratefulnotice,gratefulcarousel,teacherempowerment,teachertopic,tooldown,teacheropinion,instructorcertification')">
           <template #icon>
             <div class="imgBox">
               <img
@@ -376,6 +376,17 @@
             ></span>
             <router-link to="/teacherempowerment">教师赋能</router-link>
           </a-menu-item>
+
+          <a-menu-item key="sub22-7" v-if="checkMenu('instructorcertification')">
+            <span
+                :class="{
+                circleActive: selectedKeys[0] === 'sub22-7' ? true : false,
+                circle: selectedKeys[0] === 'sub22-7' ? false : true,
+              }"
+            ></span>
+            <router-link to="/instructorcertification">讲师认证</router-link>
+          </a-menu-item>
+
           <a-menu-item key="sub22-4" v-if="checkMenu('teachertopic')">
             <span
                 :class="{
@@ -573,6 +584,15 @@
               <router-link to="/employeelearning">员工学习数据</router-link>
             </a-menu-item>
           </a-sub-menu>
+          <a-menu-item key="sub17-4" v-if="checkMenu('trainingnewmanager')||checkOrgs()">
+            <span
+              :class="{
+                circleActive: selectedKeys[0] === 'sub17-4' ? true : false,
+                circle: selectedKeys[0] === 'sub17-4' ? false : true,
+              }"
+            ></span>
+            <router-link to="/trainingnewmanager">新任管理者培训数据</router-link>
+          </a-menu-item>
         </a-sub-menu>
         <a-menu-item key="sub16" v-if="checkMenu('OldSystemManage')">
           <div class="imgBox">
@@ -775,11 +795,11 @@
 </template>
 
 <script>
-import {reactive, toRefs, onMounted, onUnmounted, watch} from "vue";
+import {reactive, toRefs, onMounted, onUnmounted, watch } from "vue";
 import {useRoute} from "vue-router";
 import {useStore} from "vuex";
-import {checkMenu} from "@/utils/utils";
-
+import {checkMenu,checkOrgs} from "@/utils/utils";
+import { reportOrgs } from "@/api/indexProject";
 export default {
   name: "NavLeft",
   setup() {
@@ -1011,6 +1031,12 @@ export default {
           selectedKeys: "sub22-6",
           pagename: "意见",
         },
+        {
+          href: "/instructorcertification",
+          openKeys: "sub22",
+          selectedKeys: "sub22-7",
+          pagename: "讲师认证",
+        },
         {
           href: "/articlemanage",
           openKeys: "sub13",
@@ -1128,6 +1154,12 @@ export default {
           selectedKeys: "sub17-3-2",
           pagename: "员工学习数据",
         },
+        {
+          href: "/trainingnewmanager",
+          openKeys: "sub17",
+          selectedKeys: "sub17-4",
+          pagename: "新任管理者培训数据",
+        },
         {
           href: "/oldsystemmanage",
           openKeys: "sub18",
@@ -1266,7 +1298,6 @@ export default {
     const getClientHeight = () => {
       state.screenHeight = document.body.clientHeight;
     };
-
     onMounted(() => {
       // console.log("11111", 1);
       window.addEventListener("resize", getClientHeight, false);
@@ -1278,6 +1309,7 @@ export default {
     return {
       ...toRefs(state),
       checkMenu,
+      checkOrgs,
       onOpenChange,
       selectItem,
       packUp,