Browse Source

Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/pbl-teacher-table

lsc 2 years ago
parent
commit
a01b10f72e

+ 1 - 1
dist/index.html

@@ -25,4 +25,4 @@
       height: 100%;
       width: 100%;
       background: #e6eaf0;
-    }</style><link href=./static/css/app.ffaa51d64ab4efc202b56b5fdc06d0ea.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.ce85731d7c1d072ed0aa.js></script><script type=text/javascript src=./static/js/vendor.ec6917f8087437e124be.js></script><script type=text/javascript src=./static/js/app.794d26efd9cc06952a35.js></script></body></html>
+    }</style><link href=./static/css/app.d3a28e079d758c34592e5582ca429df2.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.fed1de90e0941b3846db.js></script><script type=text/javascript src=./static/js/vendor.ec6917f8087437e124be.js></script><script type=text/javascript src=./static/js/app.b911d765140d52ea0497.js></script></body></html>

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


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


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


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


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


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


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


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


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


+ 2 - 2
dist/static/js/manifest.ce85731d7c1d072ed0aa.js → dist/static/js/manifest.fed1de90e0941b3846db.js

@@ -1,2 +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:"495dd6dd7e801967b64f",1:"a8d1c832d7ea6bc9a183"}[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.ce85731d7c1d072ed0aa.js.map
+!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:"f867c3655b998d260981",1:"a8d1c832d7ea6bc9a183"}[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.fed1de90e0941b3846db.js.map

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


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


+ 14 - 10
src/components/pages/addCourse.vue

@@ -118,7 +118,7 @@
                       <img
                         src="../../assets/icon/projectName.png"
                         alt=""
-                        style="margin-right: 5px"
+                        style="margin-right: 8px"
                       />
                       <input
                         type="text"
@@ -1911,8 +1911,9 @@ export default {
             this.nbOrder = res.data[0][0].ordernumber;
             this.CourseType[0] = res.data[1];
             // this.selectType();
-            for(var i =0;i<this.CourseType[0].length;i++){
-              this.courseTypeId[this.CourseType[0][i].typePid] = this.CourseType[0][i].typeid;
+            for (var i = 0; i < this.CourseType[0].length; i++) {
+              this.courseTypeId[this.CourseType[0][i].typePid] =
+                this.CourseType[0][i].typeid;
             }
             console.log(this.courseTypeId);
             this.$forceUpdate();
@@ -1932,7 +1933,7 @@ export default {
         .then((res) => {
           this.CourseType = res.data;
           for (var i = 0; i < res.data[0].length; i++) {
-            if(!this.cid){
+            if (!this.cid) {
               this.courseTypeId[res.data[0][i].id] = "";
             }
             for (var j = 0; j < res.data[1].length; j++) {
@@ -2468,11 +2469,11 @@ export default {
 .right_first {
   display: flex;
   flex-direction: column;
-  width: 50%;
+  width: 60%;
 }
 
 .right_first {
-  margin-left: 60px;
+  margin-left: 20px;
 }
 .people {
   border: 1px solid rgb(229 229 229);
@@ -3046,7 +3047,7 @@ ol {
   flex-direction: column;
 }
 .all_choose {
-  margin: 15px 0;
+  margin: 15px 0 15px 10px;
   height: 20%;
   display: flex;
   flex-direction: row;
@@ -3056,9 +3057,12 @@ ol {
   width: 50px;
   display: block;
 }
-.all_choose >>> .el-select {
-  margin: 0 0 0 20px;
+.choose>.all_choose:nth-child(2)>span{
+  margin: 0 7px 0 -7px !important;
 }
+/* .all_choose >>> .el-select {
+  margin: 0 0 0 20px;
+} */
 .choose {
   display: flex;
   flex-direction: column;
@@ -3066,6 +3070,6 @@ ol {
   align-content: space-between;
   height: 100%;
   justify-content: flex-start;
-  align-items: center;
+  align-items: flex-start;
 }
 </style>

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

@@ -700,12 +700,15 @@ export default {
   width: calc(100% / 3);
 }
 .all_choose > span {
-  width: 73px;
+  width: 50px;
   display: block;
 }
 /* .all_choose >>> .el-select {
   margin: 0 0 0 20px;
 } */
+.choose>.all_choose:nth-child(2)>span{
+  margin-right: 24px !important;
+}
 .choose {
   display: flex;
   flex-direction: row;
@@ -713,7 +716,8 @@ export default {
   align-content: space-between;
   height: 100%;
   justify-content: flex-start;
-  width: 55%;
+  width: 60%;
+  min-width: 868px;
   align-items: center;
 }
 .clear {
@@ -725,5 +729,6 @@ export default {
   border-radius: 5px;
   line-height: 35px;
   cursor: pointer;
+  margin-left: 20px;
 }
 </style>

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