Changpeng Duan 5 rokov pred
rodič
commit
de51e2772c

+ 172 - 143
tv/.idea/workspace.xml

@@ -23,15 +23,16 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="c813a37b-038b-4bb1-a925-c03a432a7638" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/static/img/bg/bg_5.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/bg/bg_6.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/static/img/bg/bg_7.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/api/wifi.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/views/gropePk.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/App.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/App.vue" 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/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/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/" />
@@ -43,77 +44,83 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
-    <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/views/Index.vue">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="552">
-              <caret line="70" column="37" selection-start-line="70" selection-start-column="37" selection-end-line="70" selection-end-column="37" />
-              <folding>
-                <element signature="e#302#331#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/Mock/index.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="932">
-              <caret line="117" column="49" selection-start-line="117" selection-start-column="38" selection-end-line="117" selection-end-column="49" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/api/getApiRes.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="294">
-              <caret line="14" column="30" selection-start-line="14" selection-start-column="16" selection-end-line="14" selection-end-column="30" />
-              <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/views/Main.vue">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="298">
-              <caret line="130" column="27" selection-start-line="130" selection-start-column="3" selection-end-line="130" selection-end-column="27" />
-              <folding>
-                <element signature="e#5088#5132#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <splitter split-orientation="horizontal" split-proportion="0.5">
+      <split-first>
+        <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
+          <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="846">
+                  <caret line="957" column="18" selection-start-line="957" selection-start-column="18" selection-end-line="957" selection-end-column="18" />
+                </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">
+                <state relative-caret-position="548">
+                  <caret line="931" column="5" lean-forward="true" selection-start-line="928" selection-start-column="2" selection-end-line="931" selection-end-column="5" />
+                  <folding>
+                    <element signature="e#5088#5132#0" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/src/views/Index.vue">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="605">
+                  <caret line="65" column="90" lean-forward="true" selection-start-line="65" selection-start-column="90" selection-end-line="65" selection-end-column="90" />
+                  <folding>
+                    <element signature="e#225#333#0" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/src/api/getApiRes.js">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="929">
+                  <caret line="97" column="51" selection-start-line="97" selection-start-column="15" selection-end-line="97" selection-end-column="51" />
+                  <folding>
+                    <element signature="e#0#26#0" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+        </leaf>
+      </split-first>
+      <split-second>
+        <leaf>
+          <file pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/src/views/pk.vue">
+              <provider selected="true" editor-type-id="text-editor">
+                <state>
+                  <caret line="271" selection-start-line="271" selection-end-line="271" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+        </leaf>
+      </split-second>
+    </splitter>
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
         <option value="JavaScript File" />
-        <option value="Vue Single File Component" />
         <option value="CSS File" />
         <option value="HTML File" />
+        <option value="Vue Single File Component" />
       </list>
     </option>
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>.png</find>
-      <find>fakeEgg</find>
-      <find>fake</find>
-      <find>CalorieStatsQuery</find>
-      <find>curgetClassStat</find>
-      <find>GetgetUserList</find>
-      <find>timer2</find>
-      <find>GetUserRankingQuery</find>
-      <find>bg</find>
-      <find>.sum em</find>
-      <find>rank</find>
       <find>pages</find>
       <find>trueDate</find>
       <find>pageStyle</find>
@@ -133,6 +140,17 @@
       <find>centerLi</find>
       <find>.two</find>
       <find>students</find>
+      <find>fly</find>
+      <find>heart</find>
+      <find>.urt</find>
+      <find>Sensors</find>
+      <find>QueryVueFramework</find>
+      <find>.urt img</find>
+      <find>bottomLi</find>
+      <find>.bottomLi img</find>
+      <find>bottomLi .step</find>
+      <find>.bottomLi span</find>
+      <find>two</find>
     </findStrings>
     <replaceStrings>
       <replace>0.2rem</replace>
@@ -155,17 +173,18 @@
         <option value="$PROJECT_DIR$/README.md" />
         <option value="$PROJECT_DIR$/package.json" />
         <option value="$PROJECT_DIR$/src/main.js" />
-        <option value="$PROJECT_DIR$/src/router/index.js" />
         <option value="$PROJECT_DIR$/test.html" />
-        <option value="$PROJECT_DIR$/vue.config.js" />
         <option value="$PROJECT_DIR$/src/components/newRecord.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/App.vue" />
-        <option value="$PROJECT_DIR$/src/views/Main.vue" />
         <option value="$PROJECT_DIR$/src/components/Headside.vue" />
+        <option value="$PROJECT_DIR$/src/views/Rank.vue" />
+        <option value="$PROJECT_DIR$/src/views/gropePk.vue" />
+        <option value="$PROJECT_DIR$/src/router/index.js" />
+        <option value="$PROJECT_DIR$/vue.config.js" />
+        <option value="$PROJECT_DIR$/src/views/Main.vue" />
+        <option value="$PROJECT_DIR$/src/views/pk.vue" />
         <option value="$PROJECT_DIR$/src/api/getApiRes.js" />
         <option value="$PROJECT_DIR$/src/views/Index.vue" />
       </list>
@@ -177,11 +196,11 @@
     <other-services-enabled>true</other-services-enabled>
     <auto-save>true</auto-save>
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-2568" />
-    <option name="y" value="-8" />
-    <option name="width" value="1296" />
-    <option name="height" value="1395" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-2050" />
+    <option name="y" value="165" />
+    <option name="width" value="1936" />
+    <option name="height" value="1066" />
   </component>
   <component name="ProjectId" id="1jXXjXdwK5v7WohMBoZDModntXR" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
@@ -193,7 +212,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -210,7 +228,13 @@
               <item name="tv" type="b2602c69:ProjectViewProjectNode" />
               <item name="tv" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="libs" type="462c0819:PsiDirectoryNode" />
+              <item name="api" 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" />
@@ -222,6 +246,7 @@
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="ProjectViewState">
@@ -248,15 +273,15 @@
     <property name="vue.rearranger.settings.migration" value="true" />
   </component>
   <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
+    <key name="MoveFile.RECENT_KEYS">
       <recent name="D:\wwwroot\flyLong\tv\src\static\img\bg" />
-      <recent name="D:\wwwroot\flyLong\tv\src\static\img\people" />
-      <recent name="D:\wwwroot\flyLong\tv\src\static\img\newRecord" />
       <recent name="D:\wwwroot\flyLong\tv\src\static\img" />
-      <recent name="D:\wwwroot\flyLong\tv\src\static\img\rank" />
     </key>
-    <key name="MoveFile.RECENT_KEYS">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\wwwroot\flyLong\tv\src\api" />
       <recent name="D:\wwwroot\flyLong\tv\src\static\img\bg" />
+      <recent name="D:\wwwroot\flyLong\tv\src\static\img\people" />
+      <recent name="D:\wwwroot\flyLong\tv\src\static\img\newRecord" />
       <recent name="D:\wwwroot\flyLong\tv\src\static\img" />
     </key>
   </component>
@@ -319,6 +344,7 @@
       <workItem from="1604540536502" duration="646000" />
       <workItem from="1604541901536" duration="160559000" />
       <workItem from="1605406240238" duration="51039000" />
+      <workItem from="1605668164423" duration="14422000" />
     </task>
     <task id="LOCAL-00001" summary="test web">
       <created>1605431368250</created>
@@ -380,13 +406,13 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="212244000" />
+    <option name="totallyTimeSpent" value="229460000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-2568" y="-8" width="1296" height="1395" extended-state="0" />
+    <frame x="-2568" y="-8" width="2576" height="1395" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" weight="0.15309446" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.18301435" />
       <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" />
@@ -538,17 +564,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="273">
-          <caret line="13" column="9" lean-forward="true" selection-start-line="13" selection-start-column="9" selection-end-line="13" selection-end-column="9" />
-          <folding>
-            <element signature="e#0#21#0" expanded="true" />
-            <element signature="e#136#171#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/static/img/fire.png">
       <provider selected="true" editor-type-id="images" />
     </entry>
@@ -570,9 +585,7 @@
     <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">
-      <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" />
     </entry>
@@ -585,26 +598,7 @@
     <entry file="file://$PROJECT_DIR$/src/static/img/newRecord/record.png">
       <provider selected="true" editor-type-id="images" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/vue.config.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="693">
-          <caret line="33" column="24" selection-start-line="33" selection-start-column="24" selection-end-line="33" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/router/index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="764">
-          <caret line="73" column="10" lean-forward="true" selection-start-line="73" selection-start-column="10" selection-end-line="73" selection-end-column="10" />
-          <folding>
-            <element signature="e#0#21#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/static/img/people/flyhead.svg">
-      <provider selected="true" editor-type-id="images" />
-    </entry>
+    <entry file="file://$PROJECT_DIR$/src/static/img/people/flyhead.svg" />
     <entry file="file://$PROJECT_DIR$/src/components/newRecord.vue">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="336">
@@ -626,20 +620,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="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>
     <entry file="file://$PROJECT_DIR$/src/libs/rem.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="63">
@@ -661,39 +641,88 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/api/getApiRes.js">
+    <entry file="file://$PROJECT_DIR$/src/Mock/index.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="932">
+          <caret line="117" column="49" selection-start-line="117" selection-start-column="38" selection-end-line="117" selection-end-column="49" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/router/index.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="701">
+          <caret line="52" column="29" selection-start-line="52" selection-start-column="29" selection-end-line="52" selection-end-column="29" />
+          <folding>
+            <element signature="e#0#21#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/views/gropePk.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="42">
+          <caret line="2" column="14" selection-start-line="2" selection-start-column="14" selection-end-line="2" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/views/Rank.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="359">
+          <caret line="73" column="82" selection-start-line="73" selection-start-column="79" selection-end-line="73" selection-end-column="82" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/vue.config.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="756">
+          <caret line="36" column="13" lean-forward="true" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="294">
-          <caret line="14" column="30" selection-start-line="14" selection-start-column="16" selection-end-line="14" selection-end-column="30" />
+          <caret line="14" column="18" selection-start-line="14" selection-start-column="14" selection-end-line="14" selection-end-column="18" />
           <folding>
-            <element signature="e#0#26#0" expanded="true" />
+            <element signature="e#0#21#0" expanded="true" />
+            <element signature="e#136#171#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/views/Main.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="298">
-          <caret line="130" column="27" selection-start-line="130" selection-start-column="3" selection-end-line="130" selection-end-column="27" />
+        <state relative-caret-position="548">
+          <caret line="931" column="5" lean-forward="true" selection-start-line="928" selection-start-column="2" selection-end-line="931" selection-end-column="5" />
           <folding>
             <element signature="e#5088#5132#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Mock/index.js">
+    <entry file="file://$PROJECT_DIR$/src/views/pk.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="932">
-          <caret line="117" column="49" selection-start-line="117" selection-start-column="38" selection-end-line="117" selection-end-column="49" />
+        <state relative-caret-position="846">
+          <caret line="957" column="18" selection-start-line="957" selection-start-column="18" selection-end-line="957" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/api/getApiRes.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="929">
+          <caret line="97" column="51" selection-start-line="97" selection-start-column="15" selection-end-line="97" selection-end-column="51" />
+          <folding>
+            <element signature="e#0#26#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/views/Index.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="552">
-          <caret line="70" column="37" selection-start-line="70" selection-start-column="37" selection-end-line="70" selection-end-column="37" />
+        <state relative-caret-position="605">
+          <caret line="65" column="90" lean-forward="true" selection-start-line="65" selection-start-column="90" selection-end-line="65" selection-end-column="90" />
           <folding>
-            <element signature="e#302#331#0" expanded="true" />
+            <element signature="e#225#333#0" expanded="true" />
           </folding>
         </state>
       </provider>

+ 12 - 0
tv/src/api/getApiRes.js

@@ -86,3 +86,15 @@ export function UserRankingQuery(postdata) {
     let url = headapi + 'UserRankingQuery';
     return getApiBasic(url, postdata);
 }
+
+
+// 用查询最新wgt 般本
+export function QueryVueFramework(postdata) {
+    let url = '/bpi/v1/Sensors/QueryVueFramework';
+    return getApiBasic(url, postdata);
+}
+// 下载最新wgt 般本
+export function DownloadVueFramework(postdata) {
+    let url = '/bpi/v1/Sensors/DownloadVueFramework';
+    return getApiBasic(url, postdata);
+}

BIN
tv/src/api/wifi.png


+ 8 - 0
tv/src/router/index.js

@@ -44,6 +44,14 @@ const routes = [
                     title: "pk",
                     clmid: "3",
                 }
+            },{
+                path: '/gropePk',
+                name: 'gropePk',
+                component: () => import('@/views/gropePk.vue'),
+                meta: {
+                    title: "gropePk",
+                    clmid: "4",
+                }
             },
         ]
     }, {

+ 40 - 12
tv/src/views/Index.vue

@@ -1,24 +1,31 @@
 <template>
     <div class="IndexContainer">
+
+        <!--<img src="../api/wifi.png" height="100%" width="100%"/>-->
         <keep-alive>
             <router-view></router-view>
         </keep-alive>
-      1
     </div>
 </template>
-<script src="../../public/mui.js"></script>
+<!--<script src="../../public/mui.js"></script>-->
+
 <script>
     import {
+        QueryVueFramework,
+        DownloadVueFramework,
         getCheckUpdate,
         getUserList
     } from '@/api/getApiRes'
 
+    import "../../public/mui.js"
+
     let qs = require('qs');
 
     export default {
         name: 'Home',
         data() {
             return {
+                autoUpdate: false,//自动升级
                 aSideState: false,
                 thisClick: 0,
                 tabwildState: 1,
@@ -32,9 +39,8 @@
             }
         },
         mounted() {
+
             this.getCurVersion();
-            console.log(window.plus);
-            console.log(window);
         },
         methods: {
             // 获取当前版本号
@@ -47,8 +53,25 @@
                         localStorage.version = inf.version;
                         that.curVersion = inf.version;
                     });
-                  that.checkUpdate();
+
+                    if (this.autoUpdate) {
+                        that.checkUpdate();
+                    }
+
+                    //   获取手机UUID
+                    plus.device.getInfo({
+                        success: function (e) {
+                            // 8e501b0bde9ce600
+                            // 打印uuid
+                            // console.log('getDeviceInfo success: ' + JSON.stringify(e));
+                        },
+                        fail: function (e) {
+                            console.log('getDeviceInfo failed: ' + JSON.stringify(e));
+                        }
+                    });
+
                 }
+
                 if (window.plus) {
                     plusReady();
                 } else {
@@ -60,26 +83,31 @@
             checkUpdate() {
                 let that = this;
                 let param = {};
-                let netVersion = "";
                 let postdata = qs.stringify(param);
                 const h = this.$createElement;
-                getCheckUpdate(postdata).then(res => {
+                QueryVueFramework(postdata).then(res => {
                     let json = res;
                     if (json.Code == 0) {
-                if (that.curVersion != netVersion) {
-                    let url = "http://192.168.0.162/flyLong/hbuild/upload//GoAllOut_1.0.1.wgt";
-                    that.downWgt(url);
+                        if (that.curVersion != json.Version) {
+                            let url = "http://192.168.0.3:19096/v1/Sensors/DownloadVueFramework";
+                            that.downWgt(url, json.Version);
+                            that.$notify({
+                                title: '升级提醒',
+                                message: h('i', {style: 'color: teal'}, '检测到新的版本,正在下载最新版本')
+                            });
+                        }
+                    }
                     that.$notify({
                         title: '升级提醒',
                         message: h('i', {style: 'color: teal'}, '检测到新的版本,正在下载最新版本')
                     });
-                }
-                    }
                 })
             },
             downWgt(url) {
                 let that = this;
                 plus.downloader.createDownload(url, {filename: "_doc/update/"}, function (d, status) {
+                    // plus.downloader.createDownload(url, {}, function (d, status) {
+                    console.log(status);
                     if (status == 200) {
                         console.log("下载wgt成功:" + d.filename);
                         that.installWgt(d.filename); // 安装wgt包

+ 1 - 6
tv/src/views/Main.vue

@@ -242,7 +242,7 @@
             //       if (totalTime < 0) {
             //         totalTime = 3;
             //         that.serachBtnStatus = false;
-            //         that.$router.push({path: '/rank'});
+                    that.$router.push({path: '/pk'});
             //       }
             //     }
             //     ,
@@ -1396,11 +1396,6 @@
         text-align: center;
     }
 
-    .six .bottomLi .btck {
-        /*text-indent: 1.6rem;*/
-    }
-
-
     .six .bottomLi img {
         width: 0.4rem;
         margin-top: 0.15rem;

+ 1 - 1
tv/src/views/Rank.vue

@@ -100,7 +100,7 @@
         data() {
             return {
                 pageStyle: RandomBg(),
-                trueDate: true,//真实数据 true false
+                trueDate: false,//真实数据 true false
                 fakeNums: 8,//
                 unite: '卡路里',
                 topMsg: '',

+ 15 - 0
tv/src/views/gropePk.vue

@@ -0,0 +1,15 @@
+<template>
+    <h5>
+        多组团队竞技
+    </h5>
+</template>
+
+<script>
+    export default {
+        name: "gropePk"
+    }
+</script>
+
+<style scoped>
+
+</style>

+ 169 - 74
tv/src/views/pk.vue

@@ -20,7 +20,6 @@
                             <h5>{{ s.Name }}</h5>
                             <div class="user">
                                 <div class="ult">
-                                    <span>运动强度</span>
                                     <em>
                                         <div v-if="s.activePercent != 0">
                                             {{ s.activePercent}}
@@ -37,14 +36,12 @@
                                     </div>
                                 </div>
                                 <div class="urt">
-                                    <img src="../static/img/heart.png"/>
-                                    <!--<em :class="[{'fastJump':parseInt(s.realHr) > 100},{'slowJump':parseInt(s.realHr) <= 100}]"-->
-                                    <!--v-if="s.realHr != 0">{{s.realHr}}</em>-->
                                     <em class="fastJump" v-if="s.realHr != 0" v-show="parseInt(s.realHr) > 100">{{
                                         s.realHr }}</em>
                                     <em class="slowJump" v-if="s.realHr != 0" v-show="parseInt(s.realHr) <= 100">{{
                                         s.realHr }}</em>
                                     <em class="plus" v-if="s.realHr == 0"> --- </em>
+                                    <img src="../static/img/heart.svg" class=""/>
                                 </div>
                             </div>
                             <div class="bottomLi">
@@ -107,52 +104,6 @@
             <div class="rt">
                 <ul>
                     <li :class="BluestudentsClassName" v-for="(s,i) in Bluestudents">
-                        <div class="bg">
-                            <h5>{{ s.Name }}</h5>
-                            <div class="user">
-                                <div class="ult">
-                                    <span>运动强度</span>
-                                    <em>
-                                        <div v-if="s.activePercent != 0">
-                                            {{ s.activePercent}}
-                                        </div>
-                                        <div class="plus" v-if="s.activePercent == 0">
-                                            ---
-                                        </div>
-                                        <s>%</s>
-                                    </em>
-                                </div>
-                                <div class="umd">
-                                    <div class="circle">
-                                        <img src="../static/img/people/flyhead.png"/>
-                                    </div>
-                                </div>
-                                <div class="urt">
-                                    <img src="../static/img/heart.svg"/>
-                                    <!--<em :class="[{'fastJump':parseInt(s.realHr) > 100},{'slowJump':parseInt(s.realHr) <= 100}]"-->
-                                    <!--v-if="s.realHr != 0">{{s.realHr}}</em>-->
-                                    <em class="fastJump" v-if="s.realHr != 0" v-show="parseInt(s.realHr) > 100">{{
-                                        s.realHr }}</em>
-                                    <em class="slowJump" v-if="s.realHr != 0" v-show="parseInt(s.realHr) <= 100">{{
-                                        s.realHr }}</em>
-                                    <em class="plus" v-if="s.realHr == 0"> --- </em>
-                                </div>
-                            </div>
-                            <div class="bottomLi">
-                                <div class="btcla">
-                                    <img src="../static/img/s1.svg"/>
-                                    <span>{{ s.Cle |fmtFloat }}</span>
-                                </div>
-                                <div class="btck">
-                                    <img src="../static/img/s2.svg"/>
-                                    <span>{{ s.Steps }}</span>
-                                </div>
-                                <div class="step">
-                                    <img src="../static/img/ck.svg"/>
-                                    <span>{{ s.Ck  |fmtFloat}}</span>
-                                </div>
-                            </div>
-                        </div>
                     </li>
                 </ul>
             </div>
@@ -189,16 +140,17 @@
             }
         },
         mounted() {
-            this.timer = setInterval(() => {
-                this.GetgetUserList();
-                this.ClacClassTime();
-            }, 1000);
+            // this.timer = setInterval(() => {
+            //     this.GetgetUserList();
+            //     this.ClacClassTime();
+            // }, 1000);
+            this.GetgetUserList();
         },
         methods: {
             fakeNews() {
                 let item = [];
                 let nums = Math.random() * 100 + 1;
-                this.fakeNums = 8;
+                this.fakeNums = 3;
                 for (var i = 0; i < this.fakeNums; i++) {
                     item.push(
                         {
@@ -276,6 +228,9 @@
                     case  parseInt(res.length) <= 2 && parseInt(res.length) > 0:
                         numberClass = 'two';
                         break;
+                    case  parseInt(res.length) == 3:
+                        numberClass = 'three';
+                        break;
                     case  parseInt(res.length) <= 4 && parseInt(res.length) > 2:
                         numberClass = 'four';
                         break;
@@ -399,8 +354,10 @@
         position: relative;
         top: 0.5rem;
         width: 98%;
+        height: 0.6rem;
         display: block;
         margin: 0 auto;
+        overflow: visible;
     }
 
     .progress {
@@ -491,7 +448,7 @@
         overflow: hidden;
         display: block;
         margin: 0 auto;
-        padding-top: 0.5rem;
+        padding-top: 0.01rem;
     }
 
     .pk_container li {
@@ -591,12 +548,14 @@
         overflow: hidden;
         float: right;
         text-align: right;
-        margin-right: 0.2rem;
+        padding-right: 0.3rem;
+        font-size: 0.8rem;
+        line-height: 1.6rem;
     }
 
     .user .ult s {
         position: relative;
-        top: -1.1rem;
+        top: -1.2rem;
         right: 0rem;
         float: right;
         font-family: HeadLineA;
@@ -628,11 +587,12 @@
 
 
     .urt img {
+        position: relative;
+        right: 0.1rem;
+        top: -1.2rem;
         width: 0.35rem;
         height: 0.35rem;
-        overflow: hidden;
-        display: block;
-        margin: 0 auto;
+        float: right;
     }
 
     .urt em {
@@ -641,7 +601,7 @@
         margin: 0 auto;
         font-family: HeadLineA;
         font-weight: normal;
-        font-size: 0.8rem;
+        font-size: 0.7rem;
         letter-spacing: -0.05em;
         text-align: right;
         font-style: normal;
@@ -650,7 +610,7 @@
     }
 
     .bottomLi {
-        width: 90%;
+        width: 98%;
         overflow: hidden;
         display: block;
         margin: 0 auto;
@@ -662,14 +622,13 @@
     }
 
     .bottomLi img {
-        width: 0.3rem;
-        height: 0.3rem;
+        /*width: 0.24rem;*/
+        /*height: 0.24rem;*/
         float: left;
         margin-left: 10%;
     }
 
     .bottomLi span {
-        width: 70%;
         float: left;
         text-align: left;
     }
@@ -688,7 +647,7 @@
 
     .bottomLi .step {
         width: 30%;
-        float: left;
+        float: right;
         text-align: left;
     }
 
@@ -724,13 +683,6 @@
         }
     }
 
-    /*two*/
-
-    .pk_container li.two {
-        width: 90%;
-        overflow: hidden;
-        display: block;
-    }
 
     .md {
         width: 30%;
@@ -910,6 +862,149 @@
     }
 
 
+    /*two*/
+
+    .pk_container li.two {
+        width: 90%;
+        overflow: hidden;
+        display: block;
+    }
+
+    .two .bottomLi {
+        width: 98%;
+        font-size: 0.35rem;
+        margin-top: 0.3rem;
+        text-align: center;
+    }
+
+    .two .bottomLi img {
+        width: 0.4rem;
+        height: 0.4rem;
+        margin-top: 0.15rem;
+    }
+
+    .two .bottomLi .btck img {
+        width: 0.4rem;
+        margin-top: 0.1rem;
+    }
+
+    .two .bottomLi span {
+        line-height: 0.8rem;
+        text-indent: 0.1rem;
+    }
+
+    .two .bottomLi .btcla {
+        width: 30%;
+    }
+
+    .two .bottomLi .btck {
+        width: 33%;
+        padding-left: 3%;
+    }
+
+    .two .bottomLi .step {
+        width: 28%;
+        padding-right: 0%;
+    }
+
+    .two .cla em.plus {
+        position: relative;
+        left: -0.3rem
+    }
+
+    .two .lhj span.plus {
+        position: relative;
+        left: 1.3rem
+    }
+
+    .two .bottomLi .btck img {
+        width: 0.5rem;
+        height: 0.5rem;
+        margin-top: 0.12rem;
+    }
+
+    /*three*/
+
+    .pk_container li.three {
+        width: 90%;
+        overflow: hidden;
+        display: block;
+    }
+
+    .three .bottomLi {
+        width: 98%;
+        font-size: 0.35rem;
+        margin-top: 0rem;
+        text-align: center;
+    }
+
+    .three .circle {
+        width: 1.2rem;
+        height: 1.2rem;
+    }
+
+    .three .circle img {
+        width: 0.9rem;
+        height: 0.9rem;
+    }
+
+    .three .user {
+        height: 1.2rem;
+        overflow: hidden;
+    }
+    .three .ult em div {
+        line-height: 1.2rem;
+    }
+    .three .urt em {
+        line-height: 1.2rem;
+    }
+    .three .bottomLi img {
+        width: 0.4rem;
+        height: 0.4rem;
+        margin-top: 0.15rem;
+    }
+
+    .three .bottomLi .btck img {
+        width: 0.4rem;
+        margin-top: 0.1rem;
+    }
+
+    .three .bottomLi span {
+        line-height: 0.8rem;
+        text-indent: 0.1rem;
+    }
+
+    .three .bottomLi .btcla {
+        width: 30%;
+    }
+
+    .three .bottomLi .btck {
+        width: 33%;
+        padding-left: 3%;
+    }
+
+    .three .bottomLi .step {
+        width: 28%;
+        padding-right: 0%;
+    }
+
+    .three .cla em.plus {
+        position: relative;
+        left: -0.3rem
+    }
+
+    .three .lhj span.plus {
+        position: relative;
+        left: 1.3rem
+    }
+
+    .three .bottomLi .btck img {
+        width: 0.5rem;
+        height: 0.5rem;
+        margin-top: 0.12rem;
+    }
+
+
     /*four*/
     .four {
         width: 49%;

+ 1 - 1
tv/vue.config.js

@@ -29,7 +29,7 @@ module.exports = {
                 }
             },
             '/bpi': {
-                target: 'http://192.168.0.236:19096',//公司公用的
+                target: 'http://192.168.0.3:19096',//公司公用的
                 changeOrigin: true,
                 pathRewrite: {
                     '^/bpi': '',