Merge branch 'master' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage

src/api/index1.js

@@ -43,14 +43,26 @@ export const uploadFile = (obj) => http.post('/test/testRequest', qs.stringify({
 export const createLearnPath = (obj) => http.post('/admin/router/edit', obj);
 // 获取学习路径图列表
 export const getLearnPath = (obj) => http.post('/admin/router/list', obj);
-//删除学习路径图
+//学习路径图的发布、停用、删除
-export const deleteLearnPath = (obj) => http.post('/admin/router/handle', obj);
+export const handleLearnPath = (obj) => http.post('/admin/router/handle', obj);
 
 //获取关卡
 export const getChapter = (obj) => http.post('/admin/router/detail', { params: obj });
 
 //新建或编辑关卡
 export const editChapter = (obj) => http.post('/admin/router/editChapter', obj);
+//获取学员列表
+export const getStudent = (obj) => http.post('/admin/router/studentList', obj);
+//获取路径图详情-包含关卡及任务列表
+export const getRouterDetail = (routerId) => http.get('/admin/router/detail', {
+	params: {
+		routerId: routerId,
+	}
+});
+
+
+
+
 
 // 测试方法
 // import * as api from '../../api/index'

src/api/indexExam.js

@@ -8,7 +8,10 @@ export const createExamination = (obj) => http.post('/examination/createExaminat
 // 根据Id删除考试信息
 export const deleteExaminationById = (obj) => http.post('/examination/deleteExaminationById',obj);
 // 根据ID获取考试信息详情
-export const queryExaminationDetailById = (obj) => http.post('/examination/queryExaminationDetailById',obj);
+export const queryExaminationDetailById = (obj) => http.post('/examination/queryExaminationDetailById',obj,{headers: {
+	'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
+}
+});
 // 创建考试信息接口
 export const updateExamination = (obj) => http.post('/examination/updateExamination',obj);
 

src/api/indexWork.js

@@ -8,7 +8,11 @@ export const createWorkTask = (obj) => http.post('/work/createWorkTask',obj,{
 // 删除作业信息接口
 export const deleteWorkTask = (obj) => http.post('/work/deleteWorkTask',obj);
 // 根据ID获取作业信息详情
-export const queryWorkDetailById = (obj) => http.post('/work/queryWorkDetailById',obj);
+export const queryWorkDetailById = (obj) => http.post('/work/queryWorkDetailById',obj,{
+	headers: {
+		'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
+	}
+});
 // 修改作业信息接口
 export const updateWorkTaskUsing = (obj) => http.post('/work/updateWorkTask',obj);
 

src/components/BreadCrumb.vue

@@ -33,7 +33,10 @@ export default {
         // console.log("监听路由");
         console.log("new:" + n + ",old:" + o);
 
-        if (n === "/learningpath" || n === "/LearningPath") {
+        if (
+          n.indexOf("/learningpath") !== -1 ||
+          n.indexOf("/LearningPath") !== -1
+        ) {
           state.list = [
             {
               name: "学习路径",
@@ -42,25 +45,28 @@ export default {
             },
           ];
         }
-        if (n === "/leveladd" || n === "/LevelAdd") {
+        if (n.indexOf("/leveladd") !== -1 || n.indexOf("/LevelAdd") !== -1) {
           state.list = [
             {
               name: "学习路径",
               href: "/learningpath",
             },
             {
-              name: "关卡",
+              name: "管理",
             },
           ];
         }
-        if (n === "/leveladddetail" || n === "/LevelAddDetail") {
+        if (
+          n.indexOf("/leveladddetail") !== -1 ||
+          n.indexOf("/LevelAddDetail") !== -1
+        ) {
           state.list = [
             {
               name: "学习路径",
               href: "/learningpath",
             },
             {
-              name: "关卡",
+              name: "管理",
               href: "/leveladd",
             },
             {
@@ -68,14 +74,17 @@ export default {
             },
           ];
         }
-        if (n === "/levelcheck" || n === "/LevelCheck") {
+        if (
+          n.indexOf("/levelcheck") !== -1 ||
+          n.indexOf("/LevelCheck") !== -1
+        ) {
           state.list = [
             {
               name: "学习路径",
               href: "/learningpath",
             },
             {
-              name: "关卡",
+              name: "管理",
               href: "/leveladd",
             },
             {
@@ -83,7 +92,10 @@ export default {
             },
           ];
         }
-        if (n === "/projectmanage" || n === "/ProjectManage") {
+        if (
+          n.indexOf("/projectmanage") !== -1 ||
+          n.indexOf("/ProjectManage") !== -1
+        ) {
           state.list = [
             {
               name: "项目中心",
@@ -96,7 +108,10 @@ export default {
             },
           ];
         }
-        if (n === "/projectadd" || n === "/ProjectAdd") {
+        if (
+          n.indexOf("/projectadd") !== -1 ||
+          n.indexOf("/ProjectAdd") !== -1
+        ) {
           state.list = [
             {
               name: "项目",
@@ -107,7 +122,7 @@ export default {
             },
           ];
         }
-        if (n === "/taskpage" || n === "/TaskPage") {
+        if (n.indexOf("/taskpage") !== -1 || n.indexOf("/TaskPage") !== -1) {
           state.list = [
             {
               name: "项目",
@@ -118,7 +133,7 @@ export default {
             },
           ];
         }
-        if (n === "/taskadd" || n === "/TaskAdd") {
+        if (n.indexOf("/taskadd") !== -1 || n.indexOf("/TaskAdd") !== -1) {
           state.list = [
             {
               name: "项目",
@@ -135,7 +150,10 @@ export default {
             },
           ];
         }
-        if (n === "/templatelibrary" || n === "/TemplateLibrary") {
+        if (
+          n.indexOf("/templatelibrary") !== -1 ||
+          n.indexOf("/TemplateLibrary") !== -1
+        ) {
           state.list = [
             {
               name: "项目中心",
@@ -145,7 +163,10 @@ export default {
             },
           ];
         }
-        if (n === "/libraryadd" || n === "/LibraryAdd") {
+        if (
+          n.indexOf("/libraryadd") !== -1 ||
+          n.indexOf("/LibraryAdd") !== -1
+        ) {
           state.list = [
             {
               name: "项目中心",
@@ -159,7 +180,10 @@ export default {
             },
           ];
         }
-        if (n === "/coursemanage" || n === "/CourseManage") {
+        if (
+          n.indexOf("/coursemanage") !== -1 ||
+          n.indexOf("/CourseManage") !== -1
+        ) {
           state.list = [
             {
               name: "课程库",
@@ -172,7 +196,10 @@ export default {
             },
           ];
         }
-        if (n === "/coursewaremanage" || n === "/CoursewareManage") {
+        if (
+          n.indexOf("/coursewaremanage") !== -1 ||
+          n.indexOf("/CoursewareManage") !== -1
+        ) {
           state.list = [
             {
               name: "课程库",
@@ -182,7 +209,10 @@ export default {
             },
           ];
         }
-        if (n === "/researchmanage" || n === "/ResearchManage") {
+        if (
+          n.indexOf("/researchmanage") !== -1 ||
+          n.indexOf("/ResearchManage") !== -1
+        ) {
           state.list = [
             {
               name: "评估管理",
@@ -191,7 +221,10 @@ export default {
             },
           ];
         }
-        if (n === "/managepage" || n === "/ManagePage") {
+        if (
+          n.indexOf("/managepage") !== -1 ||
+          n.indexOf("/ManagePage") !== -1
+        ) {
           state.list = [
             {
               name: "评估管理",
@@ -204,7 +237,10 @@ export default {
           ];
         }
 
-        if (n === "/researchadd" || n === "/ResearchAdd") {
+        if (
+          n.indexOf("/researchadd") !== -1 ||
+          n.indexOf("/ResearchAdd") !== -1
+        ) {
           state.list = [
             {
               name: "评估管理",
@@ -217,14 +253,20 @@ export default {
           ];
         }
 
-        if (n === "/certificatecenter" || n === "/CertificateCenter") {
+        if (
+          n.indexOf("/certificatecenter") !== -1 ||
+          n.indexOf("/CertificateCenter") !== -1
+        ) {
           state.list = [
             {
               name: "证书中心",
             },
           ];
         }
-        if (n === "/systemmanage" || n === "/SystemManage") {
+        if (
+          n.indexOf("/systemmanage") !== -1 ||
+          n.indexOf("/SystemManage") !== -1
+        ) {
           state.list = [
             {
               name: "系统管理",

src/components/drawers/AddHomework.vue

@@ -3,13 +3,12 @@
     :visible="addhomeworkVisible"
     class="drawerStyle addhomeworkDrawer"
     width="80%"
-    title="添加作业"
     placement="right"
     @after-visible-change="afterVisibleChange"
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">添加作业</div>
+        <div class="headerTitle">{{workId ? '编辑':'添加' }}作业</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -17,7 +16,6 @@
         />
       </div>
       <a-form
-
             ref="formRef"
             name="custom-validation"
             :model="formState"
@@ -59,6 +57,7 @@
               <a-range-picker
               style="width: 424px;margin-left: 35px;"
               v-model:value="formState.choosedTime"
+              format="YYYY-MM-DD"
                 :placeholder="['      开始时间', '        结束时间']"
               />
             </a-form-item>
@@ -81,7 +80,7 @@
                 action="/api/file/upload"
                 @change="handleChange"
               >
-              <button class="xkbtn">上传附件</button>
+              <button class="xkbtn" type="button">上传附件</button>
             </a-upload>
             </div>
           </div>
@@ -106,7 +105,7 @@
 <script>
 import { reactive, ref } from "vue";
 import {message} from"ant-design-vue";
-import {createWorkTask} from "@/api/indexWork"
+import { createWorkTask, queryWorkDetailById, updateWorkTaskUsing} from "@/api/indexWork";
 import dayjs from 'dayjs';
 
 const rowSelection = ref({
@@ -134,6 +133,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    workId: {
+      type: Number,
+      default: 0,
+    }
   },
   setup(props, ctx) {
     const formState = reactive({
@@ -142,23 +145,22 @@ export default {
       choosedTime: '',
     });
     const formRef = ref();
+
+
     let checkWorkName = async (_rule, value) => {
       if (!value) {
-        message.warning("请输入作业名称");
         return Promise.reject('请输入作业名称');
       }
     };
 
     let checkWorkRequirement = async (_rule, value) => {
       if (!value) {
-        message.warning("请输入作业要求");
         return Promise.reject('请输入作业要求');
       }
     };
 
     let checkTime = async (_rule, value) => {
-      if (!value) {
+      if (!value.length) {
-        message.warning("请选择时间");
         return Promise.reject('请选择时间');
       }
     };
@@ -190,7 +192,7 @@ export default {
     // };
     const handleFinish = values => {
       console.log(values);
-      addHomework()
+      updateWork(props.workId)
     };
 
     const handleFinishFailed = errors => {
@@ -220,13 +222,29 @@ export default {
     const fileList = ref([]);
     const closeDrawer = () => {
       resetForm();
+      fileList.value = [];
+      formState.choosedTime = '';
       ctx.emit("update:addhomeworkVisible", false);
     };
     const afterVisibleChange = (bool) => {
+      if(props.addhomeworkVisible && props.workId){
+        queryWork({workId: props.workId})
+      }
       console.log("state", bool);
     };
-    const addHomework = () => {
+    const queryWork = (data) => {
-        createWorkTask({
+      queryWorkDetailById(data).then((res) => {
+        console.log(dayjs(res.data.data.submitStartTime).format("YYYY-MM-DD"));
+        formState.workName = res.data.data.workName;
+        formState.workRequirement = res.data.data.workRequirement;
+        formState.choosedTime=[dayjs(res.data.data.submitStartTime,"YYYY-MM-DD"),dayjs(res.data.data.submitEndTime,"YYYY-MM-DD")]
+        console.log(res);
+      }).catch(() => {
+        message.error(`查询失败`)
+      })
+    };
+    const updateWork = (id) => {
+      let obj = {
         "createTime": "",
         "createUser": 0,
         "submitEndTime": dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
@@ -235,22 +253,32 @@ export default {
         "updateUser": 0,
         "workEnclosureAddress": "",
         "workFlag": "",
-          "workId": 0,
+        "workId": id || 0,
         "workName": formState.workName,
         "workRequirement": formState.workRequirement,
         "workTag": ""
-          }).then((res)=>{
+      }
+      if(id) {
+        updateWorkTaskUsing(obj).then((res) => {
+        console.log(res);
+        message.success(`编辑成功`)
+        closeDrawer();
+      }).catch((err) => {
+        message.error(`编辑失败${err}`)
+      })
+      } else {
+        createWorkTask(obj).then((res)=>{
         message.success(`添加成功${res}`)
         closeDrawer();
       }).catch((err)=>{
         message.error(`添加失败${err}`)
       })
       }
+    };
     return {
       afterVisibleChange,
       closeDrawer,
       rowSelection,
-      addHomework,
       handleChange,
       fileList,
       formState,
@@ -261,6 +289,8 @@ export default {
       formRef,
       // layout,
       rules,
+      queryWork,
+      updateWork,
     };
   },
 };

src/components/drawers/AddTest.vue

@@ -3,13 +3,12 @@
     :visible="addtestVisible"
     class="drawerStyle addtestDrawer"
     width="80%"
-    title="添加作业"
     placement="right"
     @after-visible-change="afterVisibleChange"
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">添加考试</div>
+        <div class="headerTitle">{{examinationId ? "编辑" : "添加" }}考试</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -73,6 +72,7 @@
 
               <a-range-picker
               v-model:value="formState.choosedTime"
+              format="YYYY-MM-DD"
                 style="width: 424px;margin-left: 35px;"
                 :placeholder="['      开始时间', '        结束时间']"
               />
@@ -88,8 +88,9 @@
                 style="width: 388px; height: 32px;
                 margin-left: 35px;"
               />
-              <span style="margin-left: 5px">分钟</span>
+              
             </a-form-item>
+            <span style="transform: translateY(-50%)">分钟</span>
             </div>
           </div>
           <div class="main_item">
@@ -115,7 +116,7 @@
             <div class="btnbox">
               <a-form-item has-feedback label="显示答案" name="showAnswers">
 
-              <a-radio-group style="margin-left: 35px;" v-model:value="formState.showAnswers">
+              <a-radio-group style="margin-left: 35px;margin-right: 12px;" v-model:value="formState.showAnswers">
                 <a-radio v-model:checked="checked" :value="1" @click="cloradio1">允许查看</a-radio>
                 <a-radio v-model:checked="checked" :value="2" @click="cloradio1"
                   >不允许查看</a-radio
@@ -129,7 +130,7 @@
             <div class="btnbox">
               <a-form-item has-feedback label="显示解析" name="showAnalysis">
 
-              <a-radio-group style="margin-left: 35px;" v-model:value="formState.showAnalysis">
+              <a-radio-group style="margin-left: 35px;margin-right: 12px;" v-model:value="formState.showAnalysis">
                 <a-radio v-model:checked="checked" :value="1" @click="cloradio2">允许查看</a-radio>
                 <a-radio v-model:checked="checked" :value="2" @click="cloradio2"
                   >不允许查看</a-radio
@@ -143,7 +144,7 @@
             <div class="btnbox">
               <a-form-item has-feedback label="评分模式" name="scoringModel">
 
-                <a-radio-group style="margin-left: 35px;" v-model:value="formState.scoringModel">
+                <a-radio-group style="margin-left: 35px;margin-right: 12px;" v-model:value="formState.scoringModel">
                   <a-radio v-model:checked="checked" :value="1" @click="cloradio3"
                     >最高一次</a-radio
                   >
@@ -171,7 +172,9 @@
             <div class="btnbox">
               <a-form-item has-feedback label="作业要求" name="questionArrangement">
 
-              <a-radio-group v-model:value="formState.questionArrangement">
+              <a-radio-group
+              style="margin-right:12px;"
+              v-model:value="formState.questionArrangement">
                 <a-radio v-model:checked="checked" :value="1" @click="cloradio4">试题乱序</a-radio>
                 <a-radio v-model:checked="checked" :value="2" @click="cloradio4">试题排序</a-radio>
                 <a-radio v-model:checked="checked" :value="3" @click="cloradio4">全部乱序</a-radio>
@@ -193,7 +196,7 @@
   <script>
 import { reactive, ref } from "vue";
 import {message} from"ant-design-vue";
-import {createExamination} from "@/api/indexExam"
+import {createExamination,queryExaminationDetailById,updateExamination} from "@/api/indexExam"
 import  dayjs from 'dayjs';
 const rowSelection = ref({
   checkStrictly: false,
@@ -220,6 +223,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    examinationId: {
+      type: Number,
+      default: 0,
+    }
   },
   setup(props, ctx) {
     const formState = reactive({
@@ -233,71 +240,61 @@ export default {
       scoringModel:2,
       showAnalysis:2,
       showAnswers:2,
+      choosedTime:'',
     });
     const formRef = ref();
     let checkExaminationName = async (_rule, value) => {
       if (!value) {
-        message.warning("请输入考试名称");
         return Promise.reject('请输入考试名称');
       }
     };
     let checkExaminationExplain = async (_rule, value) => {
       if (!value) {
-        message.warning("请输入考试说明");
         return Promise.reject('请输入考试说明');
       }
     };
     let checkChoosedTest = async (_rule, value) => {
       if (!value) {
-        message.warning("请选择考试");
         return Promise.reject('请选择考试');
       }
     };
     let checkChoosedTime = async (_rule, value) => {
-      if (!value) {
+      if (!value.length) {
-        message.warning("请选择时间");
         return Promise.reject('请选择时间');
       }
     };
     let checkExaminationDuration = async (_rule, value) => {
       if (!value) {
-        message.warning("请输入考试时长");
         return Promise.reject('请输入考试时长');
       }
     };
     let checkLimit = async (_rule, value) => {
       if (!value) {
-        message.warning("请输入考试限制");
         return Promise.reject('请输入考试限制');
       }
     };
     let checkShowAnswers = async (_rule, value) => {
       if (!value) {
-        message.warning("请输入作业名称");
         return Promise.reject('请输入作业名称');
       }
     };
     let checkShowAnalysis = async (_rule, value) => {
       if (!value) {
-        message.warning("请输入作业名称");
         return Promise.reject('请输入作业名称');
       }
     };
     let checkScoringModel = async (_rule, value) => {
       if (!value) {
-        message.warning("请输入作业名称");
         return Promise.reject('请输入作业名称');
       }
     };
     let checkPassLine = async (_rule, value) => {
       if (!value) {
-        message.warning("请输入及格线");
         return Promise.reject('请输入及格线');
       }
     };
     let checkQuestionArrangement = async (_rule, value) => {
       if (!value) {
-        message.warning("请输入作业名称");
         return Promise.reject('请输入作业名称');
       }
     };
@@ -366,7 +363,7 @@ export default {
     ])
     const handleFinish = values => {
       console.log(values);
-      addTest()
+      updateTest(props.examinationId)
     };
 
     const handleFinishFailed = errors => {
@@ -383,17 +380,38 @@ export default {
     };
     const closeDrawer = () => {
       resetForm();
+      formState.choosedTime = '';
       ctx.emit("update:addtestVisible", false);
     };
-    const addTest = () => {
+    const queryTest = (data) => {
-        createExamination({
+      queryExaminationDetailById(data).then((res) => {
+        formState.examinationName = res.data.data.examinationName;
+        formState.workRequirement = res.data.data.workRequirement;
+        formState.examinationDuration = res.data.data.examinationDuration;
+        formState.examinationLimit = res.data.data.examinationLimit || -1;
+        formState.passLine = res.data.data.passLine;
+        formState.examinationExplain = res.data.data.examinationExplain;
+        formState.questionArrangement = res.data.data.questionArrangement || 1;
+        formState.scoringModel = res.data.data.scoringModel || 1;
+        formState.showAnalysis = res.data.data.showAnalysis || 1;
+        formState.showAnswers = res.data.data.showAnswers || 1;
+        if(res.data.data.examinationEndTime && res.data.data.examinationStartTime){
+          formState.choosedTime= [dayjs(res.data.data.examinationStartTime,"YYYY-MM-DD"),dayjs(res.data.data.examinationEndTime,"YYYY-MM-DD")]
+        } else { formState.choosedTime=[] }
+        console.log(res);
+      }).catch(() => {
+        message.error(`查询失败`)
+      })
+    }
+    const updateTest = (id) => {
+      let obj = {
             "createTime": "",
             "createUser": 0,
             "examinationDuration": formState.examinationDuration,
             "examinationEndTime": dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
             "examinationExplain": formState.examinationExplain,
             "examinationFlag": "",
-            "examinationId": 0,
+            "examinationId": id || 0,
             "examinationLimit": formState.examinationLimit,
             "examinationName": formState.examinationName,
             "examinationPaperId": 0,
@@ -407,16 +425,31 @@ export default {
             "showAnswers": formState.showAnswers,
             "updateTime": "",
             "updateUser": 0
-          }).then((res)=>{
+      }
+      if(id) {
+        updateExamination(obj).then((res)=>{
+        console.log(res);
+        message.success(`编辑成功`)
+        closeDrawer();
+      }).catch(()=>{
+        message.error(`编辑失败`)
+      })
+      } else { 
+        createExamination(obj).then((res)=>{
         message.success(`添加成功${res}`)
         closeDrawer();
       }).catch((err)=>{
         message.error(`添加失败${err}`)
       })
+      }
+      
 
     }
     const afterVisibleChange = (bool) => {
       console.log("formState", bool);
+      if(props.addtestVisible && props.examinationId){
+        queryTest({examinationId: props.examinationId})
+      }
     };
     const cloradio1 = (value) => {
       if (value != "") {
@@ -447,7 +480,6 @@ export default {
       cloradio2,
       cloradio3,
       cloradio4,
-      addTest,
       options1,
       handleFinish,
       handleFinishFailed,
@@ -456,6 +488,8 @@ export default {
       formRef,
       // layout,
       rules,
+      updateTest,
+      queryTest,
     };
   },
 };

src/views/learningpath/LearningPath.vue

@@ -398,21 +398,21 @@
       </div>
       <div class="modalMain">
         <div class="projectname">产品经理上升路径</div>
-        <div class="projecttime">
+        <!-- <div class="projecttime">
           <span class="timeti">路径时间：</span
           ><span class="timeme">2022/08/01-2022/08/30</span>
-        </div>
+        </div> -->
         <div class="projectbox">
           <div class="promessage">
             <div class="messageme">路径信息</div>
-            <div class="messagege">当前路径共0个阶段，0个任务</div>
+            <div class="messagege">当前路径共0个关卡，0个任务</div>
           </div>
           <div class="stumessage">
             <div class="messageme1">学员信息</div>
-            <div class="messagege1">路径共0名学员</div>
+            <div class="messagege1">路径共{{ routeStudentsNum }}名学员</div>
           </div>
         </div>
-        <div class="send">
+        <!-- <div class="send">
           <a-switch v-model:checked="checked" size="small" />
           <span class="sendtext">发送路径通知</span>
         </div>
@@ -423,10 +423,10 @@
           <a-checkbox v-model:checked="checkStu"
             ><span class="sendpeo">发给学员</span></a-checkbox
           >
-        </div>
+        </div> -->
         <div class="pubtn">
-          <a-button class="pubtn1" @click="closeModal">取消</a-button>
+          <a-button class="pubtn1" @click="closePub">取消</a-button>
-          <a-button class="pubtn2" @click="closeModal">发布</a-button>
+          <a-button class="pubtn2" @click="releaseLearnPath">发布</a-button>
         </div>
       </div>
     </a-modal>
@@ -481,10 +481,10 @@
           </div>
           <div class="del_btnbox">
             <div class="del_btn btn1">
-              <div class="btnText" @click="delete_exit">取消</div>
+              <div class="btnText" @click="closeStopModal">取消</div>
             </div>
             <div class="del_btn btn2">
-              <div class="btnText" @click="delete_exit">确定</div>
+              <div class="btnText" @click="stopLearnPath">确定</div>
             </div>
           </div>
         </div>
@@ -572,10 +572,10 @@
           </div>
           <div class="del_btnbox">
             <div class="del_btn btn1">
-              <div class="btnText" @click="delete_exit">取消</div>
+              <div class="btnText" @click="closeBackModal">取消</div>
             </div>
             <div class="del_btn btn2">
-              <div class="btnText" @click="delete_exit">确定</div>
+              <div class="btnText" @click="recallPath">确定</div>
             </div>
           </div>
         </div>
@@ -726,6 +726,11 @@ export default {
       searchdate: null, //选择时间
       startTime: null, //开始时间
       endTime: null, //结束时间
+      //发布---------------
+      releasePathId: null, //发布路径id
+      routeStudentsNum: 0,
+      recallPathId: null, //撤回路径id
+      stopPathId: null, //停用路径id
     });
 
     const selectProjectName = (value, index) => {
@@ -761,9 +766,58 @@ export default {
       console.log(id);
       state.learnPathBg2 = id;
     };
-    const showPub = () => {
+    //发布弹窗
+    const showPub = (routerId) => {
       state.pub = true;
+      state.releasePathId = routerId;
+      //获取学员总数
+      let obj = {
+        pageNo: 0,
+        pageSize: 0,
+        routerId: routerId,
       };
+      api
+        .getStudent(obj)
+        .then((res) => {
+          if (res.status === 200) {
+            // console.log("res", res.data.data);
+            state.routeStudentsNum = res.data.data.total;
+          }
+        })
+        .catch((err) => {
+          console.log("err", err);
+        });
+      //获取学习路径详细信息
+      api
+        .getRouterDetail(routerId)
+        .then((res) => {
+          console.log("学习路径详情", res);
+        })
+        .catch((err) => {
+          console.log("学习路径详情获取错误", err);
+        });
+    };
+    //确定发布
+    const releaseLearnPath = () => {
+      // console.log("state.releasePathId", state.releasePathId);
+      let obj = {
+        routerId: state.releasePathId,
+        type: 1,
+      };
+      api
+        .handleLearnPath(obj)
+        .then((res) => {
+          console.log("发布成功", res);
+          message.destroy();
+          message.success("发布成功");
+          state.pub = false;
+          getLearnPath();
+        })
+        .catch((err) => {
+          console.log("发布失败", err);
+        });
+    };
+
     const closePub = () => {
       state.pub = false;
     };
@@ -773,12 +827,34 @@ export default {
     const closeCopyModal = () => {
       state.copyModal = false;
     };
+    //显示停用窗口
     const showStopModal = () => {
       state.stopModal = true;
     };
+    //关闭停用窗口
     const closeStopModal = () => {
       state.stopModal = false;
     };
+    //确认停用
+    const stopLearnPath = () => {
+      let obj = {
+        routerId: state.stopPathId,
+        type: -1,
+      };
+      api
+        .handleLearnPath(obj)
+        .then((res) => {
+          console.log("停用成功", res);
+          message.destroy();
+          message.success("停用成功");
+          state.stopModal = false;
+          getLearnPath();
+        })
+        .catch((err) => {
+          console.log("停用失败", err);
+        });
+    };
+
     const showDeleteModal = () => {
       state.deleteModal = true;
     };
@@ -792,12 +868,35 @@ export default {
     const closeStartModal = () => {
       state.startModal = false;
     };
-    const showBackModal = () => {
+    //打开撤回弹窗
+    const showBackModal = (routerId) => {
       state.backModal = true;
+      state.recallPathId = routerId;
     };
+    //关闭撤回弹窗
     const closeBackModal = () => {
       state.backModal = false;
     };
+    //确定撤回
+    const recallPath = () => {
+      let obj = {
+        routerId: state.recallPathId,
+        type: 0,
+      };
+      api
+        .handleLearnPath(obj)
+        .then((res) => {
+          console.log("撤回成功", res);
+          message.destroy();
+          message.success("撤回成功");
+          state.backModal = false;
+          getLearnPath();
+        })
+        .catch((err) => {
+          console.log("撤回失败", err);
+        });
+    };
+
     const showOwner = () => {
       state.Ownervisible = true;
     };
@@ -913,7 +1012,8 @@ export default {
                         style="cursor:pointer"
                         class="jc"
                         onClick={() => {
-                          showPub();
+                          // console.log("text.record.", text.record);
+                          showPub(text.record.id);
                         }}
                       >
                         发布
@@ -974,9 +1074,17 @@ export default {
                   )}
                 </div>
                 <div class="tableSelect">
-                  <router-link to="/leveladd">
+                  <div
-                    <div class="g1">管理</div>
+                    class="g1"
-                  </router-link>
+                    onClick={() => {
+                      router.push({
+                        path: "/leveladd",
+                        query: { routerId: text.record.id },
+                      });
+                    }}
+                  >
+                    管理
+                  </div>
                   <a-select
                     style="width: 50px;margin-top:2px;margin-left:25px"
                     value="授权"
@@ -1047,6 +1155,7 @@ export default {
                       >
                         <div
                           onClick={() => {
+                            state.stopPathId = text.record.id;
                             showStopModal();
                           }}
                         >
@@ -1100,7 +1209,7 @@ export default {
                         >
                           <div
                             onClick={() => {
-                              showBackModal();
+                              showBackModal(text.record.id);
                             }}
                           >
                             撤回
@@ -1166,7 +1275,10 @@ export default {
     };
     //创建学习路径图
     const createLearnPath = () => {
-      if (!state.pathName) return message.warning("请输入路径图名称");
+      if (!state.pathName) {
+        message.destroy();
+        return message.warning("请输入路径图名称");
+      }
       // if (!state.organizationSelectName) return message.warning("请选择归属组织");
       // state.createLoading = true;
       let obj = {
@@ -1206,7 +1318,7 @@ export default {
         .getLearnPath(obj)
         .then((res) => {
           if (res.status === 200) {
-            console.log("获取路径列表数据", res.data.data);
+            // console.log("获取路径列表数据", res.data.data);
             let arr = res.data.data.rows;
             if (
               arr.length === 0 &&
@@ -1237,7 +1349,7 @@ export default {
         type: -2,
       };
       api
-        .deleteLearnPath(obj)
+        .handleLearnPath(obj)
         .then((res) => {
           console.log("删除成功", res);
           message.success("删除成功");
@@ -1326,17 +1438,20 @@ export default {
       handleOut,
       handleOut1,
       showPub,
+      releaseLearnPath,
       closePub,
       showCopyModal,
       closeCopyModal,
       showStopModal,
       closeStopModal,
+      stopLearnPath,
       showDeleteModal,
       closeDeleteModal,
       showStartModal,
       closeStartModal,
       showBackModal,
       closeBackModal,
+      recallPath,
       showOwner,
       showPower,
       tableDataFunc,

src/views/learningpath/LevelAdd.vue

@@ -42,6 +42,7 @@
         class="tab"
         v-model:activeKey="activeKey"
         size="large"
+        @change="changeTabs"
         :tabBarStyle="{ marginLeft: '10px' }"
       >
         <a-tab-pane key="1" tab="概览">
@@ -898,6 +899,8 @@ import TimeManage from "../../components/drawers/TimeManage";
 import TestManage from "../../components/drawers/TestManage";
 import FaceManage from "../../components/drawers/FaceManage";
 import WorkManage from "../../components/drawers/WorkManage";
+import { useRoute } from "vue-router";
+import * as api from "../../api/index1";
 export default {
   name: "LevelAdd",
   components: {
@@ -913,7 +916,9 @@ export default {
   },
   methods: {},
   setup() {
+    const routers = useRoute();
     const state = reactive({
+      routerId: routers.query.routerId, //学习路径页面传的学习路径id
       gatename: null, //关卡名称
       gatenamee: null, //学员管理关卡名称
       deleteAll: false, //批量删除学员弹窗
@@ -1115,7 +1120,7 @@ export default {
       pageSize: 10,
       visiblene: false,
       sh: false,
-      nodata: true,
+      nodata: false,
       closeDeleteAll: false,
       curLevel: "",
       taskSyllabusActive: 0,
@@ -1441,6 +1446,32 @@ export default {
     const closehuodModal = () => {
       state.huodModal = false;
     };
+
+    const changeTabs = (e) => {
+      console.log("切换tabs", e, state.routerId);
+      //学员管理
+      if (e == 3) {
+        getStudent();
+      }
+    };
+    //学员管理------------------------------------------------
+    //获取学员列表
+    const getStudent = () => {
+      let obj = {
+        routerId: state.routerId,
+        pageNo: 1,
+        pageSize: 10,
+      };
+      api
+        .getStudent(obj)
+        .then((res) => {
+          console.log("获取学员列表", res);
+        })
+        .catch((err) => {
+          console.log("获取学员列表失败", err);
+        });
+    };
+
     return {
       ...toRefs(state),
       selectProjectName,
@@ -1470,6 +1501,7 @@ export default {
       showhuodModal,
       closehuodModal,
       closezhibModal,
+      changeTabs,
     };
   },
 };

src/views/projectcenter/ProjectManage.vue

@@ -1228,9 +1228,17 @@ export default {
 										</a-select-option>
 									</a-select>
 								</div>
-								<router-link to="/classadd" class="operation3">
+								<div
+									onClick={() => {
+										router.push({
+											path: '/classadd',
+											query: { projectId: value.record.projectId, name: value.record.name }
+										});
+									}}
+									style={{ cursor: "pointer" }}
+									to="/classadd" class="operation3">
 									创建班级
-								</router-link>
+								</div>
 								<div class="tableSelect">
 									<a-select
 										style="width: 50px"

src/views/system/SystemManage.vue

@@ -90,6 +90,41 @@ export default {
       imageUrl: "",
       loading: false,
       fileList: [],
+
+      voteList: [
+        {
+          id: 1,
+          stem: "题干一", //题干
+          options: [
+            {
+              id: 1,
+              option: "选项一",
+              imgUrl: "",
+            },
+            {
+              id: 2,
+              option: "选项二",
+              imgUrl: "",
+            },
+          ],
+        },
+        {
+          id: 2,
+          stem: "题干二", //题干
+          options: [
+            {
+              id: 1,
+              option: "选项一",
+              imgUrl: "",
+            },
+            {
+              id: 2,
+              option: "选项二",
+              imgUrl: "",
+            },
+          ],
+        },
+      ],
     });
 
     const showDrawer = () => {