Browse Source

一些bug修改

qxp 4 years ago
parent
commit
cd9c18118c

+ 18 - 13
suishenbang-admin/src/main/resources/templates/appIndex.html

@@ -53,7 +53,7 @@
                         <li><a class="menuItem" th:href="@{/system/main}">了解若依</a></li>
                     </ul>
                 </li>-->
-                <li th:each="menu : ${menus}" >
+ff                <li th:each="menu : ${menus}" id="li-menu">
                 	<a th:class="@{${menu.url != '' && menu.url != '#'} ? ${menu.target}}" th:href="@{${menu.url == ''} ? |#| : ${menu.url}}">
                 		<i class="fa fa-bar-chart-o" th:class="${menu.icon}"></i>
                     	<span class="nav-label" th:text="${menu.menuName}">一级菜单</span> 
@@ -154,9 +154,24 @@
 <script th:src="@{/ruoyi/index.js}"></script>
 <script th:src="@{/ajax/libs/fullscreen/jquery.fullscreen.js}"></script>
 <script th:inline="javascript">
+    $(function() {
+        $("#li-menu").addClass("active");
+        if($("#li-menu ul").length>0){
+            var ul = $("#li-menu ul")[0];
+            if($(ul).children("li").length>0){
+                var li = $(ul).children("li")[0]
+                if($(li).children("a").length>0){
+                    $(ul).addClass("in");
+
+                    var a = $(li).children("a")[0];
+                    a.click();
+                }
+            }
+        }
+    });
+
     var ctx = [[@{/}]];
     var skin = storage.get("skin");
-    var menuUrl=[[${menuUrl}]] ;
     // 本地主题优先,未设置取系统配置
     if($.common.isNotEmpty(skin)){
         $("body").addClass(skin.split('|')[0]);
@@ -184,17 +199,7 @@
         })
     }
 
-    $(function() {
-        if (menuUrl !== '' &&menuUrl!='#') {
-            var url = menuUrl.substring(1, menuUrl.length);
-            var arr = $('a[href$="' + url + '"]');
-            for(var i=0;i<arr.length;i++){
-                if(arr[i].dataset["index"]!="1"){
-                    arr[i].click()
-                }
-            }
-        }
-    });
+
 </script>
 </body>
 </html>

+ 37 - 3
suishenbang-admin/src/main/resources/templates/system/user/user.html

@@ -4,6 +4,16 @@
 	<th:block th:include="include :: header('用户列表')" />
 	<th:block th:include="include :: layout-latest-css" />
 	<th:block th:include="include :: ztree-css" />
+	<style>
+		.div_tdContent{
+			white-space:nowrap;
+			overflow:hidden;
+			text-overflow:ellipsis;
+		}
+		.tooltip-inner{
+			word-wrap: break-word;
+		}
+	</style>
 </head>
 <body class="gray-bg">
 	<div class="ui-layout-west">
@@ -92,7 +102,7 @@
 		        </div>
 		        
 		        <div class="col-sm-12 select-table table-striped">
-				    <table id="bootstrap-table"></table>
+				    <table id="bootstrap-table" style='table-layout:fixed;'></table>
 				</div>
 			</div>
 		</div>
@@ -129,6 +139,7 @@
 		        exportUrl: prefix + "/export",
 		        importUrl: prefix + "/importData",
 		        importTemplateUrl: prefix + "/importTemplate",
+                responseHandler: responseHandler,
 		        sortName: "createTime",
 		        sortOrder: "desc",
 		        modalName: "用户",
@@ -137,19 +148,23 @@
 		        },
 		        {
 		            field: 'userId',
-		            title: '用户ID'
+		            title: '用户ID',
+                    visible: false
 		        },
 		        {
 		            field: 'loginName',
 		            title: '登录名称',
+					width:90,
 		            sortable: true
 		        },
 		        {
 		            field: 'userName',
+                    width: 70,
 		            title: '用户名称'
 		        },
 		        {
 		            field: 'dept.deptName',
+                    width: 70,
 		            title: '部门'
 		        },
 		        {
@@ -159,11 +174,13 @@
 		        },
 		        {
 		            field: 'phonenumber',
+                    width: 100,
 		            title: '手机'
 		        },
 		        {
 		        	visible: editFlag == 'hidden' ? false : true,
 		        	title: '用户状态',
+                    width: 70,
 		        	align: 'center',
 		        	formatter: function (value, row, index) {
 		        		return statusTools(row);
@@ -171,6 +188,7 @@
 		        },
 		         {
 		             field: 'sysUserExt.salesLevel',
+                     width: 90,
 		             title: '销售人员等级',
                      formatter: function(value, row, index) {
                          return $.table.selectDictLabel(salesLevelDict, value);
@@ -178,15 +196,28 @@
 		         },
                 {
                     field: 'sysUserExt.orgName',
-                    title: '组织名称'
+                    title: '组织名称',
+					formatter: function(value, row, index) {
+                        var reg = new RegExp( '"' , "g" )
+						if(value!==null&&value!=""){
+                            value = value.replace(reg,'&quot;');
+                            var htmlStr = '<div data-original-title="'+value+'"' +
+                                'data-placement="bottom" data-toggle="tooltip" data-html="true"'+
+                                'class="div_tdContent">'+value+'</div>';
+                            return htmlStr;
+                        }
+
+                    }
                 },
                 {
                     field: 'sysUserExt.orgCode',
+                    width: 90,
                     title: '组织code'
                 },
 		        {
 		            title: '操作',
 		            align: 'center',
+					width: "180px",
 		            formatter: function(value, row, index) {
 		                var actions = [];
 		                actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editTab(\'' + row.userId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
@@ -287,6 +318,9 @@
                 $.table.refresh();
             })
         }
+        function responseHandler(){
+            $('[data-toggle="tooltip"]').tooltip();
+        }
 	</script>
 </body>
 <!-- 导入区域 -->

+ 14 - 11
suishenbang-sync/suishenbang-sync-manager/src/main/resources/templates/sync/synclog/syncfaildetail.html

@@ -99,11 +99,13 @@
                     formatter: function(value, row, index) {
 
                         var reg = new RegExp( '"' , "g" )
-                        value = value.replace(reg,'&quot;');
-                        var htmlStr = '<div data-original-title="'+value+'"' +
-                            'data-placement="bottom" data-toggle="tooltip" data-html="true"'+
-                            'class="div_tdContent">'+value+'</div>';
-                        return htmlStr;
+                        if(value!==null&&value!=""){
+                            value = value.replace(reg,'&quot;');
+                            var htmlStr = '<div data-original-title="'+value+'"' +
+                                'data-placement="bottom" data-toggle="tooltip" data-html="true"'+
+                                'class="div_tdContent">'+value+'</div>';
+                            return htmlStr;
+                        }
                     }
                 },
                 {
@@ -112,12 +114,13 @@
                     width : '15%',
                     formatter: function(value, row, index) {
                         var reg = new RegExp( '"' , "g" )
-                        value = value.replace(reg,'&quot;');
-
-                        var htmlStr = '<div data-original-title="'+value+'"' +
-                            'data-placement="bottom" data-toggle="tooltip" data-html="true"'+
-                            'class="div_tdContent">'+value+'</div>';
-                        return htmlStr;
+                        if(value!==null&&value!=""){
+                            value = value.replace(reg,'&quot;');
+                            var htmlStr = '<div data-original-title="'+value+'"' +
+                                'data-placement="bottom" data-toggle="tooltip" data-html="true"'+
+                                'class="div_tdContent">'+value+'</div>';
+                            return htmlStr;
+                        }
                     }
                 },
                 {