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' of https://git.cocorobo.cn/CocoRoboLabs/pbl-teacher-table into beta

lsc 1 year ago
parent
9b40a4622f 9a10a9e7dd
commit
4e7c14c771
16 changed files with 24 additions and 19 deletions
Split View Show Diff Stats
  1. 4 0
      dist/index.html
  2. 1 0
      dist/static/css/app.00165a60bfb135e8cc880a8c98438bde.css
  3. 1 0
      dist/static/css/app.8db61530cac78e086e080ad56f8b3372.css
  4. 0 0
      dist/static/css/app.8db61530cac78e086e080ad56f8b3372.css.map
  5. 0 0
      dist/static/js/0.7bd37c6227e5d67b75fe.js
  6. 0 0
      dist/static/js/0.7bd37c6227e5d67b75fe.js.map
  7. 0 0
      dist/static/js/0.7da288988865a9378b49.js.map
  8. 0 0
      dist/static/js/app.3f3740c7f5a6a97877e4.js.map
  9. 0 0
      dist/static/js/app.a8d9b67ee56036db82da.js
  10. 1 0
      dist/static/js/app.a8d9b67ee56036db82da.js.map
  11. 0 2
      dist/static/js/manifest.3512a67a6213c2df4180.js
  12. 0 0
      dist/static/js/manifest.3512a67a6213c2df4180.js.map
  13. 2 0
      dist/static/js/manifest.4ae2783fdfe7ab52e4d5.js
  14. 1 0
      dist/static/js/manifest.4ae2783fdfe7ab52e4d5.js.map
  15. 2 1
      src/components/pages/student/addCourse.vue
  16. 12 16
      src/components/pages/synergyCourse/group/group.vue

+ 4 - 0
dist/index.html
View File 

@@ -25,7 +25,11 @@
 
       height: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
+<<<<<<< HEAD
 
     }</style><link href=./static/css/app.00165a60bfb135e8cc880a8c98438bde.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.b01159b52abeac4e6216.js></script><script type=text/javascript src=./static/js/app.3f3740c7f5a6a97877e4.js></script></body></html><script>function stopSafari() {
 
+=======
 
+    }</style><link href=./static/css/app.8db61530cac78e086e080ad56f8b3372.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.4ae2783fdfe7ab52e4d5.js></script><script type=text/javascript src=./static/js/vendor.b01159b52abeac4e6216.js></script><script type=text/javascript src=./static/js/app.a8d9b67ee56036db82da.js></script></body></html><script>function stopSafari() {
 
+>>>>>>> 9a10a9e7ddf706d1d99f6451cdd3e8ff83456774
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

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


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


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


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/0.7bd37c6227e5d67b75fe.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/0.7bd37c6227e5d67b75fe.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/0.7da288988865a9378b49.js.map


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


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


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


+ 0 - 2
dist/static/js/manifest.3512a67a6213c2df4180.js
View File 

@@ -1,2 +0,0 @@
 
-!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var i,u,f,s=0,l=[];s<r.length;s++)u=r[s],t[u]&&l.push(t[u][0]),t[u]=0;for(i in a)Object.prototype.hasOwnProperty.call(a,i)&&(e[i]=a[i]);for(n&&n(r,a,c);l.length;)l.shift()();if(c)for(s=0;s<c.length;s++)f=o(o.s=c[s]);return f};var r={},t={4:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+e+"."+{0:"7da288988865a9378b49",1:"994623639438b244a74c"}[e]+".js";var i=setTimeout(u,12e4);function u(){c.onerror=c.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=u,a.appendChild(c),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
 
-//# sourceMappingURL=manifest.3512a67a6213c2df4180.js.map

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


+ 2 - 0
dist/static/js/manifest.4ae2783fdfe7ab52e4d5.js
View File 

@@ -0,0 +1,2 @@
 
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var i,u,f,s=0,l=[];s<r.length;s++)u=r[s],t[u]&&l.push(t[u][0]),t[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(n&&n(r,c,a);l.length;)l.shift()();if(a)for(s=0;s<a.length;s++)f=o(o.s=a[s]);return f};var r={},t={4:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"7bd37c6227e5d67b75fe",1:"994623639438b244a74c"}[e]+".js";var i=setTimeout(u,12e4);function u(){a.onerror=a.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=u,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
 
+//# sourceMappingURL=manifest.4ae2783fdfe7ab52e4d5.js.map

File diff suppressed because it is too large
+ 1 - 0
dist/static/js/manifest.4ae2783fdfe7ab52e4d5.js.map


+ 2 - 1
src/components/pages/student/addCourse.vue
View File 

@@ -38,6 +38,7 @@
 
                 </div>
 
               </div>
 
             </div>
 
+            
             <div v-if="steps == 3" class="third" @click="navSteps(3)">
 
               <div class="cfirst">
 
                 <div>
 
@@ -2955,7 +2956,7 @@ export default {
 
   },
 
   watch: {
 
     steps(newValue, oldValue) {
 
-      if (newValue == 4) {
 
+      if ( newValue == 4 ) {
 
         let chapters = this.unitJson;
 
         let gjson = {
 
           rootId: "pid",

+ 12 - 16
src/components/pages/synergyCourse/group/group.vue
View File 

@@ -304,7 +304,11 @@
 
                     </div>
 
                     <div class="batch_add_group">
 
                         <span>批量添加小组：</span>
 
-                        <el-input-number v-model="addGroupNum" @change="handleAddGroupNumChange" label="批量添加小组"></el-input-number>
 
+                        <el-input-number v-model="addGroupNum" 
+                        :min="0"
 
+                        label="批量添加小组"></el-input-number>
 
+                        <el-button style="margin-left:5px" type="primary" size="small" @click="handleAddGroupNumChange()">
 
+                                批量添加</el-button>
 
                     </div>
 
                 </div>
 
                 <div class="groupContent">
 
@@ -454,21 +458,13 @@ export default {
 
         }
 
     },
 
     methods: {
 
-        handleAddGroupNumChange(currentValue, oldValue){
 
-            let num = currentValue-oldValue;
 
-            if(num>0){
 
-                for(let i=0;i<num;i++){
 
-                    this.groupJson2.group.push({
 
-                        name: "第" + (this.groupJson2.group.length + 1) + "组",
 
-                        id: this.guid()
 
-                    });
 
-                }
 
-            }else{
 
-                num=Math.abs(num);
 
-                for(let i=0;i<num;i++){
 
-                    this.groupJson2.group.pop();
 
-                }
 
-            }
 
+        handleAddGroupNumChange(){
 
+            for(let i=0;i<this.addGroupNum;i++){
 
+                this.groupJson2.group.push({
 
+                    name: "第" + (this.groupJson2.group.length + 1) + "组",
 
+                    id: this.guid()
 
+                });
 
+             }
 
         },
 
         handleClose2(done) {
 
             this.$emit('update:dialogVisibleGroup', false)

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