Главная Обзор Помощь
Регистрация Вход
lichunlei
/
kxs-admin
1
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

调整完成，待测试

DuGuYang 3 лет назад
Родитель
4079b4e36a
Сommit
e48ca8e6e5
4 измененных файлов с 117 добавлено и 77 удалено
Разделённый вид Показать статистику Diff
  1. 40 1
      Areas/Admin/Controllers/MainServer/MsgAlertController.cs
  2. 1 1
      Areas/Admin/Views/MainServer/MsgAlert/Add.cshtml
  3. 74 65
      Areas/Admin/Views/MainServer/MsgAlert/Edit.cshtml
  4. 2 10
      wwwroot/layuiadmin/modules_main/MsgAlert_Admin.js

+ 40 - 1
Areas/Admin/Controllers/MainServer/MsgAlertController.cs
Просмотреть файл 

@@ -212,6 +212,17 @@ namespace MySystem.Areas.Admin.Controllers
 
 

             MsgAlert editData = db.MsgAlert.FirstOrDefault(m => m.Id == Id) ?? new MsgAlert();

             ViewBag.data = editData;

+            var userSwapWhite = db.UserSwapWhite.Where(m => m.QueryCount == Id).ToList();

+            var makerInfo = "";

+            foreach (var item in userSwapWhite)

+            {

+                var user = db.Users.FirstOrDefault(m => m.Id == item.UserId) ?? new Users();

+                if (user.Id > 0)

+                {

+                    makerInfo += user.MakerCode + ",";

+                }

+            }

+            ViewBag.makerInfo = makerInfo.TrimEnd(',');

             return View();

         }

 

@@ -224,7 +235,7 @@ namespace MySystem.Areas.Admin.Controllers
 
         /// </summary>

         /// <returns></returns>

         [HttpPost]

-        public string Edit(MsgAlert data)

+        public string Edit(MsgAlert data, string MakerCodes)

         {

             Dictionary<string, object> Fields = new Dictionary<string, object>();

 

@@ -250,6 +261,34 @@ namespace MySystem.Areas.Admin.Controllers
 
             Fields.Add("SeoTitle", data.SeoTitle);

             Fields.Add("SeoDescription", data.SeoDescription);

             new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("MsgAlert", Fields, data.Id);

+            var duserSwapWhite = db.UserSwapWhite.Where(m => m.QueryCount == data.Id).ToList();

+            foreach (var item in duserSwapWhite)

+            {

+                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Delete("UserSwapWhite", item.Id);

+            }

+            if (!string.IsNullOrEmpty(MakerCodes))

+            {

+                string[] MakerCodeList = MakerCodes.Replace("\r", "").Replace("\n", ",").Split(',');

+                foreach (var item in MakerCodeList)

+                {

+                    var userForMakerCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == item) ?? new UserForMakerCode();

+                    var userSwapWhite = db.UserSwapWhite.FirstOrDefault(m => m.QueryCount == data.Id && m.UserId == userForMakerCode.UserId) ?? new UserSwapWhite();

+                    if (userForMakerCode.UserId > 0 && userSwapWhite.Id == 0)

+                    {

+                        var userSwapWhiteAdd = db.UserSwapWhite.Add(new UserSwapWhite()

+                        {

+                            QueryCount = data.Id,//弹窗Id

+                            CreateDate = DateTime.Now,

+                            CreateMan = SysUserName + "_" + SysRealName,

+                            UserId = userForMakerCode.UserId,

+                        }).Entity;

+                    }

+                    else

+                    {

+                        return "创客" + item + "不存在或者已经添加了相关信息";

+                    }

+                }

+            }

             AddSysLog(data.Id.ToString(), "MsgAlert", "update");

             db.SaveChanges();

+ 1 - 1
Areas/Admin/Views/MainServer/MsgAlert/Add.cshtml
Просмотреть файл 

@@ -174,7 +174,7 @@
 
                                 </div>

                             </div>

                             <div class="layui-form-item" id="MakerCode" style="display: none;">

-                                <label class="layui-form-label">创客编号</label>

+                                <label class="layui-form-label">指定推送创客编号</label>

                                 <div class="layui-input-block">

                                     <textarea class="layui-textarea" lay-verify="" name="MakerCodes" id="MakerCodes" placeholder="请输入创客编号,多个创客编号用回车隔开"></textarea>

                                 </div>

+ 74 - 65
Areas/Admin/Views/MainServer/MsgAlert/Edit.cshtml
Просмотреть файл 

@@ -5,7 +5,7 @@
 
 @{

     string RightInfo = ViewBag.RightInfo as string;

     string right = ViewBag.right as string;

-

+    string makerInfo = ViewBag.makerInfo as string;

 }

 <!DOCTYPE html>

 <html>

@@ -56,12 +56,12 @@
 
                                 </div>

                             </div>

                             @* <div class="layui-form-item layui-form-text">

-                                <label class="layui-form-label">简介</label>

-                                <div class="layui-input-block">

-                                <textarea class="layui-textarea" id="Summary" name="Summary" maxlength="500"

-                                lay-verify="" placeholder="请输入简介">@editData.Summary</textarea>

-                                </div>

-                                </div> *@

+                            <label class="layui-form-label">简介</label>

+                            <div class="layui-input-block">

+                            <textarea class="layui-textarea" id="Summary" name="Summary" maxlength="500"

+                            lay-verify="" placeholder="请输入简介">@editData.Summary</textarea>

+                            </div>

+                            </div> *@

                             <div class="layui-form-item layui-form-text">

                                 <label class="layui-form-label">内容</label>

                                 <div class="layui-input-block">

@@ -97,60 +97,60 @@
 
                                         @if (!string.IsNullOrEmpty(editData.BgPic))

                                         {

                                             <img src="@(MySystem.OssHelper.Instance.SourceHost)@editData.BgPic"

-                                            class="layui-upload-img" style="max-width:85px; max-height:85px;"

-                                            onclick="showBigPic('@(MySystem.OssHelper.Instance.SourceHost)@editData.BgPic')">

+                                                class="layui-upload-img" style="max-width:85px; max-height:85px;"

+                                                onclick="showBigPic('@(MySystem.OssHelper.Instance.SourceHost)@editData.BgPic')">

                                         }

                                     </div>

                                 </div>

                             </div>

                             @* <div class="layui-form-item">

-                                <label class="layui-form-label">推送类型</label>

-                                <div class="layui-input-inline">

-                                <select id="PushType" name="PushType" lay-search="">

-                                <option value="">请选择</option>

-                                <option value="0">不推送</option>

-                                <option value="1">立即推送</option>

-                                <option value="2">定时推送</option>

-                                </select>

-                                <script>$("#PushType").val("@editData.PushType");</script>

-                                </div>

-                                </div>

-                                <div class="layui-form-item">

-                                <label class="layui-form-label">推送标记</label>

-                                <div class="layui-input-inline">

-                                <select id="PushFlag" name="PushFlag" lay-search="">

-                                <option value="">请选择</option>

-                                <option value="0">不推送</option>

-                                <option value="1">未推送</option>

-                                <option value="2">已推送</option>

-                                </select>

-                                <script>$("#PushFlag").val("@editData.PushFlag");</script>

-                                </div>

-                                </div>

-                                <div class="layui-form-item">

-                                <label class="layui-form-label">推送参数</label>

-                                <div class="layui-input-inline">

-                                <input class="layui-input" type="text" id="PushParam" name="PushParam"

-                                value="@editData.PushParam" maxlength="255" lay-verify="" autocomplete="off"

-                                placeholder="请输入推送参数">

-                                </div>

-                                </div>

-                                <div class="layui-form-item">

-                                <label class="layui-form-label">推送时间</label>

-                                <div class="layui-input-inline">

-                                <input class="layui-input" type="text" id="PushTime" name="PushTime"

-                                value="@(editData.PushTime == null ? "" : editData.PushTime.Value.ToString("yyyy-MM-dd

-                                HH:mm:ss"))"

-                                lay-verify="" autocomplete="off" placeholder="请输入推送时间">

-                                </div>

-                                </div>

-                                <div class="layui-form-item layui-form-text">

-                                <label class="layui-form-label">扩展字段</label>

-                                <div class="layui-input-block">

-                                <textarea class="layui-textarea" id="ExtendColumn" name="ExtendColumn" maxlength=""

-                                lay-verify="" placeholder="请输入扩展字段">@editData.ExtendColumn</textarea>

-                                </div>

-                                </div> *@

+                            <label class="layui-form-label">推送类型</label>

+                            <div class="layui-input-inline">

+                            <select id="PushType" name="PushType" lay-search="">

+                            <option value="">请选择</option>

+                            <option value="0">不推送</option>

+                            <option value="1">立即推送</option>

+                            <option value="2">定时推送</option>

+                            </select>

+                            <script>$("#PushType").val("@editData.PushType");</script>

+                            </div>

+                            </div>

+                            <div class="layui-form-item">

+                            <label class="layui-form-label">推送标记</label>

+                            <div class="layui-input-inline">

+                            <select id="PushFlag" name="PushFlag" lay-search="">

+                            <option value="">请选择</option>

+                            <option value="0">不推送</option>

+                            <option value="1">未推送</option>

+                            <option value="2">已推送</option>

+                            </select>

+                            <script>$("#PushFlag").val("@editData.PushFlag");</script>

+                            </div>

+                            </div>

+                            <div class="layui-form-item">

+                            <label class="layui-form-label">推送参数</label>

+                            <div class="layui-input-inline">

+                            <input class="layui-input" type="text" id="PushParam" name="PushParam"

+                            value="@editData.PushParam" maxlength="255" lay-verify="" autocomplete="off"

+                            placeholder="请输入推送参数">

+                            </div>

+                            </div>

+                            <div class="layui-form-item">

+                            <label class="layui-form-label">推送时间</label>

+                            <div class="layui-input-inline">

+                            <input class="layui-input" type="text" id="PushTime" name="PushTime"

+                            value="@(editData.PushTime == null ? "" : editData.PushTime.Value.ToString("yyyy-MM-dd

+                            HH:mm:ss"))"

+                            lay-verify="" autocomplete="off" placeholder="请输入推送时间">

+                            </div>

+                            </div>

+                            <div class="layui-form-item layui-form-text">

+                            <label class="layui-form-label">扩展字段</label>

+                            <div class="layui-input-block">

+                            <textarea class="layui-textarea" id="ExtendColumn" name="ExtendColumn" maxlength=""

+                            lay-verify="" placeholder="请输入扩展字段">@editData.ExtendColumn</textarea>

+                            </div>

+                            </div> *@

                             <div class="layui-form-item">

                                 <label class="layui-form-label">跳转Url参数</label>

                                 <div class="layui-input-inline">

@@ -186,22 +186,23 @@
 
                                 <label class="layui-form-label">是否周末</label>

                                 <div class="layui-input-inline">

                                     <input type="checkbox" id="IsWeekend" name="IsWeekend" value="1"

-                                        @(editData.IsWeekend == 1 ? "checked=checked" : "") lay-skin="switch"

+                                    @(editData.IsWeekend == 1 ? "checked=checked" : "") lay-skin="switch"

                                         lay-filter="switchTest" title="开关">

                                 </div>

                             </div>

-                            <div class="layui-form-item" id="MakerCode" style="display: none;">

-                                <label class="layui-form-label">指定推送</label>

+                            <div class="layui-form-item">

+                                <label class=" layui-form-label">指定推送</label>

                                 <div class="layui-input-inline">

                                     <input type="checkbox" id="AlertFlag" name="AlertFlag" value="1"

-                                        @(editData.AlertFlag == 1 ? "checked=checked" : "") lay-skin="switch"

+                            @(editData.AlertFlag == 1 ? "checked=checked" : "") lay-skin="switch"

                                         lay-filter="AlertFlag" title="开关">

                                 </div>

                             </div>

-                            <div class="layui-form-item">

-                                <label class="layui-form-label">创客编号</label>

+                            <div class="layui-form-item" id="MakerCode" style="display: none;">

+                                <label class="layui-form-label">指定推送创客编号</label>

                                 <div class="layui-input-block">

-                                    <textarea class="layui-textarea" lay-verify="" name="MakerCodes" id="MakerCodes" placeholder="请输入创客编号,多个创客编号用回车隔开"></textarea>

+                                    <textarea class="layui-textarea" lay-verify="" name="MakerCodes"

+                                        id="MakerCodes" placeholder="请输入创客编号,多个创客编号用回车隔开">@makerInfo</textarea>

                                 </div>

                             </div>

 

@@ -223,13 +224,13 @@
 
     <script src="/other/mybjq/lang/zh_CN.js"></script>

     <script>

         //内容

-        @(Html.Raw(Library.Control.kindeditorVar("Content")))

+                                    @(Html.Raw(Library.Control.kindeditorVar("Content")))

 

 

             //编辑器

             KindEditor.ready(function (K) {

                 //内容

-        @(Html.Raw(Library.Control.kindeditor("Content", 1)))

+                                    @(Html.Raw(Library.Control.kindeditor("Content", 1)))

 

         });

 

@@ -403,6 +404,14 @@
 
                 }

                 form.render();

             });

+            var AlertFlag = '@editData.AlertFlag';

+            if (AlertFlag == '1') {

+                $('#MakerCode').show();

+            }

+            else

+            {

+                $('#MakerCode').hide();

+            }

 

             //日期

             laydate.render({

+ 2 - 10
wwwroot/layuiadmin/modules_main/MsgAlert_Admin.js
Просмотреть файл 

@@ -168,11 +168,6 @@ layui.config({
 
 

                     //内容

                     iframeWindow.Contentedit.sync();

-

-

-

-

-

                     //监听提交

                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {

                         var field = data.field; //获取提交的字段

@@ -191,6 +186,7 @@ layui.config({
 
                             success: function (data) {

                                 layer.close(index); //关闭弹层

                                 if (data == "success") {

+                                    layer.msg("编辑成功");

                                     table.reload('LAY-list-manage'); //数据刷新

                                 } else {

                                     layer.msg(data);

@@ -287,11 +283,6 @@ layui.config({
 
 

                     //内容

                     iframeWindow.Contentedit.sync();

-

-

-

-

-

                     //监听提交

                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {

                         var field = data.field; //获取提交的字段

@@ -310,6 +301,7 @@ layui.config({
 
                             success: function (data) {

                                 layer.close(index); //关闭弹层

                                 if (data == "success") {

+                                    layer.msg("添加成功");

                                     table.reload('LAY-list-manage'); //数据刷新

                                 } else {

                                     layer.msg(data);