瀏覽代碼

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

zengyicheng 2 年之前
父節點
當前提交
e2c5fd5421

+ 1 - 1
dist/index.html

@@ -25,7 +25,7 @@
       height: 100%;
       width: 100%;
       background: #e6eaf0;
-    }</style><link href=./static/css/app.2acedf320d99269a20f441eb77c6e3ad.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.107be5c8cc06ac64330b.js></script><script type=text/javascript src=./static/js/app.6d21220fb1e789b015ba.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.012db6c27ebacfe17c84d803fe82d5ff.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.107be5c8cc06ac64330b.js></script><script type=text/javascript src=./static/js/app.9df6e5adb6adf1107f74.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.012db6c27ebacfe17c84d803fe82d5ff.css


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


二進制
dist/static/img/text.e9ab3f7.png


二進制
dist/static/img/upload.b443b8c.png


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


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


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


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


二進制
src/assets/icon/fourthToolList/text.png


+ 0 - 0
dist/static/img/text.bfac28d.png → src/assets/icon/fourthToolList/text2.png


二進制
src/assets/icon/fourthToolList/upload.png


+ 4 - 3
src/components/pages/addCourse.vue

@@ -1521,7 +1521,7 @@
                                   src="../../assets/icon/thirdToolList/eval.png"
                                   alt
                                 />
-                                <div style="margin: 5px 0">学生互评</div>
+                                <div style="margin: 5px 0">个人评价</div>
                               </div>
                               <div
                                 class="check"
@@ -3311,7 +3311,7 @@
       class="dialog_diy"
     >
       <div style="background: #fff; padding: 15px; box-sizing: border-box">
-        <div style="font-size: 18px; color: #a9a9a9">请输入学生评价指标:</div>
+        <div style="font-size: 18px; color: #a9a9a9">请输入个人评价指标:</div>
         <div class="pjCss" style="width: 100%">
           <div
             v-if="rateJson.length"
@@ -3324,7 +3324,7 @@
               class="elist_input_box"
             >
               <span style="min-width: 100px; text-align: right"
-                >学生评价指标:</span
+                >个人评价指标:</span
               >
               <input
                 type="input"
@@ -6142,6 +6142,7 @@ export default {
             this.templateC.id = "123";
             this.courseUserid = res.data[0][0].userid;
             this.nbOrder = res.data[0][0].ordernumber;
+            this.courseTypeId = []
             for (var i = 0; i < res.data[1].length; i++) {
               this.courseTypeId.push(res.data[1][i].typeid);
             }

+ 1 - 0
src/components/pages/addCourseGM.vue

@@ -4455,6 +4455,7 @@ export default {
             this.templateC.id = "123";
             this.courseUserid = res.data[0][0].userid;
             this.nbOrder = res.data[0][0].ordernumber;
+            this.courseTypeId = []
             for (var i = 0; i < res.data[1].length; i++) {
               this.courseTypeId.push(res.data[1][i].typeid);
             }

+ 2 - 2
src/components/pages/student.vue

@@ -102,7 +102,7 @@
         <div class="title_add_student">添加学生</div>
       </div>
       <el-form>
-        <el-form-item label="学生名" :label-width="formLabelWidth">
+        <el-form-item label="学生名" :label-width="formLabelWidth">
           <span>
             <el-input placeholder="请输入学生昵称" clearable v-model="sName" class="add_input"></el-input>
           </span>
@@ -248,7 +248,7 @@ export default {
     },
     addStudent() {
       this.dialogVisible = true;
-      (this.sName = ""), (this.sPhone = ""), (this.sByClass = "");
+      (this.sName = ""), (this.sPhone = ""), (this.sByClass = ""),(this.sMail);
       this.getClass();
       // this.getSchool();
     },

File diff suppressed because it is too large
+ 387 - 247
src/components/pages/student/addCourse.vue


+ 1 - 1
src/components/pages/studentGM.vue

@@ -149,7 +149,7 @@
         <div class="title_add_student">添加学生</div>
       </div>
       <el-form class="inputClass">
-        <el-form-item label="学生名" :label-width="formLabelWidth">
+        <el-form-item label="学生名" :label-width="formLabelWidth">
           <span>
             <el-input placeholder="请输入学生昵称" clearable v-model="sName" class="add_input"></el-input>
           </span>

+ 2 - 2
src/components/pages/tencent/student.vue

@@ -115,7 +115,7 @@
         <div class="title_add_student">添加学生</div>
       </div>
       <el-form class="">
-        <el-form-item label="学生名" :label-width="formLabelWidth">
+        <el-form-item label="学生名" :label-width="formLabelWidth">
           <span>
             <el-input placeholder="请输入学生昵称" clearable v-model="sName" class="add_input"></el-input>
           </span>
@@ -228,7 +228,7 @@ export default {
     },
     addStudent() {
       this.dialogVisible = true;
-      (this.sName = ""), (this.sPhone = ""), (this.sByClass = "");
+      (this.sName = ""), (this.sPhone = ""), (this.sByClass = ""),(this.sMail = "");
       this.getClass();
       // this.getSchool();
     },

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