将登录界面和主界面的高度改为视窗高度

.idea/workspace.xml

@@ -2,7 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="690c02a3-0e7d-4c4a-8f0c-a44c44c3a162" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/renderer/assets/less/admin.less" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/assets/less/admin.less" 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/assets/less/admin.less" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/renderer/assets/less/mainpage.less" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/assets/less/mainpage.less" 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/" />
@@ -16,53 +19,42 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/renderer/components/Login.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="160">
-              <caret line="83" column="52" lean-forward="true" selection-start-line="83" selection-start-column="52" selection-end-line="83" selection-end-column="52" />
+            <state relative-caret-position="336">
+              <caret line="114" column="26" lean-forward="true" selection-start-line="114" selection-start-column="26" selection-end-line="114" selection-end-column="26" />
               <folding>
+                <element signature="n#section#0;n#div#0;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="e#1576#1605#0" expanded="true" />
+                <element signature="n#script#0;n#!!top" />
+                <element signature="e#1742#3983#0" />
+                <element signature="e#1762#1812#0" />
+                <element signature="e#1830#2652#0" />
+                <element signature="e#1893#2014#0" />
+                <element signature="e#1923#2000#0" />
+                <element signature="e#2079#2197#0" />
+                <element signature="e#2115#2183#0" />
+                <element signature="e#2217#2642#0" />
+                <element signature="e#2245#2332#0" />
+                <element signature="e#2357#2628#0" />
                 <element signature="e#2389#2482#0" />
                 <element signature="e#2514#2610#0" />
+                <element signature="e#2672#3977#0" />
+                <element signature="e#2705#3866#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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/renderer/api/ajax.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="105">
-              <caret line="5" column="51" lean-forward="true" selection-start-line="5" selection-start-column="51" selection-end-line="5" selection-end-column="51" />
-              <folding>
-                <element signature="n#!!doc" expanded="true" />
-                <element signature="e#58#83#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/renderer/api/index.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="42">
-              <caret line="6" column="34" lean-forward="true" selection-start-line="6" selection-start-column="34" selection-end-line="6" selection-end-column="34" />
-              <folding>
-                <element signature="n#!!doc" expanded="true" />
-                <element signature="e#40#65#0" expanded="true" />
+                <element signature="e#3067#3281#0" />
+                <element signature="e#3286#3358#0" />
+                <element signature="e#3400#3852#0" />
+                <element signature="e#3901#3967#0" />
+                <element signature="e#4230#4604#0" />
+                <element signature="e#4279#4401#0" />
+                <element signature="e#4424#4466#0" />
+                <element signature="e#4491#4594#0" />
+                <element signature="e#4528#4580#0" />
               </folding>
             </state>
           </provider>
@@ -72,8 +64,9 @@
         <entry file="file://$PROJECT_DIR$/src/renderer/components/Admin.vue">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="42">
-              <caret line="2" column="24" selection-start-line="2" selection-start-column="24" selection-end-line="2" selection-end-column="24" />
+              <caret line="2" column="22" lean-forward="true" selection-start-line="2" selection-start-column="22" selection-end-line="2" selection-end-column="22" />
               <folding>
+                <element signature="n#div#0;n#div#0;n#template#0;n#!!top" />
                 <element signature="e#1231#1954#0" />
                 <element signature="e#2070#2099#0" expanded="true" />
                 <element signature="e#2542#2729#0" />
@@ -88,15 +81,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/admin.less">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="105">
-              <caret line="5" column="16" lean-forward="true" selection-start-line="5" selection-start-column="16" selection-end-line="5" selection-end-column="16" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -197,7 +181,6 @@
         <option value="$PROJECT_DIR$/src/renderer/store/state.js" />
         <option value="$PROJECT_DIR$/.electron-vue/dev-runner.js" />
         <option value="$PROJECT_DIR$/package.json" />
-        <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$/../../files/ehs/test_uploadfile.html" />
@@ -209,8 +192,9 @@
         <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" />
         <option value="$PROJECT_DIR$/src/renderer/assets/less/admin.less" />
+        <option value="$PROJECT_DIR$/src/renderer/assets/less/mainpage.less" />
+        <option value="$PROJECT_DIR$/src/renderer/components/Login.vue" />
       </list>
     </option>
   </component>
@@ -246,6 +230,21 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="renderer" 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" />
+              <item name="assets" 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" />
+              <item name="assets" type="462c0819:PsiDirectoryNode" />
+              <item name="less" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -357,12 +356,12 @@
       <workItem from="1588744380574" duration="128000" />
       <workItem from="1588745047243" duration="2850000" />
       <workItem from="1588751627518" duration="1242000" />
-      <workItem from="1588816090227" duration="3621000" />
+      <workItem from="1588816090227" duration="4997000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="428782000" />
+    <option name="totallyTimeSpent" value="430158000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -377,7 +376,7 @@
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.17755532" />
+      <window_info active="true" 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" />
@@ -402,13 +401,6 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/static/EnityMemory.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="231">
-          <caret line="11" column="4" lean-forward="true" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/static/EnitySlider.json">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="336">
@@ -531,26 +523,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/mainpage.less">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="21">
-          <caret line="85" column="1" lean-forward="true" selection-start-line="85" selection-start-column="1" selection-end-line="85" selection-end-column="1" />
-          <folding>
-            <element signature="e#20#1561#0" />
-            <element signature="e#107#1067#0" />
-            <element signature="e#250#1063#0" />
-            <element signature="e#385#446#0" />
-            <element signature="e#488#1057#0" />
-            <element signature="e#663#786#0" />
-            <element signature="e#838#1049#0" />
-            <element signature="e#1134#1202#0" />
-            <element signature="e#1253#1392#0" />
-            <element signature="e#1440#1559#0" />
-            <element signature="e#1591#1601#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/utils/storageUtils.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="462">
@@ -2372,30 +2344,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="160">
-          <caret line="83" column="52" lean-forward="true" selection-start-line="83" selection-start-column="52" selection-end-line="83" selection-end-column="52" />
-          <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>
     <entry file="file://$PROJECT_DIR$/build/win-unpacked/resources/app/dist/electron/index.html">
       <provider selected="true" editor-type-id="text-editor">
         <state>
@@ -2425,11 +2373,72 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/splitscreen.less">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/admin.less">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="105">
+          <caret line="5" column="14" lean-forward="true" selection-start-line="5" selection-start-column="14" selection-end-line="5" selection-end-column="14" />
+          <folding>
+            <element signature="e#214#252#0" />
+            <element signature="e#280#4774#0" />
+            <element signature="e#367#626#0" />
+            <element signature="e#533#620#0" />
+            <element signature="e#659#4656#0" />
+            <element signature="e#790#1195#0" />
+            <element signature="e#1003#1039#0" />
+            <element signature="e#1095#1187#0" />
+            <element signature="e#1237#3024#0" />
+            <element signature="e#1353#1773#0" />
+            <element signature="e#1623#1763#0" />
+            <element signature="e#1817#1948#0" />
+            <element signature="e#1993#2122#0" />
+            <element signature="e#2167#2306#0" />
+            <element signature="e#2355#2484#0" />
+            <element signature="e#2525#3016#0" />
+            <element signature="e#2652#2856#0" />
+            <element signature="e#2899#3006#0" />
+            <element signature="e#3063#4650#0" />
+            <element signature="e#3263#3323#0" />
+            <element signature="e#3361#4641#0" />
+            <element signature="e#3451#4630#0" />
+            <element signature="e#3650#4618#0" />
+            <element signature="e#3832#3909#0" />
+            <element signature="e#3967#4604#0" />
+            <element signature="e#4152#4308#0" />
+            <element signature="e#4374#4588#0" />
+            <element signature="e#4687#4770#0" />
+            <element signature="e#4801#4839#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/mainpage.less">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="21">
+          <caret line="1" column="13" lean-forward="true" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
+          <folding>
+            <element signature="e#107#1067#0" />
+            <element signature="e#250#1063#0" />
+            <element signature="e#385#446#0" />
+            <element signature="e#488#1057#0" />
+            <element signature="e#663#786#0" />
+            <element signature="e#838#1049#0" />
+            <element signature="e#1134#1202#0" />
+            <element signature="e#1253#1392#0" />
+            <element signature="e#1440#1559#0" />
+            <element signature="e#1587#1648#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/renderer/components/Admin.vue">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="42">
-          <caret line="2" column="24" selection-start-line="2" selection-start-column="24" selection-end-line="2" selection-end-column="24" />
+          <caret line="2" column="22" lean-forward="true" selection-start-line="2" selection-start-column="22" selection-end-line="2" selection-end-column="22" />
           <folding>
+            <element signature="n#div#0;n#div#0;n#template#0;n#!!top" />
             <element signature="e#1231#1954#0" />
             <element signature="e#2070#2099#0" expanded="true" />
             <element signature="e#2542#2729#0" />
@@ -2443,10 +2452,42 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/admin.less">
+    <entry file="file://$PROJECT_DIR$/src/renderer/components/Login.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="5" column="16" lean-forward="true" selection-start-line="5" selection-start-column="16" selection-end-line="5" selection-end-column="16" />
+        <state relative-caret-position="336">
+          <caret line="114" column="26" lean-forward="true" selection-start-line="114" selection-start-column="26" selection-end-line="114" selection-end-column="26" />
+          <folding>
+            <element signature="n#section#0;n#div#0;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#1742#3983#0" />
+            <element signature="e#1762#1812#0" />
+            <element signature="e#1830#2652#0" />
+            <element signature="e#1893#2014#0" />
+            <element signature="e#1923#2000#0" />
+            <element signature="e#2079#2197#0" />
+            <element signature="e#2115#2183#0" />
+            <element signature="e#2217#2642#0" />
+            <element signature="e#2245#2332#0" />
+            <element signature="e#2357#2628#0" />
+            <element signature="e#2389#2482#0" />
+            <element signature="e#2514#2610#0" />
+            <element signature="e#2672#3977#0" />
+            <element signature="e#2705#3866#0" />
+            <element signature="e#2819#2921#0" />
+            <element signature="e#3067#3281#0" />
+            <element signature="e#3286#3358#0" />
+            <element signature="e#3400#3852#0" />
+            <element signature="e#3901#3967#0" />
+            <element signature="e#4230#4604#0" />
+            <element signature="e#4279#4401#0" />
+            <element signature="e#4424#4466#0" />
+            <element signature="e#4491#4594#0" />
+            <element signature="e#4528#4580#0" />
+          </folding>
         </state>
       </provider>
     </entry>

src/renderer/assets/less/admin.less

@@ -1,229 +0,0 @@
-/*管理界面样式*/
-.containers {
-  position: relative;
-  top: 0;
-  left: 0;
-  height: 997px;
-  background-color: #333;
-  display: flex;
-  //color:#F0F8FF;
-
-  /*左边留白*/
-  .leftblank {
-    width: 8%;
-    height: 100%;
-  }
-
-  /*主要内容*/
-  .maincontent {
-    width: 84%;
-    height: 100%;
-    background-color: #000;
-
-    /*标题*/
-    .title {
-      width: 100%;
-      height: 60px;
-      background-color: saddlebrown;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-
-      p {
-        font-size:30px;
-        color: deepskyblue;
-        font-weight: 900;
-      }
-    }
-
-    /*大屏管理*/
-    .screenmanage {
-      width: 100%;
-      height: 87%;
-      background-color: orange;
-      display: flex;
-
-      /*预案管理*/
-      .pre_planmanage {
-        width: 10%;
-        height: 100%;
-        background-color: #102658;
-        display: flex;
-        flex-direction: column;
-        justify-content: space-around;
-        align-items:center;
-
-        h2 {
-          color:#ffffff;
-        }
-
-        .el-button--small, .el-button--small.is-round {
-          font-size:16px;
-          margin-bottom:20px;
-          margin-left:0;
-        }
-      }
-
-      /*大屏控制*/
-      .bigscreen_control {
-        width: 80%;
-        height: 100%;
-        background-color: orange;
-
-        /*分屏*/
-        .split_screen {
-          width: 100%;
-          height: 70%;
-          background-color: #000000;
-          box-sizing: border-box;
-          border: 4px solid skyblue;
-          overflow: hidden;
-          color:#ffffff;
-          font-size:50px;
-
-          /*分屏项*/
-          .item {
-            border: 1px solid #fff;
-            color:#fff;
-            font-size:50px;
-            background-color: #717171;
-          }
-        }
-
-        /*1分屏*/
-        .split_screen_one {
-          display: grid;
-          grid-template-columns: repeat(1,100%);
-          grid-template-rows: repeat(1,100%);
-        }
-
-        /*4分屏*/
-        .split_screen_four {
-          display: grid;
-          grid-template-columns: repeat(2,50%);
-          grid-template-rows: repeat(2,50%);
-        }
-
-        /*9分屏*/
-        .split_screen_nine {
-          display: grid;
-          grid-template-columns: repeat(3,33.3333%);
-          grid-template-rows: repeat(3,33.3333%);
-        }
-
-        /*16分屏*/
-        .split_screen_sixteen {
-          display: grid;
-          grid-template-columns: repeat(4,25%);
-          grid-template-rows: repeat(4,25%);
-        }
-
-        /*控制按钮*/
-        .control_btns {
-          width: 100%;
-          height: 30%;
-          background-color: #002140;
-
-          /*分屏按钮*/
-          .split_btns {
-            width: 100%;
-            height: 50%;
-            background-color: purple;
-            display: flex;
-            justify-content: space-around;
-            align-items: center;
-          }
-
-          /*其他按钮*/
-          .other_btns {
-            width: 100%;
-            height: 50%;
-            background-color: mediumpurple;
-          }
-        }
-      }
-
-      /*信号源列表*/
-      .signal_source {
-        width: 20%;
-        height: 100%;
-        background-color: #102658;
-        display: flex;
-        flex-direction: column;
-        align-items:center;
-
-        /*标题*/
-        .signal_title {
-          height: 60px;
-          color:#ffffff;
-        }
-
-        /*主体*/
-        .signal_body {
-          width:100%;
-          height: 93%;
-
-          /*信号源项*/
-          .signal_item {
-            width: 100%;
-            height: 180px;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-
-            /*背景*/
-            .signal_item_bg {
-              width: 94%;
-              height: 180px;
-              display: flex;
-              justify-content: center;
-              align-items: center;
-              &:hover {
-                background-color: rgba(113, 113, 113, 0.4);
-              }
-
-              /*主体*/
-              .signal_item_bg_body {
-                width:96%;
-                height:96%;
-                background-color: rgba(127, 127, 127, 0.55);
-
-                /*空间*/
-                .signal_item_bg_body_space {
-                  width:94%;
-                  height:80%;
-                  background-color: green;
-                  margin:6px auto;
-                }
-                /*文字*/
-                .signal_item_bg_body_font {
-                  width:100%;
-                  height:15%;
-                  text-align: center;
-                  margin:0 auto;
-                  font-size:20px;
-                  color:#fff;
-                }
-              }
-            }
-          }
-
-        }
-
-      }
-    }
-
-    /*底部功能菜单*/
-    .footmenu {
-      width: 100%;
-      height: 66px;
-      background-color: saddlebrown;
-    }
-  }
-
-  /*右边留白*/
-  .rightblank {
-    width: 8%;
-    height: 100%;
-  }
-}

src/renderer/assets/less/mainpage.less

@@ -1,7 +1,7 @@
 // 容器样式
 .containers {
-  width: 100%;
-  height: 981px;
+  width: 100vw;
+  height: 100vh;
   background-color: #333;
 
   // 列表项样式

src/renderer/components/Login.vue

@@ -75,17 +75,17 @@
                 const userInfo = {name:username,password}
 
                 // 模拟登陆
-                if(username === 'admin' && password === '123'){
+                /*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)
@@ -95,7 +95,7 @@
                     this.$router.replace('/admin')
                 }else {
                     this.$message.error('用户名或密码错误！')
-                }*/
+                }
             },
 
             resetForm(formName) {
@@ -106,29 +106,30 @@
 </script>
 
 <style lang="less">
-    body {
+    html,body {
         margin:0;
         padding:0;
-    }
 
-    .login {
-        height: 997px;
-        background-size: 100% 100%;
-        position: relative;
+        .login {
+            width:100vw;
+            height: 100vh;
+            background-size: 100% 100%;
+            position: relative;
 
-        .login-content {
-            position: absolute;
-            h2 {
-                text-align: center;
-                font-weight:bold;
-                margin-bottom: 20px;
-            }
-            .el-input {
-                width:90%;
-            }
-            .login-form {
-                .login-form-button {
-                    width: 100%;
+            .login-content {
+                position: absolute;
+                h2 {
+                    text-align: center;
+                    font-weight:bold;
+                    margin-bottom: 20px;
+                }
+                .el-input {
+                    width:90%;
+                }
+                .login-form {
+                    .login-form-button {
+                        width: 100%;
+                    }
                 }
             }
         }