From a9f97db85330cdad4a47982167cf0d7d7ec0ef41 Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Wed, 24 May 2023 21:11:26 +0800
Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B45=E6=9C=8824=E6=97=A5=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/site/common/header.vue        | 21 +++-------------
 src/views/site/tingKeZuJi/index.vue     |  2 +-
 src/views/site/tongJi/show/jrktyxk.vue  | 29 ++++++++++++++++++----
 src/views/site/tongJi/show/jrktzs.vue   | 31 ++++++++++++++++++++----
 src/views/site/tongJi/show/jrtkkts.vue  | 29 ++++++++++++++++++----
 src/views/site/tongJi/show/jrtktkrc.vue | 30 +++++++++++++++++++----
 src/views/site/tongJi/show/skz.vue      | 31 ++++++++++++++++++++----
 src/views/site/tongJi/show/ykkttkkt.vue | 32 +++++++++++++++++++++----
 src/views/site/tongJi/show/ykkttkrc.vue | 31 ++++++++++++++++++++----
 src/views/site/tongJi/show/ykktzs.vue   | 31 ++++++++++++++++++++----
 10 files changed, 208 insertions(+), 59 deletions(-)

diff --git a/src/views/site/common/header.vue b/src/views/site/common/header.vue
index c88cd4e..d4d898c 100644
--- a/src/views/site/common/header.vue
+++ b/src/views/site/common/header.vue
@@ -83,25 +83,10 @@ function toIndex(){
     },1);
   }
 
-  function toTop(toId){
+  function toTop(){
     let topNum = 0;
-    if(toId){
-      let toDom: any = document?.querySelector('#' + toId);
-
-      console.log(`🚀 ------------------------------------------------🚀`);
-      console.log(`🚀 ~ file: header.vue:91 ~ toTop ~ toDom:`, toDom);
-      console.log(`🚀 ------------------------------------------------🚀`);
-
-      topNum = toDom?.offsetTop??0;
-
-      console.log(`🚀 --------------------------------------------------🚀`);
-      console.log(`🚀 ~ file: header.vue:97 ~ toTop ~ topNum:`, topNum);
-      console.log(`🚀 --------------------------------------------------🚀`);
-
-    }else{
-      topNum = document.body.scrollTop;
-      smoothScroll(topNum);
-    }
+    topNum = document.body.scrollTop;
+    smoothScroll(topNum);
   }
 
   function toDom(toId){
diff --git a/src/views/site/tingKeZuJi/index.vue b/src/views/site/tingKeZuJi/index.vue
index 33abf2f..5f4552d 100644
--- a/src/views/site/tingKeZuJi/index.vue
+++ b/src/views/site/tingKeZuJi/index.vue
@@ -2,7 +2,7 @@
   <a-card class="rowGutter" id="tkzjDom">
     <template #title>
       <span style="font-size: 24px;font-weight: bold;">听课足迹</span>
-      <span style="margin-left: 10px;"><a href="javascript:void(0);" @click="addPingJia">新增评价</a></span>
+      <!-- <span style="margin-left: 10px;"><a href="javascript:void(0);" @click="addPingJia">新增评价</a></span> -->
     </template>
     <template #extra>
       <RouterLink target='_blank' to="/site/tingKeZuJiMore">查看更多</RouterLink>
diff --git a/src/views/site/tongJi/show/jrktyxk.vue b/src/views/site/tongJi/show/jrktyxk.vue
index 3add3bf..3569bf6 100644
--- a/src/views/site/tongJi/show/jrktyxk.vue
+++ b/src/views/site/tongJi/show/jrktyxk.vue
@@ -5,7 +5,8 @@
       size="default"
       rowKey="id"
       :columns="columns"
-      :pagination="false"
+      :pagination="ipagination"
+      @change="tableChange"
     >
     </a-table>
   </a-modal>
@@ -15,6 +16,17 @@ import { ref, defineExpose } from 'vue';
 import { defHttp } from '/@/utils/http/axios';
 import { dateUtil, formatToDate } from '/@/utils/dateUtil';
 
+  const ipagination:any = ref({
+    current: 1,
+    pageSize: 10,
+    pageSizeOptions: ['10', '20', '30'],
+    showTotal: (total, range) => {
+      return range[0] + '-' + range[1] + ' 共' + total + '条';
+    },
+    showQuickJumper: true,
+    showSizeChanger: true,
+    total: 0,
+  });
   const columns = ref([
     // {
     //   title: '',
@@ -53,7 +65,7 @@ import { dateUtil, formatToDate } from '/@/utils/dateUtil';
   const dataSource: any = ref([]);
 
   const title = ref<string>('');
-  const width = ref<number>(700);
+  const width = ref<number>(900);
   const visible = ref<boolean>(false);
   const disableSubmit = ref<boolean>(false);
   // const registerForm = ref();
@@ -62,7 +74,7 @@ import { dateUtil, formatToDate } from '/@/utils/dateUtil';
   function open(){
     console.log("打开了！");
     //打开窗口
-    title.value = '已下课';
+    title.value = '详情';
     visible.value = true;
     disableSubmit.value = true;
     loadData();
@@ -70,10 +82,17 @@ import { dateUtil, formatToDate } from '/@/utils/dateUtil';
 
   function loadData(){
     let skrq = formatToDate(new Date());
-    defHttp.get({ url: '/ktgl/kcKetangbiao/jrktyxkList', params: { skrq } }).then(res => {
-      dataSource.value = res;
+    let { current:pageNo, pageSize } = ipagination.value;
+    defHttp.get({ url: '/ktgl/kcKetangbiao/jrktyxkList', params: { skrq, pageNo, pageSize } }).then(res => {
+      dataSource.value = res.records;
+      ipagination.value.total = res.total;
     })
   }
+  function tableChange(pagination) {
+    ipagination.value.current = pagination.current;
+    ipagination.value.pageSize = pagination.pageSize;
+    loadData();
+  }
 
   /**
    * 确定按钮点击事件
diff --git a/src/views/site/tongJi/show/jrktzs.vue b/src/views/site/tongJi/show/jrktzs.vue
index e41fe2d..d37d3e6 100644
--- a/src/views/site/tongJi/show/jrktzs.vue
+++ b/src/views/site/tongJi/show/jrktzs.vue
@@ -5,7 +5,8 @@
       size="default"
       rowKey="id"
       :columns="columns"
-      :pagination="false"
+      :pagination="ipagination"
+      @change="tableChange"
     >
     </a-table>
   </a-modal>
@@ -15,6 +16,18 @@ import { ref, defineExpose } from 'vue';
 import { defHttp } from '/@/utils/http/axios';
 import { dateUtil, formatToDate } from '/@/utils/dateUtil';
 
+  const ipagination:any = ref({
+    current: 1,
+    pageSize: 10,
+    pageSizeOptions: ['10', '20', '30'],
+    showTotal: (total, range) => {
+      return range[0] + '-' + range[1] + ' 共' + total + '条';
+    },
+    showQuickJumper: true,
+    showSizeChanger: true,
+    total: 0,
+  });
+
   const columns = ref([
     // {
     //   title: '',
@@ -53,7 +66,7 @@ import { dateUtil, formatToDate } from '/@/utils/dateUtil';
   const dataSource: any = ref([]);
 
   const title = ref<string>('');
-  const width = ref<number>(700);
+  const width = ref<number>(900);
   const visible = ref<boolean>(false);
   const disableSubmit = ref<boolean>(false);
   // const registerForm = ref();
@@ -62,7 +75,7 @@ import { dateUtil, formatToDate } from '/@/utils/dateUtil';
   function open(){
     console.log("打开了！");
     //打开窗口
-    title.value = '总数';
+    title.value = '详情';
     visible.value = true;
     disableSubmit.value = true;
     loadData();
@@ -70,11 +83,19 @@ import { dateUtil, formatToDate } from '/@/utils/dateUtil';
 
   function loadData(){
     let skrq = formatToDate(new Date());
-    defHttp.get({ url: '/ktgl/kcKetangbiao/jrktzsList', params: { skrq } }).then(res => {
-      dataSource.value = res;
+    let { current:pageNo, pageSize } = ipagination.value;
+    defHttp.get({ url: '/ktgl/kcKetangbiao/jrktzsList', params: { skrq, pageNo, pageSize } }).then(res => {
+      dataSource.value = res.records;
+      ipagination.value.total = res.total;
     })
   }
 
+  function tableChange(pagination) {
+    ipagination.value.current = pagination.current;
+    ipagination.value.pageSize = pagination.pageSize;
+    loadData();
+  }
+
   /**
    * 确定按钮点击事件
    */
diff --git a/src/views/site/tongJi/show/jrtkkts.vue b/src/views/site/tongJi/show/jrtkkts.vue
index 3a3d67d..ca202f2 100644
--- a/src/views/site/tongJi/show/jrtkkts.vue
+++ b/src/views/site/tongJi/show/jrtkkts.vue
@@ -5,7 +5,8 @@
       size="default"
       rowKey="id"
       :columns="columns"
-      :pagination="false"
+      :pagination="ipagination"
+      @change="tableChange"
     >
     </a-table>
   </a-modal>
@@ -15,6 +16,17 @@ import { ref, defineExpose } from 'vue';
 import { defHttp } from '/@/utils/http/axios';
 import { dateUtil, formatToDate } from '/@/utils/dateUtil';
 
+  const ipagination:any = ref({
+    current: 1,
+    pageSize: 10,
+    pageSizeOptions: ['10', '20', '30'],
+    showTotal: (total, range) => {
+      return range[0] + '-' + range[1] + ' 共' + total + '条';
+    },
+    showQuickJumper: true,
+    showSizeChanger: true,
+    total: 0,
+  });
   const columns = ref([
     // {
     //   title: '',
@@ -53,7 +65,7 @@ import { dateUtil, formatToDate } from '/@/utils/dateUtil';
   const dataSource: any = ref([]);
 
   const title = ref<string>('');
-  const width = ref<number>(700);
+  const width = ref<number>(900);
   const visible = ref<boolean>(false);
   const disableSubmit = ref<boolean>(false);
   // const registerForm = ref();
@@ -62,7 +74,7 @@ import { dateUtil, formatToDate } from '/@/utils/dateUtil';
   function open(){
     console.log("打开了！");
     //打开窗口
-    title.value = '今日课堂';
+    title.value = '详情';
     visible.value = true;
     disableSubmit.value = true;
     loadData();
@@ -70,10 +82,17 @@ import { dateUtil, formatToDate } from '/@/utils/dateUtil';
 
   function loadData(){
     let skrq = formatToDate(new Date());
-    defHttp.get({ url: '/ktgl/kcKetangbiao/jrtkktsList', params: { skrq } }).then(res => {
-      dataSource.value = res;
+    let { current:pageNo, pageSize } = ipagination.value;
+    defHttp.get({ url: '/ktgl/kcKetangbiao/jrtkktsList', params: { skrq, pageNo, pageSize } }).then(res => {
+      dataSource.value = res.records;
+      ipagination.value.total = res.total;
     })
   }
+  function tableChange(pagination) {
+    ipagination.value.current = pagination.current;
+    ipagination.value.pageSize = pagination.pageSize;
+    loadData();
+  }
 
   /**
    * 确定按钮点击事件
diff --git a/src/views/site/tongJi/show/jrtktkrc.vue b/src/views/site/tongJi/show/jrtktkrc.vue
index 38cdb7a..99e4b53 100644
--- a/src/views/site/tongJi/show/jrtktkrc.vue
+++ b/src/views/site/tongJi/show/jrtktkrc.vue
@@ -5,7 +5,8 @@
       size="default"
       rowKey="id"
       :columns="columns"
-      :pagination="false"
+      :pagination="ipagination"
+      @change="tableChange"
     >
     </a-table>
   </a-modal>
@@ -15,6 +16,18 @@ import { ref, defineExpose } from 'vue';
 import { defHttp } from '/@/utils/http/axios';
 import { dateUtil, formatToDate } from '/@/utils/dateUtil';
 
+  const ipagination:any = ref({
+    current: 1,
+    pageSize: 10,
+    pageSizeOptions: ['10', '20', '30'],
+    showTotal: (total, range) => {
+      return range[0] + '-' + range[1] + ' 共' + total + '条';
+    },
+    showQuickJumper: true,
+    showSizeChanger: true,
+    total: 0,
+  });
+
   const columns = ref([
     // {
     //   title: '',
@@ -53,7 +66,7 @@ import { dateUtil, formatToDate } from '/@/utils/dateUtil';
   const dataSource: any = ref([]);
 
   const title = ref<string>('');
-  const width = ref<number>(700);
+  const width = ref<number>(900);
   const visible = ref<boolean>(false);
   const disableSubmit = ref<boolean>(false);
   // const registerForm = ref();
@@ -62,7 +75,7 @@ import { dateUtil, formatToDate } from '/@/utils/dateUtil';
   function open(){
     console.log("打开了！");
     //打开窗口
-    title.value = '今日课堂';
+    title.value = '详情';
     visible.value = true;
     disableSubmit.value = true;
     loadData();
@@ -70,10 +83,17 @@ import { dateUtil, formatToDate } from '/@/utils/dateUtil';
 
   function loadData(){
     let skrq = formatToDate(new Date());
-    defHttp.get({ url: '/ktgl/kcKetangbiao/jrtktkrcList', params: { skrq } }).then(res => {
-      dataSource.value = res;
+    let { current:pageNo, pageSize } = ipagination.value;
+    defHttp.get({ url: '/ktgl/kcKetangbiao/jrtktkrcList', params: { skrq, pageNo, pageSize } }).then(res => {
+      dataSource.value = res.records;
+      ipagination.value.total = res.total;
     })
   }
+  function tableChange(pagination) {
+    ipagination.value.current = pagination.current;
+    ipagination.value.pageSize = pagination.pageSize;
+    loadData();
+  }
 
   /**
    * 确定按钮点击事件
diff --git a/src/views/site/tongJi/show/skz.vue b/src/views/site/tongJi/show/skz.vue
index f30e9f0..770797f 100644
--- a/src/views/site/tongJi/show/skz.vue
+++ b/src/views/site/tongJi/show/skz.vue
@@ -5,7 +5,8 @@
       size="default"
       rowKey="id"
       :columns="columns"
-      :pagination="false"
+      :pagination="ipagination"
+      @change="tableChange"
     >
     </a-table>
   </a-modal>
@@ -15,6 +16,19 @@ import { ref, defineExpose } from 'vue';
 import { defHttp } from '/@/utils/http/axios';
 import { dateUtil, formatToDate } from '/@/utils/dateUtil';
 
+  const ipagination:any = ref({
+    current: 1,
+    pageSize: 10,
+    pageSizeOptions: ['10', '20', '30'],
+    showTotal: (total, range) => {
+      return range[0] + '-' + range[1] + ' 共' + total + '条';
+    },
+    showQuickJumper: true,
+    showSizeChanger: true,
+    total: 0,
+  });
+
+
   const columns = ref([
     // {
     //   title: '',
@@ -53,7 +67,7 @@ import { dateUtil, formatToDate } from '/@/utils/dateUtil';
   const dataSource: any = ref([]);
 
   const title = ref<string>('');
-  const width = ref<number>(700);
+  const width = ref<number>(900);
   const visible = ref<boolean>(false);
   const disableSubmit = ref<boolean>(false);
   // const registerForm = ref();
@@ -62,7 +76,7 @@ import { dateUtil, formatToDate } from '/@/utils/dateUtil';
   function open(){
     console.log("打开了！");
     //打开窗口
-    title.value = '今日课堂';
+    title.value = '详情';
     visible.value = true;
     disableSubmit.value = true;
     loadData();
@@ -70,10 +84,17 @@ import { dateUtil, formatToDate } from '/@/utils/dateUtil';
 
   function loadData(){
     let skrq = formatToDate(new Date());
-    defHttp.get({ url: '/ktgl/kcKetangbiao/skzList', params: { skrq } }).then(res => {
-      dataSource.value = res;
+    let { current:pageNo, pageSize } = ipagination.value;
+    defHttp.get({ url: '/ktgl/kcKetangbiao/skzList', params: { skrq, pageNo, pageSize } }).then(res => {
+      dataSource.value = res.records;
+      ipagination.value.total = res.total;
     })
   }
+  function tableChange(pagination) {
+    ipagination.value.current = pagination.current;
+    ipagination.value.pageSize = pagination.pageSize;
+    loadData();
+  }
 
   /**
    * 确定按钮点击事件
diff --git a/src/views/site/tongJi/show/ykkttkkt.vue b/src/views/site/tongJi/show/ykkttkkt.vue
index 33382e7..176c2ad 100644
--- a/src/views/site/tongJi/show/ykkttkkt.vue
+++ b/src/views/site/tongJi/show/ykkttkkt.vue
@@ -5,7 +5,8 @@
       size="default"
       rowKey="id"
       :columns="columns"
-      :pagination="false"
+      :pagination="ipagination"
+      @change="tableChange"
     >
     </a-table>
   </a-modal>
@@ -15,6 +16,20 @@ import { ref, defineExpose } from 'vue';
 import { defHttp } from '/@/utils/http/axios';
 import { dateUtil, formatToDate } from '/@/utils/dateUtil';
 
+
+  const ipagination:any = ref({
+    current: 1,
+    pageSize: 10,
+    pageSizeOptions: ['10', '20', '30'],
+    showTotal: (total, range) => {
+      return range[0] + '-' + range[1] + ' 共' + total + '条';
+    },
+    showQuickJumper: true,
+    showSizeChanger: true,
+    total: 0,
+  });
+
+
   const columns = ref([
     // {
     //   title: '',
@@ -53,7 +68,7 @@ import { dateUtil, formatToDate } from '/@/utils/dateUtil';
   const dataSource: any = ref([]);
 
   const title = ref<string>('');
-  const width = ref<number>(700);
+  const width = ref<number>(900);
   const visible = ref<boolean>(false);
   const disableSubmit = ref<boolean>(false);
   // const registerForm = ref();
@@ -62,7 +77,7 @@ import { dateUtil, formatToDate } from '/@/utils/dateUtil';
   function open(){
     console.log("打开了！");
     //打开窗口
-    title.value = '今日课堂';
+    title.value = '详情';
     visible.value = true;
     disableSubmit.value = true;
     loadData();
@@ -70,10 +85,17 @@ import { dateUtil, formatToDate } from '/@/utils/dateUtil';
 
   function loadData(){
     let skrq = formatToDate(new Date());
-    defHttp.get({ url: '/ktgl/kcKetangbiao/ykkttkktList', params: { skrq } }).then(res => {
-      dataSource.value = res;
+    let { current:pageNo, pageSize } = ipagination.value;
+    defHttp.get({ url: '/ktgl/kcKetangbiao/ykkttkktList', params: { skrq, pageNo, pageSize } }).then(res => {
+      dataSource.value = res.records;
+      ipagination.value.total = res.total;
     })
   }
+  function tableChange(pagination) {
+    ipagination.value.current = pagination.current;
+    ipagination.value.pageSize = pagination.pageSize;
+    loadData();
+  }
 
   /**
    * 确定按钮点击事件
diff --git a/src/views/site/tongJi/show/ykkttkrc.vue b/src/views/site/tongJi/show/ykkttkrc.vue
index f9fb416..1c423bb 100644
--- a/src/views/site/tongJi/show/ykkttkrc.vue
+++ b/src/views/site/tongJi/show/ykkttkrc.vue
@@ -5,7 +5,8 @@
       size="default"
       rowKey="id"
       :columns="columns"
-      :pagination="false"
+      :pagination="ipagination"
+      @change="tableChange"
     >
     </a-table>
   </a-modal>
@@ -15,6 +16,19 @@ import { ref, defineExpose } from 'vue';
 import { defHttp } from '/@/utils/http/axios';
 import { dateUtil, formatToDate } from '/@/utils/dateUtil';
 
+
+  const ipagination:any = ref({
+    current: 1,
+    pageSize: 10,
+    pageSizeOptions: ['10', '20', '30'],
+    showTotal: (total, range) => {
+      return range[0] + '-' + range[1] + ' 共' + total + '条';
+    },
+    showQuickJumper: true,
+    showSizeChanger: true,
+    total: 0,
+  });
+
   const columns = ref([
     // {
     //   title: '',
@@ -53,7 +67,7 @@ import { dateUtil, formatToDate } from '/@/utils/dateUtil';
   const dataSource: any = ref([]);
 
   const title = ref<string>('');
-  const width = ref<number>(700);
+  const width = ref<number>(900);
   const visible = ref<boolean>(false);
   const disableSubmit = ref<boolean>(false);
   // const registerForm = ref();
@@ -62,7 +76,7 @@ import { dateUtil, formatToDate } from '/@/utils/dateUtil';
   function open(){
     console.log("打开了！");
     //打开窗口
-    title.value = '今日课堂';
+    title.value = '详情';
     visible.value = true;
     disableSubmit.value = true;
     loadData();
@@ -70,10 +84,17 @@ import { dateUtil, formatToDate } from '/@/utils/dateUtil';
 
   function loadData(){
     let skrq = formatToDate(new Date());
-    defHttp.get({ url: '/ktgl/kcKetangbiao/ykkttkrcList', params: { skrq } }).then(res => {
-      dataSource.value = res;
+    let { current:pageNo, pageSize } = ipagination.value;
+    defHttp.get({ url: '/ktgl/kcKetangbiao/ykkttkrcList', params: { skrq, pageNo, pageSize } }).then(res => {
+      dataSource.value = res.records;
+      ipagination.value.total = res.total;
     })
   }
+  function tableChange(pagination) {
+    ipagination.value.current = pagination.current;
+    ipagination.value.pageSize = pagination.pageSize;
+    loadData();
+  }
 
   /**
    * 确定按钮点击事件
diff --git a/src/views/site/tongJi/show/ykktzs.vue b/src/views/site/tongJi/show/ykktzs.vue
index 4efd008..1c59bdd 100644
--- a/src/views/site/tongJi/show/ykktzs.vue
+++ b/src/views/site/tongJi/show/ykktzs.vue
@@ -5,7 +5,8 @@
       size="default"
       rowKey="id"
       :columns="columns"
-      :pagination="false"
+      :pagination="ipagination"
+      @change="tableChange"
     >
     </a-table>
   </a-modal>
@@ -15,6 +16,19 @@ import { ref, defineExpose } from 'vue';
 import { defHttp } from '/@/utils/http/axios';
 import { dateUtil, formatToDate } from '/@/utils/dateUtil';
 
+
+  const ipagination:any = ref({
+    current: 1,
+    pageSize: 10,
+    pageSizeOptions: ['10', '20', '30'],
+    showTotal: (total, range) => {
+      return range[0] + '-' + range[1] + ' 共' + total + '条';
+    },
+    showQuickJumper: true,
+    showSizeChanger: true,
+    total: 0,
+  });
+
   const columns = ref([
     // {
     //   title: '',
@@ -53,7 +67,7 @@ import { dateUtil, formatToDate } from '/@/utils/dateUtil';
   const dataSource: any = ref([]);
 
   const title = ref<string>('');
-  const width = ref<number>(700);
+  const width = ref<number>(900);
   const visible = ref<boolean>(false);
   const disableSubmit = ref<boolean>(false);
   // const registerForm = ref();
@@ -62,7 +76,7 @@ import { dateUtil, formatToDate } from '/@/utils/dateUtil';
   function open(){
     console.log("打开了！");
     //打开窗口
-    title.value = '今日课堂';
+    title.value = '详情';
     visible.value = true;
     disableSubmit.value = true;
     loadData();
@@ -70,10 +84,17 @@ import { dateUtil, formatToDate } from '/@/utils/dateUtil';
 
   function loadData(){
     let skrq = formatToDate(new Date());
-    defHttp.get({ url: '/ktgl/kcKetangbiao/ykktzsList', params: { skrq,  } }).then(res => {
-      dataSource.value = res;
+    let { current:pageNo, pageSize } = ipagination.value;
+    defHttp.get({ url: '/ktgl/kcKetangbiao/ykktzsList', params: { skrq, pageNo, pageSize } }).then(res => {
+      dataSource.value = res.records;
+      ipagination.value.total = res.total;
     })
   }
+  function tableChange(pagination) {
+    ipagination.value.current = pagination.current;
+    ipagination.value.pageSize = pagination.pageSize;
+    loadData();
+  }
 
   /**
    * 确定按钮点击事件