Browse Source

解决打包后动态加载json的问题测试1

liuwei 4 years ago
parent
commit
0159050908

+ 225 - 286
.idea/workspace.xml

@@ -4,14 +4,10 @@
     <list default="true" id="690c02a3-0e7d-4c4a-8f0c-a44c44c3a162" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/index.ejs" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.ejs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/App.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/App.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/api/ajax.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/api/ajax.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/api/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/api/index.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/index.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/renderer/assets/less/mainpage.less" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/assets/less/mainpage.less" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/renderer/components/Admin.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/components/Admin.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/components/BigShow.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/components/BigShow.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/components/Login.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/components/Login.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/store/actions.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/store/actions.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/renderer/store/state.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/store/state.js" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/dist/" />
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -24,101 +20,7 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/renderer/components/BigShow.vue">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="608">
-              <caret line="157" column="32" lean-forward="true" selection-start-line="157" selection-start-column="32" selection-end-line="157" selection-end-column="32" />
-              <folding>
-                <element signature="e#1067#1096#0" expanded="true" />
-                <element signature="e#2218#3457#0" />
-                <element signature="e#3588#3892#0" />
-                <element signature="e#3921#4055#0" />
-                <element signature="n#style#0;n#!!top" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/renderer/components/Button.vue">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="251">
-              <caret line="172" column="55" lean-forward="true" selection-start-line="172" selection-start-column="55" selection-end-line="172" selection-end-column="55" />
-              <folding>
-                <element signature="n#template#0;n#!!top" />
-                <element signature="e#2554#2670#0" />
-                <element signature="e#3249#3732#0" />
-                <element signature="e#3297#3490#0" />
-                <element signature="e#3496#3687#0" />
-                <element signature="e#3838#4984#0" />
-                <element signature="e#3883#4077#0" />
-                <element signature="e#4108#4402#0" />
-                <element signature="e#4666#4938#0" />
-                <element signature="e#4749#4829#0" />
-                <element signature="e#4835#4916#0" />
-                <element signature="e#5113#5848#0" />
-                <element signature="e#5158#5352#0" />
-                <element signature="e#5382#5674#0" />
-                <element signature="e#6057#7973#0" />
-                <element signature="e#6133#6327#0" />
-                <element signature="e#6358#6652#0" />
-                <element signature="e#6807#6817#0" />
-                <element signature="e#6913#7185#0" />
-                <element signature="e#6996#7076#0" />
-                <element signature="e#7082#7163#0" />
-                <element signature="e#7283#7555#0" />
-                <element signature="e#7366#7446#0" />
-                <element signature="e#7452#7533#0" />
-                <element signature="e#7655#7927#0" />
-                <element signature="e#7738#7818#0" />
-                <element signature="e#7824#7905#0" />
-                <element signature="e#9404#10145#0" />
-                <element signature="e#9449#9643#0" />
-                <element signature="e#9673#9967#0" />
-                <element signature="e#10248#10708#0" />
-                <element signature="e#10292#10490#0" />
-                <element signature="e#10495#10690#0" />
-                <element signature="e#10795#11745#0" />
-                <element signature="e#10891#11049#0" />
-                <element signature="e#11112#11270#0" />
-                <element signature="e#11333#11491#0" />
-                <element signature="e#11547#11708#0" />
-                <element signature="e#11793#12730#0" />
-                <element signature="e#11889#12045#0" />
-                <element signature="e#12108#12264#0" />
-                <element signature="e#12327#12483#0" />
-                <element signature="e#12534#12693#0" />
-                <element signature="n#style#0;n#!!top" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/renderer/store/actions.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="370">
-              <caret line="36" column="33" selection-start-line="36" selection-start-column="33" selection-end-line="36" selection-end-column="33" />
-              <folding>
-                <element signature="n#!!doc" expanded="true" />
-                <element signature="e#25#193#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/renderer/store/mutations.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="378">
-              <caret line="29" column="28" lean-forward="true" selection-start-line="29" selection-start-column="28" selection-end-line="29" selection-end-column="28" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <leaf />
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -129,15 +31,12 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>4020b2de-534f-42ca-9ad6-419d642bb2a2</find>
-      <find>9a0dff23-8633-4e7f-89bf-cc4f68ec</find>
       <find>9a0dff23-8633-4e7f-89bf-cc4f68ec88e1</find>
       <find>black</find>
       <find>d9868551-b579-4258-9bc7-7c1f733773f5</find>
       <find>cb2687fd-931a-4b38-a76d-9c3ea171b8d8</find>
       <find>Webpack</find>
       <find>windowJson[0]</find>
-      <find>windowJson</find>
       <find>fileContent</find>
       <find>count6</find>
       <find>filter</find>
@@ -159,6 +58,9 @@
       <find>SAVE_SIGNALLIST</find>
       <find>updateSignalPreList</find>
       <find>UPDATE_SIGNALPRELIST</find>
+      <find>用户登录</find>
+      <find>loginJson</find>
+      <find>windowJson</find>
     </findStrings>
     <replaceStrings>
       <replace>class</replace>
@@ -181,7 +83,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/renderer/components/modal/playertest.vue" />
         <option value="$PROJECT_DIR$/.gitignore" />
         <option value="$PROJECT_DIR$/static/data/EnityLogin.json" />
         <option value="$PROJECT_DIR$/src/renderer/assets/less/login.less" />
@@ -212,32 +113,32 @@
         <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/main/index.js" />
         <option value="$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js" />
         <option value="$PROJECT_DIR$/src/renderer/assets/less/admin.less" />
         <option value="$PROJECT_DIR$/src/renderer/components/SignalList.vue" />
         <option value="$PROJECT_DIR$/src/renderer/store/mutation-types.js" />
-        <option value="$PROJECT_DIR$/src/renderer/store/state.js" />
         <option value="$PROJECT_DIR$/src/renderer/store/mutations.js" />
         <option value="$PROJECT_DIR$/src/utils/tools.js" />
         <option value="$PROJECT_DIR$/src/renderer/App.vue" />
         <option value="$PROJECT_DIR$/src/renderer/components/Login.vue" />
-        <option value="$PROJECT_DIR$/dist/electron/index.html" />
-        <option value="$PROJECT_DIR$/src/index.ejs" />
         <option value="$PROJECT_DIR$/src/renderer/api/ajax.js" />
         <option value="$PROJECT_DIR$/src/renderer/api/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$/static/EnityWindow.json" />
         <option value="$PROJECT_DIR$/src/renderer/components/Button.vue" />
         <option value="$PROJECT_DIR$/src/renderer/store/actions.js" />
         <option value="$PROJECT_DIR$/src/renderer/components/BigShow.vue" />
+        <option value="$PROJECT_DIR$/src/index.ejs" />
+        <option value="$PROJECT_DIR$/dist/electron/index.html" />
+        <option value="$PROJECT_DIR$/../../demo.html" />
+        <option value="$PROJECT_DIR$/src/renderer/components/Admin.vue" />
+        <option value="$PROJECT_DIR$/src/renderer/assets/less/mainpage.less" />
+        <option value="$PROJECT_DIR$/src/main/index.js" />
+        <option value="$PROJECT_DIR$/src/renderer/store/state.js" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-420" />
-    <option name="y" value="19" />
+    <option name="x" value="91" />
     <option name="width" value="1366" />
     <option name="height" value="600" />
   </component>
@@ -249,7 +150,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -257,10 +157,29 @@
               <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="build" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="electron-app" type="b2602c69:ProjectViewProjectNode" />
+              <item name="electron-app" type="462c0819:PsiDirectoryNode" />
+              <item name="build" type="462c0819:PsiDirectoryNode" />
+              <item name="win-unpacked" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="electron-app" type="b2602c69:ProjectViewProjectNode" />
+              <item name="electron-app" type="462c0819:PsiDirectoryNode" />
+              <item name="build" type="462c0819:PsiDirectoryNode" />
+              <item name="win-unpacked" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -274,6 +193,11 @@
     <property name="ts.external.directory.path" value="F:\webstorm\WebStorm 2019.1.3\plugins\JavaScriptLanguage\jsLanguageServicesImpl\external" />
   </component>
   <component name="RecentsManager">
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="C:\Users\liuwei\Desktop\electron\electron-app\static" />
+      <recent name="C:\Users\liuwei\Desktop\electron\electron-app\src\renderer\assets" />
+      <recent name="C:\Users\liuwei\Desktop\桌面程序\electron-app\src\renderer\assets\images" />
+    </key>
     <key name="CopyFile.RECENT_KEYS">
       <recent name="C:\Users\liuwei\Desktop\electron\electron-app\src\renderer\api" />
       <recent name="C:\Users\liuwei\Desktop\electron\electron-app\src\renderer" />
@@ -281,11 +205,6 @@
       <recent name="C:\Users\liuwei\Desktop\electron\electron-app\src\renderer\components\modal" />
       <recent name="C:\Users\liuwei\Desktop\electron\electron-app\src\renderer\assets\less" />
     </key>
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="C:\Users\liuwei\Desktop\electron\electron-app\static" />
-      <recent name="C:\Users\liuwei\Desktop\electron\electron-app\src\renderer\assets" />
-      <recent name="C:\Users\liuwei\Desktop\桌面程序\electron-app\src\renderer\assets\images" />
-    </key>
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -372,12 +291,14 @@
       <workItem from="1588844511323" duration="1655000" />
       <workItem from="1588856165669" duration="100000" />
       <workItem from="1588906984737" duration="659000" />
-      <workItem from="1588916874925" duration="5339000" />
+      <workItem from="1588916874925" duration="10362000" />
+      <workItem from="1588944784073" duration="3690000" />
+      <workItem from="1588988349962" duration="6705000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="451023000" />
+    <option name="totallyTimeSpent" value="466441000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -390,9 +311,8 @@
   </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.14857745" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.18914647" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="npm" order="2" side_tool="true" />
       <window_info id="Favorites" order="3" side_tool="true" />
@@ -406,7 +326,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.42328042" />
+      <window_info anchor="bottom" id="Terminal" order="10" weight="0.5037037" />
       <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" />
@@ -417,11 +337,6 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/.electron-vue/webpack.web.config.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2003" />
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/.electron-vue/dev-runner.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="336">
@@ -2096,26 +2011,6 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/static/EnityBigScreen.Data" />
-    <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>
@@ -2182,7 +2077,6 @@
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
     <entry file="file://$PROJECT_DIR$/build/win-unpacked/resources/app/dist/electron/main.js" />
-    <entry file="file://$PROJECT_DIR$/build/win-unpacked/resources/app/dist/electron/renderer.js" />
     <entry file="file://$PROJECT_DIR$/build/win-unpacked/resources/app/dist/electron/index.html" />
     <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/splitscreen.less">
       <provider selected="true" editor-type-id="text-editor" />
@@ -2265,116 +2159,148 @@
         </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="11" column="18" selection-start-line="11" selection-start-column="18" selection-end-line="11" selection-end-column="18" />
-          <folding>
-            <element signature="e#93#112#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/static/EnityLogin.json">
+    <entry file="file://$PROJECT_DIR$/src/renderer/api/ajax.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret line="34" column="1" lean-forward="true" selection-start-line="34" selection-start-column="1" selection-end-line="34" selection-end-column="1" />
+        <state relative-caret-position="861">
+          <caret line="41" column="23" lean-forward="true" selection-start-line="41" selection-start-column="23" selection-end-line="41" selection-end-column="23" />
           <folding>
-            <element signature="e#0#873#0" />
-            <element signature="e#423#435#0" />
+            <element signature="n#!!doc" expanded="true" />
+            <element signature="e#58#83#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/dist/electron/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="80" selection-start-column="80" selection-end-column="80" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/components/Login.vue">
+    <entry file="file://$PROJECT_DIR$/src/renderer/api/index.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="5" column="45" lean-forward="true" selection-start-line="5" selection-start-column="45" selection-end-line="5" selection-end-column="45" />
+        <state relative-caret-position="420">
+          <caret line="20" column="7" lean-forward="true" selection-start-line="20" selection-start-column="7" selection-end-line="20" selection-end-column="7" />
           <folding>
-            <element signature="e#1576#1605#0" expanded="true" />
-            <element signature="e#3010#3351#0" />
-            <element signature="e#4018#4677#0" />
+            <element signature="n#!!doc" expanded="true" />
+            <element signature="e#40#65#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/index.ejs">
+    <entry file="file://$PROJECT_DIR$/src/renderer/store/mutations.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="378">
-          <caret line="18" column="9" lean-forward="true" selection-start-line="18" selection-start-column="9" selection-end-line="18" selection-end-column="9" />
+          <caret line="29" column="28" lean-forward="true" selection-start-line="29" selection-start-column="28" selection-end-line="29" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/api/ajax.js">
+    <entry file="file://$PROJECT_DIR$/src/renderer/store/actions.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="861">
-          <caret line="41" column="23" lean-forward="true" selection-start-line="41" selection-start-column="23" selection-end-line="41" selection-end-column="23" />
+        <state relative-caret-position="370">
+          <caret line="36" column="33" selection-start-line="36" selection-start-column="33" selection-end-line="36" selection-end-column="33" />
           <folding>
             <element signature="n#!!doc" expanded="true" />
-            <element signature="e#58#83#0" expanded="true" />
+            <element signature="e#25#193#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/api/index.js">
+    <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.es5.d.ts">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="420">
-          <caret line="20" column="7" lean-forward="true" selection-start-line="20" selection-start-column="7" selection-end-line="20" selection-end-column="7" />
-          <folding>
-            <element signature="n#!!doc" expanded="true" />
-            <element signature="e#40#65#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="306">
+          <caret line="1451" column="38" selection-start-line="1451" selection-start-column="38" selection-end-line="1451" selection-end-column="38" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/mainpage.less">
+    <entry file="file://$PROJECT_DIR$/src/renderer/components/Button.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="147">
-          <caret line="55" column="3" lean-forward="true" selection-start-line="55" selection-start-column="3" selection-end-line="55" selection-end-column="3" />
+        <state relative-caret-position="440">
+          <caret line="172" column="55" lean-forward="true" selection-start-line="172" selection-start-column="55" selection-end-line="172" selection-end-column="55" />
           <folding>
-            <element signature="e#108#1068#0" />
-            <element signature="e#251#1064#0" />
-            <element signature="e#386#447#0" />
-            <element signature="e#489#1058#0" />
-            <element signature="e#664#787#0" />
-            <element signature="e#839#1050#0" />
-            <element signature="e#1135#1203#0" />
-            <element signature="e#1254#1393#0" />
-            <element signature="e#1441#1560#0" />
-            <element signature="e#1588#1649#0" />
+            <element signature="n#template#0;n#!!top" />
+            <element signature="e#2554#2670#0" />
+            <element signature="e#3249#3732#0" />
+            <element signature="e#3297#3490#0" />
+            <element signature="e#3496#3687#0" />
+            <element signature="e#3838#4984#0" />
+            <element signature="e#3883#4077#0" />
+            <element signature="e#4108#4402#0" />
+            <element signature="e#4666#4938#0" />
+            <element signature="e#4749#4829#0" />
+            <element signature="e#4835#4916#0" />
+            <element signature="e#5113#5848#0" />
+            <element signature="e#5158#5352#0" />
+            <element signature="e#5382#5674#0" />
+            <element signature="e#6057#7973#0" />
+            <element signature="e#6133#6327#0" />
+            <element signature="e#6358#6652#0" />
+            <element signature="e#6807#6817#0" />
+            <element signature="e#6913#7185#0" />
+            <element signature="e#6996#7076#0" />
+            <element signature="e#7082#7163#0" />
+            <element signature="e#7283#7555#0" />
+            <element signature="e#7366#7446#0" />
+            <element signature="e#7452#7533#0" />
+            <element signature="e#7655#7927#0" />
+            <element signature="e#7738#7818#0" />
+            <element signature="e#7824#7905#0" />
+            <element signature="e#9404#10145#0" />
+            <element signature="e#9449#9643#0" />
+            <element signature="e#9673#9967#0" />
+            <element signature="e#10248#10708#0" />
+            <element signature="e#10292#10490#0" />
+            <element signature="e#10495#10690#0" />
+            <element signature="e#10795#11745#0" />
+            <element signature="e#10891#11049#0" />
+            <element signature="e#11112#11270#0" />
+            <element signature="e#11333#11491#0" />
+            <element signature="e#11547#11708#0" />
+            <element signature="e#11793#12730#0" />
+            <element signature="e#11889#12045#0" />
+            <element signature="e#12108#12264#0" />
+            <element signature="e#12327#12483#0" />
+            <element signature="e#12534#12693#0" />
+            <element signature="n#style#0;n#!!top" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/components/Admin.vue">
+    <entry file="file://$PROJECT_DIR$/src/renderer/components/BigShow.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="580">
-          <caret line="101" column="30" lean-forward="true" selection-start-line="101" selection-start-column="30" selection-end-line="101" selection-end-column="30" />
+        <state relative-caret-position="126">
+          <caret line="138" column="8" lean-forward="true" selection-start-line="138" selection-start-column="8" selection-end-line="138" selection-end-column="8" />
           <folding>
-            <element signature="e#1231#1954#0" />
-            <element signature="e#2056#2085#0" expanded="true" />
-            <element signature="e#2542#2729#0" />
-            <element signature="e#2747#2850#0" />
-            <element signature="e#2903#3166#0" />
+            <element signature="n#template#0;n#!!top" />
+            <element signature="n#div#0;n#template#0;n#!!top" />
+            <element signature="n#draggable#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#div#0;n#draggable#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#script#0;n#!!top" />
+            <element signature="e#1313#4197#0" />
+            <element signature="e#1330#1422#0" />
+            <element signature="e#1351#1412#0" />
+            <element signature="e#1445#1479#0" />
+            <element signature="e#1499#1923#0" />
+            <element signature="e#1575#1845#0" />
+            <element signature="e#1917#1949#0" />
+            <element signature="e#1999#3142#0" />
+            <element signature="e#2113#2887#0" />
+            <element signature="e#2316#2864#0" />
+            <element signature="e#2922#3045#0" />
+            <element signature="e#1876#4066#0" />
+            <element signature="e#1970#3558#0" />
+            <element signature="e#1994#2072#0" />
+            <element signature="e#2099#3544#0" />
+            <element signature="e#3588#3892#0" />
+            <element signature="e#3613#3878#0" />
+            <element signature="e#3676#3818#0" />
+            <element signature="e#3921#4055#0" />
+            <element signature="e#3946#4041#0" />
+            <element signature="e#4156#5556#0" />
+            <element signature="e#4182#4305#0" />
+            <element signature="e#5561#5593#0" />
+            <element signature="n#style#0;n#!!top" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/store/state.js">
+    <entry file="file://$PROJECT_DIR$/dist/electron/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="306">
-          <caret line="25" column="10" lean-forward="true" selection-start-line="25" selection-start-column="10" selection-end-line="25" selection-end-column="10" />
-          <folding>
-            <element signature="n#!!doc" expanded="true" />
-            <element signature="e#12#62#0" expanded="true" />
-          </folding>
+        <state>
+          <caret column="51" selection-start-column="51" selection-end-column="51" />
         </state>
       </provider>
     </entry>
@@ -2382,7 +2308,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state>
           <folding>
-            <element signature="e#0#7421#0" />
             <element signature="e#4#669#0" />
             <element signature="e#157#165#0" />
             <element signature="e#188#196#0" />
@@ -2420,97 +2345,111 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/store/mutations.js">
+    <entry file="file://$PROJECT_DIR$/static/EnityLogin.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="378">
-          <caret line="29" column="28" lean-forward="true" selection-start-line="29" selection-start-column="28" selection-end-line="29" selection-end-column="28" />
+        <state relative-caret-position="441">
+          <caret line="23" column="21" selection-start-line="23" selection-start-column="21" selection-end-line="23" selection-end-column="21" />
+          <folding>
+            <element signature="e#423#435#0" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/store/actions.js">
+    <entry file="file://$PROJECT_DIR$/src/renderer/components/Login.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="370">
-          <caret line="36" column="33" selection-start-line="36" selection-start-column="33" selection-end-line="36" selection-end-column="33" />
+        <state relative-caret-position="168">
+          <caret line="65" column="10" lean-forward="true" selection-start-line="65" selection-start-column="10" selection-end-line="65" selection-end-column="10" />
           <folding>
-            <element signature="n#!!doc" expanded="true" />
-            <element signature="e#25#193#0" expanded="true" />
+            <element signature="e#1576#1605#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/components/Button.vue">
+    <entry file="file://$PROJECT_DIR$/src/renderer/App.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="251">
-          <caret line="172" column="55" lean-forward="true" selection-start-line="172" selection-start-column="55" selection-end-line="172" selection-end-column="55" />
+        <state relative-caret-position="126">
+          <caret line="6" column="8" lean-forward="true" selection-start-line="6" selection-start-column="8" selection-end-line="6" selection-end-column="8" />
           <folding>
-            <element signature="n#template#0;n#!!top" />
-            <element signature="e#2554#2670#0" />
-            <element signature="e#3249#3732#0" />
-            <element signature="e#3297#3490#0" />
-            <element signature="e#3496#3687#0" />
-            <element signature="e#3838#4984#0" />
-            <element signature="e#3883#4077#0" />
-            <element signature="e#4108#4402#0" />
-            <element signature="e#4666#4938#0" />
-            <element signature="e#4749#4829#0" />
-            <element signature="e#4835#4916#0" />
-            <element signature="e#5113#5848#0" />
-            <element signature="e#5158#5352#0" />
-            <element signature="e#5382#5674#0" />
-            <element signature="e#6057#7973#0" />
-            <element signature="e#6133#6327#0" />
-            <element signature="e#6358#6652#0" />
-            <element signature="e#6807#6817#0" />
-            <element signature="e#6913#7185#0" />
-            <element signature="e#6996#7076#0" />
-            <element signature="e#7082#7163#0" />
-            <element signature="e#7283#7555#0" />
-            <element signature="e#7366#7446#0" />
-            <element signature="e#7452#7533#0" />
-            <element signature="e#7655#7927#0" />
-            <element signature="e#7738#7818#0" />
-            <element signature="e#7824#7905#0" />
-            <element signature="e#9404#10145#0" />
-            <element signature="e#9449#9643#0" />
-            <element signature="e#9673#9967#0" />
-            <element signature="e#10248#10708#0" />
-            <element signature="e#10292#10490#0" />
-            <element signature="e#10495#10690#0" />
-            <element signature="e#10795#11745#0" />
-            <element signature="e#10891#11049#0" />
-            <element signature="e#11112#11270#0" />
-            <element signature="e#11333#11491#0" />
-            <element signature="e#11547#11708#0" />
-            <element signature="e#11793#12730#0" />
-            <element signature="e#11889#12045#0" />
-            <element signature="e#12108#12264#0" />
-            <element signature="e#12327#12483#0" />
-            <element signature="e#12534#12693#0" />
-            <element signature="n#style#0;n#!!top" />
+            <element signature="e#93#112#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.es5.d.ts">
+    <entry file="file://$PROJECT_DIR$/src/renderer/components/Admin.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="306">
-          <caret line="1451" column="38" selection-start-line="1451" selection-start-column="38" selection-end-line="1451" selection-end-column="38" />
+        <state relative-caret-position="42">
+          <caret line="2" column="22" lean-forward="true" selection-start-line="2" selection-start-column="22" selection-end-line="2" selection-end-column="22" />
+          <folding>
+            <element signature="e#1268#1991#0" />
+            <element signature="e#2118#2147#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/components/BigShow.vue">
+    <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/mainpage.less">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="608">
-          <caret line="157" column="32" lean-forward="true" selection-start-line="157" selection-start-column="32" selection-end-line="157" selection-end-column="32" />
+        <state relative-caret-position="21">
+          <caret line="1" column="12" selection-start-line="1" selection-start-column="12" selection-end-line="1" selection-end-column="12" />
           <folding>
-            <element signature="e#1067#1096#0" expanded="true" />
-            <element signature="e#2218#3457#0" />
-            <element signature="e#3588#3892#0" />
-            <element signature="e#3921#4055#0" />
-            <element signature="n#style#0;n#!!top" />
+            <element signature="e#20#1650#0" />
+            <element signature="e#107#1067#0" />
+            <element signature="e#1134#1202#0" />
+            <element signature="e#1253#1392#0" />
+            <element signature="e#1440#1559#0" />
+            <element signature="e#1587#1648#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/../../demo.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="273">
+          <caret line="13" column="9" lean-forward="true" selection-start-line="13" selection-start-column="9" selection-end-line="13" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/main.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="357">
+          <caret line="17" column="17" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" />
+          <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="-239">
+          <caret line="13" column="26" lean-forward="true" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/store/state.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="273">
+          <caret line="13" column="23" lean-forward="true" selection-start-line="13" selection-start-column="23" selection-end-line="13" selection-end-column="23" />
+          <folding>
+            <element signature="n#!!doc" expanded="true" />
+            <element signature="e#123#175#0" expanded="true" />
+            <element signature="e#674#1106#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/index.ejs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="273">
+          <caret line="13" column="24" lean-forward="true" selection-start-line="13" selection-start-column="24" selection-end-line="13" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/win-unpacked/resources/app/dist/electron/renderer.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="36">
+          <caret column="151439" lean-forward="true" selection-start-column="151439" selection-end-column="151439" />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

+ 1 - 1
src/index.ejs

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

+ 6 - 1
src/main/index.js

@@ -19,7 +19,9 @@ function createWindow () {
     width: 1000,
     height: 563,
     show:false,
-    useContentSize: true,
+    /*fullscreenable: true,
+    fullscreen: true,
+    simpleFullscreen:true,*/
     webPreferences: {
       // 允许跨域
       webSecurity: false,
@@ -30,6 +32,9 @@ function createWindow () {
 
   mainWindow.loadURL(winURL)
 
+ /* mainWindow.setFullScreen(true);
+  mainWindow.setSimpleFullScreen(true);*/
+
   // mainWindow.webContents.openDevTools();
 
   mainWindow.once('ready-to-show', () => {

+ 2 - 3
src/renderer/assets/less/mainpage.less

@@ -76,11 +76,10 @@
     background-color: #666;
   }
 
-
   // 退出按钮样式
   .logoutBtn {
     position: absolute;
-    top: 20px;
-    right: 20px;
+    top: 10px;
+    right: 10px;
   }
 }

+ 19 - 9
src/renderer/components/Admin.vue

@@ -16,6 +16,7 @@
                 backgroundSize:'100% 100%',
                 backgroundColor:`#${windowJson[0].BrackgroupStr ? windowJson[0].BrackgroupStr.slice(3) : null}`,
                 margin:'0 auto'}"
+                ref="mainpage"
         >
             <!--按钮-->
             <ButtonComponent />
@@ -52,9 +53,9 @@
                 }"
             >
             </div>-->
-        </div>
 
-        <button class="logoutBtn" @click="logout">退出</button>
+            <button class="logoutBtn" @click="logout">退出</button>
+        </div>
     </div>
 </template>
 
@@ -81,6 +82,10 @@
             SliderComponent
         },
 
+        mounted(){
+          this.fullScreen()
+        },
+
         data() {
             return {
                 user: storageUtils.getUser(), // 本地存储的用户
@@ -95,6 +100,18 @@
                 this.$store.dispatch('resetUser')
                 // 去登录界面
                 this.$router.replace('/login')
+            },
+
+            // 显示全屏
+            fullScreen(){
+                const de = this.$refs.mainpage
+                if (de.requestFullscreen) {
+                    de.requestFullscreen()
+                } else if (de.mozRequestFullScreen) {
+                    de.mozRequestFullScreen()
+                } else if (de.webkitRequestFullScreen) {
+                    de.webkitRequestFullScreen()
+                }
             }
         },
 
@@ -103,10 +120,3 @@
         }
     }
 </script>
-
-
-
-
-
-
-

+ 21 - 13
src/renderer/store/state.js

@@ -1,6 +1,7 @@
 /*状态对象模块*/
 
-import loginJson from '../../../static/EnityLogin'
+// import loginJson from '../../../static/EnityLogin'
+const loginJson  = require('../../../static/EnityLogin')
 import windowJson from '../../../static/EnityWindow'
 import buttonJson from '../../../static/EnityButton'
 import labelJson from '../../../static/EnityLable'
@@ -9,6 +10,13 @@ import sliderJson from '../../../static/EnitySlider'
 import systemJson from '../../../static/EnitySystem'
 import signalBorder from '../../../static/EnitySignalPreviewList'
 
+import fs from 'fs'
+import path from 'path'
+
+/*let loginJson = fs.readFileSync(path.join(__static, '/EnityLogin.json'), 'utf8')
+
+console.log(loginJson)*/
+
 export default {
   // 用户信息
   user: {},
@@ -19,6 +27,18 @@ export default {
   // 分屏状态(默认0: 自由屏,1: 4分屏  2:9分屏  3: 16分屏)
   splitScreenStatus: 0,
 
+  // 大屏显示
+  bigScreenJson:[],
+
+  // 信号源列表
+  signalListJson:[],
+
+  // 信号源外壳
+  signalBorder,
+
+  // 设备数据
+  deviceJson:[],
+
   // 登录
   loginJson,
 
@@ -39,16 +59,4 @@ export default {
 
   // ip 端口
   systemJson,
-
-  // 大屏显示
-  bigScreenJson:[],
-
-  // 信号源列表
-  signalListJson:[],
-
-  // 信号源外壳
-  signalBorder,
-
-  // 设备数据
-  deviceJson:[]
 }