From 39fb47a4fbb6501a0fea40194cc3a89775a455e7 Mon Sep 17 00:00:00 2001
From: weizhiqiang <598748873@qq.com>
Date: Sat, 22 Jan 2022 14:18:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=BF=AE=E6=94=B9=EF=BC=8Cap?=
 =?UTF-8?q?i=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/{apipage/apipage.js => apiPage/apiPage.js}      |  6 +++---
 .../tpl/{apipage/apipage.html => apiPage/apiPage.html} |  2 +-
 .../assets/lib/winui/css/customer/skyeye-api.css       |  4 ++--
 .../main/resources/template/js/traditionpage/index.js  | 10 +++++-----
 4 files changed, 11 insertions(+), 11 deletions(-)
 rename api/src/main/resources/template/js/{apipage/apipage.js => apiPage/apiPage.js} (98%)
 rename api/src/main/resources/template/tpl/{apipage/apipage.html => apiPage/apiPage.html} (99%)

diff --git a/api/src/main/resources/template/js/apipage/apipage.js b/api/src/main/resources/template/js/apiPage/apiPage.js
similarity index 98%
rename from api/src/main/resources/template/js/apipage/apipage.js
rename to api/src/main/resources/template/js/apiPage/apiPage.js
index afab037f4..52679f086 100644
--- a/api/src/main/resources/template/js/apipage/apipage.js
+++ b/api/src/main/resources/template/js/apiPage/apiPage.js
@@ -42,12 +42,12 @@ layui.config({
 						+ '<font id="exitBtn">退出</font>';
 						$("#operatorBtn").html(str);
 					}else{
-						location.href = "../../tpl/index/login.html?url=" + escape("../../tpl/apipage/apipage.html");
+						location.href = "../../tpl/index/login.html?url=" + escape("../../tpl/apiPage/apiPage.html");
 					}
 					loadListMation();
 				}});
 			}else{
-				location.href = "../../tpl/index/login.html?url=" + escape("../../tpl/apipage/apipage.html");
+				location.href = "../../tpl/index/login.html?url=" + escape("../../tpl/apiPage/apiPage.html");
 			}
 		}
 		
@@ -217,7 +217,7 @@ layui.config({
 				layer.close(index);
 	        	AjaxPostUtil.request({url:reqBasePath + "login003", params:{}, type:'json', callback:function(json){
 	        		$.cookie('userToken', "", {path: '/' });
-	        		location.href = "../../tpl/index/login.html?url=" + escape("../../tpl/apipage/apipage.html");
+	        		location.href = "../../tpl/index/login.html?url=" + escape("../../tpl/apiPage/apiPage.html");
 	 	   		}});
 	        });
 		});
diff --git a/api/src/main/resources/template/tpl/apipage/apipage.html b/api/src/main/resources/template/tpl/apiPage/apiPage.html
similarity index 99%
rename from api/src/main/resources/template/tpl/apipage/apipage.html
rename to api/src/main/resources/template/tpl/apiPage/apiPage.html
index 4b19052e8..8229828b7 100644
--- a/api/src/main/resources/template/tpl/apipage/apipage.html
+++ b/api/src/main/resources/template/tpl/apiPage/apiPage.html
@@ -269,7 +269,7 @@
 	<script src="../../assets/lib/layui/layui.js"></script>
 	<script src="../../assets/lib/layui/custom.js"></script>
 	<script type="text/javascript">
-		layui.config({base : '../../js/apipage/'}).use('apipage');
+		layui.config({base : '../../js/apiPage/'}).use('apiPage');
 	</script>
 </body>
 </html>
\ No newline at end of file
diff --git a/web/src/main/resources/template/assets/lib/winui/css/customer/skyeye-api.css b/web/src/main/resources/template/assets/lib/winui/css/customer/skyeye-api.css
index 5785322ae..116a3579a 100644
--- a/web/src/main/resources/template/assets/lib/winui/css/customer/skyeye-api.css
+++ b/web/src/main/resources/template/assets/lib/winui/css/customer/skyeye-api.css
@@ -9,7 +9,7 @@
     background-color: white;
 }
 .apiListForm .api-left{
-    width: 220px;
+    width: 250px;
     float: left;
     height: 100%;
     border-right: 1px solid grey;
@@ -142,7 +142,7 @@
     overflow: hidden;
 }
 .apiListForm .api-right{
-    width: calc(100% - 241px);
+    width: calc(100% - 271px);
     float: left;
     height: 100%;
     padding: 0px 10px;
diff --git a/web/src/main/resources/template/js/traditionpage/index.js b/web/src/main/resources/template/js/traditionpage/index.js
index 438884651..98feb7151 100644
--- a/web/src/main/resources/template/js/traditionpage/index.js
+++ b/web/src/main/resources/template/js/traditionpage/index.js
@@ -83,14 +83,14 @@ layui.config({
 				initDeskTopMenuBox();
 				
 				// 加载菜单
-				AjaxPostUtil.request({url:reqBasePath + "login004", params:{}, type:'json', method: "GET", callback:function(json){
+				AjaxPostUtil.request({url:reqBasePath + "login005", params:{}, type:'json', method: "GET", callback:function(json){
 		   			if(json.returnCode == 0){
 		   				var menuStr;
 		   				$.each(json.rows, function(i, row){
 		   					menuStr = "";
-		   					if(row.menuIconType === '1'){//icon
+		   					if(row.menuIconType === 1){//icon
 		   						row.icon = '<i class="fa ' + row.icon + ' fa-fw"></i>';
-		   					}else if(row.menuIconType === '2'){//图片
+		   					}else if(row.menuIconType === 2){//图片
 		   						row.icon = '<img src="' + fileBasePath + row.menuIconPic + '" />';
 		   					}
 	   						if(languageType == 'cn'){
@@ -109,9 +109,9 @@ layui.config({
 		   						//二级菜单
 		   						if(!isNull(row.childs)){
 			   						$.each(row.childs, function(j, child){
-			   							if(child.menuIconType === '1'){//icon
+			   							if(child.menuIconType === 1){//icon
 			   								child.icon = '<i class="fa ' + child.icon + ' fa-fw"></i>';
-					   					}else if(child.menuIconType === '2'){//图片
+					   					}else if(child.menuIconType === 2){//图片
 					   						child.icon = '<img src="' + fileBasePath + child.menuIconPic + '" />';
 					   					}
 					   					if(languageType == 'cn'){
-- 
GitLab