Merge branch 'develop' into manage-release

src/components/drawers/AddTest.vue

@@ -211,8 +211,9 @@
               <span style="margin-right: 3px">数据来源：</span>
             </div>
             <div class="btnbox">
-              <a-input v-model:value="formData.source" style="width: 400px; height: 40px; border-radius: 8px" :disabled="taskIndex >= 0"
+              <a-input v-model:value="formData.source" 
-                placeholder="请输入数据来源" :maxlength="120" />
+              style="width: 400px; height: 40px; border-radius: 8px" :disabled="taskIndex >= 0"
+                placeholder="请输入数据来源" show-count :maxlength="420" />
             </div>
           </div>
           <div class="main_item2">

src/components/drawers/CommonTest.vue

@@ -287,7 +287,7 @@
                   v-model:value="formData.source"
                   style="width: 400px; height: 40px; border-radius: 8px"
                   placeholder="请输入数据来源"
-                  :maxlength="120"
+                  show-count :maxlength="420"
               />
             </div>
           </div>

src/components/drawers/ExportAchievement.vue

@@ -36,10 +36,11 @@
                 @change="handleChange"
                 :showUploadList="false"
                 :data="{
-                  type: type,
+                  type,
-                  targetId: Number(targetId),
+                  targetId,
-                  chapterId: chapterId,
+                  chapterId,
-                  taskId: taskId,
+                  taskId,
+                  courseId,
                 }"
               >
                 <p class="ant-upload-drag-icon">
@@ -66,7 +67,7 @@
                       <div class="tit">{{ fileName }}</div>
                       <div class="stateloading">正在上传</div>
                     </div>
-                    <a-progress :percent="uploadpercent" />
+                    <a-progress :percent="uploadpercent"/>
                     <!-- <div class="prog">
                         <div class="inprogloading"></div>
                       </div> -->
@@ -86,7 +87,7 @@
                       <div class="tit">{{ fileName }}</div>
                       <div class="statedefeat">上传失败</div>
                     </div>
-                    <a-progress :percent="uploadpercent" />
+                    <a-progress :percent="uploadpercent"/>
                     <!-- <div class="prog">
                         <div class="inprogdefeat"></div>
                       </div> -->
@@ -121,7 +122,7 @@
                       <div class="tit">{{ fileName }}</div>
                       <div class="statesucce">上传成功</div>
                     </div>
-                    <a-progress :percent="uploadpercent" />
+                    <a-progress :percent="uploadpercent"/>
                     <!-- <div class="prog">
                         <div class="inprogsucce"></div>
                       </div> -->
@@ -185,15 +186,16 @@
     </div>
     <!--  加载动画 -->
     <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
-      <a-spin :spinning="addLoading" tip="" />
+      <a-spin :spinning="addLoading" tip=""/>
     </div>
   </a-drawer>
 </template>
-  <script>
+<script>
-import { reactive, toRefs } from "vue";
+import {reactive, toRefs} from "vue";
-import { message } from "ant-design-vue";
+import {message} from "ant-design-vue";
 import * as api from "../../api/index1";
-import { BATCH_IMPORT_SCORE } from "@/api/config";
+import {BATCH_IMPORT_SCORE} from "@/api/config";
+
 export default {
   name: "EScore",
   props: {
@@ -218,6 +220,10 @@ export default {
       type: Number,
       default: null,
     },
+    courseId: {
+      type: Number,
+      default: null,
+    },
     chapterId: {
       type: Number,
       default: null,
@@ -384,9 +390,9 @@ export default {
         window.open(process.env.VUE_APP_FILE_PATH + state.downloadErrUrl);
       }
     };
+
     function downTemplate() {
-      console.log(state.locationHref + state.template);
+      window.open(process.env.VUE_APP_FILE_PATH + process.env.VUE_APP_UP_LOAD_STUDENT_SCORE_TEMPLATE);
-      window.open(state.locationHref + state.template);
     }
 
     return {
@@ -405,7 +411,7 @@ export default {
 };
 </script>
 
-  <style lang="scss">
+<style lang="scss">
 .ExportScoreExternalExternal {
   .drawerMain {
     min-width: 600px;
@@ -413,6 +419,7 @@ export default {
     overflow-x: auto;
     display: flex;
     flex-direction: column;
+
     .header {
       height: 73px;
       border-bottom: 1px solid #e8e8e8;
@@ -422,6 +429,7 @@ export default {
       // background-color: red;
       margin-bottom: 20px;
       flex-shrink: 0;
+
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
@@ -430,15 +438,19 @@ export default {
         // margin-left: 24px;
       }
     }
+
     .main {
       overflow-y: auto;
+
       .minatitl {
         display: flex;
+
         .up1 {
           font-size: 16px;
           font-weight: 400;
           color: #333333;
         }
+
         .up2 {
           font-size: 16px;
           font-weight: 400;
@@ -446,16 +458,20 @@ export default {
           margin-left: 4px;
         }
       }
+
       .upload {
         margin-top: 32px;
         display: flex;
+
         .text {
           font-size: 14px;
           font-weight: 400;
           color: #333333;
         }
+
         .right {
           margin-left: 6px;
+
           .load {
             width: 500px;
             height: 176px;
@@ -467,12 +483,14 @@ export default {
             flex-direction: column;
             align-items: center;
             margin-bottom: 20px;
+
             .cloud {
               margin-top: 52px;
               width: 28px;
               height: 28px;
               background-image: url(../../assets/images/basicinfo/cloud.png);
             }
+
             .tip {
               font-size: 14px;
               font-weight: 400;
@@ -480,6 +498,7 @@ export default {
               margin-top: 15px;
               cursor: pointer;
             }
+
             .tipz {
               font-size: 14px;
               font-weight: 400;
@@ -487,6 +506,7 @@ export default {
               margin-top: 10px;
             }
           }
+
           .loadstate {
             width: 500px;
             margin-bottom: 100px;
@@ -501,10 +521,12 @@ export default {
               flex-direction: column;
               justify-content: center;
               position: relative;
+
               .content {
                 display: flex;
                 margin-left: 20px;
                 position: relative;
+
                 .defeat {
                   width: 400px;
                   position: absolute;
@@ -514,14 +536,17 @@ export default {
                   font-weight: 500;
                   justify-content: space-between;
                 }
+
                 .img {
                   width: 30px;
                   height: 34px;
                   background-image: url(../../assets/images/basicinfo/exl.png);
                 }
+
                 .timebox {
                   margin-left: 15px;
                   margin-top: -5px;
+
                   .timetop {
                     display: flex;
                     width: 262px;
@@ -532,27 +557,32 @@ export default {
                       font-weight: 400;
                       color: #333333;
                     }
+
                     .stateloading {
                       font-size: 14px;
                       font-weight: 400;
                       color: #4ea6ff;
                     }
+
                     .statedefeat {
                       font-size: 14px;
                       font-weight: 400;
                       color: #ff7474;
                     }
+
                     .statesucce {
                       font-size: 14px;
                       font-weight: 400;
                       color: #35ae69;
                     }
                   }
+
                   .prog {
                     width: 262px;
                     height: 5px;
                     background: #eaf1fe;
                     border-radius: 4px;
+
                     .inprogloading {
                       width: 55%;
                       height: 5px;
@@ -560,6 +590,7 @@ export default {
 
                       background: #4ea6ff;
                     }
+
                     //下载失败条
                     .inprogdefeat {
                       width: 55%;
@@ -568,6 +599,7 @@ export default {
 
                       background: #ff7474;
                     }
+
                     //下载成功条
                     .inprogsucce {
                       width: 100%;
@@ -578,15 +610,18 @@ export default {
                     }
                   }
                 }
+
                 .curloading {
                   margin-left: 15px;
                   margin-top: 15px;
                   display: flex;
+
                   .cur {
                     font-size: 14px;
                     font-weight: 400;
                     color: #333333;
                   }
+
                   .cancel {
                     font-size: 14px;
                     font-weight: 400;
@@ -594,6 +629,7 @@ export default {
                   }
                 }
               }
+
               .downloadErr {
                 width: 120px;
                 height: 32px;
@@ -617,6 +653,7 @@ export default {
         }
       }
     }
+
     .btnn {
       height: 72px;
       width: 100%;
@@ -628,6 +665,7 @@ export default {
       align-items: center;
       justify-content: center;
       box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
+
       .btn1 {
         width: 100px;
         height: 40px;
@@ -637,6 +675,7 @@ export default {
         background-color: #fff;
         cursor: pointer;
       }
+
       .btn2 {
         cursor: pointer;
         width: 100px;

src/components/drawers/project/ProjectExternalExamManage.vue

@@ -118,9 +118,10 @@
       <ExportAchievement 
         @closeDraw="closeDraw"
         v-model:eScorevisibleExternalExternal="eScorevisibleExternalExternal" 
-        :type="2"
+        :type="1"
         :targetId="datasource.projectId" 
-        :taskId="datasource.courseId" 
+        :courseId="datasource.courseId"
+        :taskId="datasource.id"
         :chapterId="datasource.stageId" />
     </a-drawer>
   </template>

src/components/drawers/router/RouterCommonManage.vue

@@ -500,6 +500,7 @@ export default {
 
     // 导出数据
     function exportTaskStu() {
+      debugger
       if(props.datasource.type==1){
         {/* 在线课导出 */}
         window.open(`${process.env.VUE_APP_BASE_API}/admin/online/manage/exportOnline?chapterId=${props.datasource.chapterId}&type=${2}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}`)
@@ -507,7 +508,7 @@ export default {
         {/* 评估导出 */}
         window.open(`${process.env.VUE_APP_BASE_API}/admin/assessment/manage/exportAssessmentMessage?chapterId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&courseId=${props.datasource.courseId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
       }else{
-        window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
+        window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportDiscussStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
       }
     }
 

src/components/drawers/router/RouterExaminationExternalManage.vue

@@ -117,9 +117,10 @@
       <ExportAchievement 
         @closeDraw="closeDraw"
         v-model:eScorevisibleExternalExternal="eScorevisibleExternalExternal" 
-        :type="1"
+        :type="2"
         :targetId="datasource.routerId" 
-        :taskId="datasource.courseId" 
+        :courseId="datasource.courseId"
+        :taskId="datasource.id"
         :chapterId="datasource.chapterId" />
     </a-drawer>
   </template>
@@ -397,6 +398,7 @@
       // 获取数据
       function getData() {
         state.loadingData = true;
+        console.log(JSON.stringify(props.datasource))
         api.QueryExternalExamManageDetail({
           chapterId: props.outchapter,
           pageNo: state.currentPage,

src/views/courselibrary/CoursewareManage.vue

@@ -3465,7 +3465,7 @@ export default defineComponent({
     const options4CurId = ref("");
     const options4CurName = ref("张");
     const of_hShow = () => {
-      state.offcourseId = '';
+      state.offcourseId = "";
       getTea();
       if (state.of_hs == false) {
         state.of_hs = true;
@@ -3839,7 +3839,11 @@ export default defineComponent({
           key: "8",
           align: "center",
           customRender: ({ record }) =>
-            record.assessmentStatus ? "已评估" : "未评估",
+            itm.courseScore === -1
+              ? "-"
+              : record.assessmentStatus
+              ? "已评估"
+              : "未评估",
         },
         {
           title: "评分",
@@ -6877,7 +6881,7 @@ export default defineComponent({
                 background: #4ea6ff;
                 border-radius: 8px;
                 border: 1px solid rgba(64, 158, 255, 1);
-                color:#fff;
+                color: #fff;
                 display: flex;
                 align-items: center;
                 justify-content: center;