提交 2b8ac8a2 authored 作者: chengye's avatar chengye

修复不能上传电表照片bug

上级 918ae55b
......@@ -2,10 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="f51c1393-9404-4c81-be85-d91ed40531b3" name="默认更改列表" comment="">
<change beforePath="$PROJECT_DIR$/application/admin/controller/Em.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/controller/Em.php" afterDir="false" />
<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/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>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
......@@ -34,8 +31,8 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/em/controller/Em.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="608">
<caret line="266" column="29" selection-start-line="266" selection-start-column="29" selection-end-line="266" selection-end-column="29" />
<state relative-caret-position="689">
<caret line="269" column="21" selection-start-line="269" selection-start-column="21" selection-end-line="269" selection-end-column="21" />
</state>
</provider>
</entry>
......@@ -289,18 +286,18 @@
<workItem from="1579059424177" duration="1050000" />
<workItem from="1579079847870" duration="1330000" />
<workItem from="1579164336952" duration="142000" />
<workItem from="1580875021110" duration="1575000" />
<workItem from="1580875021110" duration="1706000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="19449000" />
<option name="totallyTimeSpent" value="19580000" />
</component>
<component name="ToolWindowManager">
<frame x="-7" y="-7" width="2575" height="1415" extended-state="6" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.15733016" />
<window_info 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="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
......@@ -313,7 +310,7 @@
<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="Version Control" order="9" />
<window_info anchor="bottom" id="Terminal" order="10" visible="true" weight="0.27669525" />
<window_info active="true" 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="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" />
......@@ -519,8 +516,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/em/controller/Em.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="608">
<caret line="266" column="29" selection-start-line="266" selection-start-column="29" selection-end-line="266" selection-end-column="29" />
<state relative-caret-position="689">
<caret line="269" column="21" selection-start-line="269" selection-start-column="21" selection-end-line="269" selection-end-column="21" />
</state>
</provider>
</entry>
......
......@@ -267,6 +267,7 @@ class Em extends Base
$upload = new Upload($file,1);
$result = $upload->upload();
return ['aaaa'];
if(!empty($result)){
return jsonSuc('电表附件上传成功',$result);
} else {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论