feat:合并

src/views/projectcenter/TaskPage.vue

@@ -963,6 +963,7 @@
                     <div class="right">
                       <a-select
                         v-model:value="valuestu4"
+                        @change="xsSelectChange"
                         style="width: 80px"
                         :options="rankxueshi"
                       ></a-select>
@@ -973,7 +974,7 @@
                   <a-table
                     :columns="xueshitablecolumns"
                     :data-source="xueshitabledata"
-                    :loading="tableDataTotal === -1 ? true : false"
+                    :loading="studytimeRankLoading"
                     expandRowByClick="true"
                     :scroll="{ y: 330 }"
                     @expand="expandTable"
@@ -2325,10 +2326,10 @@ export default {
       valuestu3: 0,
       //学时排行
       rankxueshi: [
-        { value: "学员", label: "学员" },
-        { value: "小组", label: "小组" },
+        { value: 0, label: "学员" },
+        { value: 1, label: "小组" },
       ],
-      valuestu4: "学员",
+      valuestu4: 0,
       visible: false, //时间管理
       onlineVisible: false, //在线管理
       FaceVisivle: false, //面授管理
@@ -2531,83 +2532,32 @@ export default {
         },
       ],
       //学时排行表
-      xueshitabledata: [
-        {
-          rank: "1",
-          name: "哈哈",
-          jd: "8",
-        },
-
-        {
-          rank: "2",
-          name: "哈哈",
-          jd: "70",
-        },
-        {
-          rank: "3",
-          name: "哈哈",
-          jd: "70",
-        },
-        {
-          rank: "4",
-          name: "哈哈",
-          jd: "70",
-        },
-        {
-          rank: "5",
-          name: "哈哈",
-          jd: "70",
-        },
-        {
-          rank: "6",
-          name: "哈哈",
-          jd: "70",
-        },
-        {
-          rank: "7",
-          name: "哈哈",
-          jd: "70",
-        },
-        {
-          rank: "8",
-          name: "哈哈",
-          jd: "70",
-        },
-        {
-          rank: "9",
-          name: "哈哈",
-          jd: "70",
-        },
-        {
-          rank: "10",
-          name: "哈哈",
-          jd: "70",
-        },
-      ],
+      studytimeRankLoading:true,
+      xueshitabledata: [],
       xueshitablecolumns: [
         {
           title: "排名",
-          dataIndex: "rank",
-          key: "rank",
+          dataIndex: "index",
+          key: "index",
           width: 50,
           align: "center",
           className: "h",
           customRender: (text) => {
-            if (text.record.rank == "1") {
+            if (text.record.index == "1") {
               return (
                 <img
                   style={{ width: 24, height: 24 }}
                   src={require("../../assets/images/taskpage/one.png")}
                 />
               );
-            } else if (text.record.rank == "2") {
+            } else if (text.record.index == "2") {
               return (
                 <img
                   style={{ width: 24, height: 24 }}
                   src={require("../../assets/images/taskpage/two.png")}
                 />
               );
-            } else if (text.record.rank == "3") {
+            } else if (text.record.index == "3") {
               return (
                 <img
                   style={{ width: 24, height: 24 }}
@@ -2615,7 +2565,7 @@ export default {
                 />
               );
             } else {
-              return <div>{text.record.rank}</div>;
+              return <div>{text.record.index}</div>;
             }
           },
         },
@@ -2630,8 +2580,8 @@ export default {
 
         {
           title: "时长",
-          dataIndex: "jd",
-          key: "jd",
+          dataIndex: "timeStr",
+          key: "timeStr",
           width: 50,
           align: "center",
           className: "h",
@@ -2811,7 +2761,11 @@ export default {
     const jdSelectChange1 = (e) => {
       console.log(e);
       completionRank();
-    };
+    }
+    const xsSelectChange = (e) => {
+      console.log(e)
+      studytimeRank();
+    }
     //项目积分榜单
     const scoreRank = (period, type) => {
       state.scoreRankLoading = true;
@@ -2827,7 +2781,7 @@ export default {
         type: Number(state.valuestu3), // 查询类型 0 学员积分榜 1 小组积分榜
       });
       let obj = {
-        projectId: 290, // 项目id
+        projectId: state.projectId, // 项目id
         name: "", // 名字，没有则传空字符串
         startTime: state.rankStartTime ? state.rankStartTime : 0, // 数据查询的起始时间 10位时间戳
         endTime: state.rankEndTime ? state.rankEndTime : 0,
@@ -2866,9 +2820,9 @@ export default {
     const completionRank = () => {
       state.processRankLoading = true;
       let obj = {
-        projectId: 290, // 项目id
-        startTime: state.rankStartTime ? state.rankStartTime : 0, // 数据查询的起始时间 10位时间戳
-        endTime: state.rankEndTime ? state.rankEndTime : 0,
+        projectId: state.projectId, // 项目id
+        startTime: state.rankStartTime?state.rankStartTime:0,  // 数据查询的起始时间 10位时间戳
+        endTime: state.rankEndTime?state.rankEndTime:0,
         stageId: state.valuestu2, // 阶段ID
         type: Number(state.valuestu3), // 查询类型 0 学员积分榜 1 小组积分榜
       };
@@ -2893,6 +2847,34 @@ export default {
         });
     };
 
+    // 项目学时榜单
+    const studytimeRank = () => {
+      state.studytimeRankLoading = true;
+      let obj = {
+        projectId: state.projectId, // 项目id
+        startTime: state.rankStartTime?state.rankStartTime:0,  // 数据查询的起始时间 10位时间戳
+        endTime: state.rankEndTime?state.rankEndTime:0,
+        type: Number(state.valuestu4), // 查询类型 0 学员积分榜 1 小组积分榜
+      }
+
+      console.log('我是获取得项目学时排行榜--》', obj)
+      api.studytimeRank(obj).then(res=>{
+        console.log('项目学时榜单获取',res)
+        if(res.data.datas){
+          state.xueshitabledata = res.data.datas;
+          state.studytimeRankLoading = false;
+        }else{
+          state.xueshitabledata = [];
+          state.studytimeRankLoading = false;
+        }
+        
+      }).catch(err=>{
+        console.log(err)
+        state.xueshitabledata = [];
+        state.studytimeRankLoading = false;
+      })
+    }
+
     // 排行榜 - end
 
     const levelList = reactive({
@@ -3644,6 +3626,9 @@ export default {
         scoreRank();
         // 获取项目进度排行榜
         completionRank();
+        // 获取学时排行榜
+        studytimeRank();
+
       } else if (e == 3) {
         state.tabFlag = true;
       } else {
@@ -3700,6 +3685,8 @@ export default {
       scoreRank();
       // 获取项目进度排行榜
       completionRank();
+      // 获取学时排行榜
+      studytimeRank();
     };
     //重置
     const rankReset = () => {
@@ -3712,6 +3699,8 @@ export default {
       scoreRank();
       // 获取项目进度排行榜
       completionRank();
+      // 获取学时排行榜
+      studytimeRank();
     };
 
     // end -----排行榜----------------排行榜----------------------排行榜-----------排行榜----------
@@ -5028,6 +5017,10 @@ export default {
       completionRank,
       jdSelectChange,
       jdSelectChange1,
+
+      studytimeRank,
+      xsSelectChange
+
     };
   },
 };