解决json加载问题失败

.idea/workspace.xml

@@ -3,11 +3,14 @@
   <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" />
-      <change beforePath="$PROJECT_DIR$/src/index.ejs" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.ejs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/index.js" afterDir="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/Admin.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/components/Admin.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" />
       <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,18 +23,86 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
-    <leaf />
+    <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" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <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="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>
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
         <option value="Vue Single File Component" />
+        <option value="JavaScript File" />
       </list>
     </option>
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>9a0dff23-8633-4e7f-89bf-cc4f68ec88e1</find>
       <find>black</find>
       <find>d9868551-b579-4258-9bc7-7c1f733773f5</find>
       <find>cb2687fd-931a-4b38-a76d-9c3ea171b8d8</find>
@@ -61,6 +132,7 @@
       <find>用户登录</find>
       <find>loginJson</find>
       <find>windowJson</find>
+      <find>V1--Login</find>
     </findStrings>
     <replaceStrings>
       <replace>class</replace>
@@ -83,13 +155,10 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.gitignore" />
-        <option value="$PROJECT_DIR$/static/data/EnityLogin.json" />
         <option value="$PROJECT_DIR$/src/renderer/assets/less/login.less" />
         <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$/src/renderer/assets/less/splitscreen.less" />
         <option value="$PROJECT_DIR$/static/EnityBigScreen.json" />
@@ -110,22 +179,16 @@
         <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" />
-        <option value="$PROJECT_DIR$/src/renderer/App.vue" />
-        <option value="$PROJECT_DIR$/src/renderer/components/Login.vue" />
         <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" />
-        <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" />
         <option value="$PROJECT_DIR$/dist/electron/index.html" />
@@ -133,7 +196,16 @@
         <option value="$PROJECT_DIR$/src/renderer/components/Admin.vue" />
         <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" />
+        <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" />
       </list>
     </option>
   </component>
@@ -160,20 +232,18 @@
             <path>
               <item name="electron-app" type="b2602c69:ProjectViewProjectNode" />
               <item name="electron-app" type="462c0819:PsiDirectoryNode" />
-              <item name="build" 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="build" type="462c0819:PsiDirectoryNode" />
-              <item name="win-unpacked" 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="build" type="462c0819:PsiDirectoryNode" />
-              <item name="win-unpacked" type="462c0819:PsiDirectoryNode" />
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="static" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
@@ -293,12 +363,12 @@
       <workItem from="1588906984737" duration="659000" />
       <workItem from="1588916874925" duration="10362000" />
       <workItem from="1588944784073" duration="3690000" />
-      <workItem from="1588988349962" duration="6705000" />
+      <workItem from="1588988349962" duration="14400000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="466441000" />
+    <option name="totallyTimeSpent" value="474136000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -311,6 +381,7 @@
   </component>
   <component name="ToolWindowManager">
     <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.18914647" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
@@ -326,7 +397,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" />
@@ -337,23 +408,6 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/.electron-vue/dev-runner.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="336">
-          <caret line="70" column="46" lean-forward="true" selection-start-line="70" selection-start-column="46" selection-end-line="70" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/index.dev.js">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.dom.d.ts">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="21">
-          <caret line="14971" column="4" selection-start-line="14971" selection-start-column="4" selection-end-line="14971" selection-end-column="4" />
-        </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">
@@ -2136,16 +2190,6 @@
         </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="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" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/utils/tools.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="105">
@@ -2181,24 +2225,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/store/mutations.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="378">
-          <caret line="29" column="28" lean-forward="true" selection-start-line="29" selection-start-column="28" selection-end-line="29" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/store/actions.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="370">
-          <caret line="36" column="33" selection-start-line="36" selection-start-column="33" selection-end-line="36" selection-end-column="33" />
-          <folding>
-            <element signature="n#!!doc" expanded="true" />
-            <element signature="e#25#193#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.es5.d.ts">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="306">
@@ -2345,109 +2371,184 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/EnityLogin.json">
+    <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/mainpage.less">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="441">
-          <caret line="23" column="21" selection-start-line="23" selection-start-column="21" selection-end-line="23" selection-end-column="21" />
+        <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#423#435#0" />
+            <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" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/components/Login.vue">
+    <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="168">
-          <caret line="65" column="10" lean-forward="true" selection-start-line="65" selection-start-column="10" selection-end-line="65" selection-end-column="10" />
+        <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="e#1576#1605#0" expanded="true" />
+            <element signature="n#!!doc" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/App.vue">
+    <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="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" />
+        <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="e#93#112#0" expanded="true" />
+            <element signature="n#!!doc" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/components/Admin.vue">
+    <entry file="file://$PROJECT_DIR$/src/renderer/store/mutations.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="42">
-          <caret line="2" column="22" lean-forward="true" selection-start-line="2" selection-start-column="22" selection-end-line="2" selection-end-column="22" />
+        <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#1268#1991#0" />
-            <element signature="e#2118#2147#0" expanded="true" />
+            <element signature="e#25#193#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/mainpage.less">
+    <entry file="file://$PROJECT_DIR$/static/resource.js">
       <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" />
+        <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#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" />
+            <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" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../demo.html">
+    <entry file="file://$PROJECT_DIR$/src/renderer/store/actions.js">
       <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 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>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/renderer/main.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="17" column="17" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" />
+        <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" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/index.js">
+    <entry file="file://$PROJECT_DIR$/src/renderer/App.vue">
       <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 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" />
+          </folding>
         </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="273">
-          <caret line="13" column="23" lean-forward="true" selection-start-line="13" selection-start-column="23" selection-end-line="13" selection-end-column="23" />
+        <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#123#175#0" expanded="true" />
-            <element signature="e#674#1106#0" />
+            <element signature="e#66#118#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/index.ejs">
+    <entry file="file://$PROJECT_DIR$/build/win-unpacked/resources/app/dist/electron/static/EnityLogin.json">
       <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>
+          <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" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/build/win-unpacked/resources/app/dist/electron/renderer.js">
+    <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" />
+          </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="36">
-          <caret column="151439" lean-forward="true" selection-start-column="151439" selection-end-column="151439" />
+        <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>
         </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,7 @@
 <!--登录界面-->
 <template>
-    <div class="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)}`}"
-        >
+    <div class="login" ref="login">
+        <section class="login-content">
             <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 +11,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" @click="submitForm('ruleForm')">提交</el-button>
+                    <el-button  type="primary" @click="resetForm('ruleForm')">重置</el-button>
                 </el-form-item>
             </el-form>
         </section>
@@ -65,6 +56,13 @@
             ...mapState(['loginJson'])
         },
 
+        mounted() {
+          setTimeout(() => {
+              console.log(this.loginJson)
+              this.$refs.login.style.cssText = `background-color:${this.loginJson[0].BrackgroupStr}`
+          },100)
+        },
+
         methods: {
             async submitForm() {
                 const {username,password} = this.ruleForm
@@ -74,16 +72,6 @@
                 }
                 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)
                 if(res.token){

src/renderer/main.js

@@ -1,5 +1,7 @@
 import Vue from 'vue'
 import axios from 'axios'
+import fs from 'fs'
+import path from 'path'
 
 import App from './App'
 import router from './router'
@@ -14,9 +16,13 @@ Vue.http = Vue.prototype.$http = axios
 Vue.config.productionTip = false
 
 /* eslint-disable no-new */
-new Vue({
+const vm = new Vue({
   components: { App },
   router,
   store,
   template: '<App/>'
 }).$mount('#app')
+
+// 读取本地配置文件
+let loginJson = fs.readFileSync(path.join(__static, '/EnityLogin.json'), 'utf8')
+vm.$store.dispatch('saveLoginJson',loginJson)

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 {
@@ -50,6 +51,11 @@ export default {
   // 保存设备数据
   saveDevice({commit},deviceJson) {
     commit(SAVE_DEVICE,{deviceJson})
+  },
+
+  // 保存登录json数据
+  saveLoginJson({commit},loginJson) {
+    commit(SAVE_LOGIN,{loginJson})
   }
 
 }

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

@@ -7,7 +7,8 @@ import {
   UPDATE_SIGNALPRELIST,
   SAVE_BIGSCREEN,
   SAVE_SIGNALLIST,
-  SAVE_DEVICE
+  SAVE_DEVICE,
+  SAVE_LOGIN
 } from './mutation-types'
 
 import storageUtils from "../../utils/storageUtils"
@@ -54,4 +55,9 @@ export default {
   [SAVE_DEVICE] (state,{deviceJson}) {
     state.deviceJson = deviceJson
   },
+
+  // 保存登录数据
+  [SAVE_LOGIN] (state,{loginJson}) {
+    state.loginJson = loginJson
+  },
 }

src/renderer/store/state.js

@@ -1,7 +1,6 @@
 /*状态对象模块*/
 
 // import loginJson from '../../../static/EnityLogin'
-const loginJson  = require('../../../static/EnityLogin')
 import windowJson from '../../../static/EnityWindow'
 import buttonJson from '../../../static/EnityButton'
 import labelJson from '../../../static/EnityLable'
@@ -10,13 +9,6 @@ import sliderJson from '../../../static/EnitySlider'
 import systemJson from '../../../static/EnitySystem'
 import signalBorder from '../../../static/EnitySignalPreviewList'
 
-import fs from 'fs'
-import path from 'path'
-
-/*let loginJson = fs.readFileSync(path.join(__static, '/EnityLogin.json'), 'utf8')
-
-console.log(loginJson)*/
-
 export default {
   // 用户信息
   user: {},
@@ -40,7 +32,7 @@ export default {
   deviceJson:[],
 
   // 登录
-  loginJson,
+  loginJson:[],
 
   // window窗口
   windowJson,

static/EnityLogin.json

@@ -1,10 +1,10 @@
-[
+
     {
         "IsBorder":true,
         "BorderStr":"#FFFFFFFF",
         "ForegroundStr":"#FFD6D6D6",
         "BTNForegroundStr":"#FF000000",
-        "BrackgroupStr":"#FF03A9F4",
+        "BrackgroupStr":"#03A9F4",
         "BackIconObjID":"",
         "BackIcon":null,
         "ActionIconObjID":"",
@@ -32,4 +32,4 @@
         "IsLock":false,
         "IsWindow":false
     }
-]
+