lsc 1 yıl önce
ebeveyn
işleme
12f54d4589

+ 1 - 1
build/webpack.base.conf.js

@@ -64,7 +64,7 @@ module.exports = {
           limit: 10000,
           name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
         }
-      }
+      },
     ]
   },
   node: {

+ 1 - 1
config/index.js

@@ -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,

+ 10 - 10
package-lock.json

@@ -56,7 +56,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",
@@ -72,7 +72,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",
@@ -5672,8 +5672,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",
@@ -16149,8 +16149,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",
@@ -22998,8 +22998,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",
@@ -31610,8 +31610,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

@@ -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"
   },
@@ -58,7 +58,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",
@@ -74,7 +74,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",

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


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


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


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


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


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


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


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


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


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


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


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


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


Dosya farkı çok büyük olduğundan ihmal edildi
+ 288 - 650
src/components/pages/addCourse.vue


+ 94 - 35
src/components/pages/course.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="pb_content" style="height: auto; width: 94%; margin: 0 auto">
+  <div class="pb_content" style="height: auto; width: 94%; margin: 0 auto;background: unset;">
     <div class="pb_head top">
       <div>
         <span class="sub_head">课程管理</span>
@@ -127,7 +127,7 @@
       </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 +222,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 +285,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>
@@ -1193,6 +1198,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;
@@ -1234,9 +1247,13 @@ export default {
 }
 
 .top {
-  display: flex;
-  justify-content: space-between;
-  width: 97% !important;
+    display: flex;
+    justify-content: space-between;
+    width: 100% !important;
+    background: #fff;
+    box-sizing: border-box;
+    margin: 0px auto;
+    padding: 10px 15px;
 }
 
 .bgColor {
@@ -1270,7 +1287,7 @@ export default {
 }
 
 .student_table {
-  padding: 20px 0;
+  /* padding: 20px 0; */
   height: 100%;
   /* overflow: auto; */
   min-height: 360px;
@@ -1334,8 +1351,9 @@ export default {
 }
 
 .student_page {
-  width: 95%;
+  width: 100%;
   margin: 0 auto;
+  background: #e6eaf0;
 }
 
 .course_create_box {
@@ -1418,21 +1436,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;
@@ -1441,19 +1472,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 {
@@ -1465,7 +1499,10 @@ export default {
 .kc_time {
   margin-top: 8px;
   font-size: 14px;
-  color: #999;
+  color: #717C8D;
+}
+.kc_time + .kc_time {
+  margin-top: 0;
 }
 
 .kc_t {
@@ -1480,18 +1517,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 {
@@ -1589,7 +1644,7 @@ export default {
   background: #3c3c3c;
   width: 70px;
   height: 30px;
-  border-radius: 30px;
+  border-radius: 5px;
   color: #fff;
   font-size: 14px;
   text-align: center;
@@ -1603,7 +1658,7 @@ export default {
   background: #41a5f0;
   width: 70px;
   height: 30px;
-  border-radius: 30px;
+  border-radius: 5px;
   color: #fff;
   font-size: 14px;
   text-align: center;
@@ -1684,11 +1739,13 @@ export default {
 
 .reBox {
   background: #fff;
-  width: 97%;
-  border-radius: 5px;
-  /* padding-left: 20px; */
-  margin: 0 auto;
-  box-sizing: border-box;
+    width: 100%;
+    border-radius: 0 5px;
+    /* padding-left: 20px; */
+    margin: 0 auto;
+    box-sizing: border-box;
+    overflow: hidden;
+    padding: 10px 15px 0;
 }
 
 .reTop {
@@ -1726,6 +1783,8 @@ export default {
 .search {
   width: 20px;
   padding: 0 5px;
+  display:flex;
+  align-items: center;
 }
 
 .search > img {

Dosya farkı çok büyük olduğundan ihmal edildi
+ 289 - 632
src/components/pages/easy/addCourse.vue


Dosya farkı çok büyük olduğundan ihmal edildi
+ 282 - 410
src/components/pages/task/addCourse.vue


Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor