Merge pull request #538 from wszjx/master

重新提交代码
hzuapps · Jan 16, 2016 · af4577a · af4577a
2 parents a6cb638 + 6574336
commit af4577a
Show file tree

Hide file tree

Showing 8 changed files with 234 additions and 74 deletions.
diff --git a/works/1314080901242/images/background.jpg b/works/1314080901242/images/background.jpg
diff --git a/works/1314080901242/index.html b/works/1314080901242/index.html
@@ -1,63 +1,91 @@
 <!DOCTYPE html>
-<html lang="zh-CN" ng-app="">
+<html ng-app="BOMmessageModule"><lang="zh-CN">
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <!-- 上述3个meta标签*必须*放在最前面，任何其他内容都*必须*跟随其后！ -->
-    <title>  工程模块/BOM  查询BOM单 BOM列表</title>
+    <title>工程模块/BOM  查询BOM单 BOM列表</title>
     <link rel="shortcut icon" href="icons/favicon.ico" />
 
     <!-- Bootstrap -->
     <link href="../../lib/bootstrap-3.3.5/css/bootstrap.min.css" rel="stylesheet">
 
     <!-- Custom styles for this template -->
     <link href="css/style.css" rel="stylesheet">
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+  
+
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
     <!--[if lt IE 9]>
       <script src="//cdn.bootcss.com/html5shiv/3.7.2/html5shiv.min.js"></script>
       <script src="//cdn.bootcss.com/respond.js/1.4.2/respond.min.js"></script>
-	<script src="../../lib/angular-1.4.5/angular.min.js"></script>
-	<script src="js/orderModule.js"></script>
     <![endif]-->
+   <script src="../../lib/angular-1.4.5/angular.min.js"></script>
+   <script src="js/BOMmessageModule.js"></script>
+
+
+  <style type="text/css">
+  .header{
+  padding:0;
+  margin:0;
+  }
+  .body{
+  font-weight:bold;
+  color:white
+  }.color{
+  background-color:#e6e8eb;
+  }
+  </style>
 
   </head>
-  <body>
-    <nav class="navbar navbar-inverse navbar-fixed-top">
-      <div class="container">
+
+  <body ng-controller="MyFilterDemoCtrl" >
+    <header  class="main-header header" style="background-image: url(images/background.jpg)" >
+        <div class="container">
+            <div class="row">
+                <div class="col-sm-12">
+            <a>
+             <img src="images/background.jpg"  height="250px" width="200px" > 
+            </a>
+            <div class="container body ">
+            <h1>高级网页设计</h1>
+            <h2>——BOM信息主页</h2>
+            </div>    
+                </div>
+            </div>
+        </div>
+    </header>
+<nav class="navbar navbar-inverse navbar-fixed-top main-navigation">
+<div class="container">
         <div class="navbar-header">
           <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
             <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="#">Project name</a>
+          <a class="navbar-brand" href="#myWebsite">My Website</a>
         </div>
         <div id="navbar" class="collapse navbar-collapse">
-          <ul class="nav navbar-nav">
-            <li class="active"><a href="#">Home</a></li>
-            <li><a href="#about">About</a></li>
-            <li><a href="#contact">Contact</a></li>
+          <ul class="nav navbar-nav ">
+      <li><a href="#tableData"><span class="glyphicon glyphicon-hand-right" aria-hidden="true"></span>My Table</a></li>
+            <li><a href="#aboutMe"><span class="glyphicon glyphicon-heart-empty" aria-hidden="true"></span>About Me</a></li>
+
           </ul>
         </div><!--/.nav-collapse -->
       </div>
     </nav>
 
-    <div class="container">
-
-      <div class="starter-template">
-        <h1>Bootstrap starter template</h1>
-        <p class="lead">Use this document as a way to quickly start any new project.<br> All you get is this text and a mostly barebones HTML document.</p>
-      </div>
-
-    </div><!-- /.container -->
+    </main>
+
+    <div ng-view >
+
+    </div>
 
     <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
     <script src="//cdn.bootcss.com/jquery/1.11.3/jquery.min.js"></script>
     <!-- Include all compiled plugins (below), or include individual files as needed -->
     <script src="../../lib/bootstrap-3.3.5/js/bootstrap.min.js"></script>
+   <script src="../../lib/angular-1.4.5/angular-route.min.js"></script>
   </body>
-</html>
+</html>
diff --git a/works/1314080901242/js/BOMmessageModel.js b/works/1314080901242/js/BOMmessageModel.js
diff --git a/works/1314080901242/js/BOMmessageModule.js b/works/1314080901242/js/BOMmessageModule.js
@@ -0,0 +1,115 @@
+//初始化表单数据
+var BOMmessage = {
+        order:'0001',
+        product: '平面设计',
+        data1:'2015.9.1',
+        data2:'2015.9.31',
+        state:' ',
+        singlemember:'小张',
+        remark:' ',
+};
+//创建模块
+var BOMmessageModule = angular.module("BOMmessageModule", ['ngRoute']);
+
+      BOMmessageModule.config(['$routeProvider',
+         function($routeProvider) {
+            $routeProvider.
+               when('/myWebsite', {
+                  templateUrl: 'pages/myWebsite.html',
+                  //controller: 'myWebsiteController'
+               }).
+         when('/tableData', {
+                  templateUrl: 'pages/tableData.html',
+                  //controller: 'myWebsiteController'
+               }).
+               when('/aboutMe', {
+                  templateUrl: 'pages/aboutMe.html',
+                  //controller: 'aboutMeController'
+               }).
+               otherwise({
+                  redirectTo: '/myWebsite'
+               });
+         }]);
+
+         /*BOMmessageModule.controller('myWebsiteController', function($scope) {
+            $scope.message = "Welcome to my Website";
+         });
+
+         BOMmessageModule.controller('aboutMeController', function($scope) {
+            $scope.message = "machaorong 1314080901225";
+         });*/
+//创建服务
+BOMmessageModule.factory("ManifestService",function($http){
+      var getBOMmessage={};
+
+    //getData方法
+      getBOMmessage.getData=function(buttondata){
+            var promise=$http({
+              url:"jsonData/buttonData.json",
+              method:"GET",
+        data:buttondata
+            });
+            return promise;
+      }
+
+      return getBOMmessage;
+
+});
+
+//定义控制器
+
+angular.module('BOMmessageModule').controller('MyFilterDemoCtrl', function($scope,ManifestService) {
+          var promise=ManifestService.getData();
+
+      $scope.create = function () {
+      $scope.showSuccessMessage=false;
+      $scope.showErrorMessage=false;
+      //promise的成功方法
+      promise.success(function(data,status){
+
+
+      $scope.successMessage =data[0].SMessage;
+      alert($scope.successMessage);
+          //$scope.showSuccessMessage=true;
+      });
+
+      //promise的失败方法
+      promise.error(function(data,status){
+
+
+      $scope.errorsMessage =data[0].EMessage;
+      alert($scope.errorsMessage);
+
+      });
+      }
+
+
+
+      $scope.SelectItem = [
+       {
+          order:'0001',
+          product: '平面设计',
+          singlemember:'小张',
+       },
+       {
+        order:'0002',
+        product: '装潢设计',
+        singlemember:'小李',
+       },
+       {
+        order:'0003',
+        product: '室内外装饰设计',
+        singlemember:'小陈',
+       }
+      ];
+});
+
+
+
+//定义过滤器
+BOMmessageModule.filter('stripDashes', function() {
+  return function(txt) {
+    // filter code would go here
+  };
+});
+
diff --git a/works/1314080901242/jsonData/buttonData.json b/works/1314080901242/jsonData/buttonData.json
@@ -0,0 +1,6 @@
+[
+    {
+        "SMessage": "数据新建成功!",
+        "EMessage": "数据新建失败，请再试一次！"
+    }
+]
diff --git a/works/1314080901242/pages/aboutMe.html b/works/1314080901242/pages/aboutMe.html
@@ -0,0 +1,6 @@
+<div class="container color" >
+   <div class="starter-template">
+      <h1><strong>个人信息页面</strong></h1>
+        <p class="lead">姓名：张坚鑫.<br>学号：1314080901242.<br>班级：13计算机科学与技术（师范）2班.</p>
+    </div>
+</div>
diff --git a/works/1314080901242/pages/myWebsite.html b/works/1314080901242/pages/myWebsite.html
@@ -0,0 +1,5 @@
+<div class="container color">
+   <div class="starter-template">
+        <h1>欢迎来到我的网页</h1>
+    </div>
+</div>
diff --git a/works/1314080901242/pages/tableData.html b/works/1314080901242/pages/tableData.html
@@ -0,0 +1,51 @@
+<div class="color">
+<div class="container">
+
+      <div class="starter-template">
+        <h1>BOM订单表</h1>
+      </div>
+</div><!-- /.container -->
+<form class="form-horizontal" role="form" ng-submit="create()">
+    <fieldset>
+
+        <div class="form-group">
+            <label for="order"  class="col-md-1 control-label">订单：</label>
+            <div class="col-md-2">
+                <select id="order" class="form-control" ng-model="seleted" ng-options="a.order for a in SelectItem">
+                </select>
+            </div>
+            <label for="product"  class="col-md-1 control-label">产品：</label>
+            <div class="col-md-2">
+                <select id="product" class="form-control" ng-model="seleted" ng-options="a.product for a in SelectItem">
+                </select>
+            </div>
+            <label for="data1"  class="col-md-1 control-label">起始日期：</label>
+            <div class="col-md-2">
+                <input id="data1"  type="date"/>
+            </div> 
+            <label for="data2"  class="col-md-1 control-label">终止日期：</label>
+            <div class="col-md-2">
+                <input id="data2"  type="date"/>
+            </div>
+        </div>
+        <div class="form-group">
+            <label for="state"  class="col-md-1 control-label">状态：</label>
+            <div class="col-md-2">
+                 <input class="form-control " id="state" type="text" placeholder="只可读不可编辑" disabled/>
+            </div>
+            <label for="singlemember"  class="col-md-1 control-label">拆单员：</label>
+            <div class="col-md-2">
+                <select id="singlemember" class="form-control" ng-model="seleted" ng-options="a.singlemember for a in SelectItem">
+                </select>
+            </div>
+            <label for="remark"  class="col-md-1 control-label">备注：</label>
+            <div class="col-md-2">
+                <input class="form-control disabled" id="remark" type="text" /> 
+            </div>
+        </div>
+        <div class="btn-group col-lg-push-1" >
+            <button type="submit" class="btn btn-default btn-sm" >提交</button>
+        </div>
+    </fieldset>
+</form>
+ </div>