更新打包

dist/static/css/chunk-88da7c0c.a908b165.css → dist/static/css/chunk-05be1c1a.3524ae68.css

@@ -1 +1 @@
-.el-divider--horizontal[data-v-aff3d1da]{margin-top:0!important}.titleWrap[data-v-aff3d1da]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:55px}[data-v-24f87d70] .el-card__body,[data-v-c4cd305e] .el-card__body{padding-top:0!important}.titleCell[data-v-24f87d70]{display:inline-block}.tableWrap[data-v-24f87d70]{margin-top:20px}.btnList[data-v-24f87d70]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}[data-v-24a37342] .el-date-editor.el-input,[data-v-24a37342] .el-select{width:100%!important}[data-v-24a37342] .el-table .cell{display:-webkit-box;overflow:hidden;max-height:45px;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}[data-v-24a37342] .el-dialog__body{padding:10px 20px}.newBand[data-v-24a37342]{display:inline-block}[data-v-24a37342] .el-tabs__active-bar,[data-v-24a37342].el-tabs__nav-wrap:after,[data-v-24a37342] .el-tabs__nav-wrap:after{background-color:transparent!important}.marginBottom20[data-v-4e0124ea]{margin-bottom:20px}
+.el-divider--horizontal[data-v-aff3d1da]{margin-top:0!important}.titleWrap[data-v-aff3d1da]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:55px}[data-v-24f87d70] .el-card__body,[data-v-c4cd305e] .el-card__body{padding-top:0!important}.titleCell[data-v-24f87d70]{display:inline-block}.tableWrap[data-v-24f87d70]{margin-top:20px}.btnList[data-v-24f87d70]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}[data-v-cc2ec7a0] .el-date-editor.el-input,[data-v-cc2ec7a0] .el-select{width:100%!important}[data-v-cc2ec7a0] .el-table .cell{display:-webkit-box;overflow:hidden;max-height:45px;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}[data-v-cc2ec7a0] .el-dialog__body{padding:10px 20px}.newBand[data-v-cc2ec7a0]{display:inline-block}[data-v-cc2ec7a0] .el-tabs__active-bar,[data-v-cc2ec7a0].el-tabs__nav-wrap:after,[data-v-cc2ec7a0] .el-tabs__nav-wrap:after{background-color:transparent!important}.marginBottom20[data-v-4e0124ea]{margin-bottom:20px}

dist/static/css/chunk-cbf522be.9d96e104.css

@@ -1 +0,0 @@
-[data-v-07e988bc] .el-date-editor.el-input,[data-v-07e988bc] .el-select{width:100%!important}[data-v-07e988bc] .el-table .cell{display:-webkit-box;overflow:hidden;max-height:45px;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}[data-v-07e988bc] .el-dialog__body{padding:10px 20px}.newBand[data-v-07e988bc]{display:inline-block}[data-v-07e988bc] .el-tabs__active-bar,[data-v-07e988bc].el-tabs__nav-wrap:after,[data-v-07e988bc] .el-tabs__nav-wrap:after{background-color:transparent!important}

dist/static/css/chunk-d798311c.442e084d.css

@@ -0,0 +1 @@
+[data-v-c1491dc4] .el-date-editor.el-input,[data-v-c1491dc4] .el-select{width:100%!important}[data-v-c1491dc4] .el-table .cell{display:-webkit-box;overflow:hidden;max-height:45px;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}[data-v-c1491dc4] .el-dialog__body{padding:10px 20px}.newBand[data-v-c1491dc4]{display:inline-block}[data-v-c1491dc4] .el-tabs__active-bar,[data-v-c1491dc4].el-tabs__nav-wrap:after,[data-v-c1491dc4] .el-tabs__nav-wrap:after{background-color:transparent!important}

src/views/main/cloudDate/exerciseDuration.vue

@@ -9,8 +9,8 @@
       :model.sync="searchForm"
     >
       <el-form-item prop="dates">
+        <!-- @change="changeWeek" -->
         <el-date-picker
-          @change="changeWeek"
           :clearable="false"
           v-model="searchForm.dates"
           value-format="yyyy-MM-dd"
@@ -179,8 +179,8 @@ export default {
   },
   async mounted() {
     if (this.searchForm.dates?.length <= 0) {
-      this.searchForm.dates.push(getNowDateAndMonday(nowTime));
-      this.searchForm.dates.push(getNowDateAndSunday(nowTime));
+      this.searchForm.dates.push(nowTime);
+      this.searchForm.dates.push(nowTime);
     }
 
     this.getList();
@@ -247,12 +247,11 @@ export default {
       console.log(this.searchForm.dates, "this.searchForm.dates");
     },
     changeWeek(val) {
-      console.log(val, "121212");
       if (val) {
-        this.searchForm.dates = [
-          getNowDateAndMonday(val[0]),
-          getNowDateAndSunday(val[1])
-        ];
+        // this.searchForm.dates = [
+        //   getNowDateAndMonday(val[0]),
+        //   getNowDateAndSunday(val[1])
+        // ];
       } else {
         this.getDefaultTime();
       }

src/views/main/cloudDate/exerciseDurationDetail.vue

@@ -130,12 +130,21 @@
             </template>
           </el-table-column>
         </el-table>
+        <pagination
+          sync
+          :total.sync="pageInfo.total"
+          :page.sync="pageInfo.page"
+          :limit.sync="pageInfo.limit"
+          :page-sizes="pageInfo.page_size"
+          @pagination="getList"
+        />
       </div>
     </div>
   </div>
 </template>
 <script>
 import { Export } from "@/utils/downLoadFile";
+import pagination from "@/components/Pagination/index";
 import saveform from "@/components/save-form";
 import dayjs from "dayjs";
 import histogram from "v-charts/lib/histogram.common";
@@ -160,6 +169,7 @@ export const getTimes = (times, keys = []) => {
 export default {
   components: { saveform, "ve-histogram": histogram },
   name: "helpCategory",
+  components: { pagination },
   data() {
     return {
       nowIndex: dayjs(dayjs().format("YYYY-MM-DD")).valueOf(),
@@ -176,7 +186,14 @@ export default {
       },
       tableList: [],
       activeName: "first",
-      specialList: []
+      specialList: [],
+      pageInfo: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50] // 选择限制显示条数
+      }
     };
   },
   async mounted() {
@@ -266,12 +283,13 @@ export default {
           organId
         };
         const res = await cloudTeacherSumDetail({
-          page: 1,
-          rows: 10,
+          page: this.pageInfo.page,
+          rows: this.pageInfo.limit,
           ...params
         });
         this.tableList = [];
         this.tableList = res.data.rows || [];
+        this.pageInfo.total = res.data.total;
       } catch {}
     }
   }