liuwei 4 роки тому
батько
коміт
6f66ed9759
2 змінених файлів з 191 додано та 521 видалено
  1. 138 447
      .idea/workspace.xml
  2. 53 74
      src/renderer/components/Admin.vue

+ 138 - 447
.idea/workspace.xml

@@ -2,6 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="690c02a3-0e7d-4c4a-8f0c-a44c44c3a162" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/renderer/components/Admin.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/components/Admin.vue" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/dist/" />
@@ -15,373 +16,39 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
-    <splitter split-orientation="horizontal" split-proportion="0.7627329">
-      <split-first>
-        <leaf>
-          <file pinned="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/src/renderer/components/Admin.vue">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="524">
-                  <caret line="265" column="16" selection-start-line="265" selection-start-column="16" selection-end-line="265" selection-end-column="16" />
-                  <folding>
-                    <element signature="n#button#0;n#div#0;n#div#0;n#template#0;n#!!top" />
-                    <element signature="n#div#1;n#div#0;n#div#0;n#template#0;n#!!top" />
-                    <element signature="n#label#0;n#div#0;n#div#0;n#template#0;n#!!top" />
-                    <element signature="n#div#2;n#div#0;n#div#0;n#template#0;n#!!top" />
-                    <element signature="n#div#3;n#div#0;n#div#0;n#template#0;n#!!top" />
-                    <element signature="n#div#0;n#div#3;n#div#0;n#div#0;n#template#0;n#!!top" />
-                    <element signature="n#div#4;n#div#0;n#div#0;n#template#0;n#!!top" />
-                    <element signature="e#5039#5663#0" />
-                    <element signature="e#4610#4797#0" />
-                    <element signature="e#5310#5422#0" />
-                    <element signature="e#5478#5750#0" />
-                    <element signature="e#5799#5851#0" />
-                    <element signature="e#5915#6015#0" />
-                    <element signature="e#6066#6125#0" />
-                    <element signature="e#6180#6247#0" />
-                    <element signature="e#6295#6355#0" />
-                    <element signature="e#6404#6465#0" />
-                    <element signature="e#6509#6566#0" />
-                    <element signature="e#6615#6675#0" />
-                    <element signature="e#9014#9054#0" />
-                    <element signature="e#7563#8537#0" />
-                    <element signature="e#6775#7079#0" />
-                    <element signature="e#6800#7065#0" />
-                    <element signature="e#6863#7005#0" />
-                    <element signature="e#7108#7242#0" />
-                    <element signature="e#7133#7228#0" />
-                    <element signature="n#style#0;n#!!top" />
-                    <element signature="e#7848#7864#0" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
-        </leaf>
-      </split-first>
-      <split-second>
-        <leaf>
-          <file pinned="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/static/EnityButton.json">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="498">
-                  <caret line="3495" column="13" selection-start-line="3495" selection-start-column="5" selection-end-line="3495" selection-end-column="13" />
-                  <folding>
-                    <element signature="e#4#1307#0" />
-                    <element signature="e#547#555#0" />
-                    <element signature="e#1855#1863#0" />
-                    <element signature="e#2680#2688#0" />
-                    <element signature="e#2715#2723#0" />
-                    <element signature="e#3538#4037#0" />
-                    <element signature="e#3546#4031#0" />
-                    <element signature="e#4064#4565#0" />
-                    <element signature="e#4072#4559#0" />
-                    <element signature="e#5327#7166#0" />
-                    <element signature="e#5379#5880#0" />
-                    <element signature="e#5387#5874#0" />
-                    <element signature="e#5907#6408#0" />
-                    <element signature="e#5915#6402#0" />
-                    <element signature="e#7222#7724#0" />
-                    <element signature="e#7230#7718#0" />
-                    <element signature="e#7751#8252#0" />
-                    <element signature="e#7759#8246#0" />
-                    <element signature="e#9066#9567#0" />
-                    <element signature="e#9074#9561#0" />
-                    <element signature="e#9594#10095#0" />
-                    <element signature="e#9602#10089#0" />
-                    <element signature="e#10909#11411#0" />
-                    <element signature="e#10917#11405#0" />
-                    <element signature="e#11438#11446#0" />
-                    <element signature="e#12266#12768#0" />
-                    <element signature="e#12274#12762#0" />
-                    <element signature="e#12795#12803#0" />
-                    <element signature="e#13623#14125#0" />
-                    <element signature="e#13631#14119#0" />
-                    <element signature="e#14152#14160#0" />
-                    <element signature="e#14928#16281#0" />
-                    <element signature="e#14980#15482#0" />
-                    <element signature="e#14988#15476#0" />
-                    <element signature="e#15509#15517#0" />
-                    <element signature="e#16285#18138#0" />
-                    <element signature="e#16337#16842#0" />
-                    <element signature="e#16345#16836#0" />
-                    <element signature="e#16869#17376#0" />
-                    <element signature="e#16877#17370#0" />
-                    <element signature="e#18142#19997#0" />
-                    <element signature="e#18194#18701#0" />
-                    <element signature="e#18202#18695#0" />
-                    <element signature="e#18728#19234#0" />
-                    <element signature="e#18736#19228#0" />
-                    <element signature="e#20053#20558#0" />
-                    <element signature="e#20061#20552#0" />
-                    <element signature="e#20585#21091#0" />
-                    <element signature="e#20593#21085#0" />
-                    <element signature="e#21857#23210#0" />
-                    <element signature="e#21909#22411#0" />
-                    <element signature="e#21917#22405#0" />
-                    <element signature="e#22438#22446#0" />
-                    <element signature="e#23266#23773#0" />
-                    <element signature="e#23274#23767#0" />
-                    <element signature="e#23800#24306#0" />
-                    <element signature="e#23808#24300#0" />
-                    <element signature="e#25124#25626#0" />
-                    <element signature="e#25132#25620#0" />
-                    <element signature="e#25653#26154#0" />
-                    <element signature="e#25661#26148#0" />
-                    <element signature="e#26916#28753#0" />
-                    <element signature="e#26968#27467#0" />
-                    <element signature="e#26976#27461#0" />
-                    <element signature="e#27494#27995#0" />
-                    <element signature="e#27502#27989#0" />
-                    <element signature="e#28809#29310#0" />
-                    <element signature="e#28817#29304#0" />
-                    <element signature="e#29337#29838#0" />
-                    <element signature="e#29345#29832#0" />
-                    <element signature="e#30600#32439#0" />
-                    <element signature="e#30652#31153#0" />
-                    <element signature="e#30660#31147#0" />
-                    <element signature="e#31180#31681#0" />
-                    <element signature="e#31188#31675#0" />
-                    <element signature="e#32495#32503#0" />
-                    <element signature="e#32530#32538#0" />
-                    <element signature="e#33301#42719#0" />
-                    <element signature="e#33353#41469#0" />
-                    <element signature="e#33361#33850#0" />
-                    <element signature="e#33858#34314#0" />
-                    <element signature="e#34322#34778#0" />
-                    <element signature="e#34786#35242#0" />
-                    <element signature="e#35250#35706#0" />
-                    <element signature="e#35714#36170#0" />
-                    <element signature="e#36178#36669#0" />
-                    <element signature="e#36677#37165#0" />
-                    <element signature="e#37173#37661#0" />
-                    <element signature="e#37669#38125#0" />
-                    <element signature="e#38133#38621#0" />
-                    <element signature="e#38629#39117#0" />
-                    <element signature="e#39125#39613#0" />
-                    <element signature="e#39621#40079#0" />
-                    <element signature="e#40087#40545#0" />
-                    <element signature="e#40553#41004#0" />
-                    <element signature="e#41012#41463#0" />
-                    <element signature="e#41496#41961#0" />
-                    <element signature="e#41504#41955#0" />
-                    <element signature="e#42772#43696#0" />
-                    <element signature="e#42780#43231#0" />
-                    <element signature="e#43239#43690#0" />
-                    <element signature="e#43723#43731#0" />
-                    <element signature="e#44494#45824#0" />
-                    <element signature="e#44546#45031#0" />
-                    <element signature="e#44554#45025#0" />
-                    <element signature="e#45058#45066#0" />
-                    <element signature="e#45880#46365#0" />
-                    <element signature="e#45888#46359#0" />
-                    <element signature="e#46392#46400#0" />
-                    <element signature="e#47162#48492#0" />
-                    <element signature="e#47214#47699#0" />
-                    <element signature="e#47222#47693#0" />
-                    <element signature="e#47726#47734#0" />
-                    <element signature="e#48496#49832#0" />
-                    <element signature="e#48548#49037#0" />
-                    <element signature="e#48556#49031#0" />
-                    <element signature="e#49064#49072#0" />
-                    <element signature="e#49891#51353#0" />
-                    <element signature="e#49899#50355#0" />
-                    <element signature="e#50363#50851#0" />
-                    <element signature="e#50859#51347#0" />
-                    <element signature="e#51380#52842#0" />
-                    <element signature="e#51388#51844#0" />
-                    <element signature="e#51852#52340#0" />
-                    <element signature="e#52348#52836#0" />
-                    <element signature="e#53606#54461#0" />
-                    <element signature="e#53657#53665#0" />
-                    <element signature="e#53692#53700#0" />
-                    <element signature="e#54465#55320#0" />
-                    <element signature="e#54516#54524#0" />
-                    <element signature="e#54551#54559#0" />
-                    <element signature="e#55324#57169#0" />
-                    <element signature="e#55374#55878#0" />
-                    <element signature="e#55382#55872#0" />
-                    <element signature="e#55905#56410#0" />
-                    <element signature="e#55913#56404#0" />
-                    <element signature="e#57173#59020#0" />
-                    <element signature="e#57227#57729#0" />
-                    <element signature="e#57235#57723#0" />
-                    <element signature="e#57756#58258#0" />
-                    <element signature="e#57764#58252#0" />
-                    <element signature="e#59024#59883#0" />
-                    <element signature="e#59076#59084#0" />
-                    <element signature="e#59111#59119#0" />
-                    <element signature="e#59938#67985#0" />
-                    <element signature="e#59946#60402#0" />
-                    <element signature="e#60410#60866#0" />
-                    <element signature="e#60874#61330#0" />
-                    <element signature="e#61338#61794#0" />
-                    <element signature="e#61802#62258#0" />
-                    <element signature="e#62266#62756#0" />
-                    <element signature="e#62764#63252#0" />
-                    <element signature="e#63260#63716#0" />
-                    <element signature="e#63724#64212#0" />
-                    <element signature="e#64220#64708#0" />
-                    <element signature="e#64716#65204#0" />
-                    <element signature="e#65212#65670#0" />
-                    <element signature="e#65678#66136#0" />
-                    <element signature="e#66144#66595#0" />
-                    <element signature="e#66603#67054#0" />
-                    <element signature="e#67062#67517#0" />
-                    <element signature="e#67525#67979#0" />
-                    <element signature="e#68012#68477#0" />
-                    <element signature="e#68020#68471#0" />
-                    <element signature="e#69239#70093#0" />
-                    <element signature="e#69291#69299#0" />
-                    <element signature="e#69326#69334#0" />
-                    <element signature="e#70097#70951#0" />
-                    <element signature="e#70149#70157#0" />
-                    <element signature="e#70184#70192#0" />
-                    <element signature="e#71007#71015#0" />
-                    <element signature="e#71042#71050#0" />
-                    <element signature="e#71813#72669#0" />
-                    <element signature="e#71865#71873#0" />
-                    <element signature="e#71900#71908#0" />
-                    <element signature="e#72673#73527#0" />
-                    <element signature="e#72725#72733#0" />
-                    <element signature="e#72760#72768#0" />
-                    <element signature="e#73531#74385#0" />
-                    <element signature="e#73583#73591#0" />
-                    <element signature="e#73618#73626#0" />
-                    <element signature="e#74441#74449#0" />
-                    <element signature="e#74476#74484#0" />
-                    <element signature="e#75298#75306#0" />
-                    <element signature="e#75333#75341#0" />
-                    <element signature="e#76103#76956#0" />
-                    <element signature="e#76155#76163#0" />
-                    <element signature="e#76190#76198#0" />
-                    <element signature="e#76960#77813#0" />
-                    <element signature="e#77012#77020#0" />
-                    <element signature="e#77047#77055#0" />
-                    <element signature="e#77817#78670#0" />
-                    <element signature="e#77869#77877#0" />
-                    <element signature="e#77904#77912#0" />
-                    <element signature="e#78674#79987#0" />
-                    <element signature="e#78726#79191#0" />
-                    <element signature="e#78734#79185#0" />
-                    <element signature="e#79218#79226#0" />
-                    <element signature="e#79991#81302#0" />
-                    <element signature="e#80043#80508#0" />
-                    <element signature="e#80051#80502#0" />
-                    <element signature="e#80535#80543#0" />
-                    <element signature="e#81306#82618#0" />
-                    <element signature="e#81358#81823#0" />
-                    <element signature="e#81366#81817#0" />
-                    <element signature="e#81850#81858#0" />
-                    <element signature="e#82622#83934#0" />
-                    <element signature="e#82674#83139#0" />
-                    <element signature="e#82682#83133#0" />
-                    <element signature="e#83166#83174#0" />
-                    <element signature="e#83938#85243#0" />
-                    <element signature="e#83990#84455#0" />
-                    <element signature="e#83998#84449#0" />
-                    <element signature="e#84482#84490#0" />
-                    <element signature="e#86097#86949#0" />
-                    <element signature="e#86149#86157#0" />
-                    <element signature="e#86184#86192#0" />
-                    <element signature="e#86953#87805#0" />
-                    <element signature="e#87005#87013#0" />
-                    <element signature="e#87040#87048#0" />
-                    <element signature="e#87809#88661#0" />
-                    <element signature="e#87861#87869#0" />
-                    <element signature="e#87896#87904#0" />
-                    <element signature="e#88665#89515#0" />
-                    <element signature="e#88717#88725#0" />
-                    <element signature="e#88752#88760#0" />
-                    <element signature="e#89571#89579#0" />
-                    <element signature="e#89606#89614#0" />
-                    <element signature="e#90371#91227#0" />
-                    <element signature="e#90423#90431#0" />
-                    <element signature="e#90458#90466#0" />
-                    <element signature="e#91283#91291#0" />
-                    <element signature="e#91318#91326#0" />
-                    <element signature="e#92143#92151#0" />
-                    <element signature="e#92178#92186#0" />
-                    <element signature="e#93003#93011#0" />
-                    <element signature="e#93038#93046#0" />
-                    <element signature="e#93862#93870#0" />
-                    <element signature="e#93897#93905#0" />
-                    <element signature="e#94720#95669#0" />
-                    <element signature="e#94728#95190#0" />
-                    <element signature="e#95198#95663#0" />
-                    <element signature="e#95696#95704#0" />
-                    <element signature="e#96524#97003#0" />
-                    <element signature="e#96532#96997#0" />
-                    <element signature="e#97030#97038#0" />
-                    <element signature="e#97858#98337#0" />
-                    <element signature="e#97866#98331#0" />
-                    <element signature="e#98364#98372#0" />
-                    <element signature="e#99192#99671#0" />
-                    <element signature="e#99200#99665#0" />
-                    <element signature="e#99698#99706#0" />
-                    <element signature="e#100474#101797#0" />
-                    <element signature="e#100527#101001#0" />
-                    <element signature="e#100535#100995#0" />
-                    <element signature="e#101028#101036#0" />
-                    <element signature="e#101801#103135#0" />
-                    <element signature="e#101853#102338#0" />
-                    <element signature="e#101861#102332#0" />
-                    <element signature="e#102365#102373#0" />
-                    <element signature="e#103139#104473#0" />
-                    <element signature="e#103191#103676#0" />
-                    <element signature="e#103199#103670#0" />
-                    <element signature="e#103703#103711#0" />
-                    <element signature="e#104477#105812#0" />
-                    <element signature="e#104529#105016#0" />
-                    <element signature="e#104537#105010#0" />
-                    <element signature="e#105043#105051#0" />
-                    <element signature="e#105816#106678#0" />
-                    <element signature="e#105869#105877#0" />
-                    <element signature="e#105904#105912#0" />
-                    <element signature="e#106682#107544#0" />
-                    <element signature="e#106735#106743#0" />
-                    <element signature="e#106770#106778#0" />
-                    <element signature="e#107548#108410#0" />
-                    <element signature="e#107601#107609#0" />
-                    <element signature="e#107636#107644#0" />
-                    <element signature="e#108414#109276#0" />
-                    <element signature="e#108467#108475#0" />
-                    <element signature="e#108502#108510#0" />
-                    <element signature="e#109280#110142#0" />
-                    <element signature="e#109333#109341#0" />
-                    <element signature="e#109368#109376#0" />
-                    <element signature="e#110146#111460#0" />
-                    <element signature="e#110198#110663#0" />
-                    <element signature="e#110206#110657#0" />
-                    <element signature="e#110690#110698#0" />
-                    <element signature="e#111464#112817#0" />
-                    <element signature="e#111516#112018#0" />
-                    <element signature="e#111524#112012#0" />
-                    <element signature="e#112045#112053#0" />
-                    <element signature="e#112821#114174#0" />
-                    <element signature="e#112873#113375#0" />
-                    <element signature="e#112881#113369#0" />
-                    <element signature="e#113402#113410#0" />
-                    <element signature="e#114178#115531#0" />
-                    <element signature="e#114230#114732#0" />
-                    <element signature="e#114238#114726#0" />
-                    <element signature="e#114759#114767#0" />
-                    <element signature="e#115535#116888#0" />
-                    <element signature="e#115591#116090#0" />
-                    <element signature="e#115599#116084#0" />
-                    <element signature="e#116117#116125#0" />
-                    <element signature="e#116892#118247#0" />
-                    <element signature="e#116948#117448#0" />
-                    <element signature="e#116956#117442#0" />
-                    <element signature="e#117475#117483#0" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
-        </leaf>
-      </split-second>
-    </splitter>
+    <leaf>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/renderer/components/Admin.vue">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="160">
+              <caret line="188" column="27" lean-forward="true" selection-start-line="188" selection-start-column="27" selection-end-line="188" selection-end-column="27" />
+              <folding>
+                <element signature="n#div#0;n#div#0;n#div#0;n#template#0;n#!!top" />
+                <element signature="n#div#1;n#div#0;n#div#0;n#template#0;n#!!top" />
+                <element signature="n#label#0;n#div#0;n#div#0;n#template#0;n#!!top" />
+                <element signature="n#div#2;n#div#0;n#div#0;n#template#0;n#!!top" />
+                <element signature="n#div#3;n#div#0;n#div#0;n#template#0;n#!!top" />
+                <element signature="n#div#0;n#div#3;n#div#0;n#div#0;n#template#0;n#!!top" />
+                <element signature="n#div#4;n#div#0;n#div#0;n#template#0;n#!!top" />
+                <element signature="e#5141#5825#0" />
+                <element signature="e#5878#5928#0" expanded="true" />
+                <element signature="e#6795#6819#0" />
+                <element signature="e#9076#9550#0" />
+                <element signature="e#9657#10408#0" />
+                <element signature="e#8718#8758#0" />
+                <element signature="e#9716#10264#0" />
+                <element signature="e#9786#10090#0" />
+                <element signature="e#9811#10076#0" />
+                <element signature="e#9874#10016#0" />
+                <element signature="e#10119#10253#0" />
+                <element signature="e#10144#10239#0" />
+                <element signature="n#style#0;n#!!top" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -403,6 +70,9 @@
       <find>static</find>
       <find>HtmlWebpackPlugin</find>
       <find>电源</find>
+      <find>355d3c32-1502-40b4-9ddd-663d5b8469e7</find>
+      <find>电脑</find>
+      <find>电源管理</find>
     </findStrings>
     <replaceStrings>
       <replace>class</replace>
@@ -492,6 +162,24 @@
               <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>
             <path>
               <item name="electron-app" type="b2602c69:ProjectViewProjectNode" />
               <item name="electron-app" type="462c0819:PsiDirectoryNode" />
@@ -577,12 +265,14 @@
       <workItem from="1586767125442" duration="3838000" />
       <workItem from="1586784783881" duration="3017000" />
       <workItem from="1586829063648" duration="36119000" />
-      <workItem from="1586915969493" duration="21513000" />
+      <workItem from="1586915969493" duration="21883000" />
+      <workItem from="1586943118080" duration="1709000" />
+      <workItem from="1587002338084" duration="8984000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="188273000" />
+    <option name="totallyTimeSpent" value="199336000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -597,7 +287,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.15173867" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.018440465" />
       <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" />
@@ -611,7 +301,7 @@
       <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.4783069" />
+      <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" />
@@ -840,13 +530,6 @@
         </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="63">
-          <caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/package.json">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -897,50 +580,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/components/Login.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="126">
-          <caret line="118" lean-forward="true" selection-start-line="118" selection-end-line="118" />
-          <folding>
-            <element signature="n#template#0;n#!!top" />
-            <element signature="n#div#0;n#template#0;n#!!top" />
-            <element signature="n#section#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="n#el-form-item#0;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="n#el-form-item#1;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="n#el-form-item#2;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="n#script#0;n#!!top" />
-            <element signature="e#1053#3111#0" />
-            <element signature="e#1070#2324#0" />
-            <element signature="e#1133#1254#0" />
-            <element signature="e#1163#1240#0" />
-            <element signature="e#1319#1437#0" />
-            <element signature="e#1355#1423#0" />
-            <element signature="e#1511#2676#0" />
-            <element signature="e#1485#1572#0" />
-            <element signature="e#1597#1868#0" />
-            <element signature="e#1629#1722#0" />
-            <element signature="e#1754#1850#0" />
-            <element signature="e#1978#2080#0" />
-            <element signature="e#1932#2300#0" />
-            <element signature="e#2607#2710#0" />
-            <element signature="e#2344#3105#0" />
-            <element signature="e#2371#2994#0" />
-            <element signature="e#2485#2587#0" />
-            <element signature="e#2650#2903#0" />
-            <element signature="e#2908#2980#0" />
-            <element signature="e#3029#3095#0" />
-            <element signature="n#style#0;n#!!top" />
-            <element signature="e#3154#3667#0" />
-            <element signature="e#3287#3661#0" />
-            <element signature="e#3336#3458#0" />
-            <element signature="e#3481#3523#0" />
-            <element signature="e#3548#3651#0" />
-            <element signature="e#3585#3637#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/static/images/156.png">
       <provider selected="true" editor-type-id="images" />
     </entry>
@@ -3547,16 +3186,47 @@
         </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">
+          <caret line="163" column="3" lean-forward="true" selection-start-line="163" selection-start-column="3" selection-end-line="163" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/components/Login.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="126">
+          <caret line="118" lean-forward="true" selection-start-line="118" selection-end-line="118" />
+          <folding>
+            <element signature="n#template#0;n#!!top" />
+            <element signature="n#div#0;n#template#0;n#!!top" />
+            <element signature="n#section#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#el-form-item#0;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#el-form-item#1;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#el-form-item#2;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#script#0;n#!!top" />
+            <element signature="n#style#0;n#!!top" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/static/EnityButton.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="498">
-          <caret line="3495" column="13" selection-start-line="3495" selection-start-column="5" selection-end-line="3495" selection-end-column="13" />
+        <state relative-caret-position="63">
+          <caret line="151" column="4" lean-forward="true" selection-start-line="151" selection-start-column="4" selection-end-line="151" selection-end-column="4" />
           <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#1855#1863#0" />
+            <element signature="e#2628#3482#0" />
             <element signature="e#2680#2688#0" />
             <element signature="e#2715#2723#0" />
+            <element signature="e#3486#5323#0" />
             <element signature="e#3538#4037#0" />
             <element signature="e#3546#4031#0" />
             <element signature="e#4064#4565#0" />
@@ -3566,20 +3236,25 @@
             <element signature="e#5387#5874#0" />
             <element signature="e#5907#6408#0" />
             <element signature="e#5915#6402#0" />
+            <element signature="e#7170#9010#0" />
             <element signature="e#7222#7724#0" />
             <element signature="e#7230#7718#0" />
             <element signature="e#7751#8252#0" />
             <element signature="e#7759#8246#0" />
+            <element signature="e#9014#10853#0" />
             <element signature="e#9066#9567#0" />
             <element signature="e#9074#9561#0" />
             <element signature="e#9594#10095#0" />
             <element signature="e#9602#10089#0" />
+            <element signature="e#10857#12210#0" />
             <element signature="e#10909#11411#0" />
             <element signature="e#10917#11405#0" />
             <element signature="e#11438#11446#0" />
+            <element signature="e#12214#13567#0" />
             <element signature="e#12266#12768#0" />
             <element signature="e#12274#12762#0" />
             <element signature="e#12795#12803#0" />
+            <element signature="e#13571#14924#0" />
             <element signature="e#13623#14125#0" />
             <element signature="e#13631#14119#0" />
             <element signature="e#14152#14160#0" />
@@ -3597,6 +3272,7 @@
             <element signature="e#18202#18695#0" />
             <element signature="e#18728#19234#0" />
             <element signature="e#18736#19228#0" />
+            <element signature="e#20001#21853#0" />
             <element signature="e#20053#20558#0" />
             <element signature="e#20061#20552#0" />
             <element signature="e#20585#21091#0" />
@@ -3605,10 +3281,12 @@
             <element signature="e#21909#22411#0" />
             <element signature="e#21917#22405#0" />
             <element signature="e#22438#22446#0" />
+            <element signature="e#23214#25068#0" />
             <element signature="e#23266#23773#0" />
             <element signature="e#23274#23767#0" />
             <element signature="e#23800#24306#0" />
             <element signature="e#23808#24300#0" />
+            <element signature="e#25072#26912#0" />
             <element signature="e#25124#25626#0" />
             <element signature="e#25132#25620#0" />
             <element signature="e#25653#26154#0" />
@@ -3618,6 +3296,7 @@
             <element signature="e#26976#27461#0" />
             <element signature="e#27494#27995#0" />
             <element signature="e#27502#27989#0" />
+            <element signature="e#28757#30596#0" />
             <element signature="e#28809#29310#0" />
             <element signature="e#28817#29304#0" />
             <element signature="e#29337#29838#0" />
@@ -3627,6 +3306,7 @@
             <element signature="e#30660#31147#0" />
             <element signature="e#31180#31681#0" />
             <element signature="e#31188#31675#0" />
+            <element signature="e#32443#33297#0" />
             <element signature="e#32495#32503#0" />
             <element signature="e#32530#32538#0" />
             <element signature="e#33301#42719#0" />
@@ -3650,6 +3330,7 @@
             <element signature="e#41012#41463#0" />
             <element signature="e#41496#41961#0" />
             <element signature="e#41504#41955#0" />
+            <element signature="e#42723#44490#0" />
             <element signature="e#42772#43696#0" />
             <element signature="e#42780#43231#0" />
             <element signature="e#43239#43690#0" />
@@ -3658,6 +3339,7 @@
             <element signature="e#44546#45031#0" />
             <element signature="e#44554#45025#0" />
             <element signature="e#45058#45066#0" />
+            <element signature="e#45828#47158#0" />
             <element signature="e#45880#46365#0" />
             <element signature="e#45888#46359#0" />
             <element signature="e#46392#46400#0" />
@@ -3669,6 +3351,7 @@
             <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" />
@@ -3696,6 +3379,7 @@
             <element signature="e#59024#59883#0" />
             <element signature="e#59076#59084#0" />
             <element signature="e#59111#59119#0" />
+            <element signature="e#59887#69235#0" />
             <element signature="e#59938#67985#0" />
             <element signature="e#59946#60402#0" />
             <element signature="e#60410#60866#0" />
@@ -3722,6 +3406,7 @@
             <element signature="e#70097#70951#0" />
             <element signature="e#70149#70157#0" />
             <element signature="e#70184#70192#0" />
+            <element signature="e#70955#71809#0" />
             <element signature="e#71007#71015#0" />
             <element signature="e#71042#71050#0" />
             <element signature="e#71813#72669#0" />
@@ -3733,8 +3418,10 @@
             <element signature="e#73531#74385#0" />
             <element signature="e#73583#73591#0" />
             <element signature="e#73618#73626#0" />
+            <element signature="e#74389#75242#0" />
             <element signature="e#74441#74449#0" />
             <element signature="e#74476#74484#0" />
+            <element signature="e#75246#76099#0" />
             <element signature="e#75298#75306#0" />
             <element signature="e#75333#75341#0" />
             <element signature="e#76103#76956#0" />
@@ -3766,6 +3453,9 @@
             <element signature="e#83990#84455#0" />
             <element signature="e#83998#84449#0" />
             <element signature="e#84482#84490#0" />
+            <element signature="e#85247#86093#0" />
+            <element signature="e#85299#85307#0" />
+            <element signature="e#85334#85342#0" />
             <element signature="e#86097#86949#0" />
             <element signature="e#86149#86157#0" />
             <element signature="e#86184#86192#0" />
@@ -3778,29 +3468,38 @@
             <element signature="e#88665#89515#0" />
             <element signature="e#88717#88725#0" />
             <element signature="e#88752#88760#0" />
+            <element signature="e#89519#90367#0" />
             <element signature="e#89571#89579#0" />
             <element signature="e#89606#89614#0" />
             <element signature="e#90371#91227#0" />
             <element signature="e#90423#90431#0" />
             <element signature="e#90458#90466#0" />
+            <element signature="e#91231#92087#0" />
             <element signature="e#91283#91291#0" />
             <element signature="e#91318#91326#0" />
+            <element signature="e#92091#92947#0" />
             <element signature="e#92143#92151#0" />
             <element signature="e#92178#92186#0" />
+            <element signature="e#92951#93806#0" />
             <element signature="e#93003#93011#0" />
             <element signature="e#93038#93046#0" />
+            <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" />
             <element signature="e#95696#95704#0" />
+            <element signature="e#96471#97801#0" />
             <element signature="e#96524#97003#0" />
             <element signature="e#96532#96997#0" />
             <element signature="e#97030#97038#0" />
+            <element signature="e#97805#99135#0" />
             <element signature="e#97858#98337#0" />
             <element signature="e#97866#98331#0" />
             <element signature="e#98364#98372#0" />
+            <element signature="e#99139#100470#0" />
             <element signature="e#99192#99671#0" />
             <element signature="e#99200#99665#0" />
             <element signature="e#99698#99706#0" />
@@ -3865,37 +3564,29 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/renderer/components/Admin.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="524">
-          <caret line="265" column="16" selection-start-line="265" selection-start-column="16" selection-end-line="265" selection-end-column="16" />
+        <state relative-caret-position="160">
+          <caret line="188" column="27" lean-forward="true" selection-start-line="188" selection-start-column="27" selection-end-line="188" selection-end-column="27" />
           <folding>
-            <element signature="n#button#0;n#div#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#div#0;n#div#0;n#div#0;n#template#0;n#!!top" />
             <element signature="n#div#1;n#div#0;n#div#0;n#template#0;n#!!top" />
             <element signature="n#label#0;n#div#0;n#div#0;n#template#0;n#!!top" />
             <element signature="n#div#2;n#div#0;n#div#0;n#template#0;n#!!top" />
             <element signature="n#div#3;n#div#0;n#div#0;n#template#0;n#!!top" />
             <element signature="n#div#0;n#div#3;n#div#0;n#div#0;n#template#0;n#!!top" />
             <element signature="n#div#4;n#div#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="e#5039#5663#0" />
-            <element signature="e#4610#4797#0" />
-            <element signature="e#5310#5422#0" />
-            <element signature="e#5478#5750#0" />
-            <element signature="e#5799#5851#0" />
-            <element signature="e#5915#6015#0" />
-            <element signature="e#6066#6125#0" />
-            <element signature="e#6180#6247#0" />
-            <element signature="e#6295#6355#0" />
-            <element signature="e#6404#6465#0" />
-            <element signature="e#6509#6566#0" />
-            <element signature="e#6615#6675#0" />
-            <element signature="e#9014#9054#0" />
-            <element signature="e#7563#8537#0" />
-            <element signature="e#6775#7079#0" />
-            <element signature="e#6800#7065#0" />
-            <element signature="e#6863#7005#0" />
-            <element signature="e#7108#7242#0" />
-            <element signature="e#7133#7228#0" />
+            <element signature="e#5141#5825#0" />
+            <element signature="e#5878#5928#0" expanded="true" />
+            <element signature="e#6795#6819#0" />
+            <element signature="e#9076#9550#0" />
+            <element signature="e#9657#10408#0" />
+            <element signature="e#8718#8758#0" />
+            <element signature="e#9716#10264#0" />
+            <element signature="e#9786#10090#0" />
+            <element signature="e#9811#10076#0" />
+            <element signature="e#9874#10016#0" />
+            <element signature="e#10119#10253#0" />
+            <element signature="e#10144#10239#0" />
             <element signature="n#style#0;n#!!top" />
-            <element signature="e#7848#7864#0" />
           </folding>
         </state>
       </provider>

+ 53 - 74
src/renderer/components/Admin.vue

@@ -3,6 +3,7 @@
     <div class="containers">
         <!--主页-->
         <div :style="{
+                position: 'relative',
                 left:windowJson[0].Left+'px',
                 top:windowJson[0].Top+'px',
                 width:windowJson[0].Width + 'px',
@@ -14,7 +15,6 @@
                 backgroundSize:'100% 100%',
                 backgroundColor:`#${windowJson[0].BrackgroupStr.slice(3)}`,
                 margin:'0 auto',
-                position: 'relative',
             }"
         >
             <!--按钮-->
@@ -108,7 +108,7 @@
             >
                 <!--列表项-->
                 <div v-for="item in signalList[0].PreviewList" style="color:#ffffff">
-                    {{item.DeviceName}}
+                    {{item.ShowName}}
                 </div>
             </div>
 
@@ -160,24 +160,10 @@
     import windowJson from '../../../static/EnityWindow'
     import storageUtils from "../../utils/storageUtils"
     import {mapState} from 'vuex'
-    import draggable from 'vuedraggable'
-    import addSignalModal from './modal/addSignal'
-    import settingBackground from './modal/settingBackground'
-    import addPrePlan from './modal/addPrePlan'
-    import loadPrePlan from './modal/loadPrePlan'
-    import running from './modal/running'
-    import playertest from './modal/playertest'
-    import PubSub from 'pubsub-js'
 
     export default {
         components: {
-            draggable,
-            addSignalModal,
-            settingBackground,
-            addPrePlan,
-            loadPrePlan,
-            running,
-            playertest,
+
         },
         data() {
             return {
@@ -192,67 +178,15 @@
                 imageJson, // 图片配置
                 windowJson, // 主要页面配置
                 count:0,// 音量计数器
+                count2:0, // 预案管理模块计数器
+                count3:0, // 管理控制按钮计数器
+                count4:0, // 3个视频按钮计数器
             }
         },
         methods: {
-            // 退出登录
-            logout() {
-                this.$router.replace('/login')
-                this.$store.dispatch('resetUser')
-            },
-
-            onMove({relatedContext, draggedContext}) {
-                const relatedElement = relatedContext.element;
-                const draggedElement = draggedContext.element;
-                return (
-                    (!relatedElement || !relatedElement.fixed) && !draggedElement.fixed
-                )
-            },
-
-            // 清屏操作
-            clearScreen() {
-                this.signalList = []
-            },
-
-            // 分屏操作
-            spiltScreenOperation(status) {
-                this.splitScreenStatus = status
-                this.signalList = []
-            },
-
-            // 打开信号源对话框
-            addSignal() {
-                PubSub.publish('addSignal')
-            },
-
-            // 设置背景
-            settingBackground() {
-                PubSub.publish('settingBackground')
-            },
-
-            // 新建预案
-            addPrePlan() {
-                PubSub.publish('addPrePlan')
-            },
-
-            // 加载预案
-            loadPrePlan() {
-                PubSub.publish('loadPrePlan')
-            },
-
-            // 跑马灯
-            running() {
-                PubSub.publish('running')
-            },
-
-            // 播放器测试
-            playertest() {
-                PubSub.publish('playertest')
-            },
-
             // 点击按钮
             clickBtn(e) {
-                // 判断是否是声音开关
+                // 声音开关按钮处理
                 if(e.ID === '355d3c32-1502-40b4-9ddd-663d5b8469e7'){
                     if(this.count % 2 === 0){
                         this.$refs[e.ID][0].style.backgroundImage = 'url('+require(`../../../static/images/${e.ActionIcon}`)+')'
@@ -264,6 +198,52 @@
                     return
                 }
 
+                // 预案管理按钮处理
+                if(e.Name.includes('V0') && e.Name.slice(7)*1>62 && e.Name.slice(7)*1<72){
+                    if(this.count2===0){
+                        this.$refs[e.ID][0].style.backgroundImage = 'url('+require(`../../../static/images/${e.ActionIcon}`)+')'
+                        ++this.count2
+                    }else {
+                        this.$refs[e.ID][0].style.backgroundImage = 'url('+require(`../../../static/images/${e.ActionIcon}`)+')'
+                        this.lastBtn.style.backgroundImage = 'url('+require(`../../../static/images/${this.lastData.BackIcon}`)+')'
+                    }
+                    // 保存点过的这个按钮和按钮数据
+                    this.lastBtn = this.$refs[e.ID][0]
+                    this.lastData = e
+                    return
+                }
+
+                // 3个屏控制按钮处理
+                if(e.Text.includes('投影机') || e.Text.includes('LCD屏') || e.Text.includes('LED屏')){
+                    if(this.count4===0){
+                        this.$refs[e.ID][0].style.backgroundImage = 'url('+require(`../../../static/images/${e.ActionIcon}`)+')'
+                        ++this.count4
+                    }else {
+                        this.$refs[e.ID][0].style.backgroundImage = 'url('+require(`../../../static/images/${e.ActionIcon}`)+')'
+                        this.lastBtn4.style.backgroundImage = 'url('+require(`../../../static/images/${this.lastData4.BackIcon}`)+')'
+                    }
+                    // 保存点过的这个按钮和按钮数据
+                    this.lastBtn4 = this.$refs[e.ID][0]
+                    this.lastData4 = e
+                    return
+                }
+
+                // 管理控制按钮处理
+                if(e.Name.includes('V0--Btn6') || e.Name.includes('V0--Btn61') || e.Name.includes('V0--Btn12') || e.Name.includes('V0--Btn58') || e.Name.includes('V0--Btn77')){
+                    if(this.count3===0){
+                        this.$refs[e.ID][0].style.backgroundImage = 'url('+require(`../../../static/images/${e.ActionIcon}`)+')'
+                        ++this.count3
+                    }else {
+                        this.$refs[e.ID][0].style.backgroundImage = 'url('+require(`../../../static/images/${e.ActionIcon}`)+')'
+                        this.lastBtn3.style.backgroundImage = 'url('+require(`../../../static/images/${this.lastData3.BackIcon}`)+')'
+                    }
+                    // 保存点过的这个按钮和按钮数据
+                    this.lastBtn3 = this.$refs[e.ID][0]
+                    this.lastData3 = e
+                    return
+                }
+
+                // 其他按钮处理
                 this.$refs[e.ID][0].style.backgroundImage = 'url('+require(`../../../static/images/${e.ActionIcon}`)+')'
             }
         },
@@ -295,7 +275,6 @@
         width: 100%;
         height: 981px;
         background-color: #333;
-        /*position: relative;*/
     }
 </style>