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

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

zengyicheng 2 years ago
parent
90a05ba68f c2c2ca6c36
commit
13dddd025f
55 changed files with 128 additions and 202 deletions
Split View Show Diff Stats
  1. 0 28
      dist/beifeng/index.html
  2. 0 0
      dist/beifeng/static/css/app.0fbb8fe1b972e42ddfe6e2952c0b6493.css
  3. 0 0
      dist/beifeng/static/css/app.0fbb8fe1b972e42ddfe6e2952c0b6493.css.map
  4. 0 0
      dist/beifeng/static/css/app.95a5efa60f4a05ea65d272ebc2b57791.css.map
  5. 0 0
      dist/beifeng/static/css/app.d8607cd5a336df87a0dab25d7baf572a.css
  6. 0 0
      dist/beifeng/static/css/app.d8607cd5a336df87a0dab25d7baf572a.css.map
  7. BIN
      dist/beifeng/static/fonts/element-icons.535877f.woff
  8. BIN
      dist/beifeng/static/fonts/element-icons.732389d.ttf
  9. BIN
      dist/beifeng/static/img/avatar.3282a78.png
  10. BIN
      dist/beifeng/static/img/checkNo.7203312.png
  11. BIN
      dist/beifeng/static/img/checkedIs.a486b96.png
  12. BIN
      dist/beifeng/static/img/image.11b625a.png
  13. BIN
      dist/beifeng/static/img/kc1.1b8c4f6.png
  14. BIN
      dist/beifeng/static/img/mindNetwork.fe94240.png
  15. BIN
      dist/beifeng/static/img/portal.b3cf7fa.png
  16. BIN
      dist/beifeng/static/img/projectName.8270c53.png
  17. BIN
      dist/beifeng/static/img/sp1.92bfd5a.png
  18. BIN
      dist/beifeng/static/img/tup1.6b2e0bd.png
  19. BIN
      dist/beifeng/static/img/video.9ca79f0.png
  20. BIN
      dist/beifeng/static/img/videoH.3ef9db9.png
  21. BIN
      dist/beifeng/static/img/wheel.a7903d6.png
  22. BIN
      dist/beifeng/static/img/word.76356c6.png
  23. BIN
      dist/beifeng/static/img/yp1.d5f2ef7.png
  24. 0 0
      dist/beifeng/static/js/0.86cbf9c691e3dc53b304.js
  25. 0 0
      dist/beifeng/static/js/0.f867c3655b998d260981.js
  26. 0 0
      dist/beifeng/static/js/0.f867c3655b998d260981.js.map
  27. 0 0
      dist/beifeng/static/js/1.a8d1c832d7ea6bc9a183.js
  28. 0 0
      dist/beifeng/static/js/1.a8d1c832d7ea6bc9a183.js.map
  29. 0 0
      dist/beifeng/static/js/app.67703eb738a8b976d266.js
  30. 0 0
      dist/beifeng/static/js/app.67703eb738a8b976d266.js.map
  31. 0 0
      dist/beifeng/static/js/app.865120c55703fb7c6251.js
  32. 0 0
      dist/beifeng/static/js/app.dac9835f14b0d5bfdc05.js
  33. 0 1
      dist/beifeng/static/js/manifest.bc767fc24c5df22f150e.js
  34. 0 2
      dist/beifeng/static/js/manifest.fed1de90e0941b3846db.js
  35. 0 0
      dist/beifeng/static/js/manifest.fed1de90e0941b3846db.js.map
  36. 0 0
      dist/beifeng/static/js/vendor.779ee1bbeec2c196af1e.js
  37. 0 0
      dist/beifeng/static/js/vendor.779ee1bbeec2c196af1e.js.map
  38. BIN
      dist/beifeng/static/logo.ico
  39. 1 5
      dist/index.html
  40. 0 1
      dist/static/css/app.1da71d1f13bcfb324e2450ca13356b07.css
  41. 0 0
      dist/static/css/app.1da71d1f13bcfb324e2450ca13356b07.css.map
  42. 0 1
      dist/static/css/app.83c46df555b8de6cd56c37104e260fc1.css
  43. 0 0
      dist/static/css/app.83c46df555b8de6cd56c37104e260fc1.css.map
  44. 0 0
      dist/static/css/app.8c4e9920f59a71c0835ed56a02582743.css
  45. 0 0
      dist/static/css/app.8c4e9920f59a71c0835ed56a02582743.css.map
  46. 0 0
      dist/static/js/app.72d493b551b54c69cb09.js
  47. 0 0
      dist/static/js/app.72d493b551b54c69cb09.js.map
  48. 0 0
      dist/static/js/app.8304d43f053748902ad4.js
  49. 0 0
      dist/static/js/app.8304d43f053748902ad4.js.map
  50. 0 0
      dist/static/js/app.ade33b46fd73c769f550.js
  51. 0 0
      dist/static/js/app.ade33b46fd73c769f550.js.map
  52. 0 1
      dist/static/js/manifest.39a9f69d36ef7d211bbe.js.map
  53. BIN
      src/assets/noBanner.jpg
  54. 46 46
      src/components/pages/addCourse.vue
  55. 81 117
      src/components/pages/student.vue

+ 0 - 28
dist/beifeng/index.html
View File 

@@ -1,28 +0,0 @@
 
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>PBL教师端</title><link rel="shortcut icon" type=image/x-icon href=static/logo.ico><style>@charset "utf-8";
 
-
 
-    div::-webkit-scrollbar {
 
-      /*滚动条整体样式*/
 
-      width: 6px;
 
-      /*高宽分别对应横竖滚动条的尺寸*/
 
-      height: 6px;
 
-    }
 
-
 
-    /*定义滚动条轨道 内阴影+圆角*/
 
-    div::-webkit-scrollbar-track {
 
-      border-radius: 10px;
 
-      background-color: rgba(0, 0, 0, 0.1);
 
-    }
 
-
 
-    /*定义滑块 内阴影+圆角*/
 
-    div::-webkit-scrollbar-thumb {
 
-      border-radius: 10px;
 
-      -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
 
-      background-color: rgba(0, 0, 0, 0.1);
 
-    }
 
-
 
-    html,
 
-    body {
 
-      height: 100%;
 
-      width: 100%;
 
-      background: #e6eaf0;
 
-    }</style><link href=./static/css/app.0fbb8fe1b972e42ddfe6e2952c0b6493.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.779ee1bbeec2c196af1e.js></script><script type=text/javascript src=./static/js/app.67703eb738a8b976d266.js></script></body></html>

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


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


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


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


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


BIN
dist/beifeng/static/fonts/element-icons.535877f.woff
View File


BIN
dist/beifeng/static/fonts/element-icons.732389d.ttf
View File


BIN
dist/beifeng/static/img/avatar.3282a78.png
View File


BIN
dist/beifeng/static/img/checkNo.7203312.png
View File


BIN
dist/beifeng/static/img/checkedIs.a486b96.png
View File


BIN
dist/beifeng/static/img/image.11b625a.png
View File


BIN
dist/beifeng/static/img/kc1.1b8c4f6.png
View File


BIN
dist/beifeng/static/img/mindNetwork.fe94240.png
View File


BIN
dist/beifeng/static/img/portal.b3cf7fa.png
View File


BIN
dist/beifeng/static/img/projectName.8270c53.png
View File


BIN
dist/beifeng/static/img/sp1.92bfd5a.png
View File


BIN
dist/beifeng/static/img/tup1.6b2e0bd.png
View File


BIN
dist/beifeng/static/img/video.9ca79f0.png
View File


BIN
dist/beifeng/static/img/videoH.3ef9db9.png
View File


BIN
dist/beifeng/static/img/wheel.a7903d6.png
View File


BIN
dist/beifeng/static/img/word.76356c6.png
View File


BIN
dist/beifeng/static/img/yp1.d5f2ef7.png
View File


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


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


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


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


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


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


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


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


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


+ 0 - 1
dist/beifeng/static/js/manifest.bc767fc24c5df22f150e.js
View File 

@@ -1 +0,0 @@
 
-!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}}([]);

+ 0 - 2
dist/beifeng/static/js/manifest.fed1de90e0941b3846db.js
View File 

@@ -1,2 +0,0 @@
 
-!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/beifeng/static/js/manifest.fed1de90e0941b3846db.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/beifeng/static/js/vendor.779ee1bbeec2c196af1e.js


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


BIN
dist/beifeng/static/logo.ico
View File


+ 1 - 5
dist/index.html
View File 

@@ -25,8 +25,4 @@
 
       height: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
-<<<<<<< HEAD
 
-    }</style><link href=./static/css/app.1da71d1f13bcfb324e2450ca13356b07.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.093df9138434d51e559a.js></script><script type=text/javascript src=./static/js/vendor.69cd6886a56eb8550be1.js></script><script type=text/javascript src=./static/js/app.8304d43f053748902ad4.js></script></body></html>
 
-=======
 
-    }</style><link href=./static/css/app.83c46df555b8de6cd56c37104e260fc1.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.39a9f69d36ef7d211bbe.js></script><script type=text/javascript src=./static/js/vendor.69cd6886a56eb8550be1.js></script><script type=text/javascript src=./static/js/app.72d493b551b54c69cb09.js></script></body></html>
 
->>>>>>> eb95dfbaf62ebf19d1576d841c0e1988f56c82fa
 
+    }</style><link href=./static/css/app.8c4e9920f59a71c0835ed56a02582743.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.39a9f69d36ef7d211bbe.js></script><script type=text/javascript src=./static/js/vendor.69cd6886a56eb8550be1.js></script><script type=text/javascript src=./static/js/app.ade33b46fd73c769f550.js></script></body></html>

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


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


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


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


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


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


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


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


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


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


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


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


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


BIN
src/assets/noBanner.jpg
View File


+ 46 - 46
src/components/pages/addCourse.vue
View File 

@@ -179,9 +179,7 @@
 
                   "
 
                 >
 
                   <div style="margin: 45px 0px 0px 80px">
 
-                    <div class="bInfo_title" style="margin-top: 0 !important">
 
-                      <span style="color: red">*</span>课程封面
 
-                    </div>
 
+                    <div class="bInfo_title" style="margin-top: 0 !important">课程封面</div>
 
 
                     <el-upload
 
                       :class="{ disUoloadSty: noneBtnImg }"
 
@@ -497,7 +495,7 @@
 
                           width: 110px;
 
                           min-width: 110px;
 
                         "
 
-                      >任务学习</div>
 
+                      >学习资源</div>
 
                       <div class="line"></div>
 
                     </div>
 
                     <div>
 
@@ -674,8 +672,8 @@
 
                           "
 
                         />
 
                       </button>
 
-                      <button class="info_btn" @click="addAttText(itemTaskIndex)">富文本添加</button>
 
-                      <button class="info_btn" @click="addChaptersTools(itemTaskIndex)">添加工具</button>
 
+                      <button class="info_btn" @click="addAttText(itemTaskIndex)">添加图文</button>
 
+                      <!-- <button class="info_btn" @click="addChaptersTools(itemTaskIndex)">添加工具</button> -->
 
                       <button class="info_btn" @click="openLine(itemTaskIndex)">添加链接</button>
 
                     </div>
 
                   </div>
 
@@ -702,7 +700,7 @@
 
                           font-weight: bold;
 
                           margin-top: 15px;
 
                         "
 
-                      >任务过程</div>
 
+                      >任务实施</div>
 
                       <div class="line" style="width: 90%"></div>
 
                     </div>
 
                   </div>
 
@@ -719,6 +717,15 @@
 
                         v-for="(itemTool, toolIndex) in itemTask.toolChoose"
 
                         :key="toolIndex"
 
                       >
 
+                        <div>
 
+                          <input
 
+                            type="text"
 
+                            placeholder="添加工具描述"
 
+                            class="binfo_input"
 
+                            style="margin: 20px 0; width: 71.5% !important"
 
+                            v-model="itemTool.toolDetail"
 
+                          />
 
+                        </div>
 
                         <div
 
                           style="
 
                             display: flex;
 
@@ -902,15 +909,6 @@
 
                             </div>
 
                           </div>
 
                         </div>
 
-                        <div>
 
-                          <input
 
-                            type="text"
 
-                            placeholder="添加工具描述"
 
-                            class="binfo_input"
 
-                            style="margin: 20px 0; width: 71.5% !important"
 
-                            v-model="itemTool.toolDetail"
 
-                          />
 
-                        </div>
 
                       </div>
 
                       <div class="addToolFun" @click="addToolFun(itemTaskIndex)">
 
                         <div class="addToolImg">
 
@@ -954,7 +952,11 @@
 
                           placeholder="填写评价名称"
 
                         />
 
                         <span>评星等级：</span>
 
-                        <el-rate v-model="itemTask.eList[eIndex].score" @change="setEListStar()" disabled></el-rate>
 
+                        <el-rate
 
+                          v-model="itemTask.eList[eIndex].score"
 
+                          @change="setEListStar()"
 
+                          disabled
 
+                        ></el-rate>
 
                         <div class="remove" @click="deletEList(unitIndex,itemTaskIndex,eIndex)"></div>
 
                         <div class="elist_inptu_text">
 
                           <span>评价描述：</span>
 
@@ -1004,6 +1006,7 @@
 
                 <div class="addTaskBorder" @click="addTaskBorder">
 
                   <div>
 
                     <img src="../../assets/icon/addHw.png" alt />
 
+                    <span>添加任务</span>
 
                   </div>
 
                 </div>
 
               </div>
 
@@ -1700,11 +1703,7 @@ export default {
 
     nextSteps() {
 
       if (this.cidType == 1) {
 
         if (this.steps == 1) {
 
-          if (
 
-            this.courseName != "" &&
 
-            this.courseText != "" &&
 
-            this.cover.length != 0
 
-          ) {
 
+          if (this.courseName != "" || this.courseText != "") {
 
             this.steps = 3;
 
           } else {
 
             this.$message.error("请将信息填写完整");
 
@@ -1712,11 +1711,7 @@ export default {
 
           }
 
         } else if (this.steps == 3) {
 
           if (this.cid == "" || this.cid == undefined) {
 
-            if (
 
-              this.courseName == "" ||
 
-              this.courseText == "" ||
 
-              this.cover.length == 0
 
-            ) {
 
+            if (this.courseName == "" || this.courseText == "") {
 
               this.$message.error("请将信息填写完整");
 
               return;
 
             } else {
 
@@ -1739,11 +1734,7 @@ export default {
 
         }
 
       } else {
 
         if (this.steps == 1) {
 
-          if (
 
-            this.courseName != "" &&
 
-            this.courseText != "" &&
 
-            this.cover.length != 0
 
-          ) {
 
+          if (this.courseName != "" || this.courseText != "") {
 
             this.steps++;
 
           } else {
 
             this.$message.error("请将信息填写完整");
 
@@ -1760,11 +1751,7 @@ export default {
 
           this.steps++;
 
         } else if (this.steps == 3) {
 
           if (this.cid == "" || this.cid == undefined) {
 
-            if (
 
-              this.courseName == "" ||
 
-              this.courseText == "" ||
 
-              this.cover.length == 0
 
-            ) {
 
+            if (this.courseName == "" || this.courseText == "") {
 
               this.$message.error("请将信息填写完整");
 
               return;
 
             } else {
 
@@ -1772,11 +1759,7 @@ export default {
 
               this.steps++;
 
             }
 
           } else {
 
-            if (
 
-              this.courseName == "" ||
 
-              this.courseText == "" ||
 
-              this.cover.length == 0
 
-            ) {
 
+            if (this.courseName == "" || this.courseText == "") {
 
               this.$message.error("请将信息填写完整");
 
               return;
 
             } else {
 
@@ -2331,7 +2314,18 @@ export default {
 
           uid: this.userid,
 
           title: this.courseName,
 
           brief: this.courseText.replace(/%/g, "%25"),
 
-          cover: this.cover.length > 0 ? JSON.stringify(this.cover) : "",
 
+          cover:
 
+            this.cover.length > 0
 
+              ? JSON.stringify(this.cover)
 
+              : JSON.stringify([
 
+                  {
 
+                    name: "noBanner.jpg",
 
+                    url:
 
+                      "https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/noBanner1656409780264.jpg",
 
+                    uid: 1656409780264,
 
+                    status: "success",
 
+                  },
 
+                ]),
 
           astudent:
 
             this.checkboxList.length > 0
 
               ? JSON.stringify(this.checkboxList)
 
@@ -4308,12 +4302,18 @@ ol {
 
   cursor: pointer;
 
 }
 
 .addTaskBorder > div {
 
-  width: 100px;
 
+  /* width: 100px; */
 
   margin: 0 auto;
 
+  display: flex;
 
+  align-items: center;
 
+  justify-content: center;
 
 }
 
 .addTaskBorder > div > img {
 
-  width: 100%;
 
-  height: 100%;
 
+  width: 100px;
 
+}
 
+.addTaskBorder > div > span {
 
+  font-size: 23px;
 
+  color: #dbdbdb;
 
 }
 
 .funBlock {
 
   display: flex;

+ 81 - 117
src/components/pages/student.vue
View File 

@@ -14,14 +14,8 @@
 
       </div>
 
       <div class="student_head">
 
         <div class="head_left">
 
-          <el-input
 
-            v-model="sPhoneUser"
 
-            class="student_input"
 
-            placeholder="请输入手机号或用户名"
 
-          ></el-input>
 
-          <el-button class="student_button" @click="searchStudent"
 
-            >查询</el-button
 
-          >
 
+          <el-input v-model="sPhoneUser" class="student_input" placeholder="请输入手机号或用户名"></el-input>
 
+          <el-button class="student_button" @click="searchStudent">查询</el-button>
 
         </div>
 
         <div class="head_right">
 
           <el-button @click="addStudent">添加学生</el-button>
 
@@ -34,9 +28,7 @@
 
             accept=".xlsx"
 
           >
 
             <el-button size="primary" type="primary">批量添加</el-button>
 
-            <div slot="tip" class="el-upload__tip" style="margin-left:10px;">
 
-              只能上传jpg/png文件，且不超过500kb
 
-            </div>
 
+            <div slot="tip" class="el-upload__tip" style="margin-left:10px;">只能上传xlsx文件，且不超过500kb</div>
 
           </el-upload>
 
           <!-- <el-button @click="exportExcel">导出学生</el-button> -->
 
           <div @click="getExcel">xls 上传样例</div>
 
@@ -66,7 +58,7 @@
 
                         ? scope.row.headportrait
 
                         : tx
 
                     "
 
-                    alt=""
 
+                    alt
 
                   />
 
                 </div>
 
                 <div
 
@@ -77,40 +69,35 @@
 
                     overflow: hidden;
 
                     text-overflow: ellipsis;
 
                   "
 
-                >
 
-                  {{ scope.row.name }}
 
-                </div>
 
+                >{{ scope.row.name }}</div>
 
               </div>
 
             </template>
 
           </el-table-column>
 
-          <el-table-column
 
-            prop="phonenumber"
 
-            label="电话"
 
-            min-width="15"
 
-            align="center"
 
-          >
 
+            <el-table-column label="账号" min-width="15" align="center">
 
+            <template slot-scope="scope">
 
+              <div>{{scope.row.un ? scope.row.un : "" }}</div>
 
+            </template>
 
           </el-table-column>
 
-          <el-table-column
 
-            prop="studentid"
 
-            label="学号"
 
-            min-width="10"
 
-            align="center"
 
-          >
 
+          <el-table-column label="电话" min-width="15" align="center">
 
+            <template slot-scope="scope">
 
+              <div>{{scope.row.phonenumber ? scope.row.phonenumber : "" }}</div>
 
+            </template>
 
           </el-table-column>
 
+          <el-table-column prop="studentid" label="学号" min-width="10" align="center"></el-table-column>
 
           <!-- <el-table-column
 
             prop="school"
 
             label="学校"
 
             min-width="30"
 
             align="center"
 
           >
 
-          </el-table-column> -->
 
+          </el-table-column>-->
 
           <!-- <el-table-column
 
             prop="classname"
 
             label="班级"
 
             min-width="15"
 
             align="center"
 
           >
 
-          </el-table-column> -->
 
+          </el-table-column>-->
 
           <el-table-column label="操作" min-width="20">
 
             <template slot-scope="scope">
 
               <!-- <el-button
 
@@ -119,12 +106,9 @@
 
                 size="small"
 
                 @click="deleteStudent(scope.row.userid, scope.row.state)"
 
                 >删除</el-button
 
-              > -->
 
-              <div
 
-                class="delete"
 
-                @click="deleteStudent(scope.row.userid, scope.row.state)"
 
-              >
 
-                <img src="../../assets/remove.png" alt="" />
 
+              >-->
 
+              <div class="delete" @click="deleteStudent(scope.row.userid, scope.row.state)">
 
+                <img src="../../assets/remove.png" alt />
 
               </div>
 
             </template>
 
           </el-table-column>
 
@@ -138,8 +122,7 @@
 
           :total="total"
 
           v-if="page"
 
           @current-change="handleCurrentChange"
 
-        >
 
-        </el-pagination>
 
+        ></el-pagination>
 
       </div>
 
     </div>
 
     <el-dialog
 
@@ -151,57 +134,33 @@
 
     >
 
       <div slot="title" class="header-title">
 
         <div class="logoImg">
 
-          <img src="../../assets/logo.png" alt="" />
 
+          <img src="../../assets/logo.png" alt />
 
         </div>
 
         <div class="title_add_student">添加学生</div>
 
       </div>
 
       <el-form>
 
         <el-form-item label="学生名称" :label-width="formLabelWidth">
 
           <span>
 
-            <el-input
 
-              placeholder="请输入学生昵称"
 
-              clearable
 
-              v-model="sName"
 
-              class="add_input"
 
-            ></el-input>
 
+            <el-input placeholder="请输入学生昵称" clearable v-model="sName" class="add_input"></el-input>
 
           </span>
 
         </el-form-item>
 
         <el-form-item label="学生学号" :label-width="formLabelWidth">
 
           <span>
 
-            <el-input
 
-              placeholder="请输入学生学号"
 
-              clearable
 
-              v-model="sId"
 
-              class="add_input"
 
-            ></el-input>
 
+            <el-input placeholder="请输入学生学号" clearable v-model="sId" class="add_input"></el-input>
 
           </span>
 
         </el-form-item>
 
         <el-form-item label="学生手机号" :label-width="formLabelWidth">
 
           <span>
 
-            <el-input
 
-              placeholder="请输入学生手机号"
 
-              clearable
 
-              v-model="sPhone"
 
-              class="add_input"
 
-            ></el-input>
 
+            <el-input placeholder="请输入学生手机号" clearable v-model="sPhone" class="add_input"></el-input>
 
           </span>
 
         </el-form-item>
 
         <el-form-item label="学生邮箱" :label-width="formLabelWidth">
 
           <span>
 
-            <el-input
 
-              placeholder="请输入学生邮箱"
 
-              clearable
 
-              v-model="sMail"
 
-              class="add_input"
 
-            ></el-input>
 
+            <el-input placeholder="请输入学生邮箱" clearable v-model="sMail" class="add_input"></el-input>
 
           </span>
 
         </el-form-item>
 
         <el-form-item label="所属学校" :label-width="formLabelWidth">
 
-          <el-input
 
-            disabled
 
-            style="width: 300px"
 
-            v-model="schoolName"
 
-          ></el-input>
 
+          <el-input disabled style="width: 300px" v-model="schoolName"></el-input>
 
         </el-form-item>
 
         <el-form-item label="班级" :label-width="formLabelWidth">
 
           <el-select v-model="sByClass" placeholder="请选择班级">
 
@@ -210,13 +169,10 @@
 
               :key="index"
 
               :label="item.name"
 
               :value="item.id"
 
-            >
 
-            </el-option>
 
+            ></el-option>
 
           </el-select>
 
         </el-form-item>
 
-        <div style="text-align: center; color: #adb3b7">
 
-          注：添加学生的账号密码为123456
 
-        </div>
 
+        <div style="text-align: center; color: #adb3b7">注：添加学生的账号密码为123456</div>
 
       </el-form>
 
       <span slot="footer" class="dialog-footer flex">
 
         <el-button class="right" @click="insertStudent">确认</el-button>
 
@@ -617,11 +573,17 @@ export default {
 
           this.da.map((v) => {
 
             let obj = {};
 
             let a = "";
 
+            var num = "";
 
+            for (var cj = 0; cj < 3; cj++) {
 
+              num += Math.floor(Math.random() * 10);
 
+            }
 
             a =
 
-              pinyin.getFullChars(v["学生姓名"]).toLowerCase() + "@cocorobo.cc";
 
+              pinyin.getFullChars(v["学生姓名"]).toLowerCase() +
 
+              num +
 
+              "@cocorobo.cc";
 
             obj.sId = v["学号"];
 
             obj.name = v["学生姓名"];
 
-            obj.mail = v["学生邮箱"] != undefined ? v["学生邮箱"] : a;
 
+            obj.mail = v["学生邮箱"] ? v["学生邮箱"] : a;
 
             obj.phone = v["学生手机号"];
 
             obj.class = v["班级"];
 
             arr.push(obj);
 
@@ -828,41 +790,7 @@ export default {
 
             //   }
 
             // }
 
             // if (_b == 2) {
 
-            let z = 2;
 
-            let newArr = JSON.stringify(arr);
 
-            let params = [
 
-              {
 
-                arr: newArr,
 
-                userpassword: 123456,
 
-                oid: _this.oid,
 
-              },
 
-            ];
 
-            _this.ajax
 
-              .post(_this.$store.state.api + "batchRegistrationMore", params)
 
-              .then((res) => {
 
-                if (res.data.type == 1) {
 
-                  _this.$message.error("有学生手机号码已被注册");
 
-                  z = 1;
 
-                }
 
-                if (res.data.type == 2) {
 
-                  _this.$message.error("有学生邮箱已被注册");
 
-                  z = 1;
 
-                }
 
-                if (res.data.type == 3) {
 
-                  _this.$message.error("有学生学号重复");
 
-                  z = 1;
 
-                }
 
-                if (z == 2) {
 
-                  _this.$message({
 
-                    message: "新增成功",
 
-                    type: "success",
 
-                  });
 
-                }
 
-                loading.close();
 
-              })
 
-              .catch((err) => {
 
-                console.error(err);
 
-              });
 
+
 
             // for (var i = 0; i < arr.length; i++) {
 
             //   let _i = i;
 
             //   let item = arr[i];
 
@@ -924,9 +852,45 @@ export default {
 
             // } else {
 
             //   loading.close();
 
           }
 
-
 
+          let z = 2;
 
+          let newArr = JSON.stringify(arr);
 
+          let params = [
 
+            {
 
+              arr: newArr,
 
+              userpassword: 123456,
 
+              oid: _this.oid,
 
+            },
 
+          ];
 
+          _this.ajax
 
+            .post(_this.$store.state.api + "batchRegistrationMore", params)
 
+            .then((res) => {
 
+              if (res.data.type == 1) {
 
+                _this.$message.error("有学生手机号码已被注册");
 
+                z = 1;
 
+              }
 
+              if (res.data.type == 2) {
 
+                _this.$message.error("有学生邮箱已被注册");
 
+                z = 1;
 
+              }
 
+              if (res.data.type == 3) {
 
+                _this.$message.error("有学生学号重复");
 
+                z = 1;
 
+              }
 
+              if (z == 2) {
 
+                _this.$message({
 
+                  message: "新增成功",
 
+                  type: "success",
 
+                });
 
+                _this.getStudent();
 
+              }
 
+              loading.close();
 
+            })
 
+            .catch((err) => {
 
+              console.error(err);
 
+            });
 
           _this.fileListUpload = [];
 
         };
 
+
 
         reader.readAsArrayBuffer(f);
 
       };
 
 
@@ -1007,9 +971,9 @@ export default {
 
 }
 
 .head_right {
 
   display: flex;
 
-      flex-direction: row;
 
-    flex-wrap: nowrap;
 
-    align-items: baseline;
 
+  flex-direction: row;
 
+  flex-wrap: nowrap;
 
+  align-items: baseline;
 
 }
 
 .student_input >>> .el-input__inner {
 
   height: 30px;
 
@@ -1150,10 +1114,10 @@ export default {
 
   height: 100%;
 
 }
 
 
-.newCss{
 
+.newCss {
 
   display: flex;
 
-    flex-direction: row;
 
-    flex-wrap: nowrap;
 
-    align-items: baseline;
 
+  flex-direction: row;
 
+  flex-wrap: nowrap;
 
+  align-items: baseline;
 
 }
 
 </style>

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