Skip to content

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

修复不能上传电表照片bug

上级 ee52c62a
隐藏空白字符变更
内嵌 并排
正在显示 包含 79 行增加 和 85 行删除
.idea/workspace.xml
浏览文件 @ 2e2c896c
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
<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/view/basestation/base_map.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/basestation/base_map.html" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -15,59 +16,11 @@ ...@@ -15,59 +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="false">
<entry file="file://$PROJECT_DIR$/application/em/controller/Invoice.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1426">
<caret line="61" column="40" selection-start-line="61" selection-start-column="40" selection-end-line="61" selection-end-column="40" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/em/model/EmInvoice.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="233">
<caret line="72" column="33" lean-forward="true" selection-start-line="72" selection-start-column="33" selection-end-line="72" selection-end-column="33" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Base.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="209">
<caret line="16" column="6" selection-start-line="16" selection-start-column="6" selection-end-line="16" selection-end-column="6" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Basestation.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="388">
<caret line="738" column="34" lean-forward="true" selection-start-line="738" selection-start-column="34" selection-end-line="738" selection-end-column="34" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/admin/view/basestation/base_map.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="512"> <state relative-caret-position="378">
<caret line="132" column="9" selection-start-line="132" selection-start-column="9" selection-end-line="132" selection-end-column="9" /> <caret line="659" column="35" selection-start-line="659" selection-start-column="35" selection-end-line="659" selection-end-column="35" />
<folding>
<element signature="n#style#0;n#p#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/em/controller/Payment.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5673">
<caret line="199" selection-start-line="199" selection-end-line="199" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -96,6 +49,7 @@ ...@@ -96,6 +49,7 @@
<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/em/view/em/create.html" />
</list> </list>
</option> </option>
</component> </component>
...@@ -111,13 +65,13 @@ ...@@ -111,13 +65,13 @@
</include_path> </include_path>
</component> </component>
<component name="ProjectFrameBounds" extendedState="6"> <component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="1848" /> <option name="x" value="870" />
<option name="y" value="98" /> <option name="y" value="366" />
<option name="width" value="1364" /> <option name="width" value="2181" />
<option name="height" value="735" /> <option name="height" value="1716" />
</component> </component>
<component name="ProjectView"> <component name="ProjectView">
<navigator currentView="Scope" currentSubView="Scope 'Project Files'; set:Project Files; class com.intellij.psi.search.scope.ProjectFilesScope" proportions="" version="1"> <navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
...@@ -176,7 +130,43 @@ ...@@ -176,7 +130,43 @@
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="ProjectPane" /> <pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="Jz-Php" type="b2602c69:ProjectViewProjectNode" />
<item name="Jz-Php" 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" />
</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" />
</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" />
</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="em" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
...@@ -216,17 +206,18 @@ ...@@ -216,17 +206,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="90000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="17874000" /> <option name="totallyTimeSpent" value="17964000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="1358" y="-125" width="1936" height="1056" 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.15601704" /> <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" />
...@@ -239,7 +230,7 @@ ...@@ -239,7 +230,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.2771739" /> <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" />
...@@ -332,48 +323,52 @@ ...@@ -332,48 +323,52 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/em/controller/Invoice.php"> <entry file="file://$PROJECT_DIR$/application/em/model/EmInvoice.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1426"> <state relative-caret-position="1944">
<caret line="61" column="40" selection-start-line="61" selection-start-column="40" selection-end-line="61" selection-end-column="40" /> <caret line="72" column="33" selection-start-line="72" selection-start-column="33" selection-end-line="72" selection-end-column="33" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/em/controller/Payment.php"> <entry file="file://$PROJECT_DIR$/application/admin/controller/Base.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5673"> <state relative-caret-position="324">
<caret line="199" selection-start-line="199" selection-end-line="199" /> <caret line="16" column="6" selection-start-line="16" selection-start-column="6" selection-end-line="16" selection-end-column="6" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/em/model/EmInvoice.php"> <entry file="file://$PROJECT_DIR$/application/admin/controller/Basestation.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="233"> <state relative-caret-position="19683">
<caret line="72" column="33" lean-forward="true" selection-start-line="72" selection-start-column="33" selection-end-line="72" selection-end-column="33" /> <caret line="738" column="34" selection-start-line="738" selection-start-column="34" selection-end-line="738" selection-end-column="34" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Base.php"> <entry file="file://$PROJECT_DIR$/application/em/controller/Payment.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="209"> <state relative-caret-position="4941">
<caret line="16" column="6" selection-start-line="16" selection-start-column="6" selection-end-line="16" selection-end-column="6" /> <caret line="199" selection-start-line="199" selection-end-line="199" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Basestation.php"> <entry file="file://$PROJECT_DIR$/application/admin/view/basestation/base_map.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="388"> <state relative-caret-position="716">
<caret line="738" column="34" lean-forward="true" selection-start-line="738" selection-start-column="34" selection-end-line="738" selection-end-column="34" /> <caret line="132" column="9" selection-start-line="132" selection-start-column="9" selection-end-line="132" selection-end-column="9" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/basestation/base_map.html"> <entry file="file://$PROJECT_DIR$/application/em/controller/Invoice.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="512"> <state relative-caret-position="824">
<caret line="132" column="9" selection-start-line="132" selection-start-column="9" selection-end-line="132" selection-end-column="9" /> <caret line="61" column="40" selection-start-line="61" selection-start-column="40" selection-end-line="61" selection-end-column="40" />
<folding> </state>
<element signature="n#style#0;n#p#0;n#!!top" expanded="true" /> </provider>
</folding> </entry>
<entry file="file://$PROJECT_DIR$/application/em/view/em/create.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378">
<caret line="659" column="35" selection-start-line="659" selection-start-column="35" selection-end-line="659" selection-end-column="35" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
application/em/view/em/create.html
浏览文件 @ 2e2c896c
...@@ -573,8 +573,6 @@ ...@@ -573,8 +573,6 @@
}); });
cycle_start_time
//消息提示 //消息提示
function layMsg(msg,type=6,time=1000){ function layMsg(msg,type=6,time=1000){
layer.msg(msg,{ layer.msg(msg,{
...@@ -659,6 +657,7 @@ ...@@ -659,6 +657,7 @@
url: '/upAnnex', url: '/upAnnex',
field: 'annex_file', field: 'annex_file',
done: function (res) { done: function (res) {
console.log(res)
if(res.status == 1){ if(res.status == 1){
//将电表照片的ID填写 //将电表照片的ID填写
var $photoId = $("input[name='photo_id']") var $photoId = $("input[name='photo_id']")
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论