|
@@ -2,6 +2,10 @@
|
|
<project version="4">
|
|
<project version="4">
|
|
<component name="ChangeListManager">
|
|
<component name="ChangeListManager">
|
|
<list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" name="Default Changelist" comment="">
|
|
<list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" 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$/Modules/Camera/Enum/CameraEnum.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php" afterDir="false" />
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" afterDir="false" />
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/app/Enum/ApiEnum.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Enum/ApiEnum.php" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/TestsController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/TestsController.php" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/TestsController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/TestsController.php" afterDir="false" />
|
|
</list>
|
|
</list>
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
@@ -15,11 +19,11 @@
|
|
</component>
|
|
</component>
|
|
<component name="FileEditorManager">
|
|
<component name="FileEditorManager">
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
|
|
|
+ <file pinned="false" current-in-tab="true">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="107">
|
|
|
|
- <caret line="813" column="13" selection-start-line="813" selection-start-column="8" selection-end-line="813" selection-end-column="13" />
|
|
|
|
|
|
+ <state relative-caret-position="502">
|
|
|
|
+ <caret line="965" column="38" lean-forward="true" selection-start-line="965" selection-start-column="38" selection-end-line="965" selection-end-column="38" />
|
|
<folding>
|
|
<folding>
|
|
<element signature="e#129#150#0#PHP" expanded="true" />
|
|
<element signature="e#129#150#0#PHP" expanded="true" />
|
|
</folding>
|
|
</folding>
|
|
@@ -39,11 +43,11 @@
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
- <file pinned="false" current-in-tab="true">
|
|
|
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/TestsController.php">
|
|
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/TestsController.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="515">
|
|
|
|
- <caret line="49" column="62" selection-start-line="49" selection-start-column="62" selection-end-line="49" selection-end-column="62" />
|
|
|
|
|
|
+ <state relative-caret-position="294">
|
|
|
|
+ <caret line="37" column="37" lean-forward="true" selection-start-line="37" selection-start-column="37" selection-end-line="37" selection-end-column="37" />
|
|
<folding>
|
|
<folding>
|
|
<element signature="e#6#91#0#PHP" expanded="true" />
|
|
<element signature="e#6#91#0#PHP" expanded="true" />
|
|
<element signature="e#126#164#0#PHP" expanded="true" />
|
|
<element signature="e#126#164#0#PHP" expanded="true" />
|
|
@@ -55,8 +59,8 @@
|
|
<file pinned="false" current-in-tab="false">
|
|
<file pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="555">
|
|
|
|
- <caret line="82" column="46" lean-forward="true" selection-start-line="82" selection-start-column="46" selection-end-line="82" selection-end-column="46" />
|
|
|
|
|
|
+ <state relative-caret-position="522">
|
|
|
|
+ <caret line="82" column="49" selection-start-line="82" selection-start-column="49" selection-end-line="82" selection-end-column="49" />
|
|
<folding>
|
|
<folding>
|
|
<element signature="e#141#162#0#PHP" expanded="true" />
|
|
<element signature="e#141#162#0#PHP" expanded="true" />
|
|
</folding>
|
|
</folding>
|
|
@@ -79,8 +83,8 @@
|
|
<file pinned="false" current-in-tab="false">
|
|
<file pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="676">
|
|
|
|
- <caret line="146" column="26" selection-start-line="146" selection-start-column="10" selection-end-line="146" selection-end-column="26" />
|
|
|
|
|
|
+ <state relative-caret-position="253">
|
|
|
|
+ <caret line="77" column="10" selection-start-line="77" selection-start-column="10" selection-end-line="77" selection-end-column="10" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
@@ -139,7 +143,6 @@
|
|
<option value="$PROJECT_DIR$/Modules/Mine/Entities/MineList.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Mine/Entities/MineList.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Admin/Traits/ClassifyMethod.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Admin/Traits/ClassifyMethod.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_04_23_032650_update_camera_list_table_fields.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_04_23_032650_update_camera_list_table_fields.php" />
|
|
- <option value="$PROJECT_DIR$/app/Enum/ApiEnum.php" />
|
|
|
|
<option value="$PROJECT_DIR$/Modules/Mine/Database/Migrations/2021_05_26_074955_create_working_surface_table.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Mine/Database/Migrations/2021_05_26_074955_create_working_surface_table.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Mine/Entities/WorkingSurface.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Mine/Entities/WorkingSurface.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Mine/Http/Controllers/MineController.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Mine/Http/Controllers/MineController.php" />
|
|
@@ -172,12 +175,13 @@
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php" />
|
|
<option value="$PROJECT_DIR$/app/Console/Commands/UpdateCameraStatus.php" />
|
|
<option value="$PROJECT_DIR$/app/Console/Commands/UpdateCameraStatus.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php" />
|
|
- <option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php" />
|
|
|
|
- <option value="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" />
|
|
|
|
- <option value="$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php" />
|
|
|
|
<option value="$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php" />
|
|
<option value="$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/TdwyController.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/TdwyController.php" />
|
|
<option value="$PROJECT_DIR$/app/Http/Controllers/TestsController.php" />
|
|
<option value="$PROJECT_DIR$/app/Http/Controllers/TestsController.php" />
|
|
|
|
+ <option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php" />
|
|
|
|
+ <option value="$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php" />
|
|
|
|
+ <option value="$PROJECT_DIR$/app/Enum/ApiEnum.php" />
|
|
|
|
+ <option value="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" />
|
|
</list>
|
|
</list>
|
|
</option>
|
|
</option>
|
|
</component>
|
|
</component>
|
|
@@ -432,7 +436,7 @@
|
|
<servers />
|
|
<servers />
|
|
</component>
|
|
</component>
|
|
<component name="TimeTrackingManager">
|
|
<component name="TimeTrackingManager">
|
|
- <option name="totallyTimeSpent" value="491753000" />
|
|
|
|
|
|
+ <option name="totallyTimeSpent" value="496362000" />
|
|
</component>
|
|
</component>
|
|
<component name="ToolWindowManager">
|
|
<component name="ToolWindowManager">
|
|
<frame x="0" y="0" width="1440" height="900" extended-state="0" />
|
|
<frame x="0" y="0" width="1440" height="900" extended-state="0" />
|
|
@@ -525,13 +529,6 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/app/Enum/ApiEnum.php">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="504">
|
|
|
|
- <caret line="29" column="13" lean-forward="true" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/Modules/Admin/Routes/api.php">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Admin/Routes/api.php">
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
</entry>
|
|
</entry>
|
|
@@ -568,9 +565,6 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Mine/Enum/MineEnum.php">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor" />
|
|
|
|
- </entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/config/database.php">
|
|
<entry file="file://$PROJECT_DIR$/config/database.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="-393" />
|
|
<state relative-caret-position="-393" />
|
|
@@ -752,13 +746,6 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="676">
|
|
|
|
- <caret line="146" column="26" selection-start-line="146" selection-start-column="10" selection-end-line="146" selection-end-column="26" />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/Modules/Admin/Services/MenusService.php">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Admin/Services/MenusService.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="257">
|
|
<state relative-caret-position="257">
|
|
@@ -766,63 +753,84 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/TdwyController.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="253">
|
|
|
|
- <caret line="313" column="13" selection-start-line="313" selection-start-column="4" selection-end-line="313" selection-end-column="13" />
|
|
|
|
|
|
+ <state relative-caret-position="386">
|
|
|
|
+ <caret line="97" column="31" selection-start-line="97" selection-start-column="20" selection-end-line="97" selection-end-column="31" />
|
|
<folding>
|
|
<folding>
|
|
- <element signature="e#141#185#0#PHP" expanded="true" />
|
|
|
|
|
|
+ <element signature="e#140#184#0#PHP" expanded="true" />
|
|
</folding>
|
|
</folding>
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php">
|
|
<entry file="file://$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="582">
|
|
|
|
- <caret line="135" column="10" lean-forward="true" selection-start-line="135" selection-start-column="10" selection-end-line="135" selection-end-column="10" />
|
|
|
|
|
|
+ <state relative-caret-position="705">
|
|
|
|
+ <caret line="170" column="55" selection-start-line="170" selection-start-column="55" selection-end-line="170" selection-end-column="55" />
|
|
<folding>
|
|
<folding>
|
|
<element signature="e#40#71#0#PHP" expanded="true" />
|
|
<element signature="e#40#71#0#PHP" expanded="true" />
|
|
</folding>
|
|
</folding>
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/TdwyController.php">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="386">
|
|
|
|
- <caret line="97" column="31" selection-start-line="97" selection-start-column="20" selection-end-line="97" selection-end-column="31" />
|
|
|
|
|
|
+ <state relative-caret-position="253">
|
|
|
|
+ <caret line="313" column="13" selection-start-line="313" selection-start-column="4" selection-end-line="313" selection-end-column="13" />
|
|
<folding>
|
|
<folding>
|
|
- <element signature="e#140#184#0#PHP" expanded="true" />
|
|
|
|
|
|
+ <element signature="e#141#185#0#PHP" expanded="true" />
|
|
</folding>
|
|
</folding>
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="555">
|
|
|
|
- <caret line="82" column="46" lean-forward="true" selection-start-line="82" selection-start-column="46" selection-end-line="82" selection-end-column="46" />
|
|
|
|
|
|
+ <state relative-caret-position="522">
|
|
|
|
+ <caret line="82" column="49" selection-start-line="82" selection-start-column="49" selection-end-line="82" selection-end-column="49" />
|
|
<folding>
|
|
<folding>
|
|
<element signature="e#141#162#0#PHP" expanded="true" />
|
|
<element signature="e#141#162#0#PHP" expanded="true" />
|
|
</folding>
|
|
</folding>
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/Http/Controllers/TestsController.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="107">
|
|
|
|
- <caret line="813" column="13" selection-start-line="813" selection-start-column="8" selection-end-line="813" selection-end-column="13" />
|
|
|
|
|
|
+ <state relative-caret-position="294">
|
|
|
|
+ <caret line="37" column="37" lean-forward="true" selection-start-line="37" selection-start-column="37" selection-end-line="37" selection-end-column="37" />
|
|
<folding>
|
|
<folding>
|
|
- <element signature="e#129#150#0#PHP" expanded="true" />
|
|
|
|
|
|
+ <element signature="e#6#91#0#PHP" expanded="true" />
|
|
|
|
+ <element signature="e#126#164#0#PHP" expanded="true" />
|
|
</folding>
|
|
</folding>
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/app/Http/Controllers/TestsController.php">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Mine/Enum/MineEnum.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="515">
|
|
|
|
- <caret line="49" column="62" selection-start-line="49" selection-start-column="62" selection-end-line="49" selection-end-column="62" />
|
|
|
|
|
|
+ <state relative-caret-position="168">
|
|
|
|
+ <caret line="13" column="30" lean-forward="true" selection-start-line="13" selection-start-column="30" selection-end-line="13" selection-end-column="30" />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="253">
|
|
|
|
+ <caret line="77" column="10" selection-start-line="77" selection-start-column="10" selection-end-line="77" selection-end-column="10" />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/Enum/ApiEnum.php">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="630">
|
|
|
|
+ <caret line="35" column="36" selection-start-line="35" selection-start-column="10" selection-end-line="35" selection-end-column="36" />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="502">
|
|
|
|
+ <caret line="965" column="38" lean-forward="true" selection-start-line="965" selection-start-column="38" selection-end-line="965" selection-end-column="38" />
|
|
<folding>
|
|
<folding>
|
|
- <element signature="e#6#91#0#PHP" expanded="true" />
|
|
|
|
- <element signature="e#126#164#0#PHP" expanded="true" />
|
|
|
|
|
|
+ <element signature="e#129#150#0#PHP" expanded="true" />
|
|
</folding>
|
|
</folding>
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|