Ver Fonte

将项目进行拆分,利用vuex管理公共状态

liuwei há 4 anos atrás
pai
commit
f4762cd163

+ 227 - 538
.idea/workspace.xml

@@ -2,16 +2,12 @@
 <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/components/BigShow.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/renderer/components/Button.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/renderer/components/Image.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/renderer/components/Label.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/renderer/components/SignalList.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/renderer/components/Slider.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/components/Admin.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/components/Admin.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/main.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/main.js" 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/Button.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/components/Button.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/renderer/store/actions.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/store/actions.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/renderer/store/mutation-types.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/store/mutation-types.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/renderer/store/mutations.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/store/mutations.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/renderer/store/state.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/store/state.js" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/dist/" />
@@ -27,297 +23,127 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/index.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="265">
-              <caret line="35" column="89" lean-forward="true" selection-start-line="35" selection-start-column="5" selection-end-line="35" selection-end-column="89" />
-              <folding>
-                <element signature="e#0#45#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/renderer/main.js">
+        <entry file="file://$PROJECT_DIR$/src/renderer/components/Button.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="357">
-              <caret line="17" column="2" selection-start-line="17" selection-end-line="18" selection-end-column="41" />
-              <folding>
-                <element signature="e#0#21#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="286">
+              <caret line="172" column="48" selection-start-line="172" selection-start-column="48" selection-end-line="172" selection-end-column="48" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/renderer/components/Admin.vue">
+        <entry file="file://$PROJECT_DIR$/src/renderer/components/BigShow.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="63">
-              <caret line="202" column="7" selection-start-line="202" selection-start-column="7" selection-end-line="202" selection-end-column="7" />
+            <state relative-caret-position="126">
+              <caret line="91" column="8" lean-forward="true" selection-start-line="91" selection-start-column="8" selection-end-line="91" 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#div#0;n#div#0;n#template#0;n#!!top" />
-                <element signature="e#886#1950#0" />
-                <element signature="e#2020#3055#0" />
-                <element signature="n#div#0;n#draggable#0;n#div#0;n#div#0;n#template#0;n#!!top" />
-                <element signature="e#3089#3713#0" />
-                <element signature="e#3820#4452#0" />
-                <element signature="e#4484#5926#0" />
-                <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="e#6036#7384#0" />
-                <element signature="n#div#0;n#div#2;n#div#0;n#div#0;n#template#0;n#!!top" />
-                <element signature="n#div#0;n#div#0;n#div#2;n#div#0;n#div#0;n#template#0;n#!!top" />
-                <element signature="e#7271#7994#0" />
+                <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#8368#8421#0" />
-                <element signature="e#8652#21673#0" />
-                <element signature="e#8674#8707#0" />
-                <element signature="e#8725#9504#0" />
-                <element signature="e#9108#9830#0" />
-                <element signature="e#9156#9166#0" />
-                <element signature="e#9525#11036#0" />
-                <element signature="e#9602#9628#0" />
-                <element signature="e#9813#9834#0" />
-                <element signature="e#9967#10825#0" />
-                <element signature="e#10839#10855#0" />
-                <element signature="e#11056#21098#0" />
-                <element signature="e#11132#11402#0" />
-                <element signature="e#11457#11519#0" />
-                <element signature="e#11566#19102#0" />
-                <element signature="e#11697#12180#0" />
-                <element signature="e#11745#11938#0" />
-                <element signature="e#11944#12135#0" />
-                <element signature="e#12286#13420#0" />
-                <element signature="e#12331#12525#0" />
-                <element signature="e#12556#12850#0" />
-                <element signature="e#13102#13374#0" />
-                <element signature="e#13185#13265#0" />
-                <element signature="e#13271#13352#0" />
-                <element signature="e#13549#14284#0" />
-                <element signature="e#13594#13788#0" />
-                <element signature="e#13818#14110#0" />
-                <element signature="e#14493#16409#0" />
-                <element signature="e#14569#14763#0" />
-                <element signature="e#14794#15088#0" />
-                <element signature="e#15243#15253#0" />
-                <element signature="e#15349#15621#0" />
-                <element signature="e#15432#15512#0" />
-                <element signature="e#15518#15599#0" />
-                <element signature="e#15719#15991#0" />
-                <element signature="e#15802#15882#0" />
-                <element signature="e#15888#15969#0" />
-                <element signature="e#16091#16363#0" />
-                <element signature="e#16174#16254#0" />
-                <element signature="e#16260#16341#0" />
-                <element signature="e#16609#16725#0" />
-                <element signature="e#16886#17000#0" />
-                <element signature="e#17161#17275#0" />
-                <element signature="e#17385#17499#0" />
-                <element signature="e#17558#17673#0" />
-                <element signature="e#17760#18501#0" />
-                <element signature="e#17805#17999#0" />
-                <element signature="e#18029#18323#0" />
-                <element signature="e#18604#19064#0" />
-                <element signature="e#18648#18846#0" />
-                <element signature="e#18851#19046#0" />
-                <element signature="e#19152#20102#0" />
-                <element signature="e#19248#19406#0" />
-                <element signature="e#19469#19627#0" />
-                <element signature="e#19690#19848#0" />
-                <element signature="e#19904#20065#0" />
-                <element signature="e#20150#21087#0" />
-                <element signature="e#20246#20402#0" />
-                <element signature="e#20465#20621#0" />
-                <element signature="e#20684#20840#0" />
-                <element signature="e#20891#21050#0" />
-                <element signature="e#21119#21667#0" />
-                <element signature="e#21189#21493#0" />
-                <element signature="e#21214#21479#0" />
-                <element signature="e#21277#21419#0" />
-                <element signature="e#21522#21656#0" />
-                <element signature="e#21547#21642#0" />
+                <element signature="e#1190#2376#0" />
+                <element signature="e#1207#1429#0" />
+                <element signature="e#1228#1339#0" />
+                <element signature="e#1452#1486#0" />
+                <element signature="e#1506#1980#0" />
+                <element signature="e#1582#1852#0" />
+                <element signature="e#1753#2370#0" />
+                <element signature="e#1862#1894#0" />
+                <element signature="e#1887#1956#0" />
+                <element signature="e#1981#2101#0" />
+                <element signature="e#2074#2378#0" />
+                <element signature="e#2099#2364#0" />
+                <element signature="e#2162#2304#0" />
+                <element signature="e#2407#2541#0" />
+                <element signature="e#2432#2527#0" />
                 <element signature="n#style#0;n#!!top" />
-                <element signature="e#21733#23893#0" />
-                <element signature="e#21850#23268#0" />
-                <element signature="e#22050#23258#0" />
-                <element signature="e#22245#22328#0" />
-                <element signature="e#22391#23244#0" />
-                <element signature="e#22638#22829#0" />
-                <element signature="e#22905#23226#0" />
-                <element signature="e#23354#23444#0" />
-                <element signature="e#23508#23677#0" />
-                <element signature="e#23738#23887#0" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/renderer/components/Slider.vue">
+        <entry file="file://$PROJECT_DIR$/src/renderer/store/actions.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="126">
-              <caret line="38" column="11" lean-forward="true" selection-start-line="38" selection-start-column="11" selection-end-line="38" selection-end-column="11" />
+            <state relative-caret-position="63">
+              <caret line="27" column="1" lean-forward="true" selection-start-line="27" selection-start-column="1" selection-end-line="27" selection-end-column="1" />
               <folding>
-                <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#0;n#div#0;n#div#0;n#div#0;n#template#0;n#!!top" />
+                <element signature="e#121#498#0" />
+                <element signature="e#126#209#0" />
+                <element signature="e#235#311#0" />
+                <element signature="e#347#357#0" />
+                <element signature="e#421#431#0" />
+                <element signature="e#518#528#0" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/renderer/components/Image.vue">
+        <entry file="file://$PROJECT_DIR$/src/renderer/store/mutations.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="525">
-              <caret line="25" selection-start-line="25" selection-end-line="25" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/renderer/components/SignalList.vue">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="84">
-              <caret line="80" column="8" lean-forward="true" selection-start-line="80" selection-start-column="8" selection-end-line="80" selection-end-column="8" />
+            <state relative-caret-position="378">
+              <caret line="18" column="7" lean-forward="true" selection-start-line="18" selection-start-column="7" selection-end-line="18" selection-end-column="7" />
               <folding>
-                <element signature="n#template#0;n#!!top" />
-                <element signature="n#draggable#0;n#template#0;n#!!top" />
-                <element signature="n#div#0;n#draggable#0;n#template#0;n#!!top" />
-                <element signature="n#div#0;n#div#0;n#draggable#0;n#template#0;n#!!top" />
-                <element signature="n#div#0;n#div#0;n#div#0;n#draggable#0;n#template#0;n#!!top" />
-                <element signature="n#script#0;n#!!top" />
-                <element signature="e#1440#2111#0" />
-                <element signature="e#1426#1459#0" />
-                <element signature="e#1523#1547#0" />
-                <element signature="e#1599#1869#0" />
-                <element signature="e#1553#2105#0" />
-                <element signature="e#1497#1801#0" />
-                <element signature="e#1522#1787#0" />
-                <element signature="e#1585#1727#0" />
-                <element signature="e#1830#1964#0" />
-                <element signature="e#1855#1950#0" />
-                <element signature="n#style#0;n#!!top" />
+                <element signature="n#!!doc" expanded="true" />
+                <element signature="e#25#78#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/renderer/components/BigShow.vue">
+        <entry file="file://$PROJECT_DIR$/src/renderer/store/state.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="608">
-              <caret line="81" column="9" lean-forward="true" selection-start-line="62" selection-start-column="8" selection-end-line="81" selection-end-column="9" />
+            <state relative-caret-position="399">
+              <caret line="19" column="15" selection-start-line="19" selection-start-column="2" selection-end-line="19" selection-end-column="15" />
               <folding>
-                <element signature="e#973#1002#0" expanded="true" />
-                <element signature="e#1447#1717#0" />
-                <element signature="e#1772#1834#0" />
+                <element signature="n#!!doc" expanded="true" />
+                <element signature="e#145#197#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/renderer/components/Label.vue">
+        <entry file="file://$PROJECT_DIR$/src/renderer/store/mutation-types.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="42">
-              <caret line="2" column="9" selection-start-line="2" selection-start-column="9" selection-end-line="2" selection-end-column="9" />
+            <state relative-caret-position="168">
+              <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
               <folding>
-                <element signature="n#template#0;n#!!top" />
-                <element signature="n#div#0;n#template#0;n#!!top" />
-                <element signature="n#label#0;n#div#0;n#template#0;n#!!top" />
-                <element signature="n#script#0;n#!!top" />
-                <element signature="e#739#10674#0" />
-                <element signature="e#757#769#0" />
-                <element signature="e#778#810#0" />
-                <element signature="e#1018#1070#0" />
-                <element signature="e#1090#10668#0" />
-                <element signature="n#style#0;n#!!top" />
+                <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/Button.vue">
+        <entry file="file://$PROJECT_DIR$/src/renderer/components/Admin.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="105">
-              <caret line="33" column="33" lean-forward="true" selection-start-line="33" selection-start-column="33" selection-end-line="33" selection-end-column="33" />
+            <state relative-caret-position="609">
+              <caret line="53" column="42" selection-start-line="53" selection-start-column="29" selection-end-line="53" selection-end-column="42" />
               <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#1069#1174#0" />
-                <element signature="e#1086#1827#0" />
-                <element signature="e#1107#1352#0" />
-                <element signature="e#1089#1650#0" />
-                <element signature="e#1169#1193#0" />
-                <element signature="e#1215#8751#0" />
-                <element signature="e#1346#1829#0" />
-                <element signature="e#1394#1587#0" />
-                <element signature="e#1593#1784#0" />
-                <element signature="e#1935#3069#0" />
-                <element signature="e#1980#2174#0" />
-                <element signature="e#2205#2499#0" />
-                <element signature="e#2751#3023#0" />
-                <element signature="e#2834#2914#0" />
-                <element signature="e#2920#3001#0" />
-                <element signature="e#3198#3933#0" />
-                <element signature="e#3243#3437#0" />
-                <element signature="e#3467#3759#0" />
-                <element signature="e#4142#6058#0" />
-                <element signature="e#4218#4412#0" />
-                <element signature="e#4443#4737#0" />
-                <element signature="e#4892#4902#0" />
-                <element signature="e#4998#5270#0" />
-                <element signature="e#5081#5161#0" />
-                <element signature="e#5167#5248#0" />
-                <element signature="e#5368#5640#0" />
-                <element signature="e#5451#5531#0" />
-                <element signature="e#5537#5618#0" />
-                <element signature="e#5740#6012#0" />
-                <element signature="e#5823#5903#0" />
-                <element signature="e#5909#5990#0" />
-                <element signature="e#6258#6374#0" />
-                <element signature="e#6535#6649#0" />
-                <element signature="e#6810#6924#0" />
-                <element signature="e#7034#7148#0" />
-                <element signature="e#7207#7322#0" />
-                <element signature="e#7409#8150#0" />
-                <element signature="e#7454#7648#0" />
-                <element signature="e#7678#7972#0" />
-                <element signature="e#8253#8713#0" />
-                <element signature="e#8297#8495#0" />
-                <element signature="e#8500#8695#0" />
-                <element signature="e#9080#10030#0" />
-                <element signature="e#9176#9334#0" />
-                <element signature="e#9397#9555#0" />
-                <element signature="e#9618#9776#0" />
-                <element signature="e#9832#9993#0" />
-                <element signature="e#10078#11015#0" />
-                <element signature="e#10174#10330#0" />
-                <element signature="e#10393#10549#0" />
-                <element signature="e#10612#10768#0" />
-                <element signature="e#10819#10978#0" />
+                <element signature="e#886#1950#0" />
+                <element signature="e#3129#3753#0" />
+                <element signature="e#3820#4452#0" />
+                <element signature="e#4522#5964#0" />
+                <element signature="e#6036#7384#0" />
+                <element signature="e#7454#8177#0" />
+                <element signature="e#8230#8259#0" expanded="true" />
+                <element signature="e#8787#8825#0" expanded="true" />
+                <element signature="e#21721#22273#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/state.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="630">
-              <caret line="35" lean-forward="true" selection-start-line="35" selection-end-line="35" />
-              <folding>
-                <element signature="n#!!doc" expanded="true" />
-                <element signature="e#145#197#0" expanded="true" />
-                <element signature="e#73#177#0" />
+                <element signature="e#22339#24494#0" />
+                <element signature="e#22456#23872#0" />
+                <element signature="e#22655#23862#0" />
+                <element signature="e#22850#22933#0" />
+                <element signature="e#22995#23848#0" />
+                <element signature="e#23242#23433#0" />
+                <element signature="e#23509#23830#0" />
+                <element signature="e#23957#24047#0" />
+                <element signature="e#24110#24279#0" />
+                <element signature="e#24339#24488#0" />
               </folding>
             </state>
           </provider>
@@ -334,12 +160,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>aea34c76-4216-469b-9610-9889a2d42d06</find>
-      <find>f5361d60-6868-4c59-806b-22b85e7c9e3e</find>
-      <find>085b17a0-133d-48db-9557-dd4ad732a8d6</find>
-      <find>08208721-41cc-4f1e-937</find>
-      <find>b842585-0c91-4e65-bfed-a219</find>
-      <find>V5</find>
       <find>V10</find>
       <find>投影</find>
       <find>08208721-41cc-4f1e-937b-3a1627389049</find>
@@ -363,7 +183,13 @@
       <find>count6</find>
       <find>filter</find>
       <find>bigScreenJson</find>
+      <find>imageJson</find>
       <find>some</find>
+      <find>funcBtn</find>
+      <find>buttonJson</find>
+      <find>this.spliceScreen</find>
+      <find>splitScreenStatus</find>
+      <find>signalPreList</find>
     </findStrings>
     <replaceStrings>
       <replace>class</replace>
@@ -386,9 +212,6 @@
     <option name="CHANGED_PATHS">
       <list>
         <option value="$PROJECT_DIR$/src/renderer/assets/less/common.less" />
-        <option value="$PROJECT_DIR$/src/renderer/store/mutation-types.js" />
-        <option value="$PROJECT_DIR$/src/renderer/store/mutations.js" />
-        <option value="$PROJECT_DIR$/src/renderer/store/actions.js" />
         <option value="$PROJECT_DIR$/src/renderer/components/modal/addSignal.vue" />
         <option value="$PROJECT_DIR$/src/renderer/components/modal/settingBackground.vue" />
         <option value="$PROJECT_DIR$/src/renderer/components/modal/addPrePlan.vue" />
@@ -428,14 +251,17 @@
         <option value="$PROJECT_DIR$/src/index.ejs" />
         <option value="$PROJECT_DIR$/src/main/index.js" />
         <option value="$PROJECT_DIR$/src/renderer/main.js" />
-        <option value="$PROJECT_DIR$/src/renderer/components/Button.vue" />
         <option value="$PROJECT_DIR$/src/renderer/components/Label.vue" />
-        <option value="$PROJECT_DIR$/src/renderer/components/BigShow.vue" />
         <option value="$PROJECT_DIR$/src/renderer/components/SignalList.vue" />
         <option value="$PROJECT_DIR$/src/renderer/components/Image.vue" />
-        <option value="$PROJECT_DIR$/src/renderer/store/state.js" />
         <option value="$PROJECT_DIR$/src/renderer/components/Slider.vue" />
         <option value="$PROJECT_DIR$/src/renderer/components/Admin.vue" />
+        <option value="$PROJECT_DIR$/src/renderer/store/state.js" />
+        <option value="$PROJECT_DIR$/src/renderer/store/mutation-types.js" />
+        <option value="$PROJECT_DIR$/src/renderer/store/actions.js" />
+        <option value="$PROJECT_DIR$/src/renderer/store/mutations.js" />
+        <option value="$PROJECT_DIR$/src/renderer/components/BigShow.vue" />
+        <option value="$PROJECT_DIR$/src/renderer/components/Button.vue" />
       </list>
     </option>
   </component>
@@ -460,24 +286,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="components" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
@@ -579,12 +387,12 @@
       <workItem from="1587693233014" duration="13335000" />
       <workItem from="1587778065289" duration="15000" />
       <workItem from="1587792062979" duration="12462000" />
-      <workItem from="1587865780844" duration="5046000" />
+      <workItem from="1587865780844" duration="9757000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="354126000" />
+    <option name="totallyTimeSpent" value="358837000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -624,55 +432,6 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/dist/electron/renderer.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret column="3722" selection-start-column="3559" selection-end-column="3722" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/static/EnityLable.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="444">
-          <caret line="413" column="14" lean-forward="true" selection-start-line="413" selection-start-column="14" selection-end-line="413" selection-end-column="14" />
-          <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#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" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/static/EnitySignalPreviewList.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="200">
-          <caret line="11" column="7" lean-forward="true" selection-start-line="11" selection-start-column="7" selection-end-line="11" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/utils/tools.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="63">
-          <caret line="3" column="20" selection-start-line="3" selection-start-column="16" selection-end-line="3" selection-end-column="20" />
-          <folding>
-            <element signature="n#!!doc" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../../新建文件夹/sliderDemo.html" />
     <entry file="file://$PROJECT_DIR$/../../新建文件夹/slideDemo.html">
       <provider selected="true" editor-type-id="text-editor">
@@ -3839,41 +3598,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/EnityBigScreen.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1168">
-          <caret line="218" column="21" lean-forward="true" selection-start-line="218" selection-start-column="21" selection-end-line="218" selection-end-column="21" />
-          <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$/src/renderer/components/Label.vue">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="42">
@@ -3893,18 +3617,6 @@
         </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="608">
-          <caret line="81" column="9" lean-forward="true" selection-start-line="62" selection-start-column="8" selection-end-line="81" selection-end-column="9" />
-          <folding>
-            <element signature="e#973#1002#0" expanded="true" />
-            <element signature="e#1447#1717#0" />
-            <element signature="e#1772#1834#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/renderer/components/SignalList.vue">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="84">
@@ -3938,205 +3650,182 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/components/Button.vue">
+    <entry file="file://$PROJECT_DIR$/src/renderer/main.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="33" column="33" lean-forward="true" selection-start-line="33" selection-start-column="33" selection-end-line="33" selection-end-column="33" />
+        <state relative-caret-position="357">
+          <caret line="17" column="2" selection-start-line="17" selection-end-line="18" selection-end-column="41" />
+          <folding>
+            <element signature="e#0#21#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/components/Slider.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="126">
+          <caret line="38" column="11" lean-forward="true" selection-start-line="38" selection-start-column="11" selection-end-line="38" selection-end-column="11" />
           <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#1069#1174#0" />
-            <element signature="e#1086#1827#0" />
-            <element signature="e#1107#1352#0" />
-            <element signature="e#1089#1650#0" />
-            <element signature="e#1169#1193#0" />
-            <element signature="e#1215#8751#0" />
-            <element signature="e#1346#1829#0" />
-            <element signature="e#1394#1587#0" />
-            <element signature="e#1593#1784#0" />
-            <element signature="e#1935#3069#0" />
-            <element signature="e#1980#2174#0" />
-            <element signature="e#2205#2499#0" />
-            <element signature="e#2751#3023#0" />
-            <element signature="e#2834#2914#0" />
-            <element signature="e#2920#3001#0" />
-            <element signature="e#3198#3933#0" />
-            <element signature="e#3243#3437#0" />
-            <element signature="e#3467#3759#0" />
-            <element signature="e#4142#6058#0" />
-            <element signature="e#4218#4412#0" />
-            <element signature="e#4443#4737#0" />
-            <element signature="e#4892#4902#0" />
-            <element signature="e#4998#5270#0" />
-            <element signature="e#5081#5161#0" />
-            <element signature="e#5167#5248#0" />
-            <element signature="e#5368#5640#0" />
-            <element signature="e#5451#5531#0" />
-            <element signature="e#5537#5618#0" />
-            <element signature="e#5740#6012#0" />
-            <element signature="e#5823#5903#0" />
-            <element signature="e#5909#5990#0" />
-            <element signature="e#6258#6374#0" />
-            <element signature="e#6535#6649#0" />
-            <element signature="e#6810#6924#0" />
-            <element signature="e#7034#7148#0" />
-            <element signature="e#7207#7322#0" />
-            <element signature="e#7409#8150#0" />
-            <element signature="e#7454#7648#0" />
-            <element signature="e#7678#7972#0" />
-            <element signature="e#8253#8713#0" />
-            <element signature="e#8297#8495#0" />
-            <element signature="e#8500#8695#0" />
-            <element signature="e#9080#10030#0" />
-            <element signature="e#9176#9334#0" />
-            <element signature="e#9397#9555#0" />
-            <element signature="e#9618#9776#0" />
-            <element signature="e#9832#9993#0" />
-            <element signature="e#10078#11015#0" />
-            <element signature="e#10174#10330#0" />
-            <element signature="e#10393#10549#0" />
-            <element signature="e#10612#10768#0" />
-            <element signature="e#10819#10978#0" />
-            <element signature="n#style#0;n#!!top" />
+            <element signature="n#div#0;n#div#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#template#0;n#!!top" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/main.js">
+    <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/splitscreen.less">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="17" column="2" selection-start-line="17" selection-end-line="18" selection-end-column="41" />
+        <state relative-caret-position="252">
+          <caret line="28" column="20" lean-forward="true" selection-start-line="28" selection-start-column="20" selection-end-line="28" selection-end-column="20" />
           <folding>
-            <element signature="e#0#21#0" expanded="true" />
+            <element signature="e#30#298#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="877">
+          <caret line="218" column="21" selection-start-line="218" selection-start-column="21" selection-end-line="218" selection-end-column="21" />
+          <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$/src/renderer/store/state.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="630">
-          <caret line="35" lean-forward="true" selection-start-line="35" selection-end-line="35" />
+        <state relative-caret-position="399">
+          <caret line="19" column="15" selection-start-line="19" selection-start-column="2" selection-end-line="19" selection-end-column="15" />
           <folding>
             <element signature="n#!!doc" expanded="true" />
             <element signature="e#145#197#0" expanded="true" />
-            <element signature="e#73#177#0" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/components/Slider.vue">
+    <entry file="file://$PROJECT_DIR$/src/renderer/store/mutations.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="126">
-          <caret line="38" column="11" lean-forward="true" selection-start-line="38" selection-start-column="11" selection-end-line="38" selection-end-column="11" />
+        <state relative-caret-position="378">
+          <caret line="18" column="7" lean-forward="true" selection-start-line="18" selection-start-column="7" selection-end-line="18" selection-end-column="7" />
           <folding>
-            <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#0;n#div#0;n#div#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#!!doc" expanded="true" />
+            <element signature="e#25#78#0" expanded="true" />
           </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="63">
-          <caret line="202" column="7" selection-start-line="202" selection-start-column="7" selection-end-line="202" selection-end-column="7" />
+        <state relative-caret-position="609">
+          <caret line="53" column="42" selection-start-line="53" selection-start-column="29" selection-end-line="53" selection-end-column="42" />
           <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#886#1950#0" />
-            <element signature="e#2020#3055#0" />
-            <element signature="n#div#0;n#draggable#0;n#div#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="e#3089#3713#0" />
+            <element signature="e#3129#3753#0" />
             <element signature="e#3820#4452#0" />
-            <element signature="e#4484#5926#0" />
-            <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="e#4522#5964#0" />
             <element signature="e#6036#7384#0" />
-            <element signature="n#div#0;n#div#2;n#div#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="n#div#0;n#div#0;n#div#2;n#div#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="e#7271#7994#0" />
+            <element signature="e#7454#8177#0" />
+            <element signature="e#8230#8259#0" expanded="true" />
+            <element signature="e#8787#8825#0" expanded="true" />
+            <element signature="e#21721#22273#0" />
+            <element signature="n#style#0;n#!!top" />
+            <element signature="e#22339#24494#0" />
+            <element signature="e#22456#23872#0" />
+            <element signature="e#22655#23862#0" />
+            <element signature="e#22850#22933#0" />
+            <element signature="e#22995#23848#0" />
+            <element signature="e#23242#23433#0" />
+            <element signature="e#23509#23830#0" />
+            <element signature="e#23957#24047#0" />
+            <element signature="e#24110#24279#0" />
+            <element signature="e#24339#24488#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/store/mutation-types.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="168">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+          <folding>
+            <element signature="n#!!doc" expanded="true" />
+          </folding>
+        </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="63">
+          <caret line="27" column="1" lean-forward="true" selection-start-line="27" selection-start-column="1" selection-end-line="27" selection-end-column="1" />
+          <folding>
+            <element signature="e#121#498#0" />
+            <element signature="e#126#209#0" />
+            <element signature="e#235#311#0" />
+            <element signature="e#347#357#0" />
+            <element signature="e#421#431#0" />
+            <element signature="e#518#528#0" />
+          </folding>
+        </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="286">
+          <caret line="172" column="48" selection-start-line="172" selection-start-column="48" selection-end-line="172" selection-end-column="48" />
+        </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="91" column="8" lean-forward="true" selection-start-line="91" selection-start-column="8" selection-end-line="91" 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#8368#8421#0" />
-            <element signature="e#8652#21673#0" />
-            <element signature="e#8674#8707#0" />
-            <element signature="e#8725#9504#0" />
-            <element signature="e#9108#9830#0" />
-            <element signature="e#9156#9166#0" />
-            <element signature="e#9525#11036#0" />
-            <element signature="e#9602#9628#0" />
-            <element signature="e#9813#9834#0" />
-            <element signature="e#9967#10825#0" />
-            <element signature="e#10839#10855#0" />
-            <element signature="e#11056#21098#0" />
-            <element signature="e#11132#11402#0" />
-            <element signature="e#11457#11519#0" />
-            <element signature="e#11566#19102#0" />
-            <element signature="e#11697#12180#0" />
-            <element signature="e#11745#11938#0" />
-            <element signature="e#11944#12135#0" />
-            <element signature="e#12286#13420#0" />
-            <element signature="e#12331#12525#0" />
-            <element signature="e#12556#12850#0" />
-            <element signature="e#13102#13374#0" />
-            <element signature="e#13185#13265#0" />
-            <element signature="e#13271#13352#0" />
-            <element signature="e#13549#14284#0" />
-            <element signature="e#13594#13788#0" />
-            <element signature="e#13818#14110#0" />
-            <element signature="e#14493#16409#0" />
-            <element signature="e#14569#14763#0" />
-            <element signature="e#14794#15088#0" />
-            <element signature="e#15243#15253#0" />
-            <element signature="e#15349#15621#0" />
-            <element signature="e#15432#15512#0" />
-            <element signature="e#15518#15599#0" />
-            <element signature="e#15719#15991#0" />
-            <element signature="e#15802#15882#0" />
-            <element signature="e#15888#15969#0" />
-            <element signature="e#16091#16363#0" />
-            <element signature="e#16174#16254#0" />
-            <element signature="e#16260#16341#0" />
-            <element signature="e#16609#16725#0" />
-            <element signature="e#16886#17000#0" />
-            <element signature="e#17161#17275#0" />
-            <element signature="e#17385#17499#0" />
-            <element signature="e#17558#17673#0" />
-            <element signature="e#17760#18501#0" />
-            <element signature="e#17805#17999#0" />
-            <element signature="e#18029#18323#0" />
-            <element signature="e#18604#19064#0" />
-            <element signature="e#18648#18846#0" />
-            <element signature="e#18851#19046#0" />
-            <element signature="e#19152#20102#0" />
-            <element signature="e#19248#19406#0" />
-            <element signature="e#19469#19627#0" />
-            <element signature="e#19690#19848#0" />
-            <element signature="e#19904#20065#0" />
-            <element signature="e#20150#21087#0" />
-            <element signature="e#20246#20402#0" />
-            <element signature="e#20465#20621#0" />
-            <element signature="e#20684#20840#0" />
-            <element signature="e#20891#21050#0" />
-            <element signature="e#21119#21667#0" />
-            <element signature="e#21189#21493#0" />
-            <element signature="e#21214#21479#0" />
-            <element signature="e#21277#21419#0" />
-            <element signature="e#21522#21656#0" />
-            <element signature="e#21547#21642#0" />
+            <element signature="e#1190#2376#0" />
+            <element signature="e#1207#1429#0" />
+            <element signature="e#1228#1339#0" />
+            <element signature="e#1452#1486#0" />
+            <element signature="e#1506#1980#0" />
+            <element signature="e#1582#1852#0" />
+            <element signature="e#1753#2370#0" />
+            <element signature="e#1862#1894#0" />
+            <element signature="e#1887#1956#0" />
+            <element signature="e#1981#2101#0" />
+            <element signature="e#2074#2378#0" />
+            <element signature="e#2099#2364#0" />
+            <element signature="e#2162#2304#0" />
+            <element signature="e#2407#2541#0" />
+            <element signature="e#2432#2527#0" />
             <element signature="n#style#0;n#!!top" />
-            <element signature="e#21733#23893#0" />
-            <element signature="e#21850#23268#0" />
-            <element signature="e#22050#23258#0" />
-            <element signature="e#22245#22328#0" />
-            <element signature="e#22391#23244#0" />
-            <element signature="e#22638#22829#0" />
-            <element signature="e#22905#23226#0" />
-            <element signature="e#23354#23444#0" />
-            <element signature="e#23508#23677#0" />
-            <element signature="e#23738#23887#0" />
           </folding>
         </state>
       </provider>

+ 8 - 8
src/renderer/components/Admin.vue

@@ -202,9 +202,9 @@
 
 <script>
     import {mapState} from 'vuex'
-    import draggable from 'vuedraggable'
     import storageUtils from "../../utils/storageUtils"
-    import '../assets/less/splitscreen.less'
+    // import draggable from 'vuedraggable'
+    // import '../assets/less/splitscreen.less'
 
     // import labelJson from '../../../static/EnityLable'
     // import bigScreenJson from '../../../static/EnityBigScreen'
@@ -222,7 +222,7 @@
 
     export default {
         components: {
-            draggable,
+            // draggable,
             ButtonComponent,
             LabelComponent,
             BigShowComponent,
@@ -271,7 +271,7 @@
         },
 
         methods: {
-            // 移动信号源
+           /* // 移动信号源
             onMove({relatedContext, draggedContext}) {
                 const relatedElement = relatedContext.element
                 const draggedElement = draggedContext.element
@@ -463,12 +463,12 @@
                     this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/images/${e.BackIcon}`) + ')'
                 }
                 return
-            },
+            },*/
         },
 
         computed: {
-            ...mapState(['deviceList','windowJson']),
-            dragOptions1() {
+            ...mapState(['windowJson']),
+            /*dragOptions1() {
                 return {
                     animation: 0,
                     group: {
@@ -484,7 +484,7 @@
                     animation: 0,
                     group: "description",
                 }
-            },
+            },*/
         }
     }
 </script>

+ 13 - 9
src/renderer/components/BigShow.vue

@@ -30,13 +30,12 @@
 <script>
     import {mapState} from 'vuex'
     import draggable from 'vuedraggable'
+    import '../assets/less/splitscreen.less'
 
     export default {
         data() {
             return {
-                signalPreList: [],  // 被拖到大屏中的信号源列表
                 isDragging: false, // 是否可拖动标志
-                splitScreenStatus: 0,// 分屏状态(默认0: 自由屏,1: 4分屏  2:9分屏  3: 16分屏)
             }
         },
 
@@ -52,16 +51,21 @@
                 return (
                     (!relatedElement || !relatedElement.fixed) && !draggedElement.fixed
                 )
-            },
-
-            // 分屏操作
-            spliceScreen(value) {
-                this.splitScreenStatus = value
-            },
+            }
         },
 
         computed: {
-            ...mapState(['bigScreenJson']),
+            ...mapState(['bigScreenJson','splitScreenStatus']),
+
+            signalPreList: {
+                get() {
+                    return this.$store.state.signalPreList
+                },
+                set(arr) {
+                    this.$store.dispatch('updateSignalPreList',arr)
+                }
+            },
+
             dragOptions1() {
                 return {
                     animation: 0,

+ 25 - 8
src/renderer/components/Button.vue

@@ -44,8 +44,26 @@
             }
         },
 
+        mounted() {
+            // 获取分屏按钮数组(将分屏按钮和其他按钮区分开)
+            this.arr = this.buttonJson.filter(item => (item.WindowID === '9a0dff23-8633-4e7f-89bf-cc4f68ec88e1' || item.WindowID === '08208721-41cc-4f1e-937b-3a1627389049' || item.WindowID === 'ab842585-0c91-4e65-bfed-a219bcaaeb43'))
+
+            // 获取功能按钮涉及到的按钮和label
+            // 1.电源管理  2.音频管理  3.视频管理  4.环境控制  5.电脑控制
+            const funcBtnArr = this.buttonJson.filter(item => (item.WindowID === 'd80a8b6e-9f88-41ff-b3a7-1ff8d6ee37a5' || item.WindowID === 'cb2687fd-931a-4b38-a76d-9c3ea171b8d8' || item.WindowID === '027ab76d-6b9c-46ac-abe6-75b8059f786b' || item.WindowID === 'a12b287f-f68c-4efa-b652-d6e5b0a09d0d' || item.WindowID === 'd9868551-b579-4258-9bc7-7c1f733773f5'))
+            const funcLabArr = this.labelJson.filter(item => (item.WindowID === 'd80a8b6e-9f88-41ff-b3a7-1ff8d6ee37a5' || item.WindowID === 'cb2687fd-931a-4b38-a76d-9c3ea171b8d8' || item.WindowID === '027ab76d-6b9c-46ac-abe6-75b8059f786b' || item.WindowID === 'a12b287f-f68c-4efa-b652-d6e5b0a09d0d' || item.WindowID === 'd9868551-b579-4258-9bc7-7c1f733773f5'))
+            this.funcObj = {
+                funcBtnArr,
+                funcLabArr,
+                funSliderArr:this.sliderJson
+            }
+
+            // 获取电源管理和电脑控制按钮
+            this.powerAndCompBtns = this.buttonJson.filter(item => (item.WindowID === 'd80a8b6e-9f88-41ff-b3a7-1ff8d6ee37a5' || item.WindowID === 'd9868551-b579-4258-9bc7-7c1f733773f5') && item.ID !== '19554440-98bc-4644-83a0-d9cefd69153e')
+        },
+
         computed: {
-            ...mapState(['buttonJson']),
+            ...mapState(['buttonJson','labelJson','sliderJson']),
         },
 
         methods: {
@@ -79,7 +97,7 @@
                     this.lastData4 = e
 
                     // 首先清屏
-                    this.signalPreList = []
+                    this.$store.dispatch('clearScreen')
                     this.arr.forEach(item => {
                         if (e.MouseDownActionList[0].SourceID === item.WindowID) {
                             item.IsVisibility = true
@@ -152,23 +170,23 @@
                 // 分屏和清屏操作
                 if (e.ID === '7775e508-c6a5-4044-8264-24772a24fa97' || e.ID === '95c5d676-46a5-4c46-b550-9bc013a59937' || e.ID === 'f47e84bb-c878-4b22-a9d6-eb2e307283bc') {
                     // 清屏
-                    this.signalPreList = []
+                    this.$store.dispatch('clearScreen')
                     return
                 } else if (e.ID === '49653a62-99cb-40e1-a513-60e42893adb7' || e.ID === 'd55c81a8-54d7-4d90-aad7-4f34c3ba3950' || e.ID === '4142ab5b-ce52-4655-a28d-724bfabb24f0') {
                     // 自由屏
-                    this.spliceScreen(0)
+                    this.$store.dispatch('splitScreen',0)
                     return
                 } else if (e.ID === '52de9a2e-d171-423d-860f-3fe2750ec757' || e.ID === '0cabb1ba-bcae-45d9-b019-2b45486f98e3' || e.ID === '9bb5b3e3-9e21-4716-8059-f5b35b24e3fa') {
                     // 四分屏
-                    this.spliceScreen(1)
+                    this.$store.dispatch('splitScreen',1)
                     return
                 } else if (e.ID === 'ac0cc31c-a9b8-4bdf-88cf-928964b93ac5' || e.ID === '201e4bb0-c039-46c7-a55a-049d00de4769') {
                     // 九分屏
-                    this.spliceScreen(2)
+                    this.$store.dispatch('splitScreen',2)
                     return
                 } else if (e.ID === '2d4c49bc-905b-4f96-a65c-9b0a3e057b3f') {
                     // 16分屏
-                    this.spliceScreen(3)
+                    this.$store.dispatch('splitScreen',3)
                     return
                 }
 
@@ -197,7 +215,6 @@
                         e.ActionType = 2
                     }
                 }
-
                 return
             },
 

+ 13 - 1
src/renderer/store/actions.js

@@ -1,5 +1,5 @@
 /*包含n个用于间接更新状态的方法的对象模块*/
-import {SAVE_USER,RESET_USER} from './mutation-types'
+import {SAVE_USER,RESET_USER,CLEAR_SCREEN,SPLIT_SCREEN,UPDATE_SIGNALPRELIST} from './mutation-types'
 
 export default {
 
@@ -13,4 +13,16 @@ export default {
     commit(RESET_USER) // 传递给mutation的是一个包含数据的对象
   },
 
+  clearScreen({commit}) {
+    commit(CLEAR_SCREEN)
+  },
+
+  splitScreen({commit},number) {
+    commit(SPLIT_SCREEN,{number})
+  },
+
+  updateSignalPreList({commit},signalPreList) {
+    commit(UPDATE_SIGNALPRELIST,{signalPreList})
+  }
+
 }

+ 3 - 0
src/renderer/store/mutation-types.js

@@ -2,4 +2,7 @@
 export const SAVE_USER = 'save_user' // 保存用户信息
 export const RESET_USER = 'reset_user' // 重置用户信息
 export const OPEN_SIGNAL_MODAL = 'open_signal_modal' // 打开信号源对话框
+export const CLEAR_SCREEN = 'clear_screen' // 清屏操作
+export const SPLIT_SCREEN = 'split_screen' // 分屏操作
+export const UPDATE_SIGNALPRELIST = 'update_signalprelist' // 更新拖动到大屏中的信号源
 

+ 17 - 2
src/renderer/store/mutations.js

@@ -1,5 +1,5 @@
 /*包含n个用于直接更新状态的方法的对象模块*/
-import {SAVE_USER,RESET_USER} from './mutation-types'
+import {SAVE_USER,RESET_USER,CLEAR_SCREEN,SPLIT_SCREEN,UPDATE_SIGNALPRELIST} from './mutation-types'
 
 import storageUtils from "../../utils/storageUtils"
 
@@ -14,5 +14,20 @@ export default {
   [RESET_USER] (state) {
     state.user = {}
     storageUtils.removeUser()
-  }
+  },
+
+  // 清屏
+  [CLEAR_SCREEN] (state) {
+    state.signalPreList = []
+  },
+
+  // 分屏
+  [SPLIT_SCREEN] (state,{number}) {
+    state.splitScreenStatus = number
+  },
+
+  // 更新大屏中的信号源数量
+  [UPDATE_SIGNALPRELIST] (state,{signalPreList}) {
+    state.signalPreList = signalPreList
+  },
 }

+ 8 - 8
src/renderer/store/state.js

@@ -13,14 +13,14 @@ import imageJson from '../../../static/EnityImage'
 import sliderJson from '../../../static/EnitySlider'
 
 export default {
-  user: {}, // 用户信息
-  // 设备列表数据
-  deviceList:[
-    {name:'PC1',id:'1'},
-    {name:'PC2',id:'2'},
-    {name:'PC3',id:'3'},
-    {name:'PC4',id:'4'}
-  ],
+  // 用户信息
+  user: {},
+
+  // 被拖到大屏中的信号源列表
+  signalPreList: [],
+
+  // 分屏状态(默认0: 自由屏,1: 4分屏  2:9分屏  3: 16分屏)
+  splitScreenStatus: 0,
 
   // window窗口
   windowJson,