Home Esplora Aiuto
Accedi
CocoRoboLabs
/
pbl-teacher-table
3
0
Forka 0
File Problemi 0 Pull Requests 0 Wiki
Sfoglia il codice sorgente

Merge branch 'beta' into HK

lsc 1 anno fa
parent
b1e7883b60 c24ff365eb
commit
8a111fb61e
40 ha cambiato i file con 1083 aggiunte e 1708 eliminazioni
Visualizzazione separata Mostra Diff Stats
  1. 1 1
      config/index.js
  2. 4 0
      dist/index.html
  3. 0 0
      dist/static/css/app.b4f606f16eaef4bad888922da038e445.css
  4. 0 0
      dist/static/css/app.b4f606f16eaef4bad888922da038e445.css.map
  5. BIN
      dist/static/img/course_icon2.10e064b.png
  6. 0 0
      dist/static/js/app.8ffff308c091adcd1c07.js
  7. 1 0
      dist/static/js/app.8ffff308c091adcd1c07.js.map
  8. 0 0
      dist/static/js/app.99755465fdd40095e602.js.map
  9. 0 0
      dist/static/js/manifest.f583576dfec9dfc9a295.js.map
  10. 10 10
      package-lock.json
  11. 3 3
      package.json
  12. 165 0
      src/assets/css/button.css
  13. BIN
      src/assets/icon/new/addStage.png
  14. BIN
      src/assets/icon/new/addTask.png
  15. BIN
      src/assets/icon/new/c_none.png
  16. BIN
      src/assets/icon/new/course_icon.png
  17. BIN
      src/assets/icon/new/course_icon2.png
  18. BIN
      src/assets/icon/new/delete_u.png
  19. BIN
      src/assets/icon/new/downBtn.png
  20. BIN
      src/assets/icon/new/icon_add.png
  21. BIN
      src/assets/icon/new/icon_finish.png
  22. BIN
      src/assets/icon/new/icon_last.png
  23. BIN
      src/assets/icon/new/icon_next.png
  24. BIN
      src/assets/icon/new/icon_paste.png
  25. BIN
      src/assets/icon/new/icon_return.png
  26. BIN
      src/assets/icon/new/u_code.png
  27. BIN
      src/assets/icon/new/u_img.png
  28. BIN
      src/assets/icon/new/u_noUpload.png
  29. BIN
      src/assets/icon/new/u_url.png
  30. BIN
      src/assets/icon/new/u_video.png
  31. BIN
      src/assets/icon/new/u_word.png
  32. BIN
      src/assets/icon/new/upBtn.png
  33. 278 639
      src/components/pages/addCourse.vue
  34. 102 40
      src/components/pages/course.vue
  35. 265 592
      src/components/pages/easy/addCourse.vue
  36. 1 2
      src/components/pages/student.vue
  37. 244 421
      src/components/pages/task/addCourse.vue
  38. 4 0
      src/components/pages/teacherSource/dialog.vue
  39. 4 0
      src/components/pages/teacherSource/index.vue
  40. 1 0
      src/main.js

+ 1 - 1
config/index.js
Vedi File 

@@ -13,7 +13,7 @@ module.exports = {
 
     proxyTable: {},
 
 
     // Various Dev Server settings
 
-    host: 'localhost', // can be overwritten by process.env.HOST
 
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
 
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
 
     autoOpenBrowser: false,
 
     errorOverlay: true,

+ 4 - 0
dist/index.html
Vedi File 

@@ -25,7 +25,11 @@
 
       height: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
+<<<<<<< HEAD
 
     }</style><link href=./static/css/app.242162ee2d7e77d022cdc0ea047a0e2a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.f583576dfec9dfc9a295.js></script><script type=text/javascript src=./static/js/vendor.47326b7cf726c651fd28.js></script><script type=text/javascript src=./static/js/app.99755465fdd40095e602.js></script></body></html><script>function stopSafari() {
 
+=======
 
+    }</style><link href=./static/css/app.b4f606f16eaef4bad888922da038e445.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.f1661c5ebfd33221b88f.js></script><script type=text/javascript src=./static/js/app.8ffff308c091adcd1c07.js></script></body></html><script>function stopSafari() {
 
+>>>>>>> beta
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

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


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


BIN
dist/static/img/course_icon2.10e064b.png
Vedi File


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


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


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


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


+ 10 - 10
package-lock.json
Vedi File 

@@ -57,7 +57,7 @@
 
         "copy-webpack-plugin": "^4.0.1",
 
         "css-loader": "^0.28.0",
 
         "extract-text-webpack-plugin": "^3.0.0",
 
-        "file-loader": "^1.1.4",
 
+        "file-loader": "^1.1.11",
 
         "friendly-errors-webpack-plugin": "^1.6.1",
 
         "html-webpack-plugin": "^2.30.1",
 
         "node-notifier": "^5.1.2",
 
@@ -73,7 +73,7 @@
 
         "semver": "^5.3.0",
 
         "shelljs": "^0.7.6",
 
         "uglifyjs-webpack-plugin": "^1.1.1",
 
-        "url-loader": "^0.5.8",
 
+        "url-loader": "^0.5.9",
 
         "vue-loader": "^13.3.0",
 
         "vue-style-loader": "^3.0.1",
 
         "vue-template-compiler": "^2.5.2",
 
@@ -5673,8 +5673,8 @@
 
     },
 
     "node_modules/file-loader": {
 
       "version": "1.1.11",
 
-      "resolved": "https://registry.npm.taobao.org/file-loader/download/file-loader-1.1.11.tgz?cache=0&sync_timestamp=1603900022388&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffile-loader%2Fdownload%2Ffile-loader-1.1.11.tgz",
 
-      "integrity": "sha1-b+iGRJsPKpNuQ8q6rAzb+zaVBvg=",
 
+      "resolved": "https://registry.npmmirror.com/file-loader/-/file-loader-1.1.11.tgz",
 
+      "integrity": "sha512-TGR4HU7HUsGg6GCOPJnFk06RhWgEWFLAGWiT6rcD+GRC2keU3s9RGJ+b3Z6/U73jwwNb2gKLJ7YCrp+jvU4ALg==",
 
       "dev": true,
 
       "dependencies": {
 
         "loader-utils": "^1.0.2",
 
@@ -16155,8 +16155,8 @@
 
     },
 
     "node_modules/url-loader": {
 
       "version": "0.5.9",
 
-      "resolved": "https://registry.npm.taobao.org/url-loader/download/url-loader-0.5.9.tgz?cache=0&sync_timestamp=1602252626029&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Furl-loader%2Fdownload%2Furl-loader-0.5.9.tgz",
 
-      "integrity": "sha1-zI/qgse5Bud3cBklCGnlaemVwpU=",
 
+      "resolved": "https://registry.npmmirror.com/url-loader/-/url-loader-0.5.9.tgz",
 
+      "integrity": "sha512-B7QYFyvv+fOBqBVeefsxv6koWWtjmHaMFT6KZWti4KRw8YUD/hOU+3AECvXuzyVawIBx3z7zQRejXCDSO5kk1Q==",
 
       "dev": true,
 
       "dependencies": {
 
         "loader-utils": "^1.0.2",
 
@@ -23004,8 +23004,8 @@
 
     },
 
     "file-loader": {
 
       "version": "1.1.11",
 
-      "resolved": "https://registry.npm.taobao.org/file-loader/download/file-loader-1.1.11.tgz?cache=0&sync_timestamp=1603900022388&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffile-loader%2Fdownload%2Ffile-loader-1.1.11.tgz",
 
-      "integrity": "sha1-b+iGRJsPKpNuQ8q6rAzb+zaVBvg=",
 
+      "resolved": "https://registry.npmmirror.com/file-loader/-/file-loader-1.1.11.tgz",
 
+      "integrity": "sha512-TGR4HU7HUsGg6GCOPJnFk06RhWgEWFLAGWiT6rcD+GRC2keU3s9RGJ+b3Z6/U73jwwNb2gKLJ7YCrp+jvU4ALg==",
 
       "dev": true,
 
       "requires": {
 
         "loader-utils": "^1.0.2",
 
@@ -31621,8 +31621,8 @@
 
     },
 
     "url-loader": {
 
       "version": "0.5.9",
 
-      "resolved": "https://registry.npm.taobao.org/url-loader/download/url-loader-0.5.9.tgz?cache=0&sync_timestamp=1602252626029&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Furl-loader%2Fdownload%2Furl-loader-0.5.9.tgz",
 
-      "integrity": "sha1-zI/qgse5Bud3cBklCGnlaemVwpU=",
 
+      "resolved": "https://registry.npmmirror.com/url-loader/-/url-loader-0.5.9.tgz",
 
+      "integrity": "sha512-B7QYFyvv+fOBqBVeefsxv6koWWtjmHaMFT6KZWti4KRw8YUD/hOU+3AECvXuzyVawIBx3z7zQRejXCDSO5kk1Q==",
 
       "dev": true,
 
       "requires": {
 
         "loader-utils": "^1.0.2",

+ 3 - 3
package.json
Vedi File 

@@ -5,7 +5,7 @@
 
   "author": "lsc <1249685148@qq.com>",
 
   "private": true,
 
   "scripts": {
 
-    "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
 
+    "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js --host 0.0.0.0",
 
     "start": "npm run dev",
 
     "build": "node build/build.js"
 
   },
 
@@ -59,7 +59,7 @@
 
     "copy-webpack-plugin": "^4.0.1",
 
     "css-loader": "^0.28.0",
 
     "extract-text-webpack-plugin": "^3.0.0",
 
-    "file-loader": "^1.1.4",
 
+    "file-loader": "^1.1.11",
 
     "friendly-errors-webpack-plugin": "^1.6.1",
 
     "html-webpack-plugin": "^2.30.1",
 
     "node-notifier": "^5.1.2",
 
@@ -75,7 +75,7 @@
 
     "semver": "^5.3.0",
 
     "shelljs": "^0.7.6",
 
     "uglifyjs-webpack-plugin": "^1.1.1",
 
-    "url-loader": "^0.5.8",
 
+    "url-loader": "^0.5.9",
 
     "vue-loader": "^13.3.0",
 
     "vue-style-loader": "^3.0.1",
 
     "vue-template-compiler": "^2.5.2",

+ 165 - 0
src/assets/css/button.css
Vedi File 

@@ -0,0 +1,165 @@
 
+.c_pub_button_confirm {
 
+  color: #fff;
 
+  background-color: #3681fc;
 
+  padding: 0 24px;
 
+  font-size: 14px;
 
+  min-width: 64px;
 
+  font-weight: 500;
 
+  border-radius: 4px;
 
+  box-sizing: border-box;
 
+  border: none;
 
+  cursor: pointer;
 
+  transition: all 0.2s ease-in-out;
 
+  height: 36px;
 
+  display: flex;
 
+  align-items: center;
 
+  justify-content: center;
 
+  line-height: 1;
 
+}
 
+
 
+.c_pub_button_confirm:hover {
 
+  background-color: #4f7cd5 !important;
 
+}
 
+
 
+.c_pub_button_confirm + .c_pub_button_confirm {
 
+  margin-left: 20px;
 
+}
 
+
 
+.c_pub_button_add {
 
+  color: #3681fc;
 
+  background-color: #fff;
 
+  border: 2px solid #86b3fd;
 
+  padding: 0 24px;
 
+  font-size: 14px;
 
+  min-width: 64px;
 
+  font-weight: 500;
 
+  border-radius: 4px;
 
+  box-sizing: border-box;
 
+  cursor: pointer;
 
+  transition: all 0.2s ease-in-out;
 
+  height: 36px;
 
+  display: flex;
 
+  align-items: center;
 
+  justify-content: center;
 
+  line-height: 1;
 
+}
 
+
 
+.c_pub_button_add:hover {
 
+  background-color: #f0f4fa !important;
 
+}
 
+
 
+.c_pub_button_add + .c_pub_button_add {
 
+  margin-left: 20px;
 
+}
 
+
 
+.c_pub_button_return {
 
+  color: #3681fc;
 
+  background-color: #e7ebf1;
 
+  padding: 0 24px;
 
+  font-size: 14px;
 
+  min-width: 64px;
 
+  font-weight: 500;
 
+  border-radius: 4px;
 
+  box-sizing: border-box;
 
+  border: none;
 
+  cursor: pointer;
 
+  transition: all 0.2s ease-in-out;
 
+  height: 36px;
 
+  display: flex;
 
+  align-items: center;
 
+  justify-content: center;
 
+  line-height: 1;
 
+}
 
+
 
+.c_pub_button_return:hover {
 
+  background-color: #e1e5ea !important;
 
+}
 
+
 
+.c_pub_button_return + .c_pub_button_return {
 
+  margin-left: 20px;
 
+}
 
+
 
+.c_pub_button_return + .c_pub_button_confirm {
 
+  margin-left: 40px;
 
+}
 
+
 
+.c_pub_button_delete {
 
+  color: #717c8d;
 
+  background-color: #e7ebf1;
 
+  padding: 0 24px;
 
+  font-size: 14px;
 
+  min-width: 64px;
 
+  font-weight: 500;
 
+  border-radius: 4px;
 
+  box-sizing: border-box;
 
+  border: none;
 
+  cursor: pointer;
 
+  transition: all 0.2s ease-in-out;
 
+  height: 36px;
 
+  display: flex;
 
+  align-items: center;
 
+  justify-content: center;
 
+  line-height: 1;
 
+}
 
+
 
+.c_pub_button_delete:hover {
 
+  background-color: #e1e5ea !important;
 
+}
 
+
 
+.c_pub_button_delete + .c_pub_button_delete {
 
+  margin-left: 20px;
 
+}
 
+
 
+.c_pub_button_delete + .c_pub_button_confirm {
 
+  margin-left: 15px;
 
+}
 
+
 
+.pub_btn_add_img2::before,
 
+.pub_btn_finish_img::before,
 
+.pub_btn_last_img::before,
 
+.pub_btn_next_img::before,
 
+.pub_btn_return_img::before,
 
+.pub_btn_delete_img::before,
 
+.pub_btn_paste_img::before,
 
+.pub_btn_add_img::before {
 
+  content: "";
 
+  width: 17px;
 
+  height: 17px;
 
+  min-width: 17px;
 
+  min-height: 17px;
 
+  background-size: 100% 100%;
 
+  display: block;
 
+  margin-right: 7px;
 
+}
 
+
 
+.pub_btn_add_img::before {
 
+  background-image: url(../icon/new/addStage.png);
 
+}
 
+
 
+.pub_btn_add_img2::before {
 
+  background-image: url(../icon/new/icon_add.png);
 
+}
 
+
 
+.pub_btn_paste_img::before {
 
+  background-image: url(../icon/new/icon_paste.png);
 
+}
 
+
 
+.pub_btn_finish_img::before {
 
+  background-image: url(../icon/new/icon_finish.png);
 
+}
 
+
 
+.pub_btn_last_img::before {
 
+  background-image: url(../icon/new/icon_last.png);
 
+}
 
+
 
+.pub_btn_next_img::before {
 
+  background-image: url(../icon/new/icon_next.png);
 
+}
 
+
 
+.pub_btn_return_img::before {
 
+  background-image: url(../icon/new/icon_return.png);
 
+}
 
+
 
+.pub_btn_delete_img::before {
 
+  background-image: url(../icon/new/delete_u.png);
 
+}

BIN
src/assets/icon/new/addStage.png
Vedi File


BIN
src/assets/icon/new/addTask.png
Vedi File


BIN
src/assets/icon/new/c_none.png
Vedi File


BIN
src/assets/icon/new/course_icon.png
Vedi File


BIN
src/assets/icon/new/course_icon2.png
Vedi File


BIN
src/assets/icon/new/delete_u.png
Vedi File


BIN
src/assets/icon/new/downBtn.png
Vedi File


BIN
src/assets/icon/new/icon_add.png
Vedi File


BIN
src/assets/icon/new/icon_finish.png
Vedi File


BIN
src/assets/icon/new/icon_last.png
Vedi File


BIN
src/assets/icon/new/icon_next.png
Vedi File


BIN
src/assets/icon/new/icon_paste.png
Vedi File


BIN
src/assets/icon/new/icon_return.png
Vedi File


BIN
src/assets/icon/new/u_code.png
Vedi File


BIN
src/assets/icon/new/u_img.png
Vedi File


BIN
src/assets/icon/new/u_noUpload.png
Vedi File


BIN
src/assets/icon/new/u_url.png
Vedi File


BIN
src/assets/icon/new/u_video.png
Vedi File


BIN
src/assets/icon/new/u_word.png
Vedi File


BIN
src/assets/icon/new/upBtn.png
Vedi File


File diff suppressed because it is too large
+ 278 - 639
src/components/pages/addCourse.vue


+ 102 - 40
src/components/pages/course.vue
Vedi File 

@@ -1,7 +1,11 @@
 
 <template>
 
-  <div class="pb_content" style="height: auto; width: 94%; margin: 0 auto">
 
-    <div class="pb_head top">
 
-      <div>
 
+  <div class="pb_content" style="height: auto; width: 94%; margin: 10px auto;background: unset;">
 
+    <div style="width:100%;padding:0 21px;background:#fff;border-radius: 5px;">
 
+      <div class="pb_head top">
 
+      <div style="
 
+    display: flex;
 
+    align-items: center;
 
+">
 
         <span class="sub_head">课程管理</span>
 
         <span
 
           class="subClick"
 
@@ -126,8 +130,9 @@
 
         </div>
 
       </div>
 
     </div>
 
+    </div>
 
     <div class="line"></div>
 
-    <div class="pb_content_body" style="height: 100%; width: 97%">
 
+    <div class="pb_content_body" style="height: 100%;width: 100%;background: #e6eaf0;margin: 0 auto;">
 
       <div class="student_head" v-if="false">
 
         <div class="choose">
 
           <div class="student_search">
 
@@ -222,12 +227,12 @@
 
               <div class="kc_t" v-if="item.isCourseType == 2 || groupA == 1">
 
                 负责老师：{{ item.uname }}
 
               </div>
 
-              <div class="kc_time">
 
-                <span style="color: #4b4b4b">创建日期:</span>{{ item.time }}
 
-              </div>
 
-              <div class="kc_time">
 
-                <span style="color: #4b4b4b">修改日期:</span>{{ item.utime }}
 
-              </div>
 
+                <div class="kc_time">
 
+                  <span style="color: #717C8D">创建日期:</span>{{ item.time }}
 
+                </div>
 
+                <div class="kc_time">
 
+                  <span style="color: #717C8D">修改日期:</span>{{ item.utime }}
 
+                </div>
 
             </div>
 
             <div class="three_bottom">
 
               <!-- v-if="role == '1'" -->
 
@@ -285,21 +290,26 @@
 
               >
 
                 评价
 
               </div>
 
+              <div
 
+                @click="copyCourse(item.courseId)"
 
+              >
 
+                复制
 
+              </div>
 
               <div
 
                 v-if="item.isCourseType == 1 || role == '1'"
 
                 @click="deleteCourse(item.courseId)"
 
               >
 
                 删除
 
               </div>
 
-              <div class="more">
 
+              <!-- <div class="more">
 
                 <span style="font-size: 18px; font-weight: 700">...</span>
 
                 <div>
 
                   <span @click="copyCourse(item.courseId)">复制</span>
 
-                  <!-- <span @click="jump(item.courseId)" v-if="role == '1'">评课</span> -->
 
-                  <!-- <span @click="get(item.courseId)" v-else>预览</span> -->
 
-                  <!-- <span @click="getNT(item.courseId)">无终端</span> -->
 
+                  <span @click="jump(item.courseId)" v-if="role == '1'">评课</span>
 
+                  <span @click="get(item.courseId)" v-else>预览</span>
 
+                  <span @click="getNT(item.courseId)">无终端</span>
 
                 </div>
 
-              </div>
 
+              </div> -->
 
             </div>
 
           </div>
 
           <div class="course_empty" v-if="course.length == 0">暂无数据</div>
 
@@ -1200,6 +1210,14 @@ export default {
 
 </script>
 
 
 <style scoped>
 
+@media screen and (max-width: 1000px) {
 
+  /* .out_box {
 
+    width: 250px !important;
 
+  } */
 
+  /* .out_box:nth-child(4n){
 
+    margin-right: 25px !important;
 
+  } */
 
+}
 
 .dialog_diy >>> .el-dialog__header {
 
   background: #3d67bc !important;
 
   padding: 15px 20px;
 
@@ -1241,9 +1259,13 @@ export default {
 
 }
 
 
 .top {
 
-  display: flex;
 
-  justify-content: space-between;
 
-  width: 97% !important;
 
+    display: flex;
 
+    justify-content: space-between;
 
+    width: 100% !important;
 
+    box-sizing: border-box;
 
+    margin: 0px auto;
 
+    padding: 10px 5px;
 
+    height: 54px;
 
 }
 
 
 .bgColor {
 
@@ -1277,7 +1299,7 @@ export default {
 
 }
 
 
 .student_table {
 
-  padding: 20px 0;
 
+  /* padding: 20px 0; */
 
   height: 100%;
 
   /* overflow: auto; */
 
   min-height: 360px;
 
@@ -1341,8 +1363,9 @@ export default {
 
 }
 
 
 .student_page {
 
-  width: 95%;
 
+  width: 100%;
 
   margin: 0 auto;
 
+  background: #e6eaf0;
 
 }
 
 
 .course_create_box {
 
@@ -1425,21 +1448,34 @@ export default {
 
   display: flex;
 
   flex-direction: column;
 
   flex-wrap: nowrap;
 
-  width: 250px;
 
+  /* width: calc(100% / 5 - (15px * 4) / 5); */
 
+  width: 280px;
 
   background: #fff;
 
-  margin-right: 25px;
 
-  border: 1px solid #ccc;
 
+  margin-right: 15px;
 
+  /* border: 1px solid #ccc; */
 
   height: fit-content;
 
   box-sizing: border-box;
 
   border-radius: 0px 0px 5px 5px;
 
   /* overflow: hidden; */
 
   margin-bottom: 15px;
 
   position: relative;
 
+  border-radius: 8px;
 
+  box-sizing: border-box;
 
+  overflow: hidden;
 
+  border: 1px solid #3682fc00;
 
+}
 
+
 
+.out_box:hover{
 
+  border: 1px solid #3681FC;
 
 }
 
 
+/* .out_box:nth-child(5n){
 
+  margin-right: 0;
 
+} */
 
+
 
 .bottom_box {
 
   display: flex;
 
-  padding: 10px 0 10px 10px;
 
+  padding: 10px ;
 
   flex-direction: column;
 
   box-sizing: border-box;
 
   height: 121px;
 
@@ -1448,19 +1484,22 @@ export default {
 
 }
 
 
 .bottom_box > div:nth-child(1) {
 
-  width: 230px;
 
+  width: 100%;
 
   overflow: hidden;
 
   text-overflow: ellipsis;
 
   white-space: nowrap;
 
+  font-weight: bold;
 
 }
 
 
 .tup {
 
   width: 100%;
 
-  height: 141.06px;
 
+  height: 180px;
 
   margin: 0 auto;
 
   overflow: hidden;
 
   display: flex;
 
   align-items: center;
 
+  padding: 10px;
 
+  box-sizing: border-box;
 
 }
 
 
 .tup > img {
 
@@ -1472,7 +1511,10 @@ export default {
 
 .kc_time {
 
   margin-top: 8px;
 
   font-size: 14px;
 
-  color: #999;
 
+  color: #717C8D;
 
+}
 
+.kc_time + .kc_time {
 
+  margin-top: 0;
 
 }
 
 
 .kc_t {
 
@@ -1487,18 +1529,36 @@ export default {
 
   display: flex;
 
   flex-direction: row;
 
   justify-content: space-around;
 
-  height: 40px;
 
+  height: 45px;
 
   align-items: center;
 
-  background: #f5f4f4;
 
+  background: #fff;
 
   font-size: 14px;
 
+  border-top: 1px solid #ddd;
 
+  box-sizing: border-box;
 
 }
 
 
 .three_bottom > div {
 
   cursor: pointer;
 
+  width: 100%;
 
+  text-align: center;
 
+}
 
+
 
+.three_bottom > div + div{
 
+  border-left: 1px solid #ddd;
 
 }
 
 
 .three_bottom > div:hover {
 
-  color: #79a2ff;
 
+  color: #3681FC;
 
+  font-weight: bold;
 
+}
 
+
 
+.three_bottom  .deleteB{
 
+  color: #E96E6E;
 
+}
 
+
 
+.three_bottom .deleteB:hover {
 
+  color: #E96E6E;
 
+  font-weight: bold;
 
 }
 
 
 .head_left {
 
@@ -1596,7 +1656,7 @@ export default {
 
   background: #3c3c3c;
 
   width: 70px;
 
   height: 30px;
 
-  border-radius: 30px;
 
+  border-radius: 5px;
 
   color: #fff;
 
   font-size: 14px;
 
   text-align: center;
 
@@ -1610,7 +1670,7 @@ export default {
 
   background: #41a5f0;
 
   width: 70px;
 
   height: 30px;
 
-  border-radius: 30px;
 
+  border-radius: 5px;
 
   color: #fff;
 
   font-size: 14px;
 
   text-align: center;
 
@@ -1630,14 +1690,14 @@ export default {
 
   height: 2px;
 
   position: absolute;
 
   left: 0;
 
-  bottom: -18px;
 
+  bottom: -10px;
 
 }
 
 
 .subClick {
 
   /* font-size: 16px; */
 
   font-size: 26px;
 
   cursor: pointer;
 
-  margin-left: 10px;
 
+  margin-left: 17.5px;
 
   /* color: #ab582f; */
 
   /* color: #409eff; */
 
   color: #999;
 
@@ -1690,12 +1750,12 @@ export default {
 
 }
 
 
 .reBox {
 
-  background: #fff;
 
-  width: 97%;
 
-  border-radius: 5px;
 
-  /* padding-left: 20px; */
 
-  margin: 0 auto;
 
-  box-sizing: border-box;
 
+    width: 100%;
 
+    /* padding-left: 20px; */
 
+    margin: 0 auto;
 
+    box-sizing: border-box;
 
+    overflow: hidden;
 
+    padding: 10px 15px 0;
 
 }
 
 
 .reTop {
 
@@ -1733,6 +1793,8 @@ export default {
 
 .search {
 
   width: 20px;
 
   padding: 0 5px;
 
+  display:flex;
 
+  align-items: center;
 
 }
 
 
 .search > img {

File diff suppressed because it is too large
+ 265 - 592
src/components/pages/easy/addCourse.vue


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

@@ -303,8 +303,7 @@ export default {
 
         this.$message.error("请为学生选择班级");
 
         return;
 
       } else if (
 
-        this.sPhone != "" &&
 
-        !/^[1][3,4,5,7,8][0-9]{9}$/.test(this.sPhone)
 
+        this.sPhone != "" && !/^[1][3,4,5,7,8][0-9]{9}$/.test(this.sPhone)
 
       ) {
 
         this.$message.error("手机号格式不正确");
 
         return;

File diff suppressed because it is too large
+ 244 - 421
src/components/pages/task/addCourse.vue


+ 4 - 0
src/components/pages/teacherSource/dialog.vue
Vedi File 

@@ -178,6 +178,10 @@ export default {
 
                         return this.CourseTypeJson[tid].filter(e => {
 
                             return  ['c3eaac53-3599-43c6-a224-a9e8b1e6eb7a','65196690-f7bc-4fc2-9175-b9ddc7dcba07','1874291f-96e5-4d9f-8747-170f87edb171','3777ef66-96ff-4f08-8e6d-a7b6acc6cb89','56ef86e8-c379-4b35-b752-f9a12e0dd2e7'].indexOf(e.id) != -1 
                         })
 
+                    }else if(this.typea == '8b21473c-eac2-4a40-8fb5-ac38985e8952'){
 
+                        return this.CourseTypeJson[tid].filter(e => {
 
+                            return  ['e3365b81-49bb-4de9-a1c2-060e9dc593f3','5670c02b-7cbc-4788-8241-cf6e53dd61fd','25b66132-a125-4c51-8bbe-2653f8be4f0a','da94e547-ba90-4fd5-b95e-d13efca1e248','ba1db98a-0613-4568-92d2-59d53b600675'].indexOf(e.id) != -1 
+                        })
 
                     }else if(this.typeE.indexOf('e4cb3395-5602-4441-801c-f380e8935a74') != -1){
 
                         return this.CourseTypeJson[tid]
 
                     }else{

+ 4 - 0
src/components/pages/teacherSource/index.vue
Vedi File 

@@ -180,6 +180,10 @@ export default {
 
                         return this.CourseTypeJson[tid].filter(e => {
 
                             return  ['c3eaac53-3599-43c6-a224-a9e8b1e6eb7a','65196690-f7bc-4fc2-9175-b9ddc7dcba07','1874291f-96e5-4d9f-8747-170f87edb171','3777ef66-96ff-4f08-8e6d-a7b6acc6cb89','56ef86e8-c379-4b35-b752-f9a12e0dd2e7'].indexOf(e.id) != -1 
                         })
 
+                    }else if(this.typea == '8b21473c-eac2-4a40-8fb5-ac38985e8952'){
 
+                        return this.CourseTypeJson[tid].filter(e => {
 
+                            return  ['e3365b81-49bb-4de9-a1c2-060e9dc593f3','5670c02b-7cbc-4788-8241-cf6e53dd61fd','25b66132-a125-4c51-8bbe-2653f8be4f0a','da94e547-ba90-4fd5-b95e-d13efca1e248','ba1db98a-0613-4568-92d2-59d53b600675'].indexOf(e.id) != -1 
+                        })
 
                     }else if(this.typeE.indexOf('e4cb3395-5602-4441-801c-f380e8935a74') != -1){
 
                         return this.CourseTypeJson[tid]
 
                     }else{

+ 1 - 0
src/main.js
Vedi File 

@@ -18,6 +18,7 @@ import Viewer from 'v-viewer'
 
 import 'viewerjs/dist/viewer.css'
 
 import Clipboard from "clipboard";
 
 import hevueImgPreview from 'hevue-img-preview'
 
+import './assets/css/button.css'
 
 
 const echarts = require('echarts');

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