Browse Source

修改excel模板

qiuzijian 3 năm trước cách đây
mục cha
commit
86116ae04c
2 tập tin đã thay đổi với 11 bổ sung10 xóa
  1. 10 9
      .idea/workspace.xml
  2. 1 1
      Modules/Camera/Jobs/CameraListExcel.php

+ 10 - 9
.idea/workspace.xml

@@ -2,6 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <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/Jobs/CameraListExcel.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -18,8 +19,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="613">
-              <caret line="81" column="22" selection-start-line="81" selection-start-column="10" selection-end-line="81" selection-end-column="22" />
+            <state relative-caret-position="211">
+              <caret line="57" column="25" selection-start-line="57" selection-start-column="10" selection-end-line="57" selection-end-column="25" />
             </state>
           </provider>
         </entry>
@@ -39,8 +40,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="470">
-              <caret line="141" column="40" selection-start-line="141" selection-start-column="40" selection-end-line="141" selection-end-column="40" />
+            <state relative-caret-position="235">
+              <caret line="97" column="23" selection-start-line="97" selection-start-column="23" selection-end-line="97" selection-end-column="23" />
             </state>
           </provider>
         </entry>
@@ -493,7 +494,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="328460000" />
+    <option name="totallyTimeSpent" value="329054000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -882,15 +883,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="613">
-          <caret line="81" column="22" selection-start-line="81" selection-start-column="10" selection-end-line="81" selection-end-column="22" />
+        <state relative-caret-position="211">
+          <caret line="57" column="25" selection-start-line="57" selection-start-column="10" selection-end-line="57" selection-end-column="25" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="470">
-          <caret line="141" column="40" selection-start-line="141" selection-start-column="40" selection-end-line="141" selection-end-column="40" />
+        <state relative-caret-position="235">
+          <caret line="97" column="23" selection-start-line="97" selection-start-column="23" selection-end-line="97" selection-end-column="23" />
         </state>
       </provider>
     </entry>

+ 1 - 1
Modules/Camera/Jobs/CameraListExcel.php

@@ -92,7 +92,7 @@ class CameraListExcel implements ShouldQueue
                 'com_number' => trim($item[5]),
             ];
 
-            $camera_source = trim($item[8]);
+            $camera_source = $item[8] ? trim($item[8]) : CameraEnum::CAMERA_SOURCE_1;
 
             if ($camera_source == CameraEnum::CAMERA_SOURCE_3) {
                 $camera_url = trim($item[9]);