切换导航条
此项目
正在载入...
登录
郭盛
/
resource
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
0dadf11df2d87c08fdab71807c13513eae8d4e99
1 个父辈
b484967f
1 个管道 的构建
失败
耗费 4 秒
修改需求详情
变更
4
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
243 行增加
和
108 行删除
.idea/workspace.xml
api/index/controller/ResourceController.php
app/admin/controller/StatisticController.php
public/themes/admin_simpleboot3/admin/statistic/index.html
.idea/workspace.xml
查看文件 @
0dadf11
<?xml version="1.0" encoding="UTF-8"?>
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"73de7205-e736-4b59-941a-a54ab4506a41"
name=
"Default"
comment=
""
/>
<list
default=
"true"
id=
"73de7205-e736-4b59-941a-a54ab4506a41"
name=
"Default"
comment=
""
>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/api/index/controller/ResourceController.php"
afterPath=
"$PROJECT_DIR$/api/index/controller/ResourceController.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/app/admin/controller/StatisticController.php"
afterPath=
"$PROJECT_DIR$/app/admin/controller/StatisticController.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/statistic/index.html"
afterPath=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/statistic/index.html"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"TRACKING_ENABLED"
value=
"true"
/>
<option
name=
"SHOW_DIALOG"
value=
"false"
/>
...
...
@@ -14,18 +19,33 @@
<file
leaf-file-name=
"StatisticController.php"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/app/admin/controller/StatisticController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"700"
>
<caret
line=
"40"
column=
"46"
lean-forward=
"true"
selection-start-line=
"40"
selection-start-column=
"46"
selection-end-line=
"40"
selection-end-column=
"46"
/>
<folding
/>
<state
relative-caret-position=
"448"
>
<caret
line=
"73"
column=
"9"
lean-forward=
"true"
selection-start-line=
"73"
selection-start-column=
"9"
selection-end-line=
"73"
selection-end-column=
"9"
/>
<folding>
<marker
date=
"1568163294161"
expanded=
"true"
signature=
"4348:4384"
ph=
"select COUNT... cmf_job"
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"index.html"
pinned=
"false"
current-in-tab=
"true"
>
<file
leaf-file-name=
"ResourceController.php"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ResourceController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"299"
>
<caret
line=
"273"
column=
"34"
lean-forward=
"true"
selection-start-line=
"273"
selection-start-column=
"34"
selection-end-line=
"273"
selection-end-column=
"34"
/>
<folding>
<element
signature=
"e#9338#10067#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11561#12146#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"index.html"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/statistic/index.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"400"
>
<caret
line=
"16"
column=
"29"
lean-forward=
"true"
selection-start-line=
"16"
selection-start-column=
"29"
selection-end-line=
"16"
selection-end-column=
"29"
/>
<state
relative-caret-position=
"0"
>
<caret
line=
"45"
column=
"1"
lean-forward=
"false"
selection-start-line=
"45"
selection-start-column=
"1"
selection-end-line=
"45"
selection-end-column=
"1"
/>
<folding
/>
</state>
</provider>
...
...
@@ -55,9 +75,11 @@
<option
value=
"$PROJECT_DIR$/.gitlab-ci.yml"
/>
<option
value=
"$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php"
/>
<option
value=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/ResourceController.php"
/>
<option
value=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/account.html"
/>
<option
value=
"$PROJECT_DIR$/app/user/controller/AdminIndexController.php"
/>
<option
value=
"$PROJECT_DIR$/app/admin/controller/StatisticController.php"
/>
<option
value=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/statistic/index.html"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/ResourceController.php"
/>
</list>
</option>
</component>
...
...
@@ -68,11 +90,11 @@
<sorting>
DEFINITION_ORDER
</sorting>
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
extendedState=
"1"
>
<option
name=
"x"
value=
"252"
/>
<option
name=
"y"
value=
"75"
/>
<option
name=
"width"
value=
"1474"
/>
<option
name=
"height"
value=
"906"
/>
<component
name=
"ProjectFrameBounds"
>
<option
name=
"x"
value=
"380"
/>
<option
name=
"y"
value=
"63"
/>
<option
name=
"width"
value=
"1410"
/>
<option
name=
"height"
value=
"1012"
/>
</component>
<component
name=
"ProjectView"
>
<navigator
currentView=
"ProjectPane"
proportions=
""
version=
"1"
>
...
...
@@ -89,8 +111,6 @@
<foldersAlwaysOnTop
value=
"true"
/>
</navigator>
<panes>
<pane
id=
"Scratches"
/>
<pane
id=
"Scope"
/>
<pane
id=
"ProjectPane"
>
<subPane>
<expand>
...
...
@@ -101,38 +121,49 @@
<path>
<item
name=
"resource"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"resource"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"app"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"api"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"resource"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"resource"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"api"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"index"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"resource"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"resource"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"api"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"index"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"controller"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"resource"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"resource"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"app"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"admin"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"resource"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"resource"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"app"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"admin"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"controller"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"resource"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"resource"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"public"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"app"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"admin"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"controller"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"resource"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"resource"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"public"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"themes"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"resource"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"resource"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"public"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"themes"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"admin_simpleboot3"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"resource"
type=
"b2602c69:ProjectViewProjectNode"
/>
...
...
@@ -140,7 +171,6 @@
<item
name=
"public"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"themes"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"admin_simpleboot3"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"admin"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"resource"
type=
"b2602c69:ProjectViewProjectNode"
/>
...
...
@@ -149,12 +179,13 @@
<item
name=
"themes"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"admin_simpleboot3"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"admin"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"statistic"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
</expand>
<select
/>
</subPane>
</pane>
<pane
id=
"Scope"
/>
<pane
id=
"Scratches"
/>
</panes>
</component>
<component
name=
"PropertiesComponent"
>
...
...
@@ -187,26 +218,29 @@
<workItem
from=
"1567834508663"
duration=
"1410000"
/>
<workItem
from=
"1568016475309"
duration=
"8687000"
/>
<workItem
from=
"1568027661451"
duration=
"746000"
/>
<workItem
from=
"1568077893489"
duration=
"7871000"
/>
<workItem
from=
"1568077893489"
duration=
"8055000"
/>
<workItem
from=
"1568087646832"
duration=
"20777000"
/>
<workItem
from=
"1568160847626"
duration=
"2589000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"
1871
4000"
/>
<option
name=
"totallyTimeSpent"
value=
"
4226
4000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"252"
y=
"75"
width=
"1474"
height=
"906"
extended-state=
"1"
/>
<frame
x=
"380"
y=
"63"
width=
"1410"
height=
"1012"
extended-state=
"0"
/>
<editor
active=
"true"
/>
<layout>
<window_info
id=
"Project"
active=
"
true"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"true"
show_stripe_button=
"true"
weight=
"0.19753087
"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"combo"
/>
<window_info
id=
"Project"
active=
"
false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"true"
show_stripe_button=
"true"
weight=
"0.19081779
"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"combo"
/>
<window_info
id=
"TODO"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"6"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Event Log"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"7"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Database"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"3"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Run"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"2"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Version Control"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"7"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Run"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"2"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Structure"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.25"
sideWeight=
"0.5"
order=
"1"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Terminal"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"7"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Debug"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.4"
sideWeight=
"0.5"
order=
"3"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Favorites"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"2"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Debug"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.4"
sideWeight=
"0.5"
order=
"3"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Cvs"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.25"
sideWeight=
"0.5"
order=
"4"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Message"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Commander"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.4"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"tabs"
/>
...
...
@@ -227,25 +261,46 @@
<watches-manager
/>
</component>
<component
name=
"editorHistoryManager"
>
<entry
file=
"file://$PROJECT_DIR$/app/admin/controller/StatisticController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"2875"
>
<caret
line=
"121"
column=
"41"
lean-forward=
"false"
selection-start-line=
"121"
selection-start-column=
"30"
selection-end-line=
"121"
selection-end-column=
"41"
/>
<folding>
<marker
date=
"1568163294161"
expanded=
"true"
signature=
"4348:4384"
ph=
"select COUNT... cmf_job"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/statistic/index.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1600"
>
<caret
line=
"64"
column=
"41"
lean-forward=
"true"
selection-start-line=
"64"
selection-start-column=
"41"
selection-end-line=
"64"
selection-end-column=
"41"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/app/admin/controller/StatisticController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"850"
>
<caret
line=
"40"
column=
"46"
lean-forward=
"false"
selection-start-line=
"40"
selection-start-column=
"46"
selection-end-line=
"40"
selection-end-column=
"46"
/>
<folding>
<marker
date=
"1568163294161"
expanded=
"true"
signature=
"4348:4384"
ph=
"select COUNT... cmf_job"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/statistic/index.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"150"
>
<caret
line=
"6"
column=
"8"
lean-forward=
"true"
selection-start-line=
"6"
selection-start-column=
"8"
selection-end-line=
"6"
selection-end-column=
"8"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/app/user/controller/AdminIndexController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"2550"
>
<caret
line=
"192"
column=
"27"
lean-forward=
"false"
selection-start-line=
"192"
selection-start-column=
"20"
selection-end-line=
"192"
selection-end-column=
"27"
/>
<folding>
<element
signature=
"e#621#660#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#2705#2999#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3004#3453#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3459#3753#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3758#4067#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4089#4538#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4559#4866#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4884#5261#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5278#6976#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5936#6066#1#PHP"
expanded=
"false"
/>
<element
signature=
"e#6100#6230#1#PHP"
expanded=
"false"
/>
<element
signature=
"e#6245#6343#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6496#6970#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
...
...
@@ -253,12 +308,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"150"
>
<caret
line=
"6"
column=
"9"
lean-forward=
"false"
selection-start-line=
"6"
selection-start-column=
"9"
selection-end-line=
"6"
selection-end-column=
"9"
/>
<folding>
<element
signature=
"n#style#0;n#td#1;n#if#0;n#tr#0;n#foreach#0;n#tbody#0;n#table#0;n#form#1;n#div#0;n#body#0;n#!!top"
expanded=
"true"
/>
<element
signature=
"n#style#0;n#td#2;n#if#0;n#tr#0;n#foreach#0;n#tbody#0;n#table#0;n#form#1;n#div#0;n#body#0;n#!!top"
expanded=
"true"
/>
<element
signature=
"n#style#0;n#td#0;n#if#1;n#tr#0;n#foreach#0;n#tbody#0;n#table#0;n#form#1;n#div#0;n#body#0;n#!!top"
expanded=
"true"
/>
<element
signature=
"n#style#0;n#td#1;n#if#1;n#tr#0;n#foreach#0;n#tbody#0;n#table#0;n#form#1;n#div#0;n#body#0;n#!!top"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
...
...
@@ -266,7 +315,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"2350"
>
<caret
line=
"94"
column=
"31"
lean-forward=
"false"
selection-start-line=
"94"
selection-start-column=
"31"
selection-end-line=
"94"
selection-end-column=
"31"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -274,21 +322,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"0"
>
<caret
line=
"0"
column=
"0"
lean-forward=
"false"
selection-start-line=
"0"
selection-start-column=
"0"
selection-end-line=
"0"
selection-end-column=
"0"
/>
<folding>
<element
signature=
"e#621#660#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#2705#2999#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3004#3453#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3459#3753#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3758#4067#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4089#4538#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4559#4866#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4884#5261#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5278#6976#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5936#6066#1#PHP"
expanded=
"false"
/>
<element
signature=
"e#6100#6230#1#PHP"
expanded=
"false"
/>
<element
signature=
"e#6245#6343#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6496#6970#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
...
...
@@ -296,7 +329,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"2350"
>
<caret
line=
"94"
column=
"31"
lean-forward=
"false"
selection-start-line=
"94"
selection-start-column=
"31"
selection-end-line=
"94"
selection-end-column=
"31"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -311,7 +343,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"200"
>
<caret
line=
"8"
column=
"32"
lean-forward=
"true"
selection-start-line=
"8"
selection-start-column=
"32"
selection-end-line=
"8"
selection-end-column=
"32"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -319,7 +350,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"200"
>
<caret
line=
"8"
column=
"32"
lean-forward=
"false"
selection-start-line=
"8"
selection-start-column=
"32"
selection-end-line=
"8"
selection-end-column=
"32"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -351,19 +381,10 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ResourceController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"592"
>
<caret
line=
"117"
column=
"38"
lean-forward=
"true"
selection-start-line=
"117"
selection-start-column=
"38"
selection-end-line=
"117"
selection-end-column=
"38"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/active/edit.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-1150"
>
<caret
line=
"29"
column=
"16"
lean-forward=
"false"
selection-start-line=
"29"
selection-start-column=
"16"
selection-end-line=
"35"
selection-end-column=
"21"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -405,12 +426,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-275"
>
<caret
line=
"52"
column=
"48"
lean-forward=
"true"
selection-start-line=
"52"
selection-start-column=
"48"
selection-end-line=
"52"
selection-end-column=
"48"
/>
<folding>
<element
signature=
"n#style#0;n#td#1;n#if#0;n#tr#0;n#foreach#0;n#tbody#0;n#table#0;n#form#1;n#div#0;n#body#0;n#!!top"
expanded=
"true"
/>
<element
signature=
"n#style#0;n#td#2;n#if#0;n#tr#0;n#foreach#0;n#tbody#0;n#table#0;n#form#1;n#div#0;n#body#0;n#!!top"
expanded=
"true"
/>
<element
signature=
"n#style#0;n#td#0;n#if#1;n#tr#0;n#foreach#0;n#tbody#0;n#table#0;n#form#1;n#div#0;n#body#0;n#!!top"
expanded=
"true"
/>
<element
signature=
"n#style#0;n#td#1;n#if#1;n#tr#0;n#foreach#0;n#tbody#0;n#table#0;n#form#1;n#div#0;n#body#0;n#!!top"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
...
...
@@ -418,7 +433,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"267"
>
<caret
line=
"67"
column=
"36"
lean-forward=
"true"
selection-start-line=
"67"
selection-start-column=
"36"
selection-end-line=
"67"
selection-end-column=
"36"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -426,37 +440,35 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"767"
>
<caret
line=
"193"
column=
"29"
lean-forward=
"false"
selection-start-line=
"193"
selection-start-column=
"29"
selection-end-line=
"193"
selection-end-column=
"29"
/>
<folding>
<element
signature=
"e#621#660#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#2705#2999#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3004#3453#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3459#3753#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3758#4067#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4089#4538#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4559#4866#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4884#5261#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5278#6976#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5936#6066#1#PHP"
expanded=
"false"
/>
<element
signature=
"e#6100#6230#1#PHP"
expanded=
"false"
/>
<element
signature=
"e#6245#6343#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6496#6970#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/
app/admin/controller/StatisticController.php
"
>
<entry
file=
"file://$PROJECT_DIR$/
public/themes/admin_simpleboot3/admin/statistic/index.html
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"700"
>
<caret
line=
"40"
column=
"46"
lean-forward=
"true"
selection-start-line=
"40"
selection-start-column=
"46"
selection-end-line=
"40"
selection-end-column=
"46"
/>
<state
relative-caret-position=
"0"
>
<caret
line=
"45"
column=
"1"
lean-forward=
"false"
selection-start-line=
"45"
selection-start-column=
"1"
selection-end-line=
"45"
selection-end-column=
"1"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/
public/themes/admin_simpleboot3/admin/statistic/index.html
"
>
<entry
file=
"file://$PROJECT_DIR$/
app/admin/controller/StatisticController.php
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"400"
>
<caret
line=
"16"
column=
"29"
lean-forward=
"true"
selection-start-line=
"16"
selection-start-column=
"29"
selection-end-line=
"16"
selection-end-column=
"29"
/>
<folding
/>
<state
relative-caret-position=
"448"
>
<caret
line=
"73"
column=
"9"
lean-forward=
"true"
selection-start-line=
"73"
selection-start-column=
"9"
selection-end-line=
"73"
selection-end-column=
"9"
/>
<folding>
<marker
date=
"1568163294161"
expanded=
"true"
signature=
"4348:4384"
ph=
"select COUNT... cmf_job"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ResourceController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"299"
>
<caret
line=
"273"
column=
"34"
lean-forward=
"true"
selection-start-line=
"273"
selection-start-column=
"34"
selection-end-line=
"273"
selection-end-column=
"34"
/>
<folding>
<element
signature=
"e#9338#10067#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11561#12146#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
...
...
api/index/controller/ResourceController.php
查看文件 @
0dadf11
...
...
@@ -271,7 +271,8 @@ class ResourceController extends RestBaseController
$this
-> error(['code'=>40005,'msg'=>'缺少必要参数']);
}
$jobModel
= new JobModel();
$info
=
$jobModel->getOne
(
$id
);
$where['id']
= ['eq',
$id
];
$info
=
$jobModel->getOne
(
$where
);
$data['id']
=
$info['id']
;
$data['job_title']
=
$info['job_title']
;
$data['create_time']
= date('Y-m-d H:i:s',
$info['create_time']
);
...
...
app/admin/controller/StatisticController.php
查看文件 @
0dadf11
...
...
@@ -44,6 +44,86 @@ class StatisticController extends AdminBaseController
$data
[
'man'
]
=
Db
::
name
(
'user'
)
->
whereTime
(
'create_time'
,
'today'
)
->
count
();
//发布总数量
$arr
=
Db
::
name
(
'job'
)
->
where
([
'delete_time'
=>
0
,
'status'
=>
1
])
->
field
(
'count(id) as total_num,create_time'
)
->
group
(
"FROM_UNIXTIME(create_time,'%Y-%m-%d')"
)
->
order
(
'create_time desc'
)
->
select
()
->
toArray
();
//供给发布
$arr1
=
Db
::
name
(
'job'
)
->
where
([
'delete_time'
=>
0
,
'status'
=>
1
,
'job_type'
=>
1
])
->
field
(
'count(id) as provide_num,create_time'
)
->
group
(
"FROM_UNIXTIME(create_time,'%Y-%m-%d')"
)
->
order
(
'create_time desc'
)
->
select
()
->
toArray
();
foreach
(
$arr
as
&
$value_1
){
$value_1
[
'create_time'
]
=
date
(
'Y-m-d'
,
$value_1
[
'create_time'
]);
$value_1
[
'provide_num'
]
=
0
;
foreach
(
$arr1
as
$value1
){
$date1
=
date
(
'Y-m-d'
,
$value1
[
'create_time'
]);
if
(
$value_1
[
'create_time'
]
==
$date1
){
$value_1
[
'provide_num'
]
=
$value1
[
'provide_num'
];
}
}
}
//需求发布
$arr2
=
Db
::
name
(
'job'
)
->
where
([
'delete_time'
=>
0
,
'status'
=>
1
,
'job_type'
=>
2
])
->
field
(
'count(id) as demand_num,create_time'
)
->
group
(
"FROM_UNIXTIME(create_time,'%Y-%m-%d')"
)
->
order
(
'create_time desc'
)
->
select
()
->
toArray
();
foreach
(
$arr
as
&
$value_2
){
$value_2
[
'demand_num'
]
=
0
;
foreach
(
$arr2
as
$value2
){
$date2
=
date
(
'Y-m-d'
,
$value2
[
'create_time'
]);
if
(
$value_2
[
'create_time'
]
==
$date2
){
$value_2
[
'demand_num'
]
=
$value2
[
'demand_num'
];
}
}
}
//活动发布
$arr3
=
Db
::
name
(
'job'
)
->
where
([
'delete_time'
=>
0
,
'status'
=>
1
,
'job_type'
=>
3
])
->
field
(
'count(id) as active_num,create_time'
)
->
group
(
"FROM_UNIXTIME(create_time,'%Y-%m-%d')"
)
->
order
(
'create_time desc'
)
->
select
()
->
toArray
();
foreach
(
$arr
as
&
$value_3
){
$value_3
[
'active_num'
]
=
0
;
foreach
(
$arr3
as
$value3
){
$date3
=
date
(
'Y-m-d'
,
$value3
[
'create_time'
]);
if
(
$value_3
[
'create_time'
]
==
$date3
){
$value_3
[
'active_num'
]
=
$value3
[
'active_num'
];
}
}
}
//招商发布
$arr4
=
Db
::
name
(
'job'
)
->
where
([
'delete_time'
=>
0
,
'status'
=>
1
,
'job_type'
=>
4
])
->
field
(
'id,count(id) as attract_num,create_time'
)
->
group
(
"FROM_UNIXTIME(create_time,'%Y-%m-%d')"
)
->
order
(
'create_time desc'
)
->
select
()
->
toArray
();
foreach
(
$arr
as
&
$value_4
){
$value_4
[
'attract_num'
]
=
0
;
foreach
(
$arr4
as
$value4
){
$date4
=
date
(
'Y-m-d'
,
$value4
[
'create_time'
]);
if
(
$value_4
[
'create_time'
]
==
$date4
){
$value_4
[
'attract_num'
]
=
$value4
[
'attract_num'
];
}
}
}
$this
->
assign
(
'list'
,
$arr
);
$this
->
assign
(
'data'
,
$data
);
return
$this
->
fetch
();
}
...
...
public/themes/admin_simpleboot3/admin/statistic/index.html
查看文件 @
0dadf11
...
...
@@ -33,6 +33,48 @@
</table>
</form>
</div>
<div
class=
"wrap js-check-wrap"
>
<ul
class=
"nav nav-tabs"
>
<li
class=
"active"
><a
href=
"#"
>
发布详情
</a></li>
</ul>
<form
class=
"js-ajax-form"
action=
""
method=
"post"
>
<table
class=
"table table-hover table-bordered"
>
<thead>
<tr>
<th>
日期
</th>
<th>
发布数量
</th>
<th>
供给发布
</th>
<th>
需求发布
</th>
<th>
活动发布
</th>
<th>
招商发布
</th>
<th>
在线信息数量
</th>
<th>
供给信息
</th>
<th>
需求信息
</th>
<th>
同城活动
</th>
<th>
招商信息
</th>
</tr>
</thead>
<foreach
name=
"list"
item=
"vo"
>
<tbody>
<tr
style=
"font-size: 20px"
>
<td>
{$vo.create_time}
</td>
<td>
{$vo.total_num}
</td>
<td>
{$vo.provide_num}
</td>
<td>
{$vo.demand_num}
</td>
<td>
{$vo.active_num}
</td>
<td>
{$vo.attract_num}
</td>
<td>
1
</td>
<td>
1
</td>
<td>
1
</td>
<td>
1
</td>
<td>
1
</td>
</tr>
</tbody>
</foreach>
</table>
</form>
</div>
<script
src=
"__STATIC__/js/admin.js"
></script>
</body>
</html>
\ No newline at end of file
...
...
请
注册
或
登录
后发表评论