Skip to content

J
Jz-Php
提交 b1b6a8a1 authored 作者: chengye's avatar chengye
浏览文件
操作

修复不能上传电表照片bug

上级 87e7f693
隐藏空白字符变更
内嵌 并排
正在显示 包含 75 行增加 和 50 行删除
.idea/workspace.xml
浏览文件 @ b1b6a8a1
...@@ -2,9 +2,7 @@ ...@@ -2,9 +2,7 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="f51c1393-9404-4c81-be85-d91ed40531b3" name="默认更改列表" comment=""> <list default="true" id="f51c1393-9404-4c81-be85-d91ed40531b3" name="默认更改列表" comment="">
<change beforePath="$PROJECT_DIR$/application/em/controller/Em.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/em/controller/Em.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/application/admin/controller/Upload.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/controller/Upload.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/em/view/em/create.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/em/view/em/create.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/route/admin.php" beforeDir="false" afterPath="$PROJECT_DIR$/route/admin.php" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -31,10 +29,25 @@ ...@@ -31,10 +29,25 @@
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/em/controller/Em.php"> <entry file="file://$PROJECT_DIR$/application/admin/controller/Em.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="689"> <state relative-caret-position="390">
<caret line="260" column="5" lean-forward="true" selection-start-line="260" selection-start-column="5" selection-end-line="260" selection-end-column="5" /> <caret line="509" column="29" selection-start-line="509" selection-start-column="29" selection-end-line="509" selection-end-column="29" />
<folding>
<element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Upload.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="624">
<caret line="51" column="30" selection-start-line="51" selection-start-column="30" selection-end-line="51" selection-end-column="30" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -57,7 +70,7 @@ ...@@ -57,7 +70,7 @@
</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$/route/admin.php"> <entry file="file://$PROJECT_DIR$/route/admin.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="498"> <state relative-caret-position="498">
...@@ -94,11 +107,11 @@ ...@@ -94,11 +107,11 @@
<option value="$PROJECT_DIR$/application/em/model/EmInvoice.php" /> <option value="$PROJECT_DIR$/application/em/model/EmInvoice.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Basestation.php" /> <option value="$PROJECT_DIR$/application/admin/controller/Basestation.php" />
<option value="$PROJECT_DIR$/application/admin/view/basestation/base_map.html" /> <option value="$PROJECT_DIR$/application/admin/view/basestation/base_map.html" />
<option value="$PROJECT_DIR$/application/admin/controller/Upload.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Em.php" /> <option value="$PROJECT_DIR$/application/admin/controller/Em.php" />
<option value="$PROJECT_DIR$/application/em/controller/Em.php" /> <option value="$PROJECT_DIR$/application/em/controller/Em.php" />
<option value="$PROJECT_DIR$/application/em/view/em/create.html" /> <option value="$PROJECT_DIR$/application/em/view/em/create.html" />
<option value="$PROJECT_DIR$/route/admin.php" /> <option value="$PROJECT_DIR$/route/admin.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Upload.php" />
</list> </list>
</option> </option>
</component> </component>
...@@ -191,6 +204,19 @@ ...@@ -191,6 +204,19 @@
<item name="Jz-Php" type="462c0819:PsiDirectoryNode" /> <item name="Jz-Php" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" /> <item name="application" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="Jz-Php" type="b2602c69:ProjectViewProjectNode" />
<item name="Jz-Php" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="admin" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="Jz-Php" type="b2602c69:ProjectViewProjectNode" />
<item name="Jz-Php" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="admin" type="462c0819:PsiDirectoryNode" />
<item name="controller" type="462c0819:PsiDirectoryNode" />
</path>
<path> <path>
<item name="Jz-Php" type="b2602c69:ProjectViewProjectNode" /> <item name="Jz-Php" type="b2602c69:ProjectViewProjectNode" />
<item name="Jz-Php" type="462c0819:PsiDirectoryNode" /> <item name="Jz-Php" type="462c0819:PsiDirectoryNode" />
...@@ -288,18 +314,18 @@ ...@@ -288,18 +314,18 @@
<workItem from="1579059424177" duration="1050000" /> <workItem from="1579059424177" duration="1050000" />
<workItem from="1579079847870" duration="1330000" /> <workItem from="1579079847870" duration="1330000" />
<workItem from="1579164336952" duration="142000" /> <workItem from="1579164336952" duration="142000" />
<workItem from="1580875021110" duration="2413000" /> <workItem from="1580875021110" duration="2563000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="20287000" /> <option name="totallyTimeSpent" value="20437000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-7" y="-7" width="2575" height="1415" extended-state="6" /> <frame x="-7" y="-7" width="2575" height="1415" extended-state="6" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.15733016" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.15733016" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" /> <window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
...@@ -312,7 +338,7 @@ ...@@ -312,7 +338,7 @@
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Database Changes" order="8" /> <window_info anchor="bottom" id="Database Changes" order="8" />
<window_info anchor="bottom" id="Version Control" order="9" /> <window_info anchor="bottom" id="Version Control" order="9" />
<window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.27669525" /> <window_info anchor="bottom" id="Terminal" order="10" visible="true" weight="0.27669525" />
<window_info anchor="bottom" id="Event Log" order="11" side_tool="true" /> <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
...@@ -433,13 +459,6 @@ ...@@ -433,13 +459,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Upload.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="786">
<caret line="57" column="2" selection-start-line="57" selection-start-column="2" selection-end-line="57" selection-end-column="2" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/em/view/em/update.html"> <entry file="file://$PROJECT_DIR$/application/em/view/em/update.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-16354" /> <state relative-caret-position="-16354" />
...@@ -471,55 +490,62 @@ ...@@ -471,55 +490,62 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Em.php"> <entry file="file://$PROJECT_DIR$/route/admin.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="363"> <state relative-caret-position="498">
<caret line="508" column="35" selection-start-line="508" selection-start-column="35" selection-end-line="508" selection-end-column="35" /> <caret line="138" column="41" selection-start-line="138" selection-start-column="41" selection-end-line="138" selection-end-column="41" />
<folding>
<element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Copy.php"> <entry file="file://$PROJECT_DIR$/config/admin.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270"> <state relative-caret-position="270">
<caret line="463" column="30" selection-start-line="463" selection-end-line="464" /> <caret line="10" column="22" lean-forward="true" selection-start-line="10" selection-start-column="22" selection-end-line="10" selection-end-column="44" />
<folding>
<element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/em/controller/Em.php"> <entry file="file://$PROJECT_DIR$/application/em/view/em/create.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="689"> <state relative-caret-position="351">
<caret line="260" column="5" lean-forward="true" selection-start-line="260" selection-start-column="5" selection-end-line="260" selection-end-column="5" /> <caret line="658" column="38" lean-forward="true" selection-start-line="658" selection-start-column="38" selection-end-line="658" selection-end-column="38" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/em/view/em/create.html"> <entry file="file://$PROJECT_DIR$/application/em/controller/Em.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="351"> <state relative-caret-position="257">
<caret line="658" column="38" lean-forward="true" selection-start-line="658" selection-start-column="38" selection-end-line="658" selection-end-column="38" /> <caret line="244" column="9" lean-forward="true" selection-start-line="244" selection-start-column="9" selection-end-line="244" selection-end-column="9" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/config/admin.php"> <entry file="file://$PROJECT_DIR$/application/admin/controller/Copy.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270"> <state relative-caret-position="270">
<caret line="10" column="22" lean-forward="true" selection-start-line="10" selection-start-column="22" selection-end-line="10" selection-end-column="44" /> <caret line="463" column="30" selection-start-line="463" selection-end-line="464" />
<folding>
<element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/route/admin.php"> <entry file="file://$PROJECT_DIR$/application/admin/controller/Em.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="498"> <state relative-caret-position="390">
<caret line="138" column="41" selection-start-line="138" selection-start-column="41" selection-end-line="138" selection-end-column="41" /> <caret line="509" column="29" selection-start-line="509" selection-start-column="29" selection-end-line="509" selection-end-column="29" />
<folding>
<element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Upload.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="624">
<caret line="51" column="30" selection-start-line="51" selection-start-column="30" selection-end-line="51" selection-end-column="30" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
application/admin/controller/Upload.php
浏览文件 @ b1b6a8a1
...@@ -47,15 +47,13 @@ class Upload extends Base ...@@ -47,15 +47,13 @@ class Upload extends Base
$receipt->suffix = $info->getExtension(); $receipt->suffix = $info->getExtension();
$receipt->size =$info->getSize(); $receipt->size =$info->getSize();
if($receipt->save()){ if($receipt->save()){
return ['aaa']; return ['id'=>$receipt->id,'src'=>ltrim($receipt->src,'.')];
//return ['id'=>$receipt->id,'src'=>ltrim($receipt->src,'.')];
} else { } else {
return ['cccc']; return ['faild'];
} }
} else { } else {
// 上传失败获取错误信息 // 上传失败获取错误信息
return ['bbb']; return $this->file->getError();
// return $this->file->getError();
} }
} }
} }
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论