feat:合并

src/components/student/CommonStudent.vue

@@ -241,7 +241,7 @@ const {
   loading: stuLoading,
   total: stuTotal
 } = useBoeApiPage(USER_LIST, nameSearch.value, {
-  init: true,
+  init: false,
   result: res => res.result.userInfoList,
   totalPage: res => res.result.totalPage,
   total: res => res.result.totalElement
@@ -260,7 +260,7 @@ const {
   loading: audiLoading,
   total: audiTotal
 } = useBoeApiPage(AUDIENCE_LIST, audienceName.value, {
-  init: true,
+  init: false,
   result: res => res.result.audienceList.map(e => ({...e, id: e.id + ''})),
   totalPage: res => res.result.totalPage,
   total: res => res.result.totalElement
@@ -478,7 +478,7 @@ const resetAudienceInfo = () => {
 // };
 //确定添加授权
 const submitAuth = () => {
-  if (props.type !== 3) {
+  if (props.type === 2) {
     stageVisible.value = true
   } else {
     handleStageOk()

src/views/projectcenter/ProjectAdd.vue

@@ -357,7 +357,6 @@ export default {
               ...res.data.data.projectInfo,
               ...state.projectInfo,
             };
-            state.projectInfo.name = ''
             state.projectInfo.rangeTime = [
               state.projectInfo.beginTime,
               state.projectInfo.endTime,

src/views/projectcenter/ProjectManage.vue

@@ -973,7 +973,7 @@ export default {
         return;
       } */
       const offName = await validateName({
-        name: state.qdms_inputV1,
+        name: state.projectInfo.name,
         type: 1,
         id: state.projectInfo.projectId,
       }).then((res) => {

src/views/projectcenter/TaskPage.vue

@@ -1735,11 +1735,16 @@ export default {
           align: "center",
           className: "h",
           ellipsis: true,
+          customRender: ({ record }) => (
+            <div>
+              {record.finishTaskNum}/{record.totalTaskNum}
+            </div>
+          ),
         },
         {
           title: "最近学习时间",
-          dataIndex: "stutime",
-          key: "stutime",
+          dataIndex: "lastStudyTime",
+          key: "lastStudyTime",
           width: 80,
           align: "center",
           className: "h",