From 467a5d789b48be974fa81a326b5129fdaa4f22f8 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 17 Feb 2023 10:37:35 +0800
Subject: [PATCH] bug

---
 .../AppExaminationManage/components/Add.vue   |  3 +-
 .../AppLearningStatistics.vue                 | 61 ++++++++++++-------
 2 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/project/qujing/app/AppExaminationManage/components/Add.vue b/project/qujing/app/AppExaminationManage/components/Add.vue
index a2efc5ca..9959cf28 100644
--- a/project/qujing/app/AppExaminationManage/components/Add.vue
+++ b/project/qujing/app/AppExaminationManage/components/Add.vue
@@ -94,7 +94,7 @@
               background
               :current-page.sync="search.current"
               :total="total"
-              :page-size="search.size"
+              :page-size.sync="search.size"
               :page-sizes="[10, 20, 50, 100]"
               layout="slot,->, prev, pager, next, sizes, jumper"
               :pager-count="7"
@@ -260,6 +260,7 @@
       },
 
       getList() {
+        console.log(this.search)
         this.instance.post(`/app/appquestionbank/list`, null, {
           params: {
             ...this.search
diff --git a/project/qujing/app/AppLearningStatistics/AppLearningStatistics.vue b/project/qujing/app/AppLearningStatistics/AppLearningStatistics.vue
index 38de601b..0d0bf77a 100644
--- a/project/qujing/app/AppLearningStatistics/AppLearningStatistics.vue
+++ b/project/qujing/app/AppLearningStatistics/AppLearningStatistics.vue
@@ -6,7 +6,7 @@
     <template slot="content">
       <ai-card title="关键数据">
         <template #right>
-          <el-radio-group v-model="search1.dateRange" size="small" @change="getStatisticsKeyData">
+          <el-radio-group v-model="search1.dateRange" size="small" @change="search1.date = [], getStatisticsKeyData()">
             <el-radio-button label="0">今天</el-radio-button>
             <el-radio-button label="1">本周</el-radio-button>
             <el-radio-button label="2">本月</el-radio-button>
@@ -15,7 +15,7 @@
             style="width: 240px"
             v-model="search1.date"
             value-format="yyyy-MM-dd"
-            @change="getStatisticsKeyData"
+            @change="search1.dateRange = '', getStatisticsKeyData()"
             type="daterange"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
@@ -28,11 +28,11 @@
               <h2>课程数量</h2>
               <div class="bottom">
                 <div class="bottom-item">
-                  <h3>2131</h3>
+                  <h3>{{ statisticsKeyData['视频课程'] }}</h3>
                   <p>视频课程</p>
                 </div>
                 <div class="bottom-item">
-                  <h3>2131</h3>
+                  <h3>{{ statisticsKeyData['图文课程'] }}</h3>
                   <p>图文课程</p>
                 </div>
               </div>
@@ -41,24 +41,36 @@
               <h2>课程学习人数</h2>
               <div class="bottom">
                 <div class="bottom-item">
-                  <h3>253000</h3>
+                  <h3>{{ statisticsKeyData['课程学习人数'] }}</h3>
                 </div>
               </div>
             </div>
             <div class="statistic-item">
-              <h2>课程累计学习时长</h2>
+              <h2>课程累积学习时长</h2>
               <div class="bottom">
                 <div class="bottom-item">
-                  <h3>2131</h3>
+                  <h3>{{ statisticsKeyData['课程累积学习时长'] || 0 }}</h3>
                 </div>
               </div>
             </div>
             <div class="statistic-item">
               <h2>考试人数</h2>
               <div class="bottom">
-                <div class="bottom-item" v-for="(item, index) in statisticsKeyData" :key="index">
-                  <h3>{{ item }}</h3>
-                  <p>{{ index }}</p>
+                <div class="bottom-item">
+                  <h3>{{ statisticsKeyData['优秀'] }}</h3>
+                  <p>优秀</p>
+                </div>
+                <div class="bottom-item">
+                  <h3>{{ statisticsKeyData['良好'] }}</h3>
+                  <p>良好</p>
+                </div>
+                <div class="bottom-item">
+                  <h3>{{ statisticsKeyData['合格'] }}</h3>
+                  <p>合格</p>
+                </div>
+                <div class="bottom-item">
+                  <h3>{{ statisticsKeyData['不合格'] }}</h3>
+                  <p>不合格</p>
                 </div>
               </div>
             </div>
@@ -66,11 +78,11 @@
               <h2>获得证书人数</h2>
               <div class="bottom">
                 <div class="bottom-item">
-                  <h3>2131</h3>
+                  <h3>{{ statisticsKeyData['学习证书人数'] }}</h3>
                   <p>学习</p>
                 </div>
                 <div class="bottom-item">
-                  <h3>2131</h3>
+                  <h3>{{ statisticsKeyData['考试证书人数'] }}</h3>
                   <p>考试</p>
                 </div>
               </div>
@@ -83,14 +95,14 @@
           <template #title>
             <div class="rank-title">
               <h2>热度榜单</h2>
-              <el-radio-group v-model="type" size="small">
+              <el-radio-group v-model="type" size="small" @change="search2.date = [], getStatisticsHot()">
                 <el-radio-button :label="0">课程</el-radio-button>
                 <el-radio-button :label="1">考试</el-radio-button>
               </el-radio-group>
             </div>
           </template>
           <template #right>
-            <el-radio-group v-model="search2.dateRange" size="small" @change="getStatisticsHot">
+            <el-radio-group v-model="search2.dateRange" size="small" @change="search2.date = [], getStatisticsHot()">
               <el-radio-button label="0" >今天</el-radio-button>
               <el-radio-button label="1">本周</el-radio-button>
               <el-radio-button label="2">本月</el-radio-button>
@@ -99,7 +111,7 @@
               style="width: 240px"
               v-model="search2.date"
               value-format="yyyy-MM-dd"
-              @change="getStatisticsHot"
+              @change="type = '', getStatisticsHot()"
               type="daterange"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
@@ -191,13 +203,13 @@
         type: 0,
         colConfigs1: [
           { type: 'index',  label: '排名', align: 'left' },
-          { prop: 'examinationName',  label: '课程', align: 'center' },
-          { prop: 'examinationNumber',  label: '学习人数', align: 'center' }
+          { prop: 'name',  label: '课程', align: 'center' },
+          { prop: 'number',  label: '学习人数', align: 'center' }
         ],
         colConfigs2: [
           { type: 'index',  label: '排名', align: 'left' },
-          { prop: 'createUserName',  label: '课程', align: 'center' },
-          { prop: 'createUserName',  label: '学习人数', align: 'center' }
+          { prop: 'name',  label: '课程', align: 'center' },
+          { prop: 'number',  label: '学习人数', align: 'center' }
         ],
         tableData1: [],
         tableData2: [],
@@ -234,11 +246,18 @@
         this.instance.post(`/app/appexaminationinfo/statisticsHot`, null, {
           params: {
             ...this.search2,
-            size: 20
+            size: 20,
+            type: this.type,
+            beginDate: this.search2.date[0],
+            endDate: this.search2.date[1]
           }
         }).then(res => {
           if (res.code == 0) {
-            this.tableData1 = res.data
+            if (this.type === 0) {
+              this.tableData1 = res.data
+            } else {
+              this.tableData2 = res.data
+            }
           }
         })
       },