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' of https://git.cocorobo.cn/CocoRoboLabs/pbl-student-table into beta

zengyicheng 1 year ago
parent
ebb18d376c c4ccfa316d
commit
643de061a6
12 changed files with 49 additions and 10 deletions
Split View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.8c2f312f984f0ee8ac398fee14eafcaa.css.map
  3. 0 0
      dist/static/css/app.b77b7d43b4753901043c4ba6737afd81.css
  4. 0 0
      dist/static/css/app.b77b7d43b4753901043c4ba6737afd81.css.map
  5. 0 0
      dist/static/js/app.389a32db8c75ad92090c.js
  6. 0 0
      dist/static/js/app.689570152446ccda6cee.js
  7. 0 0
      dist/static/js/app.689570152446ccda6cee.js.map
  8. 0 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  9. 5 0
      src/components/easy2/studyStudent.vue
  10. 5 0
      src/components/easy3/studyStudent.vue
  11. 7 2
      src/components/studyStudent.vue
  12. 31 7
      src/components/tools/sunburst.vue

+ 1 - 1
dist/index.html
View File 

@@ -18,7 +18,7 @@
 
       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.8c2f312f984f0ee8ac398fee14eafcaa.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.9620f608e27ed45c9681.js></script><script type=text/javascript src=./static/js/app.389a32db8c75ad92090c.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.b77b7d43b4753901043c4ba6737afd81.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.9620f608e27ed45c9681.js></script><script type=text/javascript src=./static/js/app.689570152446ccda6cee.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.8c2f312f984f0ee8ac398fee14eafcaa.css.map


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


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


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


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


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


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


+ 5 - 0
src/components/easy2/studyStudent.vue
View File 

@@ -13,6 +13,11 @@
 
       <div class="btnAllNT">
 
         <!-- <img src="../../assets/icon/learn/screen.png" @click="allScrell" /> -->
 
         <img
 
+          v-if="
 
+                courseDetail.userid == userid ||
 
+                (courseDetail.course_teacher &&
 
+                  courseDetail.course_teacher.indexOf(userid) != -1)
 
+              "
 
           src="../../assets/icon/learn/addTool.png"
 
           @click="openToolAll"
 
           style="position: relative"

+ 5 - 0
src/components/easy3/studyStudent.vue
View File 

@@ -13,6 +13,11 @@
 
       <div class="btnAllNT">
 
         <!-- <img src="../../assets/icon/learn/screen.png" @click="allScrell" /> -->
 
         <img
 
+        v-if="
 
+                courseDetail.userid == userid ||
 
+                (courseDetail.course_teacher &&
 
+                  courseDetail.course_teacher.indexOf(userid) != -1)
 
+              "
 
           src="../../assets/icon/learn/addTool.png"
 
           @click="openToolAll"
 
           style="position: relative"

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

@@ -13,6 +13,11 @@
 
       <div class="btnAllNT">
 
         <!-- <img src="../../assets/icon/learn/screen.png" @click="allScrell" /> -->
 
         <img
 
+          v-if="
 
+                courseDetail.userid == userid ||
 
+                (courseDetail.course_teacher &&
 
+                  courseDetail.course_teacher.indexOf(userid) != -1)
 
+              "
 
           src="../assets/icon/learn/addTool.png"
 
           @click="openToolAll"
 
           style="position: relative"
 
@@ -7502,11 +7507,11 @@
 
                             @click="typeMode = 2"
 
                             >目标罗盘</span
 
                           >
 
-                          <span
 
+                          <!-- <span
 
                             :class="{ active: typeMode == 3 }"
 
                             @click="typeMode = 3"
 
                             >目标看板</span
 
-                          >
 
+                          > -->
 
                         </div>
 
                       </div>
 
                       <div class="e_add_list_pbox_content">

+ 31 - 7
src/components/tools/sunburst.vue
View File 

@@ -22,19 +22,43 @@ export default {
 
       timer: null,
 
       ooption: [],
 
       option: {
 
-        tooltip:{},
 
+        tooltip:{
 
+          formatter: function (params) {
 
+            var newParamsName = "";
 
+            var paramsNameNumber = params.name.length;
 
+            var provideNumber = 20;  //一行显示几个字
 
+            var rowNumber = Math.ceil(paramsNameNumber / provideNumber);
 
+            if (paramsNameNumber > provideNumber) {
 
+              for (var p = 0; p <rowNumber; p++) {
 
+                var tempStr = "";
 
+                var start = p * provideNumber;
 
+                var end = start + provideNumber;
 
+                if (p == rowNumber - 1) {
 
+                  tempStr = params.name.substring(start, paramsNameNumber);
 
+                } else {
 
+                  tempStr = params.name.substring(start, end) + "</br>";
 
+                }
 
+                newParamsName += tempStr;
 
+              }
 
+
 
+            } else {
 
+              newParamsName = params.name;
 
+            }
 
+            return newParamsName
 
+          }
 
+        },
 
         series: {
 
           type: "sunburst",
 
           data: [],
 
           radius: [30, "90%"],
 
           label: {
 
             rotate: "radial",
 
-            // formatter: function (val) {
 
-            //   // console.log(val);
 
-            //   return val.name.length > 5
 
-            //     ? val.name.substring(0, 6) + '...'
 
-            //     : val.name;
 
-            // }
 
+            formatter: function (val) {
 
+              // console.log(val);
 
+              return val.name.length > 5
 
+                ? val.name.substring(0, 6) + '...'
 
+                : val.name;
 
+            }
 
           },
 
         },
 
       }

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