time picker

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

.idea/workspace.xml

@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="d2d14daa-fcc9-421d-abb9-b81e7b0e4169" name="Default Changelist" comment="" />
+    <list default="true" id="d2d14daa-fcc9-421d-abb9-b81e7b0e4169" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/components/Hand.vue" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/components/Hand.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/components/timePart.vue" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/components/timePart.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/page/mainpage.vue" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/page/mainpage.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/page/sport.vue" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/page/sport.vue" afterDir="false" />
+    </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -13,17 +20,12 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/app/src/page/mainpage.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="273">
-              <caret line="120" column="17" selection-start-line="120" selection-start-column="17" selection-end-line="120" selection-end-column="17" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/page/index.vue">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="546">
-              <caret line="26" column="23" selection-start-line="26" selection-start-column="23" selection-end-line="26" selection-end-column="23" />
+            <state relative-caret-position="777">
+              <caret line="37" column="19" lean-forward="true" selection-start-line="37" selection-start-column="19" selection-end-line="37" selection-end-column="19" />
+              <folding>
+                <element signature="e#438#529#0" expanded="true" />
+                <element signature="e#743#776#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -31,8 +33,11 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/app/src/page/sport.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="651">
-              <caret line="33" column="34" selection-start-line="33" selection-start-column="34" selection-end-line="33" selection-end-column="34" />
+            <state relative-caret-position="798">
+              <caret line="68" column="20" lean-forward="true" selection-start-line="57" selection-start-column="13" selection-end-line="68" selection-end-column="20" />
+              <folding>
+                <element signature="e#1096#1122#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -56,6 +61,9 @@
       <find>number</find>
       <find>fade</find>
       <find>walk</find>
+      <find>timeContainer</find>
+      <find>console.log(this.i);</find>
+      <find>rem.js</find>
     </findStrings>
     <replaceStrings>
       <replace>red</replace>
@@ -69,6 +77,7 @@
   <component name="Git.Settings">
     <option name="PATH_TO_GIT" value="git.exe" />
     <option name="ROOT_SYNC" value="DONT_SYNC" />
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
@@ -76,20 +85,23 @@
         <option value="$PROJECT_DIR$/app/package.json" />
         <option value="$PROJECT_DIR$/app/src/router/index.js" />
         <option value="$PROJECT_DIR$/app/src/Global.js" />
-        <option value="$PROJECT_DIR$/app/src/page/mainpage.vue" />
         <option value="$PROJECT_DIR$/app/src/page/index.vue" />
         <option value="$PROJECT_DIR$/app/src/components/bottomTab.vue" />
-        <option value="$PROJECT_DIR$/app/src/components/timePart.vue" />
         <option value="$PROJECT_DIR$/app/src/components/Hand.vue" />
+        <option value="$PROJECT_DIR$/app/src/components/timePart.vue" />
+        <option value="$PROJECT_DIR$/app/src/page/mainpage.vue" />
         <option value="$PROJECT_DIR$/app/src/page/sport.vue" />
       </list>
     </option>
   </component>
-  <component name="ProjectFrameBounds" extendedState="7">
-    <option name="x" value="-2568" />
-    <option name="y" value="-8" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-2292" />
+    <option name="y" value="179" />
     <option name="width" value="2576" />
-    <option name="height" value="1395" />
+    <option name="height" value="1456" />
+  </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true">
+    <ConfirmationsSetting value="2" id="Add" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
@@ -114,13 +126,6 @@
               <item name="app" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="w" type="b2602c69:ProjectViewProjectNode" />
-              <item name="w" type="462c0819:PsiDirectoryNode" />
-              <item name="app" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="components" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="w" type="b2602c69:ProjectViewProjectNode" />
               <item name="w" type="462c0819:PsiDirectoryNode" />
@@ -188,12 +193,12 @@
       <option name="presentableId" value="Default" />
       <updated>1605261565825</updated>
       <workItem from="1605261567466" duration="8935000" />
-      <workItem from="1605406240238" duration="4707000" />
+      <workItem from="1605406240238" duration="9922000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="13642000" />
+    <option name="totallyTimeSpent" value="18857000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-2568" y="-8" width="2576" height="1395" extended-state="7" />
@@ -227,9 +232,6 @@
     <entry file="file://$PROJECT_DIR$/app/src/page/login.vue">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/vue.config.js">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/package.json">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="21">
@@ -250,17 +252,6 @@
     <entry file="file://$PROJECT_DIR$/app/public/favicon.ico">
       <provider selected="true" editor-type-id="images" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1176">
-          <caret line="56" column="23" selection-start-line="56" selection-start-column="23" selection-end-line="56" selection-end-column="23" />
-          <folding>
-            <element signature="e#0#21#0" expanded="true" />
-            <element signature="e#179#213#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/icon/logo.png">
       <provider selected="true" editor-type-id="images" />
     </entry>
@@ -294,38 +285,59 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/components/timePart.vue">
+    <entry file="file://$PROJECT_DIR$/app/vue.config.js">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/page/index.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="777">
-          <caret line="64" column="38" selection-end-line="370" />
+        <state relative-caret-position="546">
+          <caret line="26" column="23" selection-start-line="26" selection-start-column="23" selection-end-line="26" selection-end-column="23" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/page/index.vue">
+    <entry file="file://$PROJECT_DIR$/app/src/main.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="546">
-          <caret line="26" column="23" selection-start-line="26" selection-start-column="23" selection-end-line="26" selection-end-column="23" />
+          <caret line="56" column="23" selection-start-line="56" selection-start-column="23" selection-end-line="56" selection-end-column="23" />
+          <folding>
+            <element signature="e#0#21#0" expanded="true" />
+            <element signature="e#179#213#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/app/src/components/Hand.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="16" column="45" selection-start-line="16" selection-start-column="45" selection-end-line="16" selection-end-column="45" />
+        <state relative-caret-position="253">
+          <caret line="14" column="47" selection-start-line="14" selection-start-column="47" selection-end-line="14" selection-end-column="47" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/components/timePart.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="422">
+          <caret line="88" column="29" selection-start-line="88" selection-start-column="21" selection-end-line="88" selection-end-column="29" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/app/src/page/sport.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="651">
-          <caret line="33" column="34" selection-start-line="33" selection-start-column="34" selection-end-line="33" selection-end-column="34" />
+        <state relative-caret-position="798">
+          <caret line="68" column="20" lean-forward="true" selection-start-line="57" selection-start-column="13" selection-end-line="68" selection-end-column="20" />
+          <folding>
+            <element signature="e#1096#1122#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/app/src/page/mainpage.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="273">
-          <caret line="120" column="17" selection-start-line="120" selection-start-column="17" selection-end-line="120" selection-end-column="17" />
+        <state relative-caret-position="777">
+          <caret line="37" column="19" lean-forward="true" selection-start-line="37" selection-start-column="19" selection-end-line="37" selection-end-column="19" />
+          <folding>
+            <element signature="e#438#529#0" expanded="true" />
+            <element signature="e#743#776#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>

app/src/components/Hand.vue

@@ -12,7 +12,7 @@
                         </div>
                         <div class="main">
                             <div class="text">
-                                <p> > DETONATION FUNCTION</p>
+                                <p> > SPORTCALC FUNCTION</p>
                                 <h5>
                                     <em>READY</em>
                                     <I></I>

app/src/components/timePart.vue

@@ -98,7 +98,6 @@
                 this.percent = (Math.random(0, 100) * 100).toFixed(0);
                 // this.type = !this.type;
                 this.i = parseInt(Math.random(1, 3) * 4 + 1);
-                console.log(this.i);
             }
         }
     }

app/src/page/mainpage.vue

@@ -27,6 +27,7 @@
     import timePart from '@/components/timePart.vue'
     let qs = require('qs');
     import Global from '../Global.js'
+    import '../libs/rem';
 
     export default {
         data() {
@@ -38,6 +39,7 @@
             // this.getManagerSelfQuery();
         },
         destroyed() {
+
         },
         methods: {
             alertInfo(info) {

app/src/page/sport.vue

@@ -2,17 +2,28 @@
     <div id="mainPage">
         <bottomTab :curTab="thisTab"></bottomTab>
 
-        <mu-paper :z-depth="1">
-            <mu-time-picker :no-display="!display" :view-type="viewType" :time.sync="time" :format="type" :landscape="landscape"></mu-time-picker>
-        </mu-paper>
-
+        <div class="inputContainer">
+            <div class="mu-picker-landspace">
+                <mu-row gutter>
+                    <mu-col span="12" lg="6" sm="6">
+                        <mu-date-input icon="today" landscape v-model="bt" label="BEGIN TIME" type="time" label-float
+                                       full-width></mu-date-input>
+                    </mu-col>
+                    <mu-col span="12" lg="6" sm="6">
+                        <mu-date-input icon="today" landscape v-model="et" label="END TIME" type="time" label-float
+                                       full-width></mu-date-input>
+                    </mu-col>
+                </mu-row>
+            </div>
+        </div>
         <div @click="turnSport">
             <Hand :state="state"></Hand>
         </div>
-        <div>
-
-        </div>
-
+        <mu-fade-transition>
+            <div v-show="!state">
+                12345
+            </div>
+        </mu-fade-transition>
     </div>
 </template>
 
@@ -20,31 +31,48 @@
     import axios from 'axios';
     import bottomTab from '../components/bottomTab'
     import Hand from '@/components/Hand.vue'
+    import '../libs/rem';
+
     let qs = require('qs');
     import Global from '../Global.js'
+
     export default {
         data() {
             return {
                 thisTab: 'SPORT',
-                state:true,
+                state: true,
                 time: undefined,
-                landscape: false,
+                landscape: true,
                 display: true,
                 type: 'ampm',
                 viewType: 'clock',
+                bt: '',
+                et: '',
                 lists: []
             }
         },
         mounted() {
         },
         methods: {
-            turnSport(){
-                console.log(123);
+            turnSport() {
+                // if (!this.bt) {
+                //     this.$toast.warning('NULL BEGIN TIME');
+                //     return false
+                // }
+                // if (!this.et) {
+                //     this.$toast.warning('NULL END TIME');
+                //     return false
+                // }
+                // if (this.et < this.bt) {
+                //     this.$toast.warning('BT IS OVER ET');
+                //     return false
+                // }
+
                 this.state = false
             }
         },
         components: {
-            bottomTab,Hand
+            bottomTab, Hand
         }
     }
 </script>
@@ -60,4 +88,36 @@
         overflow-y: scroll;
         color: red;
     }
+
+    .timeContainer {
+        width: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+    }
+
+    .mu-picker {
+        overflow: hidden;
+        /*display: block;*/
+        margin: 0 auto;
+    }
+
+    .mu-input {
+        color: #fff;
+    }
+
+    /deep/ .mu-input.has-label .mu-input-label.float {
+        color: #fcfcfc;
+    }
+
+    /deep/ .mu-text-field-input {
+        color: #fff;
+    }
+
+    .inputContainer {
+        width: 75%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+    }
 </style>