updata

SHU-PV-Blue · chengsluo · Apr 5, 2017 · Apr 5, 2017 · Apr 5, 2017 · Apr 5, 2017
commit a4e68e860197ec3e389884191f45f350565f81d4
diff --git a/src/main/java/com/shupv/controller/SystemController.java b/src/main/java/com/shupv/controller/SystemController.java
@@ -65,6 +65,11 @@ public String forget(){
     @RequestMapping(value="/forget2")
     public String forget2() { return "forget2";}
 
+    @RequestMapping(value = "/newProject")
+    public String newProject(){
+        return "newProject";
+    }
+
     /**
      * 点击“立即注册”后进入到register.jsp页面
      * @return

diff --git a/src/main/webapp/WEB-INF/views/baogao.jsp b/src/main/webapp/WEB-INF/views/baogao.jsp
@@ -4,9 +4,9 @@
 <head>
 	<meta charset="UTF-8">
 	<title>报告</title>
-	<script src="http:\\cdn.bootcss.com/jquery/1.10.2/jquery.min.js"></script>
-  <script src="http:\\cdn.bootcss.com/bootstrap/3.3.1/js/bootstrap.min.js"></script>
-  <link href="http:\\cdn.bootcss.com/bootstrap/3.3.1/css/bootstrap.min.css" rel="stylesheet">
+    <script src="../statics/js/jquery.min.js"></script>
+    <script src="../statics/js/bootstrap.min.js"></script>
+    <link rel="stylesheet" type="text/css" href="../statics/css/bootstrap.min.css">
   <style type="text/css">
   .juzhong{
   text-align: center;
@@ -28,7 +28,7 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a class="navbar-brand" href="#">光伏软件</a>
+      <a class="navbar-brand" href="/home">光伏软件</a>
     </div>
 
     <!-- Collect the nav links, forms, and other content for toggling -->
@@ -40,8 +40,8 @@
         <li><a href="#" >当前项目</a></li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
-        <li><a href="#">切换用户</a></li>
-        <li><a href="#">当前用户：</a></li>
+          <li><a href="#" id="userId"></a></li>
+          <li><a href="/login/loginOut"><span class="glyphicon glyphicon-log-in"></span>&nbsp;&nbsp</a></li>
       </ul>
     </div><!-- /.navbar-collapse -->
   </div><!-- /.container-fluid -->
@@ -112,4 +112,5 @@
 </nav>
 <!--底部导航条-->
 </body>
-</html>
+</html>
+<script src="../statics/js/userInfo.js"></script>
diff --git a/src/main/webapp/WEB-INF/views/diyacesheji.jsp b/src/main/webapp/WEB-INF/views/diyacesheji.jsp
@@ -22,7 +22,7 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="#">光伏软件</a>
+            <a class="navbar-brand" href="/home">光伏软件</a>
         </div>
 
         <!-- Collect the nav links, forms, and other content for toggling -->
@@ -34,8 +34,9 @@
                 <li><a href="#">当前项目</a></li>
             </ul>
             <ul class="nav navbar-nav navbar-right">
-                <li><a href="#">切换用户</a></li>
-                <li><a href="#">当前用户：</a></li>
+                <li><a href="#" id="userId"></a></li>
+                <li><a href="/login/loginOut"><span class="glyphicon glyphicon-log-in"></span>&nbsp;&nbsp;注销</a></li>
+
             </ul>
         </div><!-- /.navbar-collapse -->
     </div><!-- /.container-fluid -->
@@ -693,6 +694,6 @@
 </div>
 </div>
 </div>
-
 </body>
-</html>
+</html>
+<script src="../statics/js/userInfo.js"></script>
diff --git a/src/main/webapp/WEB-INF/views/forget.jsp b/src/main/webapp/WEB-INF/views/forget.jsp
@@ -28,7 +28,7 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="#">光伏软件</a>
+            <a class="navbar-brand" href="/home">光伏软件</a>
         </div>
 
         <!-- Collect the nav links, forms, and other content for toggling -->

diff --git a/src/main/webapp/WEB-INF/views/forget2.jsp b/src/main/webapp/WEB-INF/views/forget2.jsp
@@ -26,7 +26,7 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="#">光伏软件</a>
+            <a class="navbar-brand" href="/home">光伏软件</a>
         </div>
 
         <!-- Collect the nav links, forms, and other content for toggling -->

diff --git a/src/main/webapp/WEB-INF/views/fwqj.jsp b/src/main/webapp/WEB-INF/views/fwqj.jsp
@@ -5,11 +5,9 @@
 <head>
 	<meta charset="UTF-8">
 	<title>方位倾角和设计</title>
-	<script src="http:\\cdn.bootcss.com/jquery/1.10.2/jquery.min.js"></script>
-  <script src="http:\\cdn.bootcss.com/bootstrap/3.3.1/js/bootstrap.min.js"></script>
-  <link href="http:\\cdn.bootcss.com/bootstrap/3.3.1/css/bootstrap.min.css" rel="stylesheet">
-  <script src="http:\\cdn.bootcss.com/echarts/3.4.0/echarts.common.js"></script>
-  <script src="http://apps.bdimg.com/libs/jquery/2.1.4/jquery.min.js"></script>
+  <script src="../statics/js/jquery.min.js"></script>
+  <script src="../statics/js/bootstrap.min.js"></script>
+  <link rel="stylesheet" type="text/css" href="../statics/css/bootstrap.min.css">
   <link rel="stylesheet" type="text/css" href="../statics/css/fang.css">
 </head>
 <body>
@@ -23,7 +21,7 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a class="navbar-brand" href="#">光伏软件</a>
+      <a class="navbar-brand" href="/home">光伏软件</a>
     </div>
 
     <!-- Collect the nav links, forms, and other content for toggling -->
@@ -113,4 +111,5 @@
 </nav>
 <!--底部导航条-->
 </body>
-</html>
+</html>
+<script src="../statics/js/userInfo.js"></script>
diff --git a/src/main/webapp/WEB-INF/views/gaoyc.jsp b/src/main/webapp/WEB-INF/views/gaoyc.jsp
@@ -4,9 +4,9 @@
 <head>
     <meta charset="UTF-8">
     <title>高压侧设计</title>
-    <script src="http:\\cdn.bootcss.com/jquery/1.10.2/jquery.min.js"></script>
-    <script src="http:\\cdn.bootcss.com/bootstrap/3.3.1/js/bootstrap.min.js"></script>
-    <link href="http:\\cdn.bootcss.com/bootstrap/3.3.1/css/bootstrap.min.css" rel="stylesheet">
+    <script src="../statics/js/jquery.min.js"></script>
+    <script src="../statics/js/bootstrap.min.js"></script>
+    <link rel="stylesheet" type="text/css" href="../statics/css/bootstrap.min.css">
     <link rel="stylesheet" type="text/css" href="../statics/css/gaoyac.css">
 </head>
 <body>
@@ -21,7 +21,7 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="#">光伏软件</a>
+            <a class="navbar-brand" href="/home">光伏软件</a>
         </div>
 
         <!-- Collect the nav links, forms, and other content for toggling -->
@@ -33,8 +33,8 @@
                 <li><a href="#">当前项目</a></li>
             </ul>
             <ul class="nav navbar-nav navbar-right">
-                <li><a href="#">切换用户</a></li>
-                <li><a href="#">当前用户：</a></li>
+                <li><a href="#" id="userId"></a></li>
+                <li><a href="/login/loginOut"><span class="glyphicon glyphicon-log-in"></span>&nbsp;&nbsp;注销</a></li>
             </ul>
         </div><!-- /.navbar-collapse -->
     </div><!-- /.container-fluid -->
@@ -347,4 +347,5 @@
 <!--底部导航条-->
 
 </body>
-</html>
+</html>
+<script src="../statics/js/userInfo.js"></script>
diff --git a/src/main/webapp/WEB-INF/views/home2.jsp b/src/main/webapp/WEB-INF/views/home2.jsp
@@ -3,9 +3,10 @@
 <html lang="en">
 <head>
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <script src="http:\\cdn.bootcss.com/jquery/1.10.2/jquery.min.js"></script>
-    <script src="http:\\cdn.bootcss.com/bootstrap/3.3.1/js/bootstrap.min.js"></script>
-    <link href="http:\\cdn.bootcss.com/bootstrap/3.3.1/css/bootstrap.min.css" rel="stylesheet">
+    <script src="../statics/js/jquery.min.js"></script>
+    <script src="../statics/js/bootstrap.min.js"></script>
+    <link rel="stylesheet" type="text/css" href="../statics/css/bootstrap.min.css">
+    <link rel="stylesheet" type="text/css" href="../statics/css/diya.css">
     <link rel="stylesheet" type="text/css" href="../statics/css/nav.css">
     <link rel="stylesheet" type="text/css" href="../statics/css/index.css">
     <meta charset="UTF-8">
@@ -23,20 +24,20 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="#">光伏软件</a>
+            <a class="navbar-brand" href="/home">光伏软件</a>
         </div>
 
         <!-- Collect the nav links, forms, and other content for toggling -->
         <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
             <ul class="nav navbar-nav" id="nav1">
                 <li class="active"><a href="/home/project">自定义设备</a></li>
                 <li><a href="#">我的项目</a></li>
-                <li><a href="#">新建项目</a></li>
+                <li><a data-toggle="modal" data-target="#project">新建项目</a></li>
                 <li><a href="#">当前项目</a></li>
             </ul>
             <ul class="nav navbar-nav navbar-right" id="nav2">
                 <li><a href="#" id="userId"></a></li>
-                <li><a href="#"><span class="glyphicon glyphicon-log-in"></span>&nbsp;&nbsp;注销</a></li>
+                <li><a href="/login/loginOut"><span class="glyphicon glyphicon-log-in"></span>&nbsp;&nbsp;注销</a></li>
 
             </ul>
         </div><!-- /.navbar-collapse -->
@@ -58,8 +59,26 @@
         <p class="juzhong">Copyright &copy; 2016 上海宝钢节能环保技术有限公司. All Rights Reserved</p>
     </nav>
     <!--底部导航条-->
-
+</div>
+<div class="modal" id="project" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span>
+                </button>
+                <h4 class="modal-title" id="myModalLabel">添加新项目</h4>
+            </div>
+            <div class="modal-body">
+              <span>项目名称:</span>
+                <input type="text"/>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal">确定</button>
+                <button type="button" class="btn btn-primary" data-dismiss="modal">取消</button>
+            </div>
+        </div>
+    </div>
+</div>
 </body>
 </html>
-
 <script src="../statics/js/userInfo.js"></script>
diff --git a/src/main/webapp/WEB-INF/views/information.jsp b/src/main/webapp/WEB-INF/views/information.jsp
@@ -4,11 +4,10 @@
 <head>
     <meta charset="UTF-8">
     <title>项目信息</title>
-    <script src="http:\\cdn.bootcss.com/jquery/1.10.2/jquery.min.js"></script>
-    <script src="http:\\cdn.bootcss.com/bootstrap/3.3.1/js/bootstrap.min.js"></script>
-    <script src=></script>
+    <script src="../statics/js/jquery.min.js"></script>
+    <script src="../statics/js/bootstrap.min.js"></script>
+    <link rel="stylesheet" type="text/css" href="../statics/css/bootstrap.min.css">
     <link rel="stylesheet" type="text/css" href="../statics/css/nav.css">
-    <link href="http:\\cdn.bootcss.com/bootstrap/3.3.1/css/bootstrap.min.css" rel="stylesheet">
     <script src="../statics/laydate/laydate.js"></script>
     <link rel="stylesheet" type="text/css" href="../statics/css/information.css">
 </head>
@@ -24,20 +23,20 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="#">光伏软件</a>
+            <a class="navbar-brand" href="/home">光伏软件</a>
         </div>
 
         <!-- Collect the nav links, forms, and other content for toggling -->
         <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
             <ul class="nav navbar-nav" id="nav1">
-                <li class="active"><a href="#">自定义设备</a></li>
+                <li><a href="#">自定义设备</a></li>
                 <li><a href="#">我的项目</a></li>
-                <li><a href="#">新建项目</a></li>
+                <li><a href="active">新建项目</a></li>
                 <li><a href="#">当前项目</a></li>
             </ul>
             <ul class="nav navbar-nav navbar-right" id="nav2">
-                <li><a href="#">注销登录</a></li>
-                <li><a href="#">当前用户：</a></li>
+                <li><a href="#" id="userId"></a></li>
+                <li><a href="/login/loginOut"><span class="glyphicon glyphicon-log-in"></span>&nbsp;&nbsp;注销</a></li>
             </ul>
         </div><!-- /.navbar-collapse -->
     </div><!-- /.container-fluid -->
@@ -78,8 +77,10 @@
     </div>
     <div class="col-md-8"><img src="../statics/images/basic.jpg"></div>
 </div>
+</div>
 <nav class="navbar navbar-default navbar-fixed-bottom" role="navigation">
     <p class="juzhong">Copyright &copy; 2016 上海宝钢节能环保技术有限公司. All Rights Reserved</p>
-    </body>
+</nav>
+</body>
 </html>
-   
+<script src="../statics/js/userInfo.js"></script>
diff --git a/src/main/webapp/WEB-INF/views/home.jsp → src/main/webapp/WEB-INF/views/newProject.jsp b/src/main/webapp/WEB-INF/views/home.jsp → src/main/webapp/WEB-INF/views/newProject.jsp
@@ -3,9 +3,9 @@
 <html lang="en">
 <head>
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <script src="http:\\cdn.bootcss.com/jquery/1.10.2/jquery.min.js"></script>
-    <script src="http:\\cdn.bootcss.com/bootstrap/3.3.1/js/bootstrap.min.js"></script>
-    <link href="http:\\cdn.bootcss.com/bootstrap/3.3.1/css/bootstrap.min.css" rel="stylesheet">
+    <script src="../statics/js/jquery.min.js"></script>
+    <script src="../statics/js/bootstrap.min.js"></script>
+    <link rel="stylesheet" type="text/css" href="../statics/css/bootstrap.min.css">
     <link rel="stylesheet" type="text/css" href="../statics/css/nav.css">
     <link rel="stylesheet" type="text/css" href="../statics/css/index.css">
     <meta charset="UTF-8">
@@ -23,20 +23,20 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="#">光伏软件</a>
+            <a class="navbar-brand" href="/home">光伏软件</a>
         </div>
 
         <!-- Collect the nav links, forms, and other content for toggling -->
         <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
             <ul class="nav navbar-nav" id="nav1">
-                <li class="active"><a href="/home/project">自定义设备</a></li>
+                <li><a href="/home/project">自定义设备</a></li>
                 <li><a href="#">我的项目</a></li>
-                <li><a href="#">新建项目</a></li>
+                <li class="active"><a href="#">新建项目</a></li>
                 <li><a href="#">当前项目</a></li>
             </ul>
             <ul class="nav navbar-nav navbar-right" id="nav2">
-                <li><a href="#">注销登录</a></li>
-                <li><a href="#">当前用户：</a></li>
+                <li><a href="#" id="userId"></a></li>
+                <li><a href="/login/loginOut"><span class="glyphicon glyphicon-log-in"></span>&nbsp;&nbsp;注销</a></li>
             </ul>
         </div><!-- /.navbar-collapse -->
     </div><!-- /.container-fluid -->
@@ -155,4 +155,5 @@
     <%--}--%>
     <%--</script>--%>
 </body>
-</html>
+</html>
+<script src="../statics/js/userInfo.js"></script>
diff --git a/src/main/webapp/WEB-INF/views/person.jsp b/src/main/webapp/WEB-INF/views/person.jsp
@@ -16,6 +16,37 @@
     <script src="../statics/js/person.js"></script>
 </head>
 <body>
+<nav class="navbar navbar-inverse" role="navigation">
+    <div class="container-fluid">
+        <!-- Brand and toggle get grouped for better mobile display -->
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse"
+                    data-target="#bs-example-navbar-collapse-1">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+            <a class="navbar-brand" href="/home">光伏软件</a>
+        </div>
+
+        <!-- Collect the nav links, forms, and other content for toggling -->
+        <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+            <ul class="nav navbar-nav" id="nav1">
+                <li class="active"><a href="/home/project">自定义设备</a></li>
+                <li><a href="#">我的项目</a></li>
+                <li><a href="#">新建项目</a></li>
+                <li><a href="#">当前项目</a></li>
+            </ul>
+            <ul class="nav navbar-nav navbar-right" id="nav2">
+                <li><a href="#" id="userId"></a></li>
+                <li><a href="/login/loginOut"><span class="glyphicon glyphicon-log-in"></span>&nbsp;&nbsp;注销</a></li>
+
+            </ul>
+        </div><!-- /.navbar-collapse -->
+    </div><!-- /.container-fluid -->
+</nav>
+</div>
 <div class="row">
     <div class="col-md-offset-4">
         <table id="mytable" cellspacing="10px">
@@ -48,3 +79,4 @@
 
 </body>
 </html>
+<script src="../statics/js/userInfo.js"></script>