feat:合并

src/api/indexTaskManage.js

@@ -15,4 +15,7 @@ export const ExportExam = (obj) => http.post('/admin/exam/manage/exportExam', ob
 export const QueryOnlineManagementDetail = (obj) => http.post('/admin/online/manage/queryOnlineManagementDetail', obj)
 
 // 获取 课程库-面授管理-管理-学习记录 信息
-export const GetCourseStudent = (obj) => http.get('/admin/student/getCourseStudent', {params: obj})
+export const GetCourseStudent = (obj) => http.get('/admin/student/getCourseStudent', {params: obj})
+
+// 查询评估管理-管理学员的学习信息
+export const QueryAssessmentManageMessage = (obj) => http.post('/admin/assessment/manage/queryAssessmentManageMessage', obj)

src/components/drawers/project/ProjectEvalManage.vue

@@ -187,6 +187,13 @@ export default {
             width: 50,
             align: "center",
             className: "h head",
+            customRender: (text) => {
+            return (
+              <div class="racona">
+                <span> {text.record.studentUserNo?text.record.studentUserNo:"-"}</span>
+              </div>
+            );
+          },
           },
           {
             title: "姓名",
@@ -195,6 +202,13 @@ export default {
             width: 50,
             align: "left",
             className: "h head",
+            customRender: (text) => {
+            return (
+              <div class="racona">
+                <span> {text.record.studentName?text.record.studentName:"-"}</span>
+              </div>
+            );
+          },
           },
           {
             title: "所在部门",
@@ -203,6 +217,13 @@ export default {
             width: 60,
             align: "center",
             className: "h",
+            customRender: (text) => {
+            return (
+              <div class="racona">
+                <span> {text.record.studentDepartName?text.record.studentDepartName:"-"}</span>
+              </div>
+            );
+          },
           },
           {
             title: "所在岗位",
@@ -211,6 +232,13 @@ export default {
             width: 60,
             align: "center",
             className: "h",
+            customRender: (text) => {
+              return (
+                <div class="racona">
+                  <span> {text.record.studentJobName?text.record.studentJobName:"-"}</span>
+                </div>
+              );
+            },
           },
           {
             title: "学员关卡",
@@ -222,7 +250,7 @@ export default {
             customRender: () => {
               return (
                 <div class="racona">
-                  <span> {props.levelName}</span>
+                  <span> {props.levelName?props.levelName:'-'}</span>
                 </div>
               );
             },
@@ -234,15 +262,29 @@ export default {
             width: 60,
             align: "center",
             className: "h",
+            customRender: (text) => {
+            return (
+              <div class="racona">
+                <span> {text.record.endStudyTime?text.record.endStudyTime:"-"}</span>
+              </div>
+            );
+          },
           },
   
           {
             title: "任务状态",
-            dataIndex: "status",
+            dataIndex: "finishStatus",
-            key: "status",
+            key: "finishStatus",
             width: 60,
             align: "center",
             className: "h",
+            customRender: (text) => {
+              return (
+                <div class="racona">
+                  <span> {text.record.finishStatus == 0 || text.record.finishStatus==null  ? "未开始" :text.record.finishStatus == 1 ?"已完成":"进行中"}</span>
+                </div>
+              );
+            },
           },
           {
             title: "PDF状态",
@@ -251,6 +293,13 @@ export default {
             width: 60,
             align: "center",
             className: "h",
+            customRender: (text) => {
+              return (
+                <div class="racona">
+                  <span> {text.record.PDFstatus?text.record.PDFstatus:"-"}</span>
+                </div>
+              );
+            },
           }
         ]
       return columns;

src/components/drawers/project/ProjectExamManage.vue

@@ -186,7 +186,14 @@ export default {
           key: "studentCode",
           width: 50,
           align: "center",
-          className: "h head"
+          className: "h head",
+          customRender: (text) => {
+            return (
+              <div class="racona">
+                <span> {text.record.studentCode?text.record.studentCode:"-"}</span>
+              </div>
+            );
+          },
         },
         {
           title: "姓名",
@@ -195,6 +202,13 @@ export default {
           width: 50,
           align: "left",
           className: "h head",
+          customRender: (text) => {
+            return (
+              <div class="racona">
+                <span> {text.record.studentName?text.record.studentName:"-"}</span>
+              </div>
+            );
+          },
         },
         {
           title: "所在部门",
@@ -203,6 +217,13 @@ export default {
           width: 60,
           align: "center",
           className: "h",
+          customRender: (text) => {
+            return (
+              <div class="racona">
+                <span> {text.record.studentDepartName?text.record.studentDepartName:"-"}</span>
+              </div>
+            );
+          },
         },
         {
           title: "所在岗位",
@@ -211,6 +232,13 @@ export default {
           width: 60,
           align: "center",
           className: "h",
+          customRender: (text) => {
+            return (
+              <div class="racona">
+                <span> {text.record.studentJobName?text.record.studentJobName:"-"}</span>
+              </div>
+            );
+          },
         },
         {
           title: "考试次数",
@@ -219,6 +247,13 @@ export default {
           width: 60,
           align: "center",
           className: "h",
+          customRender: (text) => {
+            return (
+              <div class="racona">
+                <span> {text.record.testNumber?text.record.testNumber:"-"}</span>
+              </div>
+            );
+          },
         },
         {
           title: "成绩",
@@ -227,6 +262,13 @@ export default {
           width: 60,
           align: "center",
           className: "h",
+          customRender: (text) => {
+            return (
+              <div class="racona">
+                <span> {text.record.score?text.record.score:"-"}</span>
+              </div>
+            );
+          },
         },
 
         {
@@ -236,6 +278,13 @@ export default {
           width: 60,
           align: "center",
           className: "h",
+          customRender: (text) => {
+            return (
+              <div class="racona">
+                <span> {text.record.finishedTime?text.record.finishedTime:"-"}</span>
+              </div>
+            );
+          },
         },
         {
           title: "任务状态",
@@ -248,7 +297,7 @@ export default {
             console.log(text.record.status);
             return (
               <div class="racona">
-                <span> {text.record.status==0?"未开始":text.record.status==10?"未通过":"已通过"}</span>
+                <span> {text.record.status==0||text.record.status==null?"未开始":text.record.status==10?"未通过":"已通过"}</span>
               </div>
             );
           },

src/components/drawers/project/ProjectOnlineManage.vue

@@ -203,6 +203,13 @@ export default {
           width: 50,
           align: "center",
           className: "h head",
+          customRender: (text) => {
+            return (
+              <div class="racona">
+                <span> {text.record.studentUserNo?text.record.studentUserNo:"-"}</span>
+              </div>
+            );
+          },
         },
         {
           title: "姓名",
@@ -211,6 +218,13 @@ export default {
           width: 50,
           align: "center",
           className: "h head",
+          customRender: (text) => {
+            return (
+              <div class="racona">
+                <span> {text.record.studentName?text.record.studentName:"-"}</span>
+              </div>
+            );
+          },
         },
         {
           title: "所在部门",
@@ -219,6 +233,13 @@ export default {
           width: 60,
           align: "center",
           className: "h",
+          customRender: (text) => {
+            return (
+              <div class="racona">
+                <span> {text.record.studentDepartName?text.record.studentDepartName:"-"}</span>
+              </div>
+            );
+          },
         },
         {
           title: "所在岗位",
@@ -227,6 +248,13 @@ export default {
           width: 60,
           align: "center",
           className: "h",
+          customRender: (text) => {
+            return (
+              <div class="racona">
+                <span> {text.record.studentJobName?text.record.studentJobName:"-"}</span>
+              </div>
+            );
+          },
         },
         {
           title: "学员关卡",
@@ -250,18 +278,25 @@ export default {
           width: 100,
           align: "center",
           className: "h",
+          customRender: (text) => {
+            return (
+              <div class="racona">
+                <span> {text.record.lastStudyTime?text.record.lastStudyTime:"-"}</span>
+              </div>
+            );
+          },
         },
         {
           title: "任务状态",
-          dataIndex: "status",
+          dataIndex: "finishStatus",
-          key: "status",
+          key: "finishStatus",
           width: 60,
           align: "center",
           className: "h",
           customRender: (text) => {
             return (
               <div class="racona">
-                <span> {text.record.status == 0 ? "未完成" : "已完成"}</span>
+                <span> {text.record.finishStatus == 0 || text.record.finishStatus==null  ? "未开始" :text.record.finishStatus == 1 ?"已完成":"进行中"}</span>
               </div>
             );
           },
@@ -368,7 +403,7 @@ export default {
                 studentDepartName: res.data.data.studyDetailList[i].studentDepartName, 
                 studentJobName: res.data.data.studyDetailList[i].studentJobName, 
                 lastStudyTime: res.data.data.studyDetailList[i].finishedTime,
-                status: res.data.data.studyDetailList[i].status?res.data.data.studyDetailList[i].status:0
+                finishStatus: res.data.data.studyDetailList[i].status?res.data.data.studyDetailList[i].status:0
               }
               newData.push(obj)
             }

src/components/drawers/router/RouterCommonManage.vue

@@ -203,6 +203,13 @@ export default {
           width: 50,
           align: "center",
           className: "h head",
+          customRender: (text) => {
+            return (
+              <div class="racona">
+                <span> {text.record.studentUserNo?text.record.studentUserNo:"-"}</span>
+              </div>
+            );
+          },
         },
         {
           title: "姓名",
@@ -211,6 +218,13 @@ export default {
           width: 50,
           align: "center",
           className: "h head",
+          customRender: (text) => {
+            return (
+              <div class="racona">
+                <span> {text.record.studentName?text.record.studentName:"-"}</span>
+              </div>
+            );
+          },
         },
         {
           title: "所在部门",
@@ -219,6 +233,13 @@ export default {
           width: 60,
           align: "center",
           className: "h",
+          customRender: (text) => {
+            return (
+              <div class="racona">
+                <span> {text.record.studentDepartName?text.record.studentDepartName:"-"}</span>
+              </div>
+            );
+          },
         },
         {
           title: "所在岗位",
@@ -227,6 +248,13 @@ export default {
           width: 60,
           align: "center",
           className: "h",
+          customRender: (text) => {
+            return (
+              <div class="racona">
+                <span> {text.record.studentJobName?text.record.studentJobName:"-"}</span>
+              </div>
+            );
+          },
         },
         {
           title: "学员关卡",
@@ -250,18 +278,25 @@ export default {
           width: 100,
           align: "center",
           className: "h",
+          customRender: (text) => {
+            return (
+              <div class="racona">
+                <span> {text.record.lastStudyTime?text.record.lastStudyTime:"-"}</span>
+              </div>
+            );
+          },
         },
         {
           title: "任务状态",
-          dataIndex: "status",
+          dataIndex: "finishStatus",
-          key: "status",
+          key: "finishStatus",
           width: 60,
           align: "center",
           className: "h",
           customRender: (text) => {
             return (
               <div class="racona">
-                <span> {text.record.status == 0 ? "未完成" : "已完成"}</span>
+                <span> {text.record.finishStatus == 0 || text.record.finishStatus==null  ? "未开始" :text.record.finishStatus == 1 ?"已完成":"进行中"}</span>
               </div>
             );
           },
@@ -367,7 +402,7 @@ export default {
                 studentDepartName: res.data.data.studyDetailList[i].studentDepartName, 
                 studentJobName: res.data.data.studyDetailList[i].studentJobName, 
                 lastStudyTime: res.data.data.studyDetailList[i].finishedTime,
-                status: res.data.data.studyDetailList[i].status?res.data.data.studyDetailList[i].status:0
+                finishStatus: res.data.data.studyDetailList[i].status?res.data.data.studyDetailList[i].status:0
               }
               newData.push(obj)
             }

src/components/drawers/router/RouterEvaluationManage.vue

@@ -188,6 +188,13 @@
             width: 50,
             align: "center",
             className: "h head",
+            customRender: (text) => {
+              return (
+                <div class="racona">
+                  <span> {text.record.studentUserNo?text.record.studentUserNo:"-"}</span>
+                </div>
+              );
+            },
           },
           {
             title: "姓名",
@@ -196,6 +203,13 @@
             width: 50,
             align: "left",
             className: "h head",
+            customRender: (text) => {
+              return (
+                <div class="racona">
+                  <span> {text.record.studentName?text.record.studentName:"-"}</span>
+                </div>
+              );
+            },
           },
           {
             title: "所在部门",
@@ -204,6 +218,13 @@
             width: 60,
             align: "center",
             className: "h",
+            customRender: (text) => {
+              return (
+                <div class="racona">
+                  <span> {text.record.studentDepartName?text.record.studentDepartName:"-"}</span>
+                </div>
+              );
+            },
           },
           {
             title: "所在岗位",
@@ -212,6 +233,13 @@
             width: 60,
             align: "center",
             className: "h",
+            customRender: (text) => {
+              return (
+                <div class="racona">
+                  <span> {text.record.studentJobName?text.record.studentJobName:"-"}</span>
+                </div>
+              );
+            },
           },
           {
             title: "学员关卡",
@@ -223,7 +251,7 @@
             customRender: () => {
               return (
                 <div class="racona">
-                  <span> {props.levelName}</span>
+                  <span> {props.levelName?props.levelName:'-'}</span>
                 </div>
               );
             },
@@ -235,15 +263,29 @@
             width: 60,
             align: "center",
             className: "h",
+            customRender: (text) => {
+              return (
+                <div class="racona">
+                  <span> {text.record.endStudyTime?text.record.endStudyTime:"-"}</span>
+                </div>
+              );
+            },
           },
   
           {
             title: "任务状态",
-            dataIndex: "status",
+            dataIndex: "finishStatus",
-            key: "status",
+            key: "finishStatus",
             width: 60,
             align: "center",
             className: "h",
+            customRender: (text) => {
+              return (
+                <div class="racona">
+                  <span> {text.record.finishStatus == 0 || text.record.finishStatus==null  ? "未开始" :text.record.finishStatus == 1 ?"已完成":"进行中"}</span>
+                </div>
+              );
+            },
           },
           {
             title: "PDF状态",
@@ -252,6 +294,13 @@
             width: 60,
             align: "center",
             className: "h",
+            customRender: (text) => {
+              return (
+                <div class="racona">
+                  <span> {text.record.PDFstatus?text.record.PDFstatus:"-"}</span>
+                </div>
+              );
+            },
           }
         ]
 

src/components/drawers/router/RouterExaminationManage.vue

@@ -190,7 +190,14 @@
             key: "studentCode",
             width: 50,
             align: "center",
-            className: "h head"
+            className: "h head",
+            customRender: (text) => {
+              return (
+                <div class="racona">
+                  <span> {text.record.studentCode?text.record.studentCode:"-"}</span>
+                </div>
+              );
+            },
           },
           {
             title: "姓名",
@@ -199,6 +206,13 @@
             width: 50,
             align: "left",
             className: "h head",
+            customRender: (text) => {
+              return (
+                <div class="racona">
+                  <span> {text.record.studentName?text.record.studentName:"-"}</span>
+                </div>
+              );
+            },
           },
           {
             title: "所在部门",
@@ -207,6 +221,13 @@
             width: 60,
             align: "center",
             className: "h",
+            customRender: (text) => {
+              return (
+                <div class="racona">
+                  <span> {text.record.studentDepartName?text.record.studentDepartName:"-"}</span>
+                </div>
+              );
+            },
           },
           {
             title: "所在岗位",
@@ -215,6 +236,13 @@
             width: 60,
             align: "center",
             className: "h",
+            customRender: (text) => {
+              return (
+                <div class="racona">
+                  <span> {text.record.studentJobName?text.record.studentJobName:"-"}</span>
+                </div>
+              );
+            },
           },
           {
             title: "学员关卡",
@@ -238,6 +266,13 @@
             width: 60,
             align: "center",
             className: "h",
+            customRender: (text) => {
+              return (
+                <div class="racona">
+                  <span> {text.record.testNumber?text.record.testNumber:"-"}</span>
+                </div>
+              );
+            },
           },
           {
             title: "成绩",
@@ -246,6 +281,13 @@
             width: 60,
             align: "center",
             className: "h",
+            customRender: (text) => {
+              return (
+                <div class="racona">
+                  <span> {text.record.score?text.record.score:"-"}</span>
+                </div>
+              );
+            },
           },
   
           {
@@ -255,6 +297,13 @@
             width: 60,
             align: "center",
             className: "h",
+            customRender: (text) => {
+              return (
+                <div class="racona">
+                  <span> {text.record.finishedTime?text.record.finishedTime:"-"}</span>
+                </div>
+              );
+            },
           },
           {
             title: "任务状态",
@@ -267,7 +316,7 @@
               console.log(text.record.status);
               return (
                 <div class="racona">
-                  <span> {text.record.status==0?"未开始":text.record.status==10?"未通过":"已通过"}</span>
+                  <span> {text.record.status==0||text.record.status==null?"未开始":text.record.status==10?"未通过":"已通过"}</span>
                 </div>
               );
             },

src/views/courselibrary/CoursewareManage.vue

@@ -2538,6 +2538,13 @@ const columns2 = [
     key: "studentName",
     width: "12%",
     align: "center",
+    customRender: (text) => {
+      return (
+        <div class="racona">
+          <span> {text.record.studentName?text.record.studentName:"-"}</span>
+        </div>
+      );
+    },
   },
   {
     title: "工号",
@@ -2545,13 +2552,27 @@ const columns2 = [
     key: "studentUserNo",
     width: "12%",
     align: "center",
+    customRender: (text) => {
+      return (
+        <div class="racona">
+          <span> {text.record.studentUserNo?text.record.studentUserNo:"-"}</span>
+        </div>
+      );
+    },
   },
   {
     title: "开课名称",
-    dataIndex: "courseName",
+    dataIndex: "name",
-    key: "courseName",
+    key: "name",
     width: "12%",
     align: "center",
+    customRender: (text) => {
+      return (
+        <div class="racona">
+          <span> {text.record.name?text.record.name:"-"}</span>
+        </div>
+      );
+    },
   },
   {
     title: "地点",
@@ -2559,6 +2580,13 @@ const columns2 = [
     key: "address",
     width: "12%",
     align: "center",
+    customRender: (text) => {
+      return (
+        <div class="racona">
+          <span> {text.record.address?text.record.address:"-"}</span>
+        </div>
+      );
+    },
   },
   {
     title: "数据来源",
@@ -2566,13 +2594,27 @@ const columns2 = [
     key: "courseSource",
     width: "12%",
     align: "center",
+    customRender: (text) => {
+      return (
+        <div class="racona">
+          <span> {text.record.courseSource?text.record.courseSource:"-"}</span>
+        </div>
+      );
+    },
   },
   {
     title: "学习时间",
-    dataIndex: "beginTime",
+    dataIndex: "lastStudyTime",
-    key: "beginTime",
+    key: "lastStudyTime",
     width: "12%",
     align: "center",
+    customRender: (text) => {
+      return (
+        <div class="racona">
+          <span> {text.record.lastStudyTime?text.record.lastStudyTime:"-"}</span>
+        </div>
+      );
+    },
   },
   {
     title: "签到时间",
@@ -2580,6 +2622,13 @@ const columns2 = [
     key: "signTime",
     width: "12%",
     align: "center",
+    customRender: (text) => {
+      return (
+        <div class="racona">
+          <span> {text.record.signTime?text.record.signTime:"-"}</span>
+        </div>
+      );
+    },
   },
   {
     title: "状态",
@@ -2587,6 +2636,13 @@ const columns2 = [
     key: "status",
     width: "12%",
     align: "center",
+    customRender: (text) => {
+      return (
+        <div class="racona">
+          <span> {text.record.finishStatus==0 || text.record.finishStatus == null ?"未开始":"已完成"}</span>
+        </div>
+      );
+    },
   },
   // {
   //   title: "操作",

src/views/learningpath/LevelAdd.vue

@@ -531,7 +531,7 @@
             :columns="tableDataFunc()"
           ></TableStudent>
         </a-tab-pane>
-        <!--1211注释 待开放
+        <!-- 1211注释 待开放 -->
         <a-tab-pane key="4" tab="设置">
           <div class="split"></div>
 
@@ -647,6 +647,7 @@
                       <div class="onetitle">上传共享文档</div>
                       <div class="oneedi">
                         <a-switch
+                          size="small"
                           v-model:checked="docChecked"
                           @change="checkedClose"
                         ></a-switch>
@@ -667,7 +668,7 @@
                         >
                         <img
                           src="@/assets/images/basicinfo/cloud.png"
-                          style="cursor: pointer; width: 34px; height: 34px"
+                          style="cursor: pointer; width: 24px; height: 24px; margin-left: 8px;margin-bottom: 3px;"
                           alt=""
                         />
                       </a-upload>
@@ -687,12 +688,14 @@
                         style="
                           width: 500px;
                           display: flex;
+                          margin-bottom: 30px;
                           justify-content: space-between;
                           align-items: center;
                         "
                         class="docListStyle"
                       >
-                        <img
+                      
+                        <!-- <img
                           src="@/assets/images/basicinfo/download.png"
                           style="
                             cursor: pointer;
@@ -701,7 +704,32 @@
                             margin-right: 40px;
                           "
                           alt=""
-                        />
+                        /> -->
+                        <img v-if="
+                              item.name.indexOf('jpg') !== -1 ||
+                              item.name.indexOf('jpeg') !== -1 ||
+                              item.name.indexOf('png') !== -1
+                            " 
+                            style="width: 27px;height: 32px;margin-right: 40px;"
+                            src="@/assets/images/coursewareManage/pngpic.png" />
+                        <div v-else>
+                          <img v-if="item.name.indexOf('doc') !== -1"  style="width: 27px;height: 32px;margin-right: 40px;" src="@/assets/images/coursewareManage/docpic.png" />
+                          <div v-else>
+                            <img v-if="item.name.indexOf('xls') !== -1"  style="width: 27px;height: 32px;margin-right: 40px;" src="@/assets/images/coursewareManage/xlspic.png" />
+                            <div v-else>
+                              <img v-if="item.name.indexOf('ppt') !== -1"  style="width: 27px;height: 32px;margin-right: 40px;" src="@/assets/images/coursewareManage/pptpic.png" />
+                              <div v-else>
+                                <img v-if="item.name.indexOf('pdf') !== -1"  style="width: 27px;height: 32px;margin-right: 40px;" src="@/assets/images/coursewareManage/pdfpic.png" />
+                                <div v-else>
+                                  <img v-if="item.name.indexOf('zip') !== -1"
+                                    style="width: 27px;height: 32px;margin-right: 40px;"
+                                    src="@/assets/images/coursewareManage/zippic.png" />
+                                  <img v-else  style="width: 27px;height: 32px;margin-right: 40px;" src="@/assets/images/coursewareManage/docpic.png" />
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
                         <span
                           style="
                             font: oblique bold 16px Sans-serif;
@@ -711,8 +739,10 @@
                             white-space: nowrap;
                             text-overflow: ellipsis;
                           "
+                          :title="item.name"
                           >{{ item.name }}</span
                         >
+                        <a :href="item.response?item.response.data:''" style="margin-left: 5px">下载</a>
                         <span
                           style="color: #4ea6ff; cursor: pointer"
                           @click="deFile(item.uid)"
@@ -726,7 +756,7 @@
             </a-tab-pane>
           </a-tabs>
         </a-tab-pane>
-   -->
+  
       </a-tabs>
 
       <a-modal
@@ -1398,6 +1428,7 @@ export default {
       evaluationLevelName: "",
 
       facestudent: "",
+      locationHref: location.href.indexOf('http://') !== -1 ? 'http://111.231.196.214:12016/' : location.href.slice(0, location.href.indexOf('/m')) + '/upload/'
     });
 
     const levelList = reactive({
@@ -2017,6 +2048,7 @@ export default {
         .then((res) => {
           console.log("router-list", res);
           state.fileList = JSON.parse(res.data.data.routerInfo.attach);
+          console.log('asdasdasd-------->',state.fileList)
           state.docChecked =
             res.data.data.routerInfo.attachSwitch == 1 ? true : false;
           if (res.data.data.routerInfo.status == 1) {

src/views/projectcenter/TaskPage.vue

@@ -993,7 +993,7 @@
                 </div>
               </div>
             </a-tab-pane>
-            <!--
+            
             <a-tab-pane key="13" tab="共享文档">
               <div class="sametab">
                 <div class="Gcon">
@@ -1004,6 +1004,7 @@
                       <div class="onetitle">上传共享文档</div>
                       <div class="oneedi">
                         <a-switch
+                          size="small"
                           v-model:checked="docChecked"
                           @change="checkedClose"
                         ></a-switch>
@@ -1024,7 +1025,7 @@
                         >
                         <img
                           src="@/assets/images/basicinfo/cloud.png"
-                          style="cursor: pointer; width: 34px; height: 34px"
+                          style="cursor: pointer; width: 24px; height: 24px; margin-left: 8px;margin-bottom: 3px;"
                           alt=""
                         />
                       </a-upload>
@@ -1043,12 +1044,13 @@
                         style="
                           width: 500px;
                           display: flex;
+                          margin-bottom: 30px;
                           justify-content: space-between;
                           align-items: center;
                         "
                         class="docListStyle"
                       >
-                        <img
+                        <!-- <img
                           src="@/assets/images/basicinfo/download.png"
                           style="
                             cursor: pointer;
@@ -1057,7 +1059,32 @@
                             margin-right: 40px;
                           "
                           alt=""
-                        />
+                        /> -->
+                        <img v-if="
+                              item.name.indexOf('jpg') !== -1 ||
+                              item.name.indexOf('jpeg') !== -1 ||
+                              item.name.indexOf('png') !== -1
+                            " 
+                            style="width: 27px;height: 32px;margin-right: 40px;"
+                            src="@/assets/images/coursewareManage/pngpic.png" />
+                        <div v-else>
+                          <img v-if="item.name.indexOf('doc') !== -1"  style="width: 27px;height: 32px;margin-right: 40px;" src="@/assets/images/coursewareManage/docpic.png" />
+                          <div v-else>
+                            <img v-if="item.name.indexOf('xls') !== -1"  style="width: 27px;height: 32px;margin-right: 40px;" src="@/assets/images/coursewareManage/xlspic.png" />
+                            <div v-else>
+                              <img v-if="item.name.indexOf('ppt') !== -1"  style="width: 27px;height: 32px;margin-right: 40px;" src="@/assets/images/coursewareManage/pptpic.png" />
+                              <div v-else>
+                                <img v-if="item.name.indexOf('pdf') !== -1"  style="width: 27px;height: 32px;margin-right: 40px;" src="@/assets/images/coursewareManage/pdfpic.png" />
+                                <div v-else>
+                                  <img v-if="item.name.indexOf('zip') !== -1"
+                                    style="width: 27px;height: 32px;margin-right: 40px;"
+                                    src="@/assets/images/coursewareManage/zippic.png" />
+                                  <img v-else  style="width: 27px;height: 32px;margin-right: 40px;" src="@/assets/images/coursewareManage/docpic.png" />
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
                         <span
                           style="
                             font: oblique bold 16px Sans-serif;
@@ -1067,8 +1094,10 @@
                             white-space: nowrap;
                             text-overflow: ellipsis;
                           "
+                          :title="item.name"
                           >{{ item.name }}</span
                         >
+                        <a :href="item.response?item.response.data:''" style="margin-left: 5px">下载</a>
                         <span
                           style="color: #4ea6ff; float: right; cursor: pointer"
                           @click="deFile(item.uid)"
@@ -1080,7 +1109,7 @@
                 </div>
               </div>
             </a-tab-pane>
-            -->
+           
           </a-tabs>
         </a-tab-pane>
       </a-tabs>
@@ -2469,6 +2498,7 @@ export default {
       evaltype: "",
       evalData: "",
       facestudent: "",
+      locationHref: location.href.indexOf('http://') !== -1 ? 'http://111.231.196.214:12016/' : location.href.slice(0, location.href.indexOf('/m')) + '/upload/'
     });
 
     const levelList = reactive({

src/views/research/ManagePage.vue

@@ -62,8 +62,8 @@
         <a-table
           style="border: 1px solid #f2f6fe"
           :columns="columns"
-          :data-source="dataSource"
+          :data-source="evalStuListData" 
-          :loading="tableDataTotal === -1 ? true : false"
+          :loading="evalStuListLoading"
           expandRowByClick="true"
           :scroll="{ x: 1500 }"
           @expand="expandTable"
@@ -71,6 +71,19 @@
         />
       </div>
       <!-- 表格 -->
+      <!-- 分页 -->
+      <a-pagination 
+        v-if="evalStuListDataTotal > 10"
+        :showSizeChanger="false"
+        showQuickJumper="true"
+        hideOnSinglePage="true"
+        :pageSize="pageSize"
+        :current="evalCurrentPage"
+        :total="evalStuListDataTotal"
+        class="pagination"
+        @change="changePaginationStu"
+      />
+      <!-- 分页 -->
     </div>
   </div>
   <view-assess v-model:Assessvisible="Assessvisible" :datasource="evalDataSource" :evalName="basicInfo.assessmentName"/>
@@ -81,6 +94,7 @@ import ViewAssess from "../../components/drawers/ViewAssess";
 import { reactive, toRefs } from "vue";
 import { queryAssessmentDetailList } from "@/api/indexResearch";
 import { useRouter } from "vue-router";
+import * as api from "@/api/indexTaskManage";
 
 export default {
   name: "ManagePage",
@@ -95,7 +109,11 @@ export default {
       tableDataTotalLoading: true,
       tabledata: [],
       tableDataTotal: 0,
-      evalDataSource: ""
+      evalDataSource: "",
+      evalStuListData: [],
+      evalStuListLoading:true,
+      evalStuListDataTotal:0,
+      evalCurrentPage:1
     });
 
     const getInfoDate = async () => {
@@ -112,18 +130,35 @@ export default {
       });
 
       // 获取学员信息
-      console.log('传递的请求学员信息的参数',{
+      state.evalStuListLoading = true;
-            pageNo: state.currentPage,
+      api.QueryAssessmentManageMessage({
-            pageSize: state.pageSize,
+        "assessmentId": router.currentRoute.value.params.id,
-            type: 3,
+        "pageNo": state.currentPage,
-            taskId: router.currentRoute.value.params.id,
+        "pageSize": state.pageSize
-            pid: router.currentRoute.value.params.id
+      }).then(res=>{
-          })
+        console.log('获取学员信息',res)
-      // createName
+        // evalStuListDataTotal evalCurrentPage
+        state.evalStuListLoading = false;
+        if(res.data.code==200){
+          state.evalStuListDataTotal = res.data.data.total;
+          state.evalStuListData = res.data.data.rows;
+          state.evalStuListLoading = false;
+        }
+      }).catch(err=>{
+        console.log(err)
+        state.evalStuListLoading = false;
+      })
     };
 
     getInfoDate();
 
+    //分页
+    const changePaginationStu = (page) => {
+      state.evalStuListLoading = true;
+      state.evalCurrentPage = page;
+      getInfoDate();
+    };
+
     const showassess = (data) => {
       state.evalDataSource = data;
       state.Assessvisible = true;
@@ -181,32 +216,67 @@ export default {
         {
           title: "工号",
           width: 40,
-          dataIndex: "userNo",
+          dataIndex: "studentCode",
-          key: "userNo",
+          key: "studentCode",
+          customRender: (text) => {
+            return (
+              <div class="racona">
+                <span> {text.record.studentCode?text.record.studentCode:"-"}</span>
+              </div>
+            );
+          },
         },
         {
           title: "姓名",
           width: 40,
-          dataIndex: "name",
+          dataIndex: "studentName",
-          key: "name",
+          key: "studentName",
+          customRender: (text) => {
+            return (
+              <div class="racona">
+                <span> {text.record.studentName?text.record.studentName:"-"}</span>
+              </div>
+            );
+          },
         },
         {
           title: "部门",
           width: 50,
-          dataIndex: "department",
+          dataIndex: "studentDepartName",
-          key: "department",
+          key: "studentDepartName",
+          customRender: (text) => {
+            return (
+              <div class="racona">
+                <span> {text.record.studentDepartName?text.record.studentDepartName:"-"}</span>
+              </div>
+            );
+          },
         },
         {
            width: 50,
            title: "岗位",
-           dataIndex: "post",
+           dataIndex: "studentJobName",
-           key: "post",
+           key: "studentJobName",
+           customRender: (text) => {
+            return (
+              <div class="racona">
+                <span> {text.record.studentJobName?text.record.studentJobName:"-"}</span>
+              </div>
+            );
+          },
          },
          {
           title: "数据来源",
           width: 50,
-          dataIndex: "dataSource",
+          dataIndex: "source",
-          key: "dataSource",
+          key: "source",
+          customRender: (text) => {
+            return (
+              <div class="racona">
+                <span> {text.record.source?text.record.source:"-"}</span>
+              </div>
+            );
+          },
         },
         // {
         //   title: "项目",
@@ -223,8 +293,15 @@ export default {
         {
           title: "提交时间",
           width: 50,
-          dataIndex: "submit",
+          dataIndex: "submitTime",
-          key: "submit",
+          key: "submitTime",
+          customRender: (text) => {
+            return (
+              <div class="racona">
+                <span> {text.record.submitTime?text.record.submitTime:"-"}</span>
+              </div>
+            );
+          },
         },
         {
           title: "操作",
@@ -250,6 +327,7 @@ export default {
         },
       ],
       showassess,
+      changePaginationStu
     };
   },
 };