!31 fixed issues #IGXHS

Merge pull request !31 from 虎子_007/master

guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice_add.html

@@ -34,6 +34,6 @@
 
 
     </div>
     </div>
 </div>
 </div>
-<script type="text/javascript" src="${ctxPath}/static/js/plugins/wangEditor/wangEditor.js"></script>
+<script type="text/javascript" src="//unpkg.com/wangeditor/release/wangEditor.min.js"></script>
 <script src="${ctxPath}/static/modular/system/notice/notice_info.js"></script>
 <script src="${ctxPath}/static/modular/system/notice/notice_info.js"></script>
 @}
 @}

guns-admin/src/main/webapp/WEB-INF/view/system/user/user_view.html

@@ -34,7 +34,7 @@
                                         <div id="driverInfoContent">
                                         <div id="driverInfoContent">
                                             <#input id="name" name="姓名" underline="true" value="${user.name}"/>
                                             <#input id="name" name="姓名" underline="true" value="${user.name}"/>
 
 
-                                            <#input id="birthday" name="出生日期" underline="true" type="date"
+                                            <#input id="birthday" name="出生日期" underline="true"
                                                     value="${user.birthday}"
                                                     value="${user.birthday}"
                                                     clickFun="laydate({istime: false, format: 'YYYY-MM-DD'})"/>
                                                     clickFun="laydate({istime: false, format: 'YYYY-MM-DD'})"/>
 
 

guns-admin/src/main/webapp/static/css/_fstyle.css

@@ -56,6 +56,10 @@
 	padding:10px
 	padding:10px
 }
 }
 
 
+.w-e-text-container{
+	height: 150px !important;
+}
+
 .editorHeight{
 .editorHeight{
 	height: 170px;
 	height: 170px;
 }
 }
\ No newline at end of file

guns-admin/src/main/webapp/static/js/contabs.js

@@ -143,12 +143,12 @@ $(function () {
             $('.J_mainContent').find('iframe.J_iframe').hide().parents('.J_mainContent').append(str1);
             $('.J_mainContent').find('iframe.J_iframe').hide().parents('.J_mainContent').append(str1);
 
 
             //显示loading提示
             //显示loading提示
-//            var loading = layer.load();
-//
-//            $('.J_mainContent iframe:visible').load(function () {
-//                //iframe加载完成后隐藏loading提示
-//                layer.close(loading);
-//            });
+           var loading = layer.load();
+
+           $('.J_mainContent iframe:visible').load(function () {
+               //iframe加载完成后隐藏loading提示
+               layer.close(loading);
+           });
             // 添加选项卡
             // 添加选项卡
             $('.J_menuTabs .page-tabs-content').append(str);
             $('.J_menuTabs .page-tabs-content').append(str);
             scrollToTab($('.J_menuTab.active'));
             scrollToTab($('.J_menuTab.active'));
@@ -282,12 +282,12 @@ $(function () {
     function refreshTab() {
     function refreshTab() {
         var target = $('.J_iframe[data-id="' + $(this).data('id') + '"]');
         var target = $('.J_iframe[data-id="' + $(this).data('id') + '"]');
         var url = target.attr('src');
         var url = target.attr('src');
-//        //显示loading提示
-//        var loading = layer.load();
-//        target.attr('src', url).load(function () {
-//            //关闭loading提示
-//            layer.close(loading);
-//        });
+       //显示loading提示
+       // var loading = layer.load();
+       // target.attr('src', url).load(function () {
+       //     //关闭loading提示
+       //     layer.close(loading);
+       // });
     }
     }
 
 
     $('.J_menuTabs').on('dblclick', '.J_menuTab', refreshTab);
     $('.J_menuTabs').on('dblclick', '.J_menuTab', refreshTab);

guns-admin/src/main/webapp/static/modular/system/dict/dict_info.js

@@ -39,6 +39,7 @@ DictInfoDlg.addItem = function () {
  */
  */
 DictInfoDlg.deleteItem = function (event) {
 DictInfoDlg.deleteItem = function (event) {
     var obj = Feng.eventParseObject(event);
     var obj = Feng.eventParseObject(event);
+    obj = obj.is('button') ? obj : obj.parent();
     obj.parent().parent().remove();
     obj.parent().parent().remove();
 };
 };
 
 

guns-admin/src/main/webapp/static/modular/system/notice/notice.js

@@ -43,7 +43,7 @@ Notice.openAddNotice = function () {
     var index = layer.open({
     var index = layer.open({
         type: 2,
         type: 2,
         title: '添加通知',
         title: '添加通知',
-        area: ['800px', '420px'], //宽高
+        area: ['800px', '500px'], //宽高
         fix: false, //不固定
         fix: false, //不固定
         maxmin: true,
         maxmin: true,
         content: Feng.ctxPath + '/notice/notice_add'
         content: Feng.ctxPath + '/notice/notice_add'

guns-admin/src/main/webapp/static/modular/system/notice/notice_info.js

@@ -123,5 +123,6 @@ $(function () {
     var editor = new E('#editor');
     var editor = new E('#editor');
     editor.create();
     editor.create();
     editor.txt.html($("#contentVal").val());
     editor.txt.html($("#contentVal").val());
+    editor.txt
     NoticeInfoDlg.editor = editor;
     NoticeInfoDlg.editor = editor;
 });
 });