del unuse

tv/.idea/workspace.xml

@@ -24,8 +24,27 @@
   <component name="ChangeListManager">
     <list default="true" id="c813a37b-038b-4bb1-a925-c03a432a7638" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/static/img/people/dcp.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/static/img/people/gc.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/static/img/people/jy.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/static/img/people/jyq.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/static/img/people/lhs.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/static/img/people/lxl.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/static/img/people/lyh.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/static/img/people/slc.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/static/img/people/sxf.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/static/img/people/sxf2.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/static/img/people/wfl.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/static/img/people/wzx.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/static/img/people/ydy.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/static/img/people/zjh.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/static/img/people/zr.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/static/img/people/zw.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/static/img/people/zy.png" beforeDir="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$/src/views/pk.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/pk.vue" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -39,31 +58,19 @@
   <component name="FileEditorManager">
     <leaf>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/api/getApiRes.js">
+        <entry file="file://$PROJECT_DIR$/src/views/Main.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="315">
-              <caret line="15" column="17" lean-forward="true" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" />
-              <folding>
-                <element signature="e#0#26#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/Global.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="441">
-              <caret line="21" column="23" lean-forward="true" selection-start-line="21" selection-start-column="23" selection-end-line="21" selection-end-column="23" />
+            <state relative-caret-position="-1972">
+              <caret line="328" column="46" selection-start-line="328" selection-start-column="46" selection-end-line="328" selection-end-column="46" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/views/Rank.vue">
+        <entry file="file://$PROJECT_DIR$/src/components/Headside.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="155">
-              <caret line="102" column="30" selection-start-line="102" selection-start-column="30" selection-end-line="102" selection-end-column="30" />
+            <state relative-caret-position="525">
+              <caret line="68" column="1" lean-forward="true" selection-start-line="68" selection-start-column="1" selection-end-line="68" selection-end-column="1" />
             </state>
           </provider>
         </entry>
@@ -82,7 +89,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>totalTime</find>
       <find>.png</find>
       <find>fakeEgg</find>
       <find>fake</find>
@@ -112,6 +118,7 @@
       <find>border</find>
       <find>centerLi</find>
       <find>.two</find>
+      <find>students</find>
     </findStrings>
     <replaceStrings>
       <replace>0.2rem</replace>
@@ -128,7 +135,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/Mock/index.js" />
         <option value="$PROJECT_DIR$/src/lib/rem.js" />
         <option value="$PROJECT_DIR$/src/assets/css/mainBk.css" />
         <option value="$PROJECT_DIR$/src/views/Index.vue" />
@@ -143,10 +149,11 @@
         <option value="$PROJECT_DIR$/src/api/getApiRes.js" />
         <option value="$PROJECT_DIR$/src/components/newRecord.vue" />
         <option value="$PROJECT_DIR$/src/App.vue" />
-        <option value="$PROJECT_DIR$/src/views/pk.vue" />
-        <option value="$PROJECT_DIR$/src/views/Main.vue" />
         <option value="$PROJECT_DIR$/src/Global.js" />
+        <option value="$PROJECT_DIR$/src/Mock/index.js" />
         <option value="$PROJECT_DIR$/src/views/Rank.vue" />
+        <option value="$PROJECT_DIR$/src/views/pk.vue" />
+        <option value="$PROJECT_DIR$/src/views/Main.vue" />
       </list>
     </option>
   </component>
@@ -157,10 +164,10 @@
     <auto-save>true</auto-save>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-2292" />
-    <option name="y" value="179" />
+    <option name="x" value="-2568" />
+    <option name="y" value="-8" />
     <option name="width" value="2576" />
-    <option name="height" value="1456" />
+    <option name="height" value="1395" />
   </component>
   <component name="ProjectId" id="1jXXjXdwK5v7WohMBoZDModntXR" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
@@ -323,7 +330,7 @@
       <workItem from="1604539672735" duration="79000" />
       <workItem from="1604540536502" duration="646000" />
       <workItem from="1604541901536" duration="160559000" />
-      <workItem from="1605406240238" duration="42021000" />
+      <workItem from="1605406240238" duration="44947000" />
     </task>
     <task id="LOCAL-00001" summary="test web">
       <created>1605431368250</created>
@@ -367,22 +374,29 @@
       <option name="project" value="LOCAL" />
       <updated>1605519118606</updated>
     </task>
-    <option name="localTasksCounter" value="7" />
+    <task id="LOCAL-00007" summary="api by corss">
+      <created>1605520419757</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1605520419757</updated>
+    </task>
+    <option name="localTasksCounter" value="8" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="203226000" />
+    <option name="totallyTimeSpent" value="206152000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-2568" y="-8" width="2576" height="1395" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1539075" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1539075" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.24973656" />
       <window_info id="Favorites" order="2" side_tool="true" weight="0.32982087" />
       <window_info id="npm" order="3" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.32692307" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32687446" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.31086773" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.21468298" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
@@ -440,7 +454,8 @@
     <MESSAGE value="sum text center" />
     <MESSAGE value="show version" />
     <MESSAGE value="show new style" />
-    <option name="LAST_COMMIT_MESSAGE" value="show new style" />
+    <MESSAGE value="api by corss" />
+    <option name="LAST_COMMIT_MESSAGE" value="api by corss" />
   </component>
   <component name="WindowStateProjectService">
     <state x="-1830" y="274" width="1099" height="859" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1604022799787">
@@ -492,13 +507,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Mock/index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-415">
-          <caret line="69" column="18" selection-start-line="69" selection-start-column="3" selection-end-line="69" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/libs/rem.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="63">
@@ -614,44 +622,45 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/pk.vue">
+    <entry file="file://$PROJECT_DIR$/src/components/newRecord.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="492">
-          <caret line="541" column="20" lean-forward="true" selection-start-line="541" selection-start-column="20" selection-end-line="541" selection-end-column="20" />
-          <folding>
-            <element signature="n#li#0;n#ul#0;n#div#2;n#div#1;n#div#0;n#template#0;n#!!top" />
-          </folding>
+        <state relative-caret-position="336">
+          <caret line="130" column="27" lean-forward="true" selection-start-line="130" selection-start-column="6" selection-end-line="130" selection-end-column="27" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/components/newRecord.vue">
+    <entry file="file://$PROJECT_DIR$/test.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="336">
-          <caret line="130" column="27" lean-forward="true" selection-start-line="130" selection-start-column="6" selection-end-line="130" selection-end-column="27" />
+        <state relative-caret-position="546">
+          <caret line="26" column="7" lean-forward="true" selection-start-line="26" selection-start-column="7" selection-end-line="26" selection-end-column="7" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/components/Headside.vue">
+    <entry file="file://$PROJECT_DIR$/src/Global.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="840">
-          <caret line="83" column="20" selection-start-line="83" selection-start-column="20" selection-end-line="83" selection-end-column="20" />
+        <state relative-caret-position="441">
+          <caret line="21" column="23" lean-forward="true" selection-start-line="21" selection-start-column="23" selection-end-line="21" selection-end-column="23" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test.html">
+    <entry file="file://$PROJECT_DIR$/src/Mock/index.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="546">
-          <caret line="26" column="7" lean-forward="true" selection-start-line="26" selection-start-column="7" selection-end-line="26" selection-end-column="7" />
+        <state relative-caret-position="398">
+          <caret line="92" column="5" lean-forward="true" selection-start-line="92" selection-start-column="5" selection-end-line="92" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/Main.vue">
+    <entry file="file://$PROJECT_DIR$/src/views/Rank.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="317">
-          <caret line="138" column="25" lean-forward="true" selection-start-line="138" selection-start-column="25" selection-end-line="138" selection-end-column="25" />
-          <folding>
-            <element signature="e#4045#4089#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="243">
+          <caret line="220" column="44" selection-start-line="220" selection-start-column="44" selection-end-line="220" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/views/pk.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="243">
+          <caret line="213" column="37" selection-start-line="213" selection-start-column="37" selection-end-line="213" selection-end-column="37" />
         </state>
       </provider>
     </entry>
@@ -665,17 +674,17 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Global.js">
+    <entry file="file://$PROJECT_DIR$/src/views/Main.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="441">
-          <caret line="21" column="23" lean-forward="true" selection-start-line="21" selection-start-column="23" selection-end-line="21" selection-end-column="23" />
+        <state relative-caret-position="-1972">
+          <caret line="328" column="46" selection-start-line="328" selection-start-column="46" selection-end-line="328" selection-end-column="46" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/Rank.vue">
+    <entry file="file://$PROJECT_DIR$/src/components/Headside.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="155">
-          <caret line="102" column="30" selection-start-line="102" selection-start-column="30" selection-end-line="102" selection-end-column="30" />
+        <state relative-caret-position="525">
+          <caret line="68" column="1" lean-forward="true" selection-start-line="68" selection-start-column="1" selection-end-line="68" selection-end-column="1" />
         </state>
       </provider>
     </entry>

tv/src/Mock/index.js

@@ -89,22 +89,7 @@ let getUserList = function () {
     ]
 
     let img = [
-        {name:'ydy.png'},
-        {name:'sxf.png'},
-        {name:'lxl.png'},
-        {name:'lhs.png'},
-        {name:'jyq.png'},
-        {name:'lyh.png'},
-        {name:'slc.png'},
-        {name:'dcp.png'},
-        {name:'zw.png'},
-        {name:'zr.png'},
-        {name:'jy.png'},
-        {name:'wzx.png'},
-        {name:'gc.png'},
-        {name:'wfl.png'},
-        {name:'zjh.png'},
-        {name:'zy.png'},
+        {name:'flyhead.png'},
     ]
 
     for (var i = 0; i < 16  ; i++) {

tv/src/views/Main.vue

@@ -10,7 +10,7 @@
                         <div class="topLi">
                             <div class="human">
                                 <span class="name">{{ s.Name }}</span>
-                                <!--<img src="../static/img/people/gc.png"/>-->
+                                <!--<img src="../static/img/people/flyhead.png"/>-->
                                 <!--<img v-bind:src="require('../static/img/people/' + s.head)" alt="">-->
                                 <img :src="s.Head" alt="" v-if="s.Head">
                                 <img v-bind:src="require('../static/img/people/flyhead.png')" alt="" v-if="!s.Head">
@@ -151,24 +151,23 @@
                 },
                 // 本地绑定名字和头像路径
                 headImg: [
-                    {name: 'ydy.png'},
-                    {name: 'sxf.png'},
-                    {name: 'lxl.png'},
-                    {name: 'lhs.png'},
-                    {name: 'jyq.png'},
-                    {name: 'lyh.png'},
-                    {name: 'slc.png'},
-                    {name: 'dcp.png'},
-                    {name: 'zw.png'},
-                    {name: 'zr.png'},
-                    {name: 'jy.png'},
-                    {name: 'wzx.png'},
-                    {name: 'gc.png'},
-                    {name: 'wfl.png'},
-                    {name: 'zjh.png'},
-                    {name: 'zy.png'},
-                    {name: 'zw.png'},
-                    {name: 'zw.png'},
+                    {name: 'flyhead.png'},
+                    {name: 'flyhead.png'},
+                    {name: 'flyhead.png'},
+                    {name: 'flyhead.png'},
+                    {name: 'flyhead.png'},
+                    {name: 'flyhead.png'},
+                    {name: 'flyhead.png'},
+                    {name: 'flyhead.png'},
+                    {name: 'flyhead.png'},
+                    {name: 'flyhead.png'},
+                    {name: 'flyhead.png'},
+                    {name: 'flyhead.png'},
+                    {name: 'flyhead.png'},
+                    {name: 'flyhead.png'},
+                    {name: 'flyhead.png'},
+                    {name: 'flyhead.png'},
+                    {name: 'flyhead.png'},
                 ],
                 nameList: [
                     {name: '杨东艳'},
@@ -327,22 +326,18 @@
                         if (that.times == 1) {
                             that.students = json.Rs;
                             if (!json.Rs) return false;
-                            // 添加头像 和 姓名
-                            that.students.map(function (i, v) {
-                                i.head = that.headImg[v].name;
-                                i.userNmae = that.nameList[v].name
-                            });
+                            // // 添加头像 和 姓名 ..
                             that.times++
                         } else {
                             if (localStorage.result != JSON.stringify(json.Rs)) {
                                 that.students = json.Rs;
                                 // this.createEgg(this.students[1]);
                                 if (!json.Rs) return false;
-                                // 添加头像 和 姓名
-                                that.students.map(function (i, v) {
-                                    i.head = that.headImg[v].name;
-                                    i.userNmae = that.nameList[v].name
-                                });
+                                // // 添加头像 和 姓名
+                                // that.students.map(function (i, v) {
+                                //     i.head = that.headImg[v].name;
+                                //     i.userNmae = that.nameList[v].name
+                                // });
                             }
                             localStorage.res = JSON.stringify(json.Rs);
                         }
@@ -1102,6 +1097,7 @@
         overflow: hidden;
         margin-top: 6%
     }
+
     .two .centerLi {
         border: 1px solid #fff;
     }
@@ -2169,6 +2165,7 @@
         height: 0.25rem;
         margin-top: 0.12rem;
     }
+
     .twentyFour .bottomLi .step img {
         margin-top: 0.16rem;
     }

tv/src/views/Rank.vue

@@ -142,7 +142,7 @@
                             {
                                 "UserName": "贾雨奇",
                                 "Sex": 1,
-                                "Head": "http://192.168.0.2/jyq.png",
+                                "Head": "http://192.168.0.2/flyhead.png",
                                 "Values": "4034",
                                 "Unite": "千卡",
                                 "Message": ""
@@ -150,7 +150,7 @@
                             {
                                 "UserName": "郑伟",
                                 "Sex": 1,
-                                "Head": "http://192.168.0.2/zw.png",
+                                "Head": "http://192.168.0.2/flyhead.png",
                                 "Values": "2290",
                                 "Unite": "千卡",
                                 "Message": ""
@@ -172,7 +172,7 @@
                             {
                                 "UserName": "郑伟",
                                 "Sex": 1,
-                                "Head": "http://192.168.0.2/zw.png",
+                                "Head": "http://192.168.0.2/flyhead.png",
                                 "Values": "1020",
                                 "Unite": "",
                                 "Message": "打破了历史记录100000"
@@ -218,7 +218,7 @@
                             "updateTime": 1604568915582,
                             "activePercent": i * 5,
                             "ck": 115.9 - i,
-                            "head": 'gc.png'
+                            "head": 'flyhead.png'
                         }
                     )
                 }
@@ -241,7 +241,7 @@
                             "activePercent": i * 5,
                             "ck": i + 115.1,
                             "sex": 1,
-                            "head": 'gc.png'
+                            "head": 'flyhead.png'
                         }
                     )
                 }

tv/src/views/pk.vue

@@ -33,7 +33,7 @@
                                 </div>
                                 <div class="umd">
                                     <div class="circle">
-                                        <img src="../static/img/people/ydy.png"/>
+                                        <img src="../static/img/people/flyhead.png"/>
                                     </div>
                                 </div>
                                 <div class="urt">
@@ -124,7 +124,7 @@
                                 </div>
                                 <div class="umd">
                                     <div class="circle">
-                                        <img src="../static/img/people/ydy.png"/>
+                                        <img src="../static/img/people/flyhead.png"/>
                                     </div>
                                 </div>
                                 <div class="urt">
@@ -211,7 +211,7 @@
                             "Name": "东南西北",
                             "updateTime": 1604568915582,
                             "Ck": nums,
-                            "head": 'gc.png'
+                            "head": 'flyhead.png'
                         }
                     )
                 }