浏览代码

添加上传封面图功能

qiuzijian 3 年之前
父节点
当前提交
f1b9731cb3
共有 2 个文件被更改,包括 36 次插入28 次删除
  1. 31 27
      .idea/workspace.xml
  2. 5 1
      Modules/Camera/Http/Controllers/CameraController.php

+ 31 - 27
.idea/workspace.xml

@@ -2,12 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/public/filedownload/test.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_08_10_102022_add_cover_picture_to_camera_list.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_08_10_102022_add_cover_picture_to_camera_list.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -32,8 +27,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="529">
-              <caret line="455" column="40" selection-start-line="455" selection-start-column="40" selection-end-line="455" selection-end-column="40" />
+            <state relative-caret-position="2761">
+              <caret line="272" column="118" selection-start-line="272" selection-start-column="91" selection-end-line="272" selection-end-column="118" />
               <folding>
                 <element signature="e#51#107#0#PHP" expanded="true" />
               </folding>
@@ -42,6 +37,15 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Modules/Admin/Auxiliary/View/TableAuxiliary.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="253">
+              <caret line="123" column="20" selection-start-line="123" selection-start-column="20" selection-end-line="123" selection-end-column="20" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/config/filesystems.php">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="424">
@@ -69,8 +73,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Modules/Admin/Auxiliary/View/FromAuxiliary.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="287">
-              <caret line="226" column="20" selection-start-line="226" selection-start-column="20" selection-end-line="226" selection-end-column="20" />
+            <state relative-caret-position="253">
+              <caret line="214" column="20" selection-start-line="214" selection-start-column="20" selection-end-line="214" selection-end-column="20" />
             </state>
           </provider>
         </entry>
@@ -91,7 +95,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>updateOrCreate</find>
       <find>select</find>
       <find>title</find>
       <find>menu</find>
@@ -121,6 +124,7 @@
       <find>请求上传</find>
       <find>asset</find>
       <find>access_id</find>
+      <find>$item</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -412,7 +416,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="348102000" />
+    <option name="totallyTimeSpent" value="349140000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -443,13 +447,6 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/Modules/Mine/Database/Migrations/2021_06_07_065202_add_field_to_working_surface_0607.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="294">
-          <caret line="16" column="83" selection-start-line="16" selection-start-column="83" selection-end-line="16" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/SurfaceController.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="314">
@@ -767,13 +764,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Admin/Auxiliary/View/FromAuxiliary.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="287">
-          <caret line="226" column="20" selection-start-line="226" selection-start-column="20" selection-end-line="226" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-08-10.log">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-840" />
@@ -799,10 +789,24 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Admin/Auxiliary/View/TableAuxiliary.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="253">
+          <caret line="123" column="20" selection-start-line="123" selection-start-column="20" selection-end-line="123" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Admin/Auxiliary/View/FromAuxiliary.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="253">
+          <caret line="214" column="20" selection-start-line="214" selection-start-column="20" selection-end-line="214" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="529">
-          <caret line="455" column="40" selection-start-line="455" selection-start-column="40" selection-end-line="455" selection-end-column="40" />
+        <state relative-caret-position="2761">
+          <caret line="272" column="118" selection-start-line="272" selection-start-column="91" selection-end-line="272" selection-end-column="118" />
           <folding>
             <element signature="e#51#107#0#PHP" expanded="true" />
           </folding>

+ 5 - 1
Modules/Camera/Http/Controllers/CameraController.php

@@ -121,6 +121,7 @@ class CameraController extends BaseController
             'camera_list.sort',
             'camera_list.camera_type',
             'camera_list.camera_source',
+            'camera_list.cover_picture',
             'mine_list.title',
             'mine_list.degree'
         )->first();
@@ -152,6 +153,9 @@ class CameraController extends BaseController
         $tableObj->column('camera_url', '链接');
         $tableObj->column('sort', '排序');
         $tableObj->column('working_surface', '所属矿区区域');
+        $tableObj->column('cover_picture', '封面图片', function($cover_picture) {
+            return '<img src="'.$cover_picture.'">';
+        });
         $tableObj->title = '摄像头链接详情';
         return $this->tableView($tableObj);
     }
@@ -266,7 +270,7 @@ class CameraController extends BaseController
         $formObj->select('code_stream', '视频码流', CameraEnum::CODE_STREAM_EXCHANGE);
         $formObj->input('sort', '排序');
         $formObj->select('surface_id', '所属矿区区域', $surface_arr, $default_surface);
-        $formObj->uploadImg('cover_picture', '封面图片', '/admin/camera/upload/cover_picture');
+        $formObj->uploadImg('cover_picture', '封面图片', '/admin/camera/upload/cover_picture', $camera_list->cover_picture);
         $formObj->title = '编辑请求链接';
         return $this->from($formObj);
     }