拖动成功

.idea/workspace.xml

@@ -2,10 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="690c02a3-0e7d-4c4a-8f0c-a44c44c3a162" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" 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/assets/less/admin.less" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/assets/less/admin.less" 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/" />
@@ -19,30 +17,55 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
+    <leaf>
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/renderer/components/Admin.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-567">
-              <caret line="15" column="44" lean-forward="true" selection-start-line="15" selection-start-column="44" selection-end-line="15" selection-end-column="44" />
+            <state relative-caret-position="378">
+              <caret line="38" column="73" selection-start-line="38" selection-start-column="73" selection-end-line="38" selection-end-column="73" />
               <folding>
+                <element signature="n#div#0;n#div#0;n#template#0;n#!!top" />
+                <element signature="n#div#0;n#div#0;n#div#0;n#template#0;n#!!top" />
+                <element signature="n#div#0;n#div#1;n#div#0;n#template#0;n#!!top" />
+                <element signature="n#div#0;n#div#1;n#div#1;n#div#0;n#template#0;n#!!top" />
                 <element signature="n#div#0;n#div#1;n#div#1;n#div#1;n#div#0;n#template#0;n#!!top" />
                 <element signature="n#div#0;n#div#0;n#div#1;n#div#1;n#div#1;n#div#0;n#template#0;n#!!top" />
                 <element signature="n#div#1;n#div#0;n#div#1;n#div#1;n#div#1;n#div#0;n#template#0;n#!!top" />
-                <element signature="n#div#0;n#div#2;n#div#1;n#div#1;n#div#0;n#template#0;n#!!top" />
-                <element signature="e#3081#3565#0" />
-                <element signature="e#3791#3825#0" expanded="true" />
-                <element signature="e#5133#6243#0" />
-                <element signature="e#5153#6233#0" />
-                <element signature="e#5220#6219#0" />
-                <element signature="e#5272#6201#0" />
-                <element signature="e#5599#5939#0" />
-                <element signature="e#5998#6179#0" />
+                <element signature="n#div#2;n#div#1;n#div#0;n#template#0;n#!!top" />
+                <element signature="n#div#2;n#div#0;n#template#0;n#!!top" />
+                <element signature="n#script#0;n#!!top" />
                 <element signature="n#style#0;n#!!top" />
-                <element signature="e#6284#6314#0" />
-                <element signature="e#6327#6452#0" />
-                <element signature="e#6467#6500#0" />
-                <element signature="e#6517#6572#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/admin.less">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="454">
+              <caret line="82" column="10" lean-forward="true" selection-start-line="82" selection-start-column="10" selection-end-line="82" selection-end-column="10" />
+              <folding>
+                <element signature="e#168#206#0" />
+                <element signature="e#321#580#0" />
+                <element signature="e#487#574#0" />
+                <element signature="e#744#1149#0" />
+                <element signature="e#957#993#0" />
+                <element signature="e#1049#1141#0" />
+                <element signature="e#1513#2004#0" />
+                <element signature="e#1640#1844#0" />
+                <element signature="e#1887#1994#0" />
+                <element signature="e#2051#3638#0" />
+                <element signature="e#2251#2311#0" />
+                <element signature="e#2349#3629#0" />
+                <element signature="e#2439#3618#0" />
+                <element signature="e#2638#3606#0" />
+                <element signature="e#2820#2897#0" />
+                <element signature="e#2955#3592#0" />
+                <element signature="e#3140#3296#0" />
+                <element signature="e#3362#3576#0" />
+                <element signature="e#3676#3759#0" />
+                <element signature="e#3790#3828#0" />
               </folding>
             </state>
           </provider>
@@ -82,10 +105,10 @@
         <option value="$PROJECT_DIR$/src/renderer/store/state.js" />
         <option value="$PROJECT_DIR$/src/renderer/index.css" />
         <option value="$PROJECT_DIR$/src/index.ejs" />
-        <option value="$PROJECT_DIR$/src/renderer/assets/less/admin.less" />
         <option value="$PROJECT_DIR$/src/renderer/App.vue" />
         <option value="$PROJECT_DIR$/package.json" />
         <option value="$PROJECT_DIR$/src/renderer/components/Admin.vue" />
+        <option value="$PROJECT_DIR$/src/renderer/assets/less/admin.less" />
       </list>
     </option>
   </component>
@@ -103,7 +126,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -133,6 +155,7 @@
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -186,12 +209,13 @@
       <workItem from="1585577204895" duration="1209000" />
       <workItem from="1585578436413" duration="2728000" />
       <workItem from="1585620225944" duration="16578000" />
-      <workItem from="1585806030504" duration="10599000" />
+      <workItem from="1585806030504" duration="10699000" />
+      <workItem from="1585833443100" duration="3468000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="60885000" />
+    <option name="totallyTimeSpent" value="64453000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -403,40 +427,6 @@
     <entry file="file://$PROJECT_DIR$/node_modules/_vuedraggable@2.23.2@vuedraggable/dist/vuedraggable.common.js">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/admin.less">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="21">
-          <caret line="1" column="12" selection-start-line="1" selection-start-column="12" selection-end-line="1" selection-end-column="12" />
-          <folding>
-            <element signature="e#23#3830#0" />
-            <element signature="e#168#206#0" />
-            <element signature="e#234#3763#0" />
-            <element signature="e#321#580#0" />
-            <element signature="e#487#574#0" />
-            <element signature="e#613#3645#0" />
-            <element signature="e#744#1149#0" />
-            <element signature="e#957#993#0" />
-            <element signature="e#1049#1141#0" />
-            <element signature="e#1191#2012#0" />
-            <element signature="e#1307#1472#0" />
-            <element signature="e#1513#2004#0" />
-            <element signature="e#1640#1844#0" />
-            <element signature="e#1887#1994#0" />
-            <element signature="e#2051#3638#0" />
-            <element signature="e#2251#2311#0" />
-            <element signature="e#2349#3629#0" />
-            <element signature="e#2439#3618#0" />
-            <element signature="e#2638#3606#0" />
-            <element signature="e#2820#2897#0" />
-            <element signature="e#2955#3592#0" />
-            <element signature="e#3140#3296#0" />
-            <element signature="e#3362#3576#0" />
-            <element signature="e#3676#3759#0" />
-            <element signature="e#3790#3828#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/node_modules/element-ui/packages/color-picker/src/draggable.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="21">
@@ -491,26 +481,49 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/renderer/components/Admin.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-567">
-          <caret line="15" column="44" lean-forward="true" selection-start-line="15" selection-start-column="44" selection-end-line="15" selection-end-column="44" />
+        <state relative-caret-position="378">
+          <caret line="38" column="73" selection-start-line="38" selection-start-column="73" selection-end-line="38" selection-end-column="73" />
           <folding>
+            <element signature="n#div#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#div#0;n#div#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#div#0;n#div#1;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#div#0;n#div#1;n#div#1;n#div#0;n#template#0;n#!!top" />
             <element signature="n#div#0;n#div#1;n#div#1;n#div#1;n#div#0;n#template#0;n#!!top" />
             <element signature="n#div#0;n#div#0;n#div#1;n#div#1;n#div#1;n#div#0;n#template#0;n#!!top" />
             <element signature="n#div#1;n#div#0;n#div#1;n#div#1;n#div#1;n#div#0;n#template#0;n#!!top" />
-            <element signature="n#div#0;n#div#2;n#div#1;n#div#1;n#div#0;n#template#0;n#!!top" />
-            <element signature="e#3081#3565#0" />
-            <element signature="e#3791#3825#0" expanded="true" />
-            <element signature="e#5133#6243#0" />
-            <element signature="e#5153#6233#0" />
-            <element signature="e#5220#6219#0" />
-            <element signature="e#5272#6201#0" />
-            <element signature="e#5599#5939#0" />
-            <element signature="e#5998#6179#0" />
+            <element signature="n#div#2;n#div#1;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#div#2;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#script#0;n#!!top" />
             <element signature="n#style#0;n#!!top" />
-            <element signature="e#6284#6314#0" />
-            <element signature="e#6327#6452#0" />
-            <element signature="e#6467#6500#0" />
-            <element signature="e#6517#6572#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/admin.less">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="454">
+          <caret line="82" column="10" lean-forward="true" selection-start-line="82" selection-start-column="10" selection-end-line="82" selection-end-column="10" />
+          <folding>
+            <element signature="e#168#206#0" />
+            <element signature="e#321#580#0" />
+            <element signature="e#487#574#0" />
+            <element signature="e#744#1149#0" />
+            <element signature="e#957#993#0" />
+            <element signature="e#1049#1141#0" />
+            <element signature="e#1513#2004#0" />
+            <element signature="e#1640#1844#0" />
+            <element signature="e#1887#1994#0" />
+            <element signature="e#2051#3638#0" />
+            <element signature="e#2251#2311#0" />
+            <element signature="e#2349#3629#0" />
+            <element signature="e#2439#3618#0" />
+            <element signature="e#2638#3606#0" />
+            <element signature="e#2820#2897#0" />
+            <element signature="e#2955#3592#0" />
+            <element signature="e#3140#3296#0" />
+            <element signature="e#3362#3576#0" />
+            <element signature="e#3676#3759#0" />
+            <element signature="e#3790#3828#0" />
           </folding>
         </state>
       </provider>

src/renderer/assets/less/admin.less

@@ -77,6 +77,13 @@
           background-color: #000000;
           box-sizing: border-box;
           border: 4px solid skyblue;
+
+          /*1分屏*/
+
+
+          /*4分屏*/
+          /*9分屏*/
+          /*16分屏*/
         }
 
         /*控制按钮*/

src/renderer/components/Admin.vue

@@ -36,18 +36,12 @@
                             @start="isDragging=true"
                             @end="isDragging=false"
                     >
-                        <div v-for="(item,key) in signalList" :key="key">
-                            <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.name}}</div>
-                                </div>
-                            </div>
+                        <div v-for="(item,key) in signalList" :key="key" >
+                            {{item.name}}
                         </div>
                     </draggable>
 
                     <!--<div class="split_screen">
-
                     </div>-->
 
                     <div class="control_btns">
@@ -70,25 +64,24 @@
                     <div class="signal_title">
                         <h2>信号源列表</h2>
                     </div>
-                    <div class="signal_body">
-                        <draggable
-                                class="signal_item"
-                                v-for="(item,index) in deviceList"
-                                :key="index"
-                                element="div"
-                                v-model="deviceList"
-                                :options="dragOptions1"
-                                :move="onMove"
-                                @start="isDragging=true"
-                                @end="isDragging=false"
-                        >
-                                <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.name}}</div>
-                                    </div>
+                    <draggable
+                            class="signal_body"
+                            element="div"
+                            v-model="deviceList"
+                            :options="dragOptions1"
+                            :move="onMove"
+                            @start="isDragging=true"
+                            @end="isDragging=false"
+                    >
+                        <div class="signal_item" v-for="(item,index) in deviceList" :key="index">
+                            <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.name}}</div>
                                 </div>
-                        </draggable>
+                            </div>
+                        </div>
+                    </draggable>
 
                         <!--<div class="signal_item" v-for="(item,index) in deviceList" :key="index">
                             <div class="signal_item_bg">
@@ -98,7 +91,6 @@
                                 </div>
                             </div>
                         </div>-->
-                    </div>
                 </div>
             </div>
             <div class="footmenu">
@@ -124,7 +116,7 @@
         data() {
             return {
                 user:storageUtils.getUser(),
-                signalList:[],// 被拖到大屏中的信号源
+                signalList:[],  // 被拖到大屏中的信号源列表
                 isDragging:false,
             }
         },