From 3de17d6ad76010e6764f369767e854aaa13972aa Mon Sep 17 00:00:00 2001
From: libo <libo_at@163.com>
Date: Fri, 3 Mar 2023 10:55:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=97=BB=E5=85=AC=E5=91=8A=EF=BC=8C?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A=20=20=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E4=BD=8D=E5=A4=A7=E5=B0=8F=E6=94=B9=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LR_OAModule/Views/Notice/FormFlow.cshtml  | 30 ++++++++++++++-----
 .../LR_OAModule/Views/Notice/ViewIndex.js     |  4 +--
 .../Views/Utility/ListContentIndex.cshtml     |  4 +--
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.cshtml
index e9a3da405..ae7131810 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.cshtml	
@@ -29,32 +29,46 @@
     <div class="col-xs-6 lr-form-item" data-table="OANews">
         <div class="lr-form-item-title">来源地址</div>
         <input id="F_SourceAddress" type="text" class="form-control" />
-    </div> 
+    </div>
     <div class="col-xs-6 lr-form-item" data-table="OANews">
         <div class="lr-form-item-title">接收部门</div>
         <div id="F_SendDeptId"></div>
-    </div> 
+    </div>
     <div class="col-xs-6 lr-form-item" data-table="OANews">
         <div class="lr-form-item-title">接收岗位</div>
         <div id="F_SendPostId"></div>
-    </div> 
+    </div>
     <div class="col-xs-12 lr-form-item" data-table="OANews">
         <div class="lr-form-item-title">下发飞星</div>
         <div id="F_IsSendFX"></div>
-    </div> 
+    </div>
     <div class="col-xs-12 lr-form-item" data-table="OANews">
         <div class="lr-form-item-title">标题图片</div>
         <div id="F_NewsImage"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="OANews">
         <div class="lr-form-item-title">公告内容</div>
-        <div id="editor" style="height:300px;"></div>
+        <div id="editor" style="height:300px;overflow:auto;"></div>
         @*<script id="editor" type="text/plain" style="height:270px;">
-        </script>*@
+            </script>*@
     </div>
 </div>
+<style>
+    #editor {
+        height: 400px;
+        overflow: auto;
+        position: relative
+    }
 
+    #edui1 {
+        padding-top: 80px
+    }
+    #edui1_toolbarbox {
+        position: absolute !important;
+        top: 0
+    }
+</style>
 @*<script src="~/Content/ueditor/ueditor.config.js"></script>
-<script src="~/Content/ueditor/ueditor.all.js"></script>
-<script src="~/Content/ueditor/lang/zh-cn/zh-cn.js"></script>*@
+    <script src="~/Content/ueditor/ueditor.all.js"></script>
+    <script src="~/Content/ueditor/lang/zh-cn/zh-cn.js"></script>*@
 @Html.AppendJsFile("/Areas/LR_OAModule/Views/Notice/FormFlow.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/ViewIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/ViewIndex.js
index 6e3214bb5..c6a9a3761 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/ViewIndex.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/ViewIndex.js	
@@ -32,8 +32,8 @@ var bootstrap = function ($, learun) {
                         id: 'formview',
                         title: '查看公告',
                         url: top.$.rootUrl + '/Utility/ListContentIndex?id=' + keyValue,
-                        width: 1000,
-                        height: 650,
+                        width: 1100,
+                        height: 850,
                         maxmin: true,
                         btn: null
                     });
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ListContentIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ListContentIndex.cshtml
index 8d31bb3b1..463e26c4e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ListContentIndex.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ListContentIndex.cshtml	
@@ -13,7 +13,7 @@
     }
 </style>
 <!--  / warpper  -->
-<div class="warpper" style="margin-top: 50px; width: 60%;margin:0 auto">
+<div class="warpper" style="margin-top: 50px; width: 100%;margin:0 auto">
     <!--  / list_sec1  -->
     <div class="list_sec list_sec1">
         <div class="index_box">
@@ -26,7 +26,7 @@
             @*<div class="listDotBox" id="F_NewsContent">
                
             </div>*@
-            <iframe id="newscontentframe"scrolling="auto" frameborder="0" width="100%" height="400px"></iframe>
+            <iframe id="newscontentframe"scrolling="auto" frameborder="0" width="100%" height="600px"></iframe>
             <div id="F_NewsImage"></div>
         </div>
     </div>