Home Verkennen Help
Inloggen
CocoRoboLabs
/
pbl-student-table
3
0
Vork 0
Bestanden Issues 0 Pull-aanvragen 0 Wiki
Bladeren bron

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

zengyicheng 2 jaren geleden
bovenliggende
c1041f7a3f 77f02e812a
commit
563b3d661c
11 gewijzigde bestanden met toevoegingen van 22 en 6 verwijderingen
Zij-aan-zij weergave Toon Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.5927a7e8cad57ecb9aa2c3fb6d058470.css
  3. 0 0
      dist/static/css/app.5927a7e8cad57ecb9aa2c3fb6d058470.css.map
  4. 0 0
      dist/static/js/app.872e9c432401c8d81427.js
  5. 0 0
      dist/static/js/app.872e9c432401c8d81427.js.map
  6. 0 0
      dist/static/js/app.9ab91d2660a9ad9c41ad.js
  7. 0 0
      dist/static/js/app.9ab91d2660a9ad9c41ad.js.map
  8. 0 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  9. 19 3
      src/components/index.vue
  10. 1 1
      src/components/study.vue
  11. 1 1
      src/components/studyStudent.vue

+ 1 - 1
dist/index.html
Bestand weergeven 

@@ -18,4 +18,4 @@
 
       border-radius: 10px;
 
       -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
 
       background-color: rgba(0, 0, 0, 0.1);
 
-    }</style><link href=./static/css/app.dba13154fcbda2d016fea6b9d6e504bf.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.ab95705b4e56cfaa9f33.js></script><script type=text/javascript src=./static/js/app.9ab91d2660a9ad9c41ad.js></script></body></html><script>document.domain = "cocorobo.cn"</script>
 
+    }</style><link href=./static/css/app.5927a7e8cad57ecb9aa2c3fb6d058470.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.ab95705b4e56cfaa9f33.js></script><script type=text/javascript src=./static/js/app.872e9c432401c8d81427.js></script></body></html><script>document.domain = "cocorobo.cn"</script>

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


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


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


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


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


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


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


+ 19 - 3
src/components/index.vue
Bestand weergeven 

@@ -108,6 +108,15 @@
 
                     {{ JSON.parse(item.chapters).length }}阶段
 
                   </div>
 
                 </div>
 
+                <el-tooltip
 
+                  effect="light"
 
+                  :content="item.school"
 
+                  placement="top"
 
+                >
 
+                  <div class="school">
 
+                    {{ item.school }}
 
+                  </div>
 
+                </el-tooltip>
 
                 <!-- <div class="people">
 
                   <div class="man">
 
                     <img src="../assets/people.png" alt="" />
 
@@ -129,7 +138,7 @@
 
                       userid +
 
                       '&oid=' +
 
                       oid +
 
-                      '&org='+
 
+                      '&org=' +
 
                       org +
 
                       '&cid=' +
 
                       classId +
 
@@ -417,11 +426,11 @@ export default {
 
     //获取banner
 
     getBanner() {
 
       var a = false;
 
-      if(this.org == "eb2af5e9-ac3d-46b6-9fe3-3c1c364f018d"){
 
+      if (this.org == "eb2af5e9-ac3d-46b6-9fe3-3c1c364f018d") {
 
         a = true;
 
       }
 
       let params = {
 
-        oid: a == false ? this.oid : this.org ,
 
+        oid: a == false ? this.oid : this.org,
 
       };
 
       this.ajax
 
         .get(this.$store.state.api + "selectBannerByOid", params)
 
@@ -819,4 +828,11 @@ export default {
 
   justify-content: flex-start;
 
   align-items: center;
 
 }
 
+.school {
 
+  white-space: nowrap;
 
+  overflow: hidden;
 
+  text-overflow: ellipsis;
 
+  max-width: 100%;
 
+  box-sizing: border-box;
 
+}
 
 </style>

+ 1 - 1
src/components/study.vue
Bestand weergeven 

@@ -4036,7 +4036,7 @@ export default {
 
           stage: this.courseType,
 
           task: this.taskCount,
 
           tool: this.toolindex,
 
-          content: JSON.stringify(this.askList),
 
+          content: JSON.stringify(this.askList).replace(/%/g, "%25"),
 
           type: 2,
 
         },
 
       ];

+ 1 - 1
src/components/studyStudent.vue
Bestand weergeven 

@@ -4263,7 +4263,7 @@ export default {
 
           stage: this.courseType,
 
           task: this.taskCount,
 
           tool: this.toolindex,
 
-          content: JSON.stringify(this.askList),
 
+          content: JSON.stringify(this.askList).replace(/%/g, "%25"),
 
           type: 2,
 
         },
 
       ];

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