提交

src/components/Course/myNote.vue

@@ -23,7 +23,7 @@
                 <div class="mycote-content" v-show="!isEdit" :style="`height:${listHeight}px`">
                     <div v-if="noteList.length > 0">
                     <div style="border-bottom:1px solid #4444;padding-bottom:25px;" v-for="note in noteList" :key="note.id">
-                        <span class="mycote-time">{{note.sysUpdateTime}}
+                        <div class="mycote-time">{{note.sysUpdateTime}}
                             <span class="sm">{{note.openType == 9?'公开':'私密'}}</span>
                             <span class="more">
                                 <el-dropdown>
@@ -38,8 +38,8 @@
                                     </el-dropdown-menu>
                                 </el-dropdown>
                             </span>
-                        </span>
+                        </div>
-                        <div style="margin-top:10px" class="newcote-time" v-if="note.playTime" @click="onPlayVideo(note.contentId,note.playTime)">
+                        <div style="margin-top:10px;" class="newcote-time" v-if="note.playTime" @click="onPlayVideo(note.contentId,note.playTime)">
                             <img :src="`${webBaseUrl}/images/coteplay.png`" alt="">
                             {{formatSeconds(note.playTime)}}
                         </div>
@@ -57,7 +57,7 @@
                 <div v-show="isEdit">
                     <p style="margin-top:37px">
                         <span style="font-size: 14px;color: #333333;margin-left:10px;">{{mynoteData.sysCreateTime}}</span>
-                        <span class="sm">{{mynoteData.openType == 9?'公开':'私密'}}</span>
+                        <span class="sm">{{mynoteData.openType == 9?'公1开':'私密'}}</span>
                         <svg-icon style="float:right;font-size:26px;margin-top:16px" icon-class="spot"></svg-icon>
                     </p>
                     <div class="newcote-content" style="margin-top:10px;min-height:236px;height: 100%;">
@@ -433,6 +433,7 @@ export default {
     .newcote-time {
         display: inline-block;
         min-width: 80px;
+        // width: 100px;
         height: 30px;
         border-radius: 4px;
         border: 1px solid #3379FB;
@@ -516,10 +517,6 @@ export default {
         .mycote-time {
             color: #666;
             font-size: 14px;
-            padding-bottom: 20px;
-
-
-
             .more {
                 margin-top: 12px;
                 float: right;

src/views/ucurrency/Index.vue

@@ -34,7 +34,11 @@
     <div class="experience">
       <div class="exp-hear">
         <div class="exp-hear-text">
-          经验值排行榜<svg-icon style="margin-left: 5px;font-size:20px;padding-top: 4px;" icon-class="doubt"></svg-icon>
+          经验值排行榜
+          <el-tooltip placement="top"  effect="light">
+            <div slot="content">占位内容<br/>占位内容</div>
+            <svg-icon style="margin-left: 5px;font-size:20px;padding-top: 4px;" icon-class="doubt"></svg-icon>
+          </el-tooltip>
           <span class="exp-hear-textbor"></span>
         </div>
         <div class="exp-hear-xiala">
@@ -212,6 +216,7 @@
     },
     data() {
       return {
+        percentageNum:0,
         cutOrgNamePath:cutOrgNamePath,
         chatData:[],
         isShowChart:false,
@@ -450,8 +455,34 @@
               }
             },
             label: {
-              show: false,
+              show: true,
               position: 'center',
+              formatter:`{total|${this.percentageNum}%}\n{active|来源top3}`,
+              // formatter: function(name) {
+              //   console.log(name,'name');
+                // let data = option.series[0].data;
+                // let total = 0;
+                // let tarValue = 0; //每一项值
+                // for (let i = 0; i < data.length; i++) {
+                //   total += data[i].value;
+                //   if (data[i].name == name) {
+                //     tarValue = data[i].value;
+                //   }
+                // }
+                // let p = total != 0 ? Math.round((tarValue / total) * 100) + '%' : 0 + '%';
+                // return ` ${p}  ${name}`
+              // },
+              rich:{
+                total:{
+                  fontSize:20,
+                  color:'#000',
+                },
+                active: {
+                  fontSize:16,
+                  color:'#333',
+                  lineHeight:30,
+                }
+              }
             },
             labelLine: {
               show: false
@@ -472,15 +503,28 @@
               })
             }
             let chatData = [];
+            let total = null;
+            let totalList = [];
             for (let key in res.result.chatData) {
               if(res.result.chatData[key] > 0) {
                  this.isShowChart = true;
               }
+              total += res.result.chatData[key];
+              totalList.push(res.result.chatData[key]);
               chatData.push({
                 value: res.result.chatData[key],
                 name: this.getUType(key)
               })
             }
+            totalList.sort();
+            totalList = totalList.splice(1,3);
+            let top3 = null;
+            totalList.forEach(item => {
+              top3+=item;
+            })
+            this.percentageNum = (top3/total)*100;
+            console.log(top3,total,this.percentageNum,'3333');
+            console.log(totalList,'totalList');
             this.chatData = chatData;
             this.initChat(chatData);
           }