Changpeng Duan 5 лет назад
Родитель
Сommit
7594aa8279

+ 114 - 104
tv/.idea/workspace.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="BookmarkManager">
-    <bookmark url="file://$PROJECT_DIR$/src/api/getApiRes.js" line="64" />
+    <bookmark url="file://$PROJECT_DIR$/src/api/getApiRes.js" line="72" />
   </component>
   <component name="BranchesTreeState">
     <expand>
@@ -23,28 +23,15 @@
   </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 beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/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/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" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -57,20 +44,47 @@
   </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/views/Main.vue">
+        <entry file="file://$PROJECT_DIR$/src/Mock/index.js">
           <provider selected="true" editor-type-id="text-editor">
-            <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 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="true">
-        <entry file="file://$PROJECT_DIR$/src/components/Headside.vue">
+      <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="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 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>
@@ -137,23 +151,23 @@
       <list>
         <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" />
         <option value="$PROJECT_DIR$/src/assets/css/mainBk2.css" />
         <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$/src/components/Headside.vue" />
         <option value="$PROJECT_DIR$/test.html" />
         <option value="$PROJECT_DIR$/vue.config.js" />
-        <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/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/api/getApiRes.js" />
+        <option value="$PROJECT_DIR$/src/views/Index.vue" />
       </list>
     </option>
   </component>
@@ -163,10 +177,10 @@
     <other-services-enabled>true</other-services-enabled>
     <auto-save>true</auto-save>
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
+  <component name="ProjectFrameBounds">
     <option name="x" value="-2568" />
     <option name="y" value="-8" />
-    <option name="width" value="2576" />
+    <option name="width" value="1296" />
     <option name="height" value="1395" />
   </component>
   <component name="ProjectId" id="1jXXjXdwK5v7WohMBoZDModntXR" />
@@ -187,48 +201,22 @@
               <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="public" 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="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" />
               <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" />
+              <item name="libs" 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" />
+              <item name="views" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
@@ -261,8 +249,8 @@
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
-      <recent name="D:\wwwroot\flyLong\tv\src\static\img\people" />
       <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" />
@@ -330,7 +318,7 @@
       <workItem from="1604539672735" duration="79000" />
       <workItem from="1604540536502" duration="646000" />
       <workItem from="1604541901536" duration="160559000" />
-      <workItem from="1605406240238" duration="44947000" />
+      <workItem from="1605406240238" duration="51039000" />
     </task>
     <task id="LOCAL-00001" summary="test web">
       <created>1605431368250</created>
@@ -381,17 +369,24 @@
       <option name="project" value="LOCAL" />
       <updated>1605520419757</updated>
     </task>
-    <option name="localTasksCounter" value="8" />
+    <task id="LOCAL-00008" summary="del unuse">
+      <created>1605582755136</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1605582755136</updated>
+    </task>
+    <option name="localTasksCounter" value="9" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="206152000" />
+    <option name="totallyTimeSpent" value="212244000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-2568" y="-8" width="2576" height="1395" extended-state="6" />
+    <frame x="-2568" y="-8" width="1296" height="1395" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1539075" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.15309446" />
       <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" />
@@ -428,6 +423,14 @@
               <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
                 <collection />
               </option>
+              <option name="COLUMN_ORDER">
+                <list>
+                  <option value="0" />
+                  <option value="1" />
+                  <option value="2" />
+                  <option value="3" />
+                </list>
+              </option>
             </State>
           </value>
         </entry>
@@ -455,7 +458,8 @@
     <MESSAGE value="show version" />
     <MESSAGE value="show new style" />
     <MESSAGE value="api by corss" />
-    <option name="LAST_COMMIT_MESSAGE" value="api by corss" />
+    <MESSAGE value="del unuse" />
+    <option name="LAST_COMMIT_MESSAGE" value="del unuse" />
   </component>
   <component name="WindowStateProjectService">
     <state x="-1830" y="274" width="1099" height="859" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1604022799787">
@@ -507,20 +511,6 @@
         </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">
-          <caret line="3" column="15" lean-forward="true" selection-start-line="3" selection-start-column="15" selection-end-line="3" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/Index.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="26" column="28" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/assets/css/mainBk2.css">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="443">
@@ -615,13 +605,6 @@
     <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/App.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="777">
-          <caret line="37" column="27" lean-forward="true" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/components/newRecord.vue">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="336">
@@ -643,13 +626,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="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/Rank.vue">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="243">
@@ -664,10 +640,31 @@
         </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">
+          <caret line="3" column="15" lean-forward="true" selection-start-line="3" selection-start-column="15" selection-end-line="3" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/App.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="189">
+          <caret line="9" column="9" lean-forward="true" selection-start-line="9" selection-start-column="9" selection-end-line="9" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/components/Headside.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="509">
+          <caret line="113" column="17" selection-start-line="113" selection-start-column="17" selection-end-line="113" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/api/getApiRes.js">
       <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" />
+        <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>
@@ -676,15 +673,28 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/views/Main.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <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 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>
-    <entry file="file://$PROJECT_DIR$/src/components/Headside.vue">
+    <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/views/Index.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <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 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>

+ 6 - 0
tv/src/App.vue

@@ -4,6 +4,12 @@
     </div>
 </template>
 
+<script>
+    export default {
+        mounted() {
+        }
+    }
+</script>
 <style>
     #app {
         position: absolute;

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

@@ -11,6 +11,14 @@ function getApiBasic(url, postdata) {
     })
 }
 
+// 获取当前版本
+export function getCheckUpdate(postdata) {
+    let url = headapi + 'getUserList';
+    return getApiBasic(url, postdata);
+}
+
+
+
 // 调用的api改写成方法
 export function getUserList(postdata) {
     let url = headapi + 'getUserList';

+ 119 - 100
tv/src/components/Headside.vue

@@ -1,117 +1,136 @@
 <template>
-  <div class="headerContainer">
-    <div class="lt">
-      <em> {{ nowWeeks }}</em> <span>  {{ nowDay }}</span>
-    </div>
-    <div class="rt">
-      {{ nowTime }}
-      <img src="../static/img/blue.svg" height="24" width="24"/>
-      <img src="../static/img/wifi.svg" height="24" width="24"/>
-    </div>
+    <div class="headerContainer">
+        <div class="lt">
+            <em> {{ nowWeeks }}</em> <span>  {{ nowDay }}</span>
+        </div>
+        <div class="rt">
+            {{ nowTime }}
+            <span>版本:{{version}}</span>
+            <img src="../static/img/blue.svg" />
+            <img src="../static/img/wifi.svg" />
+        </div>
 
-  </div>
+    </div>
 </template>
 
 <script>
-import global from '../Global'
-import '../libs/rem';
+    import global from '../Global'
+    import '../libs/rem';
 
-export default {
-  data() {
-    return {
-      nowWeeks: '',
-      nowDay: '',
-      nowTime: '',
-    }
-  },
-  mounted() {
-    this.timer = setInterval(() => {
-      this.nowDayFunc();
-      this.nowTimeFunc();
-    }, 1000);
-    this.getCurVersion();
-  },
-  beforeDestroy() {
-    clearInterval(this.timer);
-  },
-  methods: {
-    nowDayFunc() {
-      let days = new Date().getDay();
-      let wd = numberToWeekdays(days);
-      this.nowWeeks = wd;
-      this.nowDay = globalcurrent();
-    },
-    nowTimeFunc() {
-      this.nowTime = getHoursAndMinAndSec();
-    },
-    // 获取当前版本
-    getCurVersion(){
-      let version = this.$route.query.v;
-      console.log(version)
+    export default {
+        data() {
+            return {
+                nowWeeks: '',
+                nowDay: '',
+                nowTime: '',
+                version: '1.0'
+            }
+        },
+        mounted() {
+            this.timer = setInterval(() => {
+                this.nowDayFunc();
+                this.nowTimeFunc();
+            }, 1000);
+            this.getCurVersion();
+            if (localStorage.version) {
+                this.version = localStorage.version
+            }
+        },
+        beforeDestroy() {
+            clearInterval(this.timer);
+        },
+        methods: {
+            nowDayFunc() {
+                let days = new Date().getDay();
+                let wd = numberToWeekdays(days);
+                this.nowWeeks = wd;
+                this.nowDay = globalcurrent();
+            },
+            nowTimeFunc() {
+                this.nowTime = getHoursAndMinAndSec();
+            },
+            // 获取当前版本
+            getCurVersion() {
+                // console.log(version)
+            }
+        }
     }
-  }
-}
 </script>
 
 <style scoped>
-.headerContainer {
-  height: 4%;
-  overflow: hidden;
-  display: block;
-  margin: 0 auto;
-  margin-top: 1%;
-  padding: 0;
-  padding: 2%;
-  background: url("../static/img/logo.svg");
-  background-position: top center;
-  background-repeat: no-repeat;
-  background-size: 16%;
-}
+    .headerContainer {
+        height: 4%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        margin-top: 1%;
+        padding: 0;
+        padding: 2%;
+        background: url("../static/img/logo.svg");
+        background-position: top center;
+        background-repeat: no-repeat;
+        background-size: 16%;
+    }
 
-* {
-  font-family: vista;
-}
+    * {
+        font-family: vista;
+    }
 
-.lt {
-  width: 40%;
-  float: left;
-  font-family: vista;
-  font-weight: normal;
-  font-size: 0.4rem;
-  text-align: left;
-  color: #fff;
-  line-height: 20%;
-}
+    .lt {
+        width: 40%;
+        float: left;
+        font-family: vista;
+        font-weight: normal;
+        font-size: 0.4rem;
+        text-align: left;
+        color: #fff;
+        line-height: 20%;
+    }
 
-.rt {
-  width: 40%;
-  float: right;
-  font-family: vista;
-  font-weight: normal;
-  font-size: 0.4rem;
-  text-align: right;
-  color: #fff;
-  line-height: 20%;
-  padding-right: 7%;
-}
+    .rt {
+        width: 40%;
+        float: right;
+        font-family: vista;
+        font-weight: normal;
+        font-size: 0.4rem;
+        text-align: right;
+        color: #fff;
+        line-height: 20%;
+        padding-right: 14%;
+    }
+
+    .rt img {
+        position: absolute;
+        top: 4%;
+        right:  9%;
+        padding: 0;
+        margin: 0;
+        float: right;
+        width: 0.4rem;
+        height: 0.4rem;
+    }
 
-.rt img {
-  position: absolute;
-  top: 4%;
-  right: 10px;
-  padding: 0;
-  margin: 0;
-  float: right;
-  margin-right: 10px;
-}
+    .rt img:nth-child(2) {
+        right: 12%;
+    }
 
-.rt img:nth-child(2) {
-  right: 4%;
-}
+    em {
+        float: left;
+        font-style: normal;
+        margin-right: 0.5rem;
+    }
+    .rt span {
+        position: absolute;
+        top: 4%;
+        right: 2%;
+        float: right;
+        color: #fff;
+        font-size: 0.2rem;
+        text-align: center;
+        background: rgba(0,0,0,0.35);
+        width: 1.2rem;
+        height: 0.4rem;
+        line-height: 0.4rem;
 
-em {
-  float: left;
-  font-style: normal;
-  margin-right: 0.5rem;
-}
+    }
 </style>

BIN
tv/src/static/img/bg/bg_5.png


BIN
tv/src/static/img/bg/bg_6.png


BIN
tv/src/static/img/bg/bg_7.png


+ 236 - 157
tv/src/views/Index.vue

@@ -1,47 +1,114 @@
 <template>
-  <div class="IndexContainer">
-<!--      <el-container>-->
-<!--        <el-main>-->
-          <keep-alive>
+    <div class="IndexContainer">
+        <keep-alive>
             <router-view></router-view>
-          </keep-alive>
-<!--        </el-main>-->
-<!--    </el-container>-->
-  </div>
+        </keep-alive>
+    </div>
 </template>
 
 <script>
-export default {
-  name: 'Home',
-  data() {
-    return {
-      isCollapse: document.body.clientWidth < 1366,
-      aSideState: false,
-      thisClick: 0,
-      tabwildState: 1,
-      handleTabsList: [{
-        title: '系统首页',
-        name: '1',
-        clmurl: '/',
-      }],
-      editableTabsValue: '1'
-    }
-  },
-  mounted() {
-    // checkScreen
-    if (document.body.clientWidth < 1024) {
-      // this.$message.warning('请横屏使用本系统');
+    import mui from '../libs/mui'
+    import {
+        getCheckUpdate,
+        getUserList
+    } from '@/api/getApiRes'
+
+    let qs = require('qs');
+
+    export default {
+        name: 'Home',
+        data() {
+            return {
+                aSideState: false,
+                thisClick: 0,
+                tabwildState: 1,
+                handleTabsList: [{
+                    title: '系统首页',
+                    name: '1',
+                    clmurl: '/',
+                }],
+                editableTabsValue: '1',
+                curVersion: '1.0'
+            }
+        },
+        mounted() {
+            this.getCurVersion();
+        },
+        methods: {
+            // 获取当前版本号
+            getCurVersion() {
+                let that = this;
+
+                function plusReady() {
+                    // 获取本地应用资源版本号
+                    plus.runtime.getProperty(plus.runtime.appid, function (inf) {
+                        localStorage.version = inf.version;
+                        that.curVersion = inf.version;
+                    });
+                }
+
+                if (window.plus) {
+                    plusReady();
+                    this.checkUpdate();
+                } else {
+                    console.log('mui is not ready');
+                    document.addEventListener('plusready', plusReady, false);
+                }
+            },
+            // 是否有新版本
+            checkUpdate() {
+                let that = this;
+                let param = {};
+                let netVersion = "";
+                let postdata = qs.stringify(param);
+                const h = this.$createElement;
+                // getCheckUpdate(postdata).then(res => {
+                //     let json = res;
+                //     if (json.Code == 0) {
+
+                // if (that.curVersion != netVersion) {
+                if (1 == 1) {
+                    let url = "http://192.168.0.162/flyLong/hbuild/upload//GoAllOut_1.0.1.wgt";
+                    that.downWgt(url);
+                    that.$notify({
+                        title: '升级提醒',
+                        message: h('i', {style: 'color: teal'}, '检测到新的版本,正在下载最新版本')
+                    });
+                }
+                //     }
+                // })
+            },
+            downWgt(url) {
+                let that = this;
+                plus.downloader.createDownload(url, {filename: "_doc/update/"}, function (d, status) {
+                    if (status == 200) {
+                        console.log("下载wgt成功:" + d.filename);
+                        that.installWgt(d.filename); // 安装wgt包
+                    } else {
+                        console.log("下载wgt失败!");
+                        plus.nativeUI.alert("下载wgt失败!");
+                    }
+                    plus.nativeUI.closeWaiting();
+                }).start();
+            },
+            installWgt(path) {
+                plus.nativeUI.showWaiting("安装wgt文件...");
+                plus.runtime.install(path, {}, function () {
+                    plus.nativeUI.closeWaiting();
+                    console.log("安装wgt文件成功!");
+                    plus.nativeUI.alert("应用资源更新完成!", function () {
+                        plus.runtime.restart();
+                    });
+                }, function (e) {
+                    plus.nativeUI.closeWaiting();
+                    console.log("安装wgt文件失败[" + e.code + "]:" + e.message);
+                    plus.nativeUI.alert("安装wgt文件失败[" + e.code + "]:" + e.message);
+                });
+            }
+
+        },
+        components: {}
     }
-  },
-  methods: {
-    left_hide() {
-      this.aSideState = !this.aSideState;
-      this.isCollapse = !this.isCollapse;
-    },
-  },
-  components: {
-  }
-}
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
@@ -51,123 +118,135 @@ export default {
         margin: 0;
         padding: 0;
     }
-.el-header {
-  padding: 0 !important;
-  height: 72px !important;
-}
-
-.shortElaside {
-  width: 140px !important;
-  overflow: hidden;
-  height: 100%;
-  float: left;
-}
-
-.lognElaside {
-  width: 256px !important;
-  overflow: hidden;
-  height: 100%;
-  float: left;
-}
-
-/deep/ .nav {
-  width: 60px;
-}
-
-.IndexContainer {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  background: #F0F2F5;
-}
-
-.IndexContainer > .el-container {
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-  display: block;
-  margin: 0 auto;
-}
-
-.footer {
-  position: absolute;
-  bottom: 0px;
-  width: 100%;
-  padding: 10px;
-  overflow: hidden;
-  display: block;
-  margin: 0 auto;
-  text-align: center;
-  text-indent: -30%;
-  font-size: 12px;
-  color: #BDBDBD;
-  background: #F0F2F5;
-  z-index: 222;
-}
-
-.el-main {
-  width: 100%;
-  height: 100%;
-  /*min-height: 800px;*/
-  overflow: hidden;
-  display: block;
-  margin: 0 auto;
-  overflow-y: hidden;
-  padding: 10px 20px;
-}
-
-/*ipad only*/
-@media only screen and (max-width: 1366px) {
-  .lognElaside {
-    width: 70px!important;
-  }
-  .logoContainer img {
-    display: none!important;
-  }
-  .el-main {
-    padding: 3px!important;
-    overflow-y: scroll;
-  }
-  .el-main > .context {
-    /*height: 640px;*/
-    /*overflow-y: scroll;*/
-    padding: 6px!important;
-  }
-  .table {
-    /*width: 950px;*/
-    /*overflow-x: scroll;*/
-  }
-  .el-dialog {
-    max-width: 960px;
-  }
-  .el-dialog__body {
-    padding: 3px;
-  }
-  .el-transfer__buttons {
-    width: 60px;
-    padding: 3px;
-  }
-  .el-transfer .el-button + .el-button {
-    float: right;
-  }
-  .el-container.is-vertical {
-    position: absolute;
-    left: 140px;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    height: 100%;
-  }
-  .context {
-    border-radius: 12px;
-    height: 823px!important;
-    overflow-y: scroll;
-  }
-  .el-dialog {
-    padding: 5px;
-    padding-bottom: 15px;
-  }
-}
+
+    .el-header {
+        padding: 0 !important;
+        height: 72px !important;
+    }
+
+    .shortElaside {
+        width: 140px !important;
+        overflow: hidden;
+        height: 100%;
+        float: left;
+    }
+
+    .lognElaside {
+        width: 256px !important;
+        overflow: hidden;
+        height: 100%;
+        float: left;
+    }
+
+    /deep/ .nav {
+        width: 60px;
+    }
+
+    .IndexContainer {
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        background: #F0F2F5;
+    }
+
+    .IndexContainer > .el-container {
+        width: 100%;
+        height: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+    }
+
+    .footer {
+        position: absolute;
+        bottom: 0px;
+        width: 100%;
+        padding: 10px;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        text-align: center;
+        text-indent: -30%;
+        font-size: 12px;
+        color: #BDBDBD;
+        background: #F0F2F5;
+        z-index: 222;
+    }
+
+    .el-main {
+        width: 100%;
+        height: 100%;
+        /*min-height: 800px;*/
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        overflow-y: hidden;
+        padding: 10px 20px;
+    }
+
+    /*ipad only*/
+    @media only screen and (max-width: 1366px) {
+        .lognElaside {
+            width: 70px !important;
+        }
+
+        .logoContainer img {
+            display: none !important;
+        }
+
+        .el-main {
+            padding: 3px !important;
+            overflow-y: scroll;
+        }
+
+        .el-main > .context {
+            /*height: 640px;*/
+            /*overflow-y: scroll;*/
+            padding: 6px !important;
+        }
+
+        .table {
+            /*width: 950px;*/
+            /*overflow-x: scroll;*/
+        }
+
+        .el-dialog {
+            max-width: 960px;
+        }
+
+        .el-dialog__body {
+            padding: 3px;
+        }
+
+        .el-transfer__buttons {
+            width: 60px;
+            padding: 3px;
+        }
+
+        .el-transfer .el-button + .el-button {
+            float: right;
+        }
+
+        .el-container.is-vertical {
+            position: absolute;
+            left: 140px;
+            top: 0;
+            right: 0;
+            bottom: 0;
+            height: 100%;
+        }
+
+        .context {
+            border-radius: 12px;
+            height: 823px !important;
+            overflow-y: scroll;
+        }
+
+        .el-dialog {
+            padding: 5px;
+            padding-bottom: 15px;
+        }
+    }
 </style>

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

@@ -134,7 +134,7 @@
         data() {
             return {
                 pageStyle: RandomBg(),
-                trueDate: true,//真实数据 true false
+                trueDate: false,//真实数据 true false
                 totalTime: 4,
                 times: 1,
                 thisClassName: '',