这个一个有bug的提交

.electron-vue/webpack.renderer.config.js

@@ -113,14 +113,27 @@ let rendererConfig = {
     new HtmlWebpackPlugin({
       filename: 'index.html',
       template: path.resolve(__dirname, '../src/index.ejs'),
+      /*templateParameters(compilation, assets, options) {
+        return {
+          compilation: compilation,
+          webpack: compilation.getStats().toJson(),
+          webpackConfig: compilation.options,
+          htmlWebpackPlugin: {
+            files: assets,
+            options: options
+          },
+          process,
+        };
+      },*/
       minify: {
         collapseWhitespace: true,
         removeAttributeQuotes: true,
         removeComments: true
       },
-      nodeModules: process.env.NODE_ENV !== 'production'
+      nodeModules: false
+      /*nodeModules: process.env.NODE_ENV !== 'production'
         ? path.resolve(__dirname, '../node_modules')
-        : false
+        : false*/
     }),
     new webpack.HotModuleReplacementPlugin(),
     new webpack.NoEmitOnErrorsPlugin()
@@ -133,7 +146,8 @@ let rendererConfig = {
   resolve: {
     alias: {
       '@': path.join(__dirname, '../src/renderer'),
-      'vue$': 'vue/dist/vue.esm.js'
+      'vue$': 'vue/dist/vue.esm.js',
+      /*'static':path.resolve(__dirname,'../static')*/
     },
     extensions: ['.js', '.vue', '.json', '.css', '.node']
   },

.idea/workspace.xml

@@ -2,26 +2,37 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="690c02a3-0e7d-4c4a-8f0c-a44c44c3a162" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js" beforeDir="false" afterPath="$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/.electron-vue/webpack.renderer.config.js" beforeDir="false" afterPath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/.electron-vue/webpack.renderer.config.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/.gitignore" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/package.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/src/renderer/assets/less/login.less" beforeDir="false" afterPath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/src/renderer/assets/less/login.less" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/src/renderer/components/Login.vue" beforeDir="false" afterPath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/src/renderer/components/Login.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/src/renderer/router/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/src/renderer/router/index.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnityLogin.json" beforeDir="false" afterPath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnityLogin.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" 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/data/EnityBigScreen.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/data/EnityBigScreen.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/assets/data/EnityButton.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/data/EnityButton.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/assets/data/EnityDevice.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/data/EnityDevice.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/assets/data/EnityIcon.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/data/EnityIcon.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/assets/data/EnityImage.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/data/EnityImage.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/assets/data/EnityLable.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/data/EnityLable.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/assets/data/EnityLogin.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/data/EnityLogin.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/assets/data/EnityMemory.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/data/EnityMemory.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/assets/data/EnitySignalPreviewList.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/data/EnitySignalPreviewList.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/assets/data/EnitySlider.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/data/EnitySlider.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/assets/data/EnitySystem.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/data/EnitySystem.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/assets/data/EnityTimer.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/data/EnityTimer.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/assets/data/EnityTopology.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/data/EnityTopology.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/assets/data/EnityTopologyConnection.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/data/EnityTopologyConnection.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/assets/data/EnityView.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/data/EnityView.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/assets/data/EnityWindow.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/data/EnityWindow.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/index.ejs" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.ejs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/renderer/assets/less/login.less" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/assets/less/login.less" 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/router/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/router/index.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/data/EnityBigScreen.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/EnityBigScreen.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/data/EnityButton.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/EnityButton.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/data/EnityDevice.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/EnityDevice.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/data/EnityIcon.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/EnityIcon.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/data/EnityImage.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/EnityImage.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/data/EnityLable.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/EnityLable.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/data/EnityLogin.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/EnityLogin.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/data/EnityMemory.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/EnityMemory.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/data/EnitySignalPreviewList.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/EnitySignalPreviewList.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/data/EnitySlider.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/EnitySlider.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/data/EnitySystem.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/EnitySystem.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/data/EnityTimer.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/EnityTimer.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/data/EnityTopology.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/EnityTopology.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/data/EnityTopologyConnection.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/EnityTopologyConnection.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/data/EnityView.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/EnityView.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/data/EnityWindow.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/EnityWindow.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yarn.lock" beforeDir="false" afterPath="$PROJECT_DIR$/yarn.lock" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/dist/" />
@@ -36,79 +47,25 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/renderer/components/Login.vue">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="84">
-              <caret line="80" selection-start-line="80" selection-end-line="80" />
-              <folding>
-                <element signature="n#template#0;n#!!top" />
-                <element signature="n#div#0;n#template#0;n#!!top" />
-                <element signature="n#header#0;n#div#0;n#template#0;n#!!top" />
-                <element signature="n#section#0;n#div#0;n#template#0;n#!!top" />
-                <element signature="n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
-                <element signature="n#el-form-item#0;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
-                <element signature="n#el-form-item#1;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
-                <element signature="n#el-form-item#2;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
-                <element signature="n#script#0;n#!!top" />
-                <element signature="e#1098#2724#0" />
-                <element signature="e#1115#1937#0" />
-                <element signature="e#1178#1299#0" />
-                <element signature="e#1208#1285#0" />
-                <element signature="e#1364#1482#0" />
-                <element signature="e#1400#1468#0" />
-                <element signature="e#1502#1927#0" />
-                <element signature="e#1530#1617#0" />
-                <element signature="e#1642#1913#0" />
-                <element signature="e#1674#1767#0" />
-                <element signature="e#1799#1895#0" />
-                <element signature="e#1957#2718#0" />
-                <element signature="e#1984#2607#0" />
-                <element signature="e#2098#2200#0" />
-                <element signature="e#2263#2516#0" />
-                <element signature="e#2521#2593#0" />
-                <element signature="e#2642#2708#0" />
-                <element signature="n#style#0;n#!!top" />
-                <element signature="e#2761#3868#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/package.json">
+        <entry file="file://$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="462">
-              <caret line="24" column="6" lean-forward="true" selection-start-line="24" selection-start-column="6" selection-end-line="24" selection-end-column="6" />
+            <state relative-caret-position="76">
+              <caret line="151" column="57" lean-forward="true" selection-start-line="151" selection-start-column="57" selection-end-line="151" selection-end-column="57" />
               <folding>
-                <element signature="n#!!block;n#directories#0;n#!!block;n#build#0;n#!!top" />
-                <element signature="e#1068#1102#0" />
-                <element signature="n#!!block;n#dmg#0;n#!!block;n#build#0;n#!!top" />
-                <element signature="e#1135#1350#0" />
-                <element signature="e#1145#1256#0" />
-                <element signature="e#1266#1342#0" />
-                <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" />
+                <element signature="e#1156#1362#0" />
+                <element signature="e#1224#1350#0" />
+                <element signature="e#1812#2130#0" />
+                <element signature="e#1898#2118#0" />
+                <element signature="e#2269#2356#0" />
+                <element signature="e#2490#2572#0" />
+                <element signature="e#2702#2790#0" />
+                <element signature="e#4283#4340#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$/src/renderer/assets/less/login.less">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="168">
-              <caret line="29" column="44" selection-start-line="29" selection-start-column="44" selection-end-line="29" selection-end-column="44" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -126,6 +83,10 @@
       <find>,</find>
       <find>app.setAppUserModelId</find>
       <find>&quot;win&quot;</find>
+      <find>asar</find>
+      <find>nodeModules</find>
+      <find>static</find>
+      <find>HtmlWebpackPlugin</find>
     </findStrings>
     <replaceStrings>
       <replace>class</replace>
@@ -141,15 +102,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/renderer/router/index.js" />
         <option value="$PROJECT_DIR$/src/renderer/utils/storageUtils.js" />
         <option value="$PROJECT_DIR$/src/renderer/store/getters.js" />
         <option value="$PROJECT_DIR$/src/utils/storageUtils.js" />
-        <option value="$PROJECT_DIR$/.gitignore" />
         <option value="$PROJECT_DIR$/src/renderer/index.css" />
-        <option value="$PROJECT_DIR$/src/index.ejs" />
         <option value="$PROJECT_DIR$/src/renderer/App.vue" />
-        <option value="$PROJECT_DIR$/src/renderer/main.js" />
         <option value="$PROJECT_DIR$/static/data/EnityLogin.Data" />
         <option value="$PROJECT_DIR$/static/data/EnityBigScreen.Data" />
         <option value="$PROJECT_DIR$/src/renderer/assets/data/EnityButton.json" />
@@ -165,8 +122,6 @@
         <option value="$PROJECT_DIR$/src/renderer/assets/data/EnityTopology.json" />
         <option value="$PROJECT_DIR$/src/renderer/assets/data/EnityTopologyConnection.json" />
         <option value="$PROJECT_DIR$/src/renderer/assets/data/EnityWindow.json" />
-        <option value="$PROJECT_DIR$/src/renderer/components/Login.vue" />
-        <option value="$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js" />
         <option value="$PROJECT_DIR$/src/renderer/assets/less/common.less" />
         <option value="$PROJECT_DIR$/src/renderer/assets/less/admin.less" />
         <option value="$PROJECT_DIR$/src/renderer/store/mutation-types.js" />
@@ -181,8 +136,15 @@
         <option value="$PROJECT_DIR$/src/renderer/components/Admin.vue" />
         <option value="$PROJECT_DIR$/src/renderer/components/modal/playertest.vue" />
         <option value="$PROJECT_DIR$/src/main/index.js" />
+        <option value="$PROJECT_DIR$/.gitignore" />
+        <option value="$PROJECT_DIR$/src/renderer/components/Login.vue" />
+        <option value="$PROJECT_DIR$/static/data/EnityLogin.json" />
+        <option value="$PROJECT_DIR$/src/renderer/main.js" />
+        <option value="$PROJECT_DIR$/src/renderer/router/index.js" />
         <option value="$PROJECT_DIR$/src/renderer/assets/less/login.less" />
         <option value="$PROJECT_DIR$/package.json" />
+        <option value="$PROJECT_DIR$/src/index.ejs" />
+        <option value="$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js" />
       </list>
     </option>
   </component>
@@ -208,6 +170,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="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>
           </expand>
           <select />
         </subPane>
@@ -286,12 +264,12 @@
       <workItem from="1586677292013" duration="11000" />
       <workItem from="1586767125442" duration="3838000" />
       <workItem from="1586784783881" duration="3017000" />
-      <workItem from="1586829063648" duration="3521000" />
+      <workItem from="1586829063648" duration="17921000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="134162000" />
+    <option name="totallyTimeSpent" value="148562000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -305,7 +283,7 @@
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.13804004" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.14278187" />
       <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" />
@@ -330,39 +308,8 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/renderer/main.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="12" column="38" lean-forward="true" selection-start-line="12" selection-start-column="38" selection-end-line="12" selection-end-column="38" />
-          <folding>
-            <element signature="e#0#21#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/static/data/EnitySystem.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/static/data/EnityTimer.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="15" column="1" selection-start-line="15" selection-start-column="1" selection-end-line="15" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/static/data/EnityTopology.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="7174">
-          <caret line="345" column="1" selection-start-line="345" selection-start-column="1" selection-end-line="345" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/EnityLogin.json" />
-    <entry file="file://$PROJECT_DIR$/static/data/EnitySlider.json">
+    <entry file="file://$PROJECT_DIR$/static/EnitySlider.json">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="21">
           <caret line="1" column="2" lean-forward="true" selection-start-line="1" selection-start-column="2" selection-end-line="1" selection-end-column="2" />
@@ -383,7 +330,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/data/EnityWindow.json">
+    <entry file="file://$PROJECT_DIR$/static/EnityWindow.json">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="21">
           <caret line="376" lean-forward="true" selection-start-line="376" selection-end-line="376" />
@@ -426,23 +373,16 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/data/EnityView.json">
+    <entry file="file://$PROJECT_DIR$/static/EnityView.json">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/data/EnityTopologyConnection.json">
+    <entry file="file://$PROJECT_DIR$/static/EnityTopologyConnection.json">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="8841">
           <caret line="421" column="1" selection-start-line="421" selection-start-column="1" selection-end-line="421" selection-end-column="1" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/App.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="189">
-          <caret line="9" column="3" lean-forward="true" selection-start-line="9" selection-start-column="3" selection-end-line="9" selection-end-column="3" />
-        </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="21">
@@ -645,7 +585,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/data/EnityButton.json">
+    <entry file="file://$PROJECT_DIR$/static/EnityButton.json">
       <provider selected="true" editor-type-id="text-editor">
         <state>
           <folding>
@@ -995,7 +935,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/data/EnityDevice.json">
+    <entry file="file://$PROJECT_DIR$/static/EnityDevice.json">
       <provider selected="true" editor-type-id="text-editor">
         <state>
           <caret line="8607" column="1" lean-forward="true" selection-start-line="8607" selection-start-column="1" selection-end-line="8607" selection-end-column="1" />
@@ -2575,7 +2515,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/data/EnityIcon.json">
+    <entry file="file://$PROJECT_DIR$/static/EnityIcon.json">
       <provider selected="true" editor-type-id="text-editor">
         <state>
           <folding>
@@ -3419,7 +3359,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/data/EnityImage.json">
+    <entry file="file://$PROJECT_DIR$/static/EnityImage.json">
       <provider selected="true" editor-type-id="text-editor">
         <state>
           <folding>
@@ -3435,7 +3375,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/data/EnityLable.json">
+    <entry file="file://$PROJECT_DIR$/static/EnityLable.json">
       <provider selected="true" editor-type-id="text-editor">
         <state>
           <folding>
@@ -3459,14 +3399,14 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/data/EnityMemory.json">
+    <entry file="file://$PROJECT_DIR$/static/EnityMemory.json">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="252">
           <caret line="12" column="3" lean-forward="true" selection-start-line="12" selection-start-column="3" selection-end-line="12" selection-end-column="3" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/data/EnitySignalPreviewList.json">
+    <entry file="file://$PROJECT_DIR$/static/EnitySignalPreviewList.json">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="336">
           <caret line="92" column="14" lean-forward="true" selection-start-line="92" selection-start-column="14" selection-end-line="92" selection-end-column="14" />
@@ -3506,62 +3446,84 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.electron-vue/webpack.main.config.js">
+    <entry file="file://$PROJECT_DIR$/.electron-vue/webpack.web.config.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-336">
-          <caret line="17" column="11" selection-start-line="17" selection-start-column="11" selection-end-line="17" selection-end-column="11" />
+        <state relative-caret-position="223">
+          <caret line="106" selection-start-line="106" selection-end-line="106" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js">
+    <entry file="file://$PROJECT_DIR$/src/renderer/assets/images/bg.jpg">
+      <provider selected="true" editor-type-id="images" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/dist/electron/main.js">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.gitignore">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2100">
-          <caret line="32" column="12" selection-start-line="32" selection-start-column="12" selection-end-line="32" selection-end-column="12" />
+        <state relative-caret-position="147">
+          <caret line="7" column="13" lean-forward="true" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.electron-vue/webpack.web.config.js">
+    <entry file="file://$PROJECT_DIR$/build/icons/icon.ico">
+      <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/256x256.png">
+      <provider selected="true" editor-type-id="images" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/index.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="223">
-          <caret line="106" selection-start-line="106" selection-end-line="106" />
+        <state relative-caret-position="168">
+          <caret line="13" column="36" lean-forward="true" selection-start-line="13" selection-start-column="36" selection-end-line="13" selection-end-column="36" />
+          <folding>
+            <element signature="e#47#193#0" />
+            <element signature="e#238#327#0" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.electron-vue/build.js">
+    <entry file="file://$PROJECT_DIR$/.electron-vue/webpack.main.config.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1415">
-          <caret line="27" column="31" selection-start-line="27" selection-start-column="31" selection-end-line="27" selection-end-column="31" />
+        <state relative-caret-position="-386">
+          <caret line="17" column="11" selection-start-line="17" selection-start-column="11" selection-end-line="17" selection-end-column="11" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/index.ejs">
+    <entry file="file://$PROJECT_DIR$/.electron-vue/build.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="15" column="7" selection-start-line="15" selection-start-column="7" selection-end-line="15" selection-end-column="7" />
+        <state relative-caret-position="252">
+          <caret line="30" selection-start-line="30" selection-end-line="30" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/index.js">
+    <entry file="file://$PROJECT_DIR$/src/renderer/router/index.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="819">
-          <caret line="44" column="2" selection-start-line="44" selection-start-column="2" selection-end-line="44" selection-end-column="2" />
+        <state relative-caret-position="504">
+          <caret line="24" column="2" selection-start-line="24" selection-start-column="2" selection-end-line="24" selection-end-column="2" />
           <folding>
-            <element signature="e#47#193#0" />
-            <element signature="e#238#327#0" />
+            <element signature="e#0#21#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/build/icons/icon.icns">
-      <provider selected="true" editor-type-id="images" />
+    <entry file="file://$PROJECT_DIR$/dist/electron/static/data/EnityLogin.json">
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/build/icons/256x256.png">
-      <provider selected="true" editor-type-id="images" />
+    <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/login.less">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1029">
+          <caret line="49" column="8" lean-forward="true" selection-start-line="49" selection-start-column="8" selection-end-line="49" selection-end-column="8" />
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/data/EnityBigScreen.json">
+    <entry file="file://$PROJECT_DIR$/static/EnityBigScreen.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="189">
-          <caret line="9" column="13" lean-forward="true" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
+        <state relative-caret-position="378">
+          <caret line="18" column="30" lean-forward="true" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
           <folding>
             <element signature="e#1390#3941#0" />
             <element signature="e#1404#1567#0" />
@@ -3588,27 +3550,17 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/data/EnityLogin.json">
+    <entry file="file://$PROJECT_DIR$/static/EnityLogin.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="693">
-          <caret line="35" lean-forward="true" selection-start-line="35" selection-end-line="35" />
-          <folding>
-            <element signature="e#423#435#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/login.less">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="29" column="44" selection-start-line="29" selection-start-column="44" selection-end-line="29" selection-end-column="44" />
+        <state relative-caret-position="315">
+          <caret line="15" column="32" lean-forward="true" selection-start-line="15" selection-start-column="32" selection-end-line="15" selection-end-column="32" />
         </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="84">
-          <caret line="80" selection-start-line="80" selection-end-line="80" />
+        <state relative-caret-position="105">
+          <caret line="128" column="8" lean-forward="true" selection-start-line="128" selection-start-column="8" selection-end-line="128" selection-end-column="8" />
           <folding>
             <element signature="n#template#0;n#!!top" />
             <element signature="n#div#0;n#template#0;n#!!top" />
@@ -3619,52 +3571,84 @@
             <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#1098#2724#0" />
-            <element signature="e#1115#1937#0" />
-            <element signature="e#1178#1299#0" />
-            <element signature="e#1208#1285#0" />
-            <element signature="e#1364#1482#0" />
-            <element signature="e#1400#1468#0" />
-            <element signature="e#1502#1927#0" />
-            <element signature="e#1530#1617#0" />
-            <element signature="e#1642#1913#0" />
-            <element signature="e#1674#1767#0" />
-            <element signature="e#1799#1895#0" />
-            <element signature="e#1957#2718#0" />
-            <element signature="e#1984#2607#0" />
-            <element signature="e#2098#2200#0" />
-            <element signature="e#2263#2516#0" />
-            <element signature="e#2521#2593#0" />
-            <element signature="e#2642#2708#0" />
+            <element signature="e#1207#2860#0" />
+            <element signature="e#1224#2073#0" />
+            <element signature="e#1287#1408#0" />
+            <element signature="e#1317#1394#0" />
+            <element signature="e#1473#1591#0" />
+            <element signature="e#1509#1577#0" />
+            <element signature="e#1611#2063#0" />
+            <element signature="e#1639#1726#0" />
+            <element signature="e#1751#2022#0" />
+            <element signature="e#1783#1876#0" />
+            <element signature="e#1908#2004#0" />
+            <element signature="e#2093#2854#0" />
+            <element signature="e#2120#2743#0" />
+            <element signature="e#2234#2336#0" />
+            <element signature="e#2399#2652#0" />
+            <element signature="e#2657#2729#0" />
+            <element signature="e#2778#2844#0" />
             <element signature="n#style#0;n#!!top" />
-            <element signature="e#2761#3868#0" />
+            <element signature="e#2897#4004#0" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/assets/images/bg.jpg">
-      <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 file="file://$PROJECT_DIR$/src/renderer/App.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="21">
+          <caret line="1" column="16" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/dist/electron/main.js">
-      <provider selected="true" editor-type-id="text-editor" />
+    <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$/package.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="462">
-          <caret line="24" column="6" lean-forward="true" selection-start-line="24" selection-start-column="6" selection-end-line="24" selection-end-column="6" />
+        <state relative-caret-position="315">
+          <caret line="59" column="27" lean-forward="true" selection-start-line="59" selection-start-column="27" selection-end-line="59" selection-end-column="27" />
           <folding>
+            <element signature="n#!!block;n#scripts#0;n#!!top" />
+            <element signature="n#!!block;n#build#0;n#!!top" />
             <element signature="n#!!block;n#directories#0;n#!!block;n#build#0;n#!!top" />
-            <element signature="e#1068#1102#0" />
+            <element signature="e#1163#1197#0" />
             <element signature="n#!!block;n#dmg#0;n#!!block;n#build#0;n#!!top" />
-            <element signature="e#1135#1350#0" />
-            <element signature="e#1145#1256#0" />
-            <element signature="e#1266#1342#0" />
+            <element signature="e#1230#1445#0" />
+            <element signature="e#1240#1351#0" />
+            <element signature="e#1361#1437#0" />
             <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" />
+            <element signature="n#!!block;n#devDependencies#0;n#!!top" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/index.ejs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="84">
+          <caret line="4" column="28" lean-forward="true" selection-start-line="4" selection-start-column="28" selection-end-line="4" selection-end-column="28" />
+        </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="76">
+          <caret line="151" column="57" lean-forward="true" selection-start-line="151" selection-start-column="57" selection-end-line="151" selection-end-column="57" />
+          <folding>
+            <element signature="e#1156#1362#0" />
+            <element signature="e#1224#1350#0" />
+            <element signature="e#1812#2130#0" />
+            <element signature="e#1898#2118#0" />
+            <element signature="e#2269#2356#0" />
+            <element signature="e#2490#2572#0" />
+            <element signature="e#2702#2790#0" />
+            <element signature="e#4283#4340#0" />
           </folding>
         </state>
       </provider>

outApp/HelloWorld-win32-x64/resources/app/.electron-vue/webpack.renderer.config.js

@@ -118,9 +118,9 @@ let rendererConfig = {
         removeAttributeQuotes: true,
         removeComments: true
       },
-      nodeModules: process.env.NODE_ENV !== 'production'
+      /*nodeModules: process.env.NODE_ENV !== 'production'
         ? path.resolve(__dirname, '../node_modules')
-        : false
+        : false*/
     }),
     new webpack.HotModuleReplacementPlugin(),
     new webpack.NoEmitOnErrorsPlugin()
@@ -133,7 +133,8 @@ let rendererConfig = {
   resolve: {
     alias: {
       '@': path.join(__dirname, '../src/renderer'),
-      'vue$': 'vue/dist/vue.esm.js'
+      'vue$': 'vue/dist/vue.esm.js',
+      'static':path.resolve(_dirname,'../static')
     },
     extensions: ['.js', '.vue', '.json', '.css', '.node']
   },

outApp/HelloWorld-win32-x64/resources/app/.gitignore

@@ -1,5 +1,6 @@
 .DS_Store
 dist
+outApp
 dist/electron/*
 dist/web/*
 build/*

outApp/HelloWorld-win32-x64/resources/app/.idea/workspace.xml

@@ -2,27 +2,21 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="690c02a3-0e7d-4c4a-8f0c-a44c44c3a162" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js" beforeDir="false" afterPath="$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/.electron-vue/webpack.renderer.config.js" beforeDir="false" afterPath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/.electron-vue/webpack.renderer.config.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/.gitignore" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/package.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/src/renderer/assets/less/login.less" beforeDir="false" afterPath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/src/renderer/assets/less/login.less" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/src/renderer/components/Login.vue" beforeDir="false" afterPath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/src/renderer/components/Login.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/src/renderer/router/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/src/renderer/router/index.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnityLogin.json" beforeDir="false" afterPath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnityLogin.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" 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/data/EnityBigScreen.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/data/EnityBigScreen.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/assets/data/EnityButton.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/data/EnityButton.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/assets/data/EnityDevice.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/data/EnityDevice.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/assets/data/EnityIcon.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/data/EnityIcon.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/assets/data/EnityImage.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/data/EnityImage.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/assets/data/EnityLable.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/data/EnityLable.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/assets/data/EnityLogin.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/data/EnityLogin.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/assets/data/EnityMemory.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/data/EnityMemory.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/assets/data/EnitySignalPreviewList.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/data/EnitySignalPreviewList.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/assets/data/EnitySlider.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/data/EnitySlider.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/assets/data/EnitySystem.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/data/EnitySystem.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/assets/data/EnityTimer.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/data/EnityTimer.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/assets/data/EnityTopology.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/data/EnityTopology.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/assets/data/EnityTopologyConnection.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/data/EnityTopologyConnection.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/assets/data/EnityView.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/data/EnityView.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/assets/data/EnityWindow.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/data/EnityWindow.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/renderer/assets/less/login.less" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/assets/less/login.less" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yarn.lock" beforeDir="false" afterPath="$PROJECT_DIR$/yarn.lock" 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/router/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/router/index.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/data/EnityLogin.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/data/EnityLogin.json" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/dist/" />
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -36,79 +30,51 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/renderer/components/Login.vue">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="84">
-              <caret line="80" selection-start-line="80" selection-end-line="80" />
-              <folding>
-                <element signature="n#template#0;n#!!top" />
-                <element signature="n#div#0;n#template#0;n#!!top" />
-                <element signature="n#header#0;n#div#0;n#template#0;n#!!top" />
-                <element signature="n#section#0;n#div#0;n#template#0;n#!!top" />
-                <element signature="n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
-                <element signature="n#el-form-item#0;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
-                <element signature="n#el-form-item#1;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
-                <element signature="n#el-form-item#2;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
-                <element signature="n#script#0;n#!!top" />
-                <element signature="e#1098#2724#0" />
-                <element signature="e#1115#1937#0" />
-                <element signature="e#1178#1299#0" />
-                <element signature="e#1208#1285#0" />
-                <element signature="e#1364#1482#0" />
-                <element signature="e#1400#1468#0" />
-                <element signature="e#1502#1927#0" />
-                <element signature="e#1530#1617#0" />
-                <element signature="e#1642#1913#0" />
-                <element signature="e#1674#1767#0" />
-                <element signature="e#1799#1895#0" />
-                <element signature="e#1957#2718#0" />
-                <element signature="e#1984#2607#0" />
-                <element signature="e#2098#2200#0" />
-                <element signature="e#2263#2516#0" />
-                <element signature="e#2521#2593#0" />
-                <element signature="e#2642#2708#0" />
-                <element signature="n#style#0;n#!!top" />
-                <element signature="e#2761#3868#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/package.json">
+        <entry file="file://$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="357">
-              <caret line="17" column="58" selection-start-line="17" selection-start-column="58" selection-end-line="17" selection-end-column="58" />
+            <state relative-caret-position="528">
+              <caret line="136" column="49" lean-forward="true" selection-start-line="136" selection-start-column="49" selection-end-line="136" selection-end-column="49" />
               <folding>
-                <element signature="n#!!block;n#directories#0;n#!!block;n#build#0;n#!!top" />
-                <element signature="e#1068#1102#0" />
-                <element signature="n#!!block;n#dmg#0;n#!!block;n#build#0;n#!!top" />
-                <element signature="e#1135#1350#0" />
-                <element signature="e#1145#1256#0" />
-                <element signature="e#1266#1342#0" />
-                <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" />
+                <element signature="e#456#741#0" />
+                <element signature="e#852#919#0" />
+                <element signature="e#934#1023#0" />
+                <element signature="e#1388#1469#0" />
+                <element signature="e#1477#1542#0" />
+                <element signature="e#1550#1643#0" />
+                <element signature="e#1651#1712#0" />
+                <element signature="e#1720#2148#0" />
+                <element signature="e#1759#2140#0" />
+                <element signature="e#1812#2130#0" />
+                <element signature="e#1898#2118#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#2828#2941#0" />
+                <element signature="e#2954#3509#0" />
+                <element signature="e#3065#3418#0" />
+                <element signature="e#3172#3281#0" />
+                <element signature="e#3289#3412#0" />
+                <element signature="e#3521#3636#0" />
+                <element signature="e#3855#3912#0" />
+                <element signature="e#3956#4114#0" />
+                <element signature="e#4018#4107#0" />
+                <element signature="e#4116#4172#0" />
+                <element signature="e#4216#4644#0" />
+                <element signature="e#4330#4486#0" />
+                <element signature="e#4338#4480#0" />
+                <element signature="e#4518#4570#0" />
+                <element signature="e#4609#4637#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$/src/renderer/assets/less/login.less">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="168">
-              <caret line="29" column="44" selection-start-line="29" selection-start-column="44" selection-end-line="29" selection-end-column="44" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -126,6 +92,8 @@
       <find>,</find>
       <find>app.setAppUserModelId</find>
       <find>&quot;win&quot;</find>
+      <find>asar</find>
+      <find>nodeModules</find>
     </findStrings>
     <replaceStrings>
       <replace>class</replace>
@@ -141,15 +109,12 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/renderer/router/index.js" />
         <option value="$PROJECT_DIR$/src/renderer/utils/storageUtils.js" />
         <option value="$PROJECT_DIR$/src/renderer/store/getters.js" />
         <option value="$PROJECT_DIR$/src/utils/storageUtils.js" />
-        <option value="$PROJECT_DIR$/.gitignore" />
         <option value="$PROJECT_DIR$/src/renderer/index.css" />
         <option value="$PROJECT_DIR$/src/index.ejs" />
         <option value="$PROJECT_DIR$/src/renderer/App.vue" />
-        <option value="$PROJECT_DIR$/src/renderer/main.js" />
         <option value="$PROJECT_DIR$/static/data/EnityLogin.Data" />
         <option value="$PROJECT_DIR$/static/data/EnityBigScreen.Data" />
         <option value="$PROJECT_DIR$/src/renderer/assets/data/EnityButton.json" />
@@ -165,8 +130,6 @@
         <option value="$PROJECT_DIR$/src/renderer/assets/data/EnityTopology.json" />
         <option value="$PROJECT_DIR$/src/renderer/assets/data/EnityTopologyConnection.json" />
         <option value="$PROJECT_DIR$/src/renderer/assets/data/EnityWindow.json" />
-        <option value="$PROJECT_DIR$/src/renderer/components/Login.vue" />
-        <option value="$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js" />
         <option value="$PROJECT_DIR$/src/renderer/assets/less/common.less" />
         <option value="$PROJECT_DIR$/src/renderer/assets/less/admin.less" />
         <option value="$PROJECT_DIR$/src/renderer/store/mutation-types.js" />
@@ -181,8 +144,14 @@
         <option value="$PROJECT_DIR$/src/renderer/components/Admin.vue" />
         <option value="$PROJECT_DIR$/src/renderer/components/modal/playertest.vue" />
         <option value="$PROJECT_DIR$/src/main/index.js" />
+        <option value="$PROJECT_DIR$/.gitignore" />
         <option value="$PROJECT_DIR$/src/renderer/assets/less/login.less" />
+        <option value="$PROJECT_DIR$/src/renderer/components/Login.vue" />
+        <option value="$PROJECT_DIR$/static/data/EnityLogin.json" />
+        <option value="$PROJECT_DIR$/src/renderer/main.js" />
+        <option value="$PROJECT_DIR$/src/renderer/router/index.js" />
         <option value="$PROJECT_DIR$/package.json" />
+        <option value="$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js" />
       </list>
     </option>
   </component>
@@ -208,6 +177,16 @@
               <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="src" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -286,12 +265,12 @@
       <workItem from="1586677292013" duration="11000" />
       <workItem from="1586767125442" duration="3838000" />
       <workItem from="1586784783881" duration="3017000" />
-      <workItem from="1586829063648" duration="3230000" />
+      <workItem from="1586829063648" duration="15768000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="133871000" />
+    <option name="totallyTimeSpent" value="146409000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -306,7 +285,7 @@
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.13804004" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14278187" />
       <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" />
@@ -320,7 +299,7 @@
       <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Version Control" order="8" />
       <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.52063495" />
+      <window_info anchor="bottom" id="Terminal" order="10" weight="0.4920635" />
       <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" />
@@ -331,37 +310,6 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/renderer/main.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="12" column="38" lean-forward="true" selection-start-line="12" selection-start-column="38" selection-end-line="12" selection-end-column="38" />
-          <folding>
-            <element signature="e#0#21#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/static/data/EnitySystem.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/static/data/EnityTimer.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="15" column="1" selection-start-line="15" selection-start-column="1" selection-end-line="15" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/static/data/EnityTopology.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="7174">
-          <caret line="345" column="1" selection-start-line="345" selection-start-column="1" selection-end-line="345" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/EnityLogin.json" />
     <entry file="file://$PROJECT_DIR$/static/data/EnitySlider.json">
       <provider selected="true" editor-type-id="text-editor">
@@ -437,13 +385,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="189">
-          <caret line="9" column="3" lean-forward="true" selection-start-line="9" selection-start-column="3" selection-end-line="9" selection-end-column="3" />
-        </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="21">
@@ -3507,20 +3448,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.electron-vue/webpack.main.config.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-336">
-          <caret line="17" column="11" selection-start-line="17" selection-start-column="11" selection-end-line="17" selection-end-column="11" />
-        </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="-2100">
-          <caret line="32" column="12" selection-start-line="32" selection-start-column="12" selection-end-line="32" selection-end-column="12" />
-        </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="223">
@@ -3528,13 +3455,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.electron-vue/build.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1415">
-          <caret line="27" column="31" selection-start-line="27" selection-start-column="31" selection-end-line="27" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/index.ejs">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="315">
@@ -3542,23 +3462,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="819">
-          <caret line="44" column="2" selection-start-line="44" selection-start-column="2" selection-end-line="44" selection-end-column="2" />
-          <folding>
-            <element signature="e#47#193#0" />
-            <element signature="e#238#327#0" />
-          </folding>
-        </state>
-      </provider>
-    </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/256x256.png">
-      <provider selected="true" editor-type-id="images" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/static/data/EnityBigScreen.json">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="189">
@@ -3589,10 +3492,23 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/assets/images/bg.jpg">
+      <provider selected="true" editor-type-id="images" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/dist/electron/main.js">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.gitignore">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="147">
+          <caret line="7" column="13" lean-forward="true" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/static/data/EnityLogin.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="693">
-          <caret line="35" lean-forward="true" selection-start-line="35" selection-end-line="35" />
+        <state relative-caret-position="315">
+          <caret line="17" column="10" lean-forward="true" selection-start-line="17" selection-start-column="10" selection-end-line="17" selection-end-column="10" />
           <folding>
             <element signature="e#423#435#0" />
           </folding>
@@ -3601,71 +3517,143 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/login.less">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="29" column="44" selection-start-line="29" selection-start-column="44" selection-end-line="29" selection-end-column="44" />
+        <state relative-caret-position="357">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/components/Login.vue">
+    <entry file="file://$PROJECT_DIR$/build/icons/icon.ico">
+      <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/256x256.png">
+      <provider selected="true" editor-type-id="images" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/App.vue">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="84">
-          <caret line="80" selection-start-line="80" selection-end-line="80" />
+          <caret line="4" column="11" lean-forward="true" selection-start-line="4" selection-start-column="11" selection-end-line="4" selection-end-column="11" />
+        </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="231">
+          <caret line="22" column="10" lean-forward="true" selection-start-line="22" selection-start-column="10" selection-end-line="22" selection-end-column="10" />
           <folding>
-            <element signature="n#template#0;n#!!top" />
-            <element signature="n#div#0;n#template#0;n#!!top" />
-            <element signature="n#header#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="n#section#0;n#div#0;n#template#0;n#!!top" />
             <element signature="n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
             <element signature="n#el-form-item#0;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
             <element signature="n#el-form-item#1;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
             <element signature="n#el-form-item#2;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="n#script#0;n#!!top" />
-            <element signature="e#1098#2724#0" />
-            <element signature="e#1115#1937#0" />
-            <element signature="e#1178#1299#0" />
-            <element signature="e#1208#1285#0" />
-            <element signature="e#1364#1482#0" />
-            <element signature="e#1400#1468#0" />
-            <element signature="e#1502#1927#0" />
-            <element signature="e#1530#1617#0" />
-            <element signature="e#1642#1913#0" />
-            <element signature="e#1674#1767#0" />
-            <element signature="e#1799#1895#0" />
-            <element signature="e#1957#2718#0" />
-            <element signature="e#1984#2607#0" />
-            <element signature="e#2098#2200#0" />
-            <element signature="e#2263#2516#0" />
-            <element signature="e#2521#2593#0" />
-            <element signature="e#2642#2708#0" />
-            <element signature="n#style#0;n#!!top" />
-            <element signature="e#2761#3868#0" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/dist/electron/main.js">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/src/renderer/main.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="189">
+          <caret line="9" column="18" selection-start-line="9" selection-start-column="18" selection-end-line="9" selection-end-column="18" />
+          <folding>
+            <element signature="e#0#21#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/assets/images/bg.jpg">
-      <provider selected="true" editor-type-id="images" />
+    <entry file="file://$PROJECT_DIR$/src/main/index.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="168">
+          <caret line="13" column="36" lean-forward="true" selection-start-line="13" selection-start-column="36" selection-end-line="13" selection-end-column="36" />
+          <folding>
+            <element signature="e#47#193#0" />
+            <element signature="e#238#327#0" />
+          </folding>
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/build/icons/icon.ico">
-      <provider selected="true" editor-type-id="images" />
+    <entry file="file://$PROJECT_DIR$/.electron-vue/webpack.main.config.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-386">
+          <caret line="17" column="11" selection-start-line="17" selection-start-column="11" selection-end-line="17" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.electron-vue/build.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="30" selection-start-line="30" selection-end-line="30" />
+        </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="504">
+          <caret line="24" column="2" selection-start-line="24" selection-start-column="2" selection-end-line="24" selection-end-column="2" />
+          <folding>
+            <element signature="e#0#21#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/dist/electron/static/data/EnityLogin.json">
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
     <entry file="file://$PROJECT_DIR$/package.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="17" column="58" selection-start-line="17" selection-start-column="58" selection-end-line="17" selection-end-column="58" />
+        <state relative-caret-position="441">
+          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
           <folding>
-            <element signature="n#!!block;n#directories#0;n#!!block;n#build#0;n#!!top" />
-            <element signature="e#1068#1102#0" />
-            <element signature="n#!!block;n#dmg#0;n#!!block;n#build#0;n#!!top" />
-            <element signature="e#1135#1350#0" />
-            <element signature="e#1145#1256#0" />
-            <element signature="e#1266#1342#0" />
+            <element signature="e#1264#1375#0" />
+            <element signature="e#1385#1461#0" />
             <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" />
+            <element signature="n#!!block;n#dependencies#0;n#!!top" />
+            <element signature="n#!!block;n#devDependencies#0;n#!!top" />
+          </folding>
+        </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="528">
+          <caret line="136" column="49" lean-forward="true" selection-start-line="136" selection-start-column="49" selection-end-line="136" selection-end-column="49" />
+          <folding>
+            <element signature="e#456#741#0" />
+            <element signature="e#852#919#0" />
+            <element signature="e#934#1023#0" />
+            <element signature="e#1388#1469#0" />
+            <element signature="e#1477#1542#0" />
+            <element signature="e#1550#1643#0" />
+            <element signature="e#1651#1712#0" />
+            <element signature="e#1720#2148#0" />
+            <element signature="e#1759#2140#0" />
+            <element signature="e#1812#2130#0" />
+            <element signature="e#1898#2118#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#2828#2941#0" />
+            <element signature="e#2954#3509#0" />
+            <element signature="e#3065#3418#0" />
+            <element signature="e#3172#3281#0" />
+            <element signature="e#3289#3412#0" />
+            <element signature="e#3521#3636#0" />
+            <element signature="e#3855#3912#0" />
+            <element signature="e#3956#4114#0" />
+            <element signature="e#4018#4107#0" />
+            <element signature="e#4116#4172#0" />
+            <element signature="e#4216#4644#0" />
+            <element signature="e#4330#4486#0" />
+            <element signature="e#4338#4480#0" />
+            <element signature="e#4518#4570#0" />
+            <element signature="e#4609#4637#0" />
           </folding>
         </state>
       </provider>

outApp/HelloWorld-win32-x64/resources/app/package.json

@@ -15,11 +15,11 @@
     "pack:main": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.main.config.js",
     "pack:renderer": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.renderer.config.js",
     "postinstall": "",
-    "packager": "electron-packager ./ HelloWorld --windows --out ./outApp  --overwrite --icon=./build/icons/icon.ico"
+    "packager": "electron-packager ./ HelloWorld --win=x64 --out ./outApp  --overwrite --icon=./build/icons/icon.ico"
   },
   "build": {
-    "productName": "dispersedvedio_managesystem",
-    "appId": "com.example.分布式视频管理系统",
+    "productName": "vedio_app",
+    "appId": "com.example.app",
     "directories": {
       "output": "build"
     },

outApp/HelloWorld-win32-x64/resources/app/src/renderer/assets/less/login.less

@@ -19,7 +19,7 @@
 .login {
   width: 100%;
   height: 980px;
-  background-color: @BrackgroupStr;
+  //background-color: @BrackgroupStr;
   background-size: 100% 100%;
   position: relative;
 

outApp/HelloWorld-win32-x64/resources/app/src/renderer/components/Login.vue

@@ -1,7 +1,7 @@
 <!--登录界面-->
 <template>
     <div class="login">
-        <header class="login-header">
+        <header class="login-header" :style="{background:loginJson[0].BrackgroupStr}">
             <h1>分布式视频处理系统</h1>
         </header>
 
@@ -25,6 +25,7 @@
 
 <script>
     import '../assets/less/login.less'
+    import loginJson from '../../../static/data/EnityLogin'
 
     export default {
         data() {
@@ -50,7 +51,8 @@
                     password: [
                         { validator: validatePasswrod, trigger: 'blur' }
                     ]
-                }
+                },
+                loginJson
             }
         },
 

outApp/HelloWorld-win32-x64/resources/app/src/renderer/router/index.js

@@ -7,6 +7,7 @@ import Admin from '../components/Admin'
 Vue.use(Router)
 
 export default new Router({
+  mode:'hash',
   routes: [
     {
       path: '/login',

outApp/HelloWorld-win32-x64/resources/app/static/data/EnityLogin.json

@@ -4,7 +4,7 @@
         "BorderStr":"#FFFFFFFF",
         "ForegroundStr":"#FFD6D6D6",
         "BTNForegroundStr":"#FF000000",
-        "BrackgroupStr":"#FF03A9F4",
+        "BrackgroupStr":"#00ff00",
         "BackIconObjID":"",
         "BackIcon":null,
         "ActionIconObjID":"",

package.json

@@ -15,11 +15,11 @@
     "pack:main": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.main.config.js",
     "pack:renderer": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.renderer.config.js",
     "postinstall": "",
-    "packager": "electron-packager ./ HelloWorld --windows --out ./outApp  --overwrite --icon=./build/icons/icon.ico"
+    "packager": "electron-packager ./ HelloWorld --win=x64 --out ./outApp  --overwrite --icon=./build/icons/icon.ico"
   },
   "build": {
-    "productName": "dispersedvedio_managesystem",
-    "appId": "com.example.分布式视频管理系统",
+    "productName": "vedio_app",
+    "appId": "com.example.app",
     "directories": {
       "output": "build"
     },
@@ -52,8 +52,8 @@
     }
   },
   "dependencies": {
-    "axios": "^0.18.0",
     "element-ui": "^2.13.0",
+    "axios": "^0.19.2",
     "pubsub-js": "^1.7.0",
     "vue": "^2.5.16",
     "vue-electron": "^1.0.6",

src/index.ejs

@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <title>electron-app</title>
+    <title>vedio_app</title>
     <% if (htmlWebpackPlugin.options.nodeModules) { %>
       <!-- Add `node_modules/` to global paths so `require` works properly in development -->
       <script>

src/renderer/assets/less/login.less

@@ -19,7 +19,7 @@
 .login {
   width: 100%;
   height: 980px;
-  background-color: @BrackgroupStr;
+  //background-color: @BrackgroupStr;
   background-size: 100% 100%;
   position: relative;
 

src/renderer/components/Login.vue

@@ -1,7 +1,7 @@
 <!--登录界面-->
 <template>
     <div class="login">
-        <header class="login-header">
+        <header class="login-header" :style="{background:loginJson[0].BrackgroupStr}">
             <h1>分布式视频处理系统</h1>
         </header>
 
@@ -25,6 +25,7 @@
 
 <script>
     import '../assets/less/login.less'
+    import loginJson from '../../../static/EnityLogin'
 
     export default {
         data() {
@@ -50,7 +51,8 @@
                     password: [
                         { validator: validatePasswrod, trigger: 'blur' }
                     ]
-                }
+                },
+                loginJson
             }
         },
 

src/renderer/router/index.js

@@ -7,6 +7,7 @@ import Admin from '../components/Admin'
 Vue.use(Router)
 
 export default new Router({
+  mode:'hash',
   routes: [
     {
       path: '/login',

static/data/EnityLogin.json

@@ -4,7 +4,7 @@
         "BorderStr":"#FFFFFFFF",
         "ForegroundStr":"#FFD6D6D6",
         "BTNForegroundStr":"#FF000000",
-        "BrackgroupStr":"#FF03A9F4",
+        "BrackgroupStr":"#ff0000",
         "BackIconObjID":"",
         "BackIcon":null,
         "ActionIconObjID":"",

yarn.lock

@@ -595,13 +595,12 @@ aws4@^1.8.0:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e"
   integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==
 
-axios@^0.18.0:
-  version "0.18.1"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.1.tgz#ff3f0de2e7b5d180e757ad98000f1081b87bcea3"
-  integrity sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==
+axios@^0.19.2:
+  version "0.19.2"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27"
+  integrity sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==
   dependencies:
     follow-redirects "1.5.10"
-    is-buffer "^2.0.2"
 
 babel-code-frame@^6.26.0:
   version "6.26.0"
@@ -4609,11 +4608,6 @@ is-buffer@^1.0.2, is-buffer@^1.1.5:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
-is-buffer@^2.0.2:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623"
-  integrity sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==
-
 is-callable@^1.1.4, is-callable@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"