feat:合并

src/App.vue

@@ -44,7 +44,7 @@ export default defineComponent({
     const store = useStore();
     const isLogin = ref(false);
     // console.log("router", router.getRoutes(), route);
-    console.log("版本0.9.15------------");
+    console.log("版本0.9.16------------");
     const routes = computed(() => {
       return router.getRoutes().filter((e) => e.meta?.isLink);
     });

src/components/drawers/AddFaceteach.vue

@@ -267,7 +267,7 @@
             <div class="signbox"></div>
             <div class="btnbox">
               <button class="xkbtn" @click="showAssessment">选择评估</button>
-              <div v-if="assessmentId > 0">
+              <div v-if="assessmentName">
                 <a-tag closable color="processing" @close="logA">
                   <span style="font-size: 14px; line-height: 33px">{{
                     assessmentName
@@ -483,7 +483,7 @@ export default {
       fileList: [],
       chooseCourse: null, //选择的在线课程
       chooseCourseName: null, //选择的在线课程
-      assessmetId: null,
+      assessmentId: null,
       EditTestId: null,
       EditWorkId: null,
       workName: null,
@@ -512,6 +512,7 @@ export default {
       state.chooseCourse = null;
       state.EditTestId = null;
       state.assessmentId = null;
+      state.assessmentName ="";
       state.EditWorkId = null;
       state.EditEvalId = null;
       state.applyFlag = "";
@@ -546,7 +547,8 @@ export default {
       console.log(e);
     };
     const logA = (e) => {
-      state.EditEvalId = null;
+      state.assessmentId = null;
+      state.assessmentName ="";
       console.log(e);
     };
 
@@ -593,8 +595,8 @@ export default {
         state.EditTestId = result.testId;
         state.EditWorkId = result.homeWorkId;
         state.assessmentId = result.evaluateId;
-        state.needEval = result.evaluateId;
+        state.needEval = result.evalFlag == 1? true:false;
-        console.log("====",!result.offcourseId,!result.homeWorkId,!result.testId);
+        console.log("==state.needEval ==",state.needEval );
         if(result.offcourseId){
           detail({offcourseId:result.offcourseId}).then((res)=>{
           state.chooseCourseName =res.data.data.name;
@@ -602,8 +604,8 @@ export default {
 
         });
         }
-        if(result.evaluateId){
+        if(result.evalFlag == 1 && result.evaluateId){
-          queryAppraiseDetailById({assessmentId:!result.offcourseId}).then((res)=>{
+          queryAppraiseDetailById({assessmentId:result.evaluateId}).then((res)=>{
           state.assessmentName =res.data.data.assessmentName;
         });
         }
@@ -659,15 +661,16 @@ export default {
           completeType: type.concat(t),
           description: state.description,
           endTime: parseInt(new Date(state.chooseTime[1].$d).getTime() / 1000),
-          evalFlag: state.needEval ? 1 : 0,
+          evalFlag: state.needEval && state.assessmentId > 0 ? 1 : 0,
           evaluateId: state.assessmentId,
           homeWorkId: state.EditWorkId,
-          name: state.courseName,
+          name: state.courseName,       
           projectMember: p.concat(p1),
           offcourseId: state.chooseCourse,
           offcoursePlanId: props.EditFaceId > 0 ? props.EditFaceId : 0,
           testId: state.EditTestId,
           duration: state.duration,
+      
         };
         console.log("obj============", obj, "6" + "9");
         console.log("222222222");

src/components/drawers/AssessmentAll.vue

@@ -257,18 +257,25 @@ export default {
       let data = tableData;
       let array = [];
       data.map((value) => {
+        let n1 = value.essayQuestionVoList
+                ? Number(value.essayQuestionVoList.length)
+                : 0 ;
+        let n2 = value.multipleStemVoList
+                ? Number(value.multipleStemVoList.length)
+                : 0;
+       
+        let n3 = value.scoringQuestionVoList
+                ? Number(value.scoringQuestionVoList.length)
+                : 0;
+        let n4 =  value.singleStemVoList
+                ? Number(value.singleStemVoList.length)
+                : 0;
+
+        let num =  n1 + n2 + n3 +n4;   
         let obj = {
           key: value.assessmentId,
           assessmentId: value.assessmentId,
-          num: value.essayQuestionVoList
+          num: num,
-            ? Number(value.essayQuestionVoList.length)
-            : 0 + value.multipleStemVoList
-            ? Number(value.multipleStemVoList.length)
-            : 0 + value.scoringQuestionVoList
-            ? Number(value.scoringQuestionVoList.length)
-            : 0 + value.singleStemVoList
-            ? Number(value.singleStemVoList.length)
-            : 0,
           name: value.assessmentName ? value.assessmentName : "-",
           creator: value.createUser ? value.createUser : "-",
           time: dayjs(value.createTime).format("YYYY-MM-DD"),
@@ -286,6 +293,7 @@ export default {
           pageNo: state.currentPage,
           pageSize: state.pageSize,
           releaseStatus:2,
+          searchEndTime:"",
         })
         .then((res) => {
           let arr = res.data.data.rows;

src/components/drawers/AssessmentList.vue

@@ -216,6 +216,7 @@ export default {
           assessmentName: state.inputV1,
           pageNo: state.currentPage,
           pageSize: state.pageSize,
+          releaseStatus: 2 ,
           searchEndTime:"",
         })
         .then((res) => {

src/views/courselibrary/CoursewareManage.vue

@@ -4836,6 +4836,7 @@ export default defineComponent({
       state.checked4 = false;
       state.EditTestId = null;
       state.assessmentId = null;
+      state.assessmentName = "";
       state.EditWorkId = null;
    
       removePG();
@@ -4862,7 +4863,7 @@ export default defineComponent({
         beginTime: startTime,
         completeType: type,
         endTime: endTime,
-        evalFlag: state.checked4 ? 1 : 0,
+        evalFlag: Number(state.assessmentId) >0 &&state.checked4 ? 1 : 0,
         evaluateId: Number(state.assessmentId),
         testId: state.EditTestId,
         homeWorkId: state.EditWorkId,

src/views/research/ResearchManage.vue

@@ -164,6 +164,10 @@
     </a-modal>
     <!--操作弹窗 -->
   </div>
+    <!--  加载动画 -->
+    <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
+      <a-spin :spinning="addLoading" tip="" />
+    </div>
 </template>
 <script>
 import { reactive, toRefs, onMounted, ref } from "vue";
@@ -186,6 +190,7 @@ export default {
   setup() {
     const router = useRouter();
     const state = reactive({
+      addLoading: false,
       // projectNameList: [
       //   {
       //     id: 1,
@@ -383,6 +388,7 @@ export default {
 
     const getTableDate = async () => {
       // let data = state.tableData;
+      state.addLoading = true;
       let startTime,
         endTime = "";
       if (state.projectTime) {
@@ -419,6 +425,7 @@ export default {
         },
         true
       );
+      state.addLoading = false;
       data.map((value) => {
         {
           //单层项目