tv build

tv/.idea/workspace.xml

@@ -23,37 +23,13 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="c813a37b-038b-4bb1-a925-c03a432a7638" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/../pc/src/views/coursesHistory.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/../pc/src/views/relevancePhone.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/assets/img/2pkRank/2pkTitle.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/assets/img/2pkRank/blueMvp.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/assets/img/2pkRank/flag.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/assets/img/2pkRank/king.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/assets/img/2pkRank/redMvp.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/assets/img/pk/blueFlag.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/assets/img/pk/blueGood.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/assets/img/pk/redFlag.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/assets/img/pk/redGood.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/assets/img/pk/vs.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/assets/pk.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/views/2pkRank.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../pc/src/api/getApiRes.js" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/src/api/getApiRes.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../pc/src/router/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/src/router/index.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../pc/src/views/EditLessonManage.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/src/views/EditLessonManage.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../pc/src/views/EditLessonTable.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/src/views/EditLessonTable.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../pc/src/views/Member.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/src/views/Member.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../pc/src/views/classInfoDetail.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/src/views/classInfoDetail.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../pc/src/views/courseEdit.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/src/views/courseEdit.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../pc/src/views/courses.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/src/views/courses.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 afterPath="$PROJECT_DIR$/src/assets/img/3pk/3pkbg.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/views/3pk.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../icon/1024.png" beforeDir="false" afterPath="$PROJECT_DIR$/../icon/1024.png" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/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$/src/views/Wait.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/Wait.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/views/2pkRank.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/2pkRank.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/views/pk.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/pk.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/" />
@@ -67,6 +43,15 @@
   </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="200">
+              <caret line="83" column="41" selection-start-line="83" selection-start-column="25" selection-end-line="83" selection-end-column="41" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/views/Main.vue">
           <provider selected="true" editor-type-id="text-editor">
@@ -79,11 +64,26 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/views/pk.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="462">
-              <caret line="369" column="30" lean-forward="true" selection-start-line="369" selection-start-column="30" selection-end-line="369" selection-end-column="30" />
+            <state relative-caret-position="189">
+              <caret line="489" selection-start-line="489" selection-end-line="506" selection-end-column="5" />
+              <folding>
+                <element signature="e#4878#4899#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/views/3pk.vue">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="323">
+              <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
+              <folding>
+                <element signature="e#105#126#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -91,8 +91,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/router/index.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="282">
-              <caret line="73" column="49" selection-start-line="73" selection-start-column="49" selection-end-line="73" selection-end-column="49" />
+            <state relative-caret-position="513">
+              <caret line="84" column="29" selection-start-line="84" selection-start-column="29" selection-end-line="84" selection-end-column="29" />
               <folding>
                 <element signature="e#0#21#0" expanded="true" />
               </folding>
@@ -123,9 +123,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>record</find>
-      <find>head</find>
-      <find>redUnite</find>
       <find>blueUnite</find>
       <find>fakeNews</find>
       <find>lp_icon</find>
@@ -151,8 +148,11 @@
       <find>getClassStat</find>
       <find>that.redSum</find>
       <find>GetgetUserList</find>
-      <find>createEgg</find>
       <find>flyhead</find>
+      <find>createEgg</find>
+      <find>前往等待页面</find>
+      <find>fmtInt</find>
+      <find>calcSumCK</find>
     </findStrings>
     <replaceStrings>
       <replace>0.2rem</replace>
@@ -201,12 +201,13 @@
         <option value="$PROJECT_DIR$/src/main.js" />
         <option value="$PROJECT_DIR$/src/views/Index.vue" />
         <option value="$PROJECT_DIR$/src/views/Rank.vue" />
-        <option value="$PROJECT_DIR$/src/views/2pkRank.vue" />
         <option value="$PROJECT_DIR$/vue.config.js" />
-        <option value="$PROJECT_DIR$/src/router/index.js" />
         <option value="$PROJECT_DIR$/src/views/Wait.vue" />
         <option value="$PROJECT_DIR$/src/views/Main.vue" />
         <option value="$PROJECT_DIR$/src/views/pk.vue" />
+        <option value="$PROJECT_DIR$/src/views/2pkRank.vue" />
+        <option value="$PROJECT_DIR$/src/router/index.js" />
+        <option value="$PROJECT_DIR$/src/views/3pk.vue" />
       </list>
     </option>
   </component>
@@ -218,8 +219,7 @@
   </component>
   <component name="ProjectFrameBounds">
     <option name="x" value="-2568" />
-    <option name="y" value="-8" />
-    <option name="width" value="1296" />
+    <option name="width" value="1859" />
     <option name="height" value="1395" />
   </component>
   <component name="ProjectId" id="1jXXjXdwK5v7WohMBoZDModntXR" />
@@ -263,7 +263,7 @@
               <item name="src" type="9f88c78c:ScopeViewTreeModel$FileNode" />
               <item name="assets" type="9f88c78c:ScopeViewTreeModel$FileNode" />
               <item name="img" type="9f88c78c:ScopeViewTreeModel$FileNode" />
-              <item name="pk" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+              <item name="3pk" type="9f88c78c:ScopeViewTreeModel$FileNode" />
             </path>
             <path>
               <item name="tv" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
@@ -310,11 +310,11 @@
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\wwwroot\flyLong\tv\src\assets\img\3pk" />
       <recent name="D:\wwwroot\flyLong\tv\src\assets\img\pk" />
       <recent name="D:\wwwroot\flyLong\tv\src\assets\img\2pkRank" />
       <recent name="D:\wwwroot\flyLong\tv\src\views" />
       <recent name="D:\wwwroot\flyLong\tv\src\assets" />
-      <recent name="D:\wwwroot\flyLong\tv\src\static\img\ranks" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="D:\wwwroot\flyLong\tv\src\static\img\bg" />
@@ -386,7 +386,7 @@
       <workItem from="1606196990553" duration="30160000" />
       <workItem from="1606548245045" duration="12000" />
       <workItem from="1606548419929" duration="30000" />
-      <workItem from="1606700588181" duration="31851000" />
+      <workItem from="1606700588181" duration="34118000" />
     </task>
     <task id="LOCAL-00001" summary="test web">
       <created>1605431368250</created>
@@ -514,23 +514,30 @@
       <option name="project" value="LOCAL" />
       <updated>1606371274632</updated>
     </task>
-    <option name="localTasksCounter" value="19" />
+    <task id="LOCAL-00019" summary="chang img">
+      <created>1606964298016</created>
+      <option name="number" value="00019" />
+      <option name="presentableId" value="LOCAL-00019" />
+      <option name="project" value="LOCAL" />
+      <updated>1606964298016</updated>
+    </task>
+    <option name="localTasksCounter" value="20" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="340910000" />
+    <option name="totallyTimeSpent" value="343177000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-2568" y="-8" width="1296" height="1395" extended-state="0" />
+    <frame x="-2568" y="0" width="1859" height="1395" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" weight="0.21498372" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2149637" />
       <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.32687446" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49920255" weight="0.2274642" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49920255" visible="true" weight="0.2274642" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.21468298" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -608,7 +615,8 @@
     <MESSAGE value="升级链接使用正式版" />
     <MESSAGE value="测试翻页问题" />
     <MESSAGE value="pc part" />
-    <option name="LAST_COMMIT_MESSAGE" value="pc part" />
+    <MESSAGE value="chang img" />
+    <option name="LAST_COMMIT_MESSAGE" value="chang img" />
   </component>
   <component name="WindowStateProjectService">
     <state x="-1830" y="274" width="1099" height="859" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1604022799787">
@@ -653,12 +661,6 @@
     <state x="-2342" y="308" width="840" height="1034" key="search.everywhere.popup/0.0.1920.1019/-2560.0.2560.1379@-2560.0.2560.1379" timestamp="1604114774442" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/static/img/blue.svg">
-      <provider selected="true" editor-type-id="images" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/static/img/logo.svg">
-      <provider selected="true" editor-type-id="images" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/static/img/people/sxf.png" />
     <entry file="file://$PROJECT_DIR$/src/static/img/newRecord/record_icon.svg">
       <provider selected="true" editor-type-id="images" />
@@ -794,13 +796,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="3129">
-          <caret line="152" column="59" selection-start-line="152" selection-start-column="55" selection-end-line="152" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="546">
@@ -860,62 +855,85 @@
     <entry file="file://$PROJECT_DIR$/src/assets/img/pk/vs.svg">
       <provider selected="true" editor-type-id="images" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/2pkRank.vue">
+    <entry file="file://$PROJECT_DIR$/src/Global.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="380">
-          <caret line="109" column="27" lean-forward="true" selection-start-line="108" selection-start-column="14" selection-end-line="109" selection-end-column="27" />
+        <state relative-caret-position="98">
+          <caret line="95" column="13" selection-start-line="95" selection-end-line="95" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Global.js">
+    <entry file="file://$PROJECT_DIR$/src/views/Wait.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="98">
-          <caret line="95" column="13" selection-start-line="95" selection-end-line="95" selection-end-column="13" />
+        <state relative-caret-position="191">
+          <caret line="134" selection-start-line="134" selection-end-line="134" />
+          <folding>
+            <element signature="n#style#0;n#s#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#s#0;n#!!top" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/Index.vue">
+    <entry file="file://$PROJECT_DIR$/src/views/Main.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-714">
-          <caret line="5" selection-start-line="5" selection-end-line="5" />
+        <state relative-caret-position="-3150">
+          <caret line="18" selection-start-line="18" selection-end-line="18" />
+          <folding>
+            <element signature="e#5267#5311#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/views/Rank.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="200">
+          <caret line="83" column="41" selection-start-line="83" selection-start-column="25" selection-end-line="83" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/views/2pkRank.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="189">
+          <caret line="44" column="34" lean-forward="true" selection-start-line="44" selection-start-column="34" selection-end-line="44" selection-end-column="34" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/router/index.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="282">
-          <caret line="73" column="49" selection-start-line="73" selection-start-column="49" selection-end-line="73" selection-end-column="49" />
+        <state relative-caret-position="513">
+          <caret line="84" column="29" selection-start-line="84" selection-start-column="29" selection-end-line="84" selection-end-column="29" />
           <folding>
             <element signature="e#0#21#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/Wait.vue">
+    <entry file="file://$PROJECT_DIR$/src/views/pk.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="191">
-          <caret line="134" selection-start-line="134" selection-end-line="134" />
+        <state relative-caret-position="189">
+          <caret line="489" selection-start-line="489" selection-end-line="506" selection-end-column="5" />
           <folding>
-            <element signature="n#style#0;n#s#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#s#0;n#!!top" expanded="true" />
+            <element signature="e#4878#4899#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/Main.vue">
+    <entry file="file://$PROJECT_DIR$/src/views/Index.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-3150">
-          <caret line="18" selection-start-line="18" selection-end-line="18" />
-          <folding>
-            <element signature="e#5267#5311#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="-714">
+          <caret line="5" selection-start-line="5" selection-end-line="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/pk.vue">
+    <entry file="file://$PROJECT_DIR$/src/assets/img/3pk/3pkbg.svg">
+      <provider selected="true" editor-type-id="images" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/views/3pk.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="462">
-          <caret line="369" column="30" lean-forward="true" selection-start-line="369" selection-start-column="30" selection-end-line="369" selection-end-column="30" />
+        <state relative-caret-position="323">
+          <caret line="24" column="35" lean-forward="true" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
+          <folding>
+            <element signature="e#105#126#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>

tv/src/router/index.js

@@ -76,6 +76,14 @@ const routes = [
                     title: "2pkRank",
                     clmid: "5",
                 }
+            },{
+                path: '/3pk',
+                name: '3pk',
+                component: () => import('@/views/3pk.vue'),
+                meta: {
+                    title: "3pk",
+                    clmid: "6",
+                }
             },{
                 path: '/test',
                 name: 'test',

tv/src/views/2pkRank.vue

@@ -45,7 +45,7 @@
                             </div>
                             <div class="CKscore">
                                 <em>ck</em>
-                                {{s.Cle|fmtInt}}
+                                {{s.Ck|fmtFloat}}
                             </div>
                             <div class="record">
                                 <img src="../assets/img/2pkRank/redMvp.svg" class="mvpImg" alt=""
@@ -73,7 +73,7 @@
                             </div>
                             <div class="CKscore">
                                 <em>ck</em>
-                                {{s.Cle|fmtInt}}
+                                {{s.Ck|fmtFloat}}
                             </div>
                             <div class="record">
                                 <img src="../assets/img/2pkRank/blueMvp.svg" class="mvpImg" alt=""
@@ -99,7 +99,7 @@
             return {
                 eqSn: '30:9C:23:0C:8B:1E',
                 pageStyle: RandomBg(),
-                trueDate: false,//真实数据 true false
+                trueDate: true,//真实数据 true false
                 autoJump: true,//开启自动跳走
                 students: {
                     redUnite: [],
@@ -130,7 +130,7 @@
                     this.totalTime--;
                     if (parseInt(this.totalTime) < 0) {
                         // 前往等待页面
-                        // that.$router.push({path: '/wait'});
+                        that.$router.push({path: '/wait'});
                         // 计时器回收
                         clearInterval(clock);
                     }
@@ -170,7 +170,8 @@
             // 分队展示
             UniteBreak(Rs) {
                 let that = this;
-                console.log(Rs);
+                that.students.redUnite = [];
+                that.students.blueUnite = [];
                 if (!Rs) {
                     that.students.redUnite = [];
                     that.students.blueUnite = [];
@@ -199,13 +200,16 @@
             // 计算各队总分
             calcSumCK(Rs) {
                 let that = this;
-                // that.redSum
+                let redSum = 0;
+                let blueSum = 0;
                 Rs.redUnite.map(function (item, t) {
-                    that.redSum += item.Ck
+                    redSum += parseFloat(item.Ck)
                 });
                 Rs.blueUnite.map(function (item, t) {
-                    that.blueSum += item.Ck
+                    blueSum += parseFloat(item.Ck)
                 });
+                that.redSum = redSum.toFixed(1);
+                that.blueSum = blueSum.toFixed(1);
             },
             getClassUserRank() {
                 let that = this;
@@ -216,8 +220,9 @@
                 ClassUserRank(postdata).then(res => {
                     let json = res;
                     if (json.Code == 0) {
-                        this.students.CkSort = json.Rs.CkSort;
-                        this.students.CalSort = json.Rs.CalSort;
+                        that.UniteBreak(json.Rs);
+                        // this.students.CkSort = json.Rs.CkSort;
+                        // this.students.CalSort = json.Rs.CalSort;
                     } else {
                         this.students.CkSort = [];
                         this.students.CalSort = [];
@@ -279,7 +284,7 @@
                             this.totalTime--;
                             if (parseInt(this.totalTime) < 0) {
                                 // 前往等待页面
-                                // that.$router.push({path: '/wait'});
+                                that.$router.push({path: '/wait'});
                                 // 计时器回收
                                 clearInterval(clock);
                             }

tv/src/views/3pk.vue

@@ -0,0 +1,43 @@
+<template>
+    <div class="pages">
+        <Headside></Headside>
+    </div>
+</template>
+
+<script>
+    import '../libs/rem';
+    import Headside from '@/components/Headside'
+    import {
+        getHello,
+        getClassStat
+    } from '@/api/getApiRes'
+    import '../libs/rem';
+    let qs = require('qs');
+
+    export default {
+        name: "3pk",
+        components: {
+            Headside
+        }
+    }
+</script>
+<style scoped>
+    @import "../assets/css/bg.css";
+
+    .pages {
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        width: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        background-color: #028fe1;
+        background: url("../assets/img/3pk/3pkbg.png");
+        background-size: 100%;
+        background-repeat: no-repeat;
+    }
+
+</style>

tv/src/views/pk.vue

@@ -427,17 +427,8 @@
                             // 2：竞技课2PK
                             // 3：竞技课3PK
                             switch (parseInt(json.dp)) {
-                                case 0:
-                                    that.$router.push({path: '/2pkRank'});
-                                    break;
-                                case 1:
-                                    that.$router.push({path: '/'});
-                                    break;
                                 case 2:
-                                    that.$router.push({path: '/pk'});
-                                    break;
-                                case 3:
-                                    that.$router.push({path: '/3pk'});
+                                    that.$router.push({path: '/2pkRank'});
                                     break;
                             }
                         }