Signed-off-by: Changpeng Duan <838560574@qq.com>

tv/.idea/workspace.xml

@@ -20,102 +20,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="c813a37b-038b-4bb1-a925-c03a432a7638" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/assets/css/main.css" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/assets/css/mainBk.css" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/assets/css/mainBk2.css" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/components/newRecord.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/libs/rem.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/blue.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/ck.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/ck.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/fire.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/foot.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/heart.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/kaluli.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/logo.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/newRecord/record.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/newRecord/record_icon.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/newRecord/record_title.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/people/dcp.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/people/gc.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/people/jy.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/people/jyq.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/people/lhs.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/people/lxl.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/people/lyh.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/people/slc.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/people/sxf.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/people/sxf2.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/people/wfl.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/people/wzx.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/people/ydy.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/people/zjh.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/people/zr.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/people/zw.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/people/zy.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/pingtai.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/pk/bcube.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/pk/bfight.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/pk/blue.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/pk/left_power.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/pk/light.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/pk/rcube.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/pk/red.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/pk/rfight.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/pk/right_power.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/pk/vs.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/pkBg.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/rank/boy.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/rank/girl.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/s1.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/s2.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/superfire.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/t1.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/t2.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/t3.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/t4.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/t5.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/t6.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/wifi.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/yellowFire.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/views/pk.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../app/public/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/../app/public/index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../app/src/App.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../app/src/App.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../app/src/api/getApiRes.js" beforeDir="false" afterPath="$PROJECT_DIR$/../app/src/api/getApiRes.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../app/src/page/appoint.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../app/src/page/appoint.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../app/src/page/lesson.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../app/src/page/lesson.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../app/src/page/login.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../app/src/page/login.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../app/src/page/mainpage.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../app/src/page/mainpage.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../app/src/page/mine.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../app/src/page/mine.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../app/src/page/record.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../app/src/page/record.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../pc/public/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/public/index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../pc/src/api/Navs.js" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/src/api/Navs.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../pc/src/components/preview.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/src/components/preview.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../pc/src/views/Lesson.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/src/views/Lesson.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../pc/src/views/LessonTable.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/src/views/LessonTable.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../pc/src/views/Login.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/src/views/Login.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../pc/src/views/appoint.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/src/views/appoint.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../pc/src/views/heartLog.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/src/views/heartLog.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../pc/src/views/region.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/src/views/region.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/public/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/App.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/App.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Global.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/Global.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Mock/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/Mock/index.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/api/getApiRes.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/api/getApiRes.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/components/Headside.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/Headside.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/router/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/router/index.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/static/img/mainBg.png" beforeDir="false" afterPath="$PROJECT_DIR$/src/static/img/mainBg.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/static/img/rankBg.png" beforeDir="false" afterPath="$PROJECT_DIR$/src/static/img/rankBg.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/views/Index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/Index.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/views/Main.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/Main.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/views/Rank.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/Rank.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vue.config.js" beforeDir="false" afterPath="$PROJECT_DIR$/vue.config.js" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -128,11 +34,20 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/views/Rank.vue">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="427">
+              <caret line="66" column="45" lean-forward="true" selection-start-line="66" selection-start-column="45" selection-end-line="66" selection-end-column="45" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/views/Main.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="295">
-              <caret line="204" column="13" lean-forward="true" selection-start-line="204" selection-start-column="13" selection-end-line="204" selection-end-column="13" />
+            <state relative-caret-position="590">
+              <caret line="415" column="52" selection-start-line="415" selection-start-column="52" selection-end-line="415" selection-end-column="52" />
               <folding>
                 <element signature="e#5171#5215#0" expanded="true" />
               </folding>
@@ -153,8 +68,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>fastJump</find>
-      <find>bottomLi</find>
       <find>.bottomLi span</find>
       <find>four</find>
       <find>width: 3rem</find>
@@ -183,6 +96,8 @@
       <find>box-shadow</find>
       <find>twelve</find>
       <find>heart</find>
+      <find>.dghead img</find>
+      <find>.max</find>
     </findStrings>
     <replaceStrings>
       <replace>0.2rem</replace>
@@ -235,60 +150,7 @@
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
-    <panes>
-      <pane id="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="tv" type="b2602c69:ProjectViewProjectNode" />
-              <item name="tv" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="tv" type="b2602c69:ProjectViewProjectNode" />
-              <item name="tv" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="tv" type="b2602c69:ProjectViewProjectNode" />
-              <item name="tv" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="router" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="tv" type="b2602c69:ProjectViewProjectNode" />
-              <item name="tv" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="static" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="tv" type="b2602c69:ProjectViewProjectNode" />
-              <item name="tv" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="static" type="462c0819:PsiDirectoryNode" />
-              <item name="img" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="tv" type="b2602c69:ProjectViewProjectNode" />
-              <item name="tv" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="static" type="462c0819:PsiDirectoryNode" />
-              <item name="img" type="462c0819:PsiDirectoryNode" />
-              <item name="newRecord" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="tv" type="b2602c69:ProjectViewProjectNode" />
-              <item name="tv" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="static" type="462c0819:PsiDirectoryNode" />
-              <item name="img" type="462c0819:PsiDirectoryNode" />
-              <item name="people" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-    </panes>
+    <panes />
   </component>
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
@@ -313,9 +175,6 @@
     <property name="vue.rearranger.settings.migration" value="true" />
   </component>
   <component name="RecentsManager">
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="D:\wwwroot\flyLong\tv\src\static\img" />
-    </key>
     <key name="CopyFile.RECENT_KEYS">
       <recent name="D:\wwwroot\flyLong\tv\src\static\img\people" />
       <recent name="D:\wwwroot\flyLong\tv\src\static\img" />
@@ -323,6 +182,9 @@
       <recent name="D:\wwwroot\flyLong\tv\src\static\img\newRecord" />
       <recent name="D:\wwwroot\flyLong\tv\src\static\img\pk" />
     </key>
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="D:\wwwroot\flyLong\tv\src\static\img" />
+    </key>
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -382,12 +244,12 @@
       <workItem from="1604539672735" duration="79000" />
       <workItem from="1604540536502" duration="646000" />
       <workItem from="1604541901536" duration="160559000" />
-      <workItem from="1605406240238" duration="799000" />
+      <workItem from="1605406240238" duration="11444000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="162004000" />
+    <option name="totallyTimeSpent" value="172649000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-2568" y="-8" width="2576" height="1395" extended-state="6" />
@@ -640,13 +502,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/Rank.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="273">
-          <caret line="88" column="33" selection-start-line="88" selection-start-column="33" selection-end-line="88" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/views/pk.vue">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="275">
@@ -657,10 +512,17 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/views/Rank.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="427">
+          <caret line="66" column="45" lean-forward="true" selection-start-line="66" selection-start-column="45" selection-end-line="66" selection-end-column="45" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/views/Main.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="204" column="13" lean-forward="true" selection-start-line="204" selection-start-column="13" selection-end-line="204" selection-end-column="13" />
+        <state relative-caret-position="590">
+          <caret line="415" column="52" selection-start-line="415" selection-start-column="52" selection-end-line="415" selection-end-column="52" />
           <folding>
             <element signature="e#5171#5215#0" expanded="true" />
           </folding>

tv/src/views/Main.vue

@@ -132,7 +132,7 @@
                 contentStyleObj:{
                     animation: 'mymove 1s'
                 },
-                trueDate: false,//真实数据 true false
+                trueDate: true,//真实数据 true false
                 times: 1,
                 thisClassName: '',
                 studentsClassName: [],
@@ -227,6 +227,7 @@
         methods: {
             fakeNews() {
                 let item = [];
+                // 1 2 3 5 9 11 13 16 21
                 let fakeNums = 1;
                 for (var i = 0; i < fakeNums; i++) {
                     item.push(
@@ -234,9 +235,11 @@
                             "SvId": 1,
                             "UserId": 1,
                             "Cle": 9999,
-                            "realHr":parseInt( Math.random() *100 +50),
+                            "realHr1":parseInt( Math.random() *100 +50),
+                            "realHr":110,
                             "heartRate": 100,
-                            "activePercent":parseInt( Math.random() *100 +50),
+                            "activePercen1t":parseInt( Math.random() *100 +50),
+                            "activePercent":30,
                             "Steps": 99999,
                             "PureCalorieNoVo2": 9999,
                             "Name": "东南西北",
@@ -284,7 +287,7 @@
 
                         if (that.times == 1) {
                             that.students = json.Rs;
-                            if(!json.Rs) return false
+                            if(!json.Rs) return false;
                             // 添加头像 和 姓名
                             that.students.map(function (i, v) {
                                 i.head = that.headImg[v].name;
@@ -409,7 +412,8 @@
                 if (val == 0) {
                     return '0'
                 } else {
-                    return parseInt(val);
+                    // return parseInt(val);
+                    return parseFloat(val).toFixed(3);
                 }
             },
         },
@@ -979,11 +983,11 @@
 
     .max .bottomLi .btck {
         width: 29%;
-        padding-left: 0%;
+        padding-left: 3%;
     }
 
     .max .bottomLi .step {
-        width: 25%;
+        width: 24%;
         padding-right: 2%;
     }
     .max .cla em.plus {
@@ -994,6 +998,11 @@
         position: relative;
         left: 2.75rem
     }
+    .max .bottomLi .btck img {
+        width: 0.6rem;
+        height: 0.6rem;
+        margin-top: 0;
+    }
 
 
     /*two*/
@@ -1081,8 +1090,8 @@
     }
 
     .two .bottomLi .step {
-        width: 25%;
-        padding-right: 5%;
+        width: 26%;
+        padding-right:4%;
     }
     .two .cla em.plus {
         position: relative;
@@ -1092,6 +1101,11 @@
         position: relative;
         left: 2.2rem
     }
+    .two .bottomLi .btck img {
+        width: 0.6rem;
+        height: 0.6rem;
+        margin-top: 0.05rem;
+    }
 
 
     /*three*/
@@ -1179,13 +1193,13 @@
     }
 
     .three .bottomLi .btck {
-        width: 29%;
-        padding-left: 0%;
+        width: 30%;
+        padding-left: 2%;
     }
 
     .three .bottomLi .step {
         width: 25%;
-        padding-right: 5%;
+        padding-right: 2%;
     }
 
     .three .cla em.plus {
@@ -1196,6 +1210,11 @@
         position: relative;
         left: 1.9rem
     }
+    .three .bottomLi .btck img {
+        width: 0.6rem;
+        height: 0.6rem;
+        margin-top: 0.05rem;
+    }
 
     /*six*/
     .six {
@@ -1305,8 +1324,8 @@
     }
 
     .six .bottomLi .step {
-        width: 29%;
-        padding-right: 1%;
+        width: 27%;
+        padding-right: 2%;
     }
     .six .cla em.plus {
         position: relative;
@@ -1316,6 +1335,11 @@
         position: relative;
         left: 1.3rem
     }
+    .six .bottomLi .btck img {
+        width: 0.5rem;
+        height: 0.5rem;
+        margin-top: 0.07rem;
+    }
 
 
     /*nine*/
@@ -1409,12 +1433,12 @@
 
     .nine .bottomLi .btck {
         width: 32%;
-        padding-left: 3%;
+        padding-left: 2%;
     }
 
     .nine .bottomLi .step {
         width: 27%;
-        padding-right: 2%;
+        padding-right: 1%;
     }
     .nine .cla em.plus {
         position: relative;
@@ -1425,6 +1449,12 @@
         left: 1.3rem
     }
 
+    .nine .bottomLi .btck img {
+        width: 0.45rem;
+        height: 0.45rem;
+        margin-top: 0.15rem;
+    }
+
     /*ten*/
     .ten {
         width: 25%;
@@ -1580,7 +1610,7 @@
         font-size: 0.25rem;
         top: -0.8rem;
         float: left;
-        left: 0rem;
+        left: 0;
     }
 
     .twelve .cla em {
@@ -1649,6 +1679,11 @@
         width: 0.3rem;
         height: 0.3rem;
     }
+    .twelve .btck img {
+        width: 0.35rem;
+        height: 0.35rem;
+        margin-top: 0.22rem;
+    }
 
 
     /*sixteen*/
@@ -1747,7 +1782,7 @@
 
     .sixteen .bottomLi .step {
         width: 27%;
-        padding-right: 1%;
+        padding-right: 3%;
         /*text-align: center;*/
     }
     .sixteen .cla em.plus {
@@ -1979,5 +2014,10 @@
         left: 0.8rem;
         line-height: 0.45rem;
     }
+    .twentyFour .btck img {
+        width: 0.3rem;
+        height: 0.3rem;
+        margin-top: 0.11rem;
+    }
 
 </style>

tv/src/views/Rank.vue

@@ -4,43 +4,33 @@
         <div class="rankContainer">
             <div class="lt">
                 <div class="recordMain">
-                    <el-carousel :interval="30000" height="370px">
-                        <el-carousel-item>
-                            <h5>本周场馆卡路里总消耗</h5>
+                    <el-carousel :interval="30000" height="370px" >
+                        <el-carousel-item v-for="rs in recordMain">
+                            <h5>{{rs.title}}</h5>
                             <div class="sumContainer">
                                 <div class="sum">
-                                    <s>千卡</s>
-                                    <em>{{sum}}</em>
-                                </div>
-                                <span class="sumBg"></span>
-                            </div>
-                        </el-carousel-item>
-                        <el-carousel-item>
-                            <h5>本周场馆CK总消耗</h5>
-                            <div class="sumContainer">
-                                <div class="sum">
-                                    <s>千卡</s>
-                                    <em>{{sum}}</em>
+                                    <s>{{rs.Unite}}</s>
+                                    <em>{{rs.Result}}</em>
                                 </div>
                                 <span class="sumBg"></span>
                             </div>
                         </el-carousel-item>
                     </el-carousel>
                 </div>
-
                 <div class="bottom">
                     <el-carousel :interval="15000" height="280px">
-                        <el-carousel-item>
-                            <div class="topOne">
-                                <h5>单次CK值（新个人记录）</h5>
+                        <el-carousel-item v-for="Rs in bottom">
+                            <div class="topOne" v-if="Rs.style == 'topOne'">
+                                <h5>{{Rs.title}}</h5>
+                                {{bottom.students}}
                                 <ul>
-                                    <li v-for="(hero,i) in studentsLimit">
+                                    <li v-for="(hero,i) in Rs.students">
                                         <div class="dgCenter">
                                             <div class="dghead">
                                                 <!--<img v-bind:src="require('../static/img/people/' + topMsg.head)" alt="">-->
                                                 <img :id="'circle_'+i"
                                                      v-bind:src="require('../static/img/people/' + hero.head)" alt="">
-                                                <s>{{ topMsg.name }}</s>
+                                                <s>{{ topMsg.userName }}</s>
                                             </div>
                                             <div class="score">
                                                 <em>{{ topMsg.ck }}</em>
@@ -52,18 +42,16 @@
                                     </li>
                                 </ul>
                             </div>
-                        </el-carousel-item>
-                        <el-carousel-item>
-                            <div class="heros">
-                                <h5>本周卡路里消耗英雄榜</h5>
+                            <div class="heros" v-if="Rs.style == 'heros'">
+                                <h5>{{Rs.title}}</h5>
                                 <ul>
-                                    <li v-for="(hero,i) in studentsLimit">
+                                    <li v-for="(hero,i) in Rs.students">
                                         <img :id="'circle_'+i" v-bind:src="require('../static/img/people/' + hero.head)"
                                              alt="">
                                         <img src="../static/img/rank/boy.png" class="sex" v-if="hero.sex == 1"/>
                                         <img src="../static/img/rank/girl.png" class="sex" v-if="hero.sex == 2"/>
                                         <div>
-                                            <em :id="'red_'+i">No.{{i+1}}</em> {{ hero.name }}
+                                            <em :id="'red_'+i">No.{{i+1}}</em> {{ hero.userName }}
                                         </div>
                                         <span>{{ hero.calorie }} 千卡</span>
                                     </li>
@@ -75,20 +63,10 @@
             </div>
             <div class="rt">
                 <el-carousel :interval="15000" height="610px">
-                    <el-carousel-item>
-                        <h5>月度CK值排行</h5>
-                        <ul>
-                            <li v-for="s in students">
-                                <img v-bind:src="require('../static/img/people/' + s.head)" alt="">
-                                <em>{{s.name}}</em>
-                                <s>{{s.ck}}</s>
-                            </li>
-                        </ul>
-                    </el-carousel-item>
-                    <el-carousel-item>
-                        <h5>月度卡路里排行</h5>
+                    <el-carousel-item v-for="Rs in rt">
+                        <h5>{{Rs.title}}</h5>
                         <ul>
-                            <li v-for="s in students">
+                            <li v-for="s in Rs.students">
                                 <img v-bind:src="require('../static/img/people/' + s.head)" alt="">
                                 <em>{{s.name}}</em>
                                 <s>{{s.ck}}</s>
@@ -112,12 +90,37 @@
             return {
                 trueDate: false,//真实数据 true false
                 fakeNums: 8,//
-                sum: '99999',
                 unite: '卡路里',
                 topMsg: '',
                 students: [],
                 studentsLimit: [],
                 showType: 2,//1 单人
+                recordMain:[
+                    {title:'本周场馆卡路里总消耗',Result:'1234',Unite:'千卡'},
+                    {title:'本月场馆卡路里总消耗',Result:'12345',Unite:'千卡'},
+                ],
+                bottom:[
+                    {
+                        title:'单次CK值（新个人记录）',
+                        students:this.fakeNewsLimit(),
+                        style:'topOne'
+                    },
+                    {
+                        title:'本周卡路里消耗英雄榜',
+                        students:this.fakeNewsLimit(),
+                        style:'heros'
+                    },
+                ],
+                rt:[
+                    {
+                        title:'月度CK值排行',
+                        students:this.fakeNews(),
+                    },
+                    {
+                        title:'月度卡路里值排行',
+                        students:this.fakeNews(),
+                    }
+                ]
             }
         },
         mounted() {
@@ -148,7 +151,7 @@
                             "name": "杨东艳",
                             "updateTime": 1604568915582,
                             "activePercent": i * 5,
-                            "ck": 115 - i,
+                            "ck": 115.9 - i,
                             "head": 'gc.png'
                         }
                     )
@@ -170,7 +173,7 @@
                             "name": "杨东艳",
                             "updateTime": 1604568915582,
                             "activePercent": i * 5,
-                            "ck": i + 115,
+                            "ck": i + 115.1,
                             "sex": 1,
                             "head": 'gc.png'
                         }
@@ -366,13 +369,19 @@
         overflow: hidden;
         display: block;
         margin: 0 auto;
-        padding-left: 0.1rem;
+        padding-left: 2px;
         padding-top: 0.1rem;
         padding-bottom: 0.1rem;
     }
 
     .topOne li {
-        width: 44%;
+        width: 33.3%;
+        float: left;
+    }
+
+    .topOne .dgCenter {
+        width: 93%;
+        overflow: hidden;
         float: left;
         border-radius: 5px;
         background: rgba(0.0 .0 .0 .1);
@@ -381,21 +390,14 @@
         padding-bottom: 0.1rem;
     }
 
-    .topOne .dgCenter {
-        width: 96%;
-        overflow: hidden;
-        display: block;
-        margin: 0 auto;
-    }
-
     .dgCenter .dghead {
         width: 40%;
         float: left;
     }
 
     .dghead img {
-        width: 1.4rem;
-        height: 1.4rem;
+        width: 1rem;
+        height: 1rem;
         overflow: hidden;
         display: block;
         margin: 0 auto;
@@ -429,12 +431,12 @@
         margin: 0 auto;
         font-family: Roboto;
         font-weight: bold;
-        font-size: 1rem;
+        font-size: 0.7rem;
         text-align: center;
         color: #fff;
         font-style: normal;
-        height: 1.68rem;
-        line-height: 1.68rem;
+        height: 1.4rem;
+        line-height: 1.4rem;
     }
 
     .score span {
@@ -444,7 +446,7 @@
         margin: 0 auto;
         font-family: Roboto;
         font-weight: normal;
-        font-size: 24px;
+        font-size: 0.2rem;
         color: #fff;
         text-align: center;
     }
@@ -635,6 +637,7 @@
         padding-top: 0.1rem;
         bottom: 0.2rem;
     }
+
     /deep/ .el-carousel__indicators--horizontal {
         display: none;
     }