进行整改前的一次提交

.idea/workspace.xml

@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="690c02a3-0e7d-4c4a-8f0c-a44c44c3a162" name="Default Changelist" comment="" />
+    <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" />
+    </list>
     <ignored path="$PROJECT_DIR$/dist/" />
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -13,12 +17,54 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
-    <leaf>
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/static/EnitySystem.json">
+        <entry file="file://$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="105">
-              <caret line="5" column="3" lean-forward="true" selection-start-line="5" selection-start-column="3" selection-end-line="5" selection-end-column="3" />
+            <state relative-caret-position="507">
+              <caret line="139" column="11" selection-start-line="139" selection-start-column="11" selection-end-line="139" selection-end-column="11" />
+              <folding>
+                <element signature="e#1096#1372#0" />
+                <element signature="e#1156#1362#0" />
+                <element signature="e#1224#1350#0" />
+                <element signature="e#1759#2140#0" />
+                <element signature="e#1812#2130#0" />
+                <element signature="e#1898#2118#0" />
+                <element signature="e#2218#2366#0" />
+                <element signature="e#2269#2356#0" />
+                <element signature="e#3164#3508#0" />
+                <element signature="e#4515#4571#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/dist/electron/main.js">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/dist/electron/index.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state>
+              <caret column="301" selection-start-column="301" selection-end-column="301" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/package.json">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="147">
+              <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+              <folding>
+                <element signature="n#!!block;n#directories#0;n#!!block;n#build#0;n#!!top" />
+                <element signature="n#!!block;n#dmg#0;n#!!block;n#build#0;n#!!top" />
+                <element signature="n#!!block;n#mac#0;n#!!block;n#build#0;n#!!top" />
+                <element signature="n#!!block;n#win#0;n#!!block;n#build#0;n#!!top" />
+                <element signature="n#!!block;n#linux#0;n#!!block;n#build#0;n#!!top" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -125,7 +171,6 @@
         <option value="$PROJECT_DIR$/src/renderer/store/state.js" />
         <option value="$PROJECT_DIR$/.electron-vue/dev-runner.js" />
         <option value="$PROJECT_DIR$/package.json" />
-        <option value="$PROJECT_DIR$/src/main/index.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" />
@@ -134,9 +179,10 @@
         <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" />
         <option value="$PROJECT_DIR$/src/renderer/api/ajax.js" />
         <option value="$PROJECT_DIR$/src/renderer/api/index.js" />
+        <option value="$PROJECT_DIR$/src/renderer/App.vue" />
+        <option value="$PROJECT_DIR$/src/main/index.js" />
       </list>
     </option>
   </component>
@@ -161,6 +207,22 @@
               <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=".electron-vue" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="electron-app" type="b2602c69:ProjectViewProjectNode" />
+              <item name="electron-app" type="462c0819:PsiDirectoryNode" />
+              <item name="dist" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="electron-app" type="b2602c69:ProjectViewProjectNode" />
+              <item name="electron-app" type="462c0819:PsiDirectoryNode" />
+              <item name="dist" type="462c0819:PsiDirectoryNode" />
+              <item name="electron" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="electron-app" type="b2602c69:ProjectViewProjectNode" />
               <item name="electron-app" type="462c0819:PsiDirectoryNode" />
@@ -277,7 +339,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="416534000" />
+    <option name="totallyTimeSpent" value="419247000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -290,6 +352,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.14172813" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
@@ -305,7 +368,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.44550264" />
+      <window_info anchor="bottom" id="Terminal" order="10" weight="0.46666667" />
       <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" />
@@ -316,109 +379,6 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/renderer/components/Button.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="172" column="48" selection-start-line="172" selection-start-column="48" selection-end-line="172" selection-end-column="48" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/admin.less">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="15" column="3" lean-forward="true" selection-start-line="15" selection-start-column="3" selection-end-line="15" selection-end-column="3" />
-          <folding>
-            <element signature="e#187#225#0" />
-            <element signature="e#253#4747#0" />
-            <element signature="e#340#599#0" />
-            <element signature="e#506#593#0" />
-            <element signature="e#632#4629#0" />
-            <element signature="e#763#1168#0" />
-            <element signature="e#976#1012#0" />
-            <element signature="e#1068#1160#0" />
-            <element signature="e#1210#2997#0" />
-            <element signature="e#1326#1746#0" />
-            <element signature="e#1596#1736#0" />
-            <element signature="e#1790#1921#0" />
-            <element signature="e#1966#2095#0" />
-            <element signature="e#2140#2279#0" />
-            <element signature="e#2328#2457#0" />
-            <element signature="e#2498#2989#0" />
-            <element signature="e#2625#2829#0" />
-            <element signature="e#2872#2979#0" />
-            <element signature="e#3036#4623#0" />
-            <element signature="e#3236#3296#0" />
-            <element signature="e#3334#4614#0" />
-            <element signature="e#3424#4603#0" />
-            <element signature="e#3623#4591#0" />
-            <element signature="e#3805#3882#0" />
-            <element signature="e#3940#4577#0" />
-            <element signature="e#4125#4281#0" />
-            <element signature="e#4347#4561#0" />
-            <element signature="e#4660#4743#0" />
-            <element signature="e#4774#4812#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/static/EnityView.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="2" lean-forward="true" selection-start-column="2" selection-end-column="2" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/static/EnityWindow.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="420">
-          <caret line="24" column="13" lean-forward="true" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
-          <folding>
-            <element signature="e#157#165#0" />
-            <element signature="e#188#196#0" />
-            <element signature="e#673#1342#0" />
-            <element signature="e#830#838#0" />
-            <element signature="e#861#869#0" />
-            <element signature="e#1346#2019#0" />
-            <element signature="e#1501#1509#0" />
-            <element signature="e#1532#1540#0" />
-            <element signature="e#2023#2693#0" />
-            <element signature="e#2181#2189#0" />
-            <element signature="e#2212#2220#0" />
-            <element signature="e#2697#3367#0" />
-            <element signature="e#2855#2863#0" />
-            <element signature="e#2886#2894#0" />
-            <element signature="e#3371#4040#0" />
-            <element signature="e#3527#3535#0" />
-            <element signature="e#3558#3566#0" />
-            <element signature="e#4044#4714#0" />
-            <element signature="e#4201#4209#0" />
-            <element signature="e#4232#4240#0" />
-            <element signature="e#4718#5396#0" />
-            <element signature="e#4875#4883#0" />
-            <element signature="e#4906#4914#0" />
-            <element signature="e#5400#6067#0" />
-            <element signature="e#5556#5564#0" />
-            <element signature="e#5587#5595#0" />
-            <element signature="e#6071#6738#0" />
-            <element signature="e#6227#6235#0" />
-            <element signature="e#6258#6266#0" />
-            <element signature="e#6742#7419#0" />
-            <element signature="e#6899#6907#0" />
-            <element signature="e#6930#6938#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/static/EnityTopology.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="15" column="15" lean-forward="true" selection-start-line="15" selection-start-column="15" selection-end-line="15" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/static/EnityTimer.json">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/static/EnityLable.json">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -883,36 +843,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="139" column="11" lean-forward="true" selection-start-line="139" selection-start-column="11" selection-end-line="139" selection-end-column="11" />
-          <folding>
-            <element signature="e#456#741#0" />
-            <element signature="e#2156#2374#0" />
-            <element signature="e#2218#2366#0" />
-            <element signature="e#2269#2356#0" />
-            <element signature="e#2382#2580#0" />
-            <element signature="e#2490#2572#0" />
-            <element signature="e#2588#2808#0" />
-            <element signature="e#2651#2800#0" />
-            <element signature="e#2702#2790#0" />
-            <element signature="e#3065#3765#0" />
-            <element signature="e#3164#3508#0" />
-            <element signature="e#3523#3632#0" />
-            <element signature="e#4254#4311#0" />
-            <element signature="e#4355#4513#0" />
-            <element signature="e#4417#4506#0" />
-            <element signature="e#4515#4571#0" />
-            <element signature="e#4615#5043#0" />
-            <element signature="e#4729#4885#0" />
-            <element signature="e#4737#4879#0" />
-            <element signature="e#4917#4969#0" />
-            <element signature="e#5008#5036#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/.electron-vue/webpack.web.config.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-2003" />
@@ -928,17 +858,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/main/index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="399">
-          <caret line="32" column="28" selection-start-line="32" selection-start-column="28" selection-end-line="32" selection-end-column="28" />
-          <folding>
-            <element signature="e#0#45#0" expanded="true" />
-            <element signature="e#282#371#0" />
-          </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="147">
@@ -1089,13 +1008,6 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/renderer/components/UploadConfig.vue" />
-    <entry file="file://$PROJECT_DIR$/src/renderer/main.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <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">
@@ -1106,30 +1018,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/App.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
-          <folding>
-            <element signature="e#93#112#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/package.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-798">
-          <caret line="7" column="13" lean-forward="true" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-          <folding>
-            <element signature="n#!!block;n#directories#0;n#!!block;n#build#0;n#!!top" />
-            <element signature="n#!!block;n#dmg#0;n#!!block;n#build#0;n#!!top" />
-            <element signature="n#!!block;n#mac#0;n#!!block;n#build#0;n#!!top" />
-            <element signature="n#!!block;n#win#0;n#!!block;n#build#0;n#!!top" />
-            <element signature="n#!!block;n#linux#0;n#!!block;n#build#0;n#!!top" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/static/EnitySignalPreviewList.json">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="21">
@@ -2793,5 +2681,87 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/static/EnityBigScreen.Data">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/App.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="147">
+          <caret line="7" column="21" selection-start-line="7" selection-start-column="21" selection-end-line="7" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/main.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="378">
+          <caret line="18" column="32" selection-start-line="18" selection-start-column="32" selection-end-line="18" selection-end-column="32" />
+          <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="525">
+          <caret line="27" column="6" lean-forward="true" selection-start-line="27" selection-start-column="6" selection-end-line="27" selection-end-column="6" />
+          <folding>
+            <element signature="e#282#371#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/icons/256x256.png">
+      <provider selected="true" editor-type-id="images" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/icons/icon.icns">
+      <provider selected="true" editor-type-id="images" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/icons/icon.ico">
+      <provider selected="true" editor-type-id="images" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/package.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="147">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+          <folding>
+            <element signature="n#!!block;n#directories#0;n#!!block;n#build#0;n#!!top" />
+            <element signature="n#!!block;n#dmg#0;n#!!block;n#build#0;n#!!top" />
+            <element signature="n#!!block;n#mac#0;n#!!block;n#build#0;n#!!top" />
+            <element signature="n#!!block;n#win#0;n#!!block;n#build#0;n#!!top" />
+            <element signature="n#!!block;n#linux#0;n#!!block;n#build#0;n#!!top" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/dist/electron/main.js">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/dist/electron/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret column="301" selection-start-column="301" selection-end-column="301" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="507">
+          <caret line="139" column="11" selection-start-line="139" selection-start-column="11" selection-end-line="139" selection-end-column="11" />
+          <folding>
+            <element signature="e#1096#1372#0" />
+            <element signature="e#1156#1362#0" />
+            <element signature="e#1224#1350#0" />
+            <element signature="e#1759#2140#0" />
+            <element signature="e#1812#2130#0" />
+            <element signature="e#1898#2118#0" />
+            <element signature="e#2218#2366#0" />
+            <element signature="e#2269#2356#0" />
+            <element signature="e#3164#3508#0" />
+            <element signature="e#4515#4571#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

src/main/index.js

@@ -1,6 +1,4 @@
 import { app, BrowserWindow } from 'electron'
-import fs from 'fs'
-import path from 'path'
 
 /**
  * Set `__static` path to static files in production
@@ -32,13 +30,7 @@ function createWindow () {
 
   mainWindow.loadURL(winURL)
 
-  mainWindow.webContents.openDevTools();
-
-  // let fileContents = fs.readFileSync(path.join(__static, '/EnityWindow.json'), 'utf8')
-
- /* mainWindow.webContents.on('did-finish-load', function(){
-    mainWindow.webContents.send('something', fileContents)
-  })*/
+  // mainWindow.webContents.openDevTools();
 
   mainWindow.once('ready-to-show', () => {
     mainWindow.show()

src/renderer/App.vue

@@ -21,8 +21,6 @@
       formData.append('device',device)
       formData.append('bigscreen',bigscreen)
 
-      console.log(formData)
-
       // 发送请求将配置文件传给服务器
       const res = await reqImportConfigFiles(formData)
       if(!res){