模板库添加任务评估

src/api/indexInvist.js

@@ -38,16 +38,15 @@ import http from "./config";
 // 接口-请求
 
 //创建评估
-export const createAppraiseMessage = (obj) => http.post('/survey/createAppraiseMessage', obj,);
 
-//删除评估信息
-export const deleteAppraise = (obj) => http.post('/survey/deleteAppraise', { params: obj })
 
 //根据ID获取评估信息详情
-export const queryAppraiseDetailById = (obj) => http.post('/survey/queryAppraiseDetailById', { params: obj })
+export const queryAppraiseDetailById = (obj) => http.post('/assessment/queryAssessmentDetailById',  obj,{
-
+    headers: {
-//修改评估信息
+      'token': '123',
-export const updateAppraiseMessage = (obj) => http.post('/survey/updateAppraiseMessage', obj)
+      'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
+    }
+  })
 
 //获取全部评估信息接口
 export const queryAssessmentDetailList = (obj) => http.post('/assessment/queryAssessmentDetailList', obj)

src/api/indexTaskadd.js

@@ -25,4 +25,6 @@ export const setScoreRule = (obj) => http.post('/admin/project/setScoreRule', ob
 export const planList = (obj) => http.post('/admin/offcourse/planList', obj)
 
 //获取面授课列表
-export const list = (obj) => http.post('/admin/offcourse/list', obj)
+export const list = (obj) => http.post('/admin/offcourse/list', obj)
+
+export const addTempTask = (obj) => http.post('/admin/project//template/editTask', obj)

src/components/drawers/ AssessmentList.vue

@@ -86,6 +86,10 @@ export default {
       type: Number,
       default: null,
     },
+    titleTag: {
+      type: Boolean,
+      default: false,
+    }
   },
   setup(props, ctx) {
     const state = reactive({
@@ -100,9 +104,10 @@ export default {
     });
     const closeDrawer = () => {
       ctx.emit("update:assessmentVisible", false);
+      ctx.emit("update:titleTag", true);
     };
     const afterVisibleChange = (bool) => {
-      console.log("state getAllInvistText", bool);
+      console.log("state getAllInvistText", bool,"======",props.titleTag);
       if (props.assessmentVisible) {
         getAllInvistText();
       }

src/components/drawers/AddActive.vue

@@ -380,6 +380,23 @@ export default {
             message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
           });
       } else if (props.isLevel == 3) {
+        apiTask
+          .addTempTask({
+            courseId: res.data.data.activityId,
+            duration: res.data.data.activityDuration,
+            name: res.data.data.activityName,
+            projectTemplateId: props.projectTemplateId,
+            projectTaskId: props.projectTaskId || 0,
+            stageId: props.chooseStageId,
+            type: 9,
+          })
+          .then(() => {
+            message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
+          })
+          .catch(() => {
+            message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
+          });
+
         console.log("");
       }
     };

src/components/drawers/AddDiscuss.vue

@@ -192,10 +192,12 @@ export default {
           });
       } else if (props.isLevel == 2) {
         apiTask.addTask({
-          courseId: res.data.data.discussId,
+            courseId: res.data.data.discussId,
-          name: res.data.data.discussName,
+            duration: res.data.data.discussExplain,
-          routerId: props.routerId,
+            name: res.data.data.discussName,
-          routerTaskId: props.routerTaskId || 0,
+            projectId: props.projectId,
+            projectTaskId: props.projectTaskId || 0,
+            stageId: props.chooseStageId,
           type: 8,
         });
       } else if (props.isLevel == 3) {

src/components/drawers/AddInvist.vue

@@ -23,12 +23,15 @@
             <div class="main_notice">
               <div class="mntc_left">
                 <div class="notice_icon"></div>
-                <div v-if="assessment == null">
+                <div v-if="assessment == null&&assessment1==null ">
                   <span class="title"
                     >已选择 <span class="data">0</span> 条</span
                   >
                 </div>
                 <div v-else>
+              
+              
+                <div v-if ="assessment1==null">
                   <span class="title"
                     >已选择 <span class="data">1</span> 条;</span
                   >
@@ -45,6 +48,28 @@
                     >创建时间： <span class="data">{{ assessment.time }}</span>
                   </span>
                 </div>
+                <div v-else>
+                  <span class="title"
+                    >已选择 <span class="data">1</span> 条;</span
+                  >
+                  <span class="title"
+                    >名称： <span class="data">{{ assessment1.createName }}</span>
+                  </span>
+                  <span class="title"
+                    >题数： <span class="data">{{ assessment1.essayQuestionVoList.length }}</span>
+                  </span>
+                  <span class="title"
+                    >创建人： <span class="data">{{ assessment1.createUser }}</span>
+                  </span>
+                  <span class="title"
+                    >创建时间： <span class="data">{{ assessment1.createTime }}</span>
+                  </span>
+                </div>
+
+              </div>
+            
+
+
               </div>
             </div>
             <div class="main_item">
@@ -55,6 +80,7 @@
                   <div class="main_item2">
                     <AssessmentList
                       v-model:assessmentVisible="assessmentVisible"
+                      v-model:titleTag="titleTag"
                       @checkedAss="getCheckedAss"
                     />
                   </div>
@@ -77,6 +103,7 @@ import * as apiTask from "../../api/indexTaskadd";
 import { message } from "ant-design-vue";
 import AssessmentList from "./ AssessmentList.vue";
 import { RouterEditTask } from "@/api/indexTask";
+import * as api from "../../api/indexInvist";
 export default {
   name: "AddInvist",
   components: {
@@ -139,10 +166,13 @@ export default {
       assessmentId: null,
       assessmentName: "",
       assessment: null,
+      assessment1: null,
       assessmentVisible: false,
+      titleTag:false,
     });
     const getCheckedAss = (ass) => {
       state.assessment = ass;
+      state.assessment1 =null;
     };
     const closeDrawer = () => {
       ctx.emit("update:addinvistVisible", false);
@@ -159,8 +189,24 @@ export default {
       state.assessmentId = null;
       state.assessmentName = "";
       state.assessment = null;
+      queryInfo();
+     
+    };
+    const queryInfo = () => {
+      if (props.edit) {
+        state.titleTg =false;
+        //编辑讨
+        api
+          .queryAppraiseDetailById({ assessmentId: props.EditInvistId })
+          .then((res) => {
+            //更新讨论信息
+            state.assessment1=res.data.data;
+         
+          })
+          .catch(() => {
+          });
+      }
     };
-
     const updateTask = () => {
       if (state.assessment == null) {
         return message.warning("请选择评估");

src/views/projectcenter/TaskAdd.vue

@@ -1854,7 +1854,7 @@ export default {
       state.addactivevisible = true;
       state.EditActiveId = id;
       state.projectTaskId = eleId;
-      console.log("active=======", id);
+   
     };
     const showDrawerAddEval = (id, eleId) => {
       state.addevalvisible = true;
@@ -1863,12 +1863,12 @@ export default {
       state.projectTaskId = eleId;
     };
     const showDrawerAddInvist = (id, eleId) => {
-      console.log(id, eleId, "213312");
+      state.EditInvistId = id;
       state.addinvistvisible = true;
       state.projectTaskId = eleId;
     };
     const showDrawerAddVote = (id, eleId) => {
-      console.log(id, eleId, "95835325932953295325");
+
       state.addvotevisible = true;
       state.EditVoteId = id;
       state.projectTaskId = eleId;

src/views/projectcenter/TemplateLibrary.vue

@@ -15,7 +15,7 @@
             </div>
             <div class="inpbox1">
               <span>创建时间：</span>
-              <a-date-picker v-model="selectTime" type="date" placeholder="创建时间" style="
+              <a-date-picker v-model:value="time" type="date" placeholder="创建时间" style="
                 width: 270px;
                 height: 40px; 
                 border-radius: 8px;
@@ -50,6 +50,7 @@ import { message } from "ant-design-vue";
 import { useRouter } from "vue-router";
 import { useStore } from "vuex";
 import * as api from "@/api/indexTemplate"
+
 const columns1 = [
   {
     title: "模版名称",
@@ -97,6 +98,7 @@ export default defineComponent({
     const router = useRouter();
     const state = reactive({
       value1: null,
+      time:null,
       tableData1: [
         {
           key: "1",
@@ -179,12 +181,14 @@ export default defineComponent({
 
     // 获取模板列表
     const getLibraryList = () => {
+      let date = Math.ceil(new Date(state.time).getTime() / 1000);
+     
       let obj = {
-        "beginTime": 0,
+      //  "create_time": state.time,
-        "name": "",
+      "beginTime":date,
+        "name": state.value1,
         "pageNo": pagination.current,
         "pageSize": 10,
-        "status": 0
       }
       api.templateList(obj).then((res) => {
         state.tableData1 = []
@@ -222,13 +226,16 @@ export default defineComponent({
     }
     const searchLevel = () => {
       getLibraryList();
+      /*
       setTimeout(() => {
         const result = state.tableData1.filter(item => item.name.includes(state.value1))
         state.tableData1 = result;
       },100)
+      */
     };
     const resetLevel = () => {
       state.value1 = '';
+      state.time = '';
       getLibraryList();
       getTableDate1()
     };

src/views/projectcenter/temTask.vue

@@ -176,7 +176,7 @@
                   @changeData="updateTableData"
                   :isLevel="isLevel"
                   v-model:edit="edit"
-                  v-model:projectId="projectId"
+                  v-model:projectTemplateId="projectTemplateId"
                   v-model:chooseStageId="chooseStageId"
                   v-model:projectTaskId="projectTaskId"
                   v-model:EditOnlineId="EditOnlineId"
@@ -216,7 +216,7 @@
                   @changeData="updateTableData"
                   :isLevel="isLevel"
                   v-model:edit="edit"
-                  v-model:projectId="projectId"
+                  v-model:projectTemplateId="projectTemplateId"
                   v-model:chooseStageId="chooseStageId"
                   v-model:projectTaskId="projectTaskId"
                   v-model:EditCaseId="EditCaseId"
@@ -239,7 +239,7 @@
                   @changeData="updateTableData"
                   v-model:isLevel="isLevel"
                   v-model:edit="edit"
-                  v-model:projectId="projectId"
+                  v-model:projectTemplateId="projectTemplateId"
                   v-model:chooseStageId="chooseStageId"
                   v-model:EditWorkId="EditWorkId"
                   v-model:projectTaskId="projectTaskId"
@@ -262,7 +262,7 @@
                   @changeData="updateTableData"
                   :isLevel="isLevel"
                   v-model:edit="edit"
-                  v-model:projectId="projectId"
+                  v-model:projectTemplateId="projectTemplateId"
                   v-model:chooseStageId="chooseStageId"
                   v-model:EditTestId="EditTestId"
                   v-model:projectTaskId="projectTaskId"
@@ -284,7 +284,7 @@
                   v-model:addliveVisible="addlivevisible"
                   :isLevel="isLevel"
                   @changeData="updateTableData"
-                  v-model:projectId="projectId"
+                  v-model:projectTemplateId="projectTemplateId"
                   v-model:chooseStageId="chooseStageId"
                   v-model:edit="edit"
                   v-model:EditLiveId="EditLiveId"
@@ -307,7 +307,7 @@
                   v-model:addrefVisible="addrefvisible"
                   :isLevel="isLevel"
                   @changeData="updateTableData"
-                  v-model:projectId="projectId"
+                   v-model:projectTemplateId="projectTemplateId"
                   v-model:chooseStageId="chooseStageId"
                   v-model:edit="edit"
                   v-model:EditRefId="EditRefId"
@@ -330,7 +330,7 @@
                   v-model:adddiscussVisible="adddiscussvisible"
                   v-model:edit="edit"
                   :isLevel="isLevel"
-                  v-model:projectId="projectId"
+                   v-model:projectTemplateId="projectTemplateId"
                   v-model:chooseStageId="chooseStageId"
                   v-model:EditDiscussId="EditDiscussId"
                   v-model:projectTaskId="projectTaskId"
@@ -351,7 +351,7 @@
               <div>
                 <add-active
                   v-model:addactiveVisible="addactivevisible"
-                  v-model:projectId="projectId"
+                   v-model:projectTemplateId="projectTemplateId"
                   v-model:EditActiveId="EditActiveId"
                   v-model:projectTaskId="projectTaskId"
                   v-model:edit="edit"
@@ -377,7 +377,7 @@
                   @changeData="updateTableData"
                   v-model:edit="edit"
                   :isLevel="isLevel"
-                  v-model:projectId="projectId"
+                   v-model:projectTemplateId="projectTemplateId"
                   v-model:chooseStageId="chooseStageId"
                   v-model:projectTaskId="projectTaskId"
                   v-model:EditEvalId="EditEvalId"
@@ -400,7 +400,7 @@
                   @changeData="updateTableData"
                   v-model:edit="edit"
                   :isLevel="isLevel"
-                  v-model:projectId="projectId"
+                   v-model:projectTemplateId="projectTemplateId"
                   v-model:chooseStageId="chooseStageId"
                   v-model:projectTaskId="projectTaskId"
                   v-model:EditInvistId="EditInvistId"
@@ -423,7 +423,7 @@
                     @getData="changeVData"
                     v-model:edit="edit"
                     :isLevel="isLevel"
-                    v-model:projectId="projectId"
+                     v-model:projectTemplateId="projectTemplateId"
                     v-model:chooseStageId="chooseStageId"
                     v-model:projectTaskId="projectTaskId"
                     v-model:EditVoteId="EditVoteId"
@@ -1114,7 +1114,7 @@
         chooseStageId: null,
         removeStageId: null,
         edit: false,
-        isLevel: 2, //学习路径1项目2模板库3
+        isLevel: 3, //学习路径1项目2模板库3
         // isRefEdit: 1, //外链编辑
         // isLiveEdit: 1, //直播编辑
         isRefEdit: false, //外链编辑
@@ -1685,6 +1685,7 @@
         state.valuesname = "";
         state.valuesnotice = "";
         state.updateStageID = null;
+        
       };
       //显示添加阶段弹窗
       const showModal = (element) => {
@@ -1964,7 +1965,6 @@
   
       //打开测评的弹窗
       const showEditEvalDrawer = (id, eleId) => {
-        console.log("222222222222222222222", id);
         state.addevalvisible = true;
         state.projectTaskId = eleId;
         state.EditRefId = id;