TroubleAndRiskConnectHall.git

			@@ -16,7 +16,7 @@
			<link th:href="@{/css/skins.css}" rel="stylesheet"/>
			<link th:href="@{/ruoyi/css/ry-ui.css?v=4.2.0}" rel="stylesheet"/>
			</head>
			<body class="fixed-sidebar full-height-layout gray-bg" style="overflow: hidden;font-size: 15px">
			<body class="fixed-sidebar full-height-layout gray-bg theme-light" style="overflow: hidden;font-size: 15px">
			<div id="wrapper">

			<!--左侧导航开始-->
			@@ -28,24 +28,27 @@
			<li class="logo hidden-xs">
			<span class="logo-lg" style="font-size: 14px !important;">智能安全双重预防系统</span>
			</li>
			<li class="icon hidden-xs hide">
			<span class="logo-lg" style="font-size: 14px !important;">智能预警</span>
			</li>
			</a>
			<div class="sidebar-collapse" style="">
			<ul class="nav" id="side-menu">
			<li>
			<div class="user-panel">
			<a class="menuItem" title="个人中心" th:href="@{/system/user/profile}">
			<div class="hide" th:text="个人中心"></div>
			<div class="pull-left image">
			<img th:src="(${user.avatar} == '') ? @{/img/profile.png} : @{${user.avatar}}" class="img-circle" alt="User Image">
			</div>
			</a>
			<div class="pull-left info">
			<p>[[${user.loginName}]]</p>
			<a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
			<a th:href="@{logout}" style="padding-left:5px;"><i class="fa fa-sign-out text-danger"></i> 注销</a>
			</div>
			</div>
			</li>
			<!-- <li>-->
			<!-- <div class="user-panel">-->
			<!-- <a class="menuItem" title="个人中心" th:href="@{/system/user/profile}"> -->
			<!-- <div class="hide" th:text="个人中心"></div>-->
			<!-- <div class="pull-left image">-->
			<!-- <img th:src="(${user.avatar} == '') ? @{/img/profile.png} : @{${user.avatar}}" class="img-circle" alt="User Image">-->
			<!-- </div>-->
			<!-- </a>-->
			<!-- <div class="pull-left info">-->
			<!-- <p>[[${user.loginName}]]</p>-->
			<!-- <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>-->
			<!-- <a th:href="@{logout}" style="padding-left:5px;"><i class="fa fa-sign-out text-danger"></i> 注销</a>-->
			<!-- </div>-->
			<!-- </div>-->
			<!-- </li>-->
			<li>
			<a href="#"><i class="fa fa-home"></i> <span class="nav-label">主页</span> <span class="fa arrow"></span></a>
			<ul class="nav nav-second-level">
			@@ -87,7 +90,7 @@
			<div class="row border-bottom">
			<nav class="navbar navbar-static-top" role="navigation" style="margin-bottom: 0">
			<div class="navbar-header">
			<a class="navbar-minimalize minimalize-styl-2" style="color:#FFF;" href="#" title="收起菜单">
			<a class="navbar-minimalize minimalize-styl-2" style="color:#FFF;height: 70px" href="#" title="收起菜单">
			<i class="fa fa-bars"></i>
			</a>
			</div>
			@@ -102,7 +105,7 @@
			<li><a title="全屏显示" href="javascript:void(0)" id="fullScreen"><i class="fa fa-arrows-alt"></i> 全屏显示</a></li>
			<li class="dropdown user-menu">
			<a href="javascript:void(0)" class="dropdown-toggle" data-hover="dropdown">
			<img th:src="(${user.avatar} == '') ? @{/img/profile.png} : @{${user.avatar}}" class="user-image">
			<!-- <img th:src="(${user.avatar} == '') ? @{/img/profile.png} : @{${user.avatar}}" class="user-image">-->
			<span class="hidden-xs">[[${#strings.defaultString(user.userName, '-')}]]</span>
			</a>
			<ul class="dropdown-menu">
			@@ -114,10 +117,10 @@
			<a onclick="resetPwd()">
			<i class="fa fa-key"></i> 修改密码</a>
			</li>
			<li>
			<a onclick="switchSkin()">
			<i class="fa fa-dashboard"></i> 切换主题</a>
			</li>
			<!-- <li>-->
			<!-- <a onclick="switchSkin()">-->
			<!-- <i class="fa fa-dashboard"></i> 切换主题</a>-->
			<!-- </li>-->
			<li class="divider"></li>
			<li>
			<a th:href="@{logout}">
			@@ -129,17 +132,17 @@
			</nav>
			</div>
			<div class="row content-tabs">
			<button class="roll-nav roll-left tabLeft">
			<i class="fa fa-backward"></i>
			</button>
			<!-- <button class="roll-nav roll-left tabLeft">-->
			<!-- <i class="fa fa-backward"></i>-->
			<!-- </button>-->
			<nav class="page-tabs menuTabs">
			<div class="page-tabs-content">
			<a href="javascript:;" class="active menuTab" data-id="/system/main">首页</a>
			</div>
			</nav>
			<button class="roll-nav roll-right tabRight">
			<i class="fa fa-forward"></i>
			</button>
			<!-- <button class="roll-nav roll-right tabRight">-->
			<!-- <i class="fa fa-forward"></i>-->
			<!-- </button>-->
			<a href="javascript:void(0);" class="roll-nav roll-right tabReload"><i class="fa fa-refresh"></i> 刷新</a>
			</div>