Merge branch 'zcwy-0415' into dev0223

src/components/BreadCrumb.vue

@@ -594,6 +594,16 @@
                     }
                   ];
                 }
+                if (n.indexOf("/trainingnewmanager") !== -1 || n.indexOf("/TrainingNewManager") !== -1) {
+                  state.list = [
+                    {
+                      name: "报表中心",
+                    },
+                    {
+                      name:'新任管理者培训数据'
+                    },
+                  ];
+                }
                 if (n.indexOf("/learningpathmap") !== -1 || n.indexOf("/LearningPathMap") !== -1) {
                   state.list = [
                     {

src/components/NavLeft.vue

@@ -573,6 +573,15 @@
               <router-link to="/employeelearning">员工学习数据</router-link>
             </a-menu-item>
           </a-sub-menu>
+          <a-menu-item key="sub17-4" v-if="checkMenu('evaluationupload')">
+            <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">
@@ -1022,6 +1031,12 @@ export default {
           selectedKeys: "sub17-3-2",
           pagename: "员工学习数据",
         },
+        {
+          href: "/trainingnewmanager",
+          openKeys: "sub17",
+          selectedKeys: "sub17-4",
+          pagename: "新任管理者培训数据",
+        },
         {
           href: "/oldsystemmanage",
           openKeys: "sub18",

src/components/student/OnlineClassModelStudent.vue

@@ -243,7 +243,7 @@ const columns = ref([
     width: 80,
     align: "center",
     ellipsis: true,
-    customRender: ({ record: { finishStatus } }) => finishStatus ? "已完成" : "未开始",
+    customRender: ({ record: { finishStatus } }) => finishStatus==9 ? "已完成" : finishStatus==2 ? "进行中": '未开始',
   },
   {
     title: "操作",