增加用户时长统计

admin-allUser.html

@@ -38,6 +38,7 @@
             <li><a href="admin-newsUser.html">最新用户</a></li>
             <li><a href="admin-onlineUser.html">在线用户</a></li>
             <li><a href="admin-allUser.html">所有用户</a></li>
+            <li><a href="admin-countTime.html">时长统计</a></li>
           </ul>
         </div>
       </div>
@@ -45,7 +46,7 @@
         <h2 class="subMenuTitle"><a><i class="iconImg icon-">C</i><div class="subMenuText">数据分析<span class="fR caret caret-triangle"></span></div></a></h2>
         <div class="subMenuContent">
           <ul>
-            <li><a href="admin-users.html">用户登录分析</a></li>
+            <li><a href="admin-users.html">用户注册分析</a></li>
             <li><a href="admin-produce.html">产品分析</a></li>
             <li><a href="admin-count.html">客户分布</a></li>
             <li><a href="admin-channel.html">获取渠道</a></li>
@@ -73,9 +74,9 @@
     <div class="page-header pageTop">
       <h3>所有用户
         <div class="input-group fR" style="width:400px;">
-          <input type="text" class="form-control" placeholder="请输入您的称呼/邮箱/手机">
+          <input type="text" class="form-control" placeholder="请输入注册手机/注册邮箱/真实姓名/QQ">
           <div class="input-group-btn">
-            <button class="btn btn-primary" type="button"><span class="glyphicon glyphicon-search"></span></button>
+            <a class="btn btn-primary" type="button" href="admin-userSearch.html"><span class="glyphicon glyphicon-search"></span></a>
           </div>
         </div>
       </h3>
@@ -84,34 +85,10 @@
       <div class="btnGroup">
         <form class="form-inline">
           <div class="form-group">
-            <div class="dropdown">
-              <button class="btn btn-default btn-sm dropdown-toggle dropdown-toggleSF" type="button" id="dropdownMenu1">
-                广东省<!-- 省份 --> &nbsp;&nbsp;
+            <button class="btn btn-default btn-sm" type="button" data-toggle="modal" data-target="#proModal">
+                省份筛选 &nbsp;&nbsp;
                 <span class="caret"></span>
-              </button>
-              <ul class="dropdown-menu dropdown-list">
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox1" value="option1" checked> 广东省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 广西省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 江西省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 安徽省
-                  </label>
-                </li>
-              </ul>
-            </div>
+            </button>
           </div>
           <div class="form-group">
             <select class="form-control input-sm">
@@ -155,6 +132,8 @@
       <table class="table table-hover">
         <thead>
           <tr>
+            <th>注册手机</th>
+            <th>注册邮箱</th>
             <th>称呼</th>
             <th>真实姓名</th>
             <th>省份/城市</th>
@@ -165,7 +144,9 @@
           </tr>
         </thead>
         <tr>
-          <td><a href="#" data-toggle="modal" data-target="#myModal">qdlvpeng</a></td>
+          <td>13984782276</td>
+          <td>617423885@qq.com</td>
+          <td>qdlvpeng</td>
           <td>吕鹏</td>
           <td>广东省，珠海市</td>
           <td>无</td>
@@ -174,7 +155,9 @@
           <td><a href="#" data-toggle="modal" data-target="#myModalPro">造价全国</a>，<a href="#" data-toggle="modal" data-target="#myModalPro">造价广东</a>，<a href="#" data-toggle="modal" data-target="#myModalPro">清单编制</a>，<a href="#" data-toggle="modal" data-target="#myModalPro">算量全国</a></td>
         </tr>
         <tr>
-          <td><a href="#" data-toggle="modal" data-target="#myModal">dcm</a></td>
+          <td>未添加</td>
+          <td>1962295725@qq.com</td>
+          <td>dcm</td>
           <td>邓翠梅</td>
           <td>广东省，珠海市</td>
           <td>13984782276</td>
@@ -183,40 +166,48 @@
           <td><a href="#" data-toggle="modal" data-target="#myModalPro">造价全国</a>，<a href="#" data-toggle="modal" data-target="#myModalPro">造价广东</a></td>
         </tr>
         <tr>
-          <td><a href="#" data-toggle="modal" data-target="#myModal">qdlvpeng</a></td>
+          <td>13984782276</td>
+          <td>617423885@qq.com</td>
+          <td>qdlvpeng</td>
           <td>吕鹏</td>
           <td>广东省，珠海市</td>
           <td>无</td>
           <td>617423885</td>
           <td>山东高速</td>
-          <td><a href="#" data-toggle="modal" data-target="#myModalPro">造价全国</a>，<a href="#" data-toggle="modal" data-target="#myModalPro">造价广东</a></td>
+          <td><a href="#" data-toggle="modal" data-target="#myModalPro">造价全国</a>，<a href="#" data-toggle="modal" data-target="#myModalPro">造价广东</a>，<a href="#" data-toggle="modal" data-target="#myModalPro">清单编制</a>，<a href="#" data-toggle="modal" data-target="#myModalPro">算量全国</a></td>
         </tr>
         <tr>
-          <td><a href="#" data-toggle="modal" data-target="#myModal">dcm</a></td>
+          <td>13984782276</td>
+          <td>未添加</td>
+          <td>dcm</td>
           <td>邓翠梅</td>
           <td>广东省，珠海市</td>
           <td>13984782276</td>
           <td>1962295725</td>
           <td>务川铝矿分公司</td>
-          <td><a href="#" data-toggle="modal" data-target="#myModalPro">造价全国</a>，<a href="#" data-toggle="modal" data-target="#myModalPro">造价广东</a>，<a href="#" data-toggle="modal" data-target="#myModalPro">清单编制</a></td>
+          <td><a href="#" data-toggle="modal" data-target="#myModalPro">造价全国</a>，<a href="#" data-toggle="modal" data-target="#myModalPro">造价广东</a></td>
         </tr>
         <tr>
-          <td><a href="#" data-toggle="modal" data-target="#myModal">qdlvpeng</a></td>
+          <td>13984782276</td>
+          <td>617423885@qq.com</td>
+          <td>qdlvpeng</td>
           <td>吕鹏</td>
           <td>广东省，珠海市</td>
           <td>无</td>
           <td>617423885</td>
           <td>山东高速</td>
-          <td><a href="#" data-toggle="modal" data-target="#myModalPro">造价全国</a>，<a href="#" data-toggle="modal" data-target="#myModalPro">造价广东</a></td>
+          <td><a href="#" data-toggle="modal" data-target="#myModalPro">造价全国</a>，<a href="#" data-toggle="modal" data-target="#myModalPro">造价广东</a>，<a href="#" data-toggle="modal" data-target="#myModalPro">清单编制</a>，<a href="#" data-toggle="modal" data-target="#myModalPro">算量全国</a></td>
         </tr>
         <tr>
-          <td><a href="#" data-toggle="modal" data-target="#myModal">dcm</td>
+          <td>13984782276</td>
+          <td>1962295725@qq.com</td>
+          <td>dcm</td>
           <td>邓翠梅</td>
           <td>广东省，珠海市</td>
           <td>13984782276</td>
           <td>1962295725</td>
           <td>务川铝矿分公司</td>
-          <td><a href="#" data-toggle="modal" data-target="#myModalPro">造价全国</a>，<a href="#" data-toggle="modal" data-target="#myModalPro">造价广东</a>，<a href="#" data-toggle="modal" data-target="#myModalPro">清单编制</a>，<a href="#" data-toggle="modal" data-target="#myModalPro">算量全国</a></td>
+          <td><a href="#" data-toggle="modal" data-target="#myModalPro">造价全国</a>，<a href="#" data-toggle="modal" data-target="#myModalPro">造价广东</a></td>
         </tr>
       </table>
     </div>
@@ -243,9 +234,216 @@
   <!-- mainWrapper end -->    
 </div>
 
+<!-- 省份 -->
+<div class="modal fade" id="proModal" 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">
+        <div class="tableContent">
+          <ul class="dropdown-list">
+            <p>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> <b>-全国-</b>
+              </label>
+            </p>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 北京市
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 天津市
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 河北省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 山西省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 内蒙古自治区
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 辽宁省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 吉林省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 黑龙江省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 上海市
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 江苏省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 浙江省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 安徽省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 福建省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox3" value="option3" checked> 江西省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 山东省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 河南省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 湖北省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 湖南省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" checked> 广东省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 广西壮族自治区
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 海南省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 重庆市
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 四川省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 贵州省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 云南省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 西藏自治区
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 陕西省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 甘肃省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 青海省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 宁夏回族自治区
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 新疆维吾尔自治区
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 台湾省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 香港特别行政区
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 澳门特别行政区
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 海外
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 其他
+              </label>
+            </li>
+          </ul>
+          <p class="bg-warning" style="margin:20px 0 10px;padding:10px;">注意：省份一次最多只能勾选3个！</p>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+        <button type="button" class="btn btn-primary">确认</button>
+      </div>
+    </div>
+  </div>
+</div>
 
 <!-- Modal -->
-<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+<!-- <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
   <div class="modal-dialog" role="document">
     <div class="modal-content">
       <div class="modal-header">
@@ -280,13 +478,13 @@
           </dl>
         </div>
       </div>
-      <!-- <div class="modal-footer">
+      <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
         <button type="button" class="btn btn-primary">确认</button>
-      </div> -->
+      </div>
     </div>
   </div>
-</div>
+</div> -->
 
 <div class="modal fade" id="myModalPro" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
   <div class="modal-dialog" role="document">
@@ -306,28 +504,16 @@
             </select>
           </div>
           <dl class="dl-horizontal">
-            <dt><span class="glyphicon glyphicon-star text-warning"></span> 9.0.8.219：</dt>
-            <dd>2天16小时10分</dd>
+            <dt><span class="glyphicon glyphicon-star text-warning"></span> 当前使用的版本：</dt>
+            <dd>9.0.8.219</dd>
           </dl>
           <dl class="dl-horizontal">
-            <dt>9.0.8.318：</dt>
+            <dt>总在线时长：</dt>
             <dd>18小时46分</dd>
           </dl>
           <dl class="dl-horizontal">
-            <dt>9.0.8.192：</dt>
-            <dd>0</dd>
-          </dl>
-          <dl class="dl-horizontal">
-            <dt>9.0.8.185：</dt>
-            <dd>2小时</dd>
-          </dl>
-          <dl class="dl-horizontal">
-            <dt>9.0.8.177：</dt>
-            <dd>0</dd>
-          </dl>
-          <dl class="dl-horizontal">
-            <dt>9.0.8.176：</dt>
-            <dd>0</dd>
+            <dt>最近登录时间：</dt>
+            <dd>2016-12-06</dd>
           </dl>
         </div>
       </div>

admin-channel.html

@@ -15,6 +15,7 @@
   <script src=js/echarts.js></script>
   <script type=js/macarons.js></script>
   <script src=js/dateRange.js></script>
+  <script src=js/jquery.tablesorter.js></script>
 </head>
 
 <body>
@@ -41,6 +42,7 @@
             <li><a href="admin-newsUser.html">最新用户</a></li>
             <li><a href="admin-onlineUser.html">在线用户</a></li>
             <li><a href="admin-allUser.html">所有用户</a></li>
+            <li><a href="admin-countTime.html">时长统计</a></li>
           </ul>
         </div>
       </div>
@@ -48,7 +50,7 @@
         <h2 class="subMenuTitle"><a class="active"><i class="iconImg icon-">C</i><div class="subMenuText">数据分析<span class="fR caret caret-triangle"></span></div></a></h2>
         <div class="subMenuContent">
           <ul>
-            <li><a href="admin-users.html">用户登录分析</a></li>
+            <li><a href="admin-users.html">用户注册分析</a></li>
             <li><a href="admin-produce.html">产品分析</a></li>
             <li><a href="admin-count.html">客户分布</a></li>
             <li><a href="admin-channel.html">获取渠道</a></li>
@@ -76,6 +78,41 @@
     <div class="page-header pageTop">
       <h3>获取渠道 
         <small class="btnTime">
+          <select class="form-control input-sm" style="width:auto; display:inline-block; margin-right:15px;">
+            <option>全部</option>
+            <option>重庆</option>
+            <option>湖南</option>
+            <option>广东</option>
+            <option>山东</option>
+            <option>四川</option>
+            <option>江西</option>
+            <option>甘肃</option>
+            <option>广西</option>
+            <option>安徽</option>
+            <option>河南</option>
+            <option>内蒙古</option>
+            <option>云南</option>
+            <option>浙江</option>
+            <option>北京</option>
+            <option>贵州</option>
+            <option>江苏</option>
+            <option>湖北</option>
+            <option>福建</option>
+            <option>陕西</option>
+            <option>吉林</option>
+            <option>新疆</option>
+            <option>河北</option>
+            <option>辽宁</option>
+            <option>山西</option>
+            <option>黑龙江</option>
+            <option>天津</option>
+            <option>上海</option>
+            <option>海南</option>
+            <option>青海</option>
+            <option>西藏</option>
+            <option>宁夏</option>
+            <option>其他</option>
+          </select>
           <a href="#">7天内</a> | 
           <a href="#">30天内</a> | 
           <input type="text" name="date" id="date_demo1" value="" class="form-control gri_date input-sm" style=" width:auto; display:inline-block;"/>
@@ -108,11 +145,11 @@
         <div class="CountMain" id="channel" style="width:100%; height:350px;"></div>
       </div>
       <div class="fL tableContent" style="width:40%; height:345px; overflow-y:auto;">
-        <table class="table table-hover">
+        <table class="table table-hover table-striped tablelist">
           <thead>
             <tr>
               <th>访问来源</th>
-              <th>人数（人）</th>
+              <th class="taCble">人数（人）</th>
             </tr>
           </thead>
           <tr>
@@ -225,7 +262,8 @@ option = {
         bottom: '3%',
         containLabel: true
     },
-    toolbox: {
+     toolbox: {
+      show: false,
         feature: {
             saveAsImage: {}
         }
@@ -234,6 +272,10 @@ option = {
         name:'日期',
         type: 'category',
         boundaryGap: false,
+        splitLine: {
+            show: true,
+            interval: 'auto'
+        },
         data: ['01-01','01-02','01-03','01-04','01-05','01-06','01-07','01-08','01-09','01-10','01-11','01-12','01-13','01-14','01-15','01-16','01-17','01-18','01-19','01-20','01-21','01-22','01-23','01-24','01-25','01-26','01-27','01-28','01-29','01-30']
     },
     yAxis: {

admin-count.html

@@ -15,6 +15,7 @@
   <script src=js/echarts.js></script>
   <script type=js/macarons.js></script>
   <script src=js/dateRange.js></script>
+  <script src=js/jquery.tablesorter.js></script>
 </head>
 
 <body>
@@ -41,6 +42,7 @@
             <li><a href="admin-newsUser.html">最新用户</a></li>
             <li><a href="admin-onlineUser.html">在线用户</a></li>
             <li><a href="admin-allUser.html">所有用户</a></li>
+            <li><a href="admin-countTime.html">时长统计</a></li>
           </ul>
         </div>
       </div>
@@ -48,7 +50,7 @@
         <h2 class="subMenuTitle"><a class="active"><i class="iconImg icon-">C</i><div class="subMenuText">数据分析<span class="fR caret caret-triangle"></span></div></a></h2>
         <div class="subMenuContent">
           <ul>
-            <li><a href="admin-users.html">用户登录分析</a></li>
+            <li><a href="admin-users.html">用户注册分析</a></li>
             <li><a href="admin-produce.html">产品分析</a></li>
             <li><a href="admin-count.html">客户分布</a></li>
             <li><a href="admin-channel.html">获取渠道</a></li>
@@ -107,143 +109,146 @@
       <div class="fL chartContent" style="width:60%;">
         <div class="CountMain" id="CountMainTotal" style="height:350px;"></div>
       </div>
-      <div class="fL tableContent" style="width:40%; height:345px; overflow-y:auto;">
-        <table class="table table-hover">
-          <thead>
-            <tr>
-              <th>地区</th>
-              <th>人数（人）</th>
-            </tr>
-          </thead>
-          <tr>
-            <td><a href="admin-produce.html">重庆</a></td>
-            <td>456</td>
-          </tr>
-          <tr>
-            <td><a href="admin-produce.html">湖南</a></a></td>
-            <td>200</td>
-          </tr>
-          <tr>
-            <td><a href="admin-produce.html">广东</a></td>
-            <td>141</td>
-          </tr>
-          <tr>
-            <td><a href="admin-produce.html">山东</a></td>
-            <td>97</td>
-          </tr>
-          <tr>
-            <td><a href="admin-produce.html">四川</a></td>
-            <td>1</td>
-          </tr>
-          <tr>
-            <td><a href="admin-produce.html">江西</a></td>
-            <td>12</td>
-          </tr>
-          <tr>
-            <td><a href="admin-produce.html">甘肃</a></td>
-            <td>67</td>
-          </tr>
-          <tr>
-            <td><a href="admin-produce.html">广西</a></td>
-            <td>86</td>
-          </tr>
-          <tr>
-            <td><a href="admin-produce.html">安徽</a></td>
-            <td>456</td>
-          </tr>
-          <tr>
-            <td><a href="admin-produce.html">河南</a></td>
-            <td>200</td>
-          </tr>
-          <tr>
-            <td><a href="admin-produce.html">内蒙古</a></td>
-            <td>141</td>
-          </tr>
-          <tr>
-            <td><a href="admin-produce.html">云南</a></td>
-            <td>97</td>
-          </tr>
-          <tr>
-            <td><a href="admin-produce.html">浙江</a></td>
-            <td>1</td>
-          </tr>
-          <tr>
-            <td><a href="admin-produce.html">北京</a></td>
-            <td>12</td>
-          </tr>
-          <tr>
-            <td><a href="admin-produce.html">贵州</a></td>
-            <td>67</td>
-          </tr>
-          <tr>
-            <td><a href="admin-produce.html">江苏</a></td>
-            <td>86</td>
-          </tr>
-          <tr>
-            <td><a href="admin-produce.html">湖北</a></td>
-            <td>86</td>
-          </tr>
-          <tr>
-            <td><a href="admin-produce.html">福建</a></td>
-            <td>86</td>
-          </tr>
-          <tr>
-            <td><a href="admin-produce.html">陕西</a></td>
-            <td>86</td>
-          </tr>
-          <tr>
-            <td><a href="admin-produce.html">吉林</a></td>
-            <td>86</td>
-          </tr>
-          <tr>
-            <td><a href="admin-produce.html">新疆</a></td>
-            <td>86</td>
-          </tr>
-          <tr>
-            <td><a href="admin-produce.html">河北</a></td>
-            <td>86</td>
-          </tr>
-          <tr>
-            <td><a href="admin-produce.html">辽宁</a></td>
-            <td>86</td>
-          </tr>
-          <tr>
-            <td><a href="admin-produce.html">山西</a></td>
-            <td>86</td>
-          </tr>
-          <tr>
-            <td><a href="admin-produce.html">黑龙江</a></td>
-            <td>86</td>
-          </tr>
-          <tr>
-            <td><a href="admin-produce.html">天津</a></td>
-            <td>86</td>
-          </tr>
-          <tr>
-            <td><a href="admin-produce.html">上海</a></td>
-            <td>86</td>
-          </tr>
-          <tr>
-            <td><a href="admin-produce.html">海南</a></td>
-            <td>86</td>
-          </tr>
-          <tr>
-            <td><a href="admin-produce.html">青海</a></td>
-            <td>86</td>
-          </tr>
-          <tr>
-            <td><a href="admin-produce.html">西藏</a></td>
-            <td>86</td>
-          </tr>
-          <tr>
-            <td><a href="admin-produce.html">宁夏</a></td>
-            <td>86</td>
-          </tr>
-          <tr>
-            <td><a href="admin-produce.html">其他</a></td>
-            <td>86</td>
-          </tr>
-        </table>
+      <div class="fL tableContent" style="width:40%;">
+        <p class="tipMain">点击查看详情：</p>
+        <div style="height:345px; overflow-y:auto;">
+          <table class="table table-hover table-striped tablelist">
+            <thead>
+              <tr>
+                <th>地区</th>
+                <th class="taCble">人数（人）</th>
+              </tr>
+            </thead>
+            <tr>
+              <td><a href="admin-produce.html">重庆</a></td>
+              <td>456</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">湖南</a></a></td>
+              <td>200</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">广东</a></td>
+              <td>141</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">山东</a></td>
+              <td>97</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">四川</a></td>
+              <td>1</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">江西</a></td>
+              <td>12</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">甘肃</a></td>
+              <td>67</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">广西</a></td>
+              <td>86</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">安徽</a></td>
+              <td>456</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">河南</a></td>
+              <td>200</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">内蒙古</a></td>
+              <td>141</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">云南</a></td>
+              <td>97</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">浙江</a></td>
+              <td>1</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">北京</a></td>
+              <td>12</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">贵州</a></td>
+              <td>67</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">江苏</a></td>
+              <td>86</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">湖北</a></td>
+              <td>86</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">福建</a></td>
+              <td>86</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">陕西</a></td>
+              <td>86</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">吉林</a></td>
+              <td>86</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">新疆</a></td>
+              <td>86</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">河北</a></td>
+              <td>86</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">辽宁</a></td>
+              <td>86</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">山西</a></td>
+              <td>86</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">黑龙江</a></td>
+              <td>86</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">天津</a></td>
+              <td>86</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">上海</a></td>
+              <td>86</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">海南</a></td>
+              <td>86</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">青海</a></td>
+              <td>86</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">西藏</a></td>
+              <td>86</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">宁夏</a></td>
+              <td>86</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">其他</a></td>
+              <td>86</td>
+            </tr>
+          </table>
+        </div>
       </div>
     </div>
   </div>
@@ -278,6 +283,10 @@ option = {
     xAxis : [
         {
             type : 'category',
+            splitLine: {
+            show: true,
+            interval: 'auto'
+        },
             data : ['重庆','湖南','广东','山东','四川','江西','甘肃','广西','安徽','河南','内蒙古','云南','浙江','北京','贵州','江苏','湖北','福建','陕西','吉林','新疆','河北','辽宁','山西','黑龙江','天津','上海','海南','青海','西藏','宁夏','其他']
         }
     ],

admin-countTime.html

@@ -0,0 +1,525 @@
+<!DOCTYPE html>
+<html lang=zh-cn> 
+<head>
+  <meta charset=utf-8> 
+  <title>网络版后台管理</title> 
+  <meta name=description content=>  
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="renderer" content="webkit"> 
+  <link rel=stylesheet href=css/bootstrap.css> 
+  <link rel=stylesheet href=css/style.css>
+  <link rel=stylesheet href=css/dateRange.css>
+  <script src=js/jquery-1.9.1.min.js></script>
+  <script src=js/bootstrap.js></script>
+  <script src=js/global.js></script>
+  <script src=js/echarts.js></script>
+  <script type=js/macarons.js></script>
+  <script src=js/dateRange.js></script>
+  <script src=js/jquery.tablesorter.js></script>
+</head>
+
+<body>
+<div class="headerWrapper"></div>
+<div class="wrapper">
+  <div class="leftWrapper">
+    <div class="leftContent">
+      <div class="logo logoWl">
+        <h2>网<span class="logoInfo">络版后台</span><!-- <span class="caret"></span> --></h2>
+        <!-- <div class="logoList">
+          <ul>
+            <li><a href="#">文库</a></li>
+            <li><a href="#">问答</a></li>
+            <li><a href="#">价格信息</a></li>
+            <li><a href="#">官网</a></li>
+            <li><a href="#">通行帐号</a></li>
+          </ul>
+        </div> -->
+      </div>
+      <div class="subMenu">
+        <h2 class="subMenuTitle"><a class="active"><i class="iconImg icon-">B</i><div class="subMenuText">用户<span class="fR caret caret-triangle"></span></div></a></h2>
+        <div class="subMenuContent">
+          <ul>
+            <li><a href="admin-newsUser.html">最新用户</a></li>
+            <li><a href="admin-onlineUser.html">在线用户</a></li>
+            <li><a href="admin-allUser.html">所有用户</a></li>
+            <li><a href="admin-countUser.html">时长统计</a></li>
+          </ul>
+        </div>
+      </div>
+      <div class="subMenu">
+        <h2 class="subMenuTitle"><a><i class="iconImg icon-">C</i><div class="subMenuText">数据分析<span class="fR caret caret-triangle"></span></div></a></h2>
+        <div class="subMenuContent">
+          <ul>
+            <li><a href="admin-users.html">用户注册分析</a></li>
+            <li><a href="admin-produce.html">产品分析</a></li>
+            <li><a href="admin-count.html">客户分布</a></li>
+            <li><a href="admin-channel.html">获取渠道</a></li>
+          </ul>
+        </div>
+      </div>
+      <div class="subMenu">
+        <h2 class="subMenuTitle"><a><i class="iconImg icon-">A</i><div class="subMenuText">固化清单<span class="fR caret caret-triangle"></span></div></a></h2>
+        <div class="subMenuContent">
+          <ul>
+            <li><a href="admin-softList.html">用户列表</a></li>
+          </ul>
+        </div>
+      </div>
+    </div>
+    <div class="userMain">
+      <div class="userContent">
+          <span><img class="userImg" src="images/01.jpg"></span>
+          <div class="subMenuText userName"><a href="admin-userinfo.html">管理员</a> <a class="exit" href="#"><span class="glyphicon glyphicon-log-out"></span> 退出</a></div>
+      </div>
+    </div>
+  </div>
+  <!-- leftWrapper end -->
+  <div class="mainWrapper container-fluid">
+    <div class="page-header pageTop">
+      <h3>用户时长统计
+        <small class="btnTime">
+          <a href="#">7天内</a> | 
+          <a href="#">30天内</a> | 
+          <input type="text" name="date" id="date_demo1" value="" class="form-control gri_date input-sm" style=" width:auto; display:inline-block;"/>
+          <script type="text/javascript">
+            //var STATS_START_TIME = '1329148800';
+            var dateRange1 = new pickerDateRange('date_demo1', {
+              isTodayValid : true,
+              //isSingleDay : true,
+              startDate : '2016-03-12',
+              endDate : '2016-03-20',
+              needCompare : false,
+              defaultText : ' 至 ',
+              target : 'datePicker_demo1',
+              calendars : 3,
+              //theme : 'ta',
+              //shortOpr : true,
+              success : function(obj) {
+                $("#dCon_demo1").html('开始时间 : ' + obj.startDate + '<br/>结束时间 : ' + obj.endDate);
+              }
+            });
+          </script>
+        </small>
+        <div class="input-group fR" style="width:400px;">
+          <input type="text" class="form-control" placeholder="请输入注册手机/注册邮箱/真实姓名/QQ">
+          <div class="input-group-btn">
+            <a class="btn btn-primary" type="button" href="admin-userSearch.html"><span class="glyphicon glyphicon-search"></span></a>
+          </div>
+        </div>
+      </h3>
+    </div>
+    <div class="tableContent">
+      <table class="table table-hover">
+        <thead>
+          <tr>
+            <th>注册手机</th>
+            <th>注册邮箱</th>
+            <th>称呼</th>
+            <th>真实姓名</th>
+            <th>省份/城市</th>
+            <th>手机</th>
+            <th>QQ</th>
+            <th>单位</th>
+            <th colspan="3">时长统计</th>
+          </tr>
+        </thead>
+        <tr>
+          <td>13984782276</td>
+          <td>617423885@qq.com</td>
+          <td>qdlvpeng</td>
+          <td>吕鹏</td>
+          <td>广东省，珠海市</td>
+          <td>无</td>
+          <td>617423885</td>
+          <td>山东高速</td>
+          <td><a href="#" data-toggle="modal" data-target="#myModalPro">造价全国</a><br>9小时03分</td>
+          <td><br></td>
+          <td><br></td>
+        </tr>
+        <tr>
+          <td>未添加</td>
+          <td>1962295725@qq.com</td>
+          <td>dcm</td>
+          <td>邓翠梅</td>
+          <td>广东省，珠海市</td>
+          <td>13984782276</td>
+          <td>1962295725</td>
+          <td>务川铝矿分公司</td>
+          <td><a href="#" data-toggle="modal" data-target="#myModalPro">造价全国</a><br>9小时03分</td>
+          <td><a href="#" data-toggle="modal" data-target="#myModalPro">造价广东</a><br>6小时15分</td>
+          <td><a href="#" data-toggle="modal" data-target="#myModalPro">造价广东</a><br>6小时15分</td>
+        </tr>
+        <tr>
+          <td>13984782276</td>
+          <td>617423885@qq.com</td>
+          <td>qdlvpeng</td>
+          <td>吕鹏</td>
+          <td>广东省，珠海市</td>
+          <td>无</td>
+          <td>617423885</td>
+          <td>山东高速</td>
+          <td><a href="#" data-toggle="modal" data-target="#myModalPro">造价广东</a><br>6小时15分</td>
+          <td><br></td>
+          <td><br></td>
+        </tr>
+        <tr>
+          <td>13984782276</td>
+          <td>未添加</td>
+          <td>dcm</td>
+          <td>邓翠梅</td>
+          <td>广东省，珠海市</td>
+          <td>13984782276</td>
+          <td>1962295725</td>
+          <td>务川铝矿分公司</td>
+          <td><a href="#" data-toggle="modal" data-target="#myModalPro">造价全国</a><br>9小时03分</td>
+          <td><br></td>
+          <td><br></td>
+        </tr>
+        <tr>
+          <td>13984782276</td>
+          <td>617423885@qq.com</td>
+          <td>qdlvpeng</td>
+          <td>吕鹏</td>
+          <td>广东省，珠海市</td>
+          <td>无</td>
+          <td>617423885</td>
+          <td>山东高速</td>
+          <td><a href="#" data-toggle="modal" data-target="#myModalPro">造价全国</a><br>9小时03分</td>
+          <td><a href="#" data-toggle="modal" data-target="#myModalPro">造价广东</a><br>6小时15分</td>
+          <td><br></td>
+        </tr>
+        <tr>
+          <td>13984782276</td>
+          <td>1962295725@qq.com</td>
+          <td>dcm</td>
+          <td>邓翠梅</td>
+          <td>广东省，珠海市</td>
+          <td>13984782276</td>
+          <td>1962295725</td>
+          <td>务川铝矿分公司</td>
+          <td><a href="#" data-toggle="modal" data-target="#myModalPro">造价广东</a><br>6小时15分</td>
+          <td><br></td>
+          <td><br></td>
+        </tr>
+      </table>
+    </div>
+    <nav>
+      <ul class="pagination pagination-sm">
+        <li>
+          <a href="#" aria-label="Previous">
+            <span aria-hidden="true">«</span>
+          </a>
+        </li>
+        <li><a href="#">1</a></li>
+        <li><a href="#">2</a></li>
+        <li><a href="#">3</a></li>
+        <li><a href="#">4</a></li>
+        <li><a href="#">5</a></li>
+        <li>
+          <a href="#" aria-label="Next">
+            <span aria-hidden="true">»</span>
+          </a>
+        </li>
+      </ul>
+    </nav>
+  </div>
+  <!-- mainWrapper end -->    
+</div>
+
+<!-- 省份 -->
+<div class="modal fade" id="proModal" 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">
+        <div class="tableContent">
+          <ul class="dropdown-list">
+            <p>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> <b>-全国-</b>
+              </label>
+            </p>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 北京市
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 天津市
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 河北省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 山西省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 内蒙古自治区
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 辽宁省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 吉林省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 黑龙江省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 上海市
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 江苏省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 浙江省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 安徽省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 福建省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox3" value="option3" checked> 江西省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 山东省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 河南省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 湖北省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 湖南省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" checked> 广东省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 广西壮族自治区
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 海南省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 重庆市
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 四川省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 贵州省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 云南省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 西藏自治区
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 陕西省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 甘肃省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 青海省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 宁夏回族自治区
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 新疆维吾尔自治区
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 台湾省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 香港特别行政区
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 澳门特别行政区
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 海外
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 其他
+              </label>
+            </li>
+          </ul>
+          <p class="bg-warning" style="margin:20px 0 10px;padding:10px;">注意：省份一次最多只能勾选3个！</p>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+        <button type="button" class="btn btn-primary">确认</button>
+      </div>
+    </div>
+  </div>
+</div>
+
+<!-- Modal -->
+<!-- <div class="modal fade" id="myModal" 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">
+        <div class="tableContent">
+          <dl class="dl-horizontal">
+            <dt>造价全国：</dt>
+            <dd>2天16小时10分</dd>
+          </dl>
+          <dl class="dl-horizontal">
+            <dt>造价广东：</dt>
+            <dd>18小时46分</dd>
+          </dl>
+          <dl class="dl-horizontal">
+            <dt>标后预算：</dt>
+            <dd>0</dd>
+          </dl>
+          <dl class="dl-horizontal">
+            <dt>清单编制：</dt>
+            <dd>2小时</dd>
+          </dl>
+          <dl class="dl-horizontal">
+            <dt>算量全国：</dt>
+            <dd>0</dd>
+          </dl>
+          <dl class="dl-horizontal">
+            <dt>算量广东：</dt>
+            <dd>0</dd>
+          </dl>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+        <button type="button" class="btn btn-primary">确认</button>
+      </div>
+    </div>
+  </div>
+</div> -->
+
+<div class="modal fade" id="myModalPro" 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">
+        <div class="tableContent">
+          <div class="ProtTitle">
+            <select class="form-control">
+              <option>造价全国</option>
+              <option>造价广东</option>
+              <option>清单编制</option>
+              <option>算量全国</option>
+            </select>
+          </div>
+          <dl class="dl-horizontal">
+            <dt><span class="glyphicon glyphicon-star text-warning"></span> 当前使用的版本：</dt>
+            <dd>9.0.8.219</dd>
+          </dl>
+          <dl class="dl-horizontal">
+            <dt>总在线时长：</dt>
+            <dd>18小时46分</dd>
+          </dl>
+          <dl class="dl-horizontal">
+            <dt>最近登录时间：</dt>
+            <dd>2016-12-06</dd>
+          </dl>
+        </div>
+      </div>
+      <!-- <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+        <button type="button" class="btn btn-primary">确认</button>
+      </div> -->
+    </div>
+  </div>
+</div>
+
+</body>
+
+</html>
+
+         
+

admin-login.html

@@ -19,9 +19,9 @@
 			<h3 class="loginTitle logoTitleOl">网络版后台</h3>
 			<div class="loginOther">
 				<div class="dropdown">
-					<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+					<!-- <a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 						其他网站后台 <span class="caret"></span>
-					</a>
+					</a> -->
 					<ul class="dropdown-menu">
 						<li><a href="#">官网后台</a></li>
 						<li><a href="#">通行帐号后台</a></li>

admin-newsUser.html

@@ -40,6 +40,7 @@
             <li><a href="admin-newsUser.html">最新用户</a></li>
             <li><a href="admin-onlineUser.html">在线用户</a></li>
             <li><a href="admin-allUser.html">所有用户</a></li>
+            <li><a href="admin-countTime.html">时长统计</a></li>
           </ul>
         </div>
       </div>
@@ -50,7 +51,7 @@
         <h2 class="subMenuTitle"><a><i class="iconImg icon-">C</i><div class="subMenuText">数据分析<span class="fR caret caret-triangle"></span></div></a></h2>
         <div class="subMenuContent">
           <ul>
-            <li><a href="admin-users.html">用户登录分析</a></li>
+            <li><a href="admin-users.html">用户注册分析</a></li>
             <li><a href="admin-produce.html">产品分析</a></li>
             <li><a href="admin-count.html">客户分布</a></li>
             <li><a href="admin-channel.html">获取渠道</a></li>
@@ -78,220 +79,25 @@
     <div class="page-header pageTop">
       <h3>最新用户
         <div class="input-group fR" style="width:400px;">
-          <input type="text" class="form-control" placeholder="请输入您的称呼/邮箱/手机">
+          <input type="text" class="form-control" placeholder="请输入注册手机/注册邮箱/真实姓名/QQ">
           <div class="input-group-btn">
-            <button class="btn btn-primary" type="button"><span class="glyphicon glyphicon-search"></span></button>
+            <a class="btn btn-primary" type="button" href="admin-userSearch.html"><span class="glyphicon glyphicon-search"></span></a>
           </div>
         </div>
       </h3>
     </div>
-    <div class="CountMain" id="userCount" style="width:100%; height:250px; margin-bottom:35px;"></div>
+    <div class="CountMain" id="userCount" style="width:100%; height:300px; margin-bottom:35px;"></div>
+    <div class="page-header pageTop">
+      <h3>当前最新用户</h3>
+    </div>
     <div class="shopContent">
       <div class="btnGroup">
         <form class="form-inline">
           <div class="form-group">
-            <div class="dropdown">
-              <button class="btn btn-default btn-sm dropdown-toggle dropdown-toggleSF" type="button" id="dropdownMenu1">
-                广东省<!-- 省份 --> &nbsp;&nbsp;
+            <button class="btn btn-default btn-sm" type="button" data-toggle="modal" data-target="#proModal">
+                省份筛选 &nbsp;&nbsp;
                 <span class="caret"></span>
-              </button>
-              <ul class="dropdown-menu dropdown-list">
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> -全部省份客户-
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 北京市
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 天津市
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 河北省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 山西省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 内蒙古自治区
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 辽宁省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 吉林省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 黑龙江省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 上海市
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 江苏省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 浙江省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 安徽省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 福建省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 江西省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 山东省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 河南省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 湖北省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 湖南省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox4" value="option4" checked> 广东省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 广西壮族自治区
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 海南省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 重庆市
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 四川省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 贵州省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 云南省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 西藏自治区
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 陕西省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 甘肃省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 青海省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 宁夏回族自治区
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 新疆维吾尔自治区
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 台湾省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 香港特别行政区
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 澳门特别行政区
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 海外
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 其他
-                  </label>
-                </li>
-              </ul>
-            </div>
-          </div>
-          <div class="form-group">
-            <select class="form-control input-sm">
-              <option>城市</option>
-              <option selected>珠海市</option>
-              <option>佛山市</option>
-              <option>中山市</option>
-              <option>深圳市</option>
-            </select>
+            </button>
           </div>
           <div class="form-group">
             <select class="form-control input-sm">
@@ -331,221 +137,22 @@
             </p>
           </div>
         </form>
-      </div>
-    </div>
-    <div class="shopContent">
-      <div class="btnGroup">
-        <form class="form-inline">
+        <!-- <form class="form-inline">
           <div class="form-group">
-            <div class="dropdown">
-              <button class="btn btn-default btn-sm dropdown-toggle dropdown-toggleSF" type="button" id="dropdownMenu1">
-                广东省/江西省<!-- 省份 --> &nbsp;&nbsp;
+            <button class="btn btn-default btn-sm" type="button" data-toggle="modal" data-target="#proModal">
+                广东省/河南省/山西省 &nbsp;&nbsp;
                 <span class="caret"></span>
-              </button>
-              <ul class="dropdown-menu dropdown-list">
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> -全部省份客户-
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 北京市
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 天津市
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 河北省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 山西省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 内蒙古自治区
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 辽宁省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 吉林省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 黑龙江省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 上海市
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 江苏省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 浙江省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 安徽省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 福建省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox3" value="option3" checked> 江西省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 山东省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 河南省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 湖北省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 湖南省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox4" value="option4" checked> 广东省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 广西壮族自治区
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 海南省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 重庆市
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 四川省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 贵州省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 云南省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 西藏自治区
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 陕西省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 甘肃省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 青海省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 宁夏回族自治区
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 新疆维吾尔自治区
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 台湾省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 香港特别行政区
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 澳门特别行政区
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 海外
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 其他
-                  </label>
-                </li>
-              </ul>
-            </div>
-          </div>
-          <div class="form-group">
-            <select class="form-control input-sm">
-              <option>不限</option>
-              <option selected>仅注册</option>
-              <option>已验证</option>
-            </select>
+            </button>
           </div>
-          <!-- <button type="button" class="btn btn-primary btn-sm">导出Excel</button> -->
-        </form>
+        </form> -->
       </div>
-    </div>  
+    </div> 
     <div class="tableContent">
       <table class="table table-hover">
         <thead>
           <tr>
+            <th>注册手机</th>
+            <th>注册邮箱</th>
             <th>称呼</th>
             <th>真实姓名</th>
             <th>省份/城市</th>
@@ -554,14 +161,15 @@
             <th>单位</th>
             <th>地址</th>
             <th>电话</th>
-            <th>Email</th>
             <th>正在使用产品</th>
             <th>版本</th>
             <th>注册时间</th>
           </tr>
         </thead>
         <tr>
-          <td><a href="#" data-toggle="modal" data-target="#myModal">ghyqqq123</a></td>
+          <td><a href="#" data-toggle="modal" data-target="#myModal">18473457749</a></td>
+          <td>345756925@qq.com</td>
+          <td>ghyqqq123</td>
           <td>黄勇</td>
           <td>广东省，广州市</td>
           <td>18473457749</td>
@@ -569,13 +177,14 @@
           <td>湖南工学院</td>
           <td>湖南工学院</td>
           <td>-</td>
-          <td>345756925@qq.com</td>
           <td>造价全国</td>
           <td>9.0.8.319</td>
           <td>2016/4/6 0:10:11</td>
         </tr>
         <tr>
-          <td><a href="#" data-toggle="modal" data-target="#myModal">洪才hc</a></td>
+          <td><a href="#" data-toggle="modal" data-target="#myModal">未添加</a></td>
+          <td>315194299@qq.com</td>
+          <td>洪才hc</td>
           <td>洪才</td>
           <td>广东省，广州市</td>
           <td>15886362360</td>
@@ -583,63 +192,66 @@
           <td>湖南一通建设</td>
           <td>常德</td>
           <td>0873-6134501</td>
-          <td>315194299@qq.com</td>
           <td>造价全国</td>
           <td>9.0.8.319</td>
           <td>2016/4/6 9:06:37</td>
         </tr>
         <tr>
-          <td><a href="#" data-toggle="modal" data-target="#myModal">XIAOYU11</a></td>
+          <td><a href="#" data-toggle="modal" data-target="#myModal">15044601270</a></td>
+          <td>897438085@qq.com</td>
+          <td>于焕勇vds</td>
           <td>于焕勇</td>
           <td>广东省，珠海市</td>
           <td>15044601270</td>
           <td>897438085</td>
           <td>民强养护公司</td>
           <td>舒兰</td>
-          <td>-</td>
-          <td>897438085@qq.com</td>
+          <td>-</td>          
           <td>造价全国</td>
           <td>9.0.8.319</td>
           <td>2016/4/6 9:27:17</td>
         </tr>
         <tr>
-          <td><a href="#" data-toggle="modal" data-target="#myModal">ghyqqq123</a></td>
+          <td><a href="#" data-toggle="modal" data-target="#myModal">18473457749</a></td>
+          <td>未添加</td>
+          <td>ghyqqq123</td>
           <td>黄勇</td>
-          <td>广东省，佛山市</td>
+          <td>广东省，广州市</td>
           <td>18473457749</td>
           <td>345756925</td>
           <td>湖南工学院</td>
-          <td>衡阳市湖南工学院</td>
+          <td>湖南工学院</td>
           <td>-</td>
-          <td>345756925@qq.com</td>
           <td>造价全国</td>
           <td>9.0.8.319</td>
           <td>2016/4/6 0:10:11</td>
         </tr>
         <tr>
-          <td><a href="#" data-toggle="modal" data-target="#myModal">洪才hc</a></td>
+          <td><a href="#" data-toggle="modal" data-target="#myModal">15886362360</a></td>
+          <td>315194299@qq.com</td>
+          <td>洪才hc</td>
           <td>洪才</td>
-          <td>广东省，珠海市</td>
+          <td>广东省，广州市</td>
           <td>15886362360</td>
           <td>315194299</td>
           <td>湖南一通建设</td>
           <td>常德</td>
-          <td>-</td>
-          <td>315194299@qq.com</td>
+          <td>0873-6134501</td>
           <td>造价全国</td>
           <td>9.0.8.319</td>
           <td>2016/4/6 9:06:37</td>
         </tr>
         <tr>
-          <td><a href="#" data-toggle="modal" data-target="#myModal">XIAOYU11</a></td>
+          <td><a href="#" data-toggle="modal" data-target="#myModal">15044601270</a></td>
+          <td>897438085@qq.com</td>
+          <td>于焕勇vds</td>
           <td>于焕勇</td>
-          <td>广东省，深圳市</td>
+          <td>广东省，珠海市</td>
           <td>15044601270</td>
           <td>897438085</td>
           <td>民强养护公司</td>
           <td>舒兰</td>
-          <td>0873-6134501</td>
-          <td>897438085@qq.com</td>
+          <td>-</td>          
           <td>造价全国</td>
           <td>9.0.8.319</td>
           <td>2016/4/6 9:27:17</td>
@@ -669,6 +281,215 @@
   <!-- mainWrapper end -->    
 </div>
 
+
+<!-- 省份 -->
+<div class="modal fade" id="proModal" 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">
+        <div class="tableContent">
+          <ul class="dropdown-list">
+            <p>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> <b>-全国-</b>
+              </label>
+            </p>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 北京市
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 天津市
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 河北省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 山西省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 内蒙古自治区
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 辽宁省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 吉林省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 黑龙江省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 上海市
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 江苏省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 浙江省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 安徽省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 福建省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox3" value="option3" checked> 江西省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 山东省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 河南省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 湖北省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 湖南省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" checked> 广东省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 广西壮族自治区
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 海南省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 重庆市
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 四川省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 贵州省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 云南省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 西藏自治区
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 陕西省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 甘肃省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 青海省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 宁夏回族自治区
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 新疆维吾尔自治区
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 台湾省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 香港特别行政区
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 澳门特别行政区
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 海外
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 其他
+              </label>
+            </li>
+          </ul>
+          <p class="bg-warning" style="margin:20px 0 10px;padding:10px;">注意：省份一次最多只能勾选3个！</p>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+        <button type="button" class="btn btn-primary">确认</button>
+      </div>
+    </div>
+  </div>
+</div>
+
 <!-- Modal -->
 <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
   <div class="modal-dialog" role="document">
@@ -752,12 +573,13 @@ option = {
         data:['仅注册','已验证']
     },
     grid: {
-        left: '3%',
+        left: '2%',
         right: '4%',
-        bottom: '3%',
+        bottom: '15%',
         containLabel: true
     },
     toolbox: {
+      show: false,
         feature: {
             saveAsImage: {}
         }
@@ -772,6 +594,10 @@ option = {
         name:'日期',
         type: 'category',
         boundaryGap: false,
+        splitLine: {
+            show: true,
+            interval: 'auto'
+        },
         data: ['01-01','01-02','01-03','01-04','01-05','01-06','01-07','01-08','01-09','01-10','01-11','01-12','01-13','01-14','01-15','01-16','01-17','01-18','01-19','01-20','01-21','01-22','01-23','01-24','01-25','01-26','01-27','01-28','01-29','01-30']
     },
     yAxis: {

admin-onlineUser.html

@@ -38,6 +38,7 @@
             <li><a href="admin-newsUser.html">最新用户</a></li>
             <li><a href="admin-onlineUser.html">在线用户</a></li>
             <li><a href="admin-allUser.html">所有用户</a></li>
+            <li><a href="admin-countTime.html">时长统计</a></li>
           </ul>
         </div>
       </div>
@@ -45,7 +46,7 @@
         <h2 class="subMenuTitle"><a><i class="iconImg icon-">C</i><div class="subMenuText">数据分析<span class="fR caret caret-triangle"></span></div></a></h2>
         <div class="subMenuContent">
           <ul>
-            <li><a href="admin-users.html">用户登录分析</a></li>
+            <li><a href="admin-users.html">用户注册分析</a></li>
             <li><a href="admin-produce.html">产品分析</a></li>
             <li><a href="admin-count.html">客户分布</a></li>
             <li><a href="admin-channel.html">获取渠道</a></li>
@@ -72,47 +73,24 @@
   <div class="mainWrapper container-fluid">
     <div class="page-header pageTop">
       <h3>在线用户
+        <b class="total">（2608人）</b>
         <div class="input-group fR" style="width:400px;">
-          <input type="text" class="form-control" placeholder="请输入您的称呼/邮箱/手机">
+          <input type="text" class="form-control" placeholder="请输入注册手机/注册邮箱/称呼">
           <div class="input-group-btn">
-            <button class="btn btn-primary" type="button"><span class="glyphicon glyphicon-search"></span></button>
+            <a class="btn btn-primary" type="button" href="admin-userSearch.html"><span class="glyphicon glyphicon-search"></span></a>
           </div>
         </div>
       </h3>
     </div>
-    <div class="CountMain" id="userCount" style="width:100%; height:250px; margin-bottom:35px;"></div>
+    <!-- <div class="CountMain" id="userCount" style="width:100%; height:250px; margin-bottom:35px;"></div> -->
     <div class="shopContent">
       <div class="btnGroup">
         <form class="form-inline">
           <div class="form-group">
-            <div class="dropdown">
-              <button class="btn btn-default btn-sm dropdown-toggle dropdown-toggleSF" type="button" id="dropdownMenu1">
-                广东省<!-- 省份 --> &nbsp;&nbsp;
+            <button class="btn btn-default btn-sm" type="button" data-toggle="modal" data-target="#proModal">
+                省份筛选 &nbsp;&nbsp;
                 <span class="caret"></span>
-              </button>
-              <ul class="dropdown-menu dropdown-list">
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox1" value="option1" checked> 广东省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 广西省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 江西省
-                  </label>
-                </li>
-                <li>
-                  <label class="checkbox-inline">
-                    <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 安徽省
-                  </label>
-                </li>
-              </ul>
-            </div>
+            </button>
           </div>
           <div class="form-group">
             <select class="form-control input-sm">
@@ -157,6 +135,8 @@
       <table class="table table-hover">
         <thead>
           <tr>
+            <td>注册手机</td>
+            <th>注册邮箱</th>
             <th>称呼</th>
             <th>真实姓名</th>
             <th>省份/城市</th>
@@ -170,7 +150,9 @@
           </tr>
         </thead>
         <tr>
-          <td><a href="#" data-toggle="modal" data-target="#myModal">qdlvpeng</a></td>
+          <td><a href="#" data-toggle="modal" data-target="#myModal">13984782276</a></td>
+          <td>未添加</td>
+          <td>qdlvpeng</td>
           <td>吕鹏</td>
           <td>广东省，珠海市</td>
           <td>无</td>
@@ -182,7 +164,9 @@
           <td>7小时</td>
         </tr>
         <tr>
-          <td><a href="#" data-toggle="modal" data-target="#myModal">dcm</a></td>
+          <td><a href="#" data-toggle="modal" data-target="#myModal">13984782276</a></td>
+          <td>1962295725@qq.com</td>
+          <td>dcm</td>
           <td>邓翠梅</td>
           <td>广东省，珠海市</td>
           <td>13984782276</td>
@@ -194,7 +178,9 @@
           <td>6小时50分</td>
         </tr>
         <tr>
-          <td><a href="#" data-toggle="modal" data-target="#myModal">qdlvpeng</a></td>
+          <td><a href="#" data-toggle="modal" data-target="#myModal">未添加</a></td>
+          <td>617423885@qq.com</td>
+          <td>qdlvpeng</td>
           <td>吕鹏</td>
           <td>广东省，珠海市</td>
           <td>无</td>
@@ -203,43 +189,49 @@
           <td>2016/4/11 8:16:37</td>
           <td>造价全国</td>
           <td>9.0.8.192</td>
-          <td>6小时30分</td>
+          <td>7小时</td>
         </tr>
         <tr>
-          <td><a href="#" data-toggle="modal" data-target="#myModal">dcm</a></td>
+          <td><a href="#" data-toggle="modal" data-target="#myModal">13984782276</a></td>
+          <td>未添加</td>
+          <td>dcm</td>
           <td>邓翠梅</td>
           <td>广东省，珠海市</td>
           <td>13984782276</td>
           <td>1962295725</td>
           <td>务川铝矿分公司</td>
-          <td>2016/4/11 8:48:00</td>
+          <td>2016/4/11 8:16:37</td>
           <td>造价全国</td>
           <td>9.0.8.319</td>
-          <td>6小时10分</td>
+          <td>6小时50分</td>
         </tr>
         <tr>
-          <td><a href="#" data-toggle="modal" data-target="#myModal">qdlvpeng</a></td>
+          <td><a href="#" data-toggle="modal" data-target="#myModal">13984782276</a></td>
+          <td>617423885@qq.com</td>
+          <td>qdlvpeng</td>
           <td>吕鹏</td>
           <td>广东省，珠海市</td>
           <td>无</td>
           <td>617423885</td>
           <td>山东高速</td>
-          <td>2016/4/11 9:41:11</td>
+          <td>2016/4/11 8:16:37</td>
           <td>造价全国</td>
           <td>9.0.8.192</td>
-          <td>5小时50分</td>
+          <td>7小时</td>
         </tr>
         <tr>
-          <td><a href="#" data-toggle="modal" data-target="#myModal">dcm</a></td>
+          <td><a href="#" data-toggle="modal" data-target="#myModal">13984782276</a></td>
+          <td>617423885@qq.com</td>
+          <td>dcm</td>
           <td>邓翠梅</td>
           <td>广东省，珠海市</td>
           <td>13984782276</td>
           <td>1962295725</td>
           <td>务川铝矿分公司</td>
-          <td>2016/4/11 9:41:11</td>
+          <td>2016/4/11 8:16:37</td>
           <td>造价全国</td>
           <td>9.0.8.319</td>
-          <td>5小时08分</td>
+          <td>6小时50分</td>
         </tr>
       </table>
     </div>
@@ -266,6 +258,215 @@
   <!-- mainWrapper end -->    
 </div>
 
+
+<!-- 省份 -->
+<div class="modal fade" id="proModal" 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">
+        <div class="tableContent">
+          <ul class="dropdown-list">
+            <p>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> <b>-全国-</b>
+              </label>
+            </p>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 北京市
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 天津市
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 河北省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 山西省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 内蒙古自治区
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 辽宁省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 吉林省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 黑龙江省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 上海市
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 江苏省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 浙江省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 安徽省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 福建省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox3" value="option3" checked> 江西省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 山东省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 河南省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 湖北省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 湖南省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" checked> 广东省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 广西壮族自治区
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 海南省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 重庆市
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 四川省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 贵州省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 云南省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 西藏自治区
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 陕西省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 甘肃省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 青海省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 宁夏回族自治区
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 新疆维吾尔自治区
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 台湾省
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option1" disabled> 香港特别行政区
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox2" value="option2" disabled> 澳门特别行政区
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox3" value="option3" disabled> 海外
+              </label>
+            </li>
+            <li>
+              <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox4" value="option4" disabled> 其他
+              </label>
+            </li>
+          </ul>
+          <p class="bg-warning" style="margin:20px 0 10px;padding:10px;">注意：省份一次最多只能勾选3个！</p>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+        <button type="button" class="btn btn-primary">确认</button>
+      </div>
+    </div>
+  </div>
+</div>
+
 <!-- Modal -->
 <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
   <div class="modal-dialog" role="document">

admin-produce.html

@@ -8,11 +8,14 @@
   <meta name="renderer" content="webkit"> 
   <link rel=stylesheet href=css/bootstrap.css> 
   <link rel=stylesheet href=css/style.css>
+  <link rel=stylesheet href=css/dateRange.css>
   <script src=js/jquery-1.9.1.min.js></script>
   <script src=js/bootstrap.js></script>
   <script src=js/global.js></script>
   <script src=js/echarts.js></script>
   <script type=js/macarons.js></script>
+  <script src=js/dateRange.js></script>
+  <script src=js/jquery.tablesorter.js></script>
 </head>
 
 <body>
@@ -39,6 +42,7 @@
             <li><a href="admin-newsUser.html">最新用户</a></li>
             <li><a href="admin-onlineUser.html">在线用户</a></li>
             <li><a href="admin-allUser.html">所有用户</a></li>
+            <li><a href="admin-countTime.html">时长统计</a></li>
           </ul>
         </div>
       </div>
@@ -46,7 +50,7 @@
         <h2 class="subMenuTitle"><a class="active"><i class="iconImg icon-">C</i><div class="subMenuText">数据分析<span class="fR caret caret-triangle"></span></div></a></h2>
         <div class="subMenuContent">
           <ul>
-            <li><a href="admin-users.html">用户登录分析</a></li>
+            <li><a href="admin-users.html">用户注册分析</a></li>
             <li><a href="admin-produce.html">产品分析</a></li>
             <li><a href="admin-count.html">客户分布</a></li>
             <li><a href="admin-channel.html">获取渠道</a></li>
@@ -72,9 +76,9 @@
   <!-- leftWrapper end -->
   <div class="mainWrapper container-fluid">
     <div class="page-header pageTop">
-      <h3>产品分析
+      <h3>产品分析 
         <small class="btnTime">
-          <select class="form-control input-sm" style="width:auto; display:inline-block;">
+          <select class="form-control input-sm" style="width:auto; display:inline-block; margin-right:15px;">
             <option>全部</option>
             <option>重庆</option>
             <option>湖南</option>
@@ -109,6 +113,27 @@
             <option>宁夏</option>
             <option>其他</option>
           </select>
+          <a href="#">7天内</a> | 
+          <a href="#">30天内</a> | 
+          <input type="text" name="date" id="date_demo1" value="" class="form-control gri_date input-sm" style=" width:auto; display:inline-block;"/>
+          <script type="text/javascript">
+            //var STATS_START_TIME = '1329148800';
+            var dateRange1 = new pickerDateRange('date_demo1', {
+              isTodayValid : true,
+              //isSingleDay : true,
+              startDate : '2016-03-12',
+              endDate : '2016-03-20',
+              needCompare : false,
+              defaultText : ' 至 ',
+              target : 'datePicker_demo1',
+              calendars : 3,
+              //theme : 'ta',
+              //shortOpr : true,
+              success : function(obj) {
+                $("#dCon_demo1").html('开始时间 : ' + obj.startDate + '<br/>结束时间 : ' + obj.endDate);
+              }
+            });
+          </script>
         </small>
       </h3>
     </div>
@@ -119,32 +144,35 @@
       <div class="fL chartContent" style="width:60%;">
         <div class="CountMain" id="CountMainPro" style="height:350px;"></div>
       </div>
-      <div class="fR tableContent" style="width:35%; height:345px; overflow-y:auto;">
-        <table class="table table-hover">
-          <thead>
-            <tr>
-              <th>产品名称</th>
-              <th>人数（人）</th>
-            </tr>
-          </thead>
-          <tr>
-            <td><a href="admin-produceList.html">造价全国</a></td>
-            <td>1830</td>
-          </tr>
-          <tr>
-            <td><a href="admin-produceList.html">造价广东</a></td>
-            <td>563</td>
-          </tr>
-          <tr>
-            <td><a href="admin-produceList.html">标后预算</a></td>
-            <td>223</td>
-          </tr>
-          <tr>
-            <td><a href="admin-produceList.html">清单编制</a></td>
-            <td>160</td>
-          </tr>
-        </table>
-      </div>
+       <div class="fL tableContent" style="width:40%;">
+          <p class="tipMain">点击查看详情：</p>
+          <div style="height:345px; overflow-y:auto;">
+            <table class="table table-hover table-striped tablelist">
+              <thead>
+                <tr>
+                  <th>产品名称</th>
+                  <th class="taCble">人数（人）</th>
+                </tr>
+              </thead>
+              <tr>
+                <td><a href="admin-produceList.html">造价全国</a></td>
+                <td>1830</td>
+              </tr>
+              <tr>
+                <td><a href="admin-produceList.html">造价广东</a></td>
+                <td>563</td>
+              </tr>
+              <tr>
+                <td><a href="admin-produceList.html">标后预算</a></td>
+                <td>223</td>
+              </tr>
+              <tr>
+                <td><a href="admin-produceList.html">清单编制</a></td>
+                <td>160</td>
+              </tr>
+            </table>
+          </div>
+        </div>
     </div>
   </div>
   <!-- mainWrapper end -->    
@@ -169,7 +197,8 @@ option = {
         bottom: '3%',
         containLabel: true
     },
-    toolbox: {
+     toolbox: {
+      show: false,
         feature: {
             saveAsImage: {}
         }
@@ -178,6 +207,10 @@ option = {
         name:'日期',
         type: 'category',
         boundaryGap: false,
+        splitLine: {
+            show: true,
+            interval: 'auto'
+        },
         data: ['01-01','01-02','01-03','01-04','01-05','01-06','01-07','01-08','01-09','01-10','01-11','01-12','01-13','01-14','01-15','01-16','01-17','01-18','01-19','01-20','01-21','01-22','01-23','01-24','01-25','01-26','01-27','01-28','01-29','01-30']
     },
     yAxis: {

admin-produceList.html

@@ -13,6 +13,7 @@
   <script src=js/global.js></script>
   <script src=js/echarts.js></script>
   <script type=js/macarons.js></script>
+  <script src=js/jquery.tablesorter.js></script>
 </head>
 
 <body>
@@ -39,6 +40,7 @@
             <li><a href="admin-newsUser.html">最新用户</a></li>
             <li><a href="admin-onlineUser.html">在线用户</a></li>
             <li><a href="admin-allUser.html">所有用户</a></li>
+            <li><a href="admin-countTime.html">时长统计</a></li>
           </ul>
         </div>
       </div>
@@ -46,7 +48,7 @@
         <h2 class="subMenuTitle"><a class="active"><i class="iconImg icon-">C</i><div class="subMenuText">数据分析<span class="fR caret caret-triangle"></span></div></a></h2>
         <div class="subMenuContent">
           <ul>
-            <li><a href="admin-users.html">用户登录分析</a></li>
+            <li><a href="admin-users.html">用户注册分析</a></li>
             <li><a href="admin-produce.html">产品分析</a></li>
             <li><a href="admin-count.html">客户分布</a></li>
             <li><a href="admin-channel.html">获取渠道</a></li>
@@ -81,50 +83,78 @@
             <option>清单编制</option>
           </select>
         </small>
+        <div class="input-group fR" style="width:400px;">
+          <input type="text" class="form-control" placeholder="请输入注册邮箱/注册手机/您的称呼">
+          <div class="input-group-btn">
+            <a class="btn btn-primary" type="button" href="admin-userSearch.html"><span class="glyphicon glyphicon-search"></span></a>
+          </div>
+        </div>
       </h3>
     </div>
     <!-- <div class="chartContent">
       <div class="CountMain" id="CountMainArea" style="width:100%; height:350px;"></div>
     </div> -->
-    
+
     <div class="proSection clearfix">
       <div class="fL chartContent" style="width:60%;">
         <div class="CountMain" id="CountMainZjqg" style="height:350px;"></div>
       </div>
-      <div class="fR tableContent" style="width:35%; height:345px; overflow-y:auto;">
-        <!-- <p>查看统计：</p> -->
-        <table class="table table-hover">
-          <thead>
+      <div class="fL tableContent" style="width:40%;">
+        <p class="tipMain">点击查看详情：</p>
+        <div style="height:345px; overflow-y:auto;">
+          <table class="table table-hover table-striped tablelist">
+            <thead>
+              <tr>
+                <th>版本</th>
+                <th class="taCble">人数（人）</th>
+              </tr>
+            </thead>
             <tr>
-              <th>版本</th>
-              <th>人数（人）</th>
+              <td>9.0.8.320</td>
+              <td><a href="#">563</a></td>
             </tr>
-          </thead>
-          <tr>
-            <td>9.0.8.320</td>
-            <td>563</td>
-          </tr>
-          <tr>
-            <td>9.0.8.319</td>
-            <td>1830</td>
-          </tr>
-          <tr>
-            <td>9.0.8.318</td>
-            <td>223</td>
-          </tr>
-          <tr>
-            <td>9.0.8.192</td>
-            <td>4407</td>
-          </tr>
-          <tr>
-            <td>9.0.8.176</td>
-            <td>816</td>
-          </tr>
-        </table>
+            <tr>
+              <td>9.0.8.319</td>
+              <td><a href="#">1830</a></td>
+            </tr>
+            <tr>
+              <td>9.0.8.318</td>
+              <td><a href="#">223</a></td>
+            </tr>
+            <tr>
+              <td>9.0.8.192</td>
+              <td><a href="#">4407</a></td>
+            </tr>
+            <tr>
+              <td>9.0.8.176</td>
+              <td><a href="#">816</a></td>
+            </tr>
+            <tr>
+              <td>9.0.8.320</td>
+              <td><a href="#">563</a></td>
+            </tr>
+            <tr>
+              <td>9.0.8.319</td>
+              <td><a href="#">1830</a></td>
+            </tr>
+            <tr>
+              <td>9.0.8.318</td>
+              <td><a href="#">223</a></td>
+            </tr>
+            <tr>
+              <td>9.0.8.192</td>
+              <td><a href="#">4407</a></td>
+            </tr>
+            <tr>
+              <td>9.0.8.176</td>
+              <td><a href="#">816</a></td>
+            </tr>
+          </table>
+        </div>
       </div>
     </div>
     <div class="proSection">
-      <table class="table table-hover">
+      <!-- <table class="table table-hover">
         <thead>
           <tr>
             <th>版本号</th>
@@ -337,8 +367,101 @@
             <td>9</td>
           </tr>
         </thead>
+      </table> -->
+      <table class="table table-hover">
+        <thead>
+          <tr>
+            <th>注册手机</th>
+            <th>注册邮箱</th>
+            <th>称呼</th>
+            <th>真实姓名</th>
+            <th>省份/城市</th>
+            <th>手机</th>
+            <th>QQ</th>
+            <th>单位</th>
+          </tr>
+        </thead>
+        <tr>
+          <td>13984782276</td>
+          <td>617423885@qq.com</td>
+          <td>qdlvpeng</td>
+          <td>吕鹏</td>
+          <td>广东省，珠海市</td>
+          <td>无</td>
+          <td>617423885</td>
+          <td>山东高速</td>
+        </tr>
+        <tr>
+          <td>未添加</td>
+          <td>1962295725@qq.com</td>
+          <td>dcm</td>
+          <td>邓翠梅</td>
+          <td>广东省，珠海市</td>
+          <td>13984782276</td>
+          <td>1962295725</td>
+          <td>务川铝矿分公司</td>
+        </tr>
+        <tr>
+          <td>13984782276</td>
+          <td>617423885@qq.com</td>
+          <td>qdlvpeng</td>
+          <td>吕鹏</td>
+          <td>广东省，珠海市</td>
+          <td>无</td>
+          <td>617423885</td>
+          <td>山东高速</td>
+        </tr>
+        <tr>
+          <td>13984782276</td>
+          <td>未添加</td>
+          <td>dcm</td>
+          <td>邓翠梅</td>
+          <td>广东省，珠海市</td>
+          <td>13984782276</td>
+          <td>1962295725</td>
+          <td>务川铝矿分公司</td>
+        </tr>
+        <tr>
+          <td>13984782276</td>
+          <td>617423885@qq.com</td>
+          <td>qdlvpeng</td>
+          <td>吕鹏</td>
+          <td>广东省，珠海市</td>
+          <td>无</td>
+          <td>617423885</td>
+          <td>山东高速</td>
+        </tr>
+        <tr>
+          <td>13984782276</td>
+          <td>1962295725@qq.com</td>
+          <td>dcm</td>
+          <td>邓翠梅</td>
+          <td>广东省，珠海市</td>
+          <td>13984782276</td>
+          <td>1962295725</td>
+          <td>务川铝矿分公司</td>
+        </tr>
       </table>
     </div>
+    <nav>
+      <ul class="pagination pagination-sm">
+        <li>
+          <a href="#" aria-label="Previous">
+            <span aria-hidden="true">«</span>
+          </a>
+        </li>
+        <li><a href="#">1</a></li>
+        <li><a href="#">2</a></li>
+        <li><a href="#">3</a></li>
+        <li><a href="#">4</a></li>
+        <li><a href="#">5</a></li>
+        <li>
+          <a href="#" aria-label="Next">
+            <span aria-hidden="true">»</span>
+          </a>
+        </li>
+      </ul>
+    </nav>
   </div>
   <!-- mainWrapper end -->    
 </div>

admin-softList-user.html

@@ -41,6 +41,7 @@
             <li><a href="admin-newsUser.html">最新用户</a></li>
             <li><a href="admin-onlineUser.html">在线用户</a></li>
             <li><a href="admin-allUser.html">所有用户</a></li>
+            <li><a href="admin-countTime.html">时长统计</a></li>
           </ul>
         </div>
       </div>
@@ -48,7 +49,7 @@
         <h2 class="subMenuTitle"><a><i class="iconImg icon-">C</i><div class="subMenuText">数据分析<span class="fR caret caret-triangle"></span></div></a></h2>
         <div class="subMenuContent">
           <ul>
-            <li><a href="admin-users.html">用户登录分析</a></li>
+            <li><a href="admin-users.html">用户注册分析</a></li>
             <li><a href="admin-produce.html">产品分析</a></li>
             <li><a href="admin-count.html">客户分布</a></li>
             <li><a href="admin-channel.html">获取渠道</a></li>

admin-softList.html

@@ -41,6 +41,7 @@
             <li><a href="admin-newsUser.html">最新用户</a></li>
             <li><a href="admin-onlineUser.html">在线用户</a></li>
             <li><a href="admin-allUser.html">所有用户</a></li>
+            <li><a href="admin-countTime.html">时长统计</a></li>
           </ul>
         </div>
       </div>
@@ -48,7 +49,7 @@
         <h2 class="subMenuTitle"><a><i class="iconImg icon-">C</i><div class="subMenuText">数据分析<span class="fR caret caret-triangle"></span></div></a></h2>
         <div class="subMenuContent">
           <ul>
-            <li><a href="admin-users.html">用户登录分析</a></li>
+            <li><a href="admin-users.html">用户注册分析</a></li>
             <li><a href="admin-produce.html">产品分析</a></li>
             <li><a href="admin-count.html">客户分布</a></li>
             <li><a href="admin-channel.html">获取渠道</a></li>
@@ -85,32 +86,35 @@
       <table class="table table-hover">
         <thead>
           <tr>
-            <th>用户称呼</th>
+            <th>注册手机</th>
+            <th>注册邮箱</th>
+            <th>称呼</th>
             <th>真实姓名</th>
+            <th>省份</th>
             <th>单位</th>
-            <th>电子邮箱</th>
-            <th>注册手机</th>
             <th>QQ</th>
             <th>操作</th>
           </tr>
         </thead>
         <tr>
+          <td>13750039378</td>
+          <td>3216329758@qq.com</td>
           <td>欧桃珍</td>
           <td>欧桃珍</td>
+          <td>广东省</td>
           <td>山东高速</td>
-          <td>3216329758@qq.com</td>
-          <td>13750039378</td>
           <td>3216329758</td>
           <td>
             <a href="#" class="btn btn-default btn-xs" data-toggle="modal" data-target="#myModal"><span class="text-danger">禁用</span></a>
           </td>
         </tr>
         <tr>
+          <td>13750039378</td>
+          <td>3216329758@qq.com</td>
           <td>欧桃珍111</td>
           <td>欧桃珍111</td>
+          <td>广东省</td>
           <td>务川铝矿分公司</td>
-          <td>3216329758@qq.com</td>
-          <td>13750039378</td>
           <td>3216329758</td>
           <td>
             <a href="#" class="btn btn-default btn-xs" data-toggle="modal" data-target="#myModal"><span class="text-danger">禁用</span></a>
@@ -152,9 +156,9 @@
       <div class="modal-body">
         <form class="form-horizontal">
           <div class="form-group">
-            <label for="adminName" class="col-sm-3 control-label">电子邮箱</label>
+            <label for="adminName" class="col-sm-3 control-label">注册邮箱</label>
             <div class="col-sm-7">
-              <input type="adminName" class="form-control" id="adminName" placeholder="请输入电子邮箱">
+              <input type="adminName" class="form-control" id="adminName" placeholder="请输入注册邮箱">
             </div>
           </div>
           <div class="form-group">
@@ -187,7 +191,7 @@
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default">确认</button>
-        <button type="button" class="btn btn-primary" data-dismiss="modal">关闭</button>
+        <button type="button" class="btn btn-primary" data-dismiss="modal">取消</button>
       </div>
     </div>
   </div>

admin-userSearch.html

@@ -8,9 +8,14 @@
   <meta name="renderer" content="webkit"> 
   <link rel=stylesheet href=css/bootstrap.css> 
   <link rel=stylesheet href=css/style.css>
+  <link rel=stylesheet href=css/dateRange.css>
   <script src=js/jquery-1.9.1.min.js></script>
   <script src=js/bootstrap.js></script>
   <script src=js/global.js></script>
+  <script src=js/echarts.js></script>
+  <script type=js/macarons.js></script>
+  <script src=js/dateRange.js></script>
+  <script src=js/jquery.tablesorter.js></script>
 </head>
 
 <body>
@@ -37,6 +42,7 @@
             <li><a href="admin-newsUser.html">最新用户</a></li>
             <li><a href="admin-onlineUser.html">在线用户</a></li>
             <li><a href="admin-allUser.html">所有用户</a></li>
+            <li><a href="admin-countTime.html">时长统计</a></li>
           </ul>
         </div>
       </div>
@@ -44,7 +50,7 @@
         <h2 class="subMenuTitle"><a><i class="iconImg icon-">C</i><div class="subMenuText">数据分析<span class="fR caret caret-triangle"></span></div></a></h2>
         <div class="subMenuContent">
           <ul>
-            <li><a href="admin-users.html">用户登录分析</a></li>
+            <li><a href="admin-users.html">用户注册分析</a></li>
             <li><a href="admin-produce.html">产品分析</a></li>
             <li><a href="admin-count.html">客户分布</a></li>
             <li><a href="admin-channel.html">获取渠道</a></li>
@@ -71,42 +77,276 @@
   <div class="mainWrapper container-fluid">
     <div class="searchBig">
       <div class="input-group">
-        <input type="text" class="form-control" placeholder="请输入帐号/真实姓名/手机">
+        <input type="text" class="form-control" placeholder="请输入注册手机/注册邮箱/真实姓名/QQ">
         <div class="input-group-btn">
           <button class="btn btn-primary" type="button"><span class="glyphicon glyphicon-search"></span></button>
         </div>
       </div>
     </div>
-    <h4>搜索结果：</h4>
-    <!-- <h3 class="text-center">这人不在本王管辖内！</h3> -->
-    <table class="table table-hover">
-      <thead>
+    <div class="userSearch">
+      <h4><a href="#" title="返回用户列表"><span class="glyphicon glyphicon-chevron-left"></span></a>&nbsp;搜索结果：</h4>
+      <!-- <h2 class="text-center">这人不在本王管辖内！</h2> -->
+      <table class="table table-bordered table-hover">
+        <tr>
+          <th>注册手机</th>
+          <td><a href="#" data-toggle="modal" data-target="#myModal">18473457749</a></td>
+        </tr>
+        <tr>
+          <th>注册邮箱</th>
+          <td>345756925@qq.com</td>
+        </tr>
         <tr>
           <th>称呼</th>
+          <td>ghyqqq123</td>
+        </tr>
+        <tr>
           <th>真实姓名</th>
+          <td>黄勇</td>
+        </tr>
+        <tr>
           <th>省份/城市</th>
+          <td>广东省，广州市</td>
+        </tr>
+        <tr>
           <th>手机</th>
+          <td>18473457749</td>
+        </tr>
+        <tr>
           <th>QQ</th>
+          <td>345756925</td>
+        </tr>
+        <tr>
           <th>单位</th>
-          <th>产品</th>
+          <td>湖南工学院</td>
+        </tr>
+        <tr>
+          <th>地址</th>
+          <td>湖南工学院</td>
+        </tr>
+        <tr>
+          <th>电话</th>
+          <td>0873-6134501</td>
+        </tr>
+        <tr>
           <th>注册时间</th>
+          <td>2016/4/6 0:10:11</td>
         </tr>
-      </thead>
-      <tr>
-        <td><a href="#">ghyqqq123</a></td>
-        <td>黄勇</td>
-        <td>广东省，广州市</td>
-        <td>18473457749</td>
-        <td>345756925</td>
-        <td>湖南工学院</td>
-        <td>造价全国，造价广东</td>
-        <td>2016/4/6 0:10:11</td>
-      </tr>
-    </table>
+        <tr>
+          <th>产品</th>
+          <td><a href="#" data-toggle="modal" data-target="#myModalPro">造价全国</a>，<a href="#" data-toggle="modal" data-target="#myModalPro">造价广东</a>，<a href="#" data-toggle="modal" data-target="#myModalPro">清单编制</a>，<a href="#" data-toggle="modal" data-target="#myModalPro">算量全国</a></td>
+        </tr>
+      </table>
+    </div>
+    <div class="tableContent">
+      <div class="page-header">
+        <h3>用户时长统计
+          <small class="btnTime">
+            <a href="#">7天内</a> | 
+            <a href="#">30天内</a> | 
+            <input type="text" name="date" id="date_demo1" value="" class="form-control gri_date input-sm" style=" width:auto; display:inline-block;"/>
+            <script type="text/javascript">
+              //var STATS_START_TIME = '1329148800';
+              var dateRange1 = new pickerDateRange('date_demo1', {
+                isTodayValid : true,
+                //isSingleDay : true,
+                startDate : '2016-03-12',
+                endDate : '2016-03-20',
+                needCompare : false,
+                defaultText : ' 至 ',
+                target : 'datePicker_demo1',
+                calendars : 3,
+                //theme : 'ta',
+                //shortOpr : true,
+                success : function(obj) {
+                  $("#dCon_demo1").html('开始时间 : ' + obj.startDate + '<br/>结束时间 : ' + obj.endDate);
+                }
+              });
+            </script>
+          </small>
+        </h3>
+      </div>
+      <table class="table table-hover">
+        <thead>
+          <tr>
+            <th>使用日期</th>
+            <!-- <th>在线时长（分钟）</th> -->
+            <th>造价全国</th>
+            <th>造价广东</th>
+            <th>清单编制</th>
+            <th>算量全国</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td>2017/3/29</td>
+            <td>13小时52分</td>
+            <td>3小时16分</td>
+            <td></td>
+            <td></td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>2017/3/28</td>
+            <td>13小时52分</td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>2017/3/27</td>
+            <td>13小时52分</td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>2017/3/26</td>
+            <td>13小时52分</td>
+            <td>3小时16分</td>
+            <td></td>
+            <td></td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>2017/3/24</td>
+            <td>13小时52分</td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>2017/3/22</td>
+            <td>13小时52分</td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>2017/3/16</td>
+            <td>13小时52分</td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
   </div>
   <!-- mainWrapper end -->    
 </div>
 
+<!-- Modal -->
+<div class="modal fade" id="myModal" 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">
+        <div class="tableContent">
+          <dl class="dl-horizontal">
+            <dt>获悉渠道：</dt>
+            <dd>造价论坛</dd>
+          </dl>
+          <dl class="dl-horizontal">
+            <dt>其他渠道说明：</dt>
+            <dd></dd>
+          </dl>
+          <dl class="dl-horizontal">
+            <dt>启用：</dt>
+            <dd></dd>
+          </dl>
+          <dl class="dl-horizontal">
+            <dt>激活码：</dt>
+            <dd>1</dd>
+          </dl>
+          <dl class="dl-horizontal">
+            <dt>验证码：</dt>
+            <dd>1</dd>
+          </dl>
+          <dl class="dl-horizontal">
+            <dt>标志：</dt>
+            <dd>0</dd>
+          </dl>
+          <dl class="dl-horizontal">
+            <dt>造价全国：</dt>
+            <dd>9.0.8.319</dd>
+          </dl>
+          <dl class="dl-horizontal">
+            <dt>造价广东：</dt>
+            <dd>0</dd>
+          </dl>
+          <dl class="dl-horizontal">
+            <dt>标后预算：</dt>
+            <dd>0</dd>
+          </dl>
+          <dl class="dl-horizontal">
+            <dt>清单编制：</dt>
+            <dd>0</dd>
+          </dl>
+          <dl class="dl-horizontal">
+            <dt>算量全国：</dt>
+            <dd>0</dd>
+          </dl>
+          <dl class="dl-horizontal">
+            <dt>算量广东：</dt>
+            <dd>0</dd>
+          </dl>
+        </div>
+      </div>
+      <!-- <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+        <button type="button" class="btn btn-primary">确认</button>
+      </div> -->
+    </div>
+  </div>
+</div>
+
+<div class="modal fade" id="myModalPro" 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">
+        <div class="tableContent">
+          <div class="ProtTitle">
+            <select class="form-control">
+              <option>造价全国</option>
+              <option>造价广东</option>
+              <option>清单编制</option>
+              <option>算量全国</option>
+            </select>
+          </div>
+          <dl class="dl-horizontal">
+            <dt><span class="glyphicon glyphicon-star text-warning"></span> 当前使用的版本：</dt>
+            <dd>9.0.8.219</dd>
+          </dl>
+          <dl class="dl-horizontal">
+            <dt>总在线时长：</dt>
+            <dd>18小时46分</dd>
+          </dl>
+          <dl class="dl-horizontal">
+            <dt>最近登录时间：</dt>
+            <dd>2016-12-06</dd>
+          </dl>
+        </div>
+      </div>
+      <!-- <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+        <button type="button" class="btn btn-primary">确认</button>
+      </div> -->
+    </div>
+  </div>
+</div>
+
 </body>
 
 </html>

admin-userinfo.html

@@ -37,14 +37,15 @@
             <li><a href="admin-newsUser.html">最新用户</a></li>
             <li><a href="admin-onlineUser.html">在线用户</a></li>
             <li><a href="admin-allUser.html">所有用户</a></li>
+            <li><a href="admin-countTime.html">时长统计</a></li>
           </ul>
         </div>
       </div>
       <div class="subMenu">
-        <h2 class="subMenuTitle"><a class="active"><i class="iconImg icon-">C</i><div class="subMenuText">数据分析<span class="fR caret caret-triangle"></span></div></a></h2>
+        <h2 class="subMenuTitle"><a><i class="iconImg icon-">C</i><div class="subMenuText">数据分析<span class="fR caret caret-triangle"></span></div></a></h2>
         <div class="subMenuContent">
           <ul>
-            <li><a href="admin-users.html">用户登录分析</a></li>
+            <li><a href="admin-users.html">用户注册分析</a></li>
             <li><a href="admin-produce.html">产品分析</a></li>
             <li><a href="admin-count.html">客户分布</a></li>
             <li><a href="admin-channel.html">获取渠道</a></li>
@@ -76,6 +77,7 @@
       <li role="presentation" class="active"><a href="#home" aria-controls="home" role="tab" data-toggle="tab">个人资料</a></li>
       <li role="presentation"><a href="#profile" aria-controls="profile" role="tab" data-toggle="tab">密码设置</a></li>
       <li role="presentation"><a href="#addressUser" aria-controls="addressUser" role="tab" data-toggle="tab">地区管理员</a></li>
+      <li role="presentation"><a href="#guhuaUser" aria-controls="guhuaUser" role="tab" data-toggle="tab">固化清单用户</a></li>
     </ul>
     <div class="tab-content">
       <div role="tabpanel" class="tab-pane active" id="home">
@@ -181,6 +183,40 @@
             </tr>
           </table>
         </div>
+        <div role="tabpanel" class="tab-pane" id="guhuaUser" style="margin-top:20px;">
+          <table class="table table-hover" style="margin-top:20px;">
+            <thead>
+              <tr>
+                <th>用户名</th>
+                <th>密码</th>
+                <th>监控地区</th>
+                <th>固化清单权限</th>
+              </tr>
+            </thead>
+            <tr>
+              <td>gd纵横知道</td>
+              <td>123456</td>
+              <td>广东、广西、甘肃</td>
+              <td>
+                <div class="btn-group">
+                  <button type="button" class="btn btn-default btn-success btn-xs">已开启</button>
+                  <button type="button" class="btn btn-default btn-xs">关闭</button>
+                </div>
+              </td>
+            </tr>
+            <tr>
+              <td>纵横知道123</td>
+              <td>123456</td>
+              <td>广东、广西、甘肃、云南、贵州</td>
+              <td>
+                <div class="btn-group">
+                  <button type="button" class="btn btn-default btn-xs">开启</button>
+                  <button type="button" class="btn btn-default btn-danger btn-xs">已关闭</button>
+                </div>
+              </td>
+            </tr>
+          </table>
+        </div>
       </div>
     </div>
     
@@ -215,6 +251,9 @@
             <label for="adminName" class="col-sm-3 control-label">请选择省份权限</label>
             <div class="col-sm-7">
               <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option33"> <b>-全国-</b>
+              </label></br>
+              <label class="checkbox-inline">
                 <input type="checkbox" id="inlineCheckbox1" value="option1"> 重庆
               </label>
               <label class="checkbox-inline">
@@ -349,6 +388,9 @@
             <label for="adminName" class="col-sm-3 control-label">请选择省份权限</label>
             <div class="col-sm-7">
               <label class="checkbox-inline">
+                <input type="checkbox" id="inlineCheckbox1" value="option33"> <b>-全国-</b>
+              </label></br>
+              <label class="checkbox-inline">
                 <input type="checkbox" id="inlineCheckbox1" value="option1"> 重庆
               </label>
               <label class="checkbox-inline">

admin-users.html

@@ -15,6 +15,7 @@
   <script src=js/echarts.js></script>
   <script type=js/macarons.js></script>
   <script src=js/dateRange.js></script>
+  <script src=js/jquery.tablesorter.js></script>
 </head>
 
 <body>
@@ -41,6 +42,7 @@
             <li><a href="admin-newsUser.html">最新用户</a></li>
             <li><a href="admin-onlineUser.html">在线用户</a></li>
             <li><a href="admin-allUser.html">所有用户</a></li>
+            <li><a href="admin-countTime.html">时长统计</a></li>
           </ul>
         </div>
       </div>
@@ -48,7 +50,7 @@
         <h2 class="subMenuTitle"><a class="active"><i class="iconImg icon-">C</i><div class="subMenuText">数据分析<span class="fR caret caret-triangle"></span></div></a></h2>
         <div class="subMenuContent">
           <ul>
-            <li><a href="admin-users.html">用户登录分析</a></li>
+            <li><a href="admin-users.html">用户注册分析</a></li>
             <li><a href="admin-produce.html">产品分析</a></li>
             <li><a href="admin-count.html">客户分布</a></li>
             <li><a href="admin-channel.html">获取渠道</a></li>
@@ -74,8 +76,43 @@
   <!-- leftWrapper end -->
   <div class="mainWrapper container-fluid">
     <div class="page-header pageTop">
-      <h3>用户登录分析
+      <h3>新增用户分析
         <small class="btnTime">
+          <select class="form-control input-sm" style="width:auto; display:inline-block; margin-right:15px;">
+            <option>-全国-</option>
+            <option>重庆</option>
+            <option>湖南</option>
+            <option>广东</option>
+            <option>山东</option>
+            <option>四川</option>
+            <option>江西</option>
+            <option>甘肃</option>
+            <option>广西</option>
+            <option>安徽</option>
+            <option>河南</option>
+            <option>内蒙古</option>
+            <option>云南</option>
+            <option>浙江</option>
+            <option>北京</option>
+            <option>贵州</option>
+            <option>江苏</option>
+            <option>湖北</option>
+            <option>福建</option>
+            <option>陕西</option>
+            <option>吉林</option>
+            <option>新疆</option>
+            <option>河北</option>
+            <option>辽宁</option>
+            <option>山西</option>
+            <option>黑龙江</option>
+            <option>天津</option>
+            <option>上海</option>
+            <option>海南</option>
+            <option>青海</option>
+            <option>西藏</option>
+            <option>宁夏</option>
+            <option>其他</option>
+          </select>
           <a href="#">7天内</a> | 
           <a href="#">30天内</a> | 
           <input type="text" name="date" id="date_demo1" value="" class="form-control gri_date input-sm" style=" width:auto; display:inline-block;"/>
@@ -107,198 +144,146 @@
       <div class="fL chartContent" style="width:50%;">
         <div class="CountMain" id="CountMainMonth" style="height:350px;"></div>
       </div>
-      <div class="fL tableContent" style="width:50%; height:345px; overflow-y:auto;">
-        <!-- <p>查看统计：</p> -->
-        <table class="table table-hover">
-          <thead>
-            <tr>
-              <th>日期</th>
-              <th>仅注册</th>
-              <th>已验证</th>
-              <th>在线用户</th>
-            </tr>
-          </thead>
-          <tr>
-            <td>01-01</td>
-            <td>28</td>
-            <td>25</td>
-            <td>742</td>
-          </tr>
-          <tr>
-            <td>01-02</td>
-            <td>28</td>
-            <td>25</td>
-            <td>742</td>
-          </tr>
-          <tr>
-            <td>01-03</td>
-            <td>28</td>
-            <td>25</td>
-            <td>742</td>
-          </tr>
-          <tr>
-            <td>01-04</td>
-            <td>28</td>
-            <td>25</td>
-            <td>742</td>
-          </tr>
-          <tr>
-            <td>01-05</td>
-            <td>28</td>
-            <td>25</td>
-            <td>742</td>
-          </tr>
-          <tr>
-            <td>01-06</td>
-            <td>28</td>
-            <td>25</td>
-            <td>742</td>
-          </tr>
-          <tr>
-            <td>01-07</td>
-            <td>28</td>
-            <td>25</td>
-            <td>742</td>
-          </tr>
-          <tr>
-            <td>01-08</td>
-            <td>28</td>
-            <td>25</td>
-            <td>742</td>
-          </tr>
-          <tr>
-            <td>01-09</td>
-            <td>28</td>
-            <td>25</td>
-            <td>742</td>
-          </tr>
-          <tr>
-            <td>01-10</td>
-            <td>28</td>
-            <td>25</td>
-            <td>742</td>
-          </tr>
-          <tr>
-            <td>01-11</td>
-            <td>28</td>
-            <td>25</td>
-            <td>742</td>
-          </tr>
-          <tr>
-            <td>01-12</td>
-            <td>28</td>
-            <td>25</td>
-            <td>742</td>
-          </tr>
-          <tr>
-            <td>01-13</td>
-            <td>28</td>
-            <td>25</td>
-            <td>742</td>
-          </tr>
-          <tr>
-            <td>01-14</td>
-            <td>28</td>
-            <td>25</td>
-            <td>742</td>
-          </tr>
-          <tr>
-            <td>01-15</td>
-            <td>28</td>
-            <td>25</td>
-            <td>742</td>
-          </tr>
-          <tr>
-            <td>01-16</td>
-            <td>28</td>
-            <td>25</td>
-            <td>742</td>
-          </tr>
-          <tr>
-            <td>01-17</td>
-            <td>28</td>
-            <td>25</td>
-            <td>742</td>
-          </tr>
-          <tr>
-            <td>01-18</td>
-            <td>28</td>
-            <td>25</td>
-            <td>742</td>
-          </tr>
-          <tr>
-            <td>01-19</td>
-            <td>28</td>
-            <td>25</td>
-            <td>742</td>
-          </tr>
-          <tr>
-            <td>01-20</td>
-            <td>28</td>
-            <td>25</td>
-            <td>742</td>
-          </tr>
-          <tr>
-            <td>01-21</td>
-            <td>28</td>
-            <td>25</td>
-            <td>742</td>
-          </tr>
-          <tr>
-            <td>01-22</td>
-            <td>28</td>
-            <td>25</td>
-            <td>742</td>
-          </tr>
-          <tr>
-            <td>01-23</td>
-            <td>28</td>
-            <td>25</td>
-            <td>742</td>
-          </tr>
-          <tr>
-            <td>01-24</td>
-            <td>28</td>
-            <td>25</td>
-            <td>742</td>
-          </tr>
-          <tr>
-            <td>01-25</td>
-            <td>28</td>
-            <td>25</td>
-            <td>742</td>
-          </tr>
-          <tr>
-            <td>01-26</td>
-            <td>28</td>
-            <td>25</td>
-            <td>742</td>
-          </tr>
-          <tr>
-            <td>01-27</td>
-            <td>28</td>
-            <td>25</td>
-            <td>742</td>
-          </tr>
-          <tr>
-            <td>01-28</td>
-            <td>28</td>
-            <td>25</td>
-            <td>742</td>
-          </tr>
-          <tr>
-            <td>01-29</td>
-            <td>28</td>
-            <td>25</td>
-            <td>742</td>
-          </tr>
-          <tr>
-            <td>01-30</td>
-            <td>28</td>
-            <td>25</td>
-            <td>742</td>
-          </tr>
-        </table>
+      <div class="fL tableContent" style="width:50%;">
+        <p class="tipMain">点击查看详情：</p>
+        <div style="height:345px; overflow-y:auto;">
+          <table class="table table-hover table-striped tablelist">
+            <thead>
+              <tr>
+                <th>地区</th>
+                <th class="taCble">人数（人）</th>
+              </tr>
+            </thead>
+            <tr>
+              <td><a href="admin-produce.html">重庆</a></td>
+              <td>456</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">湖南</a></a></td>
+              <td>200</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">广东</a></td>
+              <td>141</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">山东</a></td>
+              <td>97</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">四川</a></td>
+              <td>1</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">江西</a></td>
+              <td>12</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">甘肃</a></td>
+              <td>67</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">广西</a></td>
+              <td>86</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">安徽</a></td>
+              <td>456</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">河南</a></td>
+              <td>200</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">内蒙古</a></td>
+              <td>141</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">云南</a></td>
+              <td>97</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">浙江</a></td>
+              <td>1</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">北京</a></td>
+              <td>12</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">贵州</a></td>
+              <td>67</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">江苏</a></td>
+              <td>86</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">湖北</a></td>
+              <td>86</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">福建</a></td>
+              <td>86</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">陕西</a></td>
+              <td>86</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">吉林</a></td>
+              <td>86</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">新疆</a></td>
+              <td>86</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">河北</a></td>
+              <td>86</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">辽宁</a></td>
+              <td>86</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">山西</a></td>
+              <td>86</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">黑龙江</a></td>
+              <td>86</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">天津</a></td>
+              <td>86</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">上海</a></td>
+              <td>86</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">海南</a></td>
+              <td>86</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">青海</a></td>
+              <td>86</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">西藏</a></td>
+              <td>86</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">宁夏</a></td>
+              <td>86</td>
+            </tr>
+            <tr>
+              <td><a href="admin-produce.html">其他</a></td>
+              <td>86</td>
+            </tr>
+          </table>
+        </div>
       </div>
     </div>
   </div>
@@ -317,12 +302,28 @@ option = {
         trigger: 'axis'
     },
     legend: {
-        data:['仅注册','已开通','在线用户']
+        data:['总注册人数']
+    },
+    grid: {
+        left: '2%',
+        right: '3%',
+        bottom: '3%',
+        containLabel: true
+    },
+     toolbox: {
+      show: false,
+        feature: {
+            saveAsImage: {}
+        }
     },
     xAxis:  {
         name:'日期',
         type: 'category',
         boundaryGap: false,
+        splitLine: {
+            show: true,
+            interval: 'auto'
+        },
         data: ['01-01','01-02','01-03','01-04','01-05','01-06','01-07','01-08','01-09','01-10','01-11','01-12','01-13','01-14','01-15','01-16','01-17','01-18','01-19','01-20','01-21','01-22','01-23','01-24','01-25','01-26','01-27','01-28','01-29','01-30']
     },
     yAxis: {
@@ -331,31 +332,9 @@ option = {
     },
     series: [
         {
-            name:'仅注册',
+            name:'总注册人数',
             type:'line',
-            data:[28,52,54,58,60,46,24,21,58,64,62,42,28,52,54,58,60,46,24,21,58,64,62,42,58,60,46,24,21,58,64],
-            markPoint: {
-                data: [
-                    {type: 'max', name: '最大值'},
-                    {type: 'min', name: '最小值'}
-                ]
-            }
-        },
-        {
-            name:'已开通',
-            type:'line',
-            data:[25,50,50,54,60,44,23,16,54,60,62,40,25,50,50,54,60,44,23,20,54,60,62,40,50,54,60,44,23,20,54],
-            markPoint: {
-                data: [
-                    {type: 'max', name: '最大值'},
-                    {type: 'min', name: '最小值'}
-                ]
-            }
-        },
-        {
-            name:'在线用户',
-            type:'line',
-            data:[742,749,802,778,796,847,747,894,804,680,742,749,802,778,796,847,747,894,804,680,742,749,802,778,796,847,747,894,804,680,797],
+            data:[101,155,200,80,186,134,126,168,132,105,90,89,136,155,160,166,132,89,101,206,188,163,136,116,138,155,160,144,123,120],
             markPoint: {
                 data: [
                     {type: 'max', name: '最大值'},
@@ -373,40 +352,77 @@ var myChart = echarts.init(document.getElementById('CountMainMonth'), 'macarons'
 // 指定图表的配置项和数据
 option = {
     title : {
-        text:'用户注册比例',
-        x:'center',
-        textStyle:{
-          fontSize:20,
-          fontFamily : "微软雅黑", 
-        }
+        text: '新增用户省份分布',
+        x:'center'
     },
     tooltip : {
         trigger: 'item',
         formatter: "{a} <br/>{b} : {c} ({d}%)"
     },
     legend: {
-        //orient: 'vertical',
-        x:'center',
-        y:'bottom',
-        data: ['仅注册','已开通']
+        orient: 'vertical',
+        x: '0',
+        data: ['重庆','湖南','广东','山东','四川','江西','甘肃','广西','安徽','河南','内蒙古','云南','浙江','北京','贵州','江苏','湖北','福建','陕西','吉林','新疆','河北','辽宁','山西','黑龙江','天津','上海','海南','青海','西藏','宁夏','其他']
     },
     series : [
         {
-            name: '用户注册情况',
-            type: 'pie',
-            radius : '55%',
-            center: ['50%', '50%'],
-            data:[
-                {value:1830, name:'仅注册'},
-                {value:1200, name:'已开通'}
-            ],
-            itemStyle: {
-                emphasis: {
-                    shadowBlur: 10,
-                    shadowOffsetX: 0,
-                    shadowColor: 'rgba(0, 0, 0, 0.5)'
+            name:'客户分布',
+            type:'pie',
+            radius : ['55%', '80%'],
+            itemStyle : {
+                normal : {
+                    label : {
+                        show : false,
+                    },
+                    labelLine : {
+                        show : false
+                    }
+                },
+                emphasis : {
+                    label : {
+                        show : true,
+                        position : 'center',
+                        textStyle : {
+                            fontSize : '30',
+                            fontWeight : 'bold'
+                        }
+                    }
                 }
-            }
+            },
+            data:[
+                {value:4783, name:'重庆'},
+                {value:3543, name:'湖南'},
+                {value:3225, name:'广东'},
+                {value:2321, name:'山东'},
+                {value:1769, name:'四川'},
+                {value:1737, name:'江西'},
+                {value:1568, name:'甘肃'},
+                {value:1516, name:'广西'},
+                {value:1434, name:'安徽'},
+                {value:1416, name:'河南'},
+                {value:1160, name:'内蒙古'},
+                {value:1146, name:'云南'},
+                {value:1144, name:'浙江'},
+                {value:1069, name:'北京'},
+                {value:1044, name:'贵州'},
+                {value:950, name:'江苏'},
+                {value:820, name:'湖北'},
+                {value:764, name:'福建'},
+                {value:710, name:'陕西'},
+                {value:707, name:'吉林'},
+                {value:473, name:'新疆'},
+                {value:461, name:'河北'},
+                {value:308, name:'辽宁'},
+                {value:273, name:'山西'},
+                {value:217, name:'黑龙江'},
+                {value:168, name:'天津'},
+                {value:161, name:'上海'},
+                {value:135, name:'海南'},
+                {value:110, name:'青海'},
+                {value:42, name:'西藏'},
+                {value:42, name:'宁夏'},
+                {value:494, name:'其他'}
+            ]
         }
     ]
 };

admin-users1.html

@@ -0,0 +1,330 @@
+<!DOCTYPE html>
+<html lang=zh-cn> 
+<head>
+  <meta charset=utf-8> 
+  <title>网络版后台管理</title> 
+  <meta name=description content=>  
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="renderer" content="webkit"> 
+  <link rel=stylesheet href=css/bootstrap.css> 
+  <link rel=stylesheet href=css/style.css>
+  <link rel=stylesheet href=css/dateRange.css>
+  <script src=js/jquery-1.9.1.min.js></script>
+  <script src=js/bootstrap.js></script>
+  <script src=js/global.js></script>
+  <script src=js/echarts.js></script>
+  <script type=js/macarons.js></script>
+  <script src=js/dateRange.js></script>
+</head>
+
+<body>
+<div class="headerWrapper"></div>
+<div class="wrapper">
+  <div class="leftWrapper">
+    <div class="leftContent">
+      <div class="logo logoWl">
+        <h2>网<span class="logoInfo">络版后台</span><!-- <span class="caret"></span> --></h2>
+        <!-- <div class="logoList">
+          <ul>
+            <li><a href="#">文库</a></li>
+            <li><a href="#">问答</a></li>
+            <li><a href="#">价格信息</a></li>
+            <li><a href="#">官网</a></li>
+            <li><a href="#">通行帐号</a></li>
+          </ul>
+        </div> -->
+      </div>
+      <div class="subMenu">
+        <h2 class="subMenuTitle"><a><i class="iconImg icon-">B</i><div class="subMenuText">用户<span class="fR caret caret-triangle"></span></div></a></h2>
+        <div class="subMenuContent">
+          <ul>
+            <li><a href="admin-newsUser.html">最新用户</a></li>
+            <li><a href="admin-onlineUser.html">在线用户</a></li>
+            <li><a href="admin-allUser.html">所有用户</a></li>
+            <li><a href="admin-countTime.html">时长统计</a></li>
+          </ul>
+        </div>
+      </div>
+      <div class="subMenu">
+        <h2 class="subMenuTitle"><a class="active"><i class="iconImg icon-">C</i><div class="subMenuText">数据分析<span class="fR caret caret-triangle"></span></div></a></h2>
+        <div class="subMenuContent">
+          <ul>
+            <li><a href="admin-users.html">用户注册分析</a></li>
+            <li><a href="admin-produce.html">产品分析</a></li>
+            <li><a href="admin-count.html">客户分布</a></li>
+            <li><a href="admin-channel.html">获取渠道</a></li>
+          </ul>
+        </div>
+      </div>
+      <div class="subMenu">
+        <h2 class="subMenuTitle"><a><i class="iconImg icon-">A</i><div class="subMenuText">固化清单<span class="fR caret caret-triangle"></span></div></a></h2>
+        <div class="subMenuContent">
+          <ul>
+            <li><a href="admin-softList.html">用户列表</a></li>
+          </ul>
+        </div>
+      </div>
+    </div>
+    <div class="userMain">
+      <div class="userContent">
+          <span><img class="userImg" src="images/01.jpg"></span>
+          <div class="subMenuText userName"><a href="admin-userinfo.html">管理员</a> <a class="exit" href="#"><span class="glyphicon glyphicon-log-out"></span> 退出</a></div>
+      </div>
+    </div>
+  </div>
+  <!-- leftWrapper end -->
+  <div class="mainWrapper container-fluid">
+    <div class="page-header pageTop">
+      <h3>新增用户分析
+        <small class="btnTime">
+          <select class="form-control input-sm" style="width:auto; display:inline-block; margin-right:15px;">
+            <option>全部</option>
+            <option>重庆</option>
+            <option>湖南</option>
+            <option selected>广东</option>
+            <option>山东</option>
+            <option>四川</option>
+            <option>江西</option>
+            <option>甘肃</option>
+            <option>广西</option>
+            <option>安徽</option>
+            <option>河南</option>
+            <option>内蒙古</option>
+            <option>云南</option>
+            <option>浙江</option>
+            <option>北京</option>
+            <option>贵州</option>
+            <option>江苏</option>
+            <option>湖北</option>
+            <option>福建</option>
+            <option>陕西</option>
+            <option>吉林</option>
+            <option>新疆</option>
+            <option>河北</option>
+            <option>辽宁</option>
+            <option>山西</option>
+            <option>黑龙江</option>
+            <option>天津</option>
+            <option>上海</option>
+            <option>海南</option>
+            <option>青海</option>
+            <option>西藏</option>
+            <option>宁夏</option>
+            <option>其他</option>
+          </select>
+          <a href="#">7天内</a> | 
+          <a href="#">30天内</a> | 
+          <input type="text" name="date" id="date_demo1" value="" class="form-control gri_date input-sm" style=" width:auto; display:inline-block;"/>
+          <script type="text/javascript">
+            //var STATS_START_TIME = '1329148800';
+            var dateRange1 = new pickerDateRange('date_demo1', {
+              isTodayValid : true,
+              //isSingleDay : true,
+              startDate : '2016-03-12',
+              endDate : '2016-03-20',
+              needCompare : false,
+              defaultText : ' 至 ',
+              target : 'datePicker_demo1',
+              calendars : 3,
+              //theme : 'ta',
+              //shortOpr : true,
+              success : function(obj) {
+                $("#dCon_demo1").html('开始时间 : ' + obj.startDate + '<br/>结束时间 : ' + obj.endDate);
+              }
+            });
+          </script>
+        </small>
+      </h3>
+    </div>
+    <div class="chartContent">
+      <div class="CountMain" id="CountMainYh" style="height:350px;"></div>
+    </div>
+    <div class="proSection clearfix">
+      <div class="tableContent" style="height:345px; overflow-y:auto;">
+        <!-- <p>查看统计：</p> -->
+        <table class="table table-hover">
+          <thead>
+            <tr>
+              <th>日期</th>
+              <th>人数（人）</th>
+            </tr>
+          </thead>
+          <tr>
+            <td>01-01</td>
+            <td>456</td>
+          </tr>
+          <tr>
+            <td>01-02</td>
+            <td>200</td>
+          </tr>
+          <tr>
+            <td>01-03</td>
+            <td>141</td>
+          </tr>
+          <tr>
+            <td>01-04</td>
+            <td>97</td>
+          </tr>
+          <tr>
+            <td>01-05</td>
+            <td>1</td>
+          </tr>
+          <tr>
+            <td>01-06</td>
+            <td>12</td>
+          </tr>
+          <tr>
+            <td>01-07</td>
+            <td>67</td>
+          </tr>
+          <tr>
+            <td>01-08</td>
+            <td>86</td>
+          </tr>
+          <tr>
+            <td>01-09</td>
+            <td>456</td>
+          </tr>
+          <tr>
+            <td>01-10</td>
+            <td>200</td>
+          </tr>
+          <tr>
+            <td>01-11</td>
+            <td>141</td>
+          </tr>
+          <tr>
+            <td>01-12</td>
+            <td>97</td>
+          </tr>
+          <tr>
+            <td>01-13</td>
+            <td>1</td>
+          </tr>
+          <tr>
+            <td>01-14</td>
+            <td>12</td>
+          </tr>
+          <tr>
+            <td>01-15</td>
+            <td>67</td>
+          </tr>
+          <tr>
+            <td>01-16</td>
+            <td>86</td>
+          </tr>
+          <tr>
+            <td>01-17</td>
+            <td>86</td>
+          </tr>
+          <tr>
+            <td>01-18</td>
+            <td>86</td>
+          </tr>
+          <tr>
+            <td>01-19</td>
+            <td>86</td>
+          </tr>
+          <tr>
+            <td>01-20</td>
+            <td>86</td>
+          </tr>
+          <tr>
+            <td>01-21</td>
+            <td>86</td>
+          </tr>
+          <tr>
+            <td>01-22</td>
+            <td>86</td>
+          </tr>
+          <tr>
+            <td>01-23</td>
+            <td>86</td>
+          </tr>
+          <tr>
+            <td>01-24</td>
+            <td>86</td>
+          </tr>
+          <tr>
+            <td>01-25</td>
+            <td>86</td>
+          </tr>
+          <tr>
+            <td>01-26</td>
+            <td>86</td>
+          </tr>
+          <tr>
+            <td>01-27</td>
+            <td>86</td>
+          </tr>
+          <tr>
+            <td>01-28</td>
+            <td>86</td>
+          </tr>
+          <tr>
+            <td>01-29</td>
+            <td>86</td>
+          </tr>
+          <tr>
+            <td>01-30</td>
+            <td>86</td>
+          </tr>
+          <tr>
+            <td>01-31</td>
+            <td>86</td>
+          </tr>
+        </table>
+      </div>
+    </div>
+  </div>
+  <!-- mainWrapper end -->    
+</div>
+
+<script type="text/javascript">
+// 基于准备好的dom，初始化echarts实例
+var myChart = echarts.init(document.getElementById('CountMainYh'));
+// 指定图表的配置项和数据
+option = {
+    title: {
+        text: '用户月数据分析'
+    },
+    tooltip: {
+        trigger: 'axis'
+    },
+    legend: {
+        data:['总注册人数']
+    },
+    xAxis:  {
+        name:'日期',
+        type: 'category',
+        boundaryGap: false,
+        data: ['01-01','01-02','01-03','01-04','01-05','01-06','01-07','01-08','01-09','01-10','01-11','01-12','01-13','01-14','01-15','01-16','01-17','01-18','01-19','01-20','01-21','01-22','01-23','01-24','01-25','01-26','01-27','01-28','01-29','01-30','01-31']
+    },
+    yAxis: {
+        name:'人数',
+        type: 'value'
+    },
+    series: [
+        {
+            name:'总注册人数',
+            type:'line',
+            data:[101,155,200,80,186,134,126,168,132,105,90,89,136,155,160,166,132,89,101,206,188,163,136,116,138,155,160,144,123,120,94.150],
+            markPoint: {
+                data: [
+                    {type: 'max', name: '最大值'},
+                    {type: 'min', name: '最小值'}
+                ]
+            }
+        }
+    ]
+};
+// 使用刚指定的配置项和数据显示图表。
+myChart.setOption(option);
+</script>
+
+</body>
+
+</html>
+
+         
+

css/style.css

@@ -235,6 +235,7 @@ table {
 .userInfoImg{
   width:48px;
   height:48px;
+  border-radius: 24px;
 }
 .userInfoHead{
   margin:0 15px 0 0;
@@ -293,7 +294,7 @@ table {
   padding-bottom: 10px;
 }
 .tableContent dl{
-  margin:10px;
+  margin:10px 100px;
 }
 .proSection{
   margin:40px 0 0 0;
@@ -303,6 +304,13 @@ table {
   margin:0 20px;
   /*color:#ccc;*/
 }
+.btnTime a{
+  padding:0 3px;
+}
+/*.btnTime a.active{ 
+  font-weight: bold;
+  cursor:default;
+}*/
 .dropdown-list{
   max-height: 250px;
   min-width: 230px;
@@ -311,7 +319,7 @@ table {
 }
 .dropdown-list li{
   float:left;
-  margin-right: 15px;
+  margin:5px 15px 5px 0;
 }
 .input-search{
   cursor:pointer;
@@ -341,3 +349,25 @@ table {
 .searchBig .glyphicon-search{
   font-size: 20px;
 }
+.userSearch{
+  margin:0 auto;
+  width:850px;
+}
+.userSearch h4{
+  margin-bottom: 15px;
+}
+
+
+
+.taCble {
+    cursor: pointer;
+    background-image: url(small.gif);
+    background-repeat: no-repeat;
+    background-position: 100px 13px;
+}
+.taCble.headerSortUp {
+  background-image: url(small_asc.gif);
+}
+.taCble.headerSortDown {
+  background-image: url(small_desc.gif);
+}

js/global.js

@@ -18,13 +18,16 @@ $(document).ready(function(){
     $(this).parent().next().addClass("menu-list");
     });
   $(".leftWrapper").hover(function(){  
-    $(".leftWrapper").stop().animate({width:"200px"},300);
-    $(".mainWrapper").stop().animate({marginLeft:"215px",marginRight:"-200px"},300);
+    timer = setTimeout(function(){
+    $(".leftWrapper").stop().animate({width:"200px"},500);
+    $(".mainWrapper").stop().animate({marginLeft:"215px",marginRight:"-200px"},500);
     $(".subMenuText").fadeIn(500);
-    $(".logoInfo").show("fast");
+    $(".logoInfo").show(500);
+     },300);
   },function(){
-    $(".leftWrapper").stop().animate({width:"56px"},300);
-    $(".mainWrapper").stop().animate({marginLeft:"61px",marginRight:"15px",paddingRight:"0"},300);
+    clearTimeout(timer);
+    $(".leftWrapper").stop().animate({width:"56px"},500);
+    $(".mainWrapper").stop().animate({marginLeft:"61px",marginRight:"15px",paddingRight:"0"},500);
     $(".subMenuText").fadeOut("fast");
     $(".logoInfo").hide();
     $(".subMenuContent").slideUp();
@@ -34,14 +37,15 @@ $(document).ready(function(){
   },function(){
     $(".logoList").hide();
   }); 
-  $(".dropdown-toggleSF").click(function(){
-    $(this).next().toggle();
-  });
-  $(document).bind("click",function(e){
-  var target  = $(e.target);
-  if(target.closest(".dropdown-toggleSF,.dropdown-list li").length == 0){/*.closest()沿 DOM 树向上遍历，直到找到已应用选择器的一个匹配为止，返回包含零个或一个元素的 jQuery 对象。*/
-  $(".dropdown-list").hide();
-  };
-  e.stopPropagation();
-  });
+  $(".tablelist").tablesorter({widthFixed: true});
+  // $(".dropdown-toggleSF").click(function(){
+  //   $(this).next().toggle();
+  // });
+  // $(document).bind("click",function(e){
+  // var target  = $(e.target);
+  // if(target.closest(".dropdown-toggleSF,.dropdown-list li").length == 0){/*.closest()沿 DOM 树向上遍历，直到找到已应用选择器的一个匹配为止，返回包含零个或一个元素的 jQuery 对象。*/
+  // $(".dropdown-list").hide();
+  // };
+  // e.stopPropagation();
+  // });
 });

js/jquery.tablesorter.js

@@ -0,0 +1,727 @@
+
+(function($) {
+	$.extend({
+		tablesorter: new function() {
+			
+			var parsers = [], widgets = [];
+			
+			this.defaults = {
+				cssHeader: "header",
+				cssAsc: "headerSortUp",
+				cssDesc: "headerSortDown",
+				sortInitialOrder: "asc",
+				sortMultiSortKey: "shiftKey",
+				sortForce: null,
+				textExtraction: "simple",
+				parsers: {}, 
+				widgets: [],		
+				widgetZebra: {css: ["even","odd"]},
+				headers: {},
+				widthFixed: false,
+				cancelSelection: true,
+				sortList: [],
+				headerList: [],
+				dateFormat: "us",
+				debug: false
+			};
+			
+			/* debuging utils */
+			function benchmark(label,stamp) {
+				log(label + "," + (new Date().getTime() - stamp.getTime()) + "ms");
+			}
+			
+			function log(s) {
+				if (typeof console != "undefined" && typeof console.debug != "undefined") {
+					console.log(s);
+				} else {
+					alert(s);
+				}
+			}
+						
+			/* parsers utils */
+			function buildParserCache(table,$headers) {
+				
+				if(table.config.debug) { var parsersDebug = ""; }
+				
+				var list = [], cells = table.tBodies[0].rows[0].cells, l = cells.length;
+				
+				for (var i=0;i < l; i++) {
+					var p = false;
+					
+					if($.meta && ($($headers[i]).data() && $($headers[i]).data().sorter)  ) {
+					
+						p = getParserById($($headers[i]).data().sorter);	
+					
+					} else if((table.config.headers[i] && table.config.headers[i].sorter)) {
+
+						p = getParserById(table.config.headers[i].sorter);
+					}
+					if(!p) {
+						p = detectParserForColumn(table.config,cells[i]);
+					}
+
+					if(table.config.debug) { parsersDebug += "column:" + i + " parser:" +p.id + "\n"; }
+
+					list.push(p);
+				}
+
+				if(table.config.debug) { log(parsersDebug); }
+
+				return list;
+			};
+			
+			function detectParserForColumn(config,node) {
+				var l = parsers.length;
+				for(var i=1; i < l; i++) {
+					if(parsers[i].is($.trim(getElementText(config,node)))) {
+						return parsers[i];
+					}
+				}
+				
+				// 0 is always the generic parser (text)
+				return parsers[0];
+			}
+			
+			function getParserById(name) {
+				var l = parsers.length;
+				for(var i=0; i < l; i++) {
+					if(parsers[i].id.toLowerCase() == name.toLowerCase()) {	
+						return parsers[i];
+					}
+				}
+				return false;
+			}
+			
+			/* utils */
+			function buildCache(table) {
+				
+				if(table.config.debug) { var cacheTime = new Date(); }
+				
+				var totalRows = (table.tBodies[0] && table.tBodies[0].rows.length) || 0,
+					totalCells = table.tBodies[0].rows[0].cells.length,
+					parsers = table.config.parsers, 
+					cache = {row: [], normalized: []};
+				
+					for (var i=0;i < totalRows; ++i) {
+					
+						/** Add the table data to main data array */
+						var c = table.tBodies[0].rows[i], cols = [];
+					
+						cache.row.push($(c));
+						
+						for(var j=0; j < totalCells; ++j) {
+							cols.push(parsers[j].format(getElementText(table.config,c.cells[j]),table,c.cells[j]));	
+						}
+												
+						cols.push(i); // add position for rowCache
+						cache.normalized.push(cols);
+						cols = null;
+					};
+				
+				if(table.config.debug) { benchmark("Building cache for " + totalRows + " rows:", cacheTime); }
+				
+				return cache;
+			};
+			
+			function getElementText(config,node) {
+				
+				if(!node) return "";
+								
+				var t = "";
+				
+				
+				if(typeof(config.textExtraction) == "function") {
+					t = config.textExtraction(node);
+				} else if(config.textExtraction == "complex") { 
+					t = $(node).text();
+				} else {
+					if(node.childNodes[0] && node.childNodes[0].hasChildNodes()) {
+						t = node.childNodes[0].innerHTML;
+					} else {
+						t = node.innerHTML;
+					}
+				}
+				return t;
+			}
+			
+			function appendToTable(table,cache) {
+				
+				if(table.config.debug) {var appendTime = new Date()}
+				
+				var c = cache, 
+					r = c.row, 
+					n= c.normalized, 
+					totalRows = n.length, 
+					checkCell = (n[0].length-1), 
+					tableBody = $("tbody:first",table).empty();
+					rows = [];
+				
+				for (var i=0;i < totalRows; i++) {
+					 	rows.push(r[n[i][checkCell]]);
+						if(table.config.appender == null) {
+							tableBody.append(r[n[i][checkCell]]);
+						}
+				}	
+
+				if(table.config.appender != null) {
+					table.config.appender(table,rows);	
+				}
+				
+				rows = null;
+				
+				//apply table widgets
+				applyWidget(table);
+				
+				if(table.config.debug) { benchmark("Rebuilt table:", appendTime); }
+			
+			};
+			
+			function buildHeaders(table) {
+				
+				if(table.config.debug) { var time = new Date(); }
+				
+				var meta = ($.meta) ? true : false, tableHeadersRows = [];
+			
+				for(var i = 0; i < table.tHead.rows.length; i++) { tableHeadersRows[i]=0; };
+				
+				$tableHeaders = $(checkCellColSpan(table, tableHeadersRows, 0,table.tHead.rows[0].cells.length));
+		
+				$tableHeaders.each(function(index) {
+							
+					this.count = 0;
+					this.column = index;
+					this.order = formatSortingOrder(table.config.sortInitialOrder);
+					
+					if(checkHeaderMetadata(this) || checkHeaderOptions(table,index)) this.sortDisabled = true;
+					
+					if(!this.sortDisabled) {
+						$(this).addClass(table.config.cssHeader);
+					}
+					
+					// add cell to headerList
+					table.config.headerList[index]= this;
+				});
+				
+				if(table.config.debug) { benchmark("Built headers:", time); log($tableHeaders); }
+				
+				return $tableHeaders;
+				
+			};
+						
+		   	function checkCellColSpan(table, headerArr, row) {
+                var arr = [], r = table.tHead.rows, c = r[row].cells;
+				
+				for(var i=headerArr[row]; i < c.length; i++) {
+					var cell = c[i];
+					
+					if ( cell.colSpan > 1) { 
+						arr = arr.concat(checkCellColSpan(table, headerArr,row+cell.rowSpan));
+					} else  {
+						if(table.tHead.length == 1 || (cell.rowSpan > 1 || !r[row+1])) {
+							arr.push(cell);
+						}
+						headerArr[row] = (i+row);
+					}
+				}
+				return arr;
+			};
+			
+			function checkHeaderMetadata(cell) {
+				if(($.meta) && ($(cell).data().sorter === false)) { return true; };
+				return false;
+			}
+			
+			function checkHeaderOptions(table,i) {	
+				if((table.config.headers[i]) && (table.config.headers[i].sorter === false)) { return true; };
+				return false;
+			}
+			
+			function applyWidget(table) {
+				var c = table.config.widgets;
+				var l = c.length;
+				for(var i=0; i < l; i++) {
+					
+					getWidgetById(c[i]).format(table);
+				}
+				
+			}
+			
+			function getWidgetById(name) {
+				var l = widgets.length;
+				for(var i=0; i < l; i++) {
+					if(widgets[i].id.toLowerCase() == name.toLowerCase() ) {
+						return widgets[i]; 
+					}
+				}
+			};
+			
+			function formatSortingOrder(v) {
+				
+				if(typeof(v) != "Number") {
+					i = (v.toLowerCase() == "desc") ? 1 : 0;
+				} else {
+					i = (v == (0 || 1)) ? v : 0;
+				}
+				return i;
+			}
+			
+			function isValueInArray(v, a) {
+				var l = a.length;
+				for(var i=0; i < l; i++) {
+					if(a[i][0] == v) {
+						return true;	
+					}
+				}
+				return false;
+			}
+				
+			function setHeadersCss(table,$headers, list, css) {
+				// remove all header information
+				$headers.removeClass(css[0]).removeClass(css[1]);
+				
+				var h = [];
+				$headers.each(function(offset) {
+						if(!this.sortDisabled) {
+							h[this.column] = $(this);					
+						}
+				});
+
+				var l = list.length; 
+				for(var i=0; i < l; i++) {
+					h[list[i][0]].addClass(css[list[i][1]]);
+				}
+			}
+			
+			function fixColumnWidth(table,$headers) {
+				var c = table.config;
+				if(c.widthFixed) {
+					var colgroup = $('<colgroup>');
+					$("tbody:first tr:first td",table).each(function() {
+						
+						colgroup.append($('<col>').css('width',$(this).width()));
+					
+					});
+					$(table).prepend(colgroup);
+				};
+			}
+			
+			function updateHeaderSortCount(table,sortList) {
+				var c = table.config, l = sortList.length;
+				for(var i=0; i < l; i++) {
+					var s = sortList[i], o = c.headerList[s[0]];
+					o.count = s[1];
+					o.count++;
+				}
+			}
+			
+			/* sorting methods */
+			function multisort(table,sortList,cache) {
+				
+				if(table.config.debug) { var sortTime = new Date(); }
+				
+				var dynamicExp = "var sortWrapper = function(a,b) {", l = sortList.length;
+					
+				for(var i=0; i < l; i++) {
+					
+					var c = sortList[i][0];
+					var order = sortList[i][1];
+					var s = (getCachedSortType(table.config.parsers,c) == "text") ? ((order == 0) ? "sortText" : "sortTextDesc") : ((order == 0) ? "sortNumeric" : "sortNumericDesc");
+					
+					var e = "e" + i;
+					
+					dynamicExp += "var " + e + " = " + s + "(a[" + c + "],b[" + c + "]); ";
+					dynamicExp += "if(" + e + ") { return " + e + "; } ";
+					dynamicExp += "else { ";
+				}
+					
+				for(var i=0; i < l; i++) {
+					dynamicExp += "}; ";
+				}
+				
+				dynamicExp += "return 0; ";	
+				dynamicExp += "}; ";	
+				
+				eval(dynamicExp);
+				
+				cache.normalized.sort(sortWrapper);
+				
+				if(table.config.debug) { benchmark("Sorting on " + sortList.toString() + " and dir " + order+ " time:", sortTime); }
+				
+				return cache;
+			};
+			
+			function sortText(a,b) {
+				return ((a < b) ? -1 : ((a > b) ? 1 : 0));
+			};
+			
+			function sortTextDesc(a,b) {
+				return ((b < a) ? -1 : ((b > a) ? 1 : 0));
+			};	
+			
+	 		function sortNumeric(a,b) {
+				return a-b;
+			};
+			
+			function sortNumericDesc(a,b) {
+				return b-a;
+			};
+			
+			function getCachedSortType(parsers,i) {
+				return parsers[i].type;
+			};
+			
+			/* public methods */
+			this.construct = function(settings) {
+
+				return this.each(function() {
+					
+					
+					
+					
+					var $this, $document,$headers, cache, config, shiftDown = 0, sortOrder;
+					
+					this.config = {};
+					
+					config = $.extend(this.config, $.tablesorter.defaults, settings);
+					
+					if(!this.tHead || !this.tBodies) return true;
+					
+					// store common expression for speed					
+					$this = $(this);
+					
+					// build headers
+					$headers = buildHeaders(this);
+					
+					// try to auto detect column type, and store in tables config
+					this.config.parsers = buildParserCache(this,$headers);
+					
+					
+					// build the cache for the tbody cells
+					cache = buildCache(this);
+					
+					// get the css class names, could be done else where.
+					var sortCSS = [config.cssDesc,config.cssAsc];
+					
+					// fixate columns if the users supplies the fixedWidth option
+					fixColumnWidth(this);
+					
+					// apply event handling to headers
+					// this is to big, perhaps break it out?
+					$headers.click(function(e) {
+						if(!this.sortDisabled) {
+							// store exp, for speed
+							var $cell = $(this);
+	
+							// get current column index
+							var i = this.column;
+							
+							// get current column sort order
+							this.order = this.count++ % 2;
+							
+							
+							
+							// user only whants to sort on one column
+							if(!e[config.sortMultiSortKey]) {
+								
+								// flush the sort list
+								config.sortList = [];
+								
+								if(config.sortForce != null) {
+									var a = config.sortForce; 
+									for(var j=0; j < a.length; j++) { 	
+										config.sortList.push(a[j]);	
+									}
+								}
+								
+								// add column to sort list
+								config.sortList.push([i,this.order]);
+							
+							// multi column sorting	
+							} else {
+								// the user has clicked on an all ready sortet column.
+								if(isValueInArray(i,config.sortList)) {	 
+									
+									// revers the sorting direction for all tables.
+									for(var j=0; j < config.sortList.length; j++) {
+										var s = config.sortList[j], o = config.headerList[s[0]];
+										if(s[0] == i) {
+											o.count = s[1];
+											o.count++;
+											s[1] = o.count % 2;
+										}
+									}	
+								} else {
+									// add column to sort list array
+									config.sortList.push([i,this.order]);
+								}
+							};
+							
+							//set css for headers
+							setHeadersCss($this[0],$headers,config.sortList,sortCSS);
+							
+							// sort the table and append it to the dom
+							appendToTable($this[0],multisort($this[0],config.sortList,cache));
+							
+							// stop normal event by returning false
+							return false;
+						}
+					// cancel selection	
+					}).mousedown(function() {
+						if(config.cancelSelection) {
+							this.onselectstart = function() {return false};
+							//alert(this.onselectstart);
+							return false;
+						}
+					});
+					
+					// apply easy methods that trigger binded events
+					$this.bind("update",function() {
+						
+						// rebuild the cache map
+						cache = buildCache(this);
+						
+					}).bind("sorton",function(e,list) {
+						
+						// update and store the sortlist
+						var sortList = config.sortList = list;
+						
+						// update header count index
+						updateHeaderSortCount(this,sortList);
+						
+						//set css for headers
+						setHeadersCss(this,$headers,sortList,sortCSS);
+						
+						// sort the table and append it to the dom
+						appendToTable(this,multisort(this,sortList,cache));
+						
+					}).bind("appendCache",function() {
+						
+						appendToTable(this,cache);
+					
+					}).bind("applyWidgetId",function(e,id) {
+						
+						getWidgetById(id).format(this);
+						
+					});
+					
+					if($.meta && ($(this).data() && $(this).data().sortlist)) {
+						config.sortList = $(this).data().sortlist;
+					}
+					// if user has supplied a sort list to constructor.
+					if(config.sortList.length > 0) {
+						$this.trigger("sorton",[config.sortList]);	
+					}
+					
+					// apply widgets
+					applyWidget(this);
+				});
+			};
+			
+			this.addParser = function(parser) {
+				var l = parsers.length, a = true;
+				for(var i=0; i < l; i++) {
+					if(parsers[i].id.toLowerCase() == parser.id.toLowerCase()) {
+						a = false;
+					}
+				}
+				if(a) { parsers.push(parser); };
+			};
+			
+			this.addWidget = function(widget) {
+				widgets.push(widget);
+			};
+			
+			this.formatFloat = function(s) {
+
+				var i = parseFloat(s);
+				return (isNaN(i)) ? 0 : i;
+			};
+			this.formatInt = function(s) {
+				var i = parseInt(s);
+				return (isNaN(i)) ? 0 : i;
+			};
+			
+		}
+	});
+	
+	// extend plugin scope
+	$.fn.extend({
+        tablesorter: $.tablesorter.construct
+	});
+	
+	// add default parsers
+	$.tablesorter.addParser({
+		id: "text",
+		is: function(s) {
+			return true;
+		},
+		format: function(s) {
+			return $.trim(s.toLowerCase());
+		},
+		type: "text"
+	});
+	
+	$.tablesorter.addParser({
+		id: "integer",
+		is: function(s) {
+			return s.match(new RegExp(/^\d+$/));
+		},
+		format: function(s) {
+			return $.tablesorter.formatInt(s);
+		},
+		type: "numeric"
+	});
+	
+	$.tablesorter.addParser({
+		id: "currency",
+		is: function(s) {
+			return /^[£$€?.]/.test(s);
+		},
+		format: function(s) {
+			return $.tablesorter.formatFloat(s.replace(new RegExp(/[^0-9.]/g),""));
+		},
+		type: "numeric"
+	});
+	
+	$.tablesorter.addParser({
+		id: "integer",
+		is: function(s) {
+			return /^\d+$/.test(s);
+		},
+		format: function(s) {
+			return $.tablesorter.formatFloat(s);
+		},
+		type: "numeric"
+	});
+	
+	$.tablesorter.addParser({
+		id: "floating",
+		is: function(s) {
+			return s.match(new RegExp(/^(\+|-)?[0-9]+\.[0-9]+((E|e)(\+|-)?[0-9]+)?$/));
+		},
+		format: function(s) {
+			return $.tablesorter.formatFloat(s.replace(new RegExp(/,/),""));
+		},
+		type: "numeric"
+	});
+	
+	$.tablesorter.addParser({
+		id: "ipAddress",
+		is: function(s) {
+			return /^\d{2,3}[\.]\d{2,3}[\.]\d{2,3}[\.]\d{2,3}$/.test(s);
+		},
+		format: function(s) {
+			var a = s.split(".");
+			var r = "";
+			for (var i = 0, item; item = a[i]; i++) {
+			   if(item.length == 2) {
+					r += "0" + item;
+			   } else {
+					r += item;
+			   }
+			}
+			return $.tablesorter.formatFloat(s);
+		},
+		type: "numeric"
+	});
+	
+	$.tablesorter.addParser({
+		id: "url",
+		is: function(s) {
+			return /^(https?|ftp|file):\/\/$/.test(s);
+		},
+		format: function(s) {
+			return jQuery.trim(s.replace(new RegExp(/(https?|ftp|file):\/\//),''));
+		},
+		type: "text"
+	});
+	
+	$.tablesorter.addParser({
+		id: "isoDate",
+		is: function(s) {
+			return /^\d{4}[\/-]\d{1,2}[\/-]\d{1,2}$/.test(s);
+		},
+		format: function(s) {
+			return $.tablesorter.formatFloat((s != "") ? new Date(s.replace(new RegExp(/-/g),"/")).getTime() : "0");
+		},
+		type: "numeric"
+	});
+	
+	$.tablesorter.addParser({
+		id: "percent",
+		is: function(s) {
+			return /^\d{1,3}%$/.test(s);
+		},
+		format: function(s) {
+			return $.tablesorter.formatFloat(s.replace(new RegExp(/%/g),""));
+		},
+		type: "numeric"
+	});
+	
+	$.tablesorter.addParser({
+		id: "usLongDate",
+		is: function(s) {
+			return /^[A-Za-z]{3,10}\.? [0-9]{1,2}, ([0-9]{4}|\'?[0-9]{2}) (([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(AM|PM)))$/.test(s);
+		},
+		format: function(s) {
+			return $.tablesorter.formatFloat(new Date(s).getTime());
+		},
+		type: "numeric"
+	});
+	
+	$.tablesorter.addParser({
+		id: "shortDate",
+		is: function(s) {
+			return /\d{1,2}[\/-]\d{1,2}[\/-]\d{2,4}/.test(s);
+		},
+		format: function(s,table) {
+			var c = table.config;
+			s = s.replace(new RegExp(/-/g),"/");
+			if(c.dateFormat == "us") {
+				/** reformat the string in ISO format */
+				s = s.replace(new RegExp(/(\d{1,2})[\/-](\d{1,2})[\/-](\d{4})/), "$3/$1/$2");
+			} else if(c.dateFormat == "uk") {
+				/** reformat the string in ISO format */
+				s = s.replace(new RegExp(/(\d{1,2})[\/-](\d{1,2})[\/-](\d{4})/), "$3/$2/$1");
+			} else if(c.dateFormat == "dd/mm/yy" || c.dateFormat == "dd-mm-yy") {
+				s = s.replace(new RegExp(/(\d{1,2})[\/-](\d{1,2})[\/-](\d{2})/), "$1/$2/$3");	
+			}
+			return $.tablesorter.formatFloat(new Date(s).getTime());
+		},
+		type: "numeric"
+	});
+	
+	$.tablesorter.addParser({
+	    id: "time",
+	    is: function(s) {
+	        return /^(([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(am|pm)))$/.test(s);
+	    },
+	    format: function(s) {
+	        return $.tablesorter.formatFloat(new Date("2000/01/01 " + s).getTime());
+	    },
+	  type: "numeric"
+	});
+	
+	
+	$.tablesorter.addParser({
+	    id: "metadata",
+	    is: function(s) {
+	        return false;
+	    },
+	    format: function(s,table,cell) {
+			var c = table.config, p = (!c.parserMetadataName) ? 'sortValue' : c.parserMetadataName;
+	        return $(cell).data()[p];
+	    },
+	  type: "numeric"
+	});
+	
+	// add default widgets
+	$.tablesorter.addWidget({
+		id: "zebra",
+		format: function(table) {
+			$("> tbody:first/tr:visible:even",table).removeClass(table.config.widgetZebra.css[1]).addClass(table.config.widgetZebra.css[0]);
+			$("> tbody:first/tr:visible:odd",table).removeClass(table.config.widgetZebra.css[0]).addClass(table.config.widgetZebra.css[1]);
+		}
+	});
+	
+})(jQuery);