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

+ 235 - 171
.idea/workspace.xml

@@ -2,7 +2,16 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="690c02a3-0e7d-4c4a-8f0c-a44c44c3a162" name="Default Changelist" comment="">
-      <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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/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/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/" />
@@ -15,15 +24,59 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
-    <leaf>
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/utils/tools.js">
+          <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" />
+              <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>
+      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/renderer/api/index.js">
+        <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" />
+              <folding>
+                <element signature="n#template#0;n#!!top" />
+                <element signature="n#div#0;n#template#0;n#!!top" />
+                <element signature="n#draggable#0;n#div#0;n#template#0;n#!!top" />
+                <element signature="n#div#0;n#draggable#0;n#div#0;n#template#0;n#!!top" />
+                <element signature="n#style#0;n#!!top" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <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="252">
-              <caret line="24" column="57" lean-forward="true" selection-start-line="24" selection-start-column="57" selection-end-line="24" selection-end-column="57" />
+            <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" />
               <folding>
                 <element signature="n#!!doc" expanded="true" />
-                <element signature="e#40#65#0" expanded="true" />
+                <element signature="e#25#193#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/renderer/App.vue">
+          <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>
           </provider>
@@ -40,9 +93,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>d80a8b6e-9f88-41ff</find>
-      <find>76</find>
-      <find>76.png</find>
       <find>4020b2de-534f-42ca-9ad6-419d642bb2a2</find>
       <find>9a0dff23-8633-4e7f-89bf-cc4f68ec</find>
       <find>9a0dff23-8633-4e7f-89bf-cc4f68ec88e1</find>
@@ -70,6 +120,9 @@
       <find>devS</find>
       <find>WebpackDevServer</find>
       <find>112.74</find>
+      <find>SAVE_SIGNALLIST</find>
+      <find>updateSignalPreList</find>
+      <find>UPDATE_SIGNALPRELIST</find>
     </findStrings>
     <replaceStrings>
       <replace>class</replace>
@@ -104,7 +157,6 @@
         <option value="$PROJECT_DIR$/src/renderer/assets/less/splitscreen.less" />
         <option value="$PROJECT_DIR$/static/EnityBigScreen.json" />
         <option value="$PROJECT_DIR$/static/EnityButton.json" />
-        <option value="$PROJECT_DIR$/src/utils/tools.js" />
         <option value="$PROJECT_DIR$/../../新建文件夹/slideDemo.html" />
         <option value="$PROJECT_DIR$/../../新建文件夹/slideDemo2.html" />
         <option value="$PROJECT_DIR$/src/renderer/components/vue-slider.vue" />
@@ -118,31 +170,32 @@
         <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/SignalList.vue" />
         <option value="$PROJECT_DIR$/src/renderer/components/Image.vue" />
         <option value="$PROJECT_DIR$/src/renderer/components/Slider.vue" />
-        <option value="$PROJECT_DIR$/src/renderer/store/mutation-types.js" />
-        <option value="$PROJECT_DIR$/src/renderer/store/actions.js" />
-        <option value="$PROJECT_DIR$/src/renderer/store/mutations.js" />
-        <option value="$PROJECT_DIR$/src/renderer/components/BigShow.vue" />
-        <option value="$PROJECT_DIR$/src/renderer/components/Button.vue" />
-        <option value="$PROJECT_DIR$/src/renderer/store/state.js" />
         <option value="$PROJECT_DIR$/.electron-vue/dev-runner.js" />
         <option value="$PROJECT_DIR$/package.json" />
-        <option value="$PROJECT_DIR$/src/renderer/components/Admin.vue" />
         <option value="$PROJECT_DIR$/src/utils/storageUtils.js" />
         <option value="$PROJECT_DIR$/../../files/ehs/test_uploadfile.html" />
         <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/renderer/App.vue" />
         <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/components/BigShow.vue" />
       </list>
     </option>
   </component>
@@ -160,18 +213,8 @@
       <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">
@@ -279,12 +322,13 @@
       <workItem from="1588745047243" duration="2850000" />
       <workItem from="1588751627518" duration="1242000" />
       <workItem from="1588816090227" duration="5197000" />
-      <workItem from="1588829637481" duration="1043000" />
+      <workItem from="1588829637481" duration="12912000" />
+      <workItem from="1588844511323" duration="1453000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="431401000" />
+    <option name="totallyTimeSpent" value="444723000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -299,7 +343,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.14857745" />
+      <window_info 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" />
@@ -313,7 +357,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.50158733" />
+      <window_info anchor="bottom" id="Terminal" order="10" weight="0.4021164" />
       <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" />
@@ -324,50 +368,6 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/static/EnitySlider.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="336">
-          <caret line="16" column="24" lean-forward="true" selection-start-line="16" selection-start-column="24" selection-end-line="16" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/static/EnityTopologyConnection.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="504">
-          <caret line="24" column="52" lean-forward="true" selection-start-line="24" selection-start-column="52" selection-end-line="24" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/components/BigShow.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="126">
-          <caret line="6" column="39" selection-start-line="6" selection-start-column="39" selection-end-line="6" selection-end-column="39" />
-          <folding>
-            <element signature="n#div#0;n#draggable#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="e#1054#1083#0" expanded="true" />
-            <element signature="n#style#0;n#!!top" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/login.less" />
-    <entry file="file://$PROJECT_DIR$/src/renderer/store/index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="336">
-          <caret line="18" column="2" lean-forward="true" selection-start-line="18" selection-start-column="2" selection-end-line="18" selection-end-column="2" />
-          <folding>
-            <element signature="e#25#46#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/static/EnityLogin.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="15" column="32" lean-forward="true" selection-start-line="15" selection-start-column="32" selection-end-line="15" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/.electron-vue/build.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="462">
@@ -429,16 +429,6 @@
     <entry file="file://$PROJECT_DIR$/src/main/index.dev.js">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/store/mutation-types.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="126">
-          <caret line="6" column="74" lean-forward="true" selection-start-line="6" selection-start-column="74" selection-end-line="6" selection-end-column="74" />
-          <folding>
-            <element signature="n#!!doc" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.dom.d.ts">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="21">
@@ -456,23 +446,6 @@
         </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="147">
-          <caret line="9" column="31" lean-forward="true" selection-start-line="9" selection-start-column="31" selection-end-line="9" selection-end-column="31" />
-          <folding>
-            <element signature="n#!!doc" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/store/actions.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="8" column="4" lean-forward="true" selection-start-line="8" selection-start-column="4" selection-end-line="8" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../../nginx.conf" />
     <entry file="file://$PROJECT_DIR$/node_modules/element-ui/types/upload.d.ts">
       <provider selected="true" editor-type-id="text-editor">
@@ -513,33 +486,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/EnitySignalPreviewList.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="21">
-          <caret line="106" lean-forward="true" selection-start-line="106" selection-end-line="106" />
-          <folding>
-            <element signature="e#0#2770#0" />
-            <element signature="e#4#2768#0" />
-            <element signature="e#97#2204#0" />
-            <element signature="e#105#226#0" />
-            <element signature="e#234#355#0" />
-            <element signature="e#363#484#0" />
-            <element signature="e#492#613#0" />
-            <element signature="e#621#744#0" />
-            <element signature="e#752#875#0" />
-            <element signature="e#883#1006#0" />
-            <element signature="e#1014#1155#0" />
-            <element signature="e#1163#1304#0" />
-            <element signature="e#1312#1453#0" />
-            <element signature="e#1461#1602#0" />
-            <element signature="e#1610#1751#0" />
-            <element signature="e#1759#1900#0" />
-            <element signature="e#1908#2049#0" />
-            <element signature="e#2057#2198#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/static/EnityBigScreen.json">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="357">
@@ -2147,13 +2093,6 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/static/EnityBigScreen.Data" />
-    <entry file="file://$PROJECT_DIR$/src/renderer/App.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="147">
-          <caret line="7" column="21" selection-start-line="7" selection-start-column="21" selection-end-line="7" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/renderer/main.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="378">
@@ -2248,17 +2187,6 @@
     </entry>
     <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$/src/renderer/store/state.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="21">
-          <caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" />
-          <folding>
-            <element signature="n#!!doc" expanded="true" />
-            <element signature="e#12#62#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <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">
@@ -2294,25 +2222,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/components/Admin.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="42">
-          <caret line="2" column="22" lean-forward="true" selection-start-line="2" selection-start-column="22" selection-end-line="2" selection-end-column="22" />
-          <folding>
-            <element signature="n#div#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="e#1231#1954#0" />
-            <element signature="e#2070#2099#0" expanded="true" />
-            <element signature="e#2542#2729#0" />
-            <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" />
-          </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">
@@ -2347,8 +2256,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/renderer/api/index.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="24" column="57" lean-forward="true" selection-start-line="24" selection-start-column="57" selection-end-line="24" selection-end-column="57" />
+        <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" />
@@ -2356,5 +2265,160 @@
         </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">
+          <caret line="18" column="2" selection-start-line="18" selection-start-column="2" selection-end-line="18" selection-end-column="2" />
+          <folding>
+            <element signature="e#25#46#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/store/getters.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="12" column="4" lean-forward="true" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="4" />
+          <folding>
+            <element signature="n#!!doc" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/static/EnitySignalPreviewList.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="268">
+          <caret line="81" column="6" lean-forward="true" selection-start-line="81" selection-start-column="6" selection-end-line="81" selection-end-column="6" />
+          <folding>
+            <element signature="e#105#226#0" />
+            <element signature="e#234#355#0" />
+            <element signature="e#363#484#0" />
+            <element signature="e#492#613#0" />
+            <element signature="e#621#744#0" />
+            <element signature="e#752#875#0" />
+            <element signature="e#883#1006#0" />
+            <element signature="e#1014#1155#0" />
+            <element signature="e#1163#1304#0" />
+            <element signature="e#1312#1453#0" />
+            <element signature="e#1461#1602#0" />
+            <element signature="e#1610#1751#0" />
+            <element signature="e#1759#1900#0" />
+            <element signature="e#1908#2049#0" />
+            <element signature="e#2057#2198#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/components/SignalList.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="12" column="32" lean-forward="true" selection-start-line="12" selection-start-column="32" selection-end-line="12" selection-end-column="32" />
+          <folding>
+            <element signature="e#1349#1378#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/components/Admin.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="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" />
+          <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" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/store/mutation-types.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="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="n#!!doc" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/components/Button.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="189">
+          <caret line="72" lean-forward="true" selection-start-line="72" selection-end-line="72" />
+        </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="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" />
+          <folding>
+            <element signature="n#!!doc" expanded="true" />
+            <element signature="e#12#62#0" expanded="true" />
+          </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="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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/App.vue">
+      <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>
+      </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" />
+          <folding>
+            <element signature="n#!!doc" expanded="true" />
+            <element signature="e#25#193#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/utils/tools.js">
+      <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" />
+          <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/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" />
+          <folding>
+            <element signature="n#template#0;n#!!top" />
+            <element signature="n#div#0;n#template#0;n#!!top" />
+            <element signature="n#draggable#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#div#0;n#draggable#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#style#0;n#!!top" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

+ 17 - 1
src/renderer/App.vue

@@ -7,7 +7,7 @@
 <script>
   import fs from 'fs'
   import path from 'path'
-  import {reqImportConfigFiles} from "./api"
+  import {reqBigScreen, reqDevice, reqImportConfigFiles, reqPreviewSourceList} from "./api"
 
   export default {
     name: 'vedio_app',
@@ -26,6 +26,14 @@
       if(!res){
         console.log('上传配置文件成功!')
       }
+
+      // 获取大屏,信号源,设备数据并保存到vuex中
+      const bigScreenJson = await reqBigScreen()
+      const signalListJson = await reqPreviewSourceList()
+      const deviceJson = await reqDevice()
+      this.$store.dispatch('saveBigscreen',bigScreenJson.filter(item => item.IsVisibility === true))
+      this.$store.dispatch('saveSignalList',signalListJson)
+      this.$store.dispatch('saveDevice',deviceJson)
     }
   }
 </script>
@@ -33,3 +41,11 @@
 <style>
 
 </style>
+
+
+
+
+
+
+
+

+ 35 - 4
src/renderer/components/BigShow.vue

@@ -12,16 +12,16 @@
                 @start="isDragging=true"
                 @end="isDragging=false"
                 :style="{
-                    left:item.Left+'px',
-                    top:item.Top+'px',
                     width:item.Width + 'px',
                     height:item.Height + 'px',
+                    left:item.Left+'px',
+                    top:item.Top+'px',
                     zIndex:item.ZIndex,
                     display:item.IsVisibility ? 'black' : 'none',
                 }"
         >
-            <div v-for="(item,key) in signalPreList" :key="key" class="item">
-                {{item.ShowName}}
+            <div v-for="(item,key) in signalPreList" :key="key" class="item" ref="signal">
+                {{item.showName}}
             </div>
         </draggable>
     </div>
@@ -31,6 +31,8 @@
     import {mapState} from 'vuex'
     import draggable from 'vuedraggable'
     import '../assets/less/splitscreen.less'
+    import {getElementLeft, getElementTop} from "../../utils/tools"
+    import {reqRefreshView} from "../api"
 
     export default {
         data() {
@@ -62,6 +64,35 @@
                     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)
                 }
             },

+ 1 - 1
src/renderer/components/Button.vue

@@ -69,7 +69,7 @@
         methods: {
             // 点击按钮
             clickBtn(e) {
-                console.log(e)
+                // console.log(e)
 
                 // 预案管理声音开关
                 if (e.ID === '355d3c32-1502-40b4-9ddd-663d5b8469e7') {

+ 15 - 16
src/renderer/components/SignalList.vue

@@ -1,32 +1,31 @@
 <template>
     <draggable
             :style="{
-                    left:signalListJson[0].Left+'px',
-                    top:signalListJson[0].Top+'px',
-                    width:signalListJson[0].Width + 'px',
-                    height:signalListJson[0].Height + 'px',
-                    zIndex:signalListJson[0].ZIndex,
-                    display:signalListJson[0].IsVisibility ? 'block' : 'none',
-                    fontSize:signalListJson[0].FontSize + 'px',
-                    color:`#${signalListJson[0].ForegroundStr.slice(3)}`,
-                    position:'absolute',
-                    overflow:'auto',
-                    }"
+                left:signalBorder[0].Left+'px',
+                top:signalBorder[0].Top+'px',
+                width:signalBorder[0].Width + 'px',
+                height:signalBorder[0].Height + 'px',
+                zIndex:signalBorder[0].ZIndex,
+                display:signalBorder[0].IsVisibility ? 'block' : 'none',
+                fontSize:signalBorder[0].FontSize + 'px',
+                color:`#${signalBorder[0].ForegroundStr.slice(3)}`,
+                position:'absolute',
+                overflow:'auto',
+            }"
             class="signal_body"
             element="div"
-            v-model="signalListJson[0].PreviewList"
+            v-model="signalListJson"
             :options="dragOptions1"
             :move="onMove"
             @start="isDragging=true"
             @end="isDragging=false"
-
     >
         <!--列表项-->
-        <div class="signal_item" v-for="item in signalListJson[0].PreviewList" :key="item.ID">
+        <div class="signal_item" v-for="item in signalListJson" :key="item.ID">
             <div class="signal_item_bg">
                 <div class="signal_item_bg_body">
                     <div class="signal_item_bg_body_space"></div>
-                    <div class="signal_item_bg_body_font">{{item.ShowName}}</div>
+                    <div class="signal_item_bg_body_font">{{item.showName}}</div>
                 </div>
             </div>
         </div>
@@ -54,7 +53,7 @@
         },
 
         computed: {
-            ...mapState(['signalListJson']),
+            ...mapState(['signalListJson','signalBorder']),
             dragOptions1() {
                 return {
                     animation: 0,

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

@@ -1,5 +1,14 @@
 /*包含n个用于间接更新状态的方法的对象模块*/
-import {SAVE_USER,RESET_USER,CLEAR_SCREEN,SPLIT_SCREEN,UPDATE_SIGNALPRELIST} from './mutation-types'
+import {
+  SAVE_USER,
+  RESET_USER,
+  CLEAR_SCREEN,
+  SPLIT_SCREEN,
+  UPDATE_SIGNALPRELIST,
+  SAVE_BIGSCREEN,
+  SAVE_SIGNALLIST,
+  SAVE_DEVICE
+} from './mutation-types'
 
 export default {
 
@@ -23,6 +32,18 @@ export default {
 
   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})
   }
 
 }

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

@@ -5,4 +5,7 @@ export const OPEN_SIGNAL_MODAL = 'open_signal_modal' // 打开信号源对话框
 export const CLEAR_SCREEN = 'clear_screen' // 清屏操作
 export const SPLIT_SCREEN = 'split_screen' // 分屏操作
 export const UPDATE_SIGNALPRELIST = 'update_signalprelist' // 更新拖动到大屏中的信号源
+export const SAVE_BIGSCREEN = 'save_bigscreen' // 保存大屏数据
+export const SAVE_SIGNALLIST = 'save_signallist' // 保存信号源列表数据
+export const SAVE_DEVICE = 'save_device' // 保存设备数据
 

+ 25 - 1
src/renderer/store/mutations.js

@@ -1,5 +1,14 @@
 /*包含n个用于直接更新状态的方法的对象模块*/
-import {SAVE_USER,RESET_USER,CLEAR_SCREEN,SPLIT_SCREEN,UPDATE_SIGNALPRELIST} from './mutation-types'
+import {
+  SAVE_USER,
+  RESET_USER,
+  CLEAR_SCREEN,
+  SPLIT_SCREEN,
+  UPDATE_SIGNALPRELIST,
+  SAVE_BIGSCREEN,
+  SAVE_SIGNALLIST,
+  SAVE_DEVICE
+} from './mutation-types'
 
 import storageUtils from "../../utils/storageUtils"
 
@@ -30,4 +39,19 @@ export default {
   [UPDATE_SIGNALPRELIST] (state,{signalPreList}) {
     state.signalPreList = signalPreList
   },
+
+  // 保存大屏数据
+  [SAVE_BIGSCREEN] (state,{bigScreenJson}) {
+    state.bigScreenJson = bigScreenJson
+  },
+
+  // 保存信号源数据
+  [SAVE_SIGNALLIST] (state,{signalListJson}) {
+    state.signalListJson = signalListJson
+  },
+
+  // 保存设备数据
+  [SAVE_DEVICE] (state,{deviceJson}) {
+    state.deviceJson = deviceJson
+  },
 }

+ 14 - 9
src/renderer/store/state.js

@@ -4,11 +4,10 @@ import loginJson from '../../../static/EnityLogin'
 import windowJson from '../../../static/EnityWindow'
 import buttonJson from '../../../static/EnityButton'
 import labelJson from '../../../static/EnityLable'
-import bigScreenJson from '../../../static/EnityBigScreen'
-import signalListJson from '../../../static/EnitySignalPreviewList'
 import imageJson from '../../../static/EnityImage'
 import sliderJson from '../../../static/EnitySlider'
 import systemJson from '../../../static/EnitySystem'
+import signalBorder from '../../../static/EnitySignalPreviewList'
 
 export default {
   // 用户信息
@@ -32,12 +31,6 @@ export default {
   // label标签
   labelJson,
 
-  // 大屏显示
-  bigScreenJson,
-
-  // 信号源列表
-  signalListJson,
-
   // 图片
   imageJson,
 
@@ -45,5 +38,17 @@ export default {
   sliderJson,
 
   // ip 端口
-  systemJson
+  systemJson,
+
+  // 大屏显示
+  bigScreenJson:[],
+
+  // 信号源列表
+  signalListJson:[],
+
+  // 信号源外壳
+  signalBorder,
+
+  // 设备数据
+  deviceJson:[]
 }

+ 21 - 0
src/utils/tools.js

@@ -10,3 +10,24 @@ export function uniq(array){
     }
     return temp;
 }
+
+// 获取绝对位置的横坐标和纵坐标
+export function getElementLeft(element){
+    var actualLeft = element.offsetLeft;
+    var current = element.offsetParent;
+    while (current !== null){
+        actualLeft += current.offsetLeft;
+        current = current.offsetParent;
+    }
+    return actualLeft;
+}
+
+export function getElementTop(element){
+    var actualTop = element.offsetTop;
+    var current = element.offsetParent;
+    while (current !== null){
+        actualTop += current.offsetTop;
+        current = current.offsetParent;
+    }
+    return actualTop;
+}