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

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/AddHomework.vue

@@ -328,8 +328,8 @@ export default {
     // 新增任务
     const updteHomeWork = () => {
       let obj = {
-        submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD HH:mm:ss"),
-        submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD HH:mm:ss"),
+        submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD HH:mm"),
+        submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD HH:mm"),
         workEnclosureAddress: state.workEnclosureAddress
           ? state.workEnclosureAddress
           : "",
@@ -379,8 +379,8 @@ export default {
           formState.workName = res.data.data.workName;
           formState.workRequirement = res.data.data.workRequirement;
           formState.choosedTime = [
-            dayjs(res.data.data.submitStartTime, "YYYY-MM-DD HH:mm:ss"),
-            dayjs(res.data.data.submitEndTime, "YYYY-MM-DD HH:mm:ss"),
+            dayjs(res.data.data.submitStartTime, "YYYY-MM-DD HH:mm"),
+            dayjs(res.data.data.submitEndTime, "YYYY-MM-DD HH:mm"),
           ];
           state.addLoading = false;
         })

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/components/drawers/MemberList.vue

@@ -330,7 +330,8 @@ export default {
           gangw: value.userInfoBo.jobName, //岗位
           completeStageCnt: value.completeStageCnt, //当前完成阶段数
           totalStageCnt: value.totalStageCnt, //总阶段数
-          progress: value.completeStageCnt + "/" + value.totalStageCnt,
+          //progress: value.completeStageCnt + "/" + value.totalStageCnt, TODO接口返回value.completeStageCnt值不对
+          progress: 0 + "/" + value.totalStageCnt,
 
           stutime: toDate(value.beginStudyTime / 1000, "Y-M-D"), //开始学习时间
         };

src/components/project/NameInput.vue

@@ -64,8 +64,13 @@ watch(modelV, () => {
 function validateProName() {
   emit('update:finished', false);
   props.value && validateName({name: props.value, type: props.type, id: props.id}).then(res => {
-    emit('update:validate', res.data.data !== 1)
-    emit('update:finished', true);
+    if(props.value==""){
+      emit('update:validate', res.data.data === 1)
+    }else{
+      emit('update:validate', res.data.data !== 1)
+      emit('update:finished', true);
+    }
+   
   })
 }
 

src/components/project/OrgClass.vue

@@ -38,8 +38,9 @@ const options = computed(() => store.state.orgtreeList)
 const id = computed(() => {
   return props.value
 })
-
+console.log("store.state.orgtreeList",store.state.orgtreeList);
 function change(key, obj) {
+  console.log(obj[0],key,props.value);
   emit('update:name', obj[0])
   emit('update:value', key)
 }