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

Merge branch 'beta'

qgt 2 days ago
parent
668fde1186 a43cf85629
commit
5c4ef7867c
13 changed files with 47 additions and 16 deletions
Split View Show Diff Stats
  1. 7 2
      dist/index.html
  2. 0 0
      dist/static/css/app.1f037d2f231e748621ae7c93031f6fde.css
  3. 0 0
      dist/static/css/app.1f037d2f231e748621ae7c93031f6fde.css.map
  4. 0 0
      dist/static/js/app.098ae50a47183e0e1359.js
  5. 0 0
      dist/static/js/app.098ae50a47183e0e1359.js.map
  6. 0 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  7. 7 0
      index.html
  8. 2 2
      src/components/easy2/studyStudent.vue
  9. 2 2
      src/components/easy3/studyStudent.vue
  10. 10 3
      src/components/pptEasyClass/index.vue
  11. 2 2
      src/components/studyStudent.vue
  12. 2 2
      src/components/studySutdentClass/studyStudent.vue
  13. 15 3
      src/router/index.js

+ 7 - 2
dist/index.html
View File 

@@ -1,4 +1,9 @@
 
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>pbl-student</title><base target=_blank><style>/* @charset "utf-8";
 
+<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=Content-Security-Policy content="default-src * data: blob: 'unsafe-inline' 'unsafe-eval';
 
+           media-src * data: blob:;
 
+           script-src * 'unsafe-inline' 'unsafe-eval';
 
+           style-src * 'unsafe-inline' 'unsafe-hashes';
 
+           img-src * data: blob:;
 
+           font-src * data:;"><meta name=viewport content="width=device-width,initial-scale=1"><title>pbl-student</title><base target=_blank><style>/* @charset "utf-8";
 
      @font-face {
 
         font-family: 'Source Han Sans SC';
 
         src: url('./static/SourceHanSans-Regular.otf') format('truetype');
 
@@ -27,7 +32,7 @@
 
     html,
 
     body{
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.56d641f39efd9b1861d9b4b522d2f7e9.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.becc9317549795ada446.js></script><script type=text/javascript src=./static/js/app.11b0513dd91ea59bbc4e.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.1f037d2f231e748621ae7c93031f6fde.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.becc9317549795ada446.js></script><script type=text/javascript src=./static/js/app.098ae50a47183e0e1359.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.1f037d2f231e748621ae7c93031f6fde.css


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


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


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


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


+ 7 - 0
index.html
View File 

@@ -3,6 +3,13 @@
 
 
 <head>
 
   <meta charset="utf-8">
 
+  <meta http-equiv="Content-Security-Policy" 
+  content="default-src * data: blob: 'unsafe-inline' 'unsafe-eval';
 
+           media-src * data: blob:;
 
+           script-src * 'unsafe-inline' 'unsafe-eval';
 
+           style-src * 'unsafe-inline' 'unsafe-hashes';
 
+           img-src * data: blob:;
 
+           font-src * data:;">
 
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
   <title>pbl-student</title>
 
 	<base target="_blank">

+ 2 - 2
src/components/easy2/studyStudent.vue
View File 

@@ -886,7 +886,7 @@
 
                                 <span v-if="vitem.text">{{ vitem.text }}-</span
 
                                 >{{ vitem.name }}
 
                               </div>
 
-                              <!-- <div
 
+                              <div
 
                                 class="downIcon"
 
                                 @click="downloadFile2(vitem)"
 
                               >
 
@@ -894,7 +894,7 @@
 
                                   src="../../assets/icon/newIcon/down.png"
 
                                   alt
 
                                 />
 
-                              </div> -->
 
+                              </div>
 
                             </div>
 
                           </div>
 
                         </div>

+ 2 - 2
src/components/easy3/studyStudent.vue
View File 

@@ -889,7 +889,7 @@
 
                                 <span v-if="vitem.text">{{ vitem.text }}-</span
 
                                 >{{ vitem.name }}
 
                               </div>
 
-                              <!-- <div
 
+                              <div
 
                                 class="downIcon"
 
                                 @click="downloadFile2(vitem)"
 
                               >
 
@@ -897,7 +897,7 @@
 
                                   src="../../assets/icon/newIcon/down.png"
 
                                   alt
 
                                 />
 
-                              </div> -->
 
+                              </div>
 
                             </div>
 
                           </div>
 
                         </div>

+ 10 - 3
src/components/pptEasyClass/index.vue
View File 

@@ -16,9 +16,11 @@
 
           </div>
 
         </div>
 
         <div class="pec_h_center">
 
-          <div class="pec_h_l_title">
 
-            <span>{{ courseDetail.title }}</span>
 
-          </div>
 
+          <el-tooltip effect="dark" :content="courseDetail.title" placement="bottom">
 
+            <div class="pec_h_l_title">
 
+              <span>{{ courseDetail.title }}</span>
 
+            </div>
 
+          </el-tooltip>
 
           <div class="free-browse-switch" v-if="courseDetail.userid == userid">
 
             <el-switch
 
               v-model="freeBrowse"
 
@@ -302,6 +304,7 @@ export default {
 
   overflow: hidden;
 
   box-sizing: border-box;
 
   background-color: #f2f2f2;
 
+  min-height: unset;
 
 }
 
 
 .pec_main {
 
@@ -348,6 +351,10 @@ export default {
 
   font-weight: bold;
 
   font-size: 20px;
 
   color: #0e1e33;
 
+  overflow: hidden;
 
+  white-space: nowrap;
 
+  max-width: 500px;
 
+  text-overflow: ellipsis;
 
 }
 
 
 .pec_h_right {

+ 2 - 2
src/components/studyStudent.vue
View File 

@@ -848,7 +848,7 @@
 
                                 <span v-if="vitem.text">{{ vitem.text }}-</span
 
                                 >{{ vitem.name }}
 
                               </div>
 
-                              <!-- <div
 
+                              <div
 
                                 class="downIcon"
 
                                 @click="downloadFile2(vitem)"
 
                               >
 
@@ -856,7 +856,7 @@
 
                                   src="../assets/icon/newIcon/down.png"
 
                                   alt
 
                                 />
 
-                              </div> -->
 
+                              </div>
 
                             </div>
 
                           </div>
 
                         </div>

+ 2 - 2
src/components/studySutdentClass/studyStudent.vue
View File 

@@ -887,7 +887,7 @@
 
                                 <span v-if="vitem.text">{{ vitem.text }}-</span
 
                                 >{{ vitem.name }}
 
                               </div>
 
-                              <!-- <div
 
+                              <div
 
                                 class="downIcon"
 
                                 @click="downloadFile2(vitem)"
 
                               >
 
@@ -895,7 +895,7 @@
 
                                   src="../../assets/icon/newIcon/down.png"
 
                                   alt
 
                                 />
 
-                              </div> -->
 
+                              </div>
 
                             </div>
 
                           </div>
 
                         </div>

+ 15 - 3
src/router/index.js
View File 

@@ -51,20 +51,32 @@ Vue.use(Router)
 
 let lang = new Object();
 
 let domain_name = "";
 
 
-if (window.location.href.includes("cocorobo.cn")) {
 
+
 
+let region = 'cn'
 
+
 
+if (window.location.href.includes('beta') || window.location.href.includes('localhost')) {
 
   domain_name="cn";
 
+  region = 'beta'
 
+  lang = cn;
 
+}else if (window.location.href.includes("cocorobo.cn")) {
 
+  domain_name="cn";
 
+  region = 'cn'
 
   lang = cn;
 
 } else if (window.location.href.includes("cocorobo.hk")) {
 
   domain_name="hk";
 
+   region = 'hk'
 
   lang = hk;
 
 } else if (window.location.href.includes("cocorobo.com")) {
 
   domain_name="com";
 
+   region = 'com'
 
   lang=en;
 
 }else{
 
-  domain_name="cn";
 
-  lang=cn;
 
+   region = 'cn'
 
+   domain_name="cn";
 
+   lang=cn;
 
 }
 
 Vue.prototype.lang =lang;
 
+Vue.prototype.$region = region
 
 if(domain_name==='com'){//英文版
 
 	Vue.use(ElementUI,{locale})
 
 }else{

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