Home Explore Help
Sign In
CocoRoboLabs
/
pbl-teacher-table
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'beta'

SanHQin 2 weeks ago
parent
f4203eab7a 6e0d097a4a
commit
a2c17c7b24
9 changed files with 68 additions and 25 deletions
Split View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.ac2dd04301665f257012132647d79809.css
  3. 0 0
      dist/static/css/app.ac2dd04301665f257012132647d79809.css.map
  4. 0 0
      dist/static/js/app.8b910998b37e9b2d4833.js
  5. 0 0
      dist/static/js/app.8b910998b37e9b2d4833.js.map
  6. 0 0
      dist/static/js/manifest.23ea04dc469b57e2b4f8.js.map
  7. 0 0
      dist/static/js/workPage-manifest.2ece51fa34be51c8610a.js.map
  8. 37 1
      src/components/pages/course.vue
  9. 30 23
      src/components/pages/studentManageNew/component/table.vue

+ 1 - 1
dist/index.html
View File 

@@ -37,7 +37,7 @@
 
       width: 100%;
 
       background: #e6eaf0;
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.2cfe0f1171a32618d1f61aac741acdca.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.23ea04dc469b57e2b4f8.js></script><script type=text/javascript src=./static/js/vendor.714ff2bfc93f2f096b79.js></script><script type=text/javascript src=./static/js/app.5bdade4d380c24b10e7d.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.ac2dd04301665f257012132647d79809.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.23ea04dc469b57e2b4f8.js></script><script type=text/javascript src=./static/js/vendor.714ff2bfc93f2f096b79.js></script><script type=text/javascript src=./static/js/app.8b910998b37e9b2d4833.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.ac2dd04301665f257012132647d79809.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.ac2dd04301665f257012132647d79809.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.8b910998b37e9b2d4833.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.8b910998b37e9b2d4833.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.23ea04dc469b57e2b4f8.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/workPage-manifest.2ece51fa34be51c8610a.js.map


+ 37 - 1
src/components/pages/course.vue
View File 

@@ -6,7 +6,7 @@
 
 
     <backPage style="padding: 30px 0 0;" v-if="gotype" tit="课程管理"></backPage>
 
 
-    <div style="width:100%;padding:0 21px;background:#fff;border-radius: 5px;box-sizing: border-box;">
 
+    <div style="width:100%;padding:0 21px;background:#fff;border-radius: 5px;box-sizing: border-box;"  v-if="oid !== '3d2d45b1-703b-11f1-9985-005056924926'">
 
       <div class="pb_head top">
 
         <div v-if="!gotype" style="
 
     display: flex;
 
@@ -1271,6 +1271,37 @@ export default {
 
           console.error(err);
 
         });
 
     },
 
+    getCourse2() {
 
+      console.log("typea", this.typea);
 
+      // this.isLoading = true;
 
+      let params = {
 
+        type: this.groupA,
 
+        uid: this.userid,
 
+        oid: this.oid,
 
+        org: this.org,
 
+        typea: this.typea != undefined ? this.typea : "",
 
+        typeb: this.typeb != undefined ? this.typeb : "",
 
+        typec: "",
 
+        typed: this.typed != undefined ? this.typed : "",
 
+        typeE: this.typeE.join(","),
 
+        cu: "",
 
+        cn: this.courseName,
 
+        page: this.page,
 
+        pageSize: this.pageSize,
 
+      };
 
+      this.ajax
 
+        .get(this.$store.state.api + "selectCourseNew2", params)
 
+        .then((res) => {
 
+          // this.loading.close();
 
+          // this.loading = "";
 
+          // this.isLoading = false;
 
+          this.total = res.data[0].length > 0 ? res.data[0][0].num : 0;
 
+          this.course = res.data[0];
 
+        })
 
+        .catch((err) => {
 
+          console.error(err);
 
+        });
 
+    },
 
     getTypeName() {
 
       this.$forceUpdate();
 
       this.page = 1;
 
@@ -1607,6 +1638,11 @@ export default {
 
     window.setCourseUrl = function(){
 
       _this.courseUrl = ''
 
     }
 
+    if(this.org && this.org == '3d2d45b1-703b-11f1-9985-005056924926'){
 
+      setInterval(() => {
 
+        this.getCourse2()
 
+      }, 10000);
 
+    }
 
   }
 
 };
 
 </script>

+ 30 - 23
src/components/pages/studentManageNew/component/table.vue
View File 

@@ -196,7 +196,7 @@
 
       >
 
         <el-table-column
 
           type="selection"
 
-          v-if="boxType == 0 || (boxType == 1 && interestType == 1)"
 
+          v-if="boxType == 0 || (boxType == 1 && interestType == 1) || boxType == 2"
 
           width="55px"
 
         >
 
         </el-table-column>
 
@@ -322,26 +322,11 @@
 
           </template>
 
         </el-table-column>
 
       </el-table>
 
-      <div
 
-        class="page_box"
 
-        v-if="boxType == 2 || (boxType == 1 && interestType == 0)"
 
-      >
 
-        <el-pagination
 
-          background
 
-          @size-change="handleSizeChange"
 
-          @current-change="handlePageChange"
 
-          :current-page.sync="page"
 
-          :page-sizes="[10, 15, 20, 25]"
 
-          :page-size="pageSize"
 
-          layout="sizes, prev, pager, next"
 
-          :total="total"
 
-        >
 
-        </el-pagination>
 
-      </div>
 
+
 
       <div
 
         class="page_box"
 
         v-if="
 
-          (boxType == 0 || (boxType == 1 && interestType == 1)) &&
 
+          (boxType == 0 || (boxType == 1 && interestType == 1) || boxType == 2) &&
 
             selectedData.length
 
         "
 
       >
 
@@ -357,7 +342,7 @@
 
               @click="cancelAllSelection"
 
               v-if="
 
                 selectedData.length != 0 &&
 
-                  selectedData.length == tableData.length
 
+                (selectedData.length == tableData.length || selectedData.length == allTableData.length)
 
               "
 
             >
 
               {{ lang.ssCancelSelAll }}
 
@@ -370,7 +355,7 @@
 
           <div
 
             @click="deleteSelectionStudent"
 
             class="action_btn"
 
-            v-if="boxType == 0"
 
+            v-if="boxType == 0 || boxType == 2"
 
             style="background: #ff4d4f; color: #fff"
 
           >
 
             {{ lang.Delete }}
 
@@ -386,6 +371,22 @@
 
           </div>
 
         </div>
 
       </div>
 
+      <div
 
+        class="page_box"
 
+        v-if="boxType == 2 || (boxType == 1 && interestType == 0)"
 
+      >
 
+        <el-pagination
 
+          background
 
+          @size-change="handleSizeChange"
 
+          @current-change="handlePageChange"
 
+          :current-page.sync="page"
 
+          :page-sizes="[10, 15, 20, 25]"
 
+          :page-size="pageSize"
 
+          layout="sizes, prev, pager, next"
 
+          :total="total"
 
+        >
 
+        </el-pagination>
 
+      </div>
 
     </div>
 
 
     <!-- 添加兴趣班弹框 -->
 
@@ -899,9 +900,15 @@ export default {
 
     },
 
     // 全选
 
     allSel() {
 
-      this.tableData.forEach(row => {
 
-        this.$refs.tableData.toggleRowSelection(row, true);
 
-      });
 
+      if(this.boxType == 2) {
 
+        this.allTableData.forEach(row => {
 
+          this.$refs.tableData.toggleRowSelection(row, true);
 
+        });
 
+      } else {
 
+        this.tableData.forEach(row => {
 
+          this.$refs.tableData.toggleRowSelection(row, true);
 
+        });
 
+      }
 
     },
 
     // 导出学生
 
     exportStudent() {

Some files were not shown because too many files changed in this diff