重新提交

.idea/workspace.xml

@@ -2,6 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="690c02a3-0e7d-4c4a-8f0c-a44c44c3a162" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/renderer/assets/less/splitscreen.less" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/renderer/components/Admin.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/components/Admin.vue" afterDir="false" />
     </list>
@@ -16,99 +17,7 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
-    <splitter split-orientation="horizontal" split-proportion="0.5256488">
-      <split-first>
-        <leaf>
-          <file pinned="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/src/renderer/components/Admin.vue">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="713">
-                  <caret line="280" selection-start-line="280" selection-end-line="280" />
-                  <folding>
-                    <element signature="n#div#0;n#div#0;n#div#0;n#template#0;n#!!top" />
-                    <element signature="n#div#1;n#div#0;n#div#0;n#template#0;n#!!top" />
-                    <element signature="n#label#0;n#div#0;n#div#0;n#template#0;n#!!top" />
-                    <element signature="n#div#2;n#div#0;n#div#0;n#template#0;n#!!top" />
-                    <element signature="n#style#0;n#div#0;n#div#3;n#div#0;n#div#0;n#template#0;n#!!top" expanded="true" />
-                    <element signature="n#div#4;n#div#0;n#div#0;n#template#0;n#!!top" />
-                    <element signature="e#5141#5825#0" />
-                    <element signature="n#script#0;n#!!top" />
-                    <element signature="e#6773#11152#0" />
-                    <element signature="e#6795#6819#0" />
-                    <element signature="e#6999#7504#0" />
-                    <element signature="e#6480#6984#0" />
-                    <element signature="e#7523#10578#0" />
-                    <element signature="e#8978#10568#0" />
-                    <element signature="e#9076#9550#0" />
-                    <element signature="e#9122#9312#0" />
-                    <element signature="e#9317#9505#0" />
-                    <element signature="e#9657#10408#0" />
-                    <element signature="e#9813#9861#0" />
-                    <element signature="e#10103#10151#0" />
-                    <element signature="e#8717#9452#0" />
-                    <element signature="e#8793#8983#0" />
-                    <element signature="e#8988#9274#0" />
-                    <element signature="e#8718#8758#0" />
-                    <element signature="e#8759#8949#0" />
-                    <element signature="e#8954#9238#0" />
-                    <element signature="e#9716#10264#0" />
-                    <element signature="e#9786#10090#0" />
-                    <element signature="e#9811#10076#0" />
-                    <element signature="e#9874#10016#0" />
-                    <element signature="e#10119#10253#0" />
-                    <element signature="e#10144#10239#0" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
-        </leaf>
-      </split-first>
-      <split-second>
-        <leaf>
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/static/EnitySignalPreviewList.json">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="-609">
-                  <caret line="31" column="6" lean-forward="true" selection-start-line="31" selection-start-column="6" selection-end-line="31" selection-end-column="6" />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/admin.less">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="475">
-                  <caret line="208" column="11" lean-forward="true" selection-start-line="208" selection-start-column="11" selection-end-line="208" selection-end-column="11" />
-                  <folding>
-                    <element signature="e#168#206#0" />
-                    <element signature="e#321#580#0" />
-                    <element signature="e#487#574#0" />
-                    <element signature="e#744#1149#0" />
-                    <element signature="e#957#993#0" />
-                    <element signature="e#1049#1141#0" />
-                    <element signature="e#1191#2978#0" />
-                    <element signature="e#1307#1727#0" />
-                    <element signature="e#1577#1717#0" />
-                    <element signature="e#1771#1902#0" />
-                    <element signature="e#1947#2076#0" />
-                    <element signature="e#2121#2260#0" />
-                    <element signature="e#2309#2438#0" />
-                    <element signature="e#2479#2970#0" />
-                    <element signature="e#2606#2810#0" />
-                    <element signature="e#2853#2960#0" />
-                    <element signature="e#3217#3277#0" />
-                    <element signature="e#3405#4584#0" />
-                    <element signature="e#4641#4724#0" />
-                    <element signature="e#4755#4793#0" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
-        </leaf>
-      </split-second>
-    </splitter>
+    <leaf />
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -133,6 +42,10 @@
       <find>355d3c32-1502-40b4-9ddd-663d5b8469e7</find>
       <find>电脑</find>
       <find>电源管理</find>
+      <find>FontSize</find>
+      <find>安卓</find>
+      <find>分布式</find>
+      <find>V6</find>
     </findStrings>
     <replaceStrings>
       <replace>class</replace>
@@ -197,11 +110,12 @@
         <option value="$PROJECT_DIR$/dist/electron/index.html" />
         <option value="$PROJECT_DIR$/src/renderer/App.vue" />
         <option value="$PROJECT_DIR$/static/EnitySignalPreviewList.json" />
+        <option value="$PROJECT_DIR$/src/renderer/assets/less/splitscreen.less" />
         <option value="$PROJECT_DIR$/src/renderer/components/Admin.vue" />
       </list>
     </option>
   </component>
-  <component name="ProjectFrameBounds" extendedState="7">
+  <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="-8" />
     <option name="y" value="-8" />
     <option name="width" value="1100" />
@@ -248,13 +162,6 @@
               <item name="assets" type="462c0819:PsiDirectoryNode" />
               <item name="less" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="electron-app" type="b2602c69:ProjectViewProjectNode" />
-              <item name="electron-app" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="renderer" type="462c0819:PsiDirectoryNode" />
-              <item name="components" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="electron-app" type="b2602c69:ProjectViewProjectNode" />
               <item name="electron-app" type="462c0819:PsiDirectoryNode" />
@@ -347,7 +254,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="200070000" />
+    <option name="totallyTimeSpent" value="212081000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -359,9 +266,29 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
-    <editor active="true" />
+    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <layout>
+      <window_info content_ui="combo" id="Project" order="0" weight="0.12697576" />
+      <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" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32910052" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.32910052" />
+      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="8" />
+      <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" weight="0.32910052" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.5280423" />
+      <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" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+    </layout>
+    <layout-to-restore>
       <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.12697576" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="npm" order="2" side_tool="true" />
@@ -381,19 +308,12 @@
       <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" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-    </layout>
+    </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/renderer/components/modal/settingBackground.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="23" column="20" lean-forward="true" selection-start-line="23" selection-start-column="20" selection-end-line="23" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/renderer/components/modal/loadPrePlan.vue">
       <provider selected="true" editor-type-id="text-editor">
         <state>
@@ -637,34 +557,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/EnityBigScreen.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="30" column="23" lean-forward="true" selection-start-line="30" selection-start-column="23" selection-end-line="30" selection-end-column="23" />
-          <folding>
-            <element signature="e#27#631#0" />
-            <element signature="e#1369#4674#0" />
-            <element signature="e#1390#3941#0" />
-            <element signature="e#1404#1567#0" />
-            <element signature="e#1581#1745#0" />
-            <element signature="e#1759#1922#0" />
-            <element signature="e#1936#2099#0" />
-            <element signature="e#2113#2276#0" />
-            <element signature="e#2290#2453#0" />
-            <element signature="e#2467#2631#0" />
-            <element signature="e#2645#2808#0" />
-            <element signature="e#2822#2985#0" />
-            <element signature="e#2999#3163#0" />
-            <element signature="e#3177#3340#0" />
-            <element signature="e#3354#3517#0" />
-            <element signature="e#3531#3655#0" />
-            <element signature="e#3669#3793#0" />
-            <element signature="e#3807#3931#0" />
-            <element signature="e#4680#6028#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/static/EnityLable.json">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="336">
@@ -3241,10 +3133,93 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/EnityButton.json">
+    <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/admin.less">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="357">
+          <caret line="20" column="27" lean-forward="true" selection-start-line="20" selection-start-column="27" selection-end-line="20" selection-end-column="27" />
+          <folding>
+            <element signature="e#168#206#0" />
+            <element signature="e#321#580#0" />
+            <element signature="e#487#574#0" />
+            <element signature="e#744#1149#0" />
+            <element signature="e#957#993#0" />
+            <element signature="e#1049#1141#0" />
+            <element signature="e#1191#2978#0" />
+            <element signature="e#1307#1727#0" />
+            <element signature="e#1577#1717#0" />
+            <element signature="e#1771#1902#0" />
+            <element signature="e#1947#2076#0" />
+            <element signature="e#2121#2260#0" />
+            <element signature="e#2309#2438#0" />
+            <element signature="e#2479#2970#0" />
+            <element signature="e#2606#2810#0" />
+            <element signature="e#2853#2960#0" />
+            <element signature="e#3217#3277#0" />
+            <element signature="e#4641#4724#0" />
+            <element signature="e#4755#4793#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/static/EnityBigScreen.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="200">
+          <caret line="36" column="16" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="16" />
+          <folding>
+            <element signature="e#27#631#0" />
+            <element signature="e#41#207#0" />
+            <element signature="e#221#345#0" />
+            <element signature="e#359#483#0" />
+            <element signature="e#497#621#0" />
+            <element signature="e#1390#3941#0" />
+            <element signature="e#1404#1567#0" />
+            <element signature="e#1581#1745#0" />
+            <element signature="e#1759#1922#0" />
+            <element signature="e#1936#2099#0" />
+            <element signature="e#2113#2276#0" />
+            <element signature="e#2290#2453#0" />
+            <element signature="e#2467#2631#0" />
+            <element signature="e#2645#2808#0" />
+            <element signature="e#2822#2985#0" />
+            <element signature="e#2999#3163#0" />
+            <element signature="e#3177#3340#0" />
+            <element signature="e#3354#3517#0" />
+            <element signature="e#3531#3655#0" />
+            <element signature="e#3669#3793#0" />
+            <element signature="e#3807#3931#0" />
+            <element signature="e#4701#5302#0" />
+            <element signature="e#4715#4878#0" />
+            <element signature="e#4892#5016#0" />
+            <element signature="e#5030#5154#0" />
+            <element signature="e#5168#5292#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/static/EnitySignalPreviewList.json">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="63">
-          <caret line="151" column="4" lean-forward="true" selection-start-line="151" selection-start-column="4" selection-end-line="151" selection-end-column="4" />
+          <caret line="3" column="18" lean-forward="true" selection-start-line="3" selection-start-column="18" selection-end-line="3" selection-end-column="18" />
+        </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="378">
+          <caret line="18" column="1" lean-forward="true" selection-start-line="18" selection-start-column="1" selection-end-line="18" selection-end-column="1" />
+          <folding>
+            <element signature="e#502#633#0" />
+            <element signature="e#678#807#0" />
+            <element signature="e#852#991#0" />
+            <element signature="e#1040#1169#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/static/EnityButton.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="414">
+          <caret line="2123" column="13" selection-start-line="2123" selection-start-column="5" selection-end-line="2123" selection-end-column="13" />
           <folding>
             <element signature="e#4#1307#0" />
             <element signature="e#55#520#0" />
@@ -3252,6 +3227,7 @@
             <element signature="e#547#555#0" />
             <element signature="e#1311#2624#0" />
             <element signature="e#1363#1828#0" />
+            <element signature="e#1371#1822#0" />
             <element signature="e#1855#1863#0" />
             <element signature="e#2628#3482#0" />
             <element signature="e#2680#2688#0" />
@@ -3365,10 +3341,6 @@
             <element signature="e#42780#43231#0" />
             <element signature="e#43239#43690#0" />
             <element signature="e#43723#43731#0" />
-            <element signature="e#44494#45824#0" />
-            <element signature="e#44546#45031#0" />
-            <element signature="e#44554#45025#0" />
-            <element signature="e#45058#45066#0" />
             <element signature="e#45828#47158#0" />
             <element signature="e#45880#46365#0" />
             <element signature="e#45888#46359#0" />
@@ -3381,7 +3353,6 @@
             <element signature="e#48548#49037#0" />
             <element signature="e#48556#49031#0" />
             <element signature="e#49064#49072#0" />
-            <element signature="e#49836#53602#0" />
             <element signature="e#49891#51353#0" />
             <element signature="e#49899#50355#0" />
             <element signature="e#50363#50851#0" />
@@ -3592,79 +3563,68 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/EnitySignalPreviewList.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-609">
-          <caret line="31" column="6" lean-forward="true" selection-start-line="31" selection-start-column="6" selection-end-line="31" selection-end-column="6" />
-        </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="713">
-          <caret line="280" selection-start-line="280" selection-end-line="280" />
+        <state relative-caret-position="314">
+          <caret line="323" column="25" lean-forward="true" selection-start-line="323" selection-start-column="25" selection-end-line="323" selection-end-column="25" />
           <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="n#div#0;n#div#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="n#div#1;n#div#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#draggable#0;n#div#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#div#0;n#draggable#0;n#div#0;n#div#0;n#template#0;n#!!top" />
             <element signature="n#label#0;n#div#0;n#div#0;n#template#0;n#!!top" />
             <element signature="n#div#2;n#div#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="n#style#0;n#div#0;n#div#3;n#div#0;n#div#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#draggable#1;n#div#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#div#0;n#draggable#1;n#div#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#div#0;n#div#0;n#draggable#1;n#div#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#div#0;n#div#0;n#div#0;n#draggable#1;n#div#0;n#div#0;n#template#0;n#!!top" />
             <element signature="n#div#4;n#div#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="e#5141#5825#0" />
-            <element signature="n#script#0;n#!!top" />
-            <element signature="e#6773#11152#0" />
-            <element signature="e#6795#6819#0" />
-            <element signature="e#6999#7504#0" />
-            <element signature="e#6480#6984#0" />
-            <element signature="e#7523#10578#0" />
-            <element signature="e#8978#10568#0" />
-            <element signature="e#9076#9550#0" />
-            <element signature="e#9122#9312#0" />
-            <element signature="e#9317#9505#0" />
-            <element signature="e#9657#10408#0" />
-            <element signature="e#9813#9861#0" />
-            <element signature="e#10103#10151#0" />
-            <element signature="e#8717#9452#0" />
-            <element signature="e#8793#8983#0" />
-            <element signature="e#8988#9274#0" />
-            <element signature="e#8718#8758#0" />
-            <element signature="e#8759#8949#0" />
-            <element signature="e#8954#9238#0" />
-            <element signature="e#9716#10264#0" />
-            <element signature="e#9786#10090#0" />
-            <element signature="e#9811#10076#0" />
-            <element signature="e#9874#10016#0" />
-            <element signature="e#10119#10253#0" />
-            <element signature="e#10144#10239#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/admin.less">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="475">
-          <caret line="208" column="11" lean-forward="true" selection-start-line="208" selection-start-column="11" selection-end-line="208" selection-end-column="11" />
-          <folding>
-            <element signature="e#168#206#0" />
-            <element signature="e#321#580#0" />
-            <element signature="e#487#574#0" />
-            <element signature="e#744#1149#0" />
-            <element signature="e#957#993#0" />
-            <element signature="e#1049#1141#0" />
-            <element signature="e#1191#2978#0" />
-            <element signature="e#1307#1727#0" />
-            <element signature="e#1577#1717#0" />
-            <element signature="e#1771#1902#0" />
-            <element signature="e#1947#2076#0" />
-            <element signature="e#2121#2260#0" />
-            <element signature="e#2309#2438#0" />
-            <element signature="e#2479#2970#0" />
-            <element signature="e#2606#2810#0" />
-            <element signature="e#2853#2960#0" />
-            <element signature="e#3217#3277#0" />
-            <element signature="e#3405#4584#0" />
-            <element signature="e#4641#4724#0" />
-            <element signature="e#4755#4793#0" />
+            <element signature="e#5139#5823#0" />
+            <element signature="e#6799#6832#0" />
+            <element signature="e#8117#8389#0" />
+            <element signature="e#8831#8863#0" />
+            <element signature="e#7229#7703#0" />
+            <element signature="e#7275#7465#0" />
+            <element signature="e#7470#7658#0" />
+            <element signature="e#7822#8518#0" />
+            <element signature="e#7863#8053#0" />
+            <element signature="e#8058#8342#0" />
+            <element signature="e#8645#9345#0" />
+            <element signature="e#8686#8876#0" />
+            <element signature="e#8881#9167#0" />
+            <element signature="e#9550#10250#0" />
+            <element signature="e#9591#9781#0" />
+            <element signature="e#9786#10072#0" />
+            <element signature="e#12222#12262#0" />
+            <element signature="e#12499#12539#0" />
+            <element signature="e#12642#12682#0" />
+            <element signature="e#12738#12778#0" />
+            <element signature="e#13011#13711#0" />
+            <element signature="e#13052#13242#0" />
+            <element signature="e#13247#13533#0" />
+            <element signature="e#13911#14392#0" />
+            <element signature="e#12983#13015#0" />
+            <element signature="e#13278#13310#0" />
+            <element signature="e#13369#13513#0" />
+            <element signature="e#11771#12319#0" />
+            <element signature="e#10512#10816#0" />
+            <element signature="e#10537#10802#0" />
+            <element signature="e#10600#10742#0" />
+            <element signature="e#10845#10979#0" />
+            <element signature="e#10870#10965#0" />
+            <element signature="n#style#0;n#!!top" />
+            <element signature="e#11319#13826#0" />
+            <element signature="e#11518#12975#0" />
+            <element signature="e#11745#12961#0" />
+            <element signature="e#11963#12054#0" />
+            <element signature="e#12124#12943#0" />
+            <element signature="e#12349#12557#0" />
+            <element signature="e#12639#12921#0" />
+            <element signature="e#12899#12962#0" />
+            <element signature="e#13017#13147#0" />
+            <element signature="e#13199#13312#0" />
           </folding>
         </state>
       </provider>

src/renderer/assets/less/splitscreen.less

@@ -0,0 +1,47 @@
+/*分屏样式*/
+/*分屏*/
+.split_screen {
+  position: absolute;
+  width: 100%;
+  height: 70%;
+  background-color: #000000;
+  box-sizing: border-box;
+  overflow: hidden;
+  color:#ffffff;
+  font-size:20px;
+
+  /*分屏项*/
+  .item {
+    border: 1px solid #000000;
+    color:#fff;
+    background-color: #717171;
+  }
+}
+
+/*1分屏*/
+.split_screen_one {
+  display: grid;
+  grid-template-columns: repeat(1,100%);
+  grid-template-rows: repeat(1,100%);
+}
+
+/*4分屏*/
+.split_screen_four {
+  display: grid;
+  grid-template-columns: repeat(2,50%);
+  grid-template-rows: repeat(2,50%);
+}
+
+/*9分屏*/
+.split_screen_nine {
+  display: grid;
+  grid-template-columns: repeat(3,33.3333%);
+  grid-template-rows: repeat(3,33.3333%);
+}
+
+/*16分屏*/
+.split_screen_sixteen {
+  display: grid;
+  grid-template-columns: repeat(4,25%);
+  grid-template-rows: repeat(4,25%);
+}

src/renderer/components/Admin.vue

@@ -38,24 +38,35 @@
                 }"
                  :ref="item.ID"
                  @click="clickBtn(item)"
+                 @mousedown="mouseDown(item)"
+                 @mouseup="mouseUp(item)"
             >
                 {{item.Text}}
             </div>
 
             <!--大屏显示-->
-            <div v-for="item in bigScreenJson"
-                :style="{
-                    position:'absolute',
+            <draggable
+                    :class="['split_screen', splitScreenStatus === 0 ? 'split_screen_one' : splitScreenStatus === 1 ? 'split_screen_four' : splitScreenStatus === 2 ? 'split_screen_nine' : 'split_screen_sixteen']"
+                    v-for="item in bigScreenJson"
+                    element="div"
+                    v-model="signalPreList"
+                    :options="dragOptions2"
+                    :move="onMove"
+                    @start="isDragging=true"
+                    @end="isDragging=false"
+                     :style="{
                     left:item.Left+'px',
                     top:item.Top+'px',
                     width:item.Width + 'px',
                     height:item.Height + 'px',
                     zIndex:item.ZIndex,
                     display:item.IsVisibility ? 'black' : 'none',
-                    backgroundColor: '#000000',
                 }"
             >
-            </div>
+                <div v-for="(item,key) in signalPreList" :key="key" class="item">
+                    {{item.ShowName}}
+                </div>
+            </draggable>
 
             <!--label标签-->
             <label v-for="item in lableJson"
@@ -93,9 +104,8 @@
             </div>
 
             <!--信号源列表-->
-            <div
-                :style="{
-                    position:'absolute',
+            <draggable
+                    :style="{
                     left:signalList[0].Left+'px',
                     top:signalList[0].Top+'px',
                     width:signalList[0].Width + 'px',
@@ -104,13 +114,28 @@
                     display:signalList[0].IsVisibility ? 'black' : 'none',
                     fontSize:signalList[0].FontSize + 'px',
                     color:`#${signalList[0].ForegroundStr.slice(3)}`,
-                }"
+                    position:'absolute',
+                    overflow:'auto',
+                    }"
+                    class="signal_body"
+                    element="div"
+                    v-model="signalList[0].PreviewList"
+                    :options="dragOptions1"
+                    :move="onMove"
+                    @start="isDragging=true"
+                    @end="isDragging=false"
+
             >
                 <!--列表项-->
-                <div v-for="item in signalList[0].PreviewList" style="color:#ffffff">
-                    {{item.ShowName}}
+                <div class="signal_item" v-for="item in signalList[0].PreviewList" :key="item.ID">
+                    <div class="signal_item_bg">
+                        <div class="signal_item_bg_body">
+                            <div class="signal_item_bg_body_space"></div>
+                            <div class="signal_item_bg_body_font">{{item.ShowName}}</div>
+                        </div>
+                    </div>
                 </div>
-            </div>
+            </draggable>
 
             <!--滑块-->
             <div v-for="item in sliderJson"
@@ -160,14 +185,17 @@
     import windowJson from '../../../static/EnityWindow'
     import storageUtils from "../../utils/storageUtils"
     import {mapState} from 'vuex'
+    import draggable from 'vuedraggable'
+    import '../assets/less/splitscreen.less'
 
     export default {
         components: {
-
+            draggable
         },
         data() {
             return {
                 user:storageUtils.getUser(),
+                signalPreList:[],  // 被拖到大屏中的信号源列表
                 isDragging:false,
                 splitScreenStatus:0,// 分屏状态（默认0: 自由屏，1: 4分屏  2：9分屏  3: 16分屏）
                 lableJson, // label标签配置
@@ -181,11 +209,28 @@
                 count2:0, // 预案管理模块计数器
                 count3:0, // 管理控制按钮计数器
                 count4:0, // 3个视频按钮计数器
+                count5:0, // 安卓分布式按钮
+                count6:0, // 7个开关按钮
             }
         },
         methods: {
+            onMove({relatedContext, draggedContext}) {
+                const relatedElement = relatedContext.element;
+                const draggedElement = draggedContext.element;
+                return (
+                    (!relatedElement || !relatedElement.fixed) && !draggedElement.fixed
+                )
+            },
+
+            // 分屏操作
+            spliceScreen(value) {
+                this.splitScreenStatus = value
+            },
+
             // 点击按钮
             clickBtn(e) {
+                console.log(e)
+
                 // 声音开关按钮处理
                 if(e.ID === '355d3c32-1502-40b4-9ddd-663d5b8469e7'){
                     if(this.count % 2 === 0){
@@ -228,7 +273,7 @@
                     return
                 }
 
-                // 管理控制按钮处理
+                // 5个管理控制按钮处理
                 if(e.Name.includes('V0--Btn6') || e.Name.includes('V0--Btn61') || e.Name.includes('V0--Btn12') || e.Name.includes('V0--Btn58') || e.Name.includes('V0--Btn77')){
                     if(this.count3===0){
                         this.$refs[e.ID][0].style.backgroundImage = 'url('+require(`../../../static/images/${e.ActionIcon}`)+')'
@@ -243,8 +288,66 @@
                     return
                 }
 
+                // LED屏分屏和清屏操作
+                if(e.ID === '7775e508-c6a5-4044-8264-24772a24fa97'){
+                    this.signalPreList = []
+                    return
+                }else if(e.ID === '49653a62-99cb-40e1-a513-60e42893adb7'){
+                    // 自由屏
+                    this.spliceScreen(0)
+                    return
+                }else if(e.ID === '52de9a2e-d171-423d-860f-3fe2750ec757'){
+                    // 四分屏
+                    this.spliceScreen(1)
+                    return
+                }else if(e.ID === 'ac0cc31c-a9b8-4bdf-88cf-928964b93ac5'){
+                    // 九分屏
+                    this.spliceScreen(2)
+                    return
+                }
+
+                // 安卓和分布式按钮
+                if(e.Text === '安卓' || e.Text === '分布式'){
+                    if(this.count5===0){
+                        this.$refs[e.ID][0].style.backgroundImage = 'url('+require(`../../../static/images/${e.ActionIcon}`)+')'
+                        ++this.count5
+                    }else {
+                        this.$refs[e.ID][0].style.backgroundImage = 'url('+require(`../../../static/images/${e.ActionIcon}`)+')'
+                        this.lastBtn5.style.backgroundImage = 'url('+require(`../../../static/images/${this.lastData5.BackIcon}`)+')'
+                    }
+                    // 保存点过的这个按钮和按钮数据
+                    this.lastBtn5 = this.$refs[e.ID][0]
+                    this.lastData5 = e
+                    return
+                }
+
                 // 其他按钮处理
                 this.$refs[e.ID][0].style.backgroundImage = 'url('+require(`../../../static/images/${e.ActionIcon}`)+')'
+
+                // 7个开关按钮操作
+                /*if(e.Text.includes('V6')){
+                    console.log('------------')
+                    if(this.count6===0){
+                        this.$refs[e.ID][0].style.backgroundImage = 'url('+require(`../../../static/images/${e.ActionIcon}`)+')'
+                        ++this.count6
+                    }else {
+                        this.$refs[e.ID][0].style.backgroundImage = 'url('+require(`../../../static/images/${e.BackIcon}`)+')'
+                    }
+                }*/
+            },
+
+            // 鼠标按下事件
+            mouseDown(e) {
+                if(e.Name.includes('V5') && 39<e.Name.slice(7)*1 && e.Name.slice(7)*1<44){
+                    this.$refs[e.ID][0].style.backgroundImage = 'url('+require(`../../../static/images/${e.ActionIcon}`)+')'
+                }
+            },
+
+            // 鼠标松开事件
+            mouseUp(e) {
+                if(e.Name.includes('V5') && 39<e.Name.slice(7)*1 && e.Name.slice(7)*1<44){
+                    this.$refs[e.ID][0].style.backgroundImage = 'url('+require(`../../../static/images/${e.BackIcon}`)+')'
+                }
             }
         },
         computed: {
@@ -277,8 +380,74 @@
         height: 981px;
         background-color: #333;
 
-        // 信号源列表项样式
+        // 列表项样式
+        .signal_item {
+            width: 100%;
+            height: 132px;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+
+            /*背景*/
+            .signal_item_bg {
+                width: 90%;
+                height: 130px;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                &:hover {
+                    background-color: rgba(113, 113, 113, 0.4);
+                }
+
+                /*主体*/
+                .signal_item_bg_body {
+                    width:96%;
+                    height:96%;
+                    background-color: rgba(127, 127, 127, 0.5);
+                    border-radius: 2px;
+
+                    /*空间*/
+                    .signal_item_bg_body_space {
+                        width:94%;
+                        height:80%;
+                        background-color: green;
+                        margin:6px auto 2px;
+                    }
+                    /*文字*/
+                    .signal_item_bg_body_font {
+                        width:100%;
+                        height:15%;
+                        text-align: center;
+                        margin:0 auto;
+                        font-size:16px;
+                        color:#fff;
+                        font-family: "Gill Sans", sans-serif;
+                    }
+                }
+            }
+        }
 
+        // 滚动条样式
+        /*定义滚动条高宽及背景高宽:分别对应横竖滚动条的尺寸*/
+        ::-webkit-scrollbar
+        {
+            width:4px;
+            background-color:rgba(10,66,125,0.65);
+        }
+        /*定义滚动条轨道:内阴影+圆角*/
+        ::-webkit-scrollbar-track
+        {
+            -webkit-box-shadow:inset 0 0 6px rgba(10,66,125,0.3);
+            border-radius:10px;
+            background-color:rgba(10,66,125,0.65);
+        }
+        /*定义滑块:内阴影+圆角*/
+        ::-webkit-scrollbar-thumb
+        {
+            border-radius:10px;
+            -webkit-box-shadow:inset 0 0 6px rgba(10,66,125,.3);
+            background-color:#666;
+        }
     }
 </style>