Skip to content

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

修复不能上传电表照片bug

上级 03316628
隐藏空白字符变更
内嵌 并排
正在显示 包含 127 行增加 和 54 行删除
.idea/workspace.xml
浏览文件 @ 918ae55b
...@@ -3,7 +3,9 @@ ...@@ -3,7 +3,9 @@
<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/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$/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" />
...@@ -17,52 +19,50 @@ ...@@ -17,52 +19,50 @@
<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="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/em/view/em/create.html"> <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="648"> <state relative-caret-position="270">
<caret line="669" column="41" lean-forward="true" selection-start-line="669" selection-end-line="670" /> <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>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/route/admin.php"> <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="282"> <state relative-caret-position="608">
<caret line="121" column="39" selection-start-line="121" selection-start-column="32" selection-end-line="121" selection-end-column="39" /> <caret line="266" column="29" selection-start-line="266" selection-start-column="29" selection-end-line="266" selection-end-column="29" />
</state> </state>
</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$/application/admin/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="336"> <state relative-caret-position="297">
<caret line="507" column="23" selection-start-line="507" selection-start-column="23" selection-end-line="507" selection-end-column="23" /> <caret line="656" column="32" lean-forward="true" selection-start-line="656" selection-start-column="32" selection-end-line="656" selection-end-column="32" />
<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>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Upload.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="786"> <state relative-caret-position="270">
<caret line="57" column="2" selection-start-line="57" selection-start-column="2" selection-end-line="57" selection-end-column="2" /> <caret line="10" column="22" lean-forward="true" selection-start-line="10" selection-start-column="22" selection-end-line="10" selection-end-column="44" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/config/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="270"> <state relative-caret-position="552">
<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="140" lean-forward="true" selection-start-line="140" selection-end-line="140" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -79,6 +79,8 @@ ...@@ -79,6 +79,8 @@
<find>status</find> <find>status</find>
<find>upa</find> <find>upa</find>
<find>upAnnex</find> <find>upAnnex</find>
<find>up_</find>
<find>up</find>
</findStrings> </findStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
...@@ -94,8 +96,10 @@ ...@@ -94,8 +96,10 @@
<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/Upload.php" />
<option value="$PROJECT_DIR$/application/em/view/em/create.html" />
<option value="$PROJECT_DIR$/application/admin/controller/Em.php" /> <option value="$PROJECT_DIR$/application/admin/controller/Em.php" />
<option value="$PROJECT_DIR$/route/admin.php" />
<option value="$PROJECT_DIR$/application/em/view/em/create.html" />
<option value="$PROJECT_DIR$/application/em/controller/Em.php" />
</list> </list>
</option> </option>
</component> </component>
...@@ -192,13 +196,13 @@ ...@@ -192,13 +196,13 @@
<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" />
<item name="application" type="462c0819:PsiDirectoryNode" /> <item name="application" type="462c0819:PsiDirectoryNode" />
<item name="admin" type="462c0819:PsiDirectoryNode" /> <item name="em" type="462c0819:PsiDirectoryNode" />
</path> </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" />
<item name="application" type="462c0819:PsiDirectoryNode" /> <item name="application" type="462c0819:PsiDirectoryNode" />
<item name="admin" type="462c0819:PsiDirectoryNode" /> <item name="em" type="462c0819:PsiDirectoryNode" />
<item name="controller" type="462c0819:PsiDirectoryNode" /> <item name="controller" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
...@@ -206,6 +210,7 @@ ...@@ -206,6 +210,7 @@
<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" />
<item name="em" type="462c0819:PsiDirectoryNode" /> <item name="em" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="Jz-Php" type="b2602c69:ProjectViewProjectNode" /> <item name="Jz-Php" type="b2602c69:ProjectViewProjectNode" />
...@@ -213,6 +218,7 @@ ...@@ -213,6 +218,7 @@
<item name="application" type="462c0819:PsiDirectoryNode" /> <item name="application" type="462c0819:PsiDirectoryNode" />
<item name="em" type="462c0819:PsiDirectoryNode" /> <item name="em" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" /> <item name="view" type="462c0819:PsiDirectoryNode" />
<item name="cert" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="Jz-Php" type="b2602c69:ProjectViewProjectNode" /> <item name="Jz-Php" type="b2602c69:ProjectViewProjectNode" />
...@@ -222,6 +228,14 @@ ...@@ -222,6 +228,14 @@
<item name="view" type="462c0819:PsiDirectoryNode" /> <item name="view" type="462c0819:PsiDirectoryNode" />
<item name="em" type="462c0819:PsiDirectoryNode" /> <item name="em" 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="em" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="useage" 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" />
...@@ -275,18 +289,18 @@ ...@@ -275,18 +289,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="1135000" /> <workItem from="1580875021110" duration="1575000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="19009000" /> <option name="totallyTimeSpent" value="19449000" />
</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" />
...@@ -299,7 +313,7 @@ ...@@ -299,7 +313,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" />
...@@ -311,13 +325,6 @@ ...@@ -311,13 +325,6 @@
<option name="version" value="1" /> <option name="version" value="1" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/application/em/view/useage/default.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2538">
<caret line="94" column="46" selection-start-line="94" selection-start-column="46" selection-end-line="94" selection-end-column="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/em/view/useage/detail_special.html"> <entry file="file://$PROJECT_DIR$/application/em/view/useage/detail_special.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2592"> <state relative-caret-position="2592">
...@@ -427,38 +434,48 @@ ...@@ -427,38 +434,48 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/config/admin.php"> <entry file="file://$PROJECT_DIR$/application/admin/controller/Upload.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="786">
<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="57" column="2" selection-start-line="57" selection-start-column="2" selection-end-line="57" selection-end-column="2" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Upload.php"> <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="786"> <state relative-caret-position="-16354" />
<caret line="57" column="2" selection-start-line="57" selection-start-column="2" selection-end-line="57" selection-end-column="2" /> </provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/em/view/cert/create.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="387">
<caret line="143" column="31" selection-start-line="143" selection-start-column="23" selection-end-line="143" selection-end-column="31" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/route/admin.php"> <entry file="file://$PROJECT_DIR$/application/em/view/useage/detail.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="282"> <state relative-caret-position="-4807" />
<caret line="121" column="39" selection-start-line="121" selection-start-column="32" selection-end-line="121" selection-end-column="39" /> </provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/em/view/useage/default.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="169">
<caret line="239" column="16" lean-forward="true" selection-start-line="239" selection-start-column="16" selection-end-line="241" selection-end-column="34" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/em/view/em/create.html"> <entry file="file://$PROJECT_DIR$/application/admin/controller/Admin.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="648"> <state relative-caret-position="1971">
<caret line="669" column="41" lean-forward="true" selection-start-line="669" selection-end-line="670" /> <caret line="77" column="22" selection-start-line="77" selection-start-column="20" selection-end-line="77" selection-end-column="22" />
</state> </state>
</provider> </provider>
</entry> </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="336"> <state relative-caret-position="363">
<caret line="507" column="23" selection-start-line="507" selection-start-column="23" selection-end-line="507" selection-end-column="23" /> <caret line="508" column="35" selection-start-line="508" selection-start-column="35" selection-end-line="508" selection-end-column="35" />
<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" />
...@@ -468,5 +485,44 @@ ...@@ -468,5 +485,44 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Copy.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/admin.php">
<provider selected="true" editor-type-id="text-editor">
<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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/route/admin.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="552">
<caret line="140" lean-forward="true" selection-start-line="140" selection-end-line="140" />
</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="297">
<caret line="656" column="32" lean-forward="true" selection-start-line="656" selection-start-column="32" selection-end-line="656" selection-end-column="32" />
</state>
</provider>
</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>
</provider>
</entry>
</component> </component>
</project> </project>
\ No newline at end of file
application/admin/controller/Em.php
浏览文件 @ 918ae55b
...@@ -505,7 +505,6 @@ class Em extends Base ...@@ -505,7 +505,6 @@ 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/controller/Em.php
浏览文件 @ 918ae55b
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
namespace app\em\controller; namespace app\em\controller;
use app\admin\controller\Base; use app\admin\controller\Base;
use app\admin\controller\Upload;
use app\admin\model\DepartmentModel; use app\admin\model\DepartmentModel;
use app\admin\model\ElectricMeter; use app\admin\model\ElectricMeter;
use app\admin\model\ElectricMeterType; use app\admin\model\ElectricMeterType;
...@@ -259,4 +260,17 @@ class Em extends Base ...@@ -259,4 +260,17 @@ class Em extends Base
return true; return true;
} }
} }
public function emPhoto(){
$file = Request::file('em_photo');
$upload = new Upload($file,1);
$result = $upload->upload();
if(!empty($result)){
return jsonSuc('电表附件上传成功',$result);
} else {
return jsonErr($result);
}
}
} }
\ No newline at end of file
application/em/view/em/create.html
浏览文件 @ 918ae55b
...@@ -654,8 +654,8 @@ ...@@ -654,8 +654,8 @@
//上传电表照片 //上传电表照片
var uploadEa = upload.render({ var uploadEa = upload.render({
elem: '#electric_annex_button' , elem: '#electric_annex_button' ,
url: '/upAnnex', url: '/emPhoto',
field: 'annex_file', field: 'em_photo',
done: function (res) { done: function (res) {
if(res.status == 1){ if(res.status == 1){
//将电表照片的ID填写 //将电表照片的ID填写
......
route/admin.php
浏览文件 @ 918ae55b
...@@ -137,6 +137,8 @@ Route::get('em_add/:sid','em/em/create'); ...@@ -137,6 +137,8 @@ Route::get('em_add/:sid','em/em/create');
Route::post('em_add','em/em/store'); Route::post('em_add','em/em/store');
Route::get('em','em/em/index'); Route::get('em','em/em/index');
Route::get('em_edit/:id','em/em/update'); Route::get('em_edit/:id','em/em/update');
Route::post('emPhoto','em/em/emPhoto');
//抄表单 //抄表单
Route::get('useage','em/useage/index'); Route::get('useage','em/useage/index');
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论