解决冲突

.idea/workspace.xml

@@ -3,11 +3,21 @@
   <component name="ChangeListManager">
     <list default="true" id="690c02a3-0e7d-4c4a-8f0c-a44c44c3a162" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+<<<<<<< HEAD
       <change beforePath="$PROJECT_DIR$/src/renderer/assets/less/splitscreen.less" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/assets/less/splitscreen.less" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/renderer/components/Admin.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/components/Admin.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/renderer/components/BigShow.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/components/BigShow.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/renderer/components/Login.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/components/Login.vue" afterDir="false" />
+=======
+      <change beforePath="$PROJECT_DIR$/src/renderer/App.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/App.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/renderer/components/Login.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/components/Login.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/renderer/main.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/main.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/renderer/store/actions.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/store/actions.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/renderer/store/mutation-types.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/store/mutation-types.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/renderer/store/mutations.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/store/mutations.js" afterDir="false" />
+>>>>>>> bc335c69e525294034b05c12bf1ebaf0dfc24159
       <change beforePath="$PROJECT_DIR$/src/renderer/store/state.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/store/state.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/EnityLogin.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/EnityLogin.json" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/dist/" />
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -20,6 +30,7 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
+<<<<<<< HEAD
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/renderer/components/Button.vue">
@@ -78,12 +89,24 @@
                 <element signature="e#12327#12483#0" />
                 <element signature="e#12534#12693#0" />
                 <element signature="n#style#0;n#!!top" />
+=======
+    <leaf>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/renderer/store/state.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="181">
+              <caret line="11" column="16" lean-forward="true" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="16" />
+              <folding>
+                <element signature="n#!!doc" expanded="true" />
+                <element signature="e#66#118#0" expanded="true" />
+>>>>>>> bc335c69e525294034b05c12bf1ebaf0dfc24159
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/renderer/store/actions.js">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="252">
@@ -91,24 +114,44 @@
               <folding>
                 <element signature="n#!!doc" expanded="true" />
                 <element signature="e#25#193#0" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/renderer/App.vue">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="183">
+              <caret line="13" column="22" lean-forward="true" selection-start-line="13" selection-start-column="22" selection-end-line="13" selection-end-column="22" />
+              <folding>
+                <element signature="e#93#112#0" expanded="true" />
+                <element signature="e#872#914#0" />
+                <element signature="n#style#0;n#!!top" />
+>>>>>>> bc335c69e525294034b05c12bf1ebaf0dfc24159
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/renderer/store/mutations.js">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="210">
               <caret line="10" column="25" lean-forward="true" selection-start-line="10" selection-start-column="25" selection-end-line="10" selection-end-column="25" />
               <folding>
                 <element signature="n#!!doc" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/renderer/main.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="567">
+              <caret line="27" column="45" lean-forward="true" selection-start-line="27" selection-start-column="45" selection-end-line="27" selection-end-column="45" />
+              <folding>
+                <element signature="e#0#21#0" expanded="true" />
+>>>>>>> bc335c69e525294034b05c12bf1ebaf0dfc24159
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/renderer/components/BigShow.vue">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="420">
@@ -140,16 +183,38 @@
                 <element signature="e#4669#4950#0" />
                 <element signature="e#4762#4829#0" />
                 <element signature="n#style#0;n#!!top" />
+=======
+        <entry file="file://$PROJECT_DIR$/static/EnityLogin.json">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="126">
+              <caret line="6" column="22" selection-start-line="6" selection-start-column="9" selection-end-line="6" selection-end-column="22" />
+              <folding>
+                <element signature="e#423#435#0" />
+>>>>>>> bc335c69e525294034b05c12bf1ebaf0dfc24159
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/splitscreen.less">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="1197">
               <caret line="57" lean-forward="true" selection-start-line="57" selection-end-line="57" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/renderer/components/Login.vue">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="265">
+              <caret line="58" column="19" lean-forward="true" selection-start-line="58" selection-start-column="19" selection-end-line="58" selection-end-column="19" />
+              <folding>
+                <element signature="e#972#1001#0" expanded="true" />
+                <element signature="e#3423#3561#0" />
+                <element signature="e#3588#3638#0" />
+                <element signature="e#3667#3786#0" />
+                <element signature="e#3708#3768#0" />
+              </folding>
+>>>>>>> bc335c69e525294034b05c12bf1ebaf0dfc24159
             </state>
           </provider>
         </entry>
@@ -194,8 +259,12 @@
       <find>UPDATE_SIGNALPRELIST</find>
       <find>用户登录</find>
       <find>windowJson</find>
+<<<<<<< HEAD
       <find>loginJson</find>
       <find>this.loginJson</find>
+=======
+      <find>V1--Login</find>
+>>>>>>> bc335c69e525294034b05c12bf1ebaf0dfc24159
     </findStrings>
     <replaceStrings>
       <replace>class</replace>
@@ -224,7 +293,6 @@
         <option value="$PROJECT_DIR$/src/utils/sliceColor.js" />
         <option value="$PROJECT_DIR$/static/EnityLable.json" />
         <option value="$PROJECT_DIR$/static/EnityImage.json" />
-        <option value="$PROJECT_DIR$/static/EnityLogin.json" />
         <option value="$PROJECT_DIR$/static/EnitySignalPreviewList.json" />
         <option value="$PROJECT_DIR$/static/EnityBigScreen.json" />
         <option value="$PROJECT_DIR$/static/EnityButton.json" />
@@ -244,26 +312,33 @@
         <option value="$PROJECT_DIR$/package.json" />
         <option value="$PROJECT_DIR$/src/utils/storageUtils.js" />
         <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$/.electron-vue/webpack.renderer.config.js" />
         <option value="$PROJECT_DIR$/src/renderer/assets/less/admin.less" />
         <option value="$PROJECT_DIR$/src/renderer/components/SignalList.vue" />
-        <option value="$PROJECT_DIR$/src/renderer/store/mutation-types.js" />
-        <option value="$PROJECT_DIR$/src/renderer/store/mutations.js" />
         <option value="$PROJECT_DIR$/src/utils/tools.js" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/renderer/App.vue" />
+=======
+>>>>>>> bc335c69e525294034b05c12bf1ebaf0dfc24159
         <option value="$PROJECT_DIR$/src/renderer/api/ajax.js" />
         <option value="$PROJECT_DIR$/src/renderer/api/index.js" />
         <option value="$PROJECT_DIR$/static/EnityWindow.json" />
         <option value="$PROJECT_DIR$/src/renderer/components/Button.vue" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/renderer/store/actions.js" />
+=======
+        <option value="$PROJECT_DIR$/src/renderer/components/BigShow.vue" />
+        <option value="$PROJECT_DIR$/src/index.ejs" />
+>>>>>>> bc335c69e525294034b05c12bf1ebaf0dfc24159
         <option value="$PROJECT_DIR$/dist/electron/index.html" />
         <option value="$PROJECT_DIR$/../../demo.html" />
         <option value="$PROJECT_DIR$/src/renderer/assets/less/mainpage.less" />
         <option value="$PROJECT_DIR$/src/main/index.js" />
+        <option value="$PROJECT_DIR$/static/resource.js" />
         <option value="$PROJECT_DIR$/src/renderer/store/state.js" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/renderer/components/Admin.vue" />
         <option value="$PROJECT_DIR$/.eslintrc" />
         <option value="$PROJECT_DIR$/src/config.js" />
@@ -271,6 +346,16 @@
         <option value="$PROJECT_DIR$/src/renderer/components/Login.vue" />
         <option value="$PROJECT_DIR$/src/renderer/components/BigShow.vue" />
         <option value="$PROJECT_DIR$/src/renderer/assets/less/splitscreen.less" />
+=======
+        <option value="$PROJECT_DIR$/src/renderer/store/mutation-types.js" />
+        <option value="$PROJECT_DIR$/src/renderer/store/mutations.js" />
+        <option value="$PROJECT_DIR$/src/renderer/store/actions.js" />
+        <option value="$PROJECT_DIR$/build/win-unpacked/resources/app/dist/electron/static/EnityLogin.json" />
+        <option value="$PROJECT_DIR$/src/renderer/App.vue" />
+        <option value="$PROJECT_DIR$/src/renderer/main.js" />
+        <option value="$PROJECT_DIR$/static/EnityLogin.json" />
+        <option value="$PROJECT_DIR$/src/renderer/components/Login.vue" />
+>>>>>>> bc335c69e525294034b05c12bf1ebaf0dfc24159
       </list>
     </option>
   </component>
@@ -288,7 +373,37 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+<<<<<<< HEAD
       <pane id="ProjectPane" />
+=======
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="electron-app" type="b2602c69:ProjectViewProjectNode" />
+              <item name="electron-app" 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" />
+            </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>
+            <path>
+              <item name="electron-app" type="b2602c69:ProjectViewProjectNode" />
+              <item name="electron-app" type="462c0819:PsiDirectoryNode" />
+              <item name="static" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+>>>>>>> bc335c69e525294034b05c12bf1ebaf0dfc24159
       <pane id="Scope" />
     </panes>
   </component>
@@ -403,17 +518,25 @@
       <workItem from="1588906984737" duration="659000" />
       <workItem from="1588916874925" duration="10362000" />
       <workItem from="1588944784073" duration="3690000" />
+<<<<<<< HEAD
       <workItem from="1588988349962" duration="6705000" />
       <workItem from="1589014045846" duration="3018000" />
       <workItem from="1589111917743" duration="16000" />
       <workItem from="1589122318085" duration="2208000" />
       <workItem from="1589161291668" duration="26000" />
       <workItem from="1589164441219" duration="5295000" />
+=======
+      <workItem from="1588988349962" duration="14400000" />
+>>>>>>> bc335c69e525294034b05c12bf1ebaf0dfc24159
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
+<<<<<<< HEAD
     <option name="totallyTimeSpent" value="478629000" />
+=======
+    <option name="totallyTimeSpent" value="474136000" />
+>>>>>>> bc335c69e525294034b05c12bf1ebaf0dfc24159
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -442,7 +565,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.5037037" />
+      <window_info anchor="bottom" id="Terminal" order="10" weight="0.4783069" />
       <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" />
@@ -453,6 +576,19 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
+=======
+    <entry file="file://$PROJECT_DIR$/src/utils/storageUtils.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="462">
+          <caret line="22" column="2" selection-start-line="22" selection-start-column="2" selection-end-line="22" selection-end-column="2" />
+          <folding>
+            <element signature="n#!!doc" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+>>>>>>> bc335c69e525294034b05c12bf1ebaf0dfc24159
     <entry file="file://$PROJECT_DIR$/../../nginx.conf" />
     <entry file="file://$PROJECT_DIR$/node_modules/element-ui/types/upload.d.ts">
       <provider selected="true" editor-type-id="text-editor">
@@ -2222,12 +2358,24 @@
         </state>
       </provider>
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/renderer/store/mutation-types.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="189">
           <caret line="9" column="24" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="24" />
           <folding>
             <element signature="n#!!doc" expanded="true" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/utils/tools.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="105">
+          <caret line="13" column="17" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" />
+          <folding>
+            <element signature="n#!!doc" expanded="true" />
+            <element signature="n#!!block;n#uniq#0" />
+            <element signature="n#!!block;n#getElementLeft#0" />
+            <element signature="n#!!block;n#getElementTop#0" />
+>>>>>>> bc335c69e525294034b05c12bf1ebaf0dfc24159
           </folding>
         </state>
       </provider>
@@ -2309,16 +2457,31 @@
         </state>
       </provider>
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/renderer/App.vue">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="126">
           <caret line="6" column="8" lean-forward="true" selection-start-line="6" selection-start-column="8" selection-end-line="6" selection-end-column="8" />
           <folding>
             <element signature="e#93#112#0" expanded="true" />
+=======
+    <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="12" selection-start-line="1" selection-start-column="12" selection-end-line="1" selection-end-column="12" />
+          <folding>
+            <element signature="e#20#1650#0" />
+            <element signature="e#107#1067#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" />
+>>>>>>> bc335c69e525294034b05c12bf1ebaf0dfc24159
           </folding>
         </state>
       </provider>
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/mainpage.less">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="21">
@@ -2330,10 +2493,40 @@
             <element signature="e#1253#1392#0" />
             <element signature="e#1440#1559#0" />
             <element signature="e#1587#1648#0" />
+=======
+    <entry file="file://$PROJECT_DIR$/../../demo.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="273">
+          <caret line="13" column="9" lean-forward="true" selection-start-line="13" selection-start-column="9" selection-end-line="13" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/index.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-239">
+          <caret line="13" column="26" lean-forward="true" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/index.ejs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="273">
+          <caret line="13" column="24" lean-forward="true" selection-start-line="13" selection-start-column="24" selection-end-line="13" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/win-unpacked/resources/app/dist/electron/static/resource.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="105">
+          <caret line="5" column="1" lean-forward="true" selection-start-line="5" selection-start-column="1" selection-end-line="5" selection-end-column="1" />
+          <folding>
+            <element signature="n#!!doc" expanded="true" />
+>>>>>>> bc335c69e525294034b05c12bf1ebaf0dfc24159
           </folding>
         </state>
       </provider>
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/../../demo.html" />
     <entry file="file://$PROJECT_DIR$/src/renderer/main.js">
       <provider selected="true" editor-type-id="text-editor">
@@ -2341,10 +2534,26 @@
           <caret line="17" column="17" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" />
           <folding>
             <element signature="e#0#21#0" expanded="true" />
+=======
+    <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="414">
+          <caret column="143892" selection-start-column="143883" selection-end-column="143892" />
+        </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="210">
+          <caret line="10" column="23" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="23" />
+          <folding>
+            <element signature="n#!!doc" expanded="true" />
+>>>>>>> bc335c69e525294034b05c12bf1ebaf0dfc24159
           </folding>
         </state>
       </provider>
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/index.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-239">
@@ -2361,10 +2570,19 @@
             <element signature="n#!!block;n#uniq#0" />
             <element signature="n#!!block;n#getElementLeft#0" />
             <element signature="n#!!block;n#getElementTop#0" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/renderer/store/mutations.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="706">
+          <caret line="60" column="19" selection-start-line="60" selection-start-column="10" selection-end-line="60" selection-end-column="19" />
+          <folding>
+            <element signature="e#25#193#0" expanded="true" />
+>>>>>>> bc335c69e525294034b05c12bf1ebaf0dfc24159
           </folding>
         </state>
       </provider>
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/renderer/store/state.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="252">
@@ -2437,19 +2655,58 @@
             <element signature="e#4054#4104#0" />
             <element signature="e#4133#4252#0" />
             <element signature="e#4174#4234#0" />
+=======
+    <entry file="file://$PROJECT_DIR$/static/resource.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="84">
+          <caret line="4" column="4" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="4" />
+        </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="399">
+          <caret line="19" column="9" lean-forward="true" selection-start-line="19" selection-start-column="9" selection-end-line="19" selection-end-column="9" />
+          <folding>
+            <element signature="e#1248#1971#0" />
+            <element signature="n#script#0;n#!!top" />
+            <element signature="e#2541#3712#0" />
+            <element signature="e#2563#2750#0" />
+            <element signature="e#2770#2809#0" />
+            <element signature="e#2827#2930#0" />
+            <element signature="e#2848#2920#0" />
+            <element signature="e#2950#3633#0" />
+            <element signature="e#2999#3203#0" />
+            <element signature="e#3250#3623#0" />
+            <element signature="e#3341#3403#0" />
+            <element signature="e#3438#3503#0" />
+            <element signature="e#3541#3609#0" />
+            <element signature="e#3654#3706#0" />
+>>>>>>> bc335c69e525294034b05c12bf1ebaf0dfc24159
           </folding>
         </state>
       </provider>
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/index.ejs">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="399">
           <caret line="19" column="7" lean-forward="true" selection-start-line="19" selection-start-column="7" selection-end-line="19" selection-end-column="7" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/renderer/store/actions.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="100">
+          <caret line="28" column="4" lean-forward="true" selection-start-line="28" selection-start-column="4" selection-end-line="28" selection-end-column="4" />
+          <folding>
+            <element signature="n#!!doc" expanded="true" />
+          </folding>
+>>>>>>> bc335c69e525294034b05c12bf1ebaf0dfc24159
         </state>
       </provider>
     </entry>
     <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.dom.d.ts">
       <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="21">
           <caret line="767" column="10" selection-start-line="767" selection-start-column="10" selection-end-line="767" selection-end-column="10" />
         </state>
@@ -2459,6 +2716,10 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="210">
           <caret line="68" column="18" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="18" />
+=======
+        <state relative-caret-position="567">
+          <caret line="27" column="45" lean-forward="true" selection-start-line="27" selection-start-column="45" selection-end-line="27" selection-end-column="45" />
+>>>>>>> bc335c69e525294034b05c12bf1ebaf0dfc24159
           <folding>
             <element signature="n#template#0;n#!!top" />
             <element signature="n#div#0;n#template#0;n#!!top" />
@@ -2468,6 +2729,7 @@
         </state>
       </provider>
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/renderer/components/Button.vue">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="126">
@@ -2523,6 +2785,15 @@
             <element signature="e#12108#12264#0" />
             <element signature="e#12327#12483#0" />
             <element signature="e#12534#12693#0" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/renderer/App.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="183">
+          <caret line="13" column="22" lean-forward="true" selection-start-line="13" selection-start-column="22" selection-end-line="13" selection-end-column="22" />
+          <folding>
+            <element signature="e#93#112#0" expanded="true" />
+            <element signature="e#872#914#0" />
+>>>>>>> bc335c69e525294034b05c12bf1ebaf0dfc24159
             <element signature="n#style#0;n#!!top" />
           </folding>
         </state>
@@ -2530,25 +2801,44 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/renderer/store/actions.js">
       <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="252">
           <caret line="12" column="16" lean-forward="true" selection-start-line="12" selection-start-column="16" selection-end-line="12" selection-end-column="16" />
           <folding>
             <element signature="n#!!doc" expanded="true" />
             <element signature="e#25#193#0" expanded="true" />
+=======
+        <state relative-caret-position="181">
+          <caret line="11" column="16" lean-forward="true" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="16" />
+          <folding>
+            <element signature="n#!!doc" expanded="true" />
+            <element signature="e#66#118#0" expanded="true" />
+>>>>>>> bc335c69e525294034b05c12bf1ebaf0dfc24159
           </folding>
         </state>
       </provider>
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/renderer/store/mutations.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="210">
           <caret line="10" column="25" lean-forward="true" selection-start-line="10" selection-start-column="25" selection-end-line="10" selection-end-column="25" />
           <folding>
             <element signature="n#!!doc" expanded="true" />
+=======
+    <entry file="file://$PROJECT_DIR$/build/win-unpacked/resources/app/dist/electron/static/EnityLogin.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="34" column="1" lean-forward="true" selection-start-line="34" selection-start-column="1" selection-end-line="34" selection-end-column="1" />
+          <folding>
+            <element signature="e#0#871#0" />
+            <element signature="e#421#433#0" />
+>>>>>>> bc335c69e525294034b05c12bf1ebaf0dfc24159
           </folding>
         </state>
       </provider>
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/renderer/components/BigShow.vue">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="420">
@@ -2580,14 +2870,36 @@
             <element signature="e#4669#4950#0" />
             <element signature="e#4762#4829#0" />
             <element signature="n#style#0;n#!!top" />
+=======
+    <entry file="file://$PROJECT_DIR$/static/EnityLogin.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="126">
+          <caret line="6" column="22" selection-start-line="6" selection-start-column="9" selection-end-line="6" selection-end-column="22" />
+          <folding>
+            <element signature="e#423#435#0" />
+>>>>>>> bc335c69e525294034b05c12bf1ebaf0dfc24159
           </folding>
         </state>
       </provider>
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/splitscreen.less">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1197">
           <caret line="57" lean-forward="true" selection-start-line="57" selection-end-line="57" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/renderer/components/Login.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="265">
+          <caret line="58" column="19" lean-forward="true" selection-start-line="58" selection-start-column="19" selection-end-line="58" selection-end-column="19" />
+          <folding>
+            <element signature="e#972#1001#0" expanded="true" />
+            <element signature="e#3423#3561#0" />
+            <element signature="e#3588#3638#0" />
+            <element signature="e#3667#3786#0" />
+            <element signature="e#3708#3768#0" />
+          </folding>
+>>>>>>> bc335c69e525294034b05c12bf1ebaf0dfc24159
         </state>
       </provider>
     </entry>

src/renderer/App.vue

@@ -7,6 +7,7 @@
 <script>
   import fs from 'fs'
   import path from 'path'
+
   import {reqBigScreen, reqDevice, reqImportConfigFiles, reqPreviewSourceList} from "./api"
 
   export default {
@@ -17,11 +18,8 @@
       const formData = new FormData()
       let device = fs.readFileSync(path.join(__static, '/EnityDevice.json'), 'utf8')
       let bigscreen = fs.readFileSync(path.join(__static, '/EnityBigScreen.json'), 'utf8')
-
       formData.append('device',device)
       formData.append('bigscreen',bigscreen)
-
-      // 发送请求将配置文件传给服务器
       const res = await reqImportConfigFiles(formData)
       if(!res){
         console.log('上传配置文件成功!')
@@ -45,5 +43,3 @@
 
 
 
-
-

src/renderer/components/Login.vue

@@ -1,16 +1,14 @@
 <!--登录界面-->
 <template>
-    <div class="login" :style="{backgroundColor: `#${loginJson[0].BrackgroupStr.slice(3)}`}">
-        <section class="login-content"
-           :style="{
+    <div class="login" ref="login" :style="{backgroundColor: `#${loginJson[0].BrackgroupStr.slice(3)}`}">
+        <section class="login-content" :style="{
             width: loginJson[0].Width + 'px',
             height: loginJson[0].Height + 'px',
             left:loginJson[0].Left + 'px',
             top:loginJson[0].Top + 'px',
             zIndex: loginJson[0].ZIndex,
             border: `1px solid #${loginJson[0].BorderStr.slice(3)}`,
-            backgroundColor: `#${loginJson[0].ForegroundStr.slice(3)}`}"
-        >
+            backgroundColor: `#${loginJson[0].ForegroundStr.slice(3)}`}">
             <h2>用户登录</h2>
             <el-form :model="ruleForm" status-icon :rules="rules" ref="ruleForm" label-width="55px" class="login-form">
                 <el-form-item label="账号" prop="username">
@@ -20,8 +18,8 @@
                     <el-input type="password" v-model="ruleForm.password" autocomplete="off" prefix-icon="el-icon-lock"></el-input>
                 </el-form-item>
                 <el-form-item>
-                    <el-button :style="{backgroundColor: `#${loginJson[0].BTNForegroundStr.slice(3)}`}" type="primary" @click="submitForm('ruleForm')">提交</el-button>
-                    <el-button :style="{backgroundColor: `#${loginJson[0].BTNForegroundStr.slice(3)}`}" type="primary" @click="resetForm('ruleForm')">重置</el-button>
+                    <el-button type="primary" :style="{backgroundColor: `#${loginJson[0].BTNForegroundStr.slice(3)}`}" @click="submitForm('ruleForm')">提交</el-button>
+                    <el-button type="primary" :style="{backgroundColor: `#${loginJson[0].BTNForegroundStr.slice(3)}`}" @click="resetForm('ruleForm')">重置</el-button>
                 </el-form-item>
             </el-form>
         </section>

src/renderer/store/actions.js

@@ -7,7 +7,8 @@ import {
   UPDATE_SIGNALPRELIST,
   SAVE_BIGSCREEN,
   SAVE_SIGNALLIST,
-  SAVE_DEVICE
+  SAVE_DEVICE,
+  SAVE_LOGIN
 } from './mutation-types'
 
 export default {
@@ -51,5 +52,4 @@ export default {
   saveDevice({commit},deviceJson) {
     commit(SAVE_DEVICE,{deviceJson})
   }
-
 }

src/renderer/store/mutation-types.js

@@ -8,4 +8,5 @@ export const UPDATE_SIGNALPRELIST = 'update_signalprelist' // 更新拖动到大
 export const SAVE_BIGSCREEN = 'save_bigscreen' // 保存大屏数据
 export const SAVE_SIGNALLIST = 'save_signallist' // 保存信号源列表数据
 export const SAVE_DEVICE = 'save_device' // 保存设备数据
+export const SAVE_LOGIN = 'save_login' // 保存登录界面数据
 

src/renderer/store/mutations.js

@@ -53,5 +53,5 @@ export default {
   // 保存设备数据
   [SAVE_DEVICE] (state,{deviceJson}) {
     state.deviceJson = deviceJson
-  },
+  }
 }