Merge branch 'master-V32-XuHaoJie' into 'master'

通用-及时消息配置-页面优化



See merge request !405

@@ -46,6 +46,24 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
             });
             });
             deleteById(noticeTimelyCodeList);
             deleteById(noticeTimelyCodeList);
         });
         });
+        // 全部刷新
+        $('#btn-noticeTimely-refresh').on('click', function () {
+            layer.load(2);
+            $.ajax({
+                url: domainName + '/api-web/noticeTimely/refresh?access_token=' + accessToken,
+                type: 'get',
+                success: function (response) {
+                    layer.closeAll('loading');
+                    if (response.success) {
+                        layer.msg('刷新成功!', {icon: 1, time: 3000});
+                        reloadTable();
+                    } else {
+                        layer.msg('刷新失败!', {icon: 2, time: 3000});
+                    }
+                }
+            })
+        });
+
         //switch事件
         //switch事件
         $.each(switchElement, function (i, v) {
         $.each(switchElement, function (i, v) {
             form.on('switch(switch_noticeTimely_checkbox_' + v + ')', function (data) {
             form.on('switch(switch_noticeTimely_checkbox_' + v + ')', function (data) {
@@ -135,6 +153,17 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
                         var ids = [$(this).data('id')];
                         var ids = [$(this).data('id')];
                         deleteStateById(ids);
                         deleteStateById(ids);
                     });
                     });
+                    //全部删除
+                    $('#btn-notice-state-delete').unbind("click").on('click',function () {
+                        //获取选中数据
+                        var checks = table.checkStatus('table-noticeTimely-state-list').data;
+                        var list= checks.map(item => item.id);
+                        if(list.length>0){
+                            deleteStateById(list);
+                        }else{
+                            layer.msg('请最少选择一项数据', {icon: 7, time: 2000});
+                        }
+                    })
                 }
                 }
             });
             });
         }
         }
@@ -223,12 +252,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
                                 loadStateTable(id);
                                 loadStateTable(id);
                             },
                             },
                             yes: function (index, layero) {
                             yes: function (index, layero) {
-                                //获取选中数据
-                                var checks = table.checkStatus('table-noticeTimely-state-list').data;
-                                var list= checks.map(item => item.id);
-                                if(list.length>0){
-                                    deleteStateById(list);
-                                }
                                 layer.close(index);
                                 layer.close(index);
                             }
                             }
                         });
                         });

@@ -119,7 +119,7 @@
         <div class="layui-form-item hide" id="notice_timely_param_sql">
         <div class="layui-form-item hide" id="notice_timely_param_sql">
             <label class="layui-form-label textarea-label">展示内容</label>
             <label class="layui-form-label textarea-label">展示内容</label>
             <div class="layui-input-block" style="display: flex;">
             <div class="layui-input-block" style="display: flex;">
-                <textarea name="details" placeholder="请输入展示内容" class="layui-textarea" style="width: 92%"></textarea>
+                <textarea name="details" placeholder="请输入展示内容" class="layui-textarea" style=""></textarea>
             </div>
             </div>
         </div>
         </div>
         <div class="layui-form-item hide" id="notice_timely_param_level">
         <div class="layui-form-item hide" id="notice_timely_param_level">
@@ -129,7 +129,7 @@
 </article>
 </article>
 <script type="text/html" id="noticeTimelyParamAddRowHtml">
 <script type="text/html" id="noticeTimelyParamAddRowHtml">
     <div class="layui-form-item">
     <div class="layui-form-item">
-        <div class="layui-inline" style="float: right">
+        <div class="layui-inline" style="margin-left: 110px">
             <div class="layui-notice-time-lable">当数据集中的</div>
             <div class="layui-notice-time-lable">当数据集中的</div>
             <select class="layui-notice-time-select notice_time_select_sql_value">
             <select class="layui-notice-time-select notice_time_select_sql_value">
 
 

@@ -29,6 +29,9 @@
                         <button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-noticeTimely-delete">
                         <button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-noticeTimely-delete">
                             <i class="layui-icon">&#xe640;</i>删除
                             <i class="layui-icon">&#xe640;</i>删除
                         </button>
                         </button>
+                        <button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-noticeTimely-refresh">
+                            <i class="layui-icon">&#xe669;</i>全部刷新
+                        </button>
                     </div>
                     </div>
                     <table id="table-noticeTimely-list" lay-filter="table-noticeTimely-list"></table>
                     <table id="table-noticeTimely-list" lay-filter="table-noticeTimely-list"></table>
                 </div>
                 </div>
@@ -37,6 +40,13 @@
     </div>
     </div>
 </article>
 </article>
 <script type="text/html" id="noticeTimely-state-html" >
 <script type="text/html" id="noticeTimely-state-html" >
+    <div class="layui-card-body">
+        <div class="warn-btns">
+            <button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-notice-state-delete">
+                <i class="layui-icon">&#xe640;</i>删除
+            </button>
+        </div>
+    </div>
     <div>
     <div>
         <table id="table-noticeTimely-state-list" lay-filter="table-noticeTimely-state-list"></table>
         <table id="table-noticeTimely-state-list" lay-filter="table-noticeTimely-state-list"></table>
     </div>
     </div>