diff --git a/works/1314080901217/aboutMe.html b/works/1314080901217/aboutMe.html
new file mode 100644
index 0000000..384681f
--- /dev/null
+++ b/works/1314080901217/aboutMe.html
@@ -0,0 +1 @@
+13计师2班 <br>姓名：贾硕 <br>学号：1314080901217
\ No newline at end of file
diff --git a/works/1314080901217/error.html b/works/1314080901217/error.html
new file mode 100644
index 0000000..c8234c7
--- /dev/null
+++ b/works/1314080901217/error.html
@@ -0,0 +1 @@
+404页面
\ No newline at end of file
diff --git a/works/1314080901217/home.html b/works/1314080901217/home.html
new file mode 100644
index 0000000..81948dd
--- /dev/null
+++ b/works/1314080901217/home.html
@@ -0,0 +1,29 @@
+  
+        <div style="margin-bottom:7px;">
+          <div style="width:80px;display:inline-block;text-align:right;">
+          开始日期：
+         </div>
+         <div style="display:inline-block;">
+           <starttime></starttime>
+         </div>
+       
+          结束日期：<endtime></endtime>
+          操作员：<opera></opera>
+        </div>
+        <div style="margin-bottom:7px;">
+           <div style="width:80px;display:inline-block;text-align:right;">
+            备注：
+           </div>
+           <notes></notes>
+        </div>
+        <div>
+           <div style="display:inline-block;margin-left:83px;">
+             <input type="button" value="新建" style="width:100px;height:40px;">
+           </div>
+           <div style="display:inline-block;margin-left:100px;">
+             <input type="button" value="保存" ng-click="baocun();" style="width:100px;height:40px;">
+           </div>
+           <div style="display:inline-block;margin-left:100px;">
+             <input type="button" value="完成" style="width:100px;height:40px;">
+           </div>
+        </div>    
diff --git a/works/1314080901217/index.html b/works/1314080901217/index.html
index dc5201e..d4c77bc 100644
--- a/works/1314080901217/index.html
+++ b/works/1314080901217/index.html
@@ -1,8 +1,7 @@
-﻿<<<<<<< HEAD
+﻿
 ﻿<!DOCTYPE html>
-<html ng-app="cangkuxinjianModule>
+<html ng-app="cangkuxinjianModule">
   <head lang="en">
-=======
 <!DOCTYPE html>
 <html lang="zh-CN">
   <head>
@@ -15,14 +14,8 @@
         };
         $scope.data = someData;
 } </script>
->>>>>>> parent of 17098ed... 实验四
-    <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>仓库-盘点-新建盘点清单 1314080901217</title>
-    <script src="../../lib/angular-1.4.5/angular.min.js"></script>
-  <script src="cangkuxinjianModule.js"></script>
+
+ 
     <link rel="shortcut icon" href="icons/favicon.ico" />
     
     <!-- Bootstrap -->
@@ -37,10 +30,14 @@
       <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>
     <![endif]-->
-	<script src="../lib/angular-1.4.5/angular.min.js"></script>
-    <script src="js/cangkuxinjianmodule.js"></script>
+  
+	
+     <script src="../../lib/angular-1.4.5/angular.min.js"></script>
+     <script src="../../lib/angular-1.4.5/angular-route.min.js"></script>
+
+  <script src="js/cangkuxinjianModule.js"></script>
   </head>
-  <body>
+  <body >
     <nav class="navbar navbar-inverse navbar-fixed-top">
       <div class="container">
         <div class="navbar-header">
@@ -54,8 +51,8 @@
         </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 class="active"><a href="#home">Home</a></li>
+            <li><a href="#aboutMe">About</a></li>
             <li><a href="#contact">Contact</a></li>
           </ul>
         </div><!--/.nav-collapse -->
@@ -69,6 +66,9 @@ <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 id="myForm" class="myForm" style="margin-left:100px;">
+      <div ng-view ></div>
+      </div>
     </div><!-- /.container -->
 
     <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
diff --git a/works/1314080901217/js/cangkuxinjianModule.js b/works/1314080901217/js/cangkuxinjianModule.js
index 0c5f508..a7ef0af 100644
--- a/works/1314080901217/js/cangkuxinjianModule.js
+++ b/works/1314080901217/js/cangkuxinjianModule.js
@@ -1,20 +1,86 @@
 ﻿// create a new module called 'myAppModule' and save 
 // a reference to it in a variable called myAppModule 
-var myAppModule = angular.module('cangkuxinjianModule', []);
 
+var myAppModule = angular.module('cangkuxinjianModule', ["ngRoute"]);
+function myRoute($routeProvider)
+{
+    $routeProvider.
+     when("/",{
+        templateUrl:"home.html",
+        controller:"MyFilterDemoCtrl"
+    })
+    .when("/home",{
+        templateUrl:"home.html",
+        controller:"MyFilterDemoCtrl"
+    })
+    .when("/aboutMe",{
+        templateUrl:"aboutMe.html"
+    })
+    .otherwise({
+        templateUrl:"error.html"
+    })
+}
+myAppModule.config(myRoute);
 // use the myAppModule variable to
 // configure the module with a controller
-myAppModule.controller('MyFilterDemoCtrl', function ($scope) {
+myAppModule.controller('MyFilterDemoCtrl', function ($scope,$http) {
        // controller code would go here
         var someData = {
             Name: '仓库-盘点-新建盘点清单',
             interface: '表单',
             dateJoined: new Date(2015, 10, 20)
         };
+        $scope.baocun=function(){
+           var promise=$http({
+            url:"jsonData/mydata.json",
+            method:"get"
+        });
+        promise.success(function(data,status){
+            alert(data["status"]);
+        });
+        }
+        
         $scope.data = someData;
 
     }
 );
+//开始日期
+myAppModule.directive("starttime",function(){
+    return{
+        restrict:"AEC",
+        template:"<input id='startTime' type='text'>",
+        transclude:true
+
+    }
+});
+//结束日期
+myAppModule.directive("endtime",function(){
+    return{
+        restrict:"AEC",
+        template:"<input type='text'>",
+        transclude:true
+
+    }
+});
+//操作员
+myAppModule.directive("opera",function(){
+    return{
+        restrict:"AEC",
+        template:"<input type='text'>",
+        transclude:true
+
+    }
+});
+//备注
+myAppModule.directive("notes",function(){
+    return{
+        restrict:"AEC",
+        template:"<input type='text' style='width:500px;''>",
+        transclude:true
+
+    }
+});
+
 // use the myAppModule variable to
 // configure the module with a filter
 myAppModule.filter('stripDashes', function() {
diff --git a/works/1314080901217/jsonData/mydata.json b/works/1314080901217/jsonData/mydata.json
new file mode 100644
index 0000000..d40ffb0
--- /dev/null
+++ b/works/1314080901217/jsonData/mydata.json
@@ -0,0 +1,3 @@
+{
+    "status": "保存成功"
+}
\ No newline at end of file
