liuwei 5 роки тому
батько
коміт
fa584b73c3

+ 94 - 66
.idea/workspace.xml

@@ -3,8 +3,6 @@
   <component name="ChangeListManager">
     <list default="true" id="690c02a3-0e7d-4c4a-8f0c-a44c44c3a162" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/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/" />
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -17,49 +15,7 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/renderer/components/Admin.vue">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="336">
-              <caret line="66" column="22" lean-forward="true" selection-start-line="66" selection-start-column="22" selection-end-line="66" selection-end-column="22" />
-              <folding>
-                <element signature="n#div#0;n#div#1;n#div#1;n#div#0;n#template#0;n#!!top" />
-                <element signature="n#div#1;n#div#1;n#div#1;n#div#0;n#template#0;n#!!top" />
-                <element signature="n#draggable#0;n#div#1;n#div#1;n#div#1;n#div#0;n#template#0;n#!!top" />
-                <element signature="n#div#0;n#draggable#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#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#2;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="n#draggable#0;n#div#2;n#div#1;n#div#1;n#div#0;n#template#0;n#!!top" />
-                <element signature="n#div#0;n#draggable#0;n#div#2;n#div#1;n#div#1;n#div#0;n#template#0;n#!!top" />
-                <element signature="n#div#0;n#div#0;n#draggable#0;n#div#2;n#div#1;n#div#1;n#div#0;n#template#0;n#!!top" />
-                <element signature="n#div#0;n#div#0;n#div#0;n#draggable#0;n#div#2;n#div#1;n#div#1;n#div#0;n#template#0;n#!!top" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/admin.less">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1239">
-              <caret line="93" column="27" selection-start-line="93" selection-start-column="27" selection-end-line="93" selection-end-column="27" />
-              <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" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
@@ -100,7 +56,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectFrameBounds" extendedState="7">
+  <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="-8" />
     <option name="y" value="-8" />
     <option name="width" value="1366" />
@@ -115,7 +71,22 @@
     </navigator>
     <panes>
       <pane id="Scope" />
-      <pane id="ProjectPane" />
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="electron-app" type="b2602c69:ProjectViewProjectNode" />
+              <item name="electron-app" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="electron-app" type="b2602c69:ProjectViewProjectNode" />
+              <item name="electron-app" type="462c0819:PsiDirectoryNode" />
+              <item name="static" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -173,11 +144,14 @@
       <workItem from="1585833443100" duration="3604000" />
       <workItem from="1585894371150" duration="9717000" />
       <workItem from="1585907669831" duration="14000" />
+      <workItem from="1586182138822" duration="718000" />
+      <workItem from="1586223683424" duration="11000" />
+      <workItem from="1586326376025" duration="927000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="74320000" />
+    <option name="totallyTimeSpent" value="75976000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -190,7 +164,6 @@
   </component>
   <component name="ToolWindowManager">
     <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.12750264" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
@@ -441,15 +414,61 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/admin.less">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret column="10" lean-forward="true" selection-start-column="10" selection-end-column="10" />
+          <folding>
+            <element signature="e#23#4433#0" />
+            <element signature="e#168#206#0" />
+            <element signature="e#234#4366#0" />
+            <element signature="e#321#580#0" />
+            <element signature="e#487#574#0" />
+            <element signature="e#613#4248#0" />
+            <element signature="e#744#1149#0" />
+            <element signature="e#957#993#0" />
+            <element signature="e#1049#1141#0" />
+            <element signature="e#1191#2616#0" />
+            <element signature="e#1307#1727#0" />
+            <element signature="e#1577#1717#0" />
+            <element signature="e#1771#1902#0" />
+            <element signature="e#1947#2076#0" />
+            <element signature="e#2117#2608#0" />
+            <element signature="e#2244#2448#0" />
+            <element signature="e#2491#2598#0" />
+            <element signature="e#2655#4242#0" />
+            <element signature="e#2855#2915#0" />
+            <element signature="e#2953#4233#0" />
+            <element signature="e#3043#4222#0" />
+            <element signature="e#3242#4210#0" />
+            <element signature="e#3424#3501#0" />
+            <element signature="e#3559#4196#0" />
+            <element signature="e#3744#3900#0" />
+            <element signature="e#3966#4180#0" />
+            <element signature="e#4279#4362#0" />
+            <element signature="e#4393#4431#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="336">
-          <caret line="66" column="22" lean-forward="true" selection-start-line="66" selection-start-column="22" selection-end-line="66" selection-end-column="22" />
+        <state relative-caret-position="84">
+          <caret line="176" lean-forward="true" selection-start-line="176" selection-end-line="176" />
           <folding>
+            <element signature="n#template#0;n#!!top" />
+            <element signature="n#div#0;n#template#0;n#!!top" />
+            <element signature="n#div#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#div#0;n#div#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#div#1;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#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#0;n#template#0;n#!!top" />
             <element signature="n#div#1;n#div#1;n#div#1;n#div#0;n#template#0;n#!!top" />
             <element signature="n#draggable#0;n#div#1;n#div#1;n#div#1;n#div#0;n#template#0;n#!!top" />
             <element signature="n#div#0;n#draggable#0;n#div#1;n#div#1;n#div#1;n#div#0;n#template#0;n#!!top" />
+            <element signature="e#2092#2282#0" />
+            <element signature="e#2337#2397#0" />
             <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" />
@@ -459,21 +478,30 @@
             <element signature="n#div#0;n#draggable#0;n#div#2;n#div#1;n#div#1;n#div#0;n#template#0;n#!!top" />
             <element signature="n#div#0;n#div#0;n#draggable#0;n#div#2;n#div#1;n#div#1;n#div#0;n#template#0;n#!!top" />
             <element signature="n#div#0;n#div#0;n#div#0;n#draggable#0;n#div#2;n#div#1;n#div#1;n#div#0;n#template#0;n#!!top" />
-          </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="1239">
-          <caret line="93" column="27" selection-start-line="93" selection-start-column="27" selection-end-line="93" selection-end-column="27" />
-          <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#4342#4826#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="e#5211#6883#0" />
+            <element signature="e#5233#5266#0" />
+            <element signature="e#5283#5533#0" />
+            <element signature="e#5304#5523#0" />
+            <element signature="e#5552#6310#0" />
+            <element signature="e#5595#5707#0" />
+            <element signature="e#5763#6035#0" />
+            <element signature="e#6084#6136#0" />
+            <element signature="e#6200#6300#0" />
+            <element signature="e#6330#6877#0" />
+            <element signature="e#6400#6704#0" />
+            <element signature="e#6425#6690#0" />
+            <element signature="e#6488#6630#0" />
+            <element signature="e#6733#6867#0" />
+            <element signature="e#6758#6853#0" />
+            <element signature="n#style#0;n#!!top" />
+            <element signature="e#6918#6948#0" />
+            <element signature="e#6961#7086#0" />
+            <element signature="e#7101#7134#0" />
+            <element signature="e#7151#7206#0" />
           </folding>
         </state>
       </provider>

Різницю між файлами не показано, бо вона завелика
+ 1 - 0
static/data/EnityBigScreen.Data


Різницю між файлами не показано, бо вона завелика
+ 1 - 0
static/data/EnityButton.Data


Різницю між файлами не показано, бо вона завелика
+ 1 - 0
static/data/EnityDevice.Data


Різницю між файлами не показано, бо вона завелика
+ 1 - 0
static/data/EnityIcon.Data


Різницю між файлами не показано, бо вона завелика
+ 1 - 0
static/data/EnityImage.Data


Різницю між файлами не показано, бо вона завелика
+ 1 - 0
static/data/EnityLable.Data


Різницю між файлами не показано, бо вона завелика
+ 1 - 0
static/data/EnityLogin.Data


+ 1 - 0
static/data/EnityMemory.Data

@@ -0,0 +1 @@
+[{"ID":"01","Code":"01","Name":"LoginUser","isInt":false,"Value":null,"IsSyn":false,"IsSystem":false,"Mark":null,"ActionType":4},{"ID":"02","Code":"02","Name":"LoginRole","isInt":false,"Value":null,"IsSyn":false,"IsSystem":false,"Mark":null,"ActionType":4}]

Різницю між файлами не показано, бо вона завелика
+ 1 - 0
static/data/EnitySignalPreviewList.Data


Різницю між файлами не показано, бо вона завелика
+ 1 - 0
static/data/EnitySlider.Data


+ 1 - 0
static/data/EnitySystem.data

@@ -0,0 +1 @@
+{"ServerIP":"192.168.1.111","ServerPort":2020,"Users":[]}

+ 1 - 0
static/data/EnityTimer.Data

@@ -0,0 +1 @@
+[{"ID":"f5f1217e-f606-4372-8650-4363931fa8e1","Code":"f5f1217e-f606-4372-8650-4363931fa8e1","Name":"500ms","ActionType":0,"Milliseconds":500},{"ID":"08be426e-f9ae-469c-8ea3-ab41403c9f47","Code":"08be426e-f9ae-469c-8ea3-ab41403c9f47","Name":"1s","ActionType":0,"Milliseconds":1000}]

Різницю між файлами не показано, бо вона завелика
+ 1 - 0
static/data/EnityTopology.Data


Різницю між файлами не показано, бо вона завелика
+ 1 - 0
static/data/EnityTopologyConnection.Data


+ 1 - 0
static/data/EnityView.Data

@@ -0,0 +1 @@
+[]

Різницю між файлами не показано, бо вона завелика
+ 1 - 0
static/data/EnityWindow.Data