时间去掉秒

src/components/drawers/AddFaceteach.vue

@@ -315,17 +315,7 @@
               </a-tag>
             </div>
 
-            <!-- 添加作业侧弹窗 -->
-            <div>
-              <add-homework
-                v-model:addhomeworkVisible="addhomeworkvisible"
-                @getWork="getWork"
-                :faceLevel="true"
-                v-model:EditWorkId="EditWorkId"
-                v-model:workName="workName"
-              />
-            </div>
-            <!-- 添加作业侧弹窗 -->
+
           </div>
           <div class="main_item">
             <div class="signbox">

src/components/drawers/AddTest.vue

@@ -244,7 +244,7 @@
           <div class="main_item">
             <div class="main_item">
               <div class="signbox">
-                <span style="margin-right: 3px">作业要求：</span>
+                <span style="margin-right: 3px">考试排序：</span>
               </div>
               <div class="btnbox">
                 <a-radio-group
@@ -307,7 +307,7 @@ import STest from "./SelectTest.vue";
 import { ProjectEditTask, RouterEditTask } from "@/api/indexTask";
 import { addTempTask } from "../../api/indexTaskadd";
 import dayjs from "dayjs";
-import { toDate } from "@/api/method";
+//import { toDate } from "@/api/method";
 
 export default {
   name: "AddTest",
@@ -446,8 +446,8 @@ export default {
             state.test.questionArrangement
           );
           state.test.chooseTime = [
-            dayjs(res.data.data.examinationStartTime, "YYYY-MM-DD HH:mm:ss"),
-            dayjs(res.data.data.examinationEndTime, "YYYY-MM-DD HH:mm:ss"),
+            dayjs(res.data.data.examinationStartTime, "YYYY-MM-DD HH:mm"),
+            dayjs(res.data.data.examinationEndTime, "YYYY-MM-DD HH:mm"),
           ];
           state.paperName = state.test.examinationTestName;
           // state.paperId=dayjs
@@ -487,14 +487,9 @@ export default {
       //   new Date(state.test.$slotschooseTime[1].$d).getTime() / 1000,
       //   "Y-M-D h:m"
       // );
-      state.test.examinationStartTime = toDate(
-        new Date(state.test.chooseTime[0].$d).getTime() / 1000,
-        "Y-M-D h:m"
-      );
-      state.test.examinationEndTime = toDate(
-        new Date(state.test.chooseTime[1].$d).getTime() / 1000,
-        "Y-M-D h:m"
-      );
+      state.test.examinationStartTime = dayjs(state.test.chooseTime[0]).format("YYYY-MM-DD HH:mm"),
+   
+      state.test.examinationEndTime = dayjs(state.test.chooseTime[1]).format("YYYY-MM-DD HH:mm"),
       state.test.examinationPaperId = state.paperId;
       //TODO缺少paperName字段
       state.test.examinationTestName = state.paperName;

src/views/courselibrary/CoursewareManage.vue

@@ -2037,13 +2037,13 @@
             <div class="signbox"></div>
             <div class="btnbox">
               <button class="xkbtn" @click="showDrawerAddHomework">配置作业</button>
-            
+              <div v-if="EditWorkId > 0">
                 <a-tag closable @close="logW" color="processing">
                   <span style="font-size: 14px; line-height: 33px">
                     {{ workName }}
                   </span>
                 </a-tag>
-          
+          </div>
                 <add-homework
                 v-model:addhomeworkVisible="addhomeworkvisible"
                 @getWork="getWork"
@@ -2057,13 +2057,13 @@
             <div class="signbox"></div>
             <div class="btnbox">
               <button class="xkbtn" @click="showDrawerAddTest">配置考试</button>
-            
+              <div v-if="EditTestId > 0">
                 <a-tag closable @close="logT" color="processing">
                   <span style="font-size: 14px; line-height: 33px">
                     {{ testName }}
                   </span>
                 </a-tag>
-          
+          </div>
                 <add-test
                 v-model:addtestVisible="addtestvisible"
                 v-model:EditTestId="EditTestId"
@@ -2926,6 +2926,10 @@ import CourseModal from "./courseModal.vue";
 import * as moment from "moment";
 import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
 import { codeUrl, toDate } from "../../api/method";
+import { queryWorkDetailById } from "@/api/indexWork";
+import { queryExaminationDetailById } from "@/api/indexExam";
+import AddHomework from "../../components/drawers/AddHomework.vue";
+import AddTest from "../../components/drawers/AddTest.vue";
 //列表表格
 const columns1 = [
   // {
@@ -3441,6 +3445,8 @@ export default defineComponent({
     ProjPowerList,
     ProjCheckShip,
     AssessmentList,
+    AddHomework,
+    AddTest,
     NameInput,
     // VNodes: (_, {attrs}) => {
     //   return attrs.vnodes;
@@ -3719,6 +3725,8 @@ export default defineComponent({
       testName:null,
       assessmentName: "",
       assessmentVisible: false,
+      addhomeworkvisible:false,
+      addtestvisible:false,
       codevisible: false, //二维码弹窗
       codeInfo: null, //二维码内容
       codeUrl: codeUrl,
@@ -4826,6 +4834,10 @@ export default defineComponent({
       state.xjkkinputV4 = null;
       state.checked1 = false;
       state.checked4 = false;
+      state.EditTestId = null;
+      state.assessmentId = null;
+      state.EditWorkId = null;
+   
       removePG();
     };
     //保存开课
@@ -4852,6 +4864,8 @@ export default defineComponent({
         endTime: endTime,
         evalFlag: state.checked4 ? 1 : 0,
         evaluateId: Number(state.assessmentId),
+        testId: state.EditTestId,
+        homeWorkId: state.EditWorkId,
         name: state.xjkkinputV1,
         signFlag: state.xjkkradioV1 === 0 ? 1 : 0, //是否允许未报名的签到:1是0否
         // signWordFlag: state.xjkkradioV1 === 1 ? 1 : 0, //签到是否需要口令:1是0否
@@ -4895,15 +4909,25 @@ export default defineComponent({
         if (res.data.code === 200) return res.data.data;
       });
 
-      let obj = {
-        assessmentId: item.evaluateId,
-      };
+    if(item.evaluateId){
       api
-        .queryAppraiseDetailById(obj)
+        .queryAppraiseDetailById({assessmentId: item.evaluateId})
         .then((res) => {
           state.assessmentName = res.data.data.assessmentName;
         })
         .catch();
+    }
+    if(item.homeWorkId){
+          queryWorkDetailById({workId:item.homeWorkId}).then((res)=>{
+          state.workName = res.data.data.workName;
+        });
+        }
+        if(item.testId){
+          queryExaminationDetailById({ examinationId: item.testId }).then((res)=>{
+          state.testName = res.data.data.examinationName;
+        });
+        }
+      
 
       console.log("res");
       console.log("获取面授课详情", item);
@@ -4922,6 +4946,8 @@ export default defineComponent({
           item.completeType.split(",")[1] == "1" ? true : false),
         (state.checked4 = item.evalFlag === 1 ? true : false);
       state.assessmentId = String(item.evaluateId);
+      state.EditTestId = String(item.testId);
+      state.EditWorkId = String(item.homeWorkId);
       state.xjkkinputV1 = item.name;
       if (item.signFlag === 1) {
         //是否允许未报名的签到:1是0否