实现拖动到不同的位置，点击分屏出现边框线

.idea/workspace.xml

@@ -3,10 +3,10 @@
   <component name="ChangeListManager">
     <list default="true" id="690c02a3-0e7d-4c4a-8f0c-a44c44c3a162" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/index.ejs" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.ejs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/index.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/assets/less/mainpage.less" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/assets/less/mainpage.less" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/renderer/assets/less/splitscreen.less" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/assets/less/splitscreen.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/state.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/store/state.js" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/dist/" />
@@ -20,18 +20,152 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
-    <leaf />
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <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="126">
+              <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
+              <folding>
+                <element signature="n#template#0;n#!!top" />
+                <element signature="n#div#0;n#template#0;n#!!top" />
+                <element signature="n#div#0;n#div#0;n#template#0;n#!!top" />
+                <element signature="e#1178#1419#0" />
+                <element signature="e#1199#1409#0" />
+                <element signature="e#1440#2951#0" />
+                <element signature="e#1728#1749#0" />
+                <element signature="e#2554#2670#0" />
+                <element signature="e#2972#3049#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="252">
+              <caret line="12" column="16" lean-forward="true" selection-start-line="12" selection-start-column="16" selection-end-line="12" selection-end-column="16" />
+              <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="210">
+              <caret line="10" column="25" lean-forward="true" selection-start-line="10" selection-start-column="25" selection-end-line="10" selection-end-column="25" />
+              <folding>
+                <element signature="n#!!doc" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/renderer/components/BigShow.vue">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="420">
+              <caret line="26" column="20" lean-forward="true" selection-start-line="26" selection-start-column="20" selection-end-line="26" selection-end-column="20" />
+              <folding>
+                <element signature="e#1220#1249#0" expanded="true" />
+                <element signature="e#1483#1615#0" />
+                <element signature="e#1504#1605#0" />
+                <element signature="e#1638#1672#0" />
+                <element signature="e#1692#3547#0" />
+                <element signature="e#1768#2038#0" />
+                <element signature="e#2098#3537#0" />
+                <element signature="e#2180#3522#0" />
+                <element signature="e#2273#3504#0" />
+                <element signature="e#2334#3168#0" />
+                <element signature="e#2553#3141#0" />
+                <element signature="e#3207#3342#0" />
+                <element signature="e#3568#4437#0" />
+                <element signature="e#3662#3929#0" />
+                <element signature="e#3686#3764#0" />
+                <element signature="e#3791#3915#0" />
+                <element signature="e#3959#4263#0" />
+                <element signature="e#3984#4249#0" />
+                <element signature="e#4047#4189#0" />
+                <element signature="e#4292#4426#0" />
+                <element signature="e#4317#4412#0" />
+                <element signature="e#4455#4960#0" />
+                <element signature="e#4537#4598#0" />
+                <element signature="e#4669#4950#0" />
+                <element signature="e#4762#4829#0" />
+                <element signature="n#style#0;n#!!top" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/splitscreen.less">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1197">
+              <caret line="57" lean-forward="true" selection-start-line="57" selection-end-line="57" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
         <option value="Vue Single File Component" />
+        <option value="JavaScript File" />
       </list>
     </option>
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>9a0dff23-8633-4e7f-89bf-cc4f68ec88e1</find>
       <find>black</find>
       <find>d9868551-b579-4258-9bc7-7c1f733773f5</find>
       <find>cb2687fd-931a-4b38-a76d-9c3ea171b8d8</find>
@@ -59,8 +193,9 @@
       <find>updateSignalPreList</find>
       <find>UPDATE_SIGNALPRELIST</find>
       <find>用户登录</find>
-      <find>loginJson</find>
       <find>windowJson</find>
+      <find>loginJson</find>
+      <find>this.loginJson</find>
     </findStrings>
     <replaceStrings>
       <replace>class</replace>
@@ -71,6 +206,8 @@
       <replace>this.windowJson</replace>
       <replace>fileContent</replace>
       <replace>windowJson</replace>
+      <replace>this.loginJson</replace>
+      <replace>loginJson</replace>
     </replaceStrings>
     <dirStrings>
       <dir>C:\Users\liuwei\Desktop\electron\electron-app\.electron-vue</dir>
@@ -83,15 +220,12 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.gitignore" />
-        <option value="$PROJECT_DIR$/static/data/EnityLogin.json" />
         <option value="$PROJECT_DIR$/src/renderer/assets/less/login.less" />
         <option value="$PROJECT_DIR$/src/utils/sliceColor.js" />
         <option value="$PROJECT_DIR$/static/EnityLable.json" />
         <option value="$PROJECT_DIR$/static/EnityImage.json" />
         <option value="$PROJECT_DIR$/static/EnityLogin.json" />
         <option value="$PROJECT_DIR$/static/EnitySignalPreviewList.json" />
-        <option value="$PROJECT_DIR$/src/renderer/assets/less/splitscreen.less" />
         <option value="$PROJECT_DIR$/static/EnityBigScreen.json" />
         <option value="$PROJECT_DIR$/static/EnityButton.json" />
         <option value="$PROJECT_DIR$/../../新建文件夹/slideDemo.html" />
@@ -120,25 +254,29 @@
         <option value="$PROJECT_DIR$/src/renderer/store/mutations.js" />
         <option value="$PROJECT_DIR$/src/utils/tools.js" />
         <option value="$PROJECT_DIR$/src/renderer/App.vue" />
-        <option value="$PROJECT_DIR$/src/renderer/components/Login.vue" />
         <option value="$PROJECT_DIR$/src/renderer/api/ajax.js" />
         <option value="$PROJECT_DIR$/src/renderer/api/index.js" />
         <option value="$PROJECT_DIR$/static/EnityWindow.json" />
         <option value="$PROJECT_DIR$/src/renderer/components/Button.vue" />
         <option value="$PROJECT_DIR$/src/renderer/store/actions.js" />
-        <option value="$PROJECT_DIR$/src/renderer/components/BigShow.vue" />
-        <option value="$PROJECT_DIR$/src/index.ejs" />
         <option value="$PROJECT_DIR$/dist/electron/index.html" />
         <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" />
+        <option value="$PROJECT_DIR$/src/renderer/components/Admin.vue" />
+        <option value="$PROJECT_DIR$/.eslintrc" />
+        <option value="$PROJECT_DIR$/src/config.js" />
+        <option value="$PROJECT_DIR$/src/index.ejs" />
+        <option value="$PROJECT_DIR$/src/renderer/components/Login.vue" />
+        <option value="$PROJECT_DIR$/src/renderer/components/BigShow.vue" />
+        <option value="$PROJECT_DIR$/src/renderer/assets/less/splitscreen.less" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="91" />
+    <option name="x" value="-420" />
+    <option name="y" value="19" />
     <option name="width" value="1366" />
     <option name="height" value="600" />
   </component>
@@ -150,35 +288,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <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="ProjectPane" />
       <pane id="Scope" />
     </panes>
   </component>
@@ -294,11 +404,16 @@
       <workItem from="1588916874925" duration="10362000" />
       <workItem from="1588944784073" duration="3690000" />
       <workItem from="1588988349962" duration="6705000" />
+      <workItem from="1589014045846" duration="3018000" />
+      <workItem from="1589111917743" duration="16000" />
+      <workItem from="1589122318085" duration="2208000" />
+      <workItem from="1589161291668" duration="26000" />
+      <workItem from="1589164441219" duration="5295000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="466441000" />
+    <option name="totallyTimeSpent" value="478629000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -311,8 +426,9 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+    <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.18914647" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.13171759" />
       <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" />
@@ -337,33 +453,6 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/.electron-vue/dev-runner.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="336">
-          <caret line="70" column="46" lean-forward="true" selection-start-line="70" selection-start-column="46" selection-end-line="70" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/index.dev.js">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.dom.d.ts">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="21">
-          <caret line="14971" column="4" selection-start-line="14971" selection-start-column="4" selection-end-line="14971" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/utils/storageUtils.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="462">
-          <caret line="22" column="2" selection-start-line="22" selection-start-column="2" selection-end-line="22" selection-end-column="2" />
-          <folding>
-            <element signature="n#!!doc" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../../nginx.conf" />
     <entry file="file://$PROJECT_DIR$/node_modules/element-ui/types/upload.d.ts">
       <provider selected="true" editor-type-id="text-editor">
@@ -2078,9 +2167,6 @@
     </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/index.html" />
-    <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/splitscreen.less">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/admin.less" />
     <entry file="file://$PROJECT_DIR$/src/renderer/store/index.js">
       <provider selected="true" editor-type-id="text-editor">
@@ -2146,19 +2232,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/utils/tools.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="13" column="17" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" />
-          <folding>
-            <element signature="n#!!doc" expanded="true" />
-            <element signature="n#!!block;n#uniq#0" />
-            <element signature="n#!!block;n#getElementLeft#0" />
-            <element signature="n#!!block;n#getElementTop#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/renderer/api/ajax.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="861">
@@ -2181,24 +2254,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/store/mutations.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="378">
-          <caret line="29" column="28" lean-forward="true" selection-start-line="29" selection-start-column="28" selection-end-line="29" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/store/actions.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="370">
-          <caret line="36" column="33" selection-start-line="36" selection-start-column="33" selection-end-line="36" selection-end-column="33" />
-          <folding>
-            <element signature="n#!!doc" expanded="true" />
-            <element signature="e#25#193#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.es5.d.ts">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="306">
@@ -2206,97 +2261,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/components/Button.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="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="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/BigShow.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <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="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$/dist/electron/index.html">
       <provider selected="true" editor-type-id="text-editor">
         <state>
@@ -2345,109 +2309,285 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/EnityLogin.json">
+    <entry file="file://$PROJECT_DIR$/src/renderer/App.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="441">
-          <caret line="23" column="21" selection-start-line="23" selection-start-column="21" selection-end-line="23" selection-end-column="21" />
+        <state relative-caret-position="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="e#423#435#0" />
+            <element signature="e#93#112#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/components/Login.vue">
+    <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/mainpage.less">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="65" column="10" lean-forward="true" selection-start-line="65" selection-start-column="10" selection-end-line="65" selection-end-column="10" />
+        <state relative-caret-position="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#1576#1605#0" expanded="true" />
+            <element signature="e#20#1650#0" />
+            <element signature="e#107#1067#0" />
+            <element signature="e#1134#1202#0" />
+            <element signature="e#1253#1392#0" />
+            <element signature="e#1440#1559#0" />
+            <element signature="e#1587#1648#0" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/App.vue">
+    <entry file="file://$PROJECT_DIR$/../../demo.html" />
+    <entry file="file://$PROJECT_DIR$/src/renderer/main.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="126">
-          <caret line="6" column="8" lean-forward="true" selection-start-line="6" selection-start-column="8" selection-end-line="6" selection-end-column="8" />
+        <state relative-caret-position="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#93#112#0" expanded="true" />
+            <element signature="e#0#21#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/components/Admin.vue">
+    <entry file="file://$PROJECT_DIR$/src/main/index.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="42">
-          <caret line="2" column="22" lean-forward="true" selection-start-line="2" selection-start-column="22" selection-end-line="2" selection-end-column="22" />
+        <state relative-caret-position="-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/utils/tools.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="105">
+          <caret line="13" column="17" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" />
           <folding>
-            <element signature="e#1268#1991#0" />
-            <element signature="e#2118#2147#0" expanded="true" />
+            <element signature="n#!!doc" expanded="true" />
+            <element signature="n#!!block;n#uniq#0" />
+            <element signature="n#!!block;n#getElementLeft#0" />
+            <element signature="n#!!block;n#getElementTop#0" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/mainpage.less">
+    <entry file="file://$PROJECT_DIR$/src/renderer/store/state.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="12" column="9" lean-forward="true" selection-start-line="12" selection-start-column="9" selection-end-line="12" selection-end-column="9" />
+          <folding>
+            <element signature="n#!!doc" expanded="true" />
+            <element signature="e#12#62#0" expanded="true" />
+          </folding>
+        </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="306">
+          <caret line="6" column="27415" selection-start-line="6" selection-start-column="27415" selection-end-line="6" selection-end-column="27415" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/static/EnityLogin.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="441">
+          <caret line="23" column="21" selection-start-line="23" selection-start-column="21" selection-end-line="23" selection-end-column="21" />
+          <folding>
+            <element signature="e#423#435#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/config.js" />
+    <entry file="file://$PROJECT_DIR$/.babelrc">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.eslintrc" />
+    <entry file="file://$PROJECT_DIR$/src/renderer/components/Login.vue">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="21">
-          <caret line="1" column="12" selection-start-line="1" selection-start-column="12" selection-end-line="1" selection-end-column="12" />
+          <caret line="28" column="11" lean-forward="true" selection-start-line="28" selection-start-column="11" selection-end-line="28" selection-end-column="11" />
           <folding>
-            <element signature="e#20#1650#0" />
-            <element signature="e#107#1067#0" />
-            <element signature="e#1134#1202#0" />
-            <element signature="e#1253#1392#0" />
-            <element signature="e#1440#1559#0" />
-            <element signature="e#1587#1648#0" />
+            <element signature="n#template#0;n#!!top" />
+            <element signature="n#div#0;n#template#0;n#!!top" />
+            <element signature="n#section#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#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#1718#3577#0" />
+            <element signature="e#1735#2558#0" />
+            <element signature="e#1798#1919#0" />
+            <element signature="e#1828#1905#0" />
+            <element signature="e#1984#2102#0" />
+            <element signature="e#2020#2088#0" />
+            <element signature="e#2122#2548#0" />
+            <element signature="e#2150#2237#0" />
+            <element signature="e#2262#2533#0" />
+            <element signature="e#2294#2387#0" />
+            <element signature="e#2419#2515#0" />
+            <element signature="e#2579#2629#0" />
+            <element signature="e#2649#3571#0" />
+            <element signature="e#2682#3460#0" />
+            <element signature="e#2796#2898#0" />
+            <element signature="e#3064#3369#0" />
+            <element signature="e#3374#3446#0" />
+            <element signature="e#3495#3561#0" />
+            <element signature="n#style#0;n#!!top" />
+            <element signature="e#3623#4282#0" />
+            <element signature="e#3678#4276#0" />
+            <element signature="e#3832#4266#0" />
+            <element signature="e#3889#4027#0" />
+            <element signature="e#4054#4104#0" />
+            <element signature="e#4133#4252#0" />
+            <element signature="e#4174#4234#0" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../demo.html">
+    <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="9" lean-forward="true" selection-start-line="13" selection-start-column="9" selection-end-line="13" selection-end-column="9" />
+        <state relative-caret-position="399">
+          <caret line="19" column="7" lean-forward="true" selection-start-line="19" selection-start-column="7" selection-end-line="19" selection-end-column="7" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/main.js">
+    <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.dom.d.ts">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="17" column="17" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" />
+        <state relative-caret-position="21">
+          <caret line="767" column="10" selection-start-line="767" selection-start-column="10" selection-end-line="767" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/components/Admin.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="68" column="18" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="18" />
           <folding>
-            <element signature="e#0#21#0" expanded="true" />
+            <element signature="n#template#0;n#!!top" />
+            <element signature="n#div#0;n#template#0;n#!!top" />
+            <element signature="n#div#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="e#1248#1971#0" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/index.js">
+    <entry file="file://$PROJECT_DIR$/src/renderer/components/Button.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-239">
-          <caret line="13" column="26" lean-forward="true" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
+        <state relative-caret-position="126">
+          <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
+          <folding>
+            <element signature="n#template#0;n#!!top" />
+            <element signature="n#div#0;n#template#0;n#!!top" />
+            <element signature="n#div#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="e#1178#1419#0" />
+            <element signature="e#1199#1409#0" />
+            <element signature="e#1440#2951#0" />
+            <element signature="e#1728#1749#0" />
+            <element signature="e#2554#2670#0" />
+            <element signature="e#2972#3049#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/store/state.js">
+    <entry file="file://$PROJECT_DIR$/src/renderer/store/actions.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="273">
-          <caret line="13" column="23" lean-forward="true" selection-start-line="13" selection-start-column="23" selection-end-line="13" selection-end-column="23" />
+        <state relative-caret-position="252">
+          <caret line="12" column="16" lean-forward="true" selection-start-line="12" selection-start-column="16" selection-end-line="12" selection-end-column="16" />
           <folding>
             <element signature="n#!!doc" expanded="true" />
-            <element signature="e#123#175#0" expanded="true" />
-            <element signature="e#674#1106#0" />
+            <element signature="e#25#193#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="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 relative-caret-position="210">
+          <caret line="10" column="25" lean-forward="true" selection-start-line="10" selection-start-column="25" selection-end-line="10" selection-end-column="25" />
+          <folding>
+            <element signature="n#!!doc" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/build/win-unpacked/resources/app/dist/electron/renderer.js">
+    <entry file="file://$PROJECT_DIR$/src/renderer/components/BigShow.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="420">
+          <caret line="26" column="20" lean-forward="true" selection-start-line="26" selection-start-column="20" selection-end-line="26" selection-end-column="20" />
+          <folding>
+            <element signature="e#1220#1249#0" expanded="true" />
+            <element signature="e#1483#1615#0" />
+            <element signature="e#1504#1605#0" />
+            <element signature="e#1638#1672#0" />
+            <element signature="e#1692#3547#0" />
+            <element signature="e#1768#2038#0" />
+            <element signature="e#2098#3537#0" />
+            <element signature="e#2180#3522#0" />
+            <element signature="e#2273#3504#0" />
+            <element signature="e#2334#3168#0" />
+            <element signature="e#2553#3141#0" />
+            <element signature="e#3207#3342#0" />
+            <element signature="e#3568#4437#0" />
+            <element signature="e#3662#3929#0" />
+            <element signature="e#3686#3764#0" />
+            <element signature="e#3791#3915#0" />
+            <element signature="e#3959#4263#0" />
+            <element signature="e#3984#4249#0" />
+            <element signature="e#4047#4189#0" />
+            <element signature="e#4292#4426#0" />
+            <element signature="e#4317#4412#0" />
+            <element signature="e#4455#4960#0" />
+            <element signature="e#4537#4598#0" />
+            <element signature="e#4669#4950#0" />
+            <element signature="e#4762#4829#0" />
+            <element signature="n#style#0;n#!!top" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/splitscreen.less">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="36">
-          <caret column="151439" lean-forward="true" selection-start-column="151439" selection-end-column="151439" />
+        <state relative-caret-position="1197">
+          <caret line="57" lean-forward="true" selection-start-line="57" selection-end-line="57" />
         </state>
       </provider>
     </entry>

src/renderer/assets/less/splitscreen.less

@@ -10,12 +10,22 @@
   color:#ffffff;
   font-size:20px;
 
-  /*分屏项*/
-  .item {
+  /*分屏项(信号源)*/
+  .sitem {
     border: 1px solid #000000;
     color:#fff;
     background-color: #717171;
   }
+
+  /*分屏项(信号源)*/
+  .sitem2 {
+    float: left;
+    color:#000;
+    border: 1px solid #3b3b3b;
+    background-color: #0b0b0b;
+    margin-right: -1px;
+    margin-bottom: -1px;
+  }
 }
 
 /*1分屏*/

src/renderer/components/Admin.vue

@@ -116,7 +116,7 @@
         },
 
         computed: {
-            ...mapState(['windowJson']),
+            ...mapState(['windowJson'])
         }
     }
 </script>

src/renderer/components/BigShow.vue

@@ -11,6 +11,7 @@
                 :move="onMove"
                 @start="isDragging=true"
                 @end="isDragging=false"
+                ref="bigscreen"
                 :style="{
                     width:item.Width + 'px',
                     height:item.Height + 'px',
@@ -20,8 +21,8 @@
                     display:item.IsVisibility ? 'black' : 'none',
                 }"
         >
-            <div v-for="(item,key) in signalPreList" :key="key" class="item" ref="signal">
-                {{item.showName}}
+            <div v-for="(item,index) in signalPreList" :key="index" :class="item.showName ? 'sitem' : 'sitem2'" ref="signal">
+                {{item.showName ? item.showName : item}}
             </div>
         </draggable>
     </div>
@@ -38,6 +39,7 @@
         data() {
             return {
                 isDragging: false, // 是否可拖动标志
+                divArr:[],// 默认大屏中盒子的数组
             }
         },
 
@@ -60,30 +62,31 @@
                 const streamWindows = []
                 setTimeout(async () => {
                     const elementArr = this.$refs.signal
-                    elementArr.forEach((item,index) => {
-                        // 获取元素绝对位置的横坐标和纵坐标
-                        const left = getElementLeft(item)
-                        const top = getElementTop(item)
-                        streamWindows.push({
-                            left,
-                            top,
-                            width:this.bigScreenJson[0].Width/(this.splitScreenStatus+1),
-                            height:this.bigScreenJson[0].Height/(this.splitScreenStatus+1),
-                            id:0,
-                            sourceId:arr[index].sourceId,
-                            widthScale:1/(this.splitScreenStatus+1),
-                            heightScale:1/(this.splitScreenStatus+1),
-                            orginRect:{}
+                    if(elementArr){
+                        elementArr.forEach((item,index) => {
+                            // 获取元素绝对位置的横坐标和纵坐标
+                            const left = getElementLeft(item)
+                            const top = getElementTop(item)
+                            streamWindows.push({
+                                left,
+                                top,
+                                width:this.bigScreenJson[0].Width/(this.splitScreenStatus+1),
+                                height:this.bigScreenJson[0].Height/(this.splitScreenStatus+1),
+                                id:0,
+                                sourceId:arr[index].sourceId,
+                                widthScale:1/(this.splitScreenStatus+1),
+                                heightScale:1/(this.splitScreenStatus+1),
+                                orginRect:{}
+                            })
                         })
-                    })
-                    const data = {
-                        bigScreenId:this.bigScreenJson[0].ID,
-                        streamWindows
+                        const data = {
+                            bigScreenId:this.bigScreenJson[0].ID,
+                            streamWindows
+                        }
+                        // 调用大屏开窗接口
+                        const res = await reqRefreshView(data)
+                        console.log(res)
                     }
-                    console.log(data)
-                    // 调用大屏开窗接口
-                    const res = await reqRefreshView(data)
-                    console.log(res)
                 })
             }
         },
@@ -96,7 +99,8 @@
                     return this.$store.state.signalPreList
                 },
                 set(arr) {
-                    this.$store.dispatch('updateSignalPreList',arr)
+                    const signalArr = [...arr,...this.divArr]
+                    this.$store.dispatch('updateSignalPreList',signalArr)
                 }
             },
 
@@ -122,13 +126,20 @@
         watch: {
             // 监视大屏中的信号源，只要变动，就调用回调函数
             signalPreList: function (arr) {
-                this.reqRefreshBigScreen(arr)
+                // this.reqRefreshBigScreen(arr)
             },
 
             // 监视分屏的状态
-            splitScreenStatus: function() {
+            splitScreenStatus: function(num) {
+                this.$data.divArr = []
+
+                for (let i=0;i<(num+1)*(num+1);i++){
+                    this.$data.divArr.push(i+1)
+                }
+                this.$store.dispatch('updateSignalPreList',this.$data.divArr)
+
                 const arr = this.$store.state.signalPreList
-                this.reqRefreshBigScreen(arr)
+                // this.reqRefreshBigScreen(arr)
             }
         }
     }

src/renderer/components/Login.vue

@@ -57,7 +57,7 @@
                     password: [
                         { validator: validatePasswrod, trigger: 'blur' }
                     ]
-                }
+                },
             }
         },
 
@@ -74,16 +74,6 @@
                 }
                 const userInfo = {name:username,password}
 
-                // 模拟登录
-                /*if(username === 'admin' && password === '123'){
-                    // 将user保存到vuex的state，同时保存到本地
-                    this.$store.dispatch('saveUser', userInfo)
-                    // 跳转到管理界面
-                    this.$router.replace('/admin')
-                }else {
-                    this.$message.error('用户名或密码错误！')
-                }*/
-
                 // 请求登录
                 const res = await reqLogin(userInfo)
                 if(res.token){

src/renderer/store/state.js

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