Merge remote-tracking branch 'origin/develop' into develop

src/api/indexTaskadd.js

@@ -14,6 +14,8 @@ export const deleteTask = (obj) => http.delete('/admin/project/deleteTask', { pa
 
 //新建或编辑项目
 export const editProj = (obj) => http.post('/admin/project/edit', obj)
+
+export const editProjs = (obj) => http.post('/admin/project/editStatus', obj)
 //编辑项目共享文档
 export const editProjDoc = (obj) => http.post('/admin/project/editShareAttach', obj)
 

src/components/drawers/AddLive.vue

@@ -284,7 +284,7 @@
               <span style="margin-right: 3px">评估：</span>
             </div>
             <div class="btnbox2">
-              <a-checkbox v-model:checked="formData.isEvaluate"
+              <a-checkbox v-model:checked="formData.isEvaluate" @change="getchanges(formData.isEvaluate)"
                 >需要评估
               </a-checkbox>
             </div>
@@ -338,6 +338,9 @@ const removePG = () => {
 const getchange = (mess) => {
   console.log(mess); //输出true或者false
 };
+const getchanges = (mess) => {
+  console.log(mess); //输出true或者false
+};
 const props = defineProps({
   type: Number,
   taskList: [],
@@ -355,7 +358,7 @@ const formData = ref({
   liveCover: "",
   beforeSignIn: "",
   afterSignIn: "",
-  isEvaluate: "",
+  isEvaluate: false,
   assessmentId: "",
   assessmentName: "",
   livePlayback: "",
@@ -375,7 +378,7 @@ const rulesRef = ref({
     {
       type: "url",
       required: true,
-      message: "请输入直播链接",
+      message: "请输入合法的直播链接",
     },
   ],
   liveStartTime: [

src/components/drawers/ExportScore.vue

@@ -380,7 +380,7 @@ export default {
   },
 };
 </script>
-  
+
 <style lang="scss">
 .ExportScore {
   .drawerMain {
@@ -627,4 +627,3 @@ export default {
   }
 }
 </style>
-  

src/components/drawers/FaceManage.vue

@@ -99,7 +99,7 @@
               onChange: onSelectChange,
             }"
           />
-       
+
           <div class="pa">
             <a-pagination
               :showSizeChanger="false"
@@ -139,7 +139,7 @@ import EntryScores from "./EntryScores.vue";
 import * as api from "../../api/index";
 export default {
   name: "FaceManage",
-  components: { 
+  components: {
     EntryScores,
     CKWork,
     CQue,
@@ -326,7 +326,7 @@ export default {
       if ( bol == true ) {
         getManageList()
       }
-      
+
     };
     const selectProjectName = (value) => {
       state.projectName = value;

src/components/drawers/NoticePub.vue

@@ -62,7 +62,7 @@
 <script>
 import { message } from "ant-design-vue";
 import { reactive, toRefs, onMounted } from "vue";
-import { editProj, getTask } from "../../api/indexTaskadd";
+import { editProj,editProjs, getTask } from "../../api/indexTaskadd";
 // import { editProj } from "../../api/indexTaskadd";
 import { publishNotice } from "../../api/indexNotice";
 import emitter from "../../utils/bus";
@@ -112,7 +112,7 @@ export default {
       state.projectInfo.projectId = props.projectId;
       state.projectInfo.beginTime = null;
       state.projectInfo.endTime = null;
-      editProj(state.projectInfo)
+      editProjs(state.projectInfo)
         .then((res) => {
           console.log("res5555555555", res);
         })

src/components/drawers/project/ProjectHomeWorkManage.vue

@@ -133,7 +133,7 @@
   <EScore
     v-model:eScorevisible="Evisible"
     :type="1"
-    :id="projectTaskInfo?.projectTaskId"
+    :id="projectTaskInfo?.id"
     :pid="projectTaskInfo?.projectId"
     v-model:searchTaskList="searchTaskList"
   />
@@ -511,7 +511,7 @@ export default {
         pid: props.projectTaskInfo.projectId,
         status: state.projectName,
         studentName: state.name,
-        taskId: props.projectTaskInfo.projectTaskId,
+        taskId: props.projectTaskInfo.id,
         taskType: props.projectTaskInfo.type,
       });
       api
@@ -523,7 +523,7 @@ export default {
           pid: props.projectTaskInfo.projectId,
           status: state.projectName,
           studentName: state.name,
-          taskId: props.projectTaskInfo.projectTaskId,
+          taskId: props.projectTaskInfo.id,
           taskType: props.projectTaskInfo.type,
         })
         .then((res) => {
@@ -585,7 +585,7 @@ export default {
       //     pageNo: state.currentPage,
       //     pageSize: state.pageSize,
       //     currentStageId: props.projectTaskInfo.stageId,
-      //     currentTaskId: props.projectTaskInfo.projectTaskId,
+      //     currentTaskId: props.projectTaskInfo.id,
       //     type: 1,
       //     pid: props.projectTaskInfo.projectId,
       //   })
@@ -603,7 +603,7 @@ export default {
       let obj = {
         currentStageId: props.projectTaskInfo.stageId,
         pid: props.projectTaskInfo.projectId,
-        taskId: props.projectTaskInfo.projectTaskId,
+        taskId: props.projectTaskInfo.id,
         taskType: props.projectTaskInfo.type,
         type: 1,
       };
@@ -634,7 +634,7 @@ export default {
         }/admin/student/exportHomeWork?currentStageId=${
           props.projectTaskInfo.stageId
         }&type=${1}&pid=${props.projectTaskInfo.projectId}&taskId=${
-          props.projectTaskInfo.projectTaskId
+          props.projectTaskInfo.id
         }&taskType=${props.projectTaskInfo.type}`
       );
     }

src/components/drawers/router/RouterEvaluationManage.vue

@@ -22,7 +22,7 @@
         <div
           v-if="datasource.startTime &&  datasource.endTime"
           class="endtime"
-        > 
+        >
           起止时间：{{ datasource.startTime }} ～ {{ datasource.endTime }}
         </div>
         <div v-else class="endtime">
@@ -348,8 +348,8 @@ export default {
         currentStageId: props.datasource.chapterId,
         type: 2,
         pid: props.datasource.routerId,
-        taskId: props.datasource.routerTaskId, 
+        taskId: props.datasource.routerTaskId,
-        taskType: props.datasource.type, 
+        taskType: props.datasource.type,
         status: state.projectName,
         studentName: state.name,
       });
@@ -360,7 +360,7 @@ export default {
           currentStageId: props.datasource.chapterId,
           type: 2,
           pid: props.datasource.routerId,
-          taskId: props.datasource.routerTaskId, 
+          taskId: props.datasource.id,
           taskType: props.datasource.type,
           status: state.projectName,
           studentName: state.name,
@@ -660,4 +660,3 @@ export default {
   }
 }
 </style>
-  

src/components/drawers/router/RouterFaceTeachManage.vue

@@ -156,7 +156,7 @@
     :downloadUrl="downloadUrl"
   />
 </template>
-  
+
   <script>
 import { toRefs, reactive } from "vue";
 import { message } from "ant-design-vue";
@@ -627,7 +627,7 @@ export default {
         }/admin/student/exportHomeWork?currentStageId=${
           props.datasource.chapterId
         }&type=${2}&pid=${props.datasource.routerId}&taskId=${
-          props.datasource.routerTaskId
+          props.datasource.id
         }&taskType=${props.datasource.type}&thirdType=5`
       );
     }
@@ -652,7 +652,7 @@ export default {
   },
 };
 </script>
-  
+
   <style lang="scss">
 .ProjectFaceTaskManage {
   .ant-drawer-content-wrapper {
@@ -949,4 +949,3 @@ export default {
   }
 }
 </style>
-  

src/components/drawers/router/RouterHomeworkManage.vue

@@ -10,7 +10,7 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">【作业111】{{ title }}</div>
+        <div class="headerTitle">【作业】{{ title }}</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../../assets/images/basicinfo/close.png"
@@ -128,7 +128,7 @@
   <EScore
     v-model:eScorevisible="Evisible"
     :type="2"
-    :id="datasource?.routerTaskId"
+    :id="datasource?.id"
     :pid="datasource?.routerId"
     v-model:searchTaskList="searchTaskList"
   />
@@ -443,6 +443,7 @@ export default {
               }}
             >
               <a-button
+              disabled
                 class="operation"
                 style="margin-right:10px;color:rgba(56, 125, 247, 0.5)"
               >
@@ -521,6 +522,7 @@ export default {
           studentName: state.name,
         })
         .then((res) => {
+          debugger
           console.log("获取作业管理学员", res);
           if (res.data.code == 200) {
             let newData = [];
@@ -594,7 +596,7 @@ export default {
       let obj = {
         currentStageId: props.datasource.chapterId,
         pid: props.datasource.routerId,
-        taskId: props.datasource.routerTaskId,
+        taskId: props.datasource.id,
         taskType: props.datasource.type,
         type: 2,
       };
@@ -603,6 +605,7 @@ export default {
         .then((res) => {
           console.log("导出作业", res.data.data);
           if (res.data.code === 200) {
+            debugger
             // message.destroy();
             // message.success("导出作业成功");
             state.exportHomeWorkV = true;

src/components/drawers/router/RouterProjectManage.vue

@@ -23,7 +23,7 @@
             v-if="datasource.type !== 6 && datasource.type !== 9"
             class="endtime"
             >
-            
+
             <!-- 起止时间：—-->
             </div>
             <div v-else class="endtime">
@@ -48,7 +48,7 @@
                     placeholder="请选择"
                     :options="projectNameList"
                     @change="selectProjectName"
-                    
+
                     ></a-select>
                 </div>
                 </div>
@@ -160,7 +160,7 @@
         },
       },
     },
-  
+
     setup(props, ctx) {
       const state = reactive({
         visible: props.PjModelVisible,
@@ -171,7 +171,7 @@
         tableDataTotal: 0,
         projectName: undefined,
         projectNameList: [
-          
+
             {
               id: 1,
               value: "1",
@@ -195,9 +195,9 @@
         courseID: "",
 
 
-        routerId: '',  
+        routerId: '',
-        studentId: '',  
+        studentId: '',
-        CheckStuvisible: false, 
+        CheckStuvisible: false,
       });
       const tableDataFunc = () => {
         const columns = [
@@ -239,7 +239,7 @@
             key: "studentDepartName",
             width: "20%",
             align: "center",
-            
+
             className: "h",
             ellipsis: true,
             customRender: (text) => {
@@ -378,7 +378,7 @@
                         () => {
                             {/* 当前学员 用来查看学员详情 */}
                             state.routerId = value.record.routerId;
-                            state.studentId = value.record.studentId; 
+                            state.studentId = value.record.studentId;
                             state.CheckStuvisible = true;
                             console.log(value);
                     }}>
@@ -390,7 +390,7 @@
         ];
         return columns;
       };
-  
+
       const closeDrawer = () => {
         ctx.emit("update:PjModelVisible", false);
         state.currentPage = 1;
@@ -417,7 +417,7 @@
       const onChange = (pageNumber) => {
         console.log("Page: ", pageNumber);
       };
-  
+
       // 获取数据
       function getData() {
         if(props.datasource.type === 13){
@@ -428,7 +428,7 @@
                 currentStageId: props.datasource.chapterId,
                 type: 2,
                 pid: props.datasource.routerId,
-                taskId: props.datasource.routerTaskId,
+                taskId: props.datasource.id,
                 taskType: props.datasource.type,
                 status: state.projectName,
                 studentName: state.name,
@@ -449,7 +449,7 @@
           state.tabledata = [];
         }
       }
-  
+
       // 搜索按钮
       function searchTaskList() {
         state.currentPage = 1;
@@ -464,20 +464,20 @@
         state.projectName = undefined;
         getData();
       }
-  
+
       //分页
       const changePaginationStu = (page) => {
         state.tableDataTotalLoading = true;
         state.currentPage = page;
         getData();
       };
-  
+
       // 导出数据
       function exportTaskStu() {
         console.log(`${process.env.VUE_APP_BASE_API}/project/management/exportProjectManage?courseId=${props.datasource.courseId}`)
         window.open(`${process.env.VUE_APP_BASE_API}/project/management/exportProjectManage?courseId=${props.datasource.courseId}`)
       }
-  
+
       return {
         ...toRefs(state),
         selectProjectName,
@@ -496,7 +496,7 @@
     },
   };
   </script>
-  
+
   <style lang="scss">
   .ant-drawer-content-wrapper {
     max-width: 80% !important;
@@ -562,7 +562,7 @@
           flex-wrap: wrap;
           margin-top: 20px;
           justify-content: space-between;
-  
+
           .sealeft {
             display: flex;
             flex-wrap: wrap;
@@ -579,7 +579,7 @@
           .btns {
             display: flex;
             flex-wrap: nowrap;
-  
+
             .btn {
               cursor: pointer;
               width: 100px;
@@ -603,15 +603,15 @@
                 margin-right: 7px;
               }
             }
-  
+
             .btn1 {
               background: #4ea6ff;
-  
+
               color: #ffffff;
             }
             .btn2 {
               background: #ffffff;
-  
+
               color: #4ea6ff;
               border: 1px solid #4ea6ff;
             }
@@ -620,7 +620,7 @@
         .btnss {
           display: flex;
           flex-wrap: nowrap;
-  
+
           .btn {
             cursor: pointer;
             width: 130px;
@@ -644,15 +644,15 @@
               margin-right: 7px;
             }
           }
-  
+
           .btn1 {
             background: #4ea6ff;
-  
+
             color: #ffffff;
           }
           .btn2 {
             background: #ffffff;
-  
+
             color: #4ea6ff;
             border: 1px solid #4ea6ff;
           }
@@ -661,7 +661,7 @@
           th.h {
             background-color: #eff4fc !important;
           }
-  
+
           .ant-table-tbody
             > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
             > td {
@@ -688,7 +688,7 @@
           }
         }
       }
-  
+
       .btnn {
         height: 72px;
         width: 100%;
@@ -723,4 +723,3 @@
     }
   }
   </style>
-    

src/views/courselibrary/CoursewareManage.vue

@@ -1629,6 +1629,29 @@ const columns1 = [
       return text ? text : "-";
     },
   },
+  {
+    title: " 资源归属",
+    width: 250,
+    dataIndex: "sourceBelongFullName",
+    key: "3",
+    align: "center",
+    ellipsis: true,
+    customRender: ({text}) => {
+      return text ? text : "-";
+    },
+  },
+  
+  {
+    title: " 目标人群",
+    width: 250,
+    dataIndex: "targetUser",
+    key: "3",
+    align: "center",
+    ellipsis: true,
+    customRender: ({text}) => {
+      return text ? text : "-";
+    },
+  },
   {
     title: "学习人数",
     width: 130,
@@ -3353,12 +3376,12 @@ export default defineComponent({
       if (state.selectTime) {
         // beginTime = parseInt(new Date(state.selectTime[0].$d).getTime() / 1000);
         // endTime = parseInt(new Date(state.selectTime[1].$d).getTime() / 1000);
-        beginTime = dayjs(state.selectTime[0]).format('YYYY-MM-DD HH:mm')
+        beginTime = dayjs(state.selectTime[0]).format('YYYY-MM-DD HH:mm:ss')
         // toDate(
         //   new Date(state.selectTime[0].$d).getTime() / 1000,
         //   "Y-M-D h:m:s"
         // );
-        endTime = dayjs(state.selectTime[1]).format('YYYY-MM-DD HH:mm')
+        endTime = dayjs(state.selectTime[1]).format('YYYY-MM-DD HH:mm:ss')
         // toDate(
         //   new Date(state.selectTime[1].$d).getTime() / 1000,
         //   "Y-M-D h:m:s"

src/views/learningpath/LearningPath.vue

@@ -1522,8 +1522,8 @@ export default {
               state.editPathId = id;
               let arr = imgData.value;
               arr.forEach((item) => {
-                if (item.dictValue === state.pathBg) {
+                if (item.value === state.pathBg) {
-                  state.pathBgId = item.dictCode;
+                  state.pathBgId = item.code;
 
                 }
               });

src/views/projectcenter/ProjectAdd.vue

@@ -102,7 +102,7 @@
             <a-range-picker
                 separator="至"
                 :show-time="{ format: 'HH:mm' }"
-                :placeholder="['      开始时间2', '        结束时间2']"
+                :placeholder="['      开始时间', '        结束时间']"
                 :disabledDate="disabledDate"
                 v-model:value="timeRange"
                 @calendarChange="calendarChange"
@@ -530,7 +530,8 @@ export default {
       if (state.projectInfo.id && state.datePartial === 'start') {
         return current && current > dayjs(state.timeRange[0]).endOf("YYYY-MM-DD HH:mm");
       }
-      return current && current < dayjs().endOf('day');
+      // return current && current < dayjs().endOf('day');
+      return current && current < dayjs().subtract(1, 'days').endOf('day')
     };
 
     function calendarChange(date, dateStr, partial) {

src/views/projectcenter/TaskPage.vue

@@ -4052,6 +4052,7 @@ export default {
           parentId: state.parentId,
           picUrl: state.picUrl,
           projectId: Number(state.projectId),
+          id: Number(state.projectId),
           remark: state.remark,
           sourceBelongId: Number(state.tsourceBelong),
           status: state.status,
@@ -4074,6 +4075,7 @@ export default {
           parentId: state.parentId,
           picUrl: state.picUrl,
           projectId: Number(state.projectId),
+          id: Number(state.projectId),
           remark: state.remark,
           sourceBelongId: Number(state.tsourceBelong),
           status: state.status,