Merge branch 'pre-dev' into 'develop'

Pre dev See merge request !22
2025-12-20 08:16:46 +08:00 · 2022-12-19 22:30:35 +08:00
parent 4683e499a1 8ba643af57
commit 1ca74979f7
14 changed files with 1001 additions and 944 deletions
--- a/src/App.vue
+++ b/src/App.vue
@@ -44,7 +44,7 @@ export default defineComponent({
    const store = useStore();
    const isLogin = ref(false);
    // console.log("router", router.getRoutes(), route);
-    console.log("版本0.9.17------------");
+    console.log("版本0.9.18------------");
    const routes = computed(() => {
      return router.getRoutes().filter((e) => e.meta?.isLink);
    });
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -57,6 +57,7 @@ export const getProjectDetail = (obj) => http.get('/admin/project/detail', {para
 export const releaseProject = (obj) => http.post('/admin/project/publish', obj)
 //获取项目学员
 export const projectStudent = (obj) => http.post('/admin/project/studentList', obj)
+export const projectStudentCount = (obj) => http.get('/admin/student/getStudentCount', {params: obj})
 //撤回发布、结束
 export const handleProject = (obj) => http.post('/admin/project/handle', obj)

--- a/src/assets/scss/common.scss
+++ b/src/assets/scss/common.scss
@@ -51,31 +51,37 @@ body {
  height: 6px;
  /*对水平流动条有效*/
 }
+
 ::-o-scrollbar {
  width: 6px;
  /*对垂直流动条有效*/
  height: 6px;
  /*对水平流动条有效*/
 }
+
 .scrollbar {
  width: 6px;
  /*对垂直流动条有效*/
  height: 6px;
  /*对水平流动条有效*/
 }
+
 /*定义滚动条的轨道颜色、内阴影及圆角*/
 ::-webkit-scrollbar-track {
  background-color: rgba(239, 244, 252, 1);
  border-radius: 6px;
 }
+
 ::-moz-scrollbar-track {
  background-color: rgba(239, 244, 252, 1);
  border-radius: 6px;
 }
+
 ::-o-scrollbar-track {
  background-color: rgba(239, 244, 252, 1);
  border-radius: 6px;
 }
+
 .scrollbar-track {
  background-color: rgba(239, 244, 252, 1);
  border-radius: 6px;
@@ -86,14 +92,17 @@ body {
  border-radius: 3px;
  background-color: rgba(78, 166, 255, 1);
 }
+
 ::-moz-scrollbar-thumb {
  border-radius: 3px;
  background-color: rgba(78, 166, 255, 1);
 }
+
 ::-o-scrollbar-thumb {
  border-radius: 3px;
  background-color: rgba(78, 166, 255, 1);
 }
+
 .scrollbar-thumb {
  border-radius: 3px;
  background-color: rgba(78, 166, 255, 1);
@@ -104,35 +113,43 @@ body {
  background-color: cyan;
  display: none;
 }
+
 ::-moz-scrollbar-button {
  background-color: cyan;
  display: none;
 }
+
 ::-o-scrollbar-button {
  background-color: cyan;
  display: none;
 }
+
 .scrollbar-button {
  background-color: cyan;
  display: none;
 }
+
 /*定义右下角汇合处的样式*/
 ::-webkit-scrollbar-corner {
  background: rgba(239, 244, 252, 1);
  ;
 }
+
 ::-moz-scrollbar-corner {
  background: rgba(239, 244, 252, 1);
  ;
 }
+
 ::-o-scrollbar-corner {
  background: rgba(239, 244, 252, 1);
  ;
 }
+
 .scrollbar-corner {
  background: rgba(239, 244, 252, 1);
  ;
 }
+
 //隐藏滚动条----------------------------------------------------------------

 //禁止选中----------------------------------------------------------
@@ -329,7 +346,8 @@ textarea {

 //抽屉--------------------------------------------------------
 .drawerStyle {
-	// transform: translateX(0px) !important;
+
+  // transform: translateX(0px) !important;
  .ant-drawer-content-wrapper {
    max-width: 1050px;

@@ -437,29 +455,34 @@ textarea {
  }
 }

-.ant-modal{
-  .modalHeader{
-    background: linear-gradient(180deg, rgba(103,64,255,0.2) 0%, rgba(166,168,255,0) 100%) !important;
+.ant-modal {
+  .modalHeader {
+    background: linear-gradient(180deg, rgba(103, 64, 255, 0.2) 0%, rgba(166, 168, 255, 0) 100%) !important;
  }
-  .top{
-    background: linear-gradient(180deg, rgba(103,64,255,0.2) 0%, rgba(166,168,255,0) 100%) !important;
+
+  .top {
+    background: linear-gradient(180deg, rgba(103, 64, 255, 0.2) 0%, rgba(166, 168, 255, 0) 100%) !important;
  }
-  .del_header{
-    background: linear-gradient(180deg, rgba(103,64,255,0.2) 0%, rgba(166,168,255,0) 100%) !important;
+
+  .del_header {
+    background: linear-gradient(180deg, rgba(103, 64, 255, 0.2) 0%, rgba(166, 168, 255, 0) 100%) !important;
  }
 }
+
 //弹窗--------------------------------------------------------

 //loading--------------------------------------------------------
 .aeLoading {
  width: 100%;
  height: 100%;
-background: rgba(0, 0, 0, 0.2);
-display: flex;
-align-items: center;
-justify-content: center;
-position: absolute;
-left: 0;
-top:0,
+  background: rgba(0, 0, 0, 0.2);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  position: absolute;
+  left: 0;
+  top: 0;
+  z-index: 100
 }
+
 //loading--------------------------------------------------------
--- a/src/components/drawers/NoticeHis.vue
+++ b/src/components/drawers/NoticeHis.vue
@@ -12,9 +12,9 @@
      <div class="itemtime">{{ item.pubtime }}</div>
    </div>
  </div>
-</template>s
+</template>
 <script>
-import { reactive, toRefs, onMounted } from "vue";
+import { reactive, toRefs, onMounted, watch } from "vue";
 import { getTask } from "../../api/indexTaskadd";
 import { noticeList } from "../../api/indexNotice";
 import emitter from "../../utils/bus";
@@ -26,6 +26,10 @@ export default {
      type: Number,
      default: null,
    },
+    show: {
+      type: String,
+      default: null,
+    },
  },

  setup(props) {
@@ -89,6 +93,19 @@ export default {
      getTaskInfo();
      getNotice();
    });
+    watch(
+      () => props.show,
+      () => {
+        console.log("props.show", props.show);
+        if (props.show == 12) {
+          getTaskInfo();
+          getNotice();
+        }
+      },
+      {
+        deep: true,
+      }
+    );
    return {
      ...toRefs(state),
      getTaskInfo,
--- a/src/components/drawers/NoticePub.vue
+++ b/src/components/drawers/NoticePub.vue
@@ -4,11 +4,11 @@
  <div class="noticeTitle">
    <!-- <div class="notitle"><span class="titlespan">公告</span></div> -->
    <div class="switch">
-      <a-switch v-model:checked="noticeChecked" @click="noticeFlag"  size="small" /><span
-        style="margin-left: 16px"
-      >
-        开启
-      </span>
+      <a-switch
+        v-model:checked="noticeChecked"
+        @click="noticeFlag"
+        size="small"
+      /><span style="margin-left: 16px"> 开启 </span>
    </div>
    <template v-if="noticeChecked">
      <p>当前公告内容：</p>
@@ -23,10 +23,8 @@
      </template>
      <!-- 编辑 -->
      <template v-if="editOn">
-      
-          <div class="txt-content">
-            {{ noticeContent1 ? noticeContent1 : "暂无公告" }}
-        
+        <div class="txt-content">
+          {{ noticeContent1 ? noticeContent1 : "暂无公告" }}
        </div>
        <p>编辑新公告：</p>
        <a-textarea
@@ -74,29 +72,30 @@ export default {
        state.projectInfo = res.data.data.projectInfo;
        state.noticeContent1 = state.projectInfo.notice;
        state.noticeContent = state.projectInfo.notice;
-        state.noticeChecked = state.projectInfo.noticeFlag==0?false:true;
+        state.noticeChecked = state.projectInfo.noticeFlag == 0 ? false : true;
      });
-      console.log("state.noticeChecked",state.noticeChecked);
+      console.log("state.noticeChecked", state.noticeChecked);
    };

    const handleEdit = () => {
      state.editOn = true;
    };
    const handleCancel = () => {
-      
      state.editOn = false;
    };
-    const noticeFlag =()=>{
+    const noticeFlag = () => {
      //state.noticeChecked = !state.noticeChecked;
-      console.log("111",state.projectInfo);
-      state.projectInfo.noticeFlag = state.noticeChecked?1:0;
-      editProj(state.projectInfo).then((res)=>{
-        console.log("res",res.data.data.projectInfo);
-      }).catch((error)=>{
-        console.log(error);
-      });
-      console.log("222",state.projectInfo);
-    }
+      console.log("111", state.projectInfo);
+      state.projectInfo.noticeFlag = state.noticeChecked ? 1 : 0;
+      editProj(state.projectInfo)
+        .then((res) => {
+          console.log("res5555555555", res);
+        })
+        .catch((error) => {
+          console.log(error);
+        });
+      console.log("222", state.projectInfo);
+    };
    const pubNotice = () => {
      if (state.noticeContent == "") {
        message.destroy();
@@ -107,15 +106,22 @@ export default {
          projectId: props.projectId,
          title: "",
        };
-        publishNotice(obj);//加入历史
-        state.projectInfo.notice =state.noticeContent;
-        editProj(state.projectInfo).then((res) => {
+        publishNotice(obj); //加入历史
+        state.projectInfo.notice = state.noticeContent;
+        console.log("222444444", state.projectInfo);
+        state.noticeContent1 =
+          state.noticeContent == "" ? "暂无公告" : state.noticeContent;
+        message.success("发布成功");
+        handleCancel();
+        editProj(state.projectInfo)
+          .then((res) => {
            // console.log("res");
            // console.log(res);
            if (res.data.code === 200) {
              message.destroy();
-              message.success("发布成功", res);
-              state.noticeContent1 = res.data.data.notice==""?"暂无公告":res.data.data.notice;
+              // message.success("发布成功");
+              state.noticeContent1 =
+                res.data.data.notice == "" ? "暂无公告" : res.data.data.notice;
              handleCancel();
              emitter.emit("setNotice", false);
            }
@@ -125,8 +131,6 @@ export default {
            message.warning("发布失败");
            console.log(err);
          });
-    
-       
      }
    };
    onMounted(() => {
--- a/src/components/student/CommonStudent.vue
+++ b/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()
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -4,9 +4,9 @@
      <a-col>
        <a-form-item title="姓名：" @click="getStuList">
          <a-input
-            class="cus-input"
-            v-model:value="tableParam.studentName"
-            placeholder="请输入姓名"
+              class="cus-input"
+              v-model:value="tableParam.studentName"
+              placeholder="请输入姓名"
          />
        </a-form-item>
      </a-col>
@@ -14,15 +14,16 @@
        <a-button class="cus-btn" style="width: 100px">
          <template #icon>
            <img
-              style="margin-right: 10px"
-              src="../../assets/images/courseManage/search0.png"
-          /></template>
+                style="margin-right: 10px"
+                src="../../assets/images/courseManage/search0.png"
+            /></template>
          搜索
        </a-button>
      </a-col>
      <a-col :span="2">
        <a-button class="cus-btn white" style="width: 100px" @click="reset"
-          >重置</a-button
+        >重置
+        </a-button
        >
      </a-col>
    </a-row>
@@ -30,14 +31,14 @@
    <a-row type="flex" gutter="12" style="padding-left: 20px">
      <a-col :span="1.5">
        <CommonStudent
-          :type="type"
-          :id="id"
-          @finash="submitCall"
-          :stage="stage"
+            :type="type"
+            :id="id"
+            @finash="submitCall"
+            :stage="stage"
        >
          <a-button class="cus-btn">
            <template #icon
-              ><img
+            ><img
                style="margin-right: 10px"
                src="../../assets/images/courseManage/add0.png"
            /></template>
@@ -48,7 +49,7 @@
      <a-col :span="1.5">
        <a-button class="cus-btn white" @click="bathDel">
          <template #icon
-            ><img
+          ><img
              style="margin-right: 10px"
              src="../../assets/images/projectadd/delete.png"
          /></template>
@@ -58,17 +59,17 @@
    </a-row>
    <div style="margin-top: 20px">
      <a-table
-        :columns="tablecolumns"
-        :data-source="tableData.list"
-        :pagination="stuPagination"
-        :loading="tableData.loading"
-        row-key="id"
-        :row-selection="stuRowSelection"
+          :columns="tablecolumns"
+          :data-source="tableData.list"
+          :pagination="stuPagination"
+          :loading="tableData.loading"
+          row-key="id"
+          :row-selection="stuRowSelection"
      >
        <template #action="{ record }">
          <div
-            @click="del(record.id)"
-            style="color: #4ea6ff; font-size: 14px; text-align: center"
+              @click="del(record.id)"
+              style="color: #4ea6ff; font-size: 14px; text-align: center"
          >
            删除
          </div>
@@ -96,8 +97,8 @@
  </div>
 </template>
 <script setup>
-import { computed, defineProps, onMounted, ref } from "vue";
-import { delStudentList, getStuPage } from "@/api/index1";
+import {computed, defineProps, onMounted, ref, watch} from "vue";
+import {delStudentList, getStuPage} from "@/api/index1";
 import CommonStudent from "@/components/student/CommonStudent";

 const props = defineProps({
@@ -145,8 +146,8 @@ const tablecolumns = ref([
    key: "source",
    width: "10%",
    align: "center",
-    customRender: ({ record: { source } }) =>
-      ({ 1: "快速添加", 2: "组织", 3: "受众" }[source]),
+    customRender: ({record: {source}}) =>
+        ({1: "快速添加", 2: "组织", 3: "受众"}[source]),
  },
  ...props.columns,
  {
@@ -155,7 +156,7 @@ const tablecolumns = ref([
    key: "operation",
    width: "25%",
    align: "center",
-    slots: { customRender: "action" },
+    slots: {customRender: "action"},
  },
 ]);
 const tableParam = ref({
@@ -183,6 +184,11 @@ onMounted(() => {
  getStuList();
 });

+watch(props, () => {
+  tableParam.value.pid= props.id
+  getStuList();
+})
+
 function onStuSelectChange(e) {
  stuSelectKeys.value = e;
 }
@@ -203,31 +209,33 @@ function changePagination(page) {
 function getStuList() {
  tableData.value.loading = true;
  getStuPage(tableParam.value).then((res) => {
+    console.log("学员管理-获取学员", res.data);
    tableData.value.total = res.data.data.total;
    tableData.value.list = res.data.data.records;
    tableData.value.loading = false;
  });
 }

-function reset() {}
+function reset() {
+}

 function bathDel() {
  stuSelectKeys.value &&
-    stuSelectKeys.value.length &&
-    delStudentList({
-      ids: stuSelectKeys.value,
-    }).then(() => {
-      getStuList();
-    });
+  stuSelectKeys.value.length &&
+  delStudentList({
+    ids: stuSelectKeys.value,
+  }).then(() => {
+    getStuList();
+  });
 }

 function del(id) {
  id &&
-    delStudentList({
-      ids: [id],
-    }).then(() => {
-      getStuList();
-    });
+  delStudentList({
+    ids: [id],
+  }).then(() => {
+    getStuList();
+  });
 }

 function submitCall(flag) {
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -2278,7 +2278,7 @@
                <span>{{ currentPlanItem.teacher }}</span>
              </div>
              <div class="stmm_i5">
-                <TableStudent :type="3" :id="offcourseId" :columns="stuColumns">
+                <TableStudent :type="3" :id="offcoursePlanId" :columns="stuColumns">
                  <!--                  <template #extension = "data">-->
                  <!--                    <div style="display: flex">-->
                  <!--                      <button @click="handlJoinStu(data)">成绩录入</button>-->
@@ -4982,7 +4982,7 @@ export default defineComponent({
      console.log(state.currentPlanItem);

      state.sm_hs = true;
-      getTableDate2();
+      // getTableDate2();
    };
    const sm_exit = () => {
      state.sm_hs = false;
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -699,6 +699,7 @@ import ProjPowerList from "../../components/drawers/ProjPowerList";
 import ProjCheckShip from "../../components/drawers/ProjCheckPower";
 // import ManageRight from "../../components/drawers/ManageRight";
 import * as api from "../../api/index1";
+import * as apiStu from "../../api/index";
 import { message } from "ant-design-vue";
 import {
  commonData,
@@ -905,23 +906,13 @@ export default {
          console.log("err", err);
        });
      //获取学员列表
-      let stuobj = {
-        pageNo: 1,
-        pageSize: 10,
-        routerId: router.id,
-      };
-      api
-        .getStudent(stuobj)
-        .then((res) => {
-          console.log("获取学员列表", res.data.data.total);
-          if (res.data.code === 200) {
-            state.routeStudentsNum = res.data.data.total;
+      apiStu.projectStudentCount({
+          pid: router.id,
+          type:2
+        }).then((res) => {
+            state.routeStudentsNum = res.data.data;
            state.pubLoading = false;
-          }
        })
-        .catch((err) => {
-          console.log("获取学员列表失败", err);
-        });
    };
    //确定发布
    const releaseLearnPath = () => {
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -10,26 +10,27 @@
        <div class="fort">创建时间：{{ cretime }}</div>
      </div>
      <div class="right">
-       <!--
+        <!--
        <img
          class="img1"
          src="../../assets/images/leveladd/ma.png"
          @click="showCodeModel2()"
        />
        <div v-if="action == 1 || action == 0" class="line"></div>-->
-        <div class ="pubIcon" v-if="action == 1 || action == 0"  @click="pubIcon(action)">
-        <img
-          class="img2"
-          src="../../assets/images/leveladd/pub.png"
-        />
-        <!-- 已发布的显示 -->
-        <div class="pub" style="width: 28px">
-          {{ act }}
+        <div
+          class="pubIcon"
+          v-if="action == 1 || action == 0"
+          @click="pubIcon(action)"
+        >
+          <img class="img2" src="../../assets/images/leveladd/pub.png" />
+          <!-- 已发布的显示 -->
+          <div class="pub" style="width: 28px">
+            {{ act }}
+          </div>
        </div>
-       </div>
        <div class="line"></div>
        <router-link to="/learningpath"
-          ><div style="display: flex; ">
+          ><div style="display: flex">
            <img class="img2" src="../../assets/images/leveladd/back.png" />
            <div class="return">返回</div>
          </div>
@@ -507,7 +508,7 @@
        <a-tab-pane key="3" tab="学员管理" force-render>
          <TableStudent :type="2" :id="routerId" :stage="stage"></TableStudent>
        </a-tab-pane>
-            <!--1211注释 待开放
+        <!--1211注释 待开放
        <a-tab-pane key="4" tab="设置">
          <div class="split"></div>

@@ -703,7 +704,6 @@
          </a-tabs>
        </a-tab-pane>
   -->
-
      </a-tabs>

      <a-modal
@@ -1114,6 +1114,7 @@ import { codeUrl } from "../../api/method";
 import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
 import TableStudent from "@/components/student/TableStudent";
 // import * as student from "@/api/student";
+import { getStuPage } from "@/api/index1";
 export default {
  name: "LevelAdd",
  components: {
@@ -1367,12 +1368,12 @@ export default {
          className: "h",
        },
        //  {
-         //   title: "岗位",
-          //  dataIndex: "gang",
-         //   key: "gang",
-         //   width: 110,
-          //  align: "center",
-         //   className: "h",
+        //   title: "岗位",
+        //  dataIndex: "gang",
+        //   key: "gang",
+        //   width: 110,
+        //  align: "center",
+        //   className: "h",
        //  },
        {
          title: "当前关卡",
@@ -1382,14 +1383,14 @@ export default {
          align: "center",
          className: "h",
        },
-          {
-            title: "进度",
-           dataIndex: "jin",
-           key: "jin",
-            width: 110,
-           align: "center",
-           className: "h",
-          },
+        {
+          title: "进度",
+          dataIndex: "jin",
+          key: "jin",
+          width: 110,
+          align: "center",
+          className: "h",
+        },
        {
          title: "开始时间",
          dataIndex: "time",
@@ -1680,10 +1681,10 @@ export default {
      let stuobj = {
        pageNo: 1,
        pageSize: 10,
-        routerId: state.routerId,
+        pid: state.routerId,
+        type: 2,
      };
-      api
-        .getStudent(stuobj)
+      getStuPage(stuobj)
        .then((res) => {
          console.log("获取学员列表", res.data.data.total);
          if (res.data.code === 200) {
@@ -1695,14 +1696,13 @@ export default {
          console.log("获取学员列表失败", err);
        });
    };
-    const pubIcon =(action)=>{
-      if(action ==1){
+    const pubIcon = (action) => {
+      if (action == 1) {
        showBackModal();
-      }else{
+      } else {
        showPub();
      }
-
-    }
+    };
    //显示撤回弹窗
    const showBackModal = () => {
      state.backModal = true;
@@ -1868,7 +1868,10 @@ export default {
            state.nodata = false;
          }
          let data = res.data.data.chapterList;
-          state.stage = res.data.data.chapterList.map(e => ({id: e.chapterId, name: e.name}))
+          state.stage = res.data.data.chapterList.map((e) => ({
+            id: e.chapterId,
+            name: e.name,
+          }));
          state.taskSyllabus = data;
          // for(let i in data) {
          //   state.taskSyllabus[i].name = data[i].name
@@ -2851,23 +2854,23 @@ export default {
        background-color: #e8effa;
        margin-right: 28px;
      }
-      .pubIcon{
+      .pubIcon {
        display: flex;
        align-items: center;

        .img2 {
-        width: 42px;
-        height: 42px;
-        margin-right: 22px;
-      }
+          width: 42px;
+          height: 42px;
+          margin-right: 22px;
+        }

-      .pub {
-        color: #ffb64e;
-        font-size: 14px;
-        margin-top: 5px;
-        margin-right: 30px;
-        cursor: pointer;
-      }
+        .pub {
+          color: #ffb64e;
+          font-size: 14px;
+          margin-top: 5px;
+          margin-right: 30px;
+          cursor: pointer;
+        }
      }

      .img2 {
@@ -4262,7 +4265,5 @@ export default {
      }
    }
  }
-
-
 }
 </style>
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -357,7 +357,7 @@ export default {
              ...res.data.data.projectInfo,
              ...state.projectInfo,
            };
-            state.projectInfo.name = ''
+            !routers.query.projectId && !!routers.query.parentId && (state.projectInfo.name = '')
            state.projectInfo.rangeTime = [
              state.projectInfo.beginTime,
              state.projectInfo.endTime,
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -974,7 +974,7 @@ export default {
        return;
      } */
      const offName = await validateName({
-        name: state.qdms_inputV1,
+        name: state.projectInfo.name,
        type: 1,
        id: state.projectInfo.projectId,
      }).then((res) => {
@@ -1047,25 +1047,13 @@ export default {
        state.projectTasks = res.data.data.tasks;
      });
      //获取学员总数
-      let obj = {
-        pageNo: 0,
-        pageSize: 0,
-        projectId: object.projectId,
-      };
-      api
-        .projectStudent(obj)
-        .then((res) => {
-          if (res.data.code === 200) {
-            // console.log("res", res.data);
-            state.projectStudentsNum = res.data.data.total
-              ? res.data.data.total
-              : 0;
+      api.projectStudentCount({
+        pid: object.projectId,
+        type:1
+      }).then((res) => {
+            state.projectStudentsNum = res.data.data
            state.projectPubLoading = false;
-          }
        })
-        .catch((err) => {
-          console.log("获取学员人数失败", err);
-        });
      //获取阶段及任务总数
    };
    //确认发布项目
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
--- a/src/views/research/ResearchManage.vue
+++ b/src/views/research/ResearchManage.vue
@@ -174,7 +174,11 @@
    <!--操作弹窗 -->
  </div>
  <!--  加载动画 -->
-  <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
+  <div
+    class="aeLoading"
+    style="z-index: 100"
+    :style="{ display: addLoading ? 'flex' : 'none' }"
+  >
    <a-spin :spinning="addLoading" tip="" />
  </div>
 </template>