Merge branch 'zcwy-0415' into dev0223

src/components/NavLeft.vue

@@ -573,7 +573,7 @@
               <router-link to="/employeelearning">员工学习数据</router-link>
             </a-menu-item>
           </a-sub-menu>
-          <a-menu-item key="sub17-4">
+          <a-menu-item key="sub17-4" v-if="checkMenu('trainingnewmanager')||getReportOrgs()">
             <span
               :class="{
                 circleActive: selectedKeys[0] === 'sub17-4' ? true : false,
@@ -1175,7 +1175,6 @@ export default {
     const getClientHeight = () => {
       state.screenHeight = document.body.clientHeight;
     };
-
     onMounted(() => {
       // console.log("11111", 1);
       window.addEventListener("resize", getClientHeight, false);

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" },
   },