Skip to content

李洋 / 消息系统

Go to a project
Commit dc0254a5 by 李洋
Options

11

parent f9f4dc87
Inline Side-by-side
Showing with 257 additions and 525 deletions
.idea/workspace.xml
......@@ -2,117 +2,12 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="5adaf67b-2f8e-4572-8a6c-38631037f4b7" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/css/modules/layer/default/icon-ext.png" afterPath="$PROJECT_DIR$/public/js/Message/layui/css/modules/layer/default/icon-ext.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/css/modules/layer/default/icon.png" afterPath="$PROJECT_DIR$/public/js/Message/layui/css/modules/layer/default/icon.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/css/modules/layer/default/loading-0.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/css/modules/layer/default/loading-0.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/css/modules/layer/default/loading-1.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/css/modules/layer/default/loading-1.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/css/modules/layer/default/loading-2.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/css/modules/layer/default/loading-2.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/font/iconfont.eot" afterPath="$PROJECT_DIR$/public/js/Message/layui/font/iconfont.eot" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/font/iconfont.ttf" afterPath="$PROJECT_DIR$/public/js/Message/layui/font/iconfont.ttf" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/font/iconfont.woff" afterPath="$PROJECT_DIR$/public/js/Message/layui/font/iconfont.woff" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/0.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/0.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/1.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/1.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/10.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/10.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/11.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/11.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/12.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/12.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/13.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/13.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/14.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/14.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/15.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/15.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/16.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/16.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/17.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/17.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/18.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/18.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/19.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/19.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/2.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/2.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/20.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/20.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/21.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/21.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/22.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/22.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/23.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/23.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/24.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/24.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/25.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/25.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/26.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/26.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/27.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/27.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/28.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/28.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/29.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/29.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/3.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/3.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/30.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/30.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/31.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/31.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/32.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/32.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/33.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/33.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/34.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/34.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/35.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/35.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/36.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/36.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/37.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/37.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/38.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/38.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/39.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/39.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/4.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/4.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/40.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/40.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/41.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/41.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/42.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/42.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/43.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/43.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/44.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/44.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/45.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/45.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/46.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/46.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/47.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/47.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/48.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/48.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/49.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/49.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/5.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/5.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/50.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/50.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/51.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/51.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/52.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/52.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/53.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/53.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/54.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/54.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/55.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/55.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/56.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/56.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/57.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/57.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/58.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/58.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/59.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/59.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/6.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/6.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/60.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/60.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/61.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/61.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/62.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/62.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/63.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/63.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/64.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/64.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/65.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/65.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/66.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/66.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/67.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/67.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/68.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/68.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/69.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/69.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/7.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/7.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/70.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/70.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/71.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/71.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/8.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/8.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/images/face/9.gif" afterPath="$PROJECT_DIR$/public/js/Message/layui/images/face/9.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/Http/Controllers/MessageController.php" afterPath="$PROJECT_DIR$/app/Http/Controllers/MessageController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/Http/function.php" afterPath="$PROJECT_DIR$/app/Http/function.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/Providers/AppServiceProvider.php" afterPath="$PROJECT_DIR$/app/Providers/AppServiceProvider.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/config/database.php" afterPath="$PROJECT_DIR$/config/database.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/config/msgconfig.php" afterPath="$PROJECT_DIR$/config/msgconfig.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/allhistorylist.js" afterPath="$PROJECT_DIR$/public/js/Message/allhistorylist.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/css/layui.css" afterPath="$PROJECT_DIR$/public/js/Message/layui/css/layui.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/css/layui.mobile.css" afterPath="$PROJECT_DIR$/public/js/Message/layui/css/layui.mobile.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/css/modules/code.css" afterPath="$PROJECT_DIR$/public/js/Message/layui/css/modules/code.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/css/modules/laydate/default/laydate.css" afterPath="$PROJECT_DIR$/public/js/Message/layui/css/modules/laydate/default/laydate.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/css/modules/layer/default/layer.css" afterPath="$PROJECT_DIR$/public/js/Message/layui/css/modules/layer/default/layer.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/font/iconfont.svg" afterPath="$PROJECT_DIR$/public/js/Message/layui/font/iconfont.svg" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/lay/modules/carousel.js" afterPath="$PROJECT_DIR$/public/js/Message/layui/lay/modules/carousel.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/lay/modules/code.js" afterPath="$PROJECT_DIR$/public/js/Message/layui/lay/modules/code.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/lay/modules/element.js" afterPath="$PROJECT_DIR$/public/js/Message/layui/lay/modules/element.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/lay/modules/flow.js" afterPath="$PROJECT_DIR$/public/js/Message/layui/lay/modules/flow.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/lay/modules/form.js" afterPath="$PROJECT_DIR$/public/js/Message/layui/lay/modules/form.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/lay/modules/jquery.js" afterPath="$PROJECT_DIR$/public/js/Message/layui/lay/modules/jquery.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/lay/modules/laydate.js" afterPath="$PROJECT_DIR$/public/js/Message/layui/lay/modules/laydate.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/lay/modules/layedit.js" afterPath="$PROJECT_DIR$/public/js/Message/layui/lay/modules/layedit.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/lay/modules/layer.js" afterPath="$PROJECT_DIR$/public/js/Message/layui/lay/modules/layer.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/lay/modules/laypage.js" afterPath="$PROJECT_DIR$/public/js/Message/layui/lay/modules/laypage.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/lay/modules/laytpl.js" afterPath="$PROJECT_DIR$/public/js/Message/layui/lay/modules/laytpl.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/lay/modules/mobile.js" afterPath="$PROJECT_DIR$/public/js/Message/layui/lay/modules/mobile.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/lay/modules/table.js" afterPath="$PROJECT_DIR$/public/js/Message/layui/lay/modules/table.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/lay/modules/tree.js" afterPath="$PROJECT_DIR$/public/js/Message/layui/lay/modules/tree.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/lay/modules/upload.js" afterPath="$PROJECT_DIR$/public/js/Message/layui/lay/modules/upload.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/lay/modules/util.js" afterPath="$PROJECT_DIR$/public/js/Message/layui/lay/modules/util.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/layui.all.js" afterPath="$PROJECT_DIR$/public/js/Message/layui/layui.all.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/layui/layui.js" afterPath="$PROJECT_DIR$/public/js/Message/layui/layui.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/Message/manualhistorylist.js" afterPath="$PROJECT_DIR$/public/js/Message/manualhistorylist.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/views/message/allhistorylist.blade.php" afterPath="$PROJECT_DIR$/resources/views/message/allhistorylist.blade.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/views/message/manualhistorylist.blade.php" afterPath="$PROJECT_DIR$/resources/views/message/manualhistorylist.blade.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
......@@ -127,37 +22,41 @@
<file leaf-file-name="allhistorylist.blade.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/message/allhistorylist.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="318">
<caret line="70" column="75" lean-forward="false" selection-start-line="70" selection-start-column="65" selection-end-line="70" selection-end-column="75" />
<state relative-caret-position="120">
<caret line="8" column="5" lean-forward="false" selection-start-line="8" selection-start-column="5" selection-end-line="8" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="manualhistorylist.blade.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/message/manualhistorylist.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="20" column="64" lean-forward="false" selection-start-line="20" selection-start-column="45" selection-end-line="20" selection-end-column="64" />
<folding>
<element signature="e#783#822#0#HTML" expanded="true" />
<element signature="e#1088#1127#0#HTML" expanded="true" />
<element signature="e#1393#1432#0#HTML" expanded="true" />
<element signature="e#2059#2098#0#HTML" expanded="true" />
<element signature="e#2603#2628#0#HTML" expanded="true" />
<element signature="e#2808#2833#0#HTML" expanded="true" />
<element signature="e#2957#2982#0#HTML" expanded="true" />
<element signature="e#3165#3204#0#HTML" expanded="true" />
<element signature="e#1#171#0#HTML" expanded="false" />
<element signature="e#2147#2172#0#HTML" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="allhistorylist.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/js/Message/allhistorylist.js">
<file leaf-file-name="manualhistorylist.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/js/Message/manualhistorylist.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="690">
<caret line="46" column="81" lean-forward="false" selection-start-line="46" selection-start-column="81" selection-end-line="46" selection-end-column="81" />
<state relative-caret-position="535">
<caret line="80" column="3" lean-forward="false" selection-start-line="80" selection-start-column="3" selection-end-line="80" selection-end-column="3" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="msgconfig.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/config/msgconfig.php">
<file leaf-file-name="allhistorylist.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/js/Message/allhistorylist.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="295">
<caret line="36" column="20" lean-forward="false" selection-start-line="36" selection-start-column="20" selection-end-line="36" selection-end-column="20" />
<state relative-caret-position="418">
<caret line="46" column="37" lean-forward="false" selection-start-line="46" selection-start-column="21" selection-end-line="46" selection-end-column="37" />
<folding />
</state>
</provider>
......@@ -166,8 +65,8 @@
<file leaf-file-name="MessageController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/MessageController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
<caret line="390" column="55" lean-forward="true" selection-start-line="390" selection-start-column="55" selection-end-line="390" selection-end-column="55" />
<state relative-caret-position="235">
<caret line="267" column="72" lean-forward="true" selection-start-line="267" selection-start-column="72" selection-end-line="267" selection-end-column="72" />
<folding>
<element signature="e#120#146#0#PHP" expanded="true" />
</folding>
......@@ -179,11 +78,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>Obtain_class</find>
<find>classifylist</find>
<find>generate_class_redis</find>
<find>Unbundling</find>
<find>liexinbrand</find>
<find>RedisDB::connection()</find>
<find>redisRemove</find>
<find>supplier</find>
......@@ -209,6 +103,11 @@
<find>search_id</find>
<find>tpl_id</find>
<find>--</find>
<find>手动</find>
<find>manual</find>
<find>p-l</find>
<find>actual_send_time</find>
<find>sendman</find>
</findStrings>
</component>
<component name="Git.Settings">
......@@ -217,8 +116,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/resources/views/footstone/brandmapping.blade.php" />
<option value="$PROJECT_DIR$/public/plupload-2.1.2/js/moxie.js" />
<option value="$PROJECT_DIR$/resources/views/footstone/categorylist.blade.php" />
<option value="$PROJECT_DIR$/public/js/FootStone/brandmapping.js" />
<option value="$PROJECT_DIR$/storage/framework/views/9a70eaec3195d8fea8b7ca663df9151d3e1d51d4.php" />
......@@ -262,11 +159,13 @@
<option value="$PROJECT_DIR$/resources/views/message/ManualHistoryList.blade.php" />
<option value="$PROJECT_DIR$/resources/views/message/SendManualMessage.blade.php" />
<option value="$PROJECT_DIR$/app/Http/function.php" />
<option value="$PROJECT_DIR$/resources/views/message/allhistorylist.blade.php" />
<option value="$PROJECT_DIR$/app/Providers/AppServiceProvider.php" />
<option value="$PROJECT_DIR$/config/database.php" />
<option value="$PROJECT_DIR$/public/js/Message/allhistorylist.js" />
<option value="$PROJECT_DIR$/config/msgconfig.php" />
<option value="$PROJECT_DIR$/public/js/Message/allhistorylist.js" />
<option value="$PROJECT_DIR$/resources/views/message/allhistorylist.blade.php" />
<option value="$PROJECT_DIR$/resources/views/message/manualhistorylist.blade.php" />
<option value="$PROJECT_DIR$/public/js/Message/manualhistorylist.js" />
<option value="$PROJECT_DIR$/app/Http/Controllers/MessageController.php" />
</list>
</option>
......@@ -294,7 +193,7 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="86" />
<option name="x" value="29" />
<option name="y" value="23" />
<option name="width" value="1211" />
<option name="height" value="752" />
......@@ -317,6 +216,8 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scratches" />
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
......@@ -400,19 +301,10 @@
<item name="storage" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="framework" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="CMS-Message" type="b2602c69:ProjectViewProjectNode" />
<item name="CMS-Message" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="storage" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="framework" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="views" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
<pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
......@@ -480,18 +372,19 @@
<workItem from="1511349105256" duration="62492000" />
<workItem from="1512031766599" duration="29538000" />
<workItem from="1540521897225" duration="14369000" />
<workItem from="1540869353045" duration="13419000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="694713000" />
<option name="totallyTimeSpent" value="708132000" />
</component>
<component name="ToolWindowManager">
<frame x="86" y="23" width="1211" height="752" extended-state="0" />
<frame x="29" y="23" width="1211" height="752" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Gulp" 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="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2035928" 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.20701455" 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.32980332" 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" />
......@@ -617,13 +510,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/message/js.blade.php">
<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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/app.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-342">
......@@ -647,13 +533,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/Message/common.min.js">
<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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/Message/excel.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
......@@ -675,20 +554,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/message/templatelist.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="39" column="71" lean-forward="false" selection-start-line="39" selection-start-column="71" selection-end-line="39" selection-end-column="71" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/Message/manualhistorylist.js">
<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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/Message/templatelist.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
......@@ -710,20 +575,12 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/message/manualhistorylist.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="8" column="94" lean-forward="false" selection-start-line="8" selection-start-column="94" selection-end-line="8" selection-end-column="94" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/FootStoneController.php" />
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/FootStoneApiController.php" />
<entry file="file://$PROJECT_DIR$/public/js/Message/sendmanualmessage.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="8" column="24" lean-forward="false" selection-start-line="8" selection-start-column="24" selection-end-line="8" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
......@@ -731,7 +588,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="305">
<caret line="243" column="90" lean-forward="false" selection-start-line="243" selection-start-column="90" selection-end-line="243" selection-end-column="90" />
<folding />
</state>
</provider>
</entry>
......@@ -739,7 +595,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
<caret line="6" column="75" lean-forward="true" selection-start-line="6" selection-start-column="75" selection-end-line="6" selection-end-column="75" />
<folding />
</state>
</provider>
</entry>
......@@ -756,7 +611,7 @@
<state relative-caret-position="75">
<caret line="5" column="7" lean-forward="false" selection-start-line="5" selection-start-column="7" selection-end-line="5" selection-end-column="7" />
<folding>
<element signature="e#33#72#0#PHP" expanded="true" />
<element signature="e#33#72#0#PHP" expanded="false" />
</folding>
</state>
</provider>
......@@ -771,41 +626,79 @@
</entry>
<entry file="file://$PROJECT_DIR$/config/msgconfig.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="295">
<state relative-caret-position="465">
<caret line="36" column="20" lean-forward="false" selection-start-line="36" selection-start-column="20" selection-end-line="36" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/message/allhistorylist.blade.php">
<entry file="file://$PROJECT_DIR$/resources/views/message/templatelist.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="318">
<caret line="70" column="75" lean-forward="false" selection-start-line="70" selection-start-column="65" selection-end-line="70" selection-end-column="75" />
<state relative-caret-position="-333">
<caret line="39" column="38" lean-forward="true" selection-start-line="39" selection-start-column="38" selection-end-line="39" selection-end-column="38" />
<folding>
<element signature="e#783#822#0#HTML" expanded="true" />
<element signature="e#1088#1127#0#HTML" expanded="true" />
<element signature="e#1393#1432#0#HTML" expanded="true" />
<element signature="e#2059#2098#0#HTML" expanded="true" />
<element signature="e#2603#2628#0#HTML" expanded="true" />
<element signature="e#2808#2833#0#HTML" expanded="true" />
<element signature="e#2957#2982#0#HTML" expanded="true" />
<element signature="e#3165#3204#0#HTML" expanded="true" />
<marker date="1538016261362" expanded="true" signature="4503:4791" ph="..." />
<marker date="1538016261362" expanded="true" signature="4518:4780" ph="..." />
<marker date="1538016261362" expanded="true" signature="4519:4779" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/message/js.blade.php">
<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 />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/Message/common.min.js">
<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 />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/Message/allhistorylist.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="690">
<caret line="46" column="81" lean-forward="false" selection-start-line="46" selection-start-column="81" selection-end-line="46" selection-end-column="81" />
<state relative-caret-position="418">
<caret line="46" column="37" lean-forward="false" selection-start-line="46" selection-start-column="21" selection-end-line="46" selection-end-column="37" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/message/allhistorylist.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="8" column="5" lean-forward="false" selection-start-line="8" selection-start-column="5" selection-end-line="8" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/Message/manualhistorylist.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="535">
<caret line="80" column="3" lean-forward="false" selection-start-line="80" selection-start-column="3" selection-end-line="80" selection-end-column="3" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/message/manualhistorylist.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="20" column="64" lean-forward="false" selection-start-line="20" selection-start-column="45" selection-end-line="20" selection-end-column="64" />
<folding>
<element signature="e#1#171#0#HTML" expanded="false" />
<element signature="e#2147#2172#0#HTML" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/MessageController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
<caret line="390" column="55" lean-forward="true" selection-start-line="390" selection-start-column="55" selection-end-line="390" selection-end-column="55" />
<state relative-caret-position="235">
<caret line="267" column="72" lean-forward="true" selection-start-line="267" selection-start-column="72" selection-end-line="267" selection-end-column="72" />
<folding>
<element signature="e#120#146#0#PHP" expanded="true" />
</folding>
......
app/Http/Controllers/MessageController.php
......@@ -264,92 +264,46 @@ class MessageController extends Controller
$manualmessage_edit = $res_perm['manualmessage_edit'];
$manualmessage_send = $res_perm['manualmessage_send'];
//搜索条件
$search_desc = $request->input('search_desc');
$search_channel = $request->input('search_channel');
$search_sendtime_start = $request->input('search_sendtime_start');
$search_sendtime_end = $request->input('search_sendtime_end');
$db = DB::connection('message');
//1.首次进页面无搜索条件
if(null==$search_desc && 0==$search_channel && null==$search_sendtime_start && null==$search_sendtime_end)
{
$info = $db->table('lie_msg_log')->groupBy('lie_msg_log.tpl_id')->having('lie_msg_log.source_type','=',2)
->join('lie_msg_tpl','lie_msg_log.tpl_id','=','lie_msg_tpl.tpl_id')
->orderBy('lie_msg_log.log_id','desc')->get();
$search_channel = 0;
$search_desc = '';
$search_sendtime_start = '';
$search_sendtime_end = '';
}else//2.有搜索条件
{
//时间为查询选择的当天
if(!empty($search_sendtime_start) && !empty($search_sendtime_end))
{
$start_time = strtotime($search_sendtime_start);
$end_time = strtotime($search_sendtime_end);
}else//否则为极限时间
{
$start_time = 0;
$end_time = 2524579200;
}
//渠道里没有0，所以如果没选，将此条件剔除掉
if(0==$search_channel)
{
$info = $db->table('lie_msg_log')->groupBy('lie_msg_log.tpl_id')->having('lie_msg_log.source_type','=',2)
->whereBetween('lie_msg_log.actual_send_time',[$start_time,$end_time])
->join('lie_msg_tpl','lie_msg_log.tpl_id','=','lie_msg_tpl.tpl_id')
->where('lie_msg_tpl.ex_str','like',"%$search_desc%")->orderBy('log_id','desc')->get();
}else
{
$info = $db->table('lie_msg_log')->groupBy('lie_msg_log.tpl_id')->having('lie_msg_log.source_type','=',2)
->join('lie_msg_tpl','lie_msg_log.tpl_id','=','lie_msg_tpl.tpl_id')
->whereBetween('lie_msg_log.actual_send_time',[$start_time,$end_time])
->where('lie_msg_tpl.channels','like',"%$search_channel%")
->where('lie_msg_tpl.ex_str','like',"%$search_desc%")->orderBy('log_id','desc')->get();
}
}
//构建model
foreach ($info as $log)
{
//将消息渠道从 数字字符串转化为汉字字符串 用于用户展示
$find_tpl = $db->table('lie_msg_tpl')->where('tpl_id',$log->tpl_id)->first();
$log->channels_str = $this->changeNumberStrToChineseStr(['站内信','短信','邮箱','微信通知'],$find_tpl->channels);
$log->description = $find_tpl->description;
$conditions = $request->input();
if(!empty($conditions['page']) && !empty($conditions['limit'])){
$items = DB::connection('message')->table('lie_msg_log as ml')
->leftjoin('lie_msg_tpl as mt','ml.tpl_id','=','mt.tpl_id')
->select('ml.log_id','ml.title','mt.description','ml.channel_type','ml.actual_send_time','ml.obj_user')
->where(function($query) use($conditions){
if(!empty($conditions['msg_tpl_description']))
{
$query->where('mt.description','like','%'.$conditions['msg_tpl_description'].'%');
}
if(!empty($conditions['start_time']))
{
$query->where('ml.actual_send_time','>=',strtotime($conditions['start_time']));
}
if(!empty($conditions['end_time']))
{
$query->where('ml.actual_send_time','<=',strtotime($conditions['end_time'])+86400);
}
if(!empty($conditions['msg_channels']))
{
$query->where('ml.channel_type',$conditions['msg_channels']);
}
})
->groupBy('mt.tpl_id')
->orderBy('ml.log_id','desc')
->paginate($conditions['limit'],['*'],'page',$conditions['page'])->toArray();
//取出渠道站内信和邮件title 放到info中
$inner_title = $db->table('lie_msg_channel_tpl')->select('title')
->where('tpl_id',$log->tpl_id)->where('channel_type',1)->first();
$email_title = $db->table('lie_msg_channel_tpl')->select('title')
->where('tpl_id',$log->tpl_id)->where('channel_type',3)->first();
$log->title = '-';
if(!empty($inner_title->title))
{
$log->title = $inner_title->title;
}else if(!empty($email_title->title))
{
$log->title = $email_title->title;
foreach ($items['data'] as &$item){
$item = objectToArray($item);
$item['actual_send_time_str'] = !empty($item['actual_send_time'])?Carbon::createFromTimestamp(strval($item['actual_send_time']))->toDateTimeString():'';
$item['channel_type_str'] = Config('msgconfig.msg_channels')[$item['channel_type']];
}
unset($item);
return json_encode(['code'=>0,'count'=>$items['total'],'msg'=>'success','data'=>$items['data']]);
}
$msg_channels=[
'全部',
'站内信',
'短信',
'邮件',
'微信通知',
];
$data=[
'title'=>'asd',
'id'=>$id,
'info'=>$info,
'msg_channels'=>$msg_channels,
'search_desc'=>$search_desc,
'search_channel'=>$search_channel,
'search_sendtime_start'=>$search_sendtime_start,
'search_sendtime_end'=>$search_sendtime_end,
'info'=>[],
'manualhistorylist_check'=>$manualhistorylist_check,
'manualmessage_edit'=>$manualmessage_edit,
......@@ -367,13 +321,6 @@ class MessageController extends Controller
$res_perm = $this->getUserPerms($request,$perms_arr);
$allhistorylist_check = $res_perm['allhistorylist_check'];
// //搜索条件
// $search_tpl_id = $request->input('search_tpl_id');
// $search_user = $request->input('search_user');
// $search_sendtime_start = $request->input('search_sendtime_start');
// $search_sendtime_end = $request->input('search_sendtime_end');
// $search_channel = $request->input('search_channel');
// $search_status = $request->input('search_status');
$conditions = $request->input();
if(!empty($conditions['page']) && !empty($conditions['limit'])){
$items = DB::connection('message')->table('lie_msg_log as ml')
......@@ -404,8 +351,9 @@ class MessageController extends Controller
{
$query->where('ml.status',$conditions['msg_status']);
}
})->groupby('ml.log_id')
->orderby('ml.log_id','desc')
})
// ->groupBy('ml.log_id') //todo:这里要改一下 想下怎么改 用mysql作groupby+分页
->orderBy('ml.log_id','desc')
->paginate($conditions['limit'],['*'],'page',$conditions['page'])->toArray();
foreach ($items['data'] as &$item){
......@@ -420,83 +368,10 @@ class MessageController extends Controller
return json_encode(['code'=>0,'count'=>$items['total'],'msg'=>'success','data'=>$items['data']]);
}
// $db = DB::connection('message');
// if($search_tpl_id==null && $search_user==null && $search_sendtime_start==null && $search_sendtime_end==null && $search_channel==null && $search_status==null)
// {
// $info = $db->table('lie_msg_log')->orderBy('log_id','desc')->paginate(20);
// $search_tpl_id = '';
// $search_user = '';
// $search_sendtime_start = '';
// $search_sendtime_end = '';
// $search_channel = 0;
// $search_status = 0;
// }else
// {
// //时间为查询选择的当天
// if(!empty($search_sendtime_start) && !empty($search_sendtime_end))
// {
// $start_time = strtotime($search_sendtime_start);
// $end_time = strtotime($search_sendtime_end);
// }else//否则为极限时间
// {
// $start_time = 0;
// $end_time = 2524579200;
// }
//
// //select option是否为0，为0则不查
// if($search_channel==0 && $search_status!=0)
// {
// $info = $db->table('lie_msg_log')
// ->where('tpl_id','like',"%$search_tpl_id%")->where('obj_user','like',"%$search_user%")
// ->whereBetween('actual_send_time',[$start_time,$end_time])
// ->where('status',$search_status)->orderBy('log_id','desc')->paginate(20);
// }elseif($search_channel!=0 && $search_status==0)
// {
// $info = $db->table('lie_msg_log')
// ->where('log_id','like',"%$search_id%")->where('obj_user','like',"%$search_user%")
// ->whereBetween('actual_send_time',[$start_time,$end_time])->where('channel_type',$search_channel)
// ->orderBy('log_id','desc')->paginate(20);
// }elseif($search_channel==0 && $search_status==0)
// {
// $info = $db->table('lie_msg_log')
// ->where('log_id','like',"%$search_id%")->where('obj_user','like',"%$search_user%")
// ->whereBetween('actual_send_time',[$start_time,$end_time])->orderBy('log_id','desc')->paginate(20);
// }else
// {
// $info = $db->table('lie_msg_log')
// ->where('log_id','like',"%$search_id%")->where('obj_user','like',"%$search_user%")
// ->whereBetween('actual_send_time',[$start_time,$end_time])->where('channel_type',$search_channel)
// ->where('status',$search_status)->orderBy('log_id','desc')->paginate(20);
// }
// }
// if($info){
// foreach ($info as &$in){
// $inf = $db->table('lie_msg_tpl')->select('ex_str')->where('tpl_id',$in->tpl_id)->first();
// $in->desc = $inf->ex_str;
// }
// unset($in);
// }
// $msg_channels = [
// '全部',
// '站内信',
// '短信',
// '邮件',
// '微信通知',
// '钉钉消息'
// ];
$data=[
'title'=>'asd',
'id'=>$id,
'info'=>[],
// 'msg_channels'=>$msg_channels,
// 'search_id'=>$search_id,
// 'search_user'=>$search_user,
// 'search_sendtime_start'=>$search_sendtime_start,
// 'search_sendtime_end'=>$search_sendtime_end,
// 'search_channel'=>$search_channel,
// 'search_status'=>$search_status,
'allhistorylist_check'=>$allhistorylist_check
];
......
public/js/Message/allhistorylist.js
......@@ -49,15 +49,4 @@ layui.use(['laydate','form','table'], function(){
]]
});
form.render();
});
// //指定条件搜索
// $('#search-btn').click(function () {
// var search_tpl_id = $('#search-tpl-id').val();
// var search_user = $('#search-msg-userobj').val();
// var search_sendtime_start = $('#Choice_start').val();
// var search_sendtime_end = $('#Choice_end').val();
// var search_channel = $('#search-msg-channel option:selected').val();
// var search_status = $('#search-msg-status option:selected').val();
// window.location.href="/message/allhistorylist?search_tpl_id="+search_tpl_id+"&search_user="+search_user+"&search_sendtime_start="+search_sendtime_start+"&search_sendtime_end="+search_sendtime_end+"&search_channel="+search_channel+"&search_status="+search_status;
// })
\ No newline at end of file
});
\ No newline at end of file
public/js/Message/manualhistorylist.js
//选择定时推送时间
layui.use('laydate', function(){
layui.use(['laydate','table','laypage','form'], function(){
var $ = layui.$;
var laydate = layui.laydate;
var form = layui.form;
var table = layui.table;
var laypage = layui.laypage;
//执行一个laydate实例
laydate.render({
elem: '#Choice_start', //指定元素
// type:'datetime',
// format:'yyyy-MM-dd HH-mm'
elem: '#start_time'
});
});
layui.use('laydate', function(){
var laydate = layui.laydate;
//执行一个laydate实例
laydate.render({
elem: '#Choice_end', //指定元素
// type:'datetime',
// format:'yyyy-MM-dd HH-mm'
elem: '#end_time'
});
//监听表单提交按钮
form.on('submit(search)', function(data){
//console.log(data.elem); //被执行事件的元素DOM对象，一般为button对象
// console.log(data.form); //被执行提交的form对象，一般在存在form标签时才会返回
// console.log(data.field); //当前容器的全部表单字段，名值对形式：{name: value}
// layer.alert(JSON.stringify(data.field), {
// title: '最终的提交信息'
// });
// return false;
//根据搜索条件 重载表单
apo_table.reload({
where: data.field,//设定异步数据接口的额外参数，任意设
page: {
curr: 1 //重新从第 1 页开始
}
});
return false; //阻止表单跳转。如果需要表单跳转，去掉这段即可。
});
var apo_table = table.render({
elem: '#table',
url: '/message/manualhistorylist',
id: 'table',
page: true,
limit: 10,
cols: [[ //表头
{field: 'log_id', title: '消息编号',align:'center',width:145},
{field: 'title', title: '消息标题',align:'center',width:145},
{field: 'description', title: '消息描述',align:'center',width:145},
{field: 'channel_type_str', title: '消息渠道',align:'center',width:145},
{field: 'obj_user', title: '推送目标',align:'center',width:145},
{field: 'actual_send_time_str', title: '发送时间',align:'center',width:145},
{fixed: 'right', title:'操作', width:150, align:'center', toolbar: '#bar'}
]]
});
//监听表格 工具栏点击
table.on('tool(table)', function(obj){
var data = obj.data;
var layEvent = obj.event;
var tr = obj.tr;
console.log(data);
if(layEvent === 'detail'){
window.location.href = '/message/sendmanualmessage?log_id='+data['log_id']+'op_type='+1;
}else if(layEvent === 're_send'){
window.location.href = '/message/sendmanualmessage?log_id='+data['log_id']+'op_type='+2;
}
});
//获取选中数据
var active = {
//可添加多个按钮 根据data-type给出的函数名决定调用
send_manual_msg:function(){
window.location.href="/message/sendmanualmessage";
}
};
//监听相关按钮点击 根据data-type值来确定是哪个按钮 然后调用对应的方法
$('.layui-btn').on('click', function(){
var type = $(this).data('type');
active[type] ? active[type].call(this) : '';
});
});
//指定条件搜索
$('#search-btn').click(function () {
var search_desc = $('#search-desc').val();
var search_channel = $('#choose-tpl option:selected').val();
var search_sendtime_start = $('#Choice_start').val();
var search_sendtime_end = $('#Choice_end').val();
window.location.href="/message/manualhistorylist?search_desc="+search_desc+"&search_channel="+search_channel+"&search_sendtime_start="+search_sendtime_start+"&search_sendtime_end="+search_sendtime_end;
})
\ No newline at end of file
form.render();
});
\ No newline at end of file
resources/views/message/allhistorylist.blade.php
<style>
.p-l{
margin: 20px;
background-color: rgba(255, 249, 242, 0.02);
height: auto;
}
.p-l label{
margin-left: 30px;
}
.div-b{
margin-top: 20px;
}
table{
table-layout: fixed;
word-break: break-all;
word-wrap: break-word; //表格固定布局
}
.filter-label-left{
width: 90px;
text-align: left;
......@@ -87,9 +69,6 @@
<table class="layui-hide" id="table" lay-filter="table"></table>
@else
<div style="text-align: center">
<label style="margin-top: 30px">对不起，您没有权限查看此页面</label>
......
resources/views/message/manualhistorylist.blade.php
<style>
.p-l{
margin: 20px;
background-color: rgba(255, 249, 242, 0.02);
height: auto;
.filter-label-left{
width: 90px;
text-align: left;
}
.p-l label{
margin-left: 30px;
}
.div-b{
.first-label{
margin-left: 20px;
margin-top: 20px;
}
</style>
@if($manualhistorylist_check)
<div class="gray-bg">
<div class="wrapper wrapper-content">
<div class="row">
<div class="col-lg-12">
<div class="ibox float-e-margins">
<div class="ibox-title">
<div class="form-inline p-l">
<form method="get" action="/message/templatelist">
<div style="text-align: center" class="div-b">
@if($manualmessage_send)
<a class="btn btn-primary btn-sm" href="/message/sendmanualmessage" style="float: left;margin-left: 30px">发送消息</a>
@endif
<label>消息描述：</label>
<input type="text" class="form-control" id="search-desc" placeholder="请输入消息描述" value="{{ $search_desc }}">
<label>消息渠道：</label>
<select class="form-control" name="inner-choose-type" id="choose-tpl">
@for($i=0;$i<count($msg_channels);$i++)
<option value="{{ $i }}" @if($i==$search_channel) selected @endif>{{ $msg_channels[$i] }}</option>
@endfor
</select>
<label>发送时间：</label>
<input type="text" class="form-control" id="Choice_start" name="create_time_start/condition" value="{{ $search_sendtime_start }}"/>-
<input type="text" class="form-control" id="Choice_end" name="create_time_end/condition" value="{{ $search_sendtime_end }}"/>
<input class="btn btn-primary btn-sm" id="search-btn" style="float: right; margin-right: 60px" value="搜索"/>
</div>
</form>
</div>
</div>
@if(count($info)>0)
<div class="ibox-content">
<div class="dataTables_wrapper form-inline dt-bootstrap">
<div class="row">
<div class="col-sm-12">
<table class="table table-striped table-bordered table-hover">
<thead>
<tr role="row">
<th style="width:100px;" class="text-center">消息编号</th>
<th style="width:100px;" class="text-center">消息标题</th>
<th style="width:150px;" class="text-center">消息描述</th>
<th style="width:100px;" class="text-center">消息渠道</th>
<th style="width:100px;" class="text-center">推送目标</th>
<th style="width:100px;" class="text-center">发送时间</th>
<th style="width:100px;" class="text-center">操作</th>
</tr>
</thead>
<form class="layui-form" action="">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label filter-label-left first-label">消息描述:</label>
<div class="layui-input-inline" style="width: 200px; margin-top: 20px;">
<input type="text" name="msg_tpl_description" autocomplete="off" class="layui-input"/>
</div>
<tbody>
@for($i=0;$i<count($info);$i++)
<tr role="row" style="text-align: center">
<td>{{ $info[$i]->log_id }}</td>
<td>{{ $info[$i]->title }}</td>
<td>{{ $info[$i]->ex_str }}</td>
<td>{{ $info[$i]->channels_str }}</td>
@if($info[$i]->obj_user=='is_to_all')
<td>全部用户</td>
@else
<td>{{ $info[$i]->obj_user }}</td>
@endif
<?php
if(empty($info[$i]->actual_send_time))
{
$info[$i]->actual_send_time = '';
}else
{
$info[$i]->actual_send_time=date("Y-m-d H:i:s",$info[$i]->actual_send_time);
}
<label class="layui-form-label filter-label-left first-label">消息渠道:</label>
<div class="layui-input-inline" style="width: 150px; margin-top: 20px;">
<select name="msg_channels" lay-filter="msg_channels">
<option value="" selected="">请选择</option>
@foreach(Config('msgconfig.msg_channels') as $k=>$v)
<option value="{{$k}}">{{$v}}</option>
@endforeach
</select>
</div>
?>
<td>{{ $info[$i]->actual_send_time }}</td>
@if($manualmessage_edit)
<td>
<a href="{{url('message/sendmanualmessage')}}?log_id={{$info[$i]->log_id}}&op_type=1" class="btn btn-xs btn-outline btn-primary">查看</a>
<a href="{{url('message/sendmanualmessage')}}?log_id={{$info[$i]->log_id}}&op_type=2" class="btn btn-xs btn-outline btn-warning">重新发送</a>
</td>
@endif
</tr>
@endfor
</tbody>
<label class="layui-form-label filter-label-left first-label">发送时间:</label>
<div class="layui-inline" style="margin-top: 20px;">
<input type="text" class="layui-input" name="start_time" id="start_time" autocomplete="off">
</div>
<div class="layui-inline" style="margin-top: 20px;">
<div class="layui-form-mid">--</div>
</div>
<div class="layui-inline" style="margin-top: 20px;">
<input type="text" class="layui-input" name="end_time" id="end_time" autocomplete="off">
</div>
</table>
{{$info->appends([
'search_desc'=>$search_desc,
'search_channel'=>$search_channel,
'search_sendtime_start'=>$search_sendtime_start,
'search_sendtime_end'=>$search_sendtime_end,
])->links() }}
</div>
</div>
<div class="row" id="my_list_paginate"></div>
</div>
</div>
@else
<div style="text-align: center">
<label>很抱歉，暂无数据</label>
</div>
@endif
<div class="layui-input-inline" style="margin-top: 20px; float: right;">
<button class="layui-btn" lay-submit lay-filter="search" data-type="reload">查询</button>
</div>
</div>
</div>
</div>
</div>
</form>
@if($manualmessage_send)
<div style="margin-top: 20px;">
<button class="layui-btn" id="send_manual_msg" data-type="send_manual_msg">发送消息</button>
</div>
@endif
<table class="layui-hide" id="table" lay-filter="table"></table>
<script type="text/html" id="bar">
<a class="layui-btn layui-btn-xs" lay-event="detail">查看</a>
<a class="layui-btn layui-btn-xs" lay-event="re_send">重新发送</a>
</script>
@else
<div style="text-align: center">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment