Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
J
Jz-Php
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
PHP
Jz-Php
Commits
2b8ac8a2
提交
2b8ac8a2
authored
2月 05, 2020
作者:
chengye
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复不能上传电表照片bug
上级
918ae55b
显示空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
9 行增加
和
11 行删除
+9
-11
workspace.xml
.idea/workspace.xml
+8
-11
Em.php
application/em/controller/Em.php
+1
-0
没有找到文件。
.idea/workspace.xml
浏览文件 @
2b8ac8a2
...
...
@@ -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=
"6
08
"
>
<caret
line=
"26
6"
column=
"29"
selection-start-line=
"266"
selection-start-column=
"29"
selection-end-line=
"266"
selection-end-column=
"29
"
/>
<state
relative-caret-position=
"6
89
"
>
<caret
line=
"26
9"
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=
"1
575
000"
/>
<workItem
from=
"1580875021110"
duration=
"1
706
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"19
449
000"
/>
<option
name=
"totallyTimeSpent"
value=
"19
580
000"
/>
</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
a
ctive=
"true"
a
nchor=
"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=
"6
08
"
>
<caret
line=
"26
6"
column=
"29"
selection-start-line=
"266"
selection-start-column=
"29"
selection-end-line=
"266"
selection-end-column=
"29
"
/>
<state
relative-caret-position=
"6
89
"
>
<caret
line=
"26
9"
column=
"21"
selection-start-line=
"269"
selection-start-column=
"21"
selection-end-line=
"269"
selection-end-column=
"21
"
/>
</state>
</provider>
</entry>
...
...
application/em/controller/Em.php
浏览文件 @
2b8ac8a2
...
...
@@ -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
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论