Переглянути джерело

完成点击切换不同类型屏幕按钮,分屏按钮大屏开窗功能

liuwei 4 роки тому
батько
коміт
4e855cb64d

+ 307 - 215
.idea/workspace.xml

@@ -3,15 +3,15 @@
   <component name="ChangeListManager">
     <list default="true" id="690c02a3-0e7d-4c4a-8f0c-a44c44c3a162" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/index.ejs" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.ejs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/renderer/App.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/App.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/renderer/api/ajax.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/api/ajax.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/renderer/api/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/api/index.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/renderer/assets/less/mainpage.less" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/assets/less/mainpage.less" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/renderer/components/Admin.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/components/Admin.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/renderer/components/BigShow.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/components/BigShow.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/components/Button.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/components/Button.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/components/SignalList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/components/SignalList.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/renderer/components/Login.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/components/Login.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/renderer/store/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" />
-      <change beforePath="$PROJECT_DIR$/src/utils/tools.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/tools.js" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/dist/" />
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -25,31 +25,71 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/utils/tools.js">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/renderer/components/BigShow.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="168">
-              <caret line="32" column="1" lean-forward="true" selection-start-line="32" selection-start-column="1" selection-end-line="32" selection-end-column="1" />
+            <state relative-caret-position="608">
+              <caret line="157" column="32" lean-forward="true" selection-start-line="157" selection-start-column="32" selection-end-line="157" selection-end-column="32" />
               <folding>
-                <element signature="n#!!doc" expanded="true" />
-                <element signature="n#!!block;n#uniq#0" />
-                <element signature="n#!!block;n#getElementLeft#0" />
-                <element signature="n#!!block;n#getElementTop#0" />
+                <element signature="e#1067#1096#0" expanded="true" />
+                <element signature="e#2218#3457#0" />
+                <element signature="e#3588#3892#0" />
+                <element signature="e#3921#4055#0" />
+                <element signature="n#style#0;n#!!top" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/renderer/components/BigShow.vue">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/renderer/components/Button.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="480">
-              <caret line="87" column="65" selection-start-line="87" selection-start-column="65" selection-end-line="87" selection-end-column="65" />
+            <state relative-caret-position="251">
+              <caret line="172" column="55" lean-forward="true" selection-start-line="172" selection-start-column="55" selection-end-line="172" selection-end-column="55" />
               <folding>
                 <element signature="n#template#0;n#!!top" />
-                <element signature="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="e#2554#2670#0" />
+                <element signature="e#3249#3732#0" />
+                <element signature="e#3297#3490#0" />
+                <element signature="e#3496#3687#0" />
+                <element signature="e#3838#4984#0" />
+                <element signature="e#3883#4077#0" />
+                <element signature="e#4108#4402#0" />
+                <element signature="e#4666#4938#0" />
+                <element signature="e#4749#4829#0" />
+                <element signature="e#4835#4916#0" />
+                <element signature="e#5113#5848#0" />
+                <element signature="e#5158#5352#0" />
+                <element signature="e#5382#5674#0" />
+                <element signature="e#6057#7973#0" />
+                <element signature="e#6133#6327#0" />
+                <element signature="e#6358#6652#0" />
+                <element signature="e#6807#6817#0" />
+                <element signature="e#6913#7185#0" />
+                <element signature="e#6996#7076#0" />
+                <element signature="e#7082#7163#0" />
+                <element signature="e#7283#7555#0" />
+                <element signature="e#7366#7446#0" />
+                <element signature="e#7452#7533#0" />
+                <element signature="e#7655#7927#0" />
+                <element signature="e#7738#7818#0" />
+                <element signature="e#7824#7905#0" />
+                <element signature="e#9404#10145#0" />
+                <element signature="e#9449#9643#0" />
+                <element signature="e#9673#9967#0" />
+                <element signature="e#10248#10708#0" />
+                <element signature="e#10292#10490#0" />
+                <element signature="e#10495#10690#0" />
+                <element signature="e#10795#11745#0" />
+                <element signature="e#10891#11049#0" />
+                <element signature="e#11112#11270#0" />
+                <element signature="e#11333#11491#0" />
+                <element signature="e#11547#11708#0" />
+                <element signature="e#11793#12730#0" />
+                <element signature="e#11889#12045#0" />
+                <element signature="e#12108#12264#0" />
+                <element signature="e#12327#12483#0" />
+                <element signature="e#12534#12693#0" />
                 <element signature="n#style#0;n#!!top" />
               </folding>
             </state>
@@ -59,8 +99,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/renderer/store/actions.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="433">
-              <caret line="33" column="31" selection-start-line="33" selection-start-column="11" selection-end-line="33" selection-end-column="31" />
+            <state relative-caret-position="370">
+              <caret line="36" column="33" selection-start-line="36" selection-start-column="33" selection-end-line="36" selection-end-column="33" />
               <folding>
                 <element signature="n#!!doc" expanded="true" />
                 <element signature="e#25#193#0" expanded="true" />
@@ -70,14 +110,10 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/renderer/App.vue">
+        <entry file="file://$PROJECT_DIR$/src/renderer/store/mutations.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="475">
-              <caret line="35" column="51" selection-start-line="35" selection-start-column="51" selection-end-line="35" selection-end-column="51" />
-              <folding>
-                <element signature="e#93#112#0" expanded="true" />
-                <element signature="n#style#0;n#!!top" />
-              </folding>
+            <state relative-caret-position="378">
+              <caret line="29" column="28" lean-forward="true" selection-start-line="29" selection-start-column="28" selection-end-line="29" selection-end-column="28" />
             </state>
           </provider>
         </entry>
@@ -160,15 +196,12 @@
         <option value="$PROJECT_DIR$/../../新建文件夹/slideDemo.html" />
         <option value="$PROJECT_DIR$/../../新建文件夹/slideDemo2.html" />
         <option value="$PROJECT_DIR$/src/renderer/components/vue-slider.vue" />
-        <option value="$PROJECT_DIR$/static/EnityWindow.json" />
         <option value="$PROJECT_DIR$/static/EnitySystem.json" />
-        <option value="$PROJECT_DIR$/dist/electron/index.html" />
         <option value="$PROJECT_DIR$/.electron-vue/webpack.main.config.js" />
         <option value="$PROJECT_DIR$/build/win-unpacked/resources/app/dist/electron/main.js" />
         <option value="$PROJECT_DIR$/build/win-unpacked/resources/app/dist/electron/index.html" />
         <option value="$PROJECT_DIR$/build/win-unpacked/resources/app/dist/electron/renderer.js" />
         <option value="$PROJECT_DIR$/src/main/data.js" />
-        <option value="$PROJECT_DIR$/src/index.ejs" />
         <option value="$PROJECT_DIR$/src/renderer/components/Label.vue" />
         <option value="$PROJECT_DIR$/src/renderer/components/Image.vue" />
         <option value="$PROJECT_DIR$/src/renderer/components/Slider.vue" />
@@ -179,22 +212,25 @@
         <option value="$PROJECT_DIR$/src/renderer/main.js" />
         <option value="$PROJECT_DIR$/src/renderer/components/UploadConfig.vue" />
         <option value="$PROJECT_DIR$/src/renderer/router/index.js" />
-        <option value="$PROJECT_DIR$/src/renderer/api/ajax.js" />
         <option value="$PROJECT_DIR$/src/main/index.js" />
         <option value="$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js" />
         <option value="$PROJECT_DIR$/src/renderer/assets/less/admin.less" />
-        <option value="$PROJECT_DIR$/src/renderer/assets/less/mainpage.less" />
-        <option value="$PROJECT_DIR$/src/renderer/components/Login.vue" />
-        <option value="$PROJECT_DIR$/src/renderer/api/index.js" />
-        <option value="$PROJECT_DIR$/src/renderer/components/Admin.vue" />
         <option value="$PROJECT_DIR$/src/renderer/components/SignalList.vue" />
         <option value="$PROJECT_DIR$/src/renderer/store/mutation-types.js" />
         <option value="$PROJECT_DIR$/src/renderer/store/state.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/Button.vue" />
-        <option value="$PROJECT_DIR$/src/renderer/App.vue" />
         <option value="$PROJECT_DIR$/src/utils/tools.js" />
+        <option value="$PROJECT_DIR$/src/renderer/App.vue" />
+        <option value="$PROJECT_DIR$/src/renderer/components/Login.vue" />
+        <option value="$PROJECT_DIR$/dist/electron/index.html" />
+        <option value="$PROJECT_DIR$/src/index.ejs" />
+        <option value="$PROJECT_DIR$/src/renderer/api/ajax.js" />
+        <option value="$PROJECT_DIR$/src/renderer/api/index.js" />
+        <option value="$PROJECT_DIR$/src/renderer/assets/less/mainpage.less" />
+        <option value="$PROJECT_DIR$/src/renderer/components/Admin.vue" />
+        <option value="$PROJECT_DIR$/static/EnityWindow.json" />
+        <option value="$PROJECT_DIR$/src/renderer/components/Button.vue" />
+        <option value="$PROJECT_DIR$/src/renderer/store/actions.js" />
         <option value="$PROJECT_DIR$/src/renderer/components/BigShow.vue" />
       </list>
     </option>
@@ -213,8 +249,18 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="ProjectPane" />
       <pane id="Scope" />
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="electron-app" type="b2602c69:ProjectViewProjectNode" />
+              <item name="electron-app" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -323,12 +369,15 @@
       <workItem from="1588751627518" duration="1242000" />
       <workItem from="1588816090227" duration="5197000" />
       <workItem from="1588829637481" duration="12912000" />
-      <workItem from="1588844511323" duration="1453000" />
+      <workItem from="1588844511323" duration="1655000" />
+      <workItem from="1588856165669" duration="100000" />
+      <workItem from="1588906984737" duration="659000" />
+      <workItem from="1588916874925" duration="5339000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="444723000" />
+    <option name="totallyTimeSpent" value="451023000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -343,7 +392,7 @@
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.14857745" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14857745" />
       <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" />
@@ -357,7 +406,7 @@
       <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Version Control" order="8" weight="0.32910052" />
       <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.4021164" />
+      <window_info anchor="bottom" id="Terminal" order="10" weight="0.42328042" />
       <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" />
@@ -368,52 +417,6 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/.electron-vue/build.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="462">
-          <caret line="22" column="50" lean-forward="true" selection-start-line="22" selection-start-column="50" selection-end-line="22" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/node_modules/webpack-cli/bin/config/optionsSchema.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="306">
-          <caret line="1159" column="7" selection-start-line="1159" selection-start-column="7" selection-end-line="1159" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.electron-vue/dev-client.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="10" column="37" lean-forward="true" selection-start-line="10" selection-start-column="37" selection-end-line="10" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.electron-vue/webpack.main.config.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="42">
-          <caret line="2" column="30" lean-forward="true" selection-start-line="2" selection-start-column="30" selection-end-line="2" selection-end-column="30" />
-          <folding>
-            <element signature="e#252#312#0" />
-            <element signature="e#327#371#0" />
-            <element signature="e#383#576#0" />
-            <element signature="e#396#572#0" />
-            <element signature="e#404#497#0" />
-            <element signature="e#505#566#0" />
-            <element signature="e#586#699#0" />
-            <element signature="e#711#826#0" />
-            <element signature="e#839#883#0" />
-            <element signature="e#896#943#0" />
-            <element signature="e#974#1027#0" />
-            <element signature="e#1071#1225#0" />
-            <element signature="e#1129#1218#0" />
-            <element signature="e#1227#1279#0" />
-            <element signature="e#1323#1464#0" />
-            <element signature="e#1405#1457#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/.electron-vue/webpack.web.config.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-2003" />
@@ -2136,13 +2139,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/dist/electron/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="301" selection-start-column="301" selection-end-column="301" />
-        </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="559">
@@ -2188,83 +2184,10 @@
     <entry file="file://$PROJECT_DIR$/build/win-unpacked/resources/app/dist/electron/main.js" />
     <entry file="file://$PROJECT_DIR$/build/win-unpacked/resources/app/dist/electron/renderer.js" />
     <entry file="file://$PROJECT_DIR$/build/win-unpacked/resources/app/dist/electron/index.html" />
-    <entry file="file://$PROJECT_DIR$/src/renderer/api/ajax.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="5" column="51" lean-forward="true" selection-start-line="5" selection-start-column="51" selection-end-line="5" selection-end-column="51" />
-          <folding>
-            <element signature="n#!!doc" expanded="true" />
-            <element signature="e#58#83#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/splitscreen.less">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
     <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/admin.less" />
-    <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/mainpage.less">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="21">
-          <caret line="1" column="13" lean-forward="true" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
-          <folding>
-            <element signature="e#107#1067#0" />
-            <element signature="e#250#1063#0" />
-            <element signature="e#385#446#0" />
-            <element signature="e#488#1057#0" />
-            <element signature="e#663#786#0" />
-            <element signature="e#838#1049#0" />
-            <element signature="e#1134#1202#0" />
-            <element signature="e#1253#1392#0" />
-            <element signature="e#1440#1559#0" />
-            <element signature="e#1587#1648#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/components/Login.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="33" column="55" lean-forward="true" selection-start-line="33" selection-start-column="55" selection-end-line="33" selection-end-column="55" />
-          <folding>
-            <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="e#1576#1605#0" expanded="true" />
-            <element signature="e#1762#1812#0" />
-            <element signature="e#1893#2014#0" />
-            <element signature="e#1923#2000#0" />
-            <element signature="e#2079#2197#0" />
-            <element signature="e#2115#2183#0" />
-            <element signature="e#2217#2642#0" />
-            <element signature="e#2245#2332#0" />
-            <element signature="e#2357#2628#0" />
-            <element signature="e#2389#2482#0" />
-            <element signature="e#2514#2610#0" />
-            <element signature="e#2819#2921#0" />
-            <element signature="e#3021#3362#0" />
-            <element signature="e#4230#4604#0" />
-            <element signature="e#4279#4401#0" />
-            <element signature="e#4424#4466#0" />
-            <element signature="e#4491#4594#0" />
-            <element signature="e#4528#4580#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/api/index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="189">
-          <caret line="9" column="66" lean-forward="true" selection-start-line="9" selection-start-column="66" selection-end-line="9" selection-end-column="66" />
-          <folding>
-            <element signature="n#!!doc" expanded="true" />
-            <element signature="e#40#65#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/renderer/store/index.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="336">
@@ -2319,73 +2242,195 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/components/Admin.vue">
+    <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="38" column="23" lean-forward="true" selection-start-line="38" selection-start-column="23" selection-end-line="38" selection-end-column="23" />
+        <state relative-caret-position="189">
+          <caret line="9" column="24" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="24" />
           <folding>
-            <element signature="e#1231#1954#0" />
-            <element signature="e#2070#2099#0" expanded="true" />
-            <element signature="e#2747#2850#0" />
-            <element signature="e#2768#2840#0" />
-            <element signature="e#2871#2883#0" />
-            <element signature="e#2903#3166#0" />
-            <element signature="e#2952#3156#0" />
-            <element signature="e#3187#3239#0" />
+            <element signature="n#!!doc" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/store/mutation-types.js">
+    <entry file="file://$PROJECT_DIR$/src/utils/tools.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="189">
-          <caret line="9" column="24" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="24" />
+        <state relative-caret-position="105">
+          <caret line="13" column="17" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" />
           <folding>
             <element signature="n#!!doc" expanded="true" />
+            <element signature="n#!!block;n#uniq#0" />
+            <element signature="n#!!block;n#getElementLeft#0" />
+            <element signature="n#!!block;n#getElementTop#0" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/components/Button.vue">
+    <entry file="file://$PROJECT_DIR$/src/renderer/App.vue">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="189">
-          <caret line="72" lean-forward="true" selection-start-line="72" selection-end-line="72" />
+          <caret line="11" column="18" selection-start-line="11" selection-start-column="18" selection-end-line="11" selection-end-column="18" />
+          <folding>
+            <element signature="e#93#112#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/store/state.js">
+    <entry file="file://$PROJECT_DIR$/static/EnityLogin.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="882">
-          <caret line="42" column="9" lean-forward="true" selection-start-line="42" selection-start-column="9" selection-end-line="42" selection-end-column="9" />
+        <state>
+          <caret line="34" column="1" lean-forward="true" selection-start-line="34" selection-start-column="1" selection-end-line="34" selection-end-column="1" />
+          <folding>
+            <element signature="e#0#873#0" />
+            <element signature="e#423#435#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/dist/electron/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret column="80" selection-start-column="80" selection-end-column="80" />
+        </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="105">
+          <caret line="5" column="45" lean-forward="true" selection-start-line="5" selection-start-column="45" selection-end-line="5" selection-end-column="45" />
+          <folding>
+            <element signature="e#1576#1605#0" expanded="true" />
+            <element signature="e#3010#3351#0" />
+            <element signature="e#4018#4677#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/index.ejs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="378">
+          <caret line="18" column="9" lean-forward="true" selection-start-line="18" selection-start-column="9" selection-end-line="18" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/api/ajax.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="861">
+          <caret line="41" column="23" lean-forward="true" selection-start-line="41" selection-start-column="23" selection-end-line="41" selection-end-column="23" />
           <folding>
             <element signature="n#!!doc" expanded="true" />
-            <element signature="e#12#62#0" expanded="true" />
+            <element signature="e#58#83#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/store/mutations.js">
+    <entry file="file://$PROJECT_DIR$/src/renderer/api/index.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="360">
-          <caret line="39" column="39" lean-forward="true" selection-start-line="39" selection-start-column="39" selection-end-line="39" selection-end-column="39" />
+        <state relative-caret-position="420">
+          <caret line="20" column="7" lean-forward="true" selection-start-line="20" selection-start-column="7" selection-end-line="20" selection-end-column="7" />
+          <folding>
+            <element signature="n#!!doc" expanded="true" />
+            <element signature="e#40#65#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/App.vue">
+    <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/mainpage.less">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="475">
-          <caret line="35" column="51" selection-start-line="35" selection-start-column="51" selection-end-line="35" selection-end-column="51" />
+        <state relative-caret-position="147">
+          <caret line="55" column="3" lean-forward="true" selection-start-line="55" selection-start-column="3" selection-end-line="55" selection-end-column="3" />
           <folding>
-            <element signature="e#93#112#0" expanded="true" />
-            <element signature="n#style#0;n#!!top" />
+            <element signature="e#108#1068#0" />
+            <element signature="e#251#1064#0" />
+            <element signature="e#386#447#0" />
+            <element signature="e#489#1058#0" />
+            <element signature="e#664#787#0" />
+            <element signature="e#839#1050#0" />
+            <element signature="e#1135#1203#0" />
+            <element signature="e#1254#1393#0" />
+            <element signature="e#1441#1560#0" />
+            <element signature="e#1588#1649#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/components/Admin.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="580">
+          <caret line="101" column="30" lean-forward="true" selection-start-line="101" selection-start-column="30" selection-end-line="101" selection-end-column="30" />
+          <folding>
+            <element signature="e#1231#1954#0" />
+            <element signature="e#2056#2085#0" expanded="true" />
+            <element signature="e#2542#2729#0" />
+            <element signature="e#2747#2850#0" />
+            <element signature="e#2903#3166#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="306">
+          <caret line="25" column="10" lean-forward="true" selection-start-line="25" selection-start-column="10" selection-end-line="25" selection-end-column="10" />
+          <folding>
+            <element signature="n#!!doc" expanded="true" />
+            <element signature="e#12#62#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/static/EnityWindow.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <folding>
+            <element signature="e#0#7421#0" />
+            <element signature="e#4#669#0" />
+            <element signature="e#157#165#0" />
+            <element signature="e#188#196#0" />
+            <element signature="e#673#1342#0" />
+            <element signature="e#830#838#0" />
+            <element signature="e#861#869#0" />
+            <element signature="e#1346#2019#0" />
+            <element signature="e#1501#1509#0" />
+            <element signature="e#1532#1540#0" />
+            <element signature="e#2023#2693#0" />
+            <element signature="e#2181#2189#0" />
+            <element signature="e#2212#2220#0" />
+            <element signature="e#2697#3367#0" />
+            <element signature="e#2855#2863#0" />
+            <element signature="e#2886#2894#0" />
+            <element signature="e#3371#4040#0" />
+            <element signature="e#3527#3535#0" />
+            <element signature="e#3558#3566#0" />
+            <element signature="e#4044#4714#0" />
+            <element signature="e#4201#4209#0" />
+            <element signature="e#4232#4240#0" />
+            <element signature="e#4718#5396#0" />
+            <element signature="e#4875#4883#0" />
+            <element signature="e#4906#4914#0" />
+            <element signature="e#5400#6067#0" />
+            <element signature="e#5556#5564#0" />
+            <element signature="e#5587#5595#0" />
+            <element signature="e#6071#6738#0" />
+            <element signature="e#6227#6235#0" />
+            <element signature="e#6258#6266#0" />
+            <element signature="e#6742#7419#0" />
+            <element signature="e#6899#6907#0" />
+            <element signature="e#6930#6938#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/store/mutations.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="378">
+          <caret line="29" column="28" lean-forward="true" selection-start-line="29" selection-start-column="28" selection-end-line="29" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/renderer/store/actions.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="433">
-          <caret line="33" column="31" selection-start-line="33" selection-start-column="11" selection-end-line="33" selection-end-column="31" />
+        <state relative-caret-position="370">
+          <caret line="36" column="33" selection-start-line="36" selection-start-column="33" selection-end-line="36" selection-end-column="33" />
           <folding>
             <element signature="n#!!doc" expanded="true" />
             <element signature="e#25#193#0" expanded="true" />
@@ -2393,28 +2438,75 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/utils/tools.js">
+    <entry file="file://$PROJECT_DIR$/src/renderer/components/Button.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="32" column="1" lean-forward="true" selection-start-line="32" selection-start-column="1" selection-end-line="32" selection-end-column="1" />
+        <state relative-caret-position="251">
+          <caret line="172" column="55" lean-forward="true" selection-start-line="172" selection-start-column="55" selection-end-line="172" selection-end-column="55" />
           <folding>
-            <element signature="n#!!doc" expanded="true" />
-            <element signature="n#!!block;n#uniq#0" />
-            <element signature="n#!!block;n#getElementLeft#0" />
-            <element signature="n#!!block;n#getElementTop#0" />
+            <element signature="n#template#0;n#!!top" />
+            <element signature="e#2554#2670#0" />
+            <element signature="e#3249#3732#0" />
+            <element signature="e#3297#3490#0" />
+            <element signature="e#3496#3687#0" />
+            <element signature="e#3838#4984#0" />
+            <element signature="e#3883#4077#0" />
+            <element signature="e#4108#4402#0" />
+            <element signature="e#4666#4938#0" />
+            <element signature="e#4749#4829#0" />
+            <element signature="e#4835#4916#0" />
+            <element signature="e#5113#5848#0" />
+            <element signature="e#5158#5352#0" />
+            <element signature="e#5382#5674#0" />
+            <element signature="e#6057#7973#0" />
+            <element signature="e#6133#6327#0" />
+            <element signature="e#6358#6652#0" />
+            <element signature="e#6807#6817#0" />
+            <element signature="e#6913#7185#0" />
+            <element signature="e#6996#7076#0" />
+            <element signature="e#7082#7163#0" />
+            <element signature="e#7283#7555#0" />
+            <element signature="e#7366#7446#0" />
+            <element signature="e#7452#7533#0" />
+            <element signature="e#7655#7927#0" />
+            <element signature="e#7738#7818#0" />
+            <element signature="e#7824#7905#0" />
+            <element signature="e#9404#10145#0" />
+            <element signature="e#9449#9643#0" />
+            <element signature="e#9673#9967#0" />
+            <element signature="e#10248#10708#0" />
+            <element signature="e#10292#10490#0" />
+            <element signature="e#10495#10690#0" />
+            <element signature="e#10795#11745#0" />
+            <element signature="e#10891#11049#0" />
+            <element signature="e#11112#11270#0" />
+            <element signature="e#11333#11491#0" />
+            <element signature="e#11547#11708#0" />
+            <element signature="e#11793#12730#0" />
+            <element signature="e#11889#12045#0" />
+            <element signature="e#12108#12264#0" />
+            <element signature="e#12327#12483#0" />
+            <element signature="e#12534#12693#0" />
+            <element signature="n#style#0;n#!!top" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.es5.d.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="306">
+          <caret line="1451" column="38" selection-start-line="1451" selection-start-column="38" selection-end-line="1451" selection-end-column="38" />
+        </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="480">
-          <caret line="87" column="65" selection-start-line="87" selection-start-column="65" selection-end-line="87" selection-end-column="65" />
+        <state relative-caret-position="608">
+          <caret line="157" column="32" lean-forward="true" selection-start-line="157" selection-start-column="32" selection-end-line="157" selection-end-column="32" />
           <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="e#1067#1096#0" expanded="true" />
+            <element signature="e#2218#3457#0" />
+            <element signature="e#3588#3892#0" />
+            <element signature="e#3921#4055#0" />
             <element signature="n#style#0;n#!!top" />
           </folding>
         </state>

+ 1 - 1
src/index.ejs

@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <title>vedio_app</title>
+    <title>分布式视频系统</title>
     <% if (htmlWebpackPlugin.options.nodeModules) { %>
       <!-- Add `node_modules/` to global paths so `require` works properly in development -->
       <script>

+ 0 - 2
src/renderer/App.vue

@@ -47,5 +47,3 @@
 
 
 
-
-

+ 0 - 2
src/renderer/api/ajax.js

@@ -5,8 +5,6 @@ ajax请求函数模块
 import axios from 'axios'
 import storageUtils from "../../utils/storageUtils"
 
-// axios.defaults.headers.post['Content-Type'] = 'multipart/form-data'
-
 /*axios请求拦截器,给请求头添加授权*/
 axios.interceptors.request.use(config => {
   config.headers.Authorization = storageUtils.getToken()

+ 0 - 7
src/renderer/api/index.js

@@ -50,10 +50,3 @@ export const reqApplyPlan = (id,data) => ajax(BASE_URL+`/v1/plan/${id}`,data,'PO
 
 // 删除预案
 export const reqDeletePlan = (id) => ajax(BASE_URL+`/v1/plan`,{id},'DELETE')
-
-
-
-
-
-
-

+ 1 - 1
src/renderer/assets/less/mainpage.less

@@ -1,6 +1,6 @@
 // 容器样式
 .containers {
-  width: 100vw;
+  width: 100%;
   height: 100vh;
   background-color: #333;
 

+ 2 - 7
src/renderer/components/Admin.vue

@@ -15,8 +15,7 @@
                 backgroundRepeat:'no-repeat',
                 backgroundSize:'100% 100%',
                 backgroundColor:`#${windowJson[0].BrackgroupStr ? windowJson[0].BrackgroupStr.slice(3) : null}`,
-                margin:'0 auto',
-            }"
+                margin:'0 auto'}"
         >
             <!--按钮-->
             <ButtonComponent />
@@ -61,8 +60,8 @@
 
 <script>
     import {mapState} from 'vuex'
-    import storageUtils from "../../utils/storageUtils"
     import '../assets/less/mainpage.less'
+    import storageUtils from "../../utils/storageUtils"
 
     import ButtonComponent from './Button'
     import LabelComponent from './Label'
@@ -88,10 +87,6 @@
             }
         },
 
-        mounted() {
-
-        },
-
         methods: {
             // 退出登录
             async logout() {

+ 45 - 29
src/renderer/components/BigShow.vue

@@ -53,6 +53,38 @@
                 return (
                     (!relatedElement || !relatedElement.fixed) && !draggedElement.fixed
                 )
+            },
+
+            // 大屏开窗
+            reqRefreshBigScreen(arr) {
+                const streamWindows = []
+                setTimeout(async () => {
+                    const elementArr = this.$refs.signal
+                    elementArr.forEach((item,index) => {
+                        // 获取元素绝对位置的横坐标和纵坐标
+                        const left = getElementLeft(item)
+                        const top = getElementTop(item)
+                        streamWindows.push({
+                            left,
+                            top,
+                            width:this.bigScreenJson[0].Width/(this.splitScreenStatus+1),
+                            height:this.bigScreenJson[0].Height/(this.splitScreenStatus+1),
+                            id:0,
+                            sourceId:arr[index].sourceId,
+                            widthScale:1/(this.splitScreenStatus+1),
+                            heightScale:1/(this.splitScreenStatus+1),
+                            orginRect:{}
+                        })
+                    })
+                    const data = {
+                        bigScreenId:this.bigScreenJson[0].ID,
+                        streamWindows
+                    }
+                    console.log(data)
+                    // 调用大屏开窗接口
+                    const res = await reqRefreshView(data)
+                    console.log(res)
+                })
             }
         },
 
@@ -64,35 +96,6 @@
                     return this.$store.state.signalPreList
                 },
                 set(arr) {
-                    // 流动屏数组
-                    const streamWindows = []
-                    setTimeout(() => {
-                        const elementArr = this.$refs.signal
-                        elementArr.forEach(async (item,index) => {
-                            // 获取元素绝对位置的横坐标和纵坐标
-                            const left = getElementLeft(item)
-                            const top = getElementTop(item)
-                            streamWindows.push({
-                                left,
-                                top,
-                                width:this.bigScreenJson[0].Width/(this.splitScreenStatus+1),
-                                height:this.bigScreenJson[0].Height/(this.splitScreenStatus+1),
-                                id:0,
-                                sourceId:arr[index].sourceId,
-                                widthScale:1/(this.splitScreenStatus+1),
-                                heightScale:1/(this.splitScreenStatus+1),
-                                orginRect:{}
-                            })
-                            console.log(streamWindows)
-                            const data = {
-                                bigScreenId:this.bigScreenJson[0].ID,
-                                streamWindows
-                            }
-                            // 调用大屏开窗接口
-                            const res = await reqRefreshView(data)
-                            console.log(res)
-                        })
-                    })
                     this.$store.dispatch('updateSignalPreList',arr)
                 }
             },
@@ -114,6 +117,19 @@
                     group: "description",
                 }
             },
+        },
+
+        watch: {
+            // 监视大屏中的信号源,只要变动,就调用回调函数
+            signalPreList: function (arr) {
+                this.reqRefreshBigScreen(arr)
+            },
+
+            // 监视分屏的状态
+            splitScreenStatus: function() {
+                const arr = this.$store.state.signalPreList
+                this.reqRefreshBigScreen(arr)
+            }
         }
     }
 </script>

+ 6 - 6
src/renderer/components/Login.vue

@@ -30,14 +30,10 @@
 
 <script>
     import {mapState} from 'vuex'
-    import {reqLogin, reqPlanList} from "../api"
+    import {reqLogin} from "../api"
     import storageUtils from "../../utils/storageUtils"
 
     export default {
-        computed: {
-            ...mapState(['loginJson'])
-        },
-
         data() {
             const checkUsername = (rule, value, callback) => {
                 if (!value) {
@@ -65,6 +61,10 @@
             }
         },
 
+        computed: {
+            ...mapState(['loginJson'])
+        },
+
         methods: {
             async submitForm() {
                 const {username,password} = this.ruleForm
@@ -74,7 +74,7 @@
                 }
                 const userInfo = {name:username,password}
 
-                // 模拟登
+                // 模拟登
                 /*if(username === 'admin' && password === '123'){
                     // 将user保存到vuex的state,同时保存到本地
                     this.$store.dispatch('saveUser', userInfo)

+ 10 - 4
src/renderer/store/actions.js

@@ -12,36 +12,42 @@ import {
 
 export default {
 
+  // 保存用户
   saveUser ({commit}, user) {
-    // 提交一个mutation请求
-    commit(SAVE_USER, {user}) // 传递给mutation的是一个包含数据的对象
+    commit(SAVE_USER, {user})
   },
 
+  // 重置用户
   resetUser ({commit}) {
-    // 提交一个mutation请求
-    commit(RESET_USER) // 传递给mutation的是一个包含数据的对象
+    commit(RESET_USER)
   },
 
+  // 清屏操作
   clearScreen({commit}) {
     commit(CLEAR_SCREEN)
   },
 
+  // 分屏操作
   splitScreen({commit},number) {
     commit(SPLIT_SCREEN,{number})
   },
 
+  // 更新大屏中的信号源列表
   updateSignalPreList({commit},signalPreList) {
     commit(UPDATE_SIGNALPRELIST,{signalPreList})
   },
 
+  // 保存大屏数据
   saveBigscreen({commit},bigScreenJson) {
     commit(SAVE_BIGSCREEN,{bigScreenJson})
   },
 
+  // 保存信号源数据
   saveSignalList({commit},signalListJson) {
     commit(SAVE_SIGNALLIST,{signalListJson})
   },
 
+  // 保存设备数据
   saveDevice({commit},deviceJson) {
     commit(SAVE_DEVICE,{deviceJson})
   }