From 5f9704c02fc61da33ed4d3db0d1172976e461089 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 22 七月 2021 19:01:02 +0800
Subject: [PATCH] 推送服务完善

---
 service-push/src/main/resources/static/pushtask-list.html |  106 ++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 81 insertions(+), 25 deletions(-)

diff --git a/service-push/src/main/resources/static/pushtask-list.html b/service-push/src/main/resources/static/pushtask-list.html
index 6a22fc3..436dd56 100644
--- a/service-push/src/main/resources/static/pushtask-list.html
+++ b/service-push/src/main/resources/static/pushtask-list.html
@@ -61,9 +61,8 @@
                                    :value="end"></div>
 
                         <div class="layui-inline layui-show-xs-block">
-                            <select name="appCode" lay-verify="required" lay-search="">
+                            <select name="appCode" class="appCode" lay-verify="required" lay-search="">
                                 <option value="">鐩存帴閫夋嫨鎴栨悳绱㈠簲鐢�</option>
-                                <option v-for="item in appList" :value="item.appCode">{{item.name}}</option>
                             </select>
                         </div>
 
@@ -92,25 +91,27 @@
 </script>
 
 <script type="text/html" id="deleteContainer">
-    <div class="layui-btn-container">
-        <ul class="layui-nav left fast-add" lay-filter="">
-            <li class="layui-nav-item">
-                <a href="javascript:;">鎿嶄綔</a>
-                <dl class="layui-nav-child">
-                    <!-- 浜岀骇鑿滃崟 -->
-                    {{# layui.each(d.operateStates, function(index, item){ console.log(d.operateStates) ;}}
-                    <dd>
-                        {{# if(item.invalid) { }}
-                        <a class="layui-btn layui-btn-xs" lay-event="check">{{ item.name }}</a>
-                        {{# } else { }}
-                        <a class="layui-btn layui-btn-xs layui-btn-disabled" lay-event="check">{{ item.name }}</a>
-                        {{# } }}
-                    </dd>
-                    {{# }); }}
-                </dl>
-            </li>
-        </ul>
-    </div>
+    <a class="layui-btn layui-btn-xs" lay-event="more">鎿嶄綔 <i class="layui-icon layui-icon-down"></i></a>
+
+    <!--<div class="layui-btn-container">-->
+    <!--<ul class="layui-nav left fast-add" lay-filter="">-->
+    <!--<li class="layui-nav-item">-->
+    <!--<a href="javascript:;">鎿嶄綔</a>-->
+    <!--<dl class="layui-nav-child">-->
+    <!--&lt;!&ndash; 浜岀骇鑿滃崟 &ndash;&gt;-->
+    <!--{{# layui.each(d.operateStates, function(index, item){ console.log(d.operateStates) ;}}-->
+    <!--<dd>-->
+    <!--{{# if(item.invalid) { }}-->
+    <!--<a class="layui-btn layui-btn-xs" lay-event="check">{{ item.name }}</a>-->
+    <!--{{# } else { }}-->
+    <!--<a class="layui-btn layui-btn-xs layui-btn-disabled" lay-event="check">{{ item.name }}</a>-->
+    <!--{{# } }}-->
+    <!--</dd>-->
+    <!--{{# }); }}-->
+    <!--</dl>-->
+    <!--</li>-->
+    <!--</ul>-->
+    <!--</div>-->
 </script>
 
 <script type="text/html" id="statusContainer">
@@ -127,7 +128,7 @@
     </div>
 </script>
 
-<script type="text/html" id="switchTpl">
+<script type="text/html" id="operateTpl">
     <!-- 杩欓噷鐨刢hecked鐨勭姸鎬佸彧鏄紨绀� -->
     <input type="checkbox" name="sex" value="{{d.id}}" lay-skin="switch" lay-text="濂硘鐢�" lay-filter="sexDemo" {{ d.id==
            10003 ? 'checked': ''}} >
@@ -213,10 +214,33 @@
 
                     });
                 },
+
+                updateState: function (id, state) {
+                    var params = {
+                        id: id,
+                        operator: state
+                    }
+                    var index = layer.load(0, {shade: false});
+                    ksapp.post("/admin/api/pushtask/updateState", params, function (e) {
+                        layer.close(index);
+                        if (e.code == 0) {
+                            layer.msg("鎿嶄綔鎴愬姛");
+                        } else
+                            layer.msg(e.msg);
+                    }, function (e) {
+                        layer.close(index);
+                    });
+
+                },
                 getAppList: function () {//搴旂敤鍒楄〃
                     ksapp.post("/admin/api/app/list", {page: 1, limit: 100}, function (e) {
                         if (e.code == 0) {
                             app.appList = e.data.list;
+                            $(".appCode").empty();
+                            $(".appCode").append("<option value=''>鐩存帴閫夋嫨鎴栨悳绱㈠簲鐢�</option>");
+                            for (var i = 0; i < e.data.list.length; i++) {
+                                $(".appCode").append("<option value=" + e.data.list[i].appCode + ">" + e.data.list[i].name + "</option>");
+                            }
                             layui.use("form", function (e) {
                                 var form = layui.form;
                                 form.render();
@@ -245,7 +269,8 @@
                     });
                 },
                 render: function () {
-                    layui.use('table', function () {
+                    layui.use(['table', 'dropdown'], function () {
+                        var dropdown = layui.dropdown;
                         //鎼滅储琛ㄥ崟鐨剉ue璧嬪��
                         app.key = ksapp.getQueryParam("key") != null ? ksapp.getQueryParam("key") : '';
                         app.start = ksapp.getQueryParam("start");
@@ -259,7 +284,7 @@
                             totalRow: true,
                             cols: [
                                 [{type: 'checkbox', title: "ID"},
-                                    {field: 'id', width: 120, sort: true, title: "ID"},
+                                    {field: 'taskId', width: 120, sort: true, title: "ID"},
                                     {field: 'appCode', width: 120, title: "搴旂敤鏍囪瘑"},
                                     {
                                         field: "title",
@@ -344,7 +369,38 @@
 
                                         break;
                                 }
-                                ;
+                            });
+
+                        //鑷畾涔夊伐鍏蜂簨浠�
+                        table.on('tool(app)',
+                            function (obj) {
+                                console.log(obj);
+                                switch (obj.event) {
+                                    case 'more':
+                                        //鑾峰彇data;
+                                        var menus = new Array();
+                                        var data = obj.data;
+                                        for (var i = 0; i < data.operateStates.length; i++) {
+                                            menus.push({
+                                                title: data.operateStates[i].name + (data.operateStates[i].valid ? '' : '锛堟棤鏁堬級')
+                                                , id: data.operateStates[i].operator
+                                            })
+                                        }
+
+
+                                        //涓嬫媺鑿滃崟
+                                        dropdown.render({
+                                            elem: this //瑙﹀彂浜嬩欢鐨� DOM 瀵硅薄
+                                            , show: true //澶栭儴浜嬩欢瑙﹀彂鍗虫樉绀�
+                                            , data: menus
+                                            , click: function (menudata) {
+                                                app.updateState(data.taskId, menudata.id);
+                                            }
+                                            , align: 'right' //鍙冲榻愬脊鍑猴紙v2.6.8 鏂板锛�
+                                            , style: 'box-shadow: 1px 1px 10px rgb(0 0 0 / 12%);' //璁剧疆棰濆鏍峰紡
+                                        })
+                                        break;
+                                }
                             });
                     });
                 }

--
Gitblit v1.8.0