Merge branch 'zcwy-0415' into zcwy-zsx0223

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('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">
@@ -697,11 +706,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() {
@@ -1022,6 +1031,12 @@ export default {
           selectedKeys: "sub17-3-2",
           pagename: "员工学习数据",
         },
+        {
+          href: "/trainingnewmanager",
+          openKeys: "sub17",
+          selectedKeys: "sub17-4",
+          pagename: "新任管理者培训数据",
+        },
         {
           href: "/oldsystemmanage",
           openKeys: "sub18",
@@ -1160,7 +1175,6 @@ export default {
     const getClientHeight = () => {
       state.screenHeight = document.body.clientHeight;
     };
-
     onMounted(() => {
       // console.log("11111", 1);
       window.addEventListener("resize", getClientHeight, false);
@@ -1172,6 +1186,7 @@ export default {
     return {
       ...toRefs(state),
       checkMenu,
+      checkOrgs,
       onOpenChange,
       selectItem,
       packUp,

src/components/drawers/project/ProjectExamManage.vue

@@ -314,7 +314,7 @@ export default {
           align: "center",
           ellipsis: true,
           className: "h",
-          customRender: ({record:{status}}) => ({1:'已完成',0:'未开始',9:'已完成'}[status] || '未开始'),
+          customRender: ({record:{status}}) => ({2:'进行中',1:'未开始',9:'已完成'}[status] || '未开始'),
         },
         {
           title: "操作",

src/components/student/TableStudent.vue

@@ -441,6 +441,10 @@ const props = defineProps({
     type: Object,
     default: () => ({}),
   },
+  remarksTrue: {
+    type: Boolean,
+    default: false,
+  }
 });
 
 const { loading: stuAsyncLoading, start } = useAsyncStu(props.id, props.type, getStuList);
@@ -540,7 +544,7 @@ const tablecolumns = ref([
     title: "操作",
     dataIndex: "operation",
     key: "operation",
-    width: 210,
+    width: 260,
     align: "center",
     slots: { customRender: "action" },
   },