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

1111

huangminghao 1 year ago
parent
dca16b9330
commit
253bb82395
17 changed files with 1 additions and 23 deletions
Split View Show Diff Stats
  1. 1 5
      dist/index.html
  2. 0 0
      dist/static/css/app.0834bf7c0ffe459133d86755e1d8f590.css
  3. 0 0
      dist/static/css/app.b8c8b736e19ece5e4019bf16756a906d.css.map
  4. 0 0
      dist/static/css/app.bc4661c4260e122a20a6f8af312738fd.css
  5. 0 0
      dist/static/css/app.bc4661c4260e122a20a6f8af312738fd.css.map
  6. 0 0
      dist/static/js/0.7da288988865a9378b49.js
  7. 0 0
      dist/static/js/0.7da288988865a9378b49.js.map
  8. 0 0
      dist/static/js/app.0c2ba8174d8601044962.js
  9. 0 0
      dist/static/js/app.0c2ba8174d8601044962.js.map
  10. 0 0
      dist/static/js/app.291521c7fb52d32edc55.js
  11. 0 0
      dist/static/js/app.375e733f85d98c240801.js
  12. 0 0
      dist/static/js/app.375e733f85d98c240801.js.map
  13. 0 2
      dist/static/js/manifest.3512a67a6213c2df4180.js
  14. 0 0
      dist/static/js/manifest.3512a67a6213c2df4180.js.map
  15. 0 0
      dist/static/js/manifest.4ae2783fdfe7ab52e4d5.js.map
  16. 0 13
      src/components/pages/dataBoardNew/course/index.vue
  17. 0 3
      src/components/pages/synergyCourse/addCourse.vue

+ 1 - 5
dist/index.html
View File 

@@ -25,11 +25,7 @@
 
       height: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
-<<<<<<< HEAD
 
-    }</style><link href=./static/css/app.b8c8b736e19ece5e4019bf16756a906d.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.291521c7fb52d32edc55.js></script></body></html><script>function stopSafari() {
 
-=======
 
-    }</style><link href=./static/css/app.0834bf7c0ffe459133d86755e1d8f590.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.0c2ba8174d8601044962.js></script></body></html><script>function stopSafari() {
 
->>>>>>> 358ea8102b1d43cdd7d2a6e8a9713334e98d629d
 
+    }</style><link href=./static/css/app.bc4661c4260e122a20a6f8af312738fd.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.375e733f85d98c240801.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.0834bf7c0ffe459133d86755e1d8f590.css


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


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


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


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


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.0c2ba8174d8601044962.js


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


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


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


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.375e733f85d98c240801.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


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


+ 0 - 13
src/components/pages/dataBoardNew/course/index.vue
View File 

@@ -408,10 +408,7 @@ export default {
 
         { value: 0, name: "教学评一体化课程" },
 
       ],
 
       weekCourse2: [],
 
-<<<<<<< HEAD
 
-=======
 
       resultSubject: []
 
->>>>>>> 358ea8102b1d43cdd7d2a6e8a9713334e98d629d
 
     };
 
   },
 
   mounted() {
 
@@ -835,11 +832,7 @@ export default {
 
         .then((res) => {
 
           this.isLoading = false;
 
           let _grade = res.data[0]; //年级
 
-<<<<<<< HEAD
 
-          let _subject = res.data[1]; //学科
 
-=======
 
           let _subject = JSON.parse(JSON.stringify(res.data[1])); //学科
 
->>>>>>> 358ea8102b1d43cdd7d2a6e8a9713334e98d629d
 
           let _themeList = res.data[2]; //主题
 
           let _allTime = [..._grade, ..._subject, ..._themeList]; //年级 + 学科 + 主题
 
           this.allCourse = res.data[3][0].count; //课程总数
 
@@ -1392,8 +1385,6 @@ export default {
 
 
           this.weekCourse2 = weekCourse2;
 
 
-<<<<<<< HEAD
 
-=======
 
 
 
           let CourseLabel = res.data[14]; //带分类的课程
 
@@ -1430,7 +1421,6 @@ export default {
 
           this.resultSubject = resultSubject2
 
           console.log(resultSubject);
 
 
->>>>>>> 358ea8102b1d43cdd7d2a6e8a9713334e98d629d
 
           this.$forceUpdate();
 
         })
 
         .catch((err) => {
 
@@ -1438,12 +1428,9 @@ export default {
 
           console.error(err);
 
         });
 
     },
 
-<<<<<<< HEAD
 
-=======
 
     checkArrayInclusion(arr1, arr2) {
 
       return arr1.every(item => arr2.includes(item));
 
     },
 
->>>>>>> 358ea8102b1d43cdd7d2a6e8a9713334e98d629d
 
   },
 
 };
 
 </script>

+ 0 - 3
src/components/pages/synergyCourse/addCourse.vue
View File 

@@ -4982,10 +4982,7 @@ export default {
 
         });
 
     },
 
     updateWork(type) {
 
-<<<<<<< HEAD
 
       let that =this;
 
-=======
 
->>>>>>> 358ea8102b1d43cdd7d2a6e8a9713334e98d629d
 
       let cPan = 1;
 
       for (var i = 0; i < this.unitJson.length; i++) {
 
         for (

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