feat:合并

2025-12-15 13:56:45 +08:00 · 2022-11-30 12:03:59 +08:00
parent 6275706f2a 721062c602
commit 48412990a0
16 changed files with 453 additions and 356 deletions
--- a/src/api/index1.js
+++ b/src/api/index1.js
@@ -2,7 +2,7 @@
 * @Author: lixg lixg@dongwu-inc.com
 * @Date: 2022-11-04 22:45:31
 * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-29 18:17:23
+ * @LastEditTime: 2022-11-30 10:39:27
 * @FilePath: /fe-manage/src/api/index1.js
 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 */
@@ -130,7 +130,7 @@ export const orgtree = () => http.get("/org/tree");
 //获取积分列表
 export const noticeList = (projectId) =>
 	http.post(
-		`http://localhost:8080/api/admin/project/noticeList?projectId=` +
+		`/admin/project/noticeList?projectId=` +
 		projectId +
 		``
 	);
--- a/src/api/indexExam.js
+++ b/src/api/indexExam.js
@@ -20,4 +20,6 @@ export const queryExaminationList = (obj) => http.post('/examination/queryExamin
 // 获取考试任务列表的接口-三方
 export const queryExaminationAloneExtendList = (obj) => http.post('/examination/queryExaminationAloneExtendList', obj);
 // 对接三方考试任务保存接口-三方
-export const examinationTaskSave = (obj) => http.post('/examination/examinationTaskSave', obj);
+export const examinationTaskSave = (obj) => http.post('/examination/examinationTaskSave', obj);
+//编辑考试信息
+export const updateExamination = (obj) => http.post('/examination/updateExamination', obj);
--- a/src/api/indexOnline.js
+++ b/src/api/indexOnline.js
@@ -12,7 +12,7 @@ import http from "./config";

 // 接口-请求
 //查询在线课信息列表接口
-export const  queryOnlinelList = (obj) => http.post('/queryOnlineClassesDetailList', obj)
+export const  queryOnlinelList = (obj) => http.post('/onlineClasses/queryOnlineClassesDetailList', obj)



--- a/src/components/drawers/AddCase.vue
+++ b/src/components/drawers/AddCase.vue
@@ -160,7 +160,6 @@ export default {
      currentPage: 1,
      tableDataTotal: 0,
      pageSize: 10,
-      searching:false,
      selectedRowKeys: [],
      apiTaskList: [],
      inputV1: "",
@@ -222,23 +221,6 @@ export default {
    const getTableDate = (tableData) => {
      let data = tableData;
      let array = [];
-      if(state.searching){
-        data.map((value, index) => {
-        let obj = {
-          key: index,
-          authorId: value.authorId,
-          authorName: value.authorName,
-          companyId: value.companyId,
-          coverUrl: value.coverUrl,
-          id: value.id,
-          casesId: value.casesId,
-          title: value.title,
-        };
-        if(obj.title == state.inputV1){
-          array.push(obj);
-        }
-      });
-      } else {
        data.map((value, index) => {
        let obj = {
          key: index,
@@ -252,7 +234,6 @@ export default {
        };
        array.push(obj);
      });
-      }
      state.tableData = array;
    };
    //获取全部案例信息接口
@@ -264,7 +245,7 @@ export default {
          orderField: "",
          pageIndex: state.currentPage,
          pageSize: state.pageSize,
-          top: true,
+          isTop: "",
        })
        .then((res) => {
          if (res.status === 200) {
@@ -318,10 +299,6 @@ export default {
        }
      } else if (props.isLevel == 3) {
        for (let i = 0; i < state.apiTaskList.length; i++) {
-          console.log(
-            state.apiTaskList[i],
-            "state.apiTaskList[i].caseIdstate.apiTaskList[i].caseId"
-          );
          apiTask
            .addTask({
              courseId: state.apiTaskList[i].caseid,
@@ -349,17 +326,14 @@ export default {
    //搜索案例列表
    const searchList = ()=> {
      if(state.inputV1 !== ''){
-        state.searching = true
        getAllCaseText()
      }else {
-        state.searching = false
        resetCase()
      }
    }
    //重置案例信息
    const resetCase = () => {
      state.inputV1 = ""
-      state.searching = false
      state.selectedRowKeys=[]
      state.currentPage = 1
      getAllCaseText();
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -198,7 +198,6 @@ export default {
      time: undefined,
      onlineClassesId: null,
      onlineName: "",
-      searching:false,
      selectV: "",
      selectedRowKeys: [],
      tableData: [],
@@ -286,23 +285,10 @@ export default {
      let data = tableData;
      let array = [];
      data.map((value,index) => {
-        if(state.searching){
+        {
          let obj = {
            key: index + 1,
-            num:"", 
-            name:value.name,
-            contenttype:value.contentType == 10 ? "微课" : "录播课",
-            teacher:value.teacher,
-            sysCreateBy:value.sysCreateBy,
-            overtime:"",
-          };
-          if(obj.name == state.inputV1 || obj.contenttype == state.selectV){
-            array.push(obj);
-          }
-        } else {
-          let obj = {
-            key: index + 1,
-            num:"", 
+            num:value.onlineClassesId,
            name:value.name,
            contenttype:value.contentType == 10 ? "微课" : "录播课",
            teacher:value.teacher,
@@ -345,7 +331,7 @@ export default {
        state.addOnlineList.map((value) => {
          RouterEditTask({
          chapterId: Number(props.isactive),
-          courseId: value.onlineClassesId,
+          courseId: value.num,
          name: value.name,
          routerId: props.routerId,
          routerTaskId: props.routerTaskId || 0,
@@ -363,11 +349,11 @@ export default {
            message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
          });
        })
-      } else if (props.isLevel == 2) {
+      } else if (props.isLevel === 2) {
        state.addOnlineList.map((value) => {
          apiTask
          .addTask({
-            courseId: value.onlineClassesId,
+            courseId: value.num,
            name: value.name,
            projectId: props.projectId,
            projectTaskId: props.projectTaskId || 0,
@@ -415,7 +401,6 @@ export default {
    //搜索在线列表
    const searchList = ()=> {
      if(state.inputV1 !== '' || state.selectV !== ''){
-        state.searching = true
        getAllOnlineText()
      }else {
        resetOnline()
@@ -425,7 +410,6 @@ export default {
    const resetOnline = () => {
      state.inputV1 = "";
      state.selectV = "";
-      state.searching = false;
      state.selectedRowKeys = [];
      state.addOnlineList = [];
      state.currentPage = 1;
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -32,7 +32,6 @@
          外部考试
        </button>
      </div>
-
      <a-form
        v-if="isOuter == 1"
        ref="formRef"
@@ -119,6 +118,7 @@
                      class="tag-style"
                      v-if="paperName != ''"
                      :closable="true"
+                      @close="delTag"
                      >{{ paperName }}</a-tag
                    >
                    <!-- <a-tag
@@ -266,7 +266,6 @@
                    style="width: 88px; height: 32px; margin-left: 35px"
                  />
                </a-form-item>
-
                <span style="margin-left: 8px">分</span>
              </div>
            </div>
@@ -310,7 +309,6 @@
          <a-button class="btn2" html-type="submit">确定</a-button>
        </div>
      </a-form>
-
      <a-form
        v-else
        ref="formRef"
@@ -341,7 +339,6 @@
                </a-form-item>
              </div>
            </div>
-
            <div class="main_item">
              <div class="btnbox">
                <a-form-item
@@ -403,7 +400,6 @@ import STest from "./SelectTest.vue";
 import { ProjectEditTask, RouterEditTask } from "@/api/indexTask";
 import { addTempTask } from "../../api/indexTaskadd";
 import dayjs from "dayjs";
-
 export default {
  name: "AddTest",
  components: {
@@ -476,6 +472,7 @@ export default {
      showAnalysis: 2,
      showAnswers: 2,
      choosedTime: "",
+      paperName: "",
      choosedTest: [
        {
          key: 1,
@@ -497,6 +494,8 @@ export default {
      STvisible: false, //选择试卷抽屉
      paperId: null, //试卷id 子组件传过来给考试抽屉创建考试信息需要
      paperName: "", //试卷名称 子组件传过来给考试抽屉选择试卷后框框用
+      id: "",
+      testName: "",
      choosedTestList: [
        {
          value: "提高核心竞争力",
@@ -626,7 +625,6 @@ export default {
        },
      ],
    };
-
    const options1 = ref([
      {
        label: "math",
@@ -640,16 +638,16 @@ export default {
    const handleFinish = () => {
      updateTest();
    };
-
-    const handleFinishFailed = (e) => {
-      console.log("提交失败", e);
+    const handleFinishFailed = () => {
      message.error("handleFinishFailed");
    };
-
    const resetForm = () => {
      formRef.value.resetFields();
+      state.paperName = "";
+      state.paperId = null;
+      state.id = "";
+      state.testName = "";
    };
-
    const handleValidate = (...args) => {
      console.log(args);
    };
@@ -668,11 +666,13 @@ export default {
        queryTest();
      }
    };
-
    const selectTest = () => {
      state.STvisible = true;
    };
-
+    const delTag = () => {
+      state.paperId = 0;
+      state.paperName = "";
+    };
    const queryTest = () => {
      // state.addLoading = true;
      queryExaminationDetailById({ examinationId: props.EditTestId })
@@ -689,6 +689,8 @@ export default {
          formState.scoringModel = Number(res.data.data.scoringModel) || 1;
          formState.showAnalysis = Number(res.data.data.showAnalysis) || 1;
          formState.showAnswers = Number(res.data.data.showAnswers) || 1;
+          formState.papaerName = res.data.data.examinationTestName;
+          state.paperName = res.data.data.examinationTestName;
          if (
            res.data.data.examinationEndTime &&
            res.data.data.examinationStartTime
@@ -707,7 +709,7 @@ export default {
        });
    };
    const updateTest = () => {
-      //state.addLoading = true;
+      //state.addLoading = true;updateTask
      let obj = {
        examinationDuration: formState.examinationDuration,
        examinationEndTime: dayjs(formState.choosedTime[1]).format(
@@ -727,17 +729,17 @@ export default {
        scoringModel: formState.scoringModel,
        showAnalysis: formState.showAnalysis,
        showAnswers: formState.showAnswers,
+        examinationTestId: state.id,
+        examinationTestName: state.testName,
      };
      if (props.edit) {
        // 编辑任务
        updateExamination(obj)
          .then((res) => {
-            console.log("编辑考试", res);
            updateTask(res);
            closeDrawer();
          })
-          .catch((err) => {
-            console.log("编辑失败", err);
+          .catch(() => {
            message.error(`编辑失败`);
          });
      } else {
@@ -747,19 +749,15 @@ export default {
            updateTask(res);
            closeDrawer();
          })
-          .catch((err) => {
-            console.log("创建失败", err);
+          .catch(() => {
            message.error(`编辑失败`);
          });
      }
    };
-
    const updateTask = (res) => {
      state.EditTestId = res.data.data.examinationId;
-      console.log("state.EditTestId=====0", state.EditTestId, props.faceLevel);
      if (props.faceLevel) {
        state.EditTestId = res.data.data.examinationId;
-        console.log("state.EditTestId=====", state.EditTestId);
      } else {
        if (props.isLevel == 1) {
          let editObj1 = {
@@ -804,7 +802,6 @@ export default {
              );
            });
        } else if (props.isLevel == 3) {
-          console.log("");
          addTempTask({
            courseId: res.data.data.examinationId,
            duration: res.data.data.examinationDuration,
@@ -828,7 +825,6 @@ export default {
        }
      }
    };
-
    const cloradio1 = (value) => {
      if (value != "") {
        formState.showAnswers = "";
@@ -868,6 +864,8 @@ export default {
    const getData = (value) => {
      state.paperId = value.paperId;
      state.paperName = value.testName;
+      state.id = value.id;
+      state.testName = value.testName;
    };
    return {
      formState,
@@ -884,6 +882,7 @@ export default {
      resetForm,
      handleValidate,
      formRef,
+      delTag,
      // layout,
      rules,
      updateTest,
--- a/src/components/drawers/EvList.vue
+++ b/src/components/drawers/EvList.vue
@@ -97,7 +97,6 @@ import { reactive, toRefs } from "vue";
        tableDataTotal: 0,
        pageSize: 10,
        inputV1:"",
-        searching:false,
        evaluationTypeId:null,
        evaluationTypeName:"",
        tableData: [],
@@ -160,11 +159,10 @@ import { reactive, toRefs } from "vue";
      state.evListData = selectedRows[0] ? selectedRows[0] : {}
    }
    const closeDrawer = () => {
-      ctx.emit("update:EvalListVisible", false);
      state.selectedRowKeys = []
      state.evListData = {}
      state.inputV1 = ""
-      state.searching = false
+      ctx.emit("update:EvalListVisible", false);
    };
    const afterVisibleChange = (bol) => {
      if ( bol == true ) {
@@ -177,6 +175,7 @@ import { reactive, toRefs } from "vue";
    }
    const changePagination = (page) => {
      state.currentPage = page;
+      getAllEvalText();
    };
    //如果编辑情况会通过父亲传回来evaluationTypeId遍历出相同的那个选项 再将那个选项的key值赋给state.selectRowKeys
    const getTableDataList = (tableData) => {
@@ -202,24 +201,6 @@ import { reactive, toRefs } from "vue";
      });
      state.tableData = array;
      state.selectedRowKeys = arrayKey;
-      }else if (state.searching){
-        data.map((value,index) => {
-        let obj = {
-          key:index+1,
-          status:value.status,
-          quiz_code:value.quiz_code,
-          quiz_kid:value.quiz_kid,
-          title:value.title,
-          theme_desc:value.theme_desc,
-          quiz_price:value.quiz_price,
-          quiz_range:value.quiz_range,
-        };
-        if(state.inputV1 == obj.title)
-        {
-          array.push(obj);
-        }
-      });
-      state.tableData = array;
      }
      else{
        data.map((value,index) => {
@@ -242,7 +223,7 @@ import { reactive, toRefs } from "vue";
    //获取测评列表
    const getAllEvalText = ()=> {
      let objael = {
-        "keyword": "",
+        "keyword": state.inputV1,
        "user_id": "965341999643234304",
      }
      api
@@ -256,10 +237,8 @@ import { reactive, toRefs } from "vue";
    //搜索测评列表
    const searchList = ()=> {
      if(state.inputV1 !== ''){
-        state.searching = true
        getAllEvalText()
      }else {
-        state.searching = false
        resetData()
      }
    }
--- a/src/components/drawers/SelectTest.vue
+++ b/src/components/drawers/SelectTest.vue
@@ -23,17 +23,18 @@
              <a-input
                v-model:value="inputPname"
                style="width: 270px; height: 40px; border-radius: 8px"
-                placeholder="请输入试卷名称或序号"
+                placeholder="请输入试卷名称"
              />
            </div>
-            <div class="namecon" style="margin-right: 30px">
+            <!-- 因为接口不支持创建人搜索，所以暂时注调 -->
+            <!-- <div class="namecon" style="margin-right: 30px">
              <div class="name">创建人：</div>
              <a-input
                v-model:value="inputCname"
                style="width: 240px; height: 40px; border-radius: 8px"
                placeholder="请输入创建人"
              />
-            </div>
+            </div> -->
          </div>
          <div class="btns">
            <div
@@ -72,6 +73,7 @@
          <div class="tableBox">
            <div class="pa">
              <a-pagination
+                v-if="tableDataTotal>10"
                showSizeChanger="true"
                showQuickJumper="true"
                hideOnSinglePage="true"
@@ -147,6 +149,7 @@ export default {
      closeDrawer();
    };
    const closeDrawer = () => {
+      state.selectedRowKeys = []
      ctx.emit("update:STvisible", false);
    };

@@ -217,56 +220,57 @@ export default {
      }
      state.selectedRowKeys = selectedRowKeys;
      state.SelectTestData = selectedRows[0];
-      console.log("state.SelectTestData---------------", state.SelectTestData);
    };

    const newTest = () => {
-      console.log("创建考试没设计图");
      state.addExamVisible = true;
    };
-    const getTableDate = (tableData) => {
-      let data = tableData;
-      let array = [];
-      data.map((value, index) => {
-        let obj = {
-          key: index + 1,
-          sysCreateBy: value.sysCreateBy,
-          paperId: value.paperId,
-          testName: value.testName,
-          paperMode: value.paperMode,
-          sysUpdateTime: value.sysUpdateTime,
-        };
-        array.push(obj);
-      });
-      state.tableData = array;
-    };
+    // const getTableDate = (tableData) => {
+    //   let data = tableData;
+    //   let array = [];
+    //   data.map((value, index) => {
+    //     let obj = {
+    //       key: index + 1,
+    //       sysCreateBy: value.sysCreateBy,
+    //       paperId: value.paperId,
+    //       testName: value.testName,
+    //       paperMode: value.paperMode == 1 ? "固定试卷" : "随机",
+    //       sysUpdateTime: value.sysUpdateTime,
+    //     };
+    //     array.push(obj);
+    //   });
+    //   state.tableData = array;
+    //   state.tableDataTotal = array.length
+    // };
    //获取选择考试列表
    const getManageList = () => {
      let obj = {
        keyWord: state.inputPname,
-        pageIndex: state.pageSize,
+        pageIndex: state.currentPage,
        pageSize: state.pageSize,
        published: true,
      };
      api
        .queryExaminationList(obj)
        .then((data) => {
-
          // getTableDate(res.data.data);
          //**   表格repaint   */
          let array = []
-          data.map((value, index) => {
+          data.data.data.map((value, index) => {
          let obj = {
          key: index + 1,
          sysCreateBy: value.sysCreateBy,
-          paperId: value.paperId,
+          paperId: index + 1,
          testName: value.testName,
-          paperMode: value.paperMode,
+          paperMode: value.randomMode ? "是" : "否",
          sysUpdateTime: value.sysUpdateTime,
+          id:value.id,
        };
        array.push(obj);
      });
-      //**         */
+      state.tableData = array
+      state.tableDataTotal = array.length
+          message.destroy()
          message.success("获取选择考试列表成功");
        })
        .catch(() => {
@@ -289,7 +293,6 @@ export default {
      ...toRefs(state),
      closeDrawer,
      afterVisibleChange,
-      getTableDate,
      onSelectChange,
      CreatSTText,
      newTest,
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -4813,7 +4813,7 @@ export default defineComponent({
          deptList: res[1],
          groupList: res[2],
          offcourseId: state.offcourseId,
-          offcoursePlanId: "",
+          offcoursePlanId: state.offcoursePlanId, //开课id
          studentList: res[0],
        };
        console.log("obj", obj);
--- a/src/views/examine/CourseReviewed.vue
+++ b/src/views/examine/CourseReviewed.vue
@@ -15,34 +15,33 @@
          <div class="inpbox">
            <div class="inpbox1">
              <a-select
-                v-model:value="valueproj"
-                placeholder="请选择内容分类"
-                @change="handleChangeproj"
-                :options="optionsproj"
+                  v-model:value="valueproj"
+                  value-key="value"
+                  :options="[{label:'请选择内容分类',value:''},...calssifyList]"
              />
            </div>
            <div class="inpbox1">
              <a-input
-                v-model:value="valuecreater"
-                style="
+                  v-model:value="valuecreater"
+                  style="
                  width: 270px;
                  height: 40px;
                  border-radius: 8px;
                  margin-right: 14px;
                "
-                placeholder="请输入创建人"
+                  placeholder="请输入创建人"
              />
            </div>
            <div class="inpbox1">
              <a-input
-                v-model:value="valuename"
-                style="
+                  v-model:value="valuename"
+                  style="
                  width: 270px;
                  height: 40px;
                  border-radius: 8px;
                  margin-right: 14px;
                "
-                placeholder="请输入名称"
+                  placeholder="请输入名称"
              />
            </div>
          </div>
@@ -61,26 +60,26 @@
      <div class="tmpl_body">
        <div class="tmpl_tabbox">
          <a-table
-            :columns="columns1"
-            :data-source="tableData1"
-            :loading="tableDataTotal === -1 ? true : false"
-            expandRowByClick="true"
-            @expand="expandTable"
-            :scroll="{ x: 1300 }"
-            :pagination="false"
+              :columns="columns1"
+              :data-source="tableData1"
+              :loading="tableDataTotal === -1 ? true : false"
+              expandRowByClick="true"
+              @expand="expandTable"
+              :scroll="{ x: 1300 }"
+              :pagination="false"
          />
        </div>
        <div class="tableBox">
          <div class="pa">
            <a-pagination
-              v-if="total > 10"
-              showSizeChanger="true"
-              show-quick-jumper
-              :pageSize="pageSize"
-              v-model:current="currentPage"
-              :total="total"
-              class="pagination"
-              @change="changePagination"
+                v-if="total > 10"
+                showSizeChanger="true"
+                show-quick-jumper
+                :pageSize="pageSize"
+                v-model:current="currentPage"
+                :total="total"
+                class="pagination"
+                @change="changePagination"
            />
          </div>
        </div>
@@ -89,23 +88,16 @@
  </div>
 </template>
 <script>
-import { reactive, toRefs, onMounted } from "vue";
-import { courseListView } from "../../api/indexAudit";
+import {reactive, toRefs, onMounted} from "vue";
+import {courseListView} from "../../api/indexAudit";
+import * as api1 from "@/api/index1";
+
 export default {
  name: "CoursereViewed",

  setup() {
    const state = reactive({
-      optionsproj: [
-        {
-          value: "0",
-          label: "Jack",
-        },
-        {
-          value: "1",
-          label: "rose",
-        },
-      ],
+      calssifyList: [], //分类字典
      valueproj: "",
      valuecreater: "",
      valuename: "",
@@ -136,6 +128,7 @@ export default {
          dataIndex: "content",
          key: "content",
          align: "center",
+          customRender: ({text}) => state.calssifyList.find(e => e.value == text)?.label,
        },
        {
          title: "审核状态",
@@ -187,26 +180,27 @@ export default {
    const getList = () => {
      let objn = {
        auditStatus: 0,
-        // categoryId: 0,
+        categoryId: state.valueproj,
        createName: state.valuecreater,
        name: state.valuename,
        pageNo: state.currentPage,
        pageSize: 10,
      };
      courseListView(objn)
-        .then((res) => {
-          console.log("获取已审核课程成功", res.data.data);
-          let result = res.data.data.rows;
-          state.total = res.data.data.total;
-          if (res.data.data.total > 0) {
-            setTableData(result);
-          }
-        })
-        .catch((err) => {
-          console.log("获取已审核课程失败", err);
-        });
+          .then((res) => {
+            console.log("获取已审核课程成功", res.data.data);
+            state.total = res.data.data.total;
+            setTableData(res.data.data.rows);
+          })
+          .catch((err) => {
+            console.log("获取已审核课程失败", err);
+          });
    };
    const setTableData = (table) => {
+      if(!table || !table.length){
+        state.tableData1 = []
+        return
+      }
      let data = table;
      let array = [];
      data.map((item) => {
@@ -216,15 +210,15 @@ export default {
          type: item.type == 1 ? "线上" : "线下",
          content: item.categoryId,
          status:
-            item.auditStatus == 0
-              ? "未提交"
-              : item.auditStatus == 1
-              ? "提交待审核"
-              : item.auditStatus == 2
-              ? "通过"
-              : item.auditStatus == -1
-              ? "拒绝"
-              : "-",
+              item.auditStatus == 0
+                  ? "未提交"
+                  : item.auditStatus == 1
+                      ? "提交待审核"
+                      : item.auditStatus == 2
+                          ? "通过"
+                          : item.auditStatus == -1
+                              ? "拒绝"
+                              : "-",
          creater: item.createName,
          time: "-",
          msg: item.description || "-",
@@ -234,27 +228,30 @@ export default {
      state.tableData1 = array;
    };
    const reset = () => {
-      (state.valueproj = null),
-        (state.valuecreater = null),
-        (state.valuename = null),
-        getList();
-    };
-    const handleChangeproj = (value, item) => {
-      console.log(value, item);
-      state.valueproj = item.value;
+      (state.valueproj = ''),
+          (state.valuecreater = null),
+          (state.valuename = null),
+          getList();
    };
    const changePagination = (pagina) => {
      state.currentPage = pagina;
      getList();
    };
-    onMounted(() => {
+    const getDictList = (param) => api1.getDict({
+      pageNo: 1,
+      pageSize: 20,
+      setCode: param
+    }).then((res) => res.data.data.rows)
+
+    onMounted(async () => {
      getList();
+      //获取分类列表
+      state.calssifyList = (await getDictList("faceclassClass")).map(e => ({label: e.dictName, value: e.dictCode}))
    });
    return {
      ...toRefs(state),
      getList,
      setTableData,
-      handleChangeproj,
      reset,
      changePagination,
    };
@@ -264,8 +261,10 @@ export default {
 <style lang="scss">
 .coursereviewed {
  width: 100%;
+
  .tmpl {
    width: 100%;
+
    .tmpl_header {
      display: flex;
      flex-wrap: wrap;
@@ -274,33 +273,39 @@ export default {

      margin-left: 32px;
      margin-right: 32px;
+
      .tmplh_inp {
        .inpbox {
          display: flex;
          margin-top: 32px;
          flex-wrap: wrap;
+
          .inpbox1 {
            display: flex;
            justify-content: center;
            align-items: center;
            margin-right: 24px;
            margin-top: 10px;
+
            .ant-select-selector {
              border-radius: 8px;
              width: 270px;
              height: 40px;
              padding-top: 5px;
            }
+
            span {
              white-space: nowrap;
            }
          }
        }
      }
+
      .tmplh_btn {
        display: flex;
        // margin-left: 38px;
        margin-top: 42px;
+
        .btn {
          padding: 0px 26px 0px 26px;
          height: 38px;
@@ -311,72 +316,90 @@ export default {
          margin-right: 14px;
          cursor: pointer;
          flex-shrink: 0;
+
          .search {
            background-size: 100%;
          }
+
          .btnText {
            font-size: 14px;
            font-weight: 400;
            line-height: 36px;
            margin-left: 5px;
          }
+
          .btnText1 {
            color: rgb(255, 255, 255);
          }
+
          .btnText2 {
            color: rgba(64, 158, 255, 1);
          }
        }
+
        .btn1 {
          background: #409eff;
+
          .search {
            width: 15px;
            height: 17px;
            background-image: url("../../assets/images/courseManage/search0.png");
          }
        }
+
        .btn2 {
          background: #ffffff;
          border: 1px solid #388be1;
+
          .search {
            width: 16px;
            height: 18px;
            background-image: url("../../assets/images/courseManage/reset1.png");
          }
        }
+
        .btn1:hover {
          background: rgb(255, 255, 255);
          border: 1px solid #388be1;
+
          .search {
            background-image: url("../../assets/images/courseManage/search1.png");
          }
+
          .btnText {
            color: rgba(64, 158, 255, 1);
          }
        }
+
        .btn2:hover {
          background: rgba(64, 158, 255, 1);
+
          .search {
            background-image: url("../../assets/images/courseManage/reset0.png");
          }
+
          .btnText {
            color: #ffffff;
          }
        }
      }
    }
+
    .tmpl_body {
      padding: 0px 30px;
+
      .tmpl_tabbox {
        .operation {
          display: flex;
          justify-content: center;
          align-items: center;
          color: #4ea6ff;
+
          .nselect {
            justify-content: center;
            align-items: center;
            display: flex;
+
            .jc {
              margin-left: 20px;
              white-space: nowrap;
@@ -385,6 +408,7 @@ export default {
          }
        }
      }
+
      .pa {
        width: 100%;
        margin-top: 20px;
--- a/src/views/examine/CourseReviewedN.vue
+++ b/src/views/examine/CourseReviewedN.vue
--- a/src/views/examine/ProjectReviewed.vue
+++ b/src/views/examine/ProjectReviewed.vue
@@ -57,14 +57,14 @@
                @change="rankTimeChange"
              />
            </div>
-            <div class="inpbox1">
-              <a-select
-                v-model:value="valuestate"
-                placeholder="请选择审核状态"
-                @change="handleChangeproj"
-                :options="optionsproj"
-              />
-            </div>
+<!--            <div class="inpbox1">-->
+<!--              <a-select-->
+<!--                v-model:value="valuestate"-->
+<!--                placeholder="请选择审核状态"-->
+<!--                @change="handleChangeproj"-->
+<!--                :options="optionsproj"-->
+<!--              />-->
+<!--            </div>-->
          </div>
        </div>
        <div class="tmplh_btn">
@@ -193,8 +193,8 @@ export default {

        {
          title: "所属项目",
-          dataIndex: "belong",
-          key: "belong",
+          dataIndex: "sourceBelongName",
+          key: "sourceBelongName",
          align: "center",
          width: "10%",
        },
@@ -317,6 +317,7 @@ export default {
          name: item.name,
          belong: "",
          manager: item.manager || "-",
+          sourceBelongName: item.sourceBelongName,
          status:
            item.status == 0
              ? "草稿"
@@ -337,6 +338,7 @@ export default {
          number: item.projectId,
          name: item.name,
          belong: "",
+          sourceBelongName: item.sourceBelongName,
          manager: item.manager || "-",
          status:
            item.status == 0
--- a/src/views/examine/ProjectReviewedN.vue
+++ b/src/views/examine/ProjectReviewedN.vue
@@ -154,8 +154,8 @@ export default {

        {
          title: "所属项目",
-          dataIndex: "belong",
-          key: "belong",
+          dataIndex: "sourceBelongName",
+          key: "sourceBelongName",
          align: "center",
          width: "11%",
        },
@@ -250,6 +250,7 @@ export default {
          number: item.projectId,
          name: item.name,
          belong: item.parentId,
+          sourceBelongName: item.sourceBelongName,
          manager: item.manager || "-",
          status:
            item.status == 0
@@ -277,6 +278,7 @@ export default {
          number: item.projectId,
          name: item.name,
          belong: item.parentId,
+          sourceBelongName: item.sourceBelongName,
          manager: item.manager || "-",
          status:
            item.status == 0
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -616,7 +616,7 @@
                  <div style="width: 5px; display: inline-block"></div>
                  <span class="yi">项</span>
                  <span class="zon">列表选项总数：</span>
-                  <span class="th">{{ tableData.length }}</span>
+                  <span class="th">{{ tableDataTotal }}</span>
                  <span class="yi"> 条</span>
                </div>
              </div>
@@ -648,6 +648,7 @@
                    @change="pageChange"
                    class="pagination"
                    style="display: block"
+                    v-if="tableDataTotal > 10"
                  />
                </div>
              </div>
@@ -1333,7 +1334,7 @@ export default {
      fileList: [],
      docChecked: true,
      currentPage: 1,
-      tableDataTotal: 100,
+      tableDataTotal: -1,
      pageSize: 10,
      visiblene: false,
      sh: false,
@@ -1650,6 +1651,7 @@ export default {
        .then((res) => {
          console.log("获取学员列表", res);
          let data = res.data.data.rows || null;
+          state.tableDataTotal = res.data.data.total;
          state.tableData = [];
          if (data.length) {
            for (let i in data) {
@@ -1657,7 +1659,7 @@ export default {
              state.tableData.push({
                key: data[i].studentId,
                com: data[i].userInfoBo.deptName,
-                name: data[i].userInfoBo.userName,
+                name: data[i].name,
                gang: data[i].userInfoBo.jobName,
                cur: data[i].currentChapterName || "0",
                jin: data[i].completeChapterCnt + "/" + data[i].totalChapterCnt,
@@ -2087,6 +2089,7 @@ export default {
          .then((res) => {
            console.log("添加学员成功", res);
            message.success("添加学员成功");
+            getStudent();
          })
          .catch((err) => {
            console.log("添加学员失败", err);
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -2054,9 +2054,10 @@ export default {
      console.log("点击发布");
      let obj = {
        projectId: state.releaseProjectId,
+        type: 4,
      };
      api
-        .releaseProject(obj)
+        .handleProject(obj)
        .then((res) => {
          console.log("发布成功", res);
          message.destroy();
@@ -2081,7 +2082,7 @@ export default {
    const recallProject = () => {
      let obj = {
        projectId: state.recallProjectId,
-        type: 0,
+        type: -4,
      };
      api
        .handleProject(obj)
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -3210,6 +3210,8 @@ export default {
            // studentData();
          }
        }
+      }).catch(err=>{
+        console.log('获取学员列表失败',err)
      });
    };
    //获取项目信息