优化index.html样式

2025-09-26 20:11:14 +08:00 · 2024-07-14 14:25:18 +08:00
parent 9ad2c3109d
commit c2f4b130a3
5 changed files with 1558 additions and 454 deletions
--- a/docs/sql/ruoyi-go.sql
+++ b/docs/sql/ruoyi-go.sql
--- a/main/internal/demo/demo_router.go
+++ b/main/internal/demo/demo_router.go
@@ -2,7 +2,9 @@ package demo

 import (
 	"fmt"
+	"github.com/gin-gonic/gin"
 	"github.com/lv_framework/web/router"
+	"lostvip.com/utils/lv_web"
 	"main/internal/common/middleware/auth"
 	controller2 "main/internal/demo/controller"
 )
@@ -91,4 +93,12 @@ func init() {
 	g6.GET("/remember", "", demo.Remember)
 	g6.GET("/recorder", "", demo.Recorder)
 	g6.GET("/lv_sql", "", demo.Search)
+
+	//20240714
+	g6.GET("/customView", "", func(c *gin.Context) {
+		lv_web.BuildTpl(c, "demo/table/customView").WriteTpl()
+	})
+	g6.GET("/subdata", "", func(c *gin.Context) {
+		lv_web.BuildTpl(c, "demo/table/subdata").WriteTpl()
+	})
 }
--- a/main/main.go
+++ b/main/main.go
@@ -9,7 +9,7 @@ import (
 	"github.com/spf13/cast"
 	_ "main/internal"
 	"main/internal/common/myconf"
-	my "main/internal/mywork/model"
+	"main/internal/system/model"
 	"main/internal/system/model/monitor/online"
 	"os"
 	"os/signal"
@@ -30,7 +30,7 @@ func main() {
 		gin.SetMode("debug")
 	}
 	//自动建表
-	err := db.GetMasterGorm().AutoMigrate(my.DpcTask{}, online.UserOnline{})
+	err := db.GetMasterGorm().AutoMigrate(model.SysUser{}, model.SysMenu{}, model.SysRole{}, online.UserOnline{})
 	lv_err.HasErrAndPanic(err)
 	httpSvr = server.New("0.0.0.0:" + cast.ToString(cfg.GetServerPort()))
 	go httpSvr.Start()
--- a/main/static/resource/css/skins.css
+++ b/main/static/resource/css/skins.css
@@ -60,7 +60,7 @@
 		background-color: rgba(255, 255, 255, 0.1)
 	}
 	.skin-blue .navbar .dropdown-menu li a {
-		color: #fff
+		color: #3c3c3c;
 	}
 	.skin-blue .navbar .dropdown-menu li a:hover {
 		background: #367fa9
--- a/main/template/index.html
+++ b/main/template/index.html
@@ -1,4 +1,4 @@
-{{define "index"}}
+<!DOCTYPE html>
 <html lang="zh">
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -14,11 +14,11 @@
 	<link href="{{OssUrl}}/resource/css/animate.min.css" rel="stylesheet"/>
 	<link href="{{OssUrl}}/resource/css/style.min.css" rel="stylesheet"/>
 	<link href="{{OssUrl}}/resource/css/skins.css" rel="stylesheet"/>
-	<link href="{{OssUrl}}/resource/ruoyi/css/ry-ui.css?v=4.6.1" rel="stylesheet"/>
+	<link href="{{OssUrl}}/resource/ruoyi/css/ry-ui.css?v=v=4.7.9" rel="stylesheet"/>
+	<style type="text/css">.fixed-sidebar .nav:not(.navbar-toolbar)>li.active{border-left:0px!important;}</style>
 </head>
 <body class="fixed-sidebar full-height-layout gray-bg " style="overflow: hidden">
 <div id="wrapper">
-
 	<!--左侧导航开始-->
 	<nav class="navbar-default navbar-static-side" role="navigation">
 		<div class="nav-close">
@@ -29,7 +29,7 @@
 				<span class="logo-lg"> ruoyi-go </span>
 			</li>
 		</a>
-		<div class="slimScrollDiv" style="position: relative; width: auto; height: 96%;"><div class="sidebar-collapse tab-content" id="side-menu" style="width: auto; height: 96%;">
+		<div class="sidebar-collapse tab-content" id="side-menu">
 			<div class="user-panel">
 				<a class="menuItem noactive" title="个人中心" href="{{Ctx}}/system/user/profile">
 					<div class="hide">个人中心</div>
@@ -40,8 +40,7 @@
 				<div class="pull-left info">
 					<p>{{.loginname}}</p>
 					<a href="javascript:void(0)"><i class="fa fa-circle text-success"></i> 在线</a>
-					<a href="{{Ctx}}/logout" style="padding-left:5px;"><i class="fa fa-sign-out text-danger"></i>
-						注销</a>
+					<a href="{{Ctx}}/logout" style="padding-left:5px;"><i class="fa fa-sign-out text-danger"></i>注销</a>
 				</div>
 			</div>

@@ -52,38 +51,37 @@
 				<ul class="nav">
 					{{range $index00, $cmenu := $menu.Children}}

+					{{if le (len $cmenu.Children) 0}}
 					<li>
-						{{if le (len $cmenu.Children) 0}}
+						<a class="menu-content menuItem" href="{{getCtxPath $cmenu.Url}}" data-refresh="false">
+							<i class="{{$cmenu.Icon}}"></i> <span class="nav-label">{{$cmenu.MenuName}}</span>
+						</a>
+					</li>
+					{{else}}
+					<li>
+					<a href="javascript:void(0)"><i class="{{$cmenu.Icon}}"></i> <span class="nav-label">{{$cmenu.MenuName}}</span><span class="fa arrow"></span></a>
+					<ul class="nav nav-second-level collapse">
+						{{range $index, $emenu := $cmenu.Children}}
 						<li>
-							<a class="menu-content menuItem" href="{{getCtxPath $cmenu.Url}}" data-refresh="false">
-								<i class="{{$cmenu.Icon}}"></i> <span class="nav-label">{{$cmenu.MenuName}}</span>
+							{{if le (len $emenu.Children) 0}}
+						<li>
+							<a class="menu-content menuItem" href="{{getCtxPath $emenu.Url}}" data-refresh="false">
+								<i class="{{$emenu.Icon}}"></i> <span>{{$emenu.MenuName}}</span>
 							</a>
 						</li>
 						{{else}}
-						<a href="javascript:void(0)"><i class="{{$cmenu.Icon}}"></i>{{$cmenu.MenuName}}<span class="fa arrow"></span></a>
-						<ul class="nav nav-third-level">
-							{{range $index, $emenu := $cmenu.Children}}
+						<a href="javascript:void(0)"> <i class="fa fa-table"></i><span class="nav-label">{{$emenu.MenuName}}</span><span class="fa arrow"></span></a>
+						<ul class="nav nav-second-level collapse">
+							{{range $index, $fmenu := $emenu.Children}}
 							<li>
-								{{if le (len $emenu.Children) 0}}
-								<li>
-									<a class="menu-content menuItem" href="{{getCtxPath $emenu.Url}}" data-refresh="false">
-										<i class="{{$emenu.Icon}}"></i> <span class="nav-label">{{$emenu.MenuName}}</span>
-									</a>
-								</li>
-								{{else}}
-								<a href="javascript:void(0)">{{$emenu.MenuName}}<span class="fa arrow"></span></a>
-								<ul class="nav nav-four-level">
-									{{range $index, $fmenu := $emenu.Children}}
-									<li>
-										<a class="{{$fmenu.Target}}" href="{{getCtxPath $fmenu.Url}}">{{$fmenu.MenuName}}</a>
-									</li>
-									{{end}}
-								</ul>
-								{{end}}
+								<a class="{{$fmenu.Target}}" href="{{getCtxPath $fmenu.Url}}">{{$fmenu.MenuName}}</a>
 							</li>
 							{{end}}
 						</ul>
 						{{end}}
+						{{end}}
+					</ul>
+					{{end}}
 					</li>

 					{{end}}
@@ -92,7 +90,6 @@

 			{{end}}

-
 			<!-- 左侧菜单-首页菜单 -->
 			<div class="tab-pane fade height-full" id="index">
 				<ul class="nav">
@@ -103,7 +100,6 @@
 				</ul>
 			</div>
 		</div>
-		</div>
 	</nav>
 	<!--左侧导航结束-->

@@ -118,7 +114,7 @@
 				</div>
 				<!-- 顶部栏 hidden-xs -->
 				<div id="navMenu">
-					<ul class="nav navbar-toolbar nav-tabs navbar-left">
+					<ul class="nav navbar-toolbar nav-tabs navbar-left hidden-xs">
 						<!-- 顶部菜单列表 -->
 						{{range $index, $menu := .menus}}
 						{{if eq $menu.ParentId 0}}
@@ -157,10 +153,10 @@
 								<a onclick="switchSkin()">
 									<i class="fa fa-dashboard"></i> 切换主题</a>
 							</li>
-<!--							<li>-->
-<!--								<a onclick="toggleMenu()">-->
-<!--									<i class="fa fa-toggle-off"></i> 左侧菜单</a>-->
-<!--							</li>-->
+							<!--							<li>-->
+							<!--								<a onclick="toggleMenu()">-->
+							<!--									<i class="fa fa-toggle-off"></i> 左侧菜单</a>-->
+							<!--							</li>-->
 							<li class="divider"></li>
 							<li>
 								<a href="{{Ctx}}/logout">
@@ -228,7 +224,7 @@
 	let historyPath = storage.get("historyPath");
 	// 是否页签与菜单联动
 	let isLinkage = true;
-   console.log("=====>skin:",skin)
+	console.log("=====>skin:",skin)
 	// 本地主题优先，未设置取系统配置
 	if($.common.isNotEmpty(skin)){
 		$("body").addClass(skin.split('|')[0]);
@@ -334,4 +330,3 @@

 </body>
 </html>
-{{end}}