|
@@ -5,9 +5,7 @@
|
|
|
<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/api/ajax.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/api/ajax.js" 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/main.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/main.js" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/renderer/router/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/router/index.js" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/src/renderer/api/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/api/index.js" afterDir="false" />
|
|
|
</list>
|
|
|
<ignored path="$PROJECT_DIR$/dist/" />
|
|
|
<ignored path="$PROJECT_DIR$/.tmp/" />
|
|
@@ -20,41 +18,7 @@
|
|
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
|
|
</component>
|
|
|
<component name="FileEditorManager">
|
|
|
- <leaf>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/renderer/main.js">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="84">
|
|
|
- <caret line="4" column="29" lean-forward="true" selection-start-line="4" selection-start-column="29" selection-end-line="4" selection-end-column="29" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="true">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/renderer/App.vue">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="483">
|
|
|
- <caret line="23" column="27" lean-forward="true" selection-start-line="23" selection-start-column="27" selection-end-line="23" selection-end-column="27" />
|
|
|
- <folding>
|
|
|
- <element signature="e#93#112#0" expanded="true" />
|
|
|
- </folding>
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/renderer/router/index.js">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="462">
|
|
|
- <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
|
|
|
- <folding>
|
|
|
- <element signature="e#0#21#0" expanded="true" />
|
|
|
- </folding>
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- </leaf>
|
|
|
+ <leaf />
|
|
|
</component>
|
|
|
<component name="FileTemplateManagerImpl">
|
|
|
<option name="RECENT_TEMPLATES">
|
|
@@ -160,22 +124,21 @@
|
|
|
<option value="$PROJECT_DIR$/src/renderer/assets/less/mainpage.less" />
|
|
|
<option value="$PROJECT_DIR$/src/renderer/components/Admin.vue" />
|
|
|
<option value="$PROJECT_DIR$/src/utils/storageUtils.js" />
|
|
|
- <option value="$PROJECT_DIR$/src/renderer/api/index.js" />
|
|
|
<option value="$PROJECT_DIR$/src/renderer/components/Login.vue" />
|
|
|
- <option value="$PROJECT_DIR$/src/renderer/api/ajax.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/App.vue" />
|
|
|
+ <option value="$PROJECT_DIR$/src/renderer/api/ajax.js" />
|
|
|
+ <option value="$PROJECT_DIR$/src/renderer/api/index.js" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
|
<component name="ProjectFrameBounds" extendedState="6">
|
|
|
- <option name="x" value="-420" />
|
|
|
- <option name="y" value="19" />
|
|
|
- <option name="width" value="1366" />
|
|
|
- <option name="height" value="600" />
|
|
|
+ <option name="x" value="-80" />
|
|
|
+ <option name="width" value="1100" />
|
|
|
+ <option name="height" value="444" />
|
|
|
</component>
|
|
|
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
|
|
|
<ConfirmationsSetting value="2" id="Add" />
|
|
@@ -193,31 +156,6 @@
|
|
|
<item name="electron-app" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="electron-app" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
- <path>
|
|
|
- <item name="electron-app" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="electron-app" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
- <path>
|
|
|
- <item name="electron-app" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="electron-app" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="renderer" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
- <path>
|
|
|
- <item name="electron-app" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="electron-app" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="renderer" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="components" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
- <path>
|
|
|
- <item name="electron-app" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="electron-app" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="renderer" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="router" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
</expand>
|
|
|
<select />
|
|
|
</subPane>
|
|
@@ -322,12 +260,14 @@
|
|
|
<workItem from="1587909041527" duration="633000" />
|
|
|
<workItem from="1587980408036" duration="1193000" />
|
|
|
<workItem from="1588039023750" duration="21254000" />
|
|
|
- <workItem from="1588125117785" duration="17969000" />
|
|
|
+ <workItem from="1588125117785" duration="20299000" />
|
|
|
+ <workItem from="1588165885620" duration="51000" />
|
|
|
+ <workItem from="1588211219666" duration="2377000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="410970000" />
|
|
|
+ <option name="totallyTimeSpent" value="415728000" />
|
|
|
</component>
|
|
|
<component name="TodoView">
|
|
|
<todo-panel id="selected-file">
|
|
@@ -340,9 +280,8 @@
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<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.15700738" />
|
|
|
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14172813" />
|
|
|
<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" />
|
|
@@ -2561,24 +2500,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/package.json">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="210">
|
|
|
- <caret line="104" column="3" lean-forward="true" selection-start-line="104" selection-start-column="3" selection-end-line="104" selection-end-column="3" />
|
|
|
- <folding>
|
|
|
- <element signature="n#!!block;n#scripts#0;n#!!top" />
|
|
|
- <element signature="n#!!block;n#build#0;n#!!top" />
|
|
|
- <element signature="n#!!block;n#directories#0;n#!!block;n#build#0;n#!!top" />
|
|
|
- <element signature="n#!!block;n#dmg#0;n#!!block;n#build#0;n#!!top" />
|
|
|
- <element signature="n#!!block;n#mac#0;n#!!block;n#build#0;n#!!top" />
|
|
|
- <element signature="n#!!block;n#win#0;n#!!block;n#build#0;n#!!top" />
|
|
|
- <element signature="n#!!block;n#linux#0;n#!!block;n#build#0;n#!!top" />
|
|
|
- <element signature="n#!!block;n#dependencies#0;n#!!top" />
|
|
|
- <element signature="n#!!block;n#devDependencies#0;n#!!top" />
|
|
|
- </folding>
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/static/EnityBigScreen.json">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state>
|
|
@@ -2723,55 +2644,7 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/../../nginx.conf">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="126">
|
|
|
- <caret line="6" column="33" lean-forward="true" selection-start-line="6" selection-start-column="33" selection-end-line="6" selection-end-column="33" />
|
|
|
- </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="84">
|
|
|
- <caret line="4" column="25" lean-forward="true" selection-start-line="4" selection-start-column="25" selection-end-line="4" selection-end-column="25" />
|
|
|
- <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="210">
|
|
|
- <caret line="10" column="8" lean-forward="true" selection-start-line="10" selection-start-column="8" selection-end-line="10" selection-end-column="8" />
|
|
|
- <folding>
|
|
|
- <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/api/index.js">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="294">
|
|
|
- <caret line="14" column="31" lean-forward="true" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
|
|
|
- <folding>
|
|
|
- <element signature="n#!!doc" expanded="true" />
|
|
|
- </folding>
|
|
|
- </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">
|
|
|
<state relative-caret-position="751">
|
|
@@ -2828,16 +2701,7 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/renderer/components/UploadConfig.vue">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="357">
|
|
|
- <caret line="17" column="11" lean-forward="true" selection-start-line="17" selection-start-column="11" selection-end-line="17" selection-end-column="11" />
|
|
|
- <folding>
|
|
|
- <element signature="n#style#0;n#el-button#1;n#el-upload#0;n#div#0;n#template#0;n#!!top" expanded="true" />
|
|
|
- </folding>
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/renderer/components/UploadConfig.vue" />
|
|
|
<entry file="file://$PROJECT_DIR$/src/renderer/main.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="84">
|
|
@@ -2857,13 +2721,77 @@
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/renderer/App.vue">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="483">
|
|
|
- <caret line="23" column="27" lean-forward="true" selection-start-line="23" selection-start-column="27" selection-end-line="23" selection-end-column="27" />
|
|
|
+ <state relative-caret-position="210">
|
|
|
+ <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
|
|
|
<folding>
|
|
|
<element signature="e#93#112#0" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/package.json">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="-798">
|
|
|
+ <caret line="7" column="13" lean-forward="true" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
|
|
|
+ <folding>
|
|
|
+ <element signature="n#!!block;n#directories#0;n#!!block;n#build#0;n#!!top" />
|
|
|
+ <element signature="n#!!block;n#dmg#0;n#!!block;n#build#0;n#!!top" />
|
|
|
+ <element signature="n#!!block;n#mac#0;n#!!block;n#build#0;n#!!top" />
|
|
|
+ <element signature="n#!!block;n#win#0;n#!!block;n#build#0;n#!!top" />
|
|
|
+ <element signature="n#!!block;n#linux#0;n#!!block;n#build#0;n#!!top" />
|
|
|
+ </folding>
|
|
|
+ </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$/src/renderer/api/index.js">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="63">
|
|
|
+ <caret line="3" column="3" lean-forward="true" selection-start-line="3" selection-start-column="3" selection-end-line="3" selection-end-column="3" />
|
|
|
+ <folding>
|
|
|
+ <element signature="n#!!doc" expanded="true" />
|
|
|
+ </folding>
|
|
|
+ </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="622">
|
|
|
+ <caret line="38" column="19" lean-forward="true" selection-start-line="38" selection-start-column="19" selection-end-line="38" selection-end-column="19" />
|
|
|
+ <folding>
|
|
|
+ <element signature="n#!!doc" expanded="true" />
|
|
|
+ <element signature="e#58#83#0" expanded="true" />
|
|
|
+ <element signature="e#988#1048#0" />
|
|
|
+ <element signature="e#1073#1187#0" />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
</component>
|
|
|
</project>
|