Skip to content

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

修复不能上传电表照片bug

上级 62f70400
显示空白字符变更
内嵌 并排
正在显示 包含 29 行增加 和 27 行删除
.idea/workspace.xml
浏览文件 @ 03316628
...@@ -2,6 +2,7 @@ ...@@ -2,6 +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/admin/controller/Em.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/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$/application/em/view/em/create.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/em/view/em/create.html" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
...@@ -15,11 +16,11 @@ ...@@ -15,11 +16,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="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/em/view/em/create.html"> <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="675"> <state relative-caret-position="648">
<caret line="670" column="44" selection-start-line="670" selection-start-column="44" selection-end-line="670" selection-end-column="44" /> <caret line="669" column="41" lean-forward="true" selection-start-line="669" selection-end-line="670" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -27,17 +28,17 @@ ...@@ -27,17 +28,17 @@
<file pinned="false" current-in-tab="false"> <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="313"> <state relative-caret-position="282">
<caret line="121" column="39" selection-start-line="121" selection-start-column="32" selection-end-line="121" selection-end-column="39" /> <caret line="121" column="39" selection-start-line="121" selection-start-column="32" selection-end-line="121" selection-end-column="39" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/admin/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="363"> <state relative-caret-position="336">
<caret line="508" column="29" selection-start-line="508" selection-start-column="29" selection-end-line="508" selection-end-column="29" /> <caret line="507" column="23" selection-start-line="507" selection-start-column="23" selection-end-line="507" selection-end-column="23" />
<folding> <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" />
...@@ -94,6 +95,7 @@ ...@@ -94,6 +95,7 @@
<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/Upload.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$/application/admin/controller/Em.php" />
</list> </list>
</option> </option>
</component> </component>
...@@ -273,12 +275,12 @@ ...@@ -273,12 +275,12 @@
<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="976000" /> <workItem from="1580875021110" duration="1135000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="18850000" /> <option name="totallyTimeSpent" value="19009000" />
</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" />
...@@ -425,13 +427,6 @@ ...@@ -425,13 +427,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/route/admin.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="313">
<caret line="121" column="39" selection-start-line="121" selection-start-column="32" selection-end-line="121" selection-end-column="39" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/admin.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">
...@@ -446,10 +441,24 @@ ...@@ -446,10 +441,24 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/route/admin.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="282">
<caret line="121" column="39" selection-start-line="121" selection-start-column="32" selection-end-line="121" selection-end-column="39" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/em/view/em/create.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="648">
<caret line="669" column="41" lean-forward="true" selection-start-line="669" selection-end-line="670" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/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="363"> <state relative-caret-position="336">
<caret line="508" column="29" selection-start-line="508" selection-start-column="29" selection-end-line="508" selection-end-column="29" /> <caret line="507" column="23" selection-start-line="507" selection-start-column="23" selection-end-line="507" selection-end-column="23" />
<folding> <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" />
...@@ -459,12 +468,5 @@ ...@@ -459,12 +468,5 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/em/view/em/create.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="675">
<caret line="670" column="44" selection-start-line="670" selection-start-column="44" selection-end-line="670" selection-end-column="44" />
</state>
</provider>
</entry>
</component> </component>
</project> </project>
\ No newline at end of file
application/admin/controller/Em.php
浏览文件 @ 03316628
...@@ -504,6 +504,8 @@ class Em extends Base ...@@ -504,6 +504,8 @@ class Em extends Base
} }
public function upAnnex(Request $request){ public function upAnnex(Request $request){
return ['aaa'];
$file = $request->file('annex_file'); $file = $request->file('annex_file');
$upload = new Upload($file,1); $upload = new Upload($file,1);
$result = $upload->upload(); $result = $upload->upload();
......
application/em/view/em/create.html
浏览文件 @ 03316628
...@@ -664,7 +664,6 @@ ...@@ -664,7 +664,6 @@
var $a = $photoId.next('a'); var $a = $photoId.next('a');
$a.removeClass('layui-hide') $a.removeClass('layui-hide')
$a.attr('href',res.data.src); $a.attr('href',res.data.src);
console.log(res);
layMsg(res.message) layMsg(res.message)
} }
else { else {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论