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

程序启动时引入配置文件成功,折腾了好久,最后正确的代码是如此简单。当你写一个功能很费劲的时候,可能是用错了方式

liuwei 4 роки тому
батько
коміт
7735b3cef2

+ 168 - 191
.idea/workspace.xml

@@ -3,15 +3,11 @@
   <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/main/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/index.js" 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/api/ajax.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/api/ajax.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/api/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/api/index.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/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/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/utils/storageUtils.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/storageUtils.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/renderer/router/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/router/index.js" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/dist/" />
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -26,33 +22,33 @@
   <component name="FileEditorManager">
     <leaf>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/renderer/api/index.js">
+        <entry file="file://$PROJECT_DIR$/src/renderer/main.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="63">
-              <caret line="3" column="3" lean-forward="true" selection-start-line="3" selection-start-column="3" selection-end-line="3" selection-end-column="3" />
+            <state relative-caret-position="84">
+              <caret line="4" column="29" lean-forward="true" selection-start-line="4" selection-start-column="29" selection-end-line="4" selection-end-column="29" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/renderer/App.vue">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="483">
+              <caret line="23" column="27" lean-forward="true" selection-start-line="23" selection-start-column="27" selection-end-line="23" selection-end-column="27" />
               <folding>
-                <element signature="n#!!doc" expanded="true" />
+                <element signature="e#93#112#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/renderer/components/Admin.vue">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/renderer/router/index.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="391">
-              <caret line="82" column="10" lean-forward="true" selection-start-line="82" selection-start-column="10" selection-end-line="82" selection-end-column="10" />
+            <state relative-caret-position="462">
+              <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="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" />
-                <element signature="e#2747#2850#0" />
-                <element signature="e#2768#2840#0" />
-                <element signature="e#2871#2883#0" />
-                <element signature="e#2903#3166#0" />
-                <element signature="e#2952#3156#0" />
-                <element signature="e#3187#3239#0" />
+                <element signature="e#0#21#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -121,8 +117,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/renderer/components/modal/loadPrePlan.vue" />
-        <option value="$PROJECT_DIR$/src/renderer/components/modal/running.vue" />
         <option value="$PROJECT_DIR$/src/renderer/components/modal/playertest.vue" />
         <option value="$PROJECT_DIR$/.gitignore" />
         <option value="$PROJECT_DIR$/static/data/EnityLogin.json" />
@@ -144,7 +138,6 @@
         <option value="$PROJECT_DIR$/src/renderer/assets/less/admin.less" />
         <option value="$PROJECT_DIR$/static/EnitySystem.json" />
         <option value="$PROJECT_DIR$/dist/electron/index.html" />
-        <option value="$PROJECT_DIR$/src/renderer/router/index.js" />
         <option value="$PROJECT_DIR$/.electron-vue/webpack.main.config.js" />
         <option value="$PROJECT_DIR$/build/win-unpacked/resources/app/dist/electron/main.js" />
         <option value="$PROJECT_DIR$/build/win-unpacked/resources/app/dist/electron/index.html" />
@@ -164,22 +157,25 @@
         <option value="$PROJECT_DIR$/.electron-vue/dev-runner.js" />
         <option value="$PROJECT_DIR$/package.json" />
         <option value="$PROJECT_DIR$/src/main/index.js" />
-        <option value="$PROJECT_DIR$/src/renderer/main.js" />
         <option value="$PROJECT_DIR$/src/renderer/assets/less/mainpage.less" />
         <option value="$PROJECT_DIR$/src/renderer/components/Admin.vue" />
         <option value="$PROJECT_DIR$/src/utils/storageUtils.js" />
-        <option value="$PROJECT_DIR$/src/renderer/api/ajax.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/api/ajax.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$/src/renderer/App.vue" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="511" />
-    <option name="y" value="113" />
-    <option name="width" value="1100" />
-    <option name="height" value="444" />
+    <option name="x" value="-420" />
+    <option name="y" value="19" />
+    <option name="width" value="1366" />
+    <option name="height" value="600" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
     <ConfirmationsSetting value="2" id="Add" />
@@ -208,6 +204,20 @@
               <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="components" 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="router" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -311,12 +321,13 @@
       <workItem from="1587865780844" duration="20841000" />
       <workItem from="1587909041527" duration="633000" />
       <workItem from="1587980408036" duration="1193000" />
-      <workItem from="1588039023750" duration="20874000" />
+      <workItem from="1588039023750" duration="21254000" />
+      <workItem from="1588125117785" duration="17969000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="392621000" />
+    <option name="totallyTimeSpent" value="410970000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -331,7 +342,7 @@
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.15700738" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.15700738" />
       <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" />
@@ -345,7 +356,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.6730159" />
+      <window_info anchor="bottom" id="Terminal" order="10" weight="0.44550264" />
       <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" />
@@ -356,87 +367,6 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/index.ejs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="294">
-          <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/components/Label.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="42">
-          <caret line="2" column="9" selection-start-line="2" selection-start-column="9" selection-end-line="2" selection-end-column="9" />
-          <folding>
-            <element signature="n#template#0;n#!!top" />
-            <element signature="n#div#0;n#template#0;n#!!top" />
-            <element signature="n#label#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="n#script#0;n#!!top" />
-            <element signature="e#739#10674#0" />
-            <element signature="e#757#769#0" />
-            <element signature="e#778#810#0" />
-            <element signature="e#1018#1070#0" />
-            <element signature="e#1090#10668#0" />
-            <element signature="n#style#0;n#!!top" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/components/SignalList.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="80" column="8" lean-forward="true" selection-start-line="80" selection-start-column="8" selection-end-line="80" selection-end-column="8" />
-          <folding>
-            <element signature="n#template#0;n#!!top" />
-            <element signature="n#draggable#0;n#template#0;n#!!top" />
-            <element signature="n#div#0;n#draggable#0;n#template#0;n#!!top" />
-            <element signature="n#div#0;n#div#0;n#draggable#0;n#template#0;n#!!top" />
-            <element signature="n#div#0;n#div#0;n#div#0;n#draggable#0;n#template#0;n#!!top" />
-            <element signature="n#script#0;n#!!top" />
-            <element signature="e#1440#2111#0" />
-            <element signature="e#1426#1459#0" />
-            <element signature="e#1523#1547#0" />
-            <element signature="e#1599#1869#0" />
-            <element signature="e#1553#2105#0" />
-            <element signature="e#1497#1801#0" />
-            <element signature="e#1522#1787#0" />
-            <element signature="e#1585#1727#0" />
-            <element signature="e#1830#1964#0" />
-            <element signature="e#1855#1950#0" />
-            <element signature="n#style#0;n#!!top" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/components/Image.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="525">
-          <caret line="25" selection-start-line="25" selection-end-line="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/components/Slider.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="126">
-          <caret line="38" column="11" lean-forward="true" selection-start-line="38" selection-start-column="11" selection-end-line="38" selection-end-column="11" />
-          <folding>
-            <element signature="n#div#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="n#div#0;n#div#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#template#0;n#!!top" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/splitscreen.less">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="28" column="20" lean-forward="true" selection-start-line="28" selection-start-column="20" selection-end-line="28" selection-end-column="20" />
-          <folding>
-            <element signature="e#30#298#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/renderer/components/Button.vue">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
@@ -2486,26 +2416,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/EnitySignalPreviewList.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="289">
-          <caret line="82" column="7" selection-start-line="82" selection-start-column="7" selection-end-line="82" selection-end-column="7" />
-          <folding>
-            <element signature="e#621#744#0" />
-            <element signature="e#752#875#0" />
-            <element signature="e#883#1006#0" />
-            <element signature="e#1014#1155#0" />
-            <element signature="e#1163#1304#0" />
-            <element signature="e#1312#1453#0" />
-            <element signature="e#1461#1602#0" />
-            <element signature="e#1610#1751#0" />
-            <element signature="e#1759#1900#0" />
-            <element signature="e#1908#2049#0" />
-            <element signature="e#2057#2198#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/static/EnitySlider.json">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="336">
@@ -2651,13 +2561,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/router/index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="42">
-          <caret line="2" lean-forward="true" selection-start-line="2" selection-end-line="2" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/package.json">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="210">
@@ -2717,16 +2620,6 @@
     <entry file="file://$PROJECT_DIR$/src/main/index.dev.js">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/main.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="273">
-          <caret line="13" column="4" selection-start-line="13" selection-start-column="4" selection-end-line="13" selection-end-column="4" />
-          <folding>
-            <element signature="e#0#21#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/index.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="399">
@@ -2812,78 +2705,162 @@
         </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="76">
+          <caret line="60" lean-forward="true" selection-start-line="60" selection-end-line="60" />
+          <folding>
+            <element signature="e#1231#1954#0" />
+            <element signature="e#2070#2099#0" expanded="true" />
+            <element signature="e#2542#2729#0" />
+            <element signature="e#2747#2850#0" />
+            <element signature="e#2768#2840#0" />
+            <element signature="e#2871#2883#0" />
+            <element signature="e#2903#3166#0" />
+            <element signature="e#2952#3156#0" />
+            <element signature="e#3187#3239#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../nginx.conf">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="126">
+          <caret line="6" column="33" lean-forward="true" selection-start-line="6" selection-start-column="33" selection-end-line="6" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/renderer/api/ajax.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="945">
-          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
+        <state relative-caret-position="84">
+          <caret line="4" column="25" lean-forward="true" selection-start-line="4" selection-start-column="25" selection-end-line="4" selection-end-column="25" />
+          <folding>
+            <element signature="n#!!doc" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/static/EnitySignalPreviewList.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="10" column="8" lean-forward="true" selection-start-line="10" selection-start-column="8" selection-end-line="10" selection-end-column="8" />
+          <folding>
+            <element signature="e#363#484#0" />
+            <element signature="e#492#613#0" />
+            <element signature="e#621#744#0" />
+            <element signature="e#752#875#0" />
+            <element signature="e#883#1006#0" />
+            <element signature="e#1014#1155#0" />
+            <element signature="e#1163#1304#0" />
+            <element signature="e#1312#1453#0" />
+            <element signature="e#1461#1602#0" />
+            <element signature="e#1610#1751#0" />
+            <element signature="e#1759#1900#0" />
+            <element signature="e#1908#2049#0" />
+            <element signature="e#2057#2198#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/api/index.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="294">
+          <caret line="14" column="31" lean-forward="true" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
           <folding>
             <element signature="n#!!doc" expanded="true" />
-            <element signature="e#58#83#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/node_modules/element-ui/types/upload.d.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="751">
+          <caret line="122" column="2" selection-start-line="122" selection-start-column="2" selection-end-line="122" selection-end-column="2" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../files/ehs/test_uploadfile.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="798">
+          <caret line="38" column="9" lean-forward="true" selection-start-line="38" selection-start-column="9" selection-end-line="38" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../files/ehs/test_uploadfile2.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="294">
+          <caret line="14" column="31" lean-forward="true" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
+        </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="97">
-          <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="21">
+          <caret line="28" column="11" lean-forward="true" selection-start-line="28" selection-start-column="11" selection-end-line="28" selection-end-column="11" />
           <folding>
-            <element signature="n#div#0;n#template#0;n#!!top" />
-            <element signature="n#section#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#template#0;n#!!top" />
             <element signature="n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
             <element signature="n#el-form-item#0;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
             <element signature="n#el-form-item#1;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
             <element signature="n#el-form-item#2;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#script#0;n#!!top" />
             <element signature="e#1576#1605#0" expanded="true" />
+            <element signature="e#2389#2482#0" />
+            <element signature="e#2514#2610#0" />
+            <element signature="e#2705#3480#0" />
+            <element signature="e#2819#2921#0" />
+            <element signature="e#3086#3389#0" />
+            <element signature="e#3394#3466#0" />
+            <element signature="e#3515#3581#0" />
             <element signature="n#style#0;n#!!top" />
+            <element signature="e#3823#3945#0" />
+            <element signature="e#3968#4010#0" />
+            <element signature="e#4035#4138#0" />
+            <element signature="e#4072#4124#0" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/App.vue">
+    <entry file="file://$PROJECT_DIR$/node_modules/element-ui/packages/upload/src/index.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="41" column="8" lean-forward="true" selection-start-line="41" selection-start-column="8" selection-end-line="41" selection-end-column="8" />
+        <state relative-caret-position="609">
+          <caret line="32" column="4" selection-start-line="32" selection-start-column="4" selection-end-line="32" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/components/UploadConfig.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="357">
+          <caret line="17" column="11" lean-forward="true" selection-start-line="17" selection-start-column="11" selection-end-line="17" selection-end-column="11" />
           <folding>
-            <element signature="n#template#0;n#!!top" />
-            <element signature="n#div#0;n#template#0;n#!!top" />
-            <element signature="n#script#0;n#!!top" />
-            <element signature="e#157#754#0" />
-            <element signature="e#197#750#0" />
-            <element signature="e#479#497#0" />
-            <element signature="e#524#577#0" />
-            <element signature="e#664#781#0" />
-            <element signature="e#714#772#0" />
-            <element signature="n#style#0;n#!!top" />
+            <element signature="n#style#0;n#el-button#1;n#el-upload#0;n#div#0;n#template#0;n#!!top" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/api/index.js">
+    <entry file="file://$PROJECT_DIR$/src/renderer/main.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="63">
-          <caret line="3" column="3" lean-forward="true" selection-start-line="3" selection-start-column="3" selection-end-line="3" selection-end-column="3" />
+        <state relative-caret-position="84">
+          <caret line="4" column="29" lean-forward="true" selection-start-line="4" selection-start-column="29" selection-end-line="4" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/router/index.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="462">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
           <folding>
-            <element signature="n#!!doc" expanded="true" />
+            <element signature="e#0#21#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/components/Admin.vue">
+    <entry file="file://$PROJECT_DIR$/src/renderer/App.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="391">
-          <caret line="82" column="10" lean-forward="true" selection-start-line="82" selection-start-column="10" selection-end-line="82" selection-end-column="10" />
+        <state relative-caret-position="483">
+          <caret line="23" column="27" lean-forward="true" selection-start-line="23" selection-start-column="27" selection-end-line="23" selection-end-column="27" />
           <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" />
-            <element signature="e#2747#2850#0" />
-            <element signature="e#2768#2840#0" />
-            <element signature="e#2871#2883#0" />
-            <element signature="e#2903#3166#0" />
-            <element signature="e#2952#3156#0" />
-            <element signature="e#3187#3239#0" />
+            <element signature="e#93#112#0" expanded="true" />
           </folding>
         </state>
       </provider>

+ 8 - 13
src/renderer/App.vue

@@ -18,21 +18,16 @@
       let device = fs.readFileSync(path.join(__static, '/EnityDevice.json'), 'utf8')
       let bigscreen = fs.readFileSync(path.join(__static, '/EnityBigScreen.json'), 'utf8')
 
-      // 将json文件转成formdata
-      for (let i=0;i<device.length;i++){
-        Object.keys(device[i]).forEach((key) => {
-          formData.append(key, device[i][key])
-        })
-      }
-
-      for (let i=0;i<bigscreen.length;i++){
-        Object.keys(bigscreen[i]).forEach((key) => {
-          formData.append(key, bigscreen[i][key])
-        })
-      }
+      formData.append('device',device)
+      formData.append('bigscreen',bigscreen)
+      
+      console.log(formData)
 
       // 发送请求将配置文件传给服务器
-      await reqImportConfigFiles(formData)
+      const res = await reqImportConfigFiles(formData)
+      if(!res){
+        console.log('上传配置文件成功!')
+      }
     }
   }
 </script>

+ 2 - 0
src/renderer/api/ajax.js

@@ -5,6 +5,8 @@ ajax请求函数模块
 import axios from 'axios'
 import storageUtils from "../../utils/storageUtils"
 
+axios.defaults.headers.post['Content-Type'] = 'multipart/form-data'
+
 /*axios请求拦截器,给请求头添加授权*/
 axios.interceptors.request.use(config => {
   config.headers.Authorization = storageUtils.getToken()

+ 0 - 2
src/renderer/components/Login.vue

@@ -73,8 +73,6 @@
                     return
                 }
                 const userInfo = {name:username,password}
-                /*this.$router.replace('/admin')
-                return*/
                 // 请求登录
                 const res = await reqLogin(userInfo)
                 if(res.token){

+ 0 - 1
src/renderer/main.js

@@ -1,7 +1,6 @@
 import Vue from 'vue'
 import axios from 'axios'
 
-
 import App from './App'
 import router from './router'
 import store from './store'

+ 2 - 4
src/renderer/router/index.js

@@ -11,12 +11,10 @@ export default new Router({
     {
       path: '/login',
       component: Login
-    },
-    {
+    }, {
       path: '/admin',
       component: Admin
-    },
-    {
+    }, {
       path: '/',
       redirect: '/login'
     },