Переглянути джерело

优化登录界面,去除内外边距

liuwei 4 роки тому
батько
коміт
10caec7017
3 змінених файлів з 166 додано та 102 видалено
  1. 146 85
      .idea/workspace.xml
  2. 0 12
      src/renderer/api/index.js
  3. 20 5
      src/renderer/components/Login.vue

+ 146 - 85
.idea/workspace.xml

@@ -2,7 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="690c02a3-0e7d-4c4a-8f0c-a44c44c3a162" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js" beforeDir="false" afterPath="$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/renderer/api/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/api/index.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/renderer/components/Login.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/components/Login.vue" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/dist/" />
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -15,12 +17,29 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+    <leaf>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js">
+        <entry file="file://$PROJECT_DIR$/src/renderer/components/Login.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-189">
-              <caret line="12" column="49" lean-forward="true" selection-start-line="12" selection-start-column="49" selection-end-line="12" selection-end-column="49" />
+            <state relative-caret-position="622">
+              <caret line="114" column="22" lean-forward="true" selection-start-line="114" selection-start-column="22" selection-end-line="114" selection-end-column="22" />
+              <folding>
+                <element signature="n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
+                <element signature="n#el-form-item#0;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
+                <element signature="n#el-form-item#1;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
+                <element signature="n#el-form-item#2;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
+                <element signature="e#1576#1605#0" expanded="true" />
+                <element signature="e#2389#2482#0" />
+                <element signature="e#2514#2610#0" />
+                <element signature="e#2819#2921#0" />
+                <element signature="e#3086#3389#0" />
+                <element signature="e#3515#3581#0" />
+                <element signature="e#3774#4148#0" />
+                <element signature="e#3823#3945#0" />
+                <element signature="e#3968#4010#0" />
+                <element signature="e#4035#4138#0" />
+                <element signature="e#4072#4124#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -36,7 +55,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>label</find>
       <find>d80a8b6e-9f88-41ff</find>
       <find>76</find>
       <find>76.png</find>
@@ -66,6 +84,7 @@
       <find>devServer</find>
       <find>devS</find>
       <find>WebpackDevServer</find>
+      <find>112.74</find>
     </findStrings>
     <replaceStrings>
       <replace>class</replace>
@@ -129,23 +148,24 @@
         <option value="$PROJECT_DIR$/src/renderer/assets/less/mainpage.less" />
         <option value="$PROJECT_DIR$/src/renderer/components/Admin.vue" />
         <option value="$PROJECT_DIR$/src/utils/storageUtils.js" />
-        <option value="$PROJECT_DIR$/src/renderer/components/Login.vue" />
         <option value="$PROJECT_DIR$/../../files/ehs/test_uploadfile.html" />
         <option value="$PROJECT_DIR$/src/renderer/main.js" />
         <option value="$PROJECT_DIR$/src/renderer/components/UploadConfig.vue" />
         <option value="$PROJECT_DIR$/src/renderer/router/index.js" />
         <option value="$PROJECT_DIR$/src/renderer/api/ajax.js" />
-        <option value="$PROJECT_DIR$/src/renderer/api/index.js" />
         <option value="$PROJECT_DIR$/src/renderer/App.vue" />
         <option value="$PROJECT_DIR$/src/main/index.js" />
         <option value="$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js" />
+        <option value="$PROJECT_DIR$/src/renderer/api/index.js" />
+        <option value="$PROJECT_DIR$/src/renderer/components/Login.vue" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-80" />
-    <option name="width" value="1100" />
-    <option name="height" value="444" />
+    <option name="x" value="-420" />
+    <option name="y" value="19" />
+    <option name="width" value="1366" />
+    <option name="height" value="600" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
     <ConfirmationsSetting value="2" id="Add" />
@@ -155,7 +175,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -166,12 +185,19 @@
             <path>
               <item name="electron-app" type="b2602c69:ProjectViewProjectNode" />
               <item name="electron-app" type="462c0819:PsiDirectoryNode" />
-              <item name=".electron-vue" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="electron-app" type="b2602c69:ProjectViewProjectNode" />
+              <item name="electron-app" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="renderer" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -275,11 +301,15 @@
       <workItem from="1588125117785" duration="20299000" />
       <workItem from="1588165885620" duration="51000" />
       <workItem from="1588211219666" duration="3183000" />
+      <workItem from="1588744380574" duration="128000" />
+      <workItem from="1588745047243" duration="2850000" />
+      <workItem from="1588751627518" duration="1242000" />
+      <workItem from="1588816090227" duration="3220000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="419624000" />
+    <option name="totallyTimeSpent" value="428381000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -294,7 +324,7 @@
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14172813" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.17755532" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="npm" order="2" side_tool="true" />
       <window_info id="Favorites" order="3" side_tool="true" />
@@ -308,7 +338,7 @@
       <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Version Control" order="8" weight="0.32910052" />
       <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" weight="0.32910052" />
-      <window_info anchor="bottom" id="Terminal" order="10" weight="0.8137566" />
+      <window_info anchor="bottom" id="Terminal" order="10" weight="0.53227514" />
       <window_info anchor="bottom" id="TypeScript" order="11" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -319,15 +349,6 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/static/EnityLable.json">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/static/EnityImage.json">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/static/EnityIcon.json">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/static/EnityButton.json">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="772">
@@ -792,16 +813,6 @@
     <entry file="file://$PROJECT_DIR$/src/main/index.dev.js">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/store/state.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="147">
-          <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
-          <folding>
-            <element signature="n#!!doc" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/renderer/store/mutation-types.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="126">
@@ -906,34 +917,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/components/Login.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="21">
-          <caret line="28" column="11" lean-forward="true" selection-start-line="28" selection-start-column="11" selection-end-line="28" selection-end-column="11" />
-          <folding>
-            <element signature="n#template#0;n#!!top" />
-            <element signature="n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="n#el-form-item#0;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="n#el-form-item#1;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="n#el-form-item#2;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="n#script#0;n#!!top" />
-            <element signature="e#1576#1605#0" expanded="true" />
-            <element signature="e#2389#2482#0" />
-            <element signature="e#2514#2610#0" />
-            <element signature="e#2705#3480#0" />
-            <element signature="e#2819#2921#0" />
-            <element signature="e#3086#3389#0" />
-            <element signature="e#3394#3466#0" />
-            <element signature="e#3515#3581#0" />
-            <element signature="n#style#0;n#!!top" />
-            <element signature="e#3823#3945#0" />
-            <element signature="e#3968#4010#0" />
-            <element signature="e#4035#4138#0" />
-            <element signature="e#4072#4124#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/node_modules/element-ui/packages/upload/src/index.vue">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="609">
@@ -979,16 +962,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/api/index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="63">
-          <caret line="3" column="3" lean-forward="true" selection-start-line="3" selection-start-column="3" selection-end-line="3" selection-end-column="3" />
-          <folding>
-            <element signature="n#!!doc" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/renderer/api/ajax.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="622">
@@ -2608,13 +2581,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/EnitySystem.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="5" column="3" lean-forward="true" selection-start-line="5" selection-start-column="3" selection-end-line="5" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/static/EnityBigScreen.Data" />
     <entry file="file://$PROJECT_DIR$/src/renderer/App.vue">
       <provider selected="true" editor-type-id="text-editor">
@@ -2666,9 +2632,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/dist/electron/main.js">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/dist/electron/index.html">
       <provider selected="true" editor-type-id="text-editor">
         <state>
@@ -2678,8 +2641,106 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-189">
-          <caret line="12" column="49" lean-forward="true" selection-start-line="12" selection-start-column="49" selection-end-line="12" selection-end-column="49" />
+        <state relative-caret-position="559">
+          <caret line="156" column="3" lean-forward="true" selection-start-line="156" selection-start-column="3" selection-end-line="156" selection-end-column="3" />
+          <folding>
+            <element signature="e#1056#1153#0" />
+            <element signature="e#1161#1242#0" />
+            <element signature="e#1250#1315#0" />
+            <element signature="e#1323#1416#0" />
+            <element signature="e#1424#1485#0" />
+            <element signature="e#1493#1921#0" />
+            <element signature="e#1532#1913#0" />
+            <element signature="e#1585#1903#0" />
+            <element signature="e#1671#1891#0" />
+            <element signature="e#1929#2147#0" />
+            <element signature="e#1991#2139#0" />
+            <element signature="e#2042#2129#0" />
+            <element signature="e#2155#2353#0" />
+            <element signature="e#2263#2345#0" />
+            <element signature="e#2361#2581#0" />
+            <element signature="e#2424#2573#0" />
+            <element signature="e#2475#2563#0" />
+            <element signature="e#2838#3538#0" />
+            <element signature="e#2937#3281#0" />
+            <element signature="e#3296#3405#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/static/EnitySystem.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="6" column="1" lean-forward="true" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" />
+          <folding>
+            <element signature="e#0#78#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/api/index.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="168">
+          <caret line="8" column="14" selection-start-line="8" selection-start-column="14" selection-end-line="8" selection-end-column="14" />
+          <folding>
+            <element signature="n#!!doc" expanded="true" />
+            <element signature="e#40#65#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/dist/electron/main.js">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/win-unpacked/resources/app/dist/electron/main.js">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/win-unpacked/resources/app/dist/electron/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret column="38" lean-forward="true" selection-start-column="38" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/win-unpacked/resources/app/dist/electron/renderer.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-2311">
+          <caret line="6" column="17220" selection-start-line="6" selection-start-column="17220" selection-end-line="6" selection-end-column="17220" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/store/state.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="21">
+          <caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" />
+          <folding>
+            <element signature="n#!!doc" expanded="true" />
+            <element signature="e#12#62#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/components/Login.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="622">
+          <caret line="114" column="22" lean-forward="true" selection-start-line="114" selection-start-column="22" selection-end-line="114" selection-end-column="22" />
+          <folding>
+            <element signature="n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#el-form-item#0;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#el-form-item#1;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#el-form-item#2;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="e#1576#1605#0" expanded="true" />
+            <element signature="e#2389#2482#0" />
+            <element signature="e#2514#2610#0" />
+            <element signature="e#2819#2921#0" />
+            <element signature="e#3086#3389#0" />
+            <element signature="e#3515#3581#0" />
+            <element signature="e#3774#4148#0" />
+            <element signature="e#3823#3945#0" />
+            <element signature="e#3968#4010#0" />
+            <element signature="e#4035#4138#0" />
+            <element signature="e#4072#4124#0" />
+          </folding>
         </state>
       </provider>
     </entry>

+ 0 - 12
src/renderer/api/index.js

@@ -49,18 +49,6 @@ export const reqDeletePlan = (id) => ajax(BASE_URL+`/v1/plan`,{id},'DELETE')
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 

+ 20 - 5
src/renderer/components/Login.vue

@@ -73,18 +73,29 @@
                     return
                 }
                 const userInfo = {name:username,password}
+
+                // 模拟登陆
+                if(username === 'admin' && password === '123'){
+                    // 将user保存到vuex的state,同时保存到本地
+                    this.$store.dispatch('saveUser', userInfo)
+                    // 跳转到管理界面
+                    this.$router.replace('/admin')
+                }else {
+                    this.$message.error('用户名或密码错误!')
+                }
+
                 // 请求登录
-                const res = await reqLogin(userInfo)
+                /*const res = await reqLogin(userInfo)
                 if(res.token){
                     // 将user保存到vuex的state,同时保存到本地
                     this.$store.dispatch('saveUser', userInfo)
                     // 将token保存到会议存储
                     storageUtils.saveToken(res.token)
-                    // 去管理界面
+                    // 跳转到管理界面
                     this.$router.replace('/admin')
                 }else {
                     this.$message.error('用户名或密码错误!')
-                }
+                }*/
             },
 
             resetForm(formName) {
@@ -95,9 +106,13 @@
 </script>
 
 <style lang="less">
+    body {
+        margin:0;
+        padding:0;
+    }
+
     .login {
-        width: 100%;
-        height: 980px;
+        height: 997px;
         background-size: 100% 100%;
         position: relative;