liuwei 4 роки тому
батько
коміт
1f14450989
2 змінених файлів з 364 додано та 288 видалено
  1. 278 278
      .idea/workspace.xml
  2. 86 10
      src/renderer/components/Admin.vue

+ 278 - 278
.idea/workspace.xml

@@ -16,16 +16,21 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
-    <splitter split-orientation="horizontal" split-proportion="0.8556947">
+    <splitter split-orientation="horizontal" split-proportion="0.6201264">
       <split-first>
         <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
           <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="587">
-                  <caret line="248" column="70" lean-forward="true" selection-start-line="248" selection-start-column="70" selection-end-line="248" selection-end-column="70" />
+                <state relative-caret-position="567">
+                  <caret line="358" column="17" lean-forward="true" selection-start-line="358" selection-start-column="17" selection-end-line="358" selection-end-column="17" />
                   <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#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#1;n#div#0;n#div#0;n#template#0;n#!!top" />
                     <element signature="n#draggable#1;n#div#0;n#div#0;n#template#0;n#!!top" />
@@ -34,50 +39,67 @@
                     <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#2;n#div#0;n#div#0;n#template#0;n#!!top" />
                     <element signature="e#6437#7121#0" />
-                    <element signature="e#7174#7203#0" expanded="true" />
                     <element signature="e#7800#7833#0" />
-                    <element signature="e#8670#8942#0" />
-                    <element signature="e#8997#9059#0" />
-                    <element signature="e#9235#9709#0" />
-                    <element signature="e#9281#9471#0" />
-                    <element signature="e#9476#9664#0" />
-                    <element signature="e#9828#10524#0" />
-                    <element signature="e#9869#10059#0" />
-                    <element signature="e#10064#10348#0" />
-                    <element signature="e#10651#11351#0" />
-                    <element signature="e#10692#10882#0" />
-                    <element signature="e#10887#11173#0" />
-                    <element signature="e#11558#12258#0" />
-                    <element signature="e#11599#11789#0" />
-                    <element signature="e#11794#12080#0" />
-                    <element signature="e#12358#12448#0" />
-                    <element signature="e#12504#12618#0" />
-                    <element signature="e#12674#12788#0" />
-                    <element signature="e#12844#12958#0" />
-                    <element signature="e#13043#13743#0" />
-                    <element signature="e#13084#13274#0" />
-                    <element signature="e#13279#13565#0" />
-                    <element signature="e#13811#13851#0" />
-                    <element signature="e#14482#14731#0" />
-                    <element signature="e#14779#15026#0" />
-                    <element signature="e#15636#15668#0" />
-                    <element signature="e#15056#15604#0" />
-                    <element signature="e#15126#15430#0" />
-                    <element signature="e#15151#15416#0" />
-                    <element signature="e#15214#15356#0" />
-                    <element signature="e#15459#15593#0" />
-                    <element signature="e#15484#15579#0" />
+                    <element signature="e#10888#11158#0" />
+                    <element signature="e#11213#11275#0" />
+                    <element signature="e#11457#11943#0" />
+                    <element signature="e#11584#11853#0" />
+                    <element signature="e#11665#11745#0" />
+                    <element signature="e#11750#11831#0" />
+                    <element signature="e#12040#12514#0" />
+                    <element signature="e#12086#12276#0" />
+                    <element signature="e#12281#12469#0" />
+                    <element signature="e#12633#13329#0" />
+                    <element signature="e#12674#12864#0" />
+                    <element signature="e#12869#13153#0" />
+                    <element signature="e#13456#14156#0" />
+                    <element signature="e#13497#13687#0" />
+                    <element signature="e#13692#13978#0" />
+                    <element signature="e#14435#14625#0" />
+                    <element signature="e#14630#14916#0" />
+                    <element signature="e#15142#15411#0" />
+                    <element signature="e#15223#15303#0" />
+                    <element signature="e#15308#15389#0" />
+                    <element signature="e#15473#15853#0" />
+                    <element signature="e#13267#13357#0" />
+                    <element signature="e#13413#13527#0" />
+                    <element signature="e#13583#13697#0" />
+                    <element signature="e#13753#13867#0" />
+                    <element signature="e#14055#14145#0" />
+                    <element signature="e#14201#14315#0" />
+                    <element signature="e#14371#14485#0" />
+                    <element signature="e#14541#14655#0" />
+                    <element signature="e#14659#14699#0" />
+                    <element signature="e#14910#15000#0" />
+                    <element signature="e#15056#15170#0" />
+                    <element signature="e#15226#15340#0" />
+                    <element signature="e#13952#14652#0" />
+                    <element signature="e#13993#14183#0" />
+                    <element signature="e#14188#14474#0" />
+                    <element signature="e#14747#15849#0" />
+                    <element signature="e#14849#15329#0" />
+                    <element signature="e#15334#15798#0" />
+                    <element signature="e#15913#16162#0" />
+                    <element signature="e#16004#16148#0" />
+                    <element signature="e#16210#16457#0" />
+                    <element signature="e#16301#16443#0" />
+                    <element signature="e#16564#17112#0" />
+                    <element signature="e#16634#16938#0" />
+                    <element signature="e#16659#16924#0" />
+                    <element signature="e#16722#16864#0" />
+                    <element signature="e#16967#17101#0" />
+                    <element signature="e#16992#17087#0" />
                     <element signature="n#style#0;n#!!top" />
-                    <element signature="e#15670#17813#0" />
-                    <element signature="e#15787#17189#0" />
-                    <element signature="e#15986#17179#0" />
-                    <element signature="e#16180#16263#0" />
-                    <element signature="e#16325#17165#0" />
-                    <element signature="e#16569#16757#0" />
-                    <element signature="e#16831#17147#0" />
-                    <element signature="e#17282#17367#0" />
-                    <element signature="e#17437#17597#0" />
-                    <element signature="e#17664#17807#0" />
+                    <element signature="e#17178#19321#0" />
+                    <element signature="e#17295#18697#0" />
+                    <element signature="e#17494#18687#0" />
+                    <element signature="e#17688#17771#0" />
+                    <element signature="e#17833#18673#0" />
+                    <element signature="e#18077#18265#0" />
+                    <element signature="e#18339#18655#0" />
+                    <element signature="e#18790#18875#0" />
+                    <element signature="e#18945#19105#0" />
+                    <element signature="e#19172#19315#0" />
                   </folding>
                 </state>
               </provider>
@@ -87,17 +109,16 @@
       </split-first>
       <split-second>
         <leaf>
-          <file pinned="false" current-in-tab="true">
+          <file pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/static/EnityButton.json">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="609">
-                  <caret line="2189" column="4" lean-forward="true" selection-start-line="2189" selection-start-column="4" selection-end-line="2189" selection-end-column="4" />
+                <state relative-caret-position="-1722">
+                  <caret line="57" column="2" lean-forward="true" selection-start-line="57" selection-start-column="2" selection-end-line="57" selection-end-column="2" />
                   <folding>
                     <element signature="e#4#1307#0" />
                     <element signature="e#55#520#0" />
                     <element signature="e#63#514#0" />
                     <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" />
@@ -229,7 +250,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" />
@@ -364,6 +384,7 @@
                     <element signature="e#93810#94663#0" />
                     <element signature="e#93862#93870#0" />
                     <element signature="e#93897#93905#0" />
+                    <element signature="e#94667#96467#0" />
                     <element signature="e#94720#95669#0" />
                     <element signature="e#94728#95190#0" />
                     <element signature="e#95198#95663#0" />
@@ -441,40 +462,39 @@
             </entry>
           </file>
           <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/static/EnityBigScreen.json">
+            <entry file="file://$PROJECT_DIR$/static/EnityLable.json">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="84">
-                  <caret line="229" column="1" lean-forward="true" selection-start-line="229" selection-start-column="1" selection-end-line="229" selection-end-column="1" />
+                <state relative-caret-position="276">
+                  <caret line="255" column="21" lean-forward="true" selection-start-line="255" selection-start-column="21" selection-end-line="255" selection-end-column="21" />
                   <folding>
-                    <element signature="e#6#1363#0" />
-                    <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#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" />
-                    <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" />
+                    <element signature="e#4#579#0" />
+                    <element signature="e#583#1163#0" />
+                    <element signature="e#1167#1747#0" />
+                    <element signature="e#1751#2344#0" />
+                    <element signature="e#2348#2923#0" />
+                    <element signature="e#2927#3503#0" />
+                    <element signature="e#3507#4082#0" />
+                    <element signature="e#4086#4666#0" />
+                    <element signature="e#6412#6988#0" />
+                    <element signature="e#6992#7570#0" />
+                    <element signature="e#7574#8154#0" />
+                    <element signature="e#8158#8734#0" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/static/EnitySlider.json">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="465">
+                  <caret line="32" column="25" lean-forward="true" selection-start-line="32" selection-start-column="25" selection-end-line="32" selection-end-column="25" />
+                  <folding>
+                    <element signature="e#834#1660#0" />
+                    <element signature="e#1664#2490#0" />
+                    <element signature="e#2494#3320#0" />
+                    <element signature="e#3324#4150#0" />
+                    <element signature="e#4154#4980#0" />
                   </folding>
                 </state>
               </provider>
@@ -493,9 +513,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>className</find>
-      <find>;</find>
-      <find>less</find>
       <find>,</find>
       <find>app.setAppUserModelId</find>
       <find>&quot;win&quot;</find>
@@ -516,13 +533,21 @@
       <find>085b17a0-133d-48db-9557-dd4ad732a8d6</find>
       <find>08208721-41cc-4f1e-937</find>
       <find>b842585-0c91-4e65-bfed-a219</find>
-      <find>08208721-41cc-4f1e-937b-3a1627389049</find>
       <find>V5</find>
       <find>V10</find>
+      <find>投影</find>
+      <find>08208721-41cc-4f1e-937b-3a1627389049</find>
+      <find>cb2687fd-931a</find>
+      <find>64a2f252-370a-4bc6-a817-</find>
+      <find>lable</find>
+      <find>label</find>
+      <find>d80a8b6e-9f88-41ff</find>
+      <find>cb2687fd-931a-4b38-a76d-9c3ea171b8d8</find>
     </findStrings>
     <replaceStrings>
       <replace>class</replace>
       <replace>;</replace>
+      <replace>label</replace>
     </replaceStrings>
     <dirStrings>
       <dir>C:\Users\liuwei\Desktop\electron\electron-app</dir>
@@ -609,39 +634,6 @@
               <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="src" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="electron-app" type="b2602c69:ProjectViewProjectNode" />
-              <item name="electron-app" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="renderer" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <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="assets" 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="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" />
@@ -733,12 +725,13 @@
       <workItem from="1587044888750" duration="72000" />
       <workItem from="1587088258410" duration="506000" />
       <workItem from="1587092453442" duration="5506000" />
-      <workItem from="1587177725929" duration="22229000" />
+      <workItem from="1587177725929" duration="22477000" />
+      <workItem from="1587262250088" duration="10127000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="241305000" />
+    <option name="totallyTimeSpent" value="251680000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -753,7 +746,7 @@
     <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.11643836" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.10063224" />
       <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" />
@@ -773,27 +766,6 @@
       <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" />
-      <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 anchor="bottom" id="Terminal" order="10" 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-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
@@ -1042,31 +1014,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/EnityLable.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="336">
-          <caret line="16" column="18" selection-start-line="16" selection-start-column="18" selection-end-line="16" selection-end-column="18" />
-          <folding>
-            <element signature="e#583#1163#0" />
-            <element signature="e#1167#1747#0" />
-            <element signature="e#1751#2344#0" />
-            <element signature="e#2348#2923#0" />
-            <element signature="e#2927#3503#0" />
-            <element signature="e#3507#4082#0" />
-            <element signature="e#4086#4666#0" />
-            <element signature="e#4670#5246#0" />
-            <element signature="e#5250#5828#0" />
-            <element signature="e#5832#6408#0" />
-            <element signature="e#6412#6988#0" />
-            <element signature="e#6992#7570#0" />
-            <element signature="e#7574#8154#0" />
-            <element signature="e#8158#8734#0" />
-            <element signature="e#8738#9313#0" />
-            <element signature="e#9317#9895#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/static/EnityDevice.json">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-693">
@@ -3487,19 +3434,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/EnitySlider.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-147">
-          <caret line="17" column="25" lean-forward="true" selection-start-line="17" selection-start-column="25" selection-end-line="17" selection-end-column="25" />
-          <folding>
-            <element signature="e#1664#2490#0" />
-            <element signature="e#2494#3320#0" />
-            <element signature="e#3324#4150#0" />
-            <element signature="e#4154#4980#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/static/EnitySystem.json">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="105">
@@ -3535,48 +3469,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/EnityWindow.json">
-      <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" />
-            <element signature="e#673#1342#0" />
-            <element signature="e#830#838#0" />
-            <element signature="e#861#869#0" />
-            <element signature="e#1346#2019#0" />
-            <element signature="e#1501#1509#0" />
-            <element signature="e#1532#1540#0" />
-            <element signature="e#2023#2693#0" />
-            <element signature="e#2181#2189#0" />
-            <element signature="e#2212#2220#0" />
-            <element signature="e#2697#3367#0" />
-            <element signature="e#2855#2863#0" />
-            <element signature="e#2886#2894#0" />
-            <element signature="e#3371#4040#0" />
-            <element signature="e#3527#3535#0" />
-            <element signature="e#3558#3566#0" />
-            <element signature="e#4044#4714#0" />
-            <element signature="e#4201#4209#0" />
-            <element signature="e#4232#4240#0" />
-            <element signature="e#4718#5396#0" />
-            <element signature="e#4875#4883#0" />
-            <element signature="e#4906#4914#0" />
-            <element signature="e#5400#6067#0" />
-            <element signature="e#5556#5564#0" />
-            <element signature="e#5587#5595#0" />
-            <element signature="e#6071#6738#0" />
-            <element signature="e#6227#6235#0" />
-            <element signature="e#6258#6266#0" />
-            <element signature="e#6742#7419#0" />
-            <element signature="e#6899#6907#0" />
-            <element signature="e#6930#6938#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="3016">
@@ -3639,13 +3531,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/EnityImage.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1509">
-          <caret line="45" column="23" lean-forward="true" selection-start-line="45" selection-start-column="23" selection-end-line="45" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/static/EnityBigScreen.json">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="84">
@@ -3684,16 +3569,57 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/static/EnityWindow.json">
+      <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" />
+            <element signature="e#673#1342#0" />
+            <element signature="e#830#838#0" />
+            <element signature="e#861#869#0" />
+            <element signature="e#1346#2019#0" />
+            <element signature="e#1501#1509#0" />
+            <element signature="e#1532#1540#0" />
+            <element signature="e#2023#2693#0" />
+            <element signature="e#2181#2189#0" />
+            <element signature="e#2212#2220#0" />
+            <element signature="e#2697#3367#0" />
+            <element signature="e#2855#2863#0" />
+            <element signature="e#2886#2894#0" />
+            <element signature="e#3371#4040#0" />
+            <element signature="e#3527#3535#0" />
+            <element signature="e#3558#3566#0" />
+            <element signature="e#4044#4714#0" />
+            <element signature="e#4201#4209#0" />
+            <element signature="e#4232#4240#0" />
+            <element signature="e#4718#5396#0" />
+            <element signature="e#4875#4883#0" />
+            <element signature="e#4906#4914#0" />
+            <element signature="e#5400#6067#0" />
+            <element signature="e#5556#5564#0" />
+            <element signature="e#5587#5595#0" />
+            <element signature="e#6071#6738#0" />
+            <element signature="e#6227#6235#0" />
+            <element signature="e#6258#6266#0" />
+            <element signature="e#6742#7419#0" />
+            <element signature="e#6899#6907#0" />
+            <element signature="e#6930#6938#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/static/EnityButton.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="609">
-          <caret line="2189" column="4" lean-forward="true" selection-start-line="2189" selection-start-column="4" selection-end-line="2189" selection-end-column="4" />
+        <state relative-caret-position="-1722">
+          <caret line="57" column="2" lean-forward="true" selection-start-line="57" selection-start-column="2" selection-end-line="57" selection-end-column="2" />
           <folding>
             <element signature="e#4#1307#0" />
             <element signature="e#55#520#0" />
             <element signature="e#63#514#0" />
             <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" />
@@ -3825,7 +3751,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" />
@@ -3960,6 +3885,7 @@
             <element signature="e#93810#94663#0" />
             <element signature="e#93862#93870#0" />
             <element signature="e#93897#93905#0" />
+            <element signature="e#94667#96467#0" />
             <element signature="e#94720#95669#0" />
             <element signature="e#94728#95190#0" />
             <element signature="e#95198#95663#0" />
@@ -4035,12 +3961,69 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/static/EnityImage.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="21">
+          <caret line="21" column="4" lean-forward="true" selection-start-line="21" selection-start-column="4" selection-end-line="21" selection-end-column="4" />
+          <folding>
+            <element signature="e#4#464#0" />
+            <element signature="e#468#930#0" />
+            <element signature="e#934#1403#0" />
+            <element signature="e#1407#1876#0" />
+            <element signature="e#1880#2348#0" />
+            <element signature="e#2352#2818#0" />
+            <element signature="e#2822#3289#0" />
+            <element signature="e#3293#3757#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="276">
+          <caret line="255" column="21" lean-forward="true" selection-start-line="255" selection-start-column="21" selection-end-line="255" selection-end-column="21" />
+          <folding>
+            <element signature="e#4#579#0" />
+            <element signature="e#583#1163#0" />
+            <element signature="e#1167#1747#0" />
+            <element signature="e#1751#2344#0" />
+            <element signature="e#2348#2923#0" />
+            <element signature="e#2927#3503#0" />
+            <element signature="e#3507#4082#0" />
+            <element signature="e#4086#4666#0" />
+            <element signature="e#6412#6988#0" />
+            <element signature="e#6992#7570#0" />
+            <element signature="e#7574#8154#0" />
+            <element signature="e#8158#8734#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/static/EnitySlider.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="465">
+          <caret line="32" column="25" lean-forward="true" selection-start-line="32" selection-start-column="25" selection-end-line="32" selection-end-column="25" />
+          <folding>
+            <element signature="e#834#1660#0" />
+            <element signature="e#1664#2490#0" />
+            <element signature="e#2494#3320#0" />
+            <element signature="e#3324#4150#0" />
+            <element signature="e#4154#4980#0" />
+          </folding>
+        </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="587">
-          <caret line="248" column="70" lean-forward="true" selection-start-line="248" selection-start-column="70" selection-end-line="248" selection-end-column="70" />
+        <state relative-caret-position="567">
+          <caret line="358" column="17" lean-forward="true" selection-start-line="358" selection-start-column="17" selection-end-line="358" selection-end-column="17" />
           <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#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#1;n#div#0;n#div#0;n#template#0;n#!!top" />
             <element signature="n#draggable#1;n#div#0;n#div#0;n#template#0;n#!!top" />
@@ -4049,50 +4032,67 @@
             <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#2;n#div#0;n#div#0;n#template#0;n#!!top" />
             <element signature="e#6437#7121#0" />
-            <element signature="e#7174#7203#0" expanded="true" />
             <element signature="e#7800#7833#0" />
-            <element signature="e#8670#8942#0" />
-            <element signature="e#8997#9059#0" />
-            <element signature="e#9235#9709#0" />
-            <element signature="e#9281#9471#0" />
-            <element signature="e#9476#9664#0" />
-            <element signature="e#9828#10524#0" />
-            <element signature="e#9869#10059#0" />
-            <element signature="e#10064#10348#0" />
-            <element signature="e#10651#11351#0" />
-            <element signature="e#10692#10882#0" />
-            <element signature="e#10887#11173#0" />
-            <element signature="e#11558#12258#0" />
-            <element signature="e#11599#11789#0" />
-            <element signature="e#11794#12080#0" />
-            <element signature="e#12358#12448#0" />
-            <element signature="e#12504#12618#0" />
-            <element signature="e#12674#12788#0" />
-            <element signature="e#12844#12958#0" />
-            <element signature="e#13043#13743#0" />
-            <element signature="e#13084#13274#0" />
-            <element signature="e#13279#13565#0" />
-            <element signature="e#13811#13851#0" />
-            <element signature="e#14482#14731#0" />
-            <element signature="e#14779#15026#0" />
-            <element signature="e#15636#15668#0" />
-            <element signature="e#15056#15604#0" />
-            <element signature="e#15126#15430#0" />
-            <element signature="e#15151#15416#0" />
-            <element signature="e#15214#15356#0" />
-            <element signature="e#15459#15593#0" />
-            <element signature="e#15484#15579#0" />
+            <element signature="e#10888#11158#0" />
+            <element signature="e#11213#11275#0" />
+            <element signature="e#11457#11943#0" />
+            <element signature="e#11584#11853#0" />
+            <element signature="e#11665#11745#0" />
+            <element signature="e#11750#11831#0" />
+            <element signature="e#12040#12514#0" />
+            <element signature="e#12086#12276#0" />
+            <element signature="e#12281#12469#0" />
+            <element signature="e#12633#13329#0" />
+            <element signature="e#12674#12864#0" />
+            <element signature="e#12869#13153#0" />
+            <element signature="e#13456#14156#0" />
+            <element signature="e#13497#13687#0" />
+            <element signature="e#13692#13978#0" />
+            <element signature="e#14435#14625#0" />
+            <element signature="e#14630#14916#0" />
+            <element signature="e#15142#15411#0" />
+            <element signature="e#15223#15303#0" />
+            <element signature="e#15308#15389#0" />
+            <element signature="e#15473#15853#0" />
+            <element signature="e#13267#13357#0" />
+            <element signature="e#13413#13527#0" />
+            <element signature="e#13583#13697#0" />
+            <element signature="e#13753#13867#0" />
+            <element signature="e#14055#14145#0" />
+            <element signature="e#14201#14315#0" />
+            <element signature="e#14371#14485#0" />
+            <element signature="e#14541#14655#0" />
+            <element signature="e#14659#14699#0" />
+            <element signature="e#14910#15000#0" />
+            <element signature="e#15056#15170#0" />
+            <element signature="e#15226#15340#0" />
+            <element signature="e#13952#14652#0" />
+            <element signature="e#13993#14183#0" />
+            <element signature="e#14188#14474#0" />
+            <element signature="e#14747#15849#0" />
+            <element signature="e#14849#15329#0" />
+            <element signature="e#15334#15798#0" />
+            <element signature="e#15913#16162#0" />
+            <element signature="e#16004#16148#0" />
+            <element signature="e#16210#16457#0" />
+            <element signature="e#16301#16443#0" />
+            <element signature="e#16564#17112#0" />
+            <element signature="e#16634#16938#0" />
+            <element signature="e#16659#16924#0" />
+            <element signature="e#16722#16864#0" />
+            <element signature="e#16967#17101#0" />
+            <element signature="e#16992#17087#0" />
             <element signature="n#style#0;n#!!top" />
-            <element signature="e#15670#17813#0" />
-            <element signature="e#15787#17189#0" />
-            <element signature="e#15986#17179#0" />
-            <element signature="e#16180#16263#0" />
-            <element signature="e#16325#17165#0" />
-            <element signature="e#16569#16757#0" />
-            <element signature="e#16831#17147#0" />
-            <element signature="e#17282#17367#0" />
-            <element signature="e#17437#17597#0" />
-            <element signature="e#17664#17807#0" />
+            <element signature="e#17178#19321#0" />
+            <element signature="e#17295#18697#0" />
+            <element signature="e#17494#18687#0" />
+            <element signature="e#17688#17771#0" />
+            <element signature="e#17833#18673#0" />
+            <element signature="e#18077#18265#0" />
+            <element signature="e#18339#18655#0" />
+            <element signature="e#18790#18875#0" />
+            <element signature="e#18945#19105#0" />
+            <element signature="e#19172#19315#0" />
           </folding>
         </state>
       </provider>

+ 86 - 10
src/renderer/components/Admin.vue

@@ -69,7 +69,7 @@
             </draggable>
 
             <!--label标签-->
-            <label v-for="item in lableJson"
+            <label v-for="item in labelJson"
                    :style="{
                  fontSize:item.FontSize + 'px',
                  position:'absolute',
@@ -179,7 +179,7 @@
     import {mapState} from 'vuex'
     import draggable from 'vuedraggable'
     import '../assets/less/splitscreen.less'
-    import lableJson from '../../../static/EnityLable'
+    import labelJson from '../../../static/EnityLable'
     import bigScreenJson from '../../../static/EnityBigScreen'
     import buttonJson from '../../../static/EnityButton'
     import signalList from '../../../static/EnitySignalPreviewList'
@@ -198,7 +198,7 @@
                 signalPreList:[],  // 被拖到大屏中的信号源列表
                 isDragging:false,
                 splitScreenStatus:0,// 分屏状态(默认0: 自由屏,1: 4分屏  2:9分屏  3: 16分屏)
-                lableJson, // label标签配置
+                labelJson, // label标签配置
                 bigScreenJson,// 大屏显示配置
                 buttonJson, // button按钮配置
                 signalList, // 信号源列表配置
@@ -211,13 +211,37 @@
                 count4:0, // 3个视频按钮计数器
                 count5:0, // 安卓分布式按钮
                 systemStatus:false,// 系统开关状态,默认为关
-                arr:[],// 分屏数组
-
+                arr:[],// 分屏按钮数组
+                funcBtnArr:[],// 功能按钮数组
+                funcLabArr:[],// 功能label数组
             }
         },
         mounted() {
+            // 获取分屏按钮数组
             const arr = buttonJson.filter(item => item.Name.includes('V5') || item.Name.includes('LED智慧屏') || (item.Name.includes('V10') && 66<item.Name.slice(8) && item.Name.slice(8)<72) || (item.Name.includes('V9') && 68<item.Name.slice(7) && item.Name.slice(7)<72))
             this.arr = arr
+
+            // 获取功能按钮涉及到的按钮和label
+            // 1.电源管理
+            const curSourceBtnArr = this.buttonJson.filter(item => item.WindowID === 'd80a8b6e-9f88-41ff-b3a7-1ff8d6ee37a5')
+            const curSourceLabArr = this.labelJson.filter(item => item.WindowID === 'd80a8b6e-9f88-41ff-b3a7-1ff8d6ee37a5')
+            // 2.音频管理
+            const audioBtnArr = this.buttonJson.filter(item => item.WindowID === 'cb2687fd-931a-4b38-a76d-9c3ea171b8d8')
+            const audioLabArr = this.labelJson.filter(item => item.WindowID === 'cb2687fd-931a-4b38-a76d-9c3ea171b8d8')
+            // 3.视频管理
+            const vedioBtnArr = this.buttonJson.filter(item => item.WindowID === '027ab76d-6b9c-46ac-abe6-75b8059f786b')
+            const vedioLabArr = this.labelJson.filter(item => item.WindowID === '027ab76d-6b9c-46ac-abe6-75b8059f786b')
+            // 4.环境控制
+            const envirControlBtnArr = this.buttonJson.filter(item => item.WindowID === 'a12b287f-f68c-4efa-b652-d6e5b0a09d0d')
+            const envirControlLabArr = this.labelJson.filter(item => item.WindowID === 'a12b287f-f68c-4efa-b652-d6e5b0a09d0d')
+            // 5.电脑控制
+            const compControlBtnArr = this.buttonJson.filter(item => item.WindowID === 'd9868551-b579-4258-9bc7-7c1f733773f5')
+            const compControlLabArr = this.labelJson.filter(item => item.WindowID === 'd9868551-b579-4258-9bc7-7c1f733773f5')
+
+            const funcBtnArr = [...curSourceBtnArr,...audioBtnArr,...vedioBtnArr,...envirControlBtnArr,...compControlBtnArr]
+            const funcLabArr = [...curSourceLabArr,...audioLabArr,...vedioLabArr,...envirControlLabArr,...compControlLabArr]
+            this.funcBtnArr = funcBtnArr
+            this.funcLabArr = funcLabArr
         },
         methods: {
             // 移动信号源
@@ -239,6 +263,8 @@
                 console.log(e)
                 // 切换屏幕
                 if(e.Text === 'LCD屏' || e.Text === 'LED屏' || e.Text === '投影机'){
+                    // 首先清屏
+                    this.signalPreList = []
                     this.arr.forEach((item,index) => {
                         if(e.MouseDownActionList[0].SourceID === item.WindowID){
                             item.IsVisibility = true
@@ -293,6 +319,7 @@
 
                 // 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')){
+                    // (1)背景切换
                     if(this.count3===0){
                         this.$refs[e.ID][0].style.backgroundImage = 'url('+require(`../../../static/images/${e.ActionIcon}`)+')'
                         ++this.count3
@@ -303,6 +330,24 @@
                     // 保存点过的这个按钮和按钮数据
                     this.lastBtn3 = this.$refs[e.ID][0]
                     this.lastData3 = e
+
+                    // (2)界面切换
+                    this.funcBtnArr.forEach((item,index) => {
+                        if(e.MouseDownActionList[0].SourceID === item.WindowID){
+                            item.IsVisibility = true
+                        }else {
+                            item.IsVisibility = false
+                        }
+                    })
+                    this.funcLabArr.forEach((item,index) => {
+                        if(e.MouseDownActionList[0].SourceID === item.WindowID){
+                            item.IsVisibility = true
+                        }else {
+                            item.IsVisibility = false
+                        }
+                    })
+                    this.buttonJson = [...this.buttonJson,...this.funcBtnArr]
+                    this.labelJson = [...this.labelJson,...this.funcLabArr]
                     return
                 }
 
@@ -324,6 +369,42 @@
                     return
                 }
 
+                // LCD屏分屏和清屏操作
+                if(e.ID === '95c5d676-46a5-4c46-b550-9bc013a59937'){
+                    this.signalPreList = []
+                    return
+                }else if(e.ID === 'd55c81a8-54d7-4d90-aad7-4f34c3ba3950'){
+                    // 自由屏
+                    this.spliceScreen(0)
+                    return
+                }else if(e.ID === '0cabb1ba-bcae-45d9-b019-2b45486f98e3'){
+                    // 四分屏
+                    this.spliceScreen(1)
+                    return
+                }else if(e.ID === '201e4bb0-c039-46c7-a55a-049d00de4769'){
+                    // 九分屏
+                    this.spliceScreen(2)
+                    return
+                }else if(e.ID === '2d4c49bc-905b-4f96-a65c-9b0a3e057b3f'){
+                    // 16分屏
+                    this.spliceScreen(3)
+                    return
+                }
+
+                // 投影机分屏和清屏操作
+                if(e.ID === 'f47e84bb-c878-4b22-a9d6-eb2e307283bc'){
+                    this.signalPreList = []
+                    return
+                }else if(e.ID === '4142ab5b-ce52-4655-a28d-724bfabb24f0'){
+                    // 自由屏
+                    this.spliceScreen(0)
+                    return
+                }else if(e.ID === '9bb5b3e3-9e21-4716-8059-f5b35b24e3fa'){
+                    // 四分屏
+                    this.spliceScreen(1)
+                    return
+                }
+
                 // 安卓和分布式按钮
                 if(e.Text === '安卓' || e.Text === '分布式'){
                     if(this.count5===0){
@@ -368,11 +449,6 @@
                     this.$refs[e.ID][0].style.backgroundImage = 'url('+require(`../../../static/images/${e.BackIcon}`)+')'
                 }
             },
-
-            // 切换led,lcd和投影机屏幕
-            toggleScreen() {
-
-            }
         },
         computed: {
             ...mapState(['deviceList']),