lsc il y a 2 ans
Parent
commit
85c2266df2

+ 27 - 0
src/components/pages/CaseDesign.vue

@@ -264,6 +264,17 @@
           </template>
         </el-table-column>
       </el-table>
+      <div class="student_page">
+        <el-pagination
+          background
+          layout="prev, pager, next"
+          :page-size="pageSize"
+          :total="total"
+          v-if="page && tableData.length"
+          style="padding: 0px"
+          @current-change="handleCurrentChange"
+        ></el-pagination>
+      </div>
     </div>
     <el-dialog
       title="查看"
@@ -350,6 +361,9 @@ export default {
       dataArray: [],
       choose: "",
       search: "",
+      total: 0,
+      page: 1,
+      pageSize: 10,
     };
   },
   methods: {
@@ -370,6 +384,8 @@ export default {
       let params = {
         org: this.org,
         oid: this.oid,
+        page:this.page,
+        pageSize:this.pageSize
         // this.org
       };
       this.ajax
@@ -378,6 +394,7 @@ export default {
           this.isLoading = false;
           let _res = res.data[0];
           let _res2 = res.data[1];
+          this.total = res.data[0].length > 0 ? res.data[0][0].num : 0;
           for (var i = 0; i < _res.length; i++) {
             let taskC = 0;
             let toolC = 0;
@@ -487,6 +504,11 @@ export default {
           console.error(err);
         });
     },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.page = val;
+      this.getData();
+    },
     getAll(res) {
       this.data = res;
       let a = Object.keys(res);
@@ -643,6 +665,11 @@ export default {
 .table >>> .cell{
   padding: 0px 3px !important;
 }
+
+.student_page {
+  width: 100%;
+  margin: 20px auto;
+}
 /* .table >>> .el-table .cell, .table >>> .el-table--border td:first-child .cell, .table >>> .el-table--border th:first-child .cell{
   padding: 0 3px;
 } */

+ 28 - 2
src/components/pages/CaseDesignS.vue

@@ -251,6 +251,17 @@
           </template>
         </el-table-column>
       </el-table>
+      <div class="student_page">
+        <el-pagination
+          background
+          layout="prev, pager, next"
+          :page-size="pageSize"
+          :total="total"
+          v-if="page && tableData.length"
+          style="padding: 0px"
+          @current-change="handleCurrentChange"
+        ></el-pagination>
+      </div>
     </div>
     <el-dialog title="查看" :visible.sync="dialogVisible" :append-to-body="true" width="620px" :before-close="handleClose"
       class="dialog_diy">
@@ -323,7 +334,10 @@ export default {
       search: "",
       mode: false,
       courseTypeId: [],
-      ttype: ""
+      ttype: "",
+      total: 0,
+      page: 1,
+      pageSize: 10,
     };
   },
   methods: {
@@ -359,7 +373,9 @@ export default {
       let params = {
         org: this.org,
         oid: this.oid,
-        type: this.ttype
+        type: this.ttype,
+        page:this.page,
+        pageSize:this.pageSize
         // this.org
       };
       this.ajax
@@ -367,6 +383,7 @@ export default {
         .then((res) => {
           this.isLoading = false;
           let _res = res.data[0];
+          this.total = res.data[0].length > 0 ? res.data[0][0].num : 0;
           // let _res2 = res.data[1];
           for (var i = 0; i < _res.length; i++) {
             let taskC = 0;
@@ -509,6 +526,11 @@ export default {
           console.error(err);
         });
     },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.page = val;
+      this.getData();
+    },
     selectAllType() {
       let params = {
         org: this.org && this.org != "" ? this.org : "",
@@ -920,6 +942,10 @@ export default {
   padding: 0px 3px !important;
 }
 
+.student_page {
+  width: 100%;
+  margin: 20px auto;
+}
 /* .table >>> .el-table .cell, .table >>> .el-table--border td:first-child .cell, .table >>> .el-table--border th:first-child .cell{
   padding: 0 3px;
 } */

Fichier diff supprimé car celui-ci est trop grand
+ 330 - 633
src/components/pages/addCourse.vue


+ 4 - 2
src/components/pages/course.vue

@@ -152,7 +152,7 @@
       <el-pagination
         background
         layout="prev, pager, next"
-        :page-size="10"
+        :page-size="pageSize"
         :total="total"
         v-if="page && course.length"
         style="padding-bottom: 20px"
@@ -270,6 +270,7 @@ export default {
       JuriList: [],
       page: 1,
       total: 0,
+      pageSize: 20,
       tableData: [],
       now: "",
       courseDetail: {},
@@ -481,7 +482,8 @@ export default {
         typeE: typeE.join(","),
         cu: "",
         cn: this.courseName,
-        page: this.page
+        page: this.page,
+        pageSize: this.pageSize
       };
       this.ajax
         .get(this.$store.state.api + "selectCourseNew2", params)

+ 3 - 1
src/components/pages/scourse.vue

@@ -116,7 +116,7 @@
       </div>
     </div>
     <div class="student_page">
-      <el-pagination background layout="prev, pager, next" :page-size="10" :total="total" v-if="page && course.length"
+      <el-pagination background layout="prev, pager, next" :page-size="pageSize" :total="total" v-if="page && course.length"
         style="padding-bottom: 20px" @current-change="handleCurrentChange"></el-pagination>
     </div>
     <el-dialog :visible.sync="dialogVisible1" size="tiny">
@@ -211,6 +211,7 @@ export default {
       JuriList: [],
       page: 1,
       total: 0,
+      pageSize: 20,
       tableData: [],
       now: "",
       courseDetail: {},
@@ -443,6 +444,7 @@ export default {
         cu: "",
         cn: this.courseName,
         page: this.page,
+        pageSize: this.pageSize,
       };
       this.ajax
         .get(this.$store.state.api + "selectStudentCourseNew22", params)

+ 5 - 1
src/components/pages/student/addCourse.vue

@@ -385,7 +385,7 @@
               <div style="margin: 15px auto; padding: 0 0 0 20px">
                 <div
                   style="
-                    width: 100%%;
+                    width: 100%;
                     display: flex;
                     flex-direction: row;
                     flex-wrap: nowrap;
@@ -5684,6 +5684,10 @@ export default {
         },
       }); //选择桶
       var _this = this;
+      if(type == 3 && (file.size / 1024 / 1024) > 100){
+          _this.$message.error("上传文件大于100兆,请重新选择文件!");
+          return;
+      }
       // _this.unitJson[_this.unitIndex].chapterInfo[0].taskJson[task].toolArray[toolindex].progress = 0;
       _this.unitJson[_this.unitIndex].chapterInfo[0].taskJson[task].toolArray[
         toolindex

+ 3 - 1
src/components/pages/student/course.vue

@@ -116,7 +116,7 @@
       </div>
     </div>
     <div class="student_page">
-      <el-pagination background layout="prev, pager, next" :page-size="10" :total="total" v-if="page && course.length"
+      <el-pagination background layout="prev, pager, next" :page-size="pageSize" :total="total" v-if="page && course.length"
         style="padding-bottom: 20px" @current-change="handleCurrentChange"></el-pagination>
     </div>
     <el-dialog :visible.sync="dialogVisible1" size="tiny">
@@ -211,6 +211,7 @@ export default {
       JuriList: [],
       page: 1,
       total: 0,
+      pageSize: 20,
       tableData: [],
       now: "",
       courseDetail: {},
@@ -443,6 +444,7 @@ export default {
         cu: "",
         cn: this.courseName,
         page: this.page,
+        pageSize:this.pageSize,
       };
       this.ajax
         .get(this.$store.state.api + "selectStudentCourseNew22", params)

+ 5 - 1
src/components/tools/wangEnduit.vue

@@ -257,7 +257,11 @@ export default {
  /* ul ol 样式 */
  .cont>>>ul,
  ol {
-   margin: 10px 0 10px 20px;
+   margin: 0;
+ }
+
+ .cont>>>.w-e-droplist{
+  width: 80px !important;
  }
 
  .mask {

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff