浏览代码

完整版提交

outaozhen 8 年之前
父节点
当前提交
f572c907c4

+ 100 - 20
css/style.css

@@ -34,7 +34,7 @@ dd {
   margin-left:0
 }
 body{
-  font-size:62.5%;
+  font-size:12px;
 }
 html, form, fieldset, a, ul, ol, li, div, legend, label,
 br, input, button, textarea, h1, h2, h3, h4, h5,em{
@@ -113,7 +113,7 @@ a:focus {
   line-height: 3.2rem;
 }
 .wrapTop{
-  height:4rem;
+  height:5rem;
   background:url(headerBg.jpg) repeat-x 0 0;
 }
 .wrapTop .mainLogo{
@@ -123,7 +123,6 @@ a:focus {
   background:url(logo.png) no-repeat 0 0;
 }
 .wrapTop .userInfo{
-  padding:0 1rem;
   font-size: 1.8rem;
   color:#fff;
 }
@@ -135,19 +134,20 @@ a:focus {
   color:#333;
 }
 .wrapTop .userInfo{
-  padding:1rem 1rem 0 1rem;
+  padding:1rem 2rem 0 1rem;
 }
 .wrapTop .userInfo a{
   color:#fff;
 }
 .wrapTop .userInfo .topImg{
-  padding:0 0 0 1rem;
+  padding:0 0 0 2rem;
 }
 .mainNav{
-  margin:0 1rem;
+  margin:0 1.5rem;
 }
 .mainNav ul li{
-  padding:1rem 0;
+  position:relative;
+  padding:1.5rem 0;
   border-bottom:1px solid #ddd; 
 }
 .mainNav .projectImg{
@@ -159,7 +159,6 @@ a:focus {
   text-align: center;
 }
 .navIcon{
-  line-height: 4.3rem;
   font-size: 3.2rem;
   color:#333;
 }
@@ -167,23 +166,19 @@ a:focus {
   margin:0 0 0 6.5rem;
 }
 .projectRight h4{
-  padding:0.8rem 0 0.3rem 0;
+  margin-bottom: 0.5rem;
   color:#333;
 }
 .projectRight p{
-  padding:0.3rem 0;
   color:#333;
 }
-.mainNav ul li{
-  position:relative;
-}
 .badge{
   position:absolute;
   left:3.2rem;
   top:1.3rem;
 }
 .headerLeft{
-  padding:0.7rem 0 0 1rem;
+  padding:1rem 0 0 1rem;
   font-size: 2rem;
 }
 .headerLeft a{
@@ -231,7 +226,7 @@ a:focus {
 .wrapGraphic ul li{
   float:left;
   font-size: 1.2rem;
-  margin:1.5rem 0 1.5rem 1.8rem;
+  margin:1.5rem 0 1.5rem 1.5rem;
 }
 .graphic{
   width:1rem;
@@ -349,7 +344,7 @@ a:focus {
   border-bottom: 1px solid #ddd;
 }
 .filesDetail dd{
-  padding:1rem 0;
+  padding:1.5rem 0;
   border-bottom: 1px solid #ddd;
 }
 .btnOrange{
@@ -389,13 +384,13 @@ a:focus {
   position:fixed;
   bottom:0;
   width:100%;
-  height:3.5rem;
+  height:5.5rem;
 }
 .bottomToolsbar ul li{
   float:left;
   width:50%;
-  height:3.5rem;
-  line-height: 3.5rem;
+  height:5.5rem;
+  line-height: 5.5rem;
   text-align: center;
 }
 .bottomToolsbar ul li button{
@@ -414,4 +409,89 @@ a:focus {
 .bottomView form label{
   font-size: 1.4rem;
   margin-bottom: 0.5rem;
-}
+}
+.wrapContent .userInfoList{
+  margin:0 1rem;
+}
+.userInfoList ul li{
+  padding:1.5rem 1rem;
+  font-size: 1.4rem;
+  border-bottom: 1px solid #ddd;
+}
+.userInfoList ul li a{
+  color:#333;
+}
+.userLeft.userTouImg{
+  padding:1.5rem 0 0 0;
+}
+.userRight{
+  text-align: right;
+}
+.userRight span{
+  font-size: 1.6rem;
+  color:#555;
+}
+.p-1{
+  padding:0.5rem 1rem;
+}
+.modalWrap{
+  top:20%;
+}
+.shareList{
+}
+.shareList ul li{
+  font-size: 1.6rem;
+  margin:2rem 0;
+}
+.shareList .shareTitle{
+  background:#f1f1f1;
+  padding:1rem;
+  border-top: 1px solid #ddd;
+  border-bottom: 1px solid #ddd;
+}
+.shareList .shareLink{
+  display:none;
+  padding:1rem;
+  border-bottom: 1px solid #ddd;
+}
+.labelSwitch{
+  display: inline-block;
+  vertical-align: middle;
+  width: 3.8rem;
+  border-radius: 1rem;
+  border:1px solid #ddd;
+  background:#fcfcfc;
+  box-sizing: border-box;
+  height: 2rem;
+  position: relative;
+  cursor: pointer;
+  -webkit-align-self: center;
+  align-self: center;
+}
+.labelSwitch input[type="checkbox"]{
+  display:none;
+}
+.labelSwitch .checkbox{
+  position:absolute;
+  width: 2rem;
+  border-radius: 1rem;
+  box-sizing: border-box;
+  height: 2rem;
+  background: #fff;
+  border:1px solid #ddd;
+  z-index: 0;
+  margin:0;
+  padding:0;
+  top:-1px;
+  cursor: pointer;
+}
+.shareBtn{
+  display:none;
+}
+.modalCont li{
+  padding:1rem 0;
+  border-bottom: 1px solid #ddd;
+}
+.modalCont li:last-child{
+  border-bottom: none;
+};

+ 2 - 2
index.html

@@ -5,7 +5,7 @@
     <title>纵横计量支付系统</title>
     <meta name=description content=计量支付>
     <meta name=copyright content=smartcost.com.cn>
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no">
     <link rel=stylesheet href=css/bootstrap.css>
     <link rel=stylesheet href=css/style.css>
     <script src=js/jquery-1.9.1.min.js></script>
@@ -20,7 +20,7 @@
                     <span class="glyphicon glyphicon-option-vertical topImg"></span>
                 </div>
                 <ul class="dropdown-menu" id="dropdownMenu" aria-labelledby="dropdownMenu1">
-                    <li><a href="#">张三</a></li>
+                    <li><a href="userInfo.html">张三</a></li>
                     <li><a href="#">退出</a></li>
                 </ul>
             </div>

文件差异内容过多而无法显示
+ 32 - 0
js/echarts.min.js


+ 24 - 6
js/global.js

@@ -3,9 +3,10 @@ $(function(){
     $('[data-toggle="tooltip"]').tooltip()
   });
   $('.dropdown-toggle').dropdown();
-
-  $(".openPro").click(function(){
-    if($(".projectDetailNot").css("display")=="none"){
+  
+  $(".projectSeList li .openPro").click(function(){
+    var projectDetail = $(this).siblings(".projectDetailNot");
+    if(projectDetail.css("display")=="none"){
       $(this).text("隐藏所有标段");
       $(this).siblings(".projectDetailNot").slideDown();
     }else{
@@ -13,8 +14,25 @@ $(function(){
       $(this).siblings(".projectDetailNot").slideUp();
     }
   });
-  // $(".submit").click(function(){
-  //   $(".bottomView").show();
-  // });
+
+  $(".labelSwitch").click(function(e){
+    if($(e.target).is('input')){
+        return;
+      };
+    var shareBtn = $(this).parents().siblings().children(".shareBtn");
+    var Switch = $(this).parents().siblings(".shareLink");
+    if(Switch.css("display")=="none"){
+      $(this).addClass("Switch");
+      $(this).css("background","#5eb95e");
+      $(this).children(".checkbox").css("left","2rem");
+      $(Switch).slideDown();
+      $(shareBtn).show();
+    }else{
+      $(this).css("background","#fff");
+      $(this).children(".checkbox").css("left","-1px");
+      $(Switch).slideUp();
+      $(shareBtn).hide();
+    }
+  });
 });
 

+ 1 - 1
login.html

@@ -5,7 +5,7 @@
     <title>纵横计量支付系统</title>
     <meta name=description content=计量支付>
     <meta name=copyright content=smartcost.com.cn>
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no">
     <link rel=stylesheet href=css/bootstrap.css>
     <link rel=stylesheet href=css/style.css>
     <script src=js/jquery-1.9.1.min.js></script>

+ 20 - 24
r-project-section-detail.html

@@ -5,13 +5,13 @@
     <title>纵横计量支付系统</title>
     <meta name=description content=计量支付>
     <meta name=copyright content=smartcost.com.cn>
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no">
     <link rel=stylesheet href=css/bootstrap.css>
     <link rel=stylesheet href=css/style.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="http://s1.bdstatic.com/r/www/cache/ecom/esl/1-6-10/esl.js"></script>
+    <script src=js/echarts.min.js></script> 
 </head>
 <body>
     <div class="wrapTop">
@@ -44,7 +44,7 @@
         <div class="project">
             <div class="proSection">
                 <!--图表4-->
-                <div id="chartContainer4" style="height: 300px; width: 100%;">
+                <div id="chartContainer4" style="height: 350px; width: 100%;">
                 </div>
                 <!--图表5-->
                 <div id="chartContainer5" style="height: 300px; width: 100%;">
@@ -124,23 +124,8 @@
     </div>
 
     <script type="text/javascript">
-        // 路径配置
-        require.config({
-            paths:{ 
-                'echarts' : 'http://echarts.baidu.com/build/echarts'
-            }
-        });
-        
-        // 使用
-        require(
-            [
-                'echarts',
-                'echarts/chart/pie', // 使用柱状图就加载bar模块,按需加载
-                'echarts/chart/bar'
-            ],
-            function(ec) {
                 //4 标段期数计量进度//
-                var myChart = ec.init(document.getElementById('chartContainer4'));   
+                var myChart = echarts.init(document.getElementById('chartContainer4'));   
                 var option = {
                   color: ['#e9af68','#57b7b6','#e4575a','#959eac','#6699FF',
                           '#d38b70','#8fb7cf','#cd5c5c','#ffa500','#40e0d0',
@@ -153,6 +138,11 @@
     legend: {
         data:['本期合同计量','本期数量变更计量','截至上期累计完成','本期完成计量','完成度']
     },
+    dataZoom : {
+        show : true,
+        start :0,
+        end : 100
+    },
     xAxis : [
         {
             type : 'category',
@@ -160,6 +150,13 @@
             data : ['第一期','第二期','第三期','第四期','第五期','第六期','第七期']
         }
     ],
+    grid:[
+        {
+            x2:'40',
+            top:'25%',
+            bottom:'20%',
+        }
+    ],
     yAxis : [
         {
             type : 'value',
@@ -219,8 +216,7 @@
                 myChart.setOption(option); 
                 //4 标段期数计量进度//
                 //5 期数组成//
-                // 基于准备好的dom,初始化echarts图表
-                var myChart = ec.init(document.getElementById('chartContainer5'));   
+                var myChart = echarts.init(document.getElementById('chartContainer5'));   
                 var option = {
                   color: ['#e9af68','#57b7b6','#e4575a','#959eac','#6699FF',
                           '#d38b70','#8fb7cf','#cd5c5c','#ffa500','#40e0d0',
@@ -230,6 +226,7 @@
                       text: '期数计量组成',
                       x:'left'
                   },
+
                   tooltip : {
                       trigger: 'item',
                       formatter: "{a} <br/>{b}:{c} 元<br>占标段:{d} %"
@@ -239,8 +236,9 @@
                       {
                           name:'标段计量分布',
                           type:'pie',
+                          roseType: 'angle',
                           radius : '40%',
-                          center: ['45%', 155],
+                          center: ['50%', 155],
                           data:[
                               {value:27814964.00, name:'第一期'},
                               {value:41043186.10, name:'第二期'},
@@ -256,8 +254,6 @@
                 // 为echarts对象加载数据 
                 myChart.setOption(option); 
                 //5 期数组成//
-            }
-        );
     </script>
 
 </body>

+ 1 - 1
r-project-section-files-detail.html

@@ -5,7 +5,7 @@
     <title>纵横计量支付系统</title>
     <meta name=description content=计量支付>
     <meta name=copyright content=smartcost.com.cn>
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no">
     <link rel=stylesheet href=css/bootstrap.css>
     <link rel=stylesheet href=css/style.css>
     <script src=js/jquery-1.9.1.min.js></script>

+ 1 - 1
r-project-section-files.html

@@ -5,7 +5,7 @@
     <title>纵横计量支付系统</title>
     <meta name=description content=计量支付>
     <meta name=copyright content=smartcost.com.cn>
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no">
     <link rel=stylesheet href=css/bootstrap.css>
     <link rel=stylesheet href=css/style.css>
     <script src=js/jquery-1.9.1.min.js></script>

+ 40 - 3
r-project-section-measure.html

@@ -5,7 +5,7 @@
     <title>纵横计量支付系统</title>
     <meta name=description content=计量支付>
     <meta name=copyright content=smartcost.com.cn>
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no">
     <link rel=stylesheet href=css/bootstrap.css>
     <link rel=stylesheet href=css/style.css>
     <script src=js/jquery-1.9.1.min.js></script>
@@ -111,8 +111,45 @@
         </form> 
       </div>
       <ul>
-        <li><button type="button" class="submit btn-danger">审批不通过</button></li>
-        <li><button type="button" class="submit btn-success">审批通过</button></li>
+        <li><button type="button" class="submit btn-danger" data-toggle="modal" data-target="#myModalUnpass">审批不通过</button></li>
+        <li><button type="button" class="submit btn-success" data-toggle="modal" data-target="#myModalPass">审批通过</button></li>
       </ul>
     </div>
+
+    <div class="modal fade modalWrap" id="myModalUnpass" 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">审批意见</h4>
+          </div>
+          <div class="modal-body">
+            <!-- <h4><p>审批意见</p></h4> -->
+            <textarea class="form-control" rows="3" placeholder="填写审批意见"></textarea>
+          </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 modalWrap" id="myModalPass" 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">审批意见</h4>
+          </div>
+          <div class="modal-body">
+            <!-- <h4><p>审批意见</p></h4> -->
+            <textarea class="form-control" rows="3" placeholder="填写审批意见"></textarea>
+          </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>

+ 3 - 3
r-project-section.html

@@ -5,7 +5,7 @@
     <title>纵横计量支付系统</title>
     <meta name=description content=计量支付>
     <meta name=copyright content=smartcost.com.cn>
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no">
     <link rel=stylesheet href=css/bootstrap.css>
     <link rel=stylesheet href=css/style.css>
     <script src=js/jquery-1.9.1.min.js></script>
@@ -59,7 +59,7 @@
           <ul>
             <li>
               <div class="projectSection">
-                <div class="title"><a href="#">土建合同&nbsp;<span class="glyphicon glyphicon-cog"></span></a></div>
+                <div class="title">土建合同</div>
                 <p>总价:<b>¥123,122,212.00</b></p>
                 <div class="progress">
                   <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="min-width: 2em; width: 65%;" data-toggle="tooltip" data-placement="bottom" title="累计完成:¥499,500,000.00">65%</div>
@@ -111,7 +111,7 @@
             </li>
             <li>
               <div class="projectSection">
-                <div class="title"><a href="#">监理合同目&nbsp;<span class="glyphicon glyphicon-cog"></span></a></div>
+                <div class="title">监理合同目</div>
                 <p>总价:<b>¥123,122,212.00</b></p>
                 <div class="progress">
                   <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="min-width: 2em; width: 65%;" data-toggle="tooltip" data-placement="bottom" title="累计完成:¥499,500,000.00">65%</div>

+ 1 - 1
r-project.html

@@ -5,7 +5,7 @@
     <title>纵横计量支付系统</title>
     <meta name=description content=计量支付>
     <meta name=copyright content=smartcost.com.cn>
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no">
     <link rel=stylesheet href=css/bootstrap.css>
     <link rel=stylesheet href=css/style.css>
     <script src=js/jquery-1.9.1.min.js></script>

+ 20 - 23
s-project-section-detail.html

@@ -5,13 +5,13 @@
     <title>纵横计量支付系统</title>
     <meta name=description content=计量支付>
     <meta name=copyright content=smartcost.com.cn>
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no">
     <link rel=stylesheet href=css/bootstrap.css>
     <link rel=stylesheet href=css/style.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="http://s1.bdstatic.com/r/www/cache/ecom/esl/1-6-10/esl.js"></script>
+    <script src=js/echarts.min.js></script> 
 </head>
 <body>
     <div class="wrapTop">
@@ -44,7 +44,7 @@
         <div class="project">
             <div class="proSection">
                 <!--图表4-->
-                <div id="chartContainer4" style="height: 300px; width: 100%;">
+                <div id="chartContainer4" style="height: 350px; width: 100%;">
                 </div>
                 <!--图表5-->
                 <div id="chartContainer5" style="height: 300px; width: 100%;">
@@ -124,23 +124,8 @@
     </div>
 
     <script type="text/javascript">
-        // 路径配置
-        require.config({
-            paths:{ 
-                'echarts' : 'http://echarts.baidu.com/build/echarts'
-            }
-        });
-        
-        // 使用
-        require(
-            [
-                'echarts',
-                'echarts/chart/pie', // 使用柱状图就加载bar模块,按需加载
-                'echarts/chart/bar'
-            ],
-            function(ec) {
                 //4 标段期数计量进度//
-                var myChart = ec.init(document.getElementById('chartContainer4'));   
+                var myChart = echarts.init(document.getElementById('chartContainer4'));   
                 var option = {
                   color: ['#e9af68','#57b7b6','#e4575a','#959eac','#6699FF',
                           '#d38b70','#8fb7cf','#cd5c5c','#ffa500','#40e0d0',
@@ -153,6 +138,11 @@
     legend: {
         data:['本期合同计量','本期数量变更计量','截至上期累计完成','本期完成计量','完成度']
     },
+    dataZoom : {
+        show : true,
+        start :0,
+        end : 100
+    },
     xAxis : [
         {
             type : 'category',
@@ -160,6 +150,14 @@
             data : ['第一期','第二期','第三期','第四期','第五期','第六期','第七期']
         }
     ],
+    grid:[
+        {
+            x:'45',
+            x2:'40',
+            top:'25%',
+            bottom:'20%',
+        }
+    ],
     yAxis : [
         {
             type : 'value',
@@ -220,7 +218,7 @@
                 //4 标段期数计量进度//
                 //5 期数组成//
                 // 基于准备好的dom,初始化echarts图表
-                var myChart = ec.init(document.getElementById('chartContainer5'));   
+                var myChart = echarts.init(document.getElementById('chartContainer5'));   
                 var option = {
                   color: ['#e9af68','#57b7b6','#e4575a','#959eac','#6699FF',
                           '#d38b70','#8fb7cf','#cd5c5c','#ffa500','#40e0d0',
@@ -239,8 +237,9 @@
                       {
                           name:'标段计量分布',
                           type:'pie',
+                          roseType: 'angle',
                           radius : '40%',
-                          center: ['45%', 155],
+                          center: ['50%', 155],
                           data:[
                               {value:27814964.00, name:'第一期'},
                               {value:41043186.10, name:'第二期'},
@@ -256,8 +255,6 @@
                 // 为echarts对象加载数据 
                 myChart.setOption(option); 
                 //5 期数组成//
-            }
-        );
     </script>
 
 </body>

+ 1 - 1
s-project-section-files-detail.html

@@ -5,7 +5,7 @@
     <title>纵横计量支付系统</title>
     <meta name=description content=计量支付>
     <meta name=copyright content=smartcost.com.cn>
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no">
     <link rel=stylesheet href=css/bootstrap.css>
     <link rel=stylesheet href=css/style.css>
     <script src=js/jquery-1.9.1.min.js></script>

+ 1 - 1
s-project-section-files.html

@@ -5,7 +5,7 @@
     <title>纵横计量支付系统</title>
     <meta name=description content=计量支付>
     <meta name=copyright content=smartcost.com.cn>
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no">
     <link rel=stylesheet href=css/bootstrap.css>
     <link rel=stylesheet href=css/style.css>
     <script src=js/jquery-1.9.1.min.js></script>

+ 27 - 60
s-project-section.html

@@ -5,13 +5,13 @@
     <title>纵横计量支付系统</title>
     <meta name=description content=计量支付>
     <meta name=copyright content=smartcost.com.cn>
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no">
     <link rel=stylesheet href=css/bootstrap.css>
     <link rel=stylesheet href=css/style.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="http://s1.bdstatic.com/r/www/cache/ecom/esl/1-6-10/esl.js"></script>
+    <script src=js/echarts.min.js></script> 
 </head>
 <body>
     <div class="wrapTop">
@@ -41,7 +41,7 @@
           <div id="chartContainer6" style="height: 300px; width: 100%; background-color: transparent; cursor: default;">
           </div>
           <!--图表7-->
-          <div id="chartContainer7" style="height: 300px; width: 100%; background-color: transparent; cursor: default;">
+          <div id="chartContainer7" style="height: 350px; width: 100%; background-color: transparent; cursor: default;">
           </div>
         </div>
       </div>
@@ -114,24 +114,9 @@
 
 
     <script type="text/javascript">
-        // 路径配置
-        require.config({
-            paths:{ 
-                'echarts' : 'http://echarts.baidu.com/build/echarts'
-            }
-        });
-        
-        // 使用
-        require(
-            [
-                'echarts',
-                'echarts/chart/pie', // 使用柱状图就加载bar模块,按需加载
-                'echarts/chart/bar'
-            ],
-            function(ec) {
                 //5 期数组成//
                 // 基于准备好的dom,初始化echarts图表
-                var myChart = ec.init(document.getElementById('chartContainer6'));   
+                var myChart = echarts.init(document.getElementById('chartContainer6'));   
                 var option = {
                   color: ['#e9af68','#57b7b6','#e4575a','#959eac','#6699FF',
                           '#d38b70','#8fb7cf','#cd5c5c','#ffa500','#40e0d0',
@@ -150,7 +135,8 @@
                       {
                           name:'标段计量分布',
                           type:'pie',
-                          radius : '40%',
+                          roseType: 'angle',
+                          radius : '20%',
                           center: ['50%', 155],
                           data:[
                               {value:27814964.00, name:'GZ-HJDQ-JL-001'},
@@ -164,44 +150,41 @@
                 myChart.setOption(option); 
                 //5 期数组成//
                 //6 标段计量分布//
-                // 基于准备好的dom,初始化echarts图表
-                var myChart = ec.init(document.getElementById('chartContainer7'));   
+                var myChart = echarts.init(document.getElementById('chartContainer7'));   
                 var option = {
-                          color:['#e9af68','#57b7b6','#e4575a','#959eac','#6699FF',
-                          '#d38b70','#8fb7cf','#cd5c5c','#ffa500','#40e0d0',
-                          '#1e90ff','#ff6347','#7b68ee','#00fa9a','#ffd700',
-                          '#5c616b','#ff6666','#3cb371','#b8860b','#30e0e0'],
+                          color:['#ff6666','#3cb371'],
                           title : {
-                              text: '标段按月进度'
+                              text: '项目按月进度'
                           },
                           tooltip : {
                               trigger: 'axis',
-                              formatter: "{b} <br/>{a}:{c} %<br/>{a1}:{c1} %<br/>{a2}:{c2} %"
+                              formatter: "{b} <br/>{a}:{c} %<br/>{a1}:{c1} %"
                           },
                           legend: {
-                              data:['GZ-HJDQ-JL-001','GZ-HJDQ-JL-002','GZ-HJDQ-JL-003']
-                          },
-                          toolbox: {
-                              show : true,
-                              feature : {
-                                  magicType : {show: true, type: ['line', 'bar']}
-                              }
+                              data:['累计完成','本月完成'],
+                              y:'35',
                           },
     dataZoom : {
         show : true,
-        realtime: true,
-        start :0,
+        start :50,
         end : 100
     },
     xAxis : [
         {
                                   type : 'category',
-                                  boundaryGap : false,
+                                  boundaryGap : true,
             data : [
-                '2013年2月','3月','4月','5月','6月','7月','8月','9月','10月'
+                '2月','3月','4月','5月','6月','7月','8月','9月','10月'
             ]
         }
     ],
+    grid:[
+        {
+            x:'50',
+            top:'25%',
+            bottom:'20%',
+        }
+    ],
     yAxis : [
                               {
                                   type : 'value',
@@ -213,7 +196,7 @@
                           ],
     series : [
                               {
-                                  name:'GZ-HJDQ-JL-001',
+                                  name:'累计完成',
                                   type:'line',
                                   itemStyle: {
                                       normal: {
@@ -228,22 +211,7 @@
                                   data:[10, 10, 30, 40, 50, 60, 80, 85, 100]
                               },
                               {
-                                  name:'GZ-HJDQ-JL-002',
-                                  type:'line',
-                                  itemStyle: {
-                                      normal: {
-                                          lineStyle: {
-                                              shadowColor : 'rgba(0,0,0,0.4)',
-                                              shadowBlur: 5,
-                                              shadowOffsetX: 3,
-                                              shadowOffsetY: 3
-                                          }
-                                      }
-                                  },
-                                  data:[20, 0, 10, 10, 10, 10, 10, 5, 15]
-                              },
-                              {
-                                  name:'GZ-HJDQ-JL-003',
+                                  name:'本月完成',
                                   type:'line',
                                   itemStyle: {
                                       normal: {
@@ -255,7 +223,7 @@
                                           }
                                       }
                                   },
-                                  data:[10, 0, 10, 15, 15, 5, 5, 5, 15]
+                                  data:[10, 0, 20, 10, 10, 10, 10, 5, 15]
                               }
                           ]
 };
@@ -263,8 +231,7 @@
                     
                 // 为echarts对象加载数据 
                 myChart.setOption(option); 
-                //3 标段计量分布//
-            }
-        );
+                //6 标段计量分布//                
+                
     </script>
 </body>

+ 1 - 1
s-project.html

@@ -5,7 +5,7 @@
     <title>纵横计量支付系统</title>
     <meta name=description content=计量支付>
     <meta name=copyright content=smartcost.com.cn>
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no">
     <link rel=stylesheet href=css/bootstrap.css>
     <link rel=stylesheet href=css/style.css>
     <script src=js/jquery-1.9.1.min.js></script>

+ 74 - 0
share-key.html

@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<html lang=zh-cn>
+<head>
+    <meta charset=utf-8>
+    <title>纵横计量支付系统</title>
+    <meta name=description content=计量支付>
+    <meta name=copyright content=smartcost.com.cn>
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no">
+    <link rel=stylesheet href=css/bootstrap.css>
+    <link rel=stylesheet href=css/style.css>
+    <script src=js/jquery-1.9.1.min.js></script>
+    <script src=js/bootstrap.js></script>
+</head>
+<body>
+    <div class="wrapTop">
+        <!-- <div class="userInfo fR">
+            <span class="glyphicon glyphicon-ok topImg"></span>
+        </div> -->
+        <div class="headerLeft fL">
+            <a href="w-project-detail.html">
+                <span class="glyphicon glyphicon-chevron-left"></span>
+                <b>标段类型设置</b>
+            </a>
+        </div>
+    </div>
+    <div class="wrapContent">
+        <div class="userInfoList">
+            <ul>
+                <li>
+                    <a href="w-project-section-edit.html">
+                      <div class="userLeft fL">标段类型名称</div>
+                      <div class="userRight">
+                        土建合同
+                        <span class="glyphicon glyphicon-menu-right"></span>
+                      </div>
+                    </a>
+                </li>
+                <li>
+                    <a href="#" type="button" data-toggle="modal" data-target="#myModal">
+                      <div class="userLeft fL">KEY</div>
+                      <div class="userRight">
+                        分享
+                        <span class="glyphicon glyphicon-menu-right"></span>
+                      </div>
+                    </a>
+                </li>
+            </ul>
+        </div>
+    </div>
+    <div class="modal fade modalWrap" 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">分享Key</h4>
+          </div>
+          <div class="modal-body">
+            <h4><p>纵横计量支付系统</p></h4>
+            <ul class="modalCont">
+              <li>
+                <p>黄金大桥项目</p>
+                <p><b>链接:</b>http://g1506.6jlzf.cn/share?pid=1212</p>
+                <textarea class="form-control" rows="2" placeholder="给朋友留言"></textarea>
+              </li>
+            </ul>
+          </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>

+ 36 - 0
share-list.html

@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html lang=zh-cn>
+<head>
+    <meta charset=utf-8>
+    <title>纵横计量支付系统</title>
+    <meta name=description content=计量支付>
+    <meta name=copyright content=smartcost.com.cn>
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no">
+    <link rel=stylesheet href=css/bootstrap.css>
+    <link rel=stylesheet href=css/style.css>
+    <script src=js/jquery-1.9.1.min.js></script>
+</head>
+<body>
+    <div class="wrapTop">
+        <div class="userInfo fR">
+            <span class="glyphicon glyphicon-ok topImg"></span>
+        </div>
+        <div class="headerLeft fL">
+            <a href="w-project-detail.html">
+                <span class="glyphicon glyphicon-chevron-left"></span>
+                <b>项目分享</b>
+            </a>
+        </div>
+    </div>
+    <div class="wrapContent">
+        <div class="projectFrom">
+            <p>选择分享类型</p>
+            <select class="form-control">
+                <option>请选择分享类型</option>
+                <option>分享项目</option>
+                <option>分享标段类型</option>
+                <option>分享标段</option>
+            </select >
+        </div>
+    </div>
+</body>

+ 82 - 0
share-project.html

@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<html lang=zh-cn>
+<head>
+    <meta charset=utf-8>
+    <title>纵横计量支付系统</title>
+    <meta name=description content=计量支付>
+    <meta name=copyright content=smartcost.com.cn>
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no">
+    <link rel=stylesheet href=css/bootstrap.css>
+    <link rel=stylesheet href=css/style.css>
+    <script src=js/jquery-1.9.1.min.js></script>
+    <script src=js/bootstrap.js></script>
+    <script src=js/global.js></script>
+</head>
+<body>
+    <div class="wrapTop">
+        <div class="userInfo fR shareBtn">
+            <a href data-toggle="modal" data-target="#myModal"><span class="glyphicon glyphicon-share topImg"></span></a>
+        </div>
+        <div class="headerLeft fL">
+            <a href="w-project-detail.html">
+                <span class="glyphicon glyphicon-chevron-left"></span>
+                <b>分享项目</b>
+            </a>
+        </div>
+    </div>
+    <div class="wrapContent">
+        <div class="shareList">
+          <ul>
+            <li>
+              <div class="shareTitle">
+                黄金大桥项目
+                <div class="fR">
+                  <label class="labelSwitch">
+                    <input type="checkbox">
+                    <div class="checkbox"></div>
+                  </label>
+                </div>
+              </div>
+              <div class="shareLink">http://g1506.6jlzf.cn/share?pid=1212</div>
+            </li>
+            <!-- <li>
+              <div class="shareTitle">
+                黄金大桥项目
+                <div class="fR">
+                  <label class="labelSwitch">
+                    <input type="checkbox">
+                    <div class="checkbox"></div>
+                  </label>
+                </div>
+              </div>
+              <div class="shareLink">http://g1506.6jlzf.cn/share?pid=1212</div>
+            </li> -->
+          </ul>
+        </div>
+    </div>
+
+    <div class="modal fade modalWrap" 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">分享项目</h4>
+          </div>
+          <div class="modal-body">
+            <h4><p>纵横计量支付系统</p></h4>
+            <ul class="modalCont">
+              <li>
+                <p>黄金大桥项目</p>
+                <p><b>链接:</b>http://g1506.6jlzf.cn/share?pid=1212</p>
+                <textarea class="form-control" rows="2" placeholder="给朋友留言"></textarea>
+              </li>
+            </ul>
+          </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>

+ 87 - 0
share-section-type.html

@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<html lang=zh-cn>
+<head>
+    <meta charset=utf-8>
+    <title>纵横计量支付系统</title>
+    <meta name=description content=计量支付>
+    <meta name=copyright content=smartcost.com.cn>
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no">
+    <link rel=stylesheet href=css/bootstrap.css>
+    <link rel=stylesheet href=css/style.css>
+    <script src=js/jquery-1.9.1.min.js></script>
+    <script src=js/bootstrap.js></script>
+    <script src=js/global.js></script>
+</head>
+<body>
+    <div class="wrapTop">
+        <div class="userInfo fR shareBtn">
+            <a href data-toggle="modal" data-target="#myModal"><span class="glyphicon glyphicon-share topImg"></span></a>
+        </div>
+        <div class="headerLeft fL">
+            <a href="w-project-detail.html">
+                <span class="glyphicon glyphicon-chevron-left"></span>
+                <b>分享标段类型</b>
+            </a>
+        </div>
+    </div>
+    <div class="wrapContent">
+        <div class="shareList">
+          <ul>
+            <li>
+              <div class="shareTitle">
+                土建合同
+                <div class="fR">
+                  <label class="labelSwitch">
+                    <input type="checkbox">
+                    <div class="checkbox"></div>
+                  </label>
+                </div>
+              </div>
+              <div class="shareLink">http://g1506.6jlzf.cn/share?pid=1212</div>
+            </li>
+            <li>
+              <div class="shareTitle">
+                监理合同
+                <div class="fR">
+                  <label class="labelSwitch">
+                    <input type="checkbox">
+                    <div class="checkbox"></div>
+                  </label>
+                </div>
+              </div>
+              <div class="shareLink">http://g1506.6jlzf.cn/share?pid=1212</div>
+            </li>
+          </ul>
+        </div>
+    </div>
+
+    <div class="modal fade modalWrap" 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">分享标段类型</h4>
+          </div>
+          <div class="modal-body">
+            <h4><p>纵横计量支付系统</p></h4>
+            <ul class="modalCont">
+              <li>
+                <p>黄金大桥项目/土建合同</p>
+                <p><b>链接:</b>http://g1506.6jlzf.cn/share?pid=1212</p>
+                <textarea class="form-control" rows="2" placeholder="给朋友留言"></textarea>
+              </li>
+              <li>
+                <p>黄金大桥项目/监理合同</p>
+                <p><b>链接:</b>http://g1506.6jlzf.cn/share?pid=1212</p>
+                <textarea class="form-control" rows="2" placeholder="给朋友留言"></textarea>
+              </li>
+            </ul>
+          </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>

+ 111 - 0
share-section.html

@@ -0,0 +1,111 @@
+<!DOCTYPE html>
+<html lang=zh-cn>
+<head>
+    <meta charset=utf-8>
+    <title>纵横计量支付系统</title>
+    <meta name=description content=计量支付>
+    <meta name=copyright content=smartcost.com.cn>
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no">
+    <link rel=stylesheet href=css/bootstrap.css>
+    <link rel=stylesheet href=css/style.css>
+    <script src=js/jquery-1.9.1.min.js></script>
+    <script src=js/bootstrap.js></script>
+    <script src=js/global.js></script>
+</head>
+<body>
+    <div class="wrapTop">
+        <div class="userInfo fR shareBtn">
+            <a href data-toggle="modal" data-target="#myModal"><span class="glyphicon glyphicon-share topImg"></span></a>
+        </div>
+        <div class="headerLeft fL">
+            <a href="w-project-detail.html">
+                <span class="glyphicon glyphicon-chevron-left"></span>
+                <b>分享标段</b>
+            </a>
+        </div>
+    </div>
+    <div class="wrapContent">
+        <div class="shareList">
+          <ul>
+            <li>
+              <div class="shareTitle">
+                SA-01
+                <div class="fR">
+                  <label class="labelSwitch">
+                    <input type="checkbox">
+                    <div class="checkbox"></div>
+                  </label>
+                </div>
+              </div>
+              <div class="shareLink">http://g1506.6jlzf.cn/share?pid=1212</div>
+            </li>
+            <li>
+              <div class="shareTitle">
+                SA-02
+                <div class="fR">
+                  <label class="labelSwitch">
+                    <input type="checkbox">
+                    <div class="checkbox"></div>
+                  </label>
+                </div>
+              </div>
+              <div class="shareLink">http://g1506.6jlzf.cn/share?pid=1212</div>
+            </li>
+            <li>
+              <div class="shareTitle">
+                SA-03
+                <div class="fR">
+                  <label class="labelSwitch">
+                    <input type="checkbox">
+                    <div class="checkbox"></div>
+                  </label>
+                </div>
+              </div>
+              <div class="shareLink">http://g1506.6jlzf.cn/share?pid=1212</div>
+            </li>
+            <li>
+              <div class="shareTitle">
+                SA-04
+                <div class="fR">
+                  <label class="labelSwitch">
+                    <input type="checkbox">
+                    <div class="checkbox"></div>
+                  </label>
+                </div>
+              </div>
+              <div class="shareLink">http://g1506.6jlzf.cn/share?pid=1212</div>
+            </li>
+          </ul>
+        </div>
+    </div>
+
+    <div class="modal fade modalWrap" 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">分享标段</h4>
+          </div>
+          <div class="modal-body">
+            <h4><p>纵横计量支付系统</p></h4>
+            <ul class="modalCont">
+              <li>
+                <p>黄金大桥项目/SA-01</p>
+                <p><b>链接:</b>http://g1506.6jlzf.cn/share?pid=1212</p>
+                <textarea class="form-control" rows="2" placeholder="给朋友留言"></textarea>
+              </li>
+              <li>
+                <p>黄金大桥项目/SA-02</p>
+                <p><b>链接:</b>http://g1506.6jlzf.cn/share?pid=1212</p>
+                <textarea class="form-control" rows="2" placeholder="给朋友留言"></textarea>
+              </li>
+            </ul>
+          </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>

+ 33 - 0
userInfo-edit-name.html

@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html lang=zh-cn>
+<head>
+    <meta charset=utf-8>
+    <title>纵横计量支付系统</title>
+    <meta name=description content=计量支付>
+    <meta name=copyright content=smartcost.com.cn>
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no">
+    <link rel=stylesheet href=css/bootstrap.css>
+    <link rel=stylesheet href=css/style.css>
+    <script src=js/jquery-1.9.1.min.js></script>
+</head>
+<body>
+    <div class="wrapTop">
+        <div class="userInfo fR">
+            <span class="glyphicon glyphicon-ok topImg"></span>
+        </div>
+        <div class="headerLeft fL">
+            <a href="userInfo.html">
+                <span class="glyphicon glyphicon-chevron-left"></span>
+                <b>修改姓名</b>
+            </a>
+        </div>
+    </div>
+    <div class="wrapContent">
+        <div class="projectFrom">
+            <div class="form-group">
+                <input type="text" class="form-control" id="user" placeholder="欧桃珍">
+            </div>
+            <p class="bg-danger p-1">请填写真实的姓名,方便与你联系</p>
+        </div>
+    </div>
+</body>

+ 38 - 0
userInfo-edit-password.html

@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html lang=zh-cn>
+<head>
+    <meta charset=utf-8>
+    <title>纵横计量支付系统</title>
+    <meta name=description content=计量支付>
+    <meta name=copyright content=smartcost.com.cn>
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no">
+    <link rel=stylesheet href=css/bootstrap.css>
+    <link rel=stylesheet href=css/style.css>
+    <script src=js/jquery-1.9.1.min.js></script>
+</head>
+<body>
+    <div class="wrapTop">
+        <div class="userInfo fR">
+            <span class="glyphicon glyphicon-ok topImg"></span>
+        </div>
+        <div class="headerLeft fL">
+            <a href="userInfo.html">
+                <span class="glyphicon glyphicon-chevron-left"></span>
+                <b>修改密码</b>
+            </a>
+        </div>
+    </div>
+    <div class="wrapContent">
+        <div class="projectFrom">
+            <div class="form-group">
+                <input type="password" class="form-control" id="user" placeholder="当前密码">
+            </div>
+            <div class="form-group">
+                <input type="password" class="form-control" id="user" placeholder="新密码">
+            </div>
+            <div class="form-group">
+                <input type="password" class="form-control" id="user" placeholder="确认新密码">
+            </div>
+        </div>
+    </div>
+</body>

+ 115 - 0
userInfo.html

@@ -0,0 +1,115 @@
+<!DOCTYPE html>
+<html lang=zh-cn>
+<head>
+    <meta charset=utf-8>
+    <title>纵横计量支付系统</title>
+    <meta name=description content=计量支付>
+    <meta name=copyright content=smartcost.com.cn>
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no">
+    <link rel=stylesheet href=css/bootstrap.css>
+    <link rel=stylesheet href=css/style.css>
+    <script src=js/jquery-1.9.1.min.js></script>
+    <script src=js/bootstrap.js></script> 
+    <script src=js/global.js></script>
+</head>
+<body>
+    <div class="wrapTop">
+        <div class="userInfo fR">
+            <!-- <div class="dropdown fL">
+                <div class="dropdown-toggle" id="dropdownMenu1" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+                    <button type="button" class="btn btn-primary btn-xs">排序</button>
+                </div>
+                <ul class="dropdown-menu" id="dropdownMenu" aria-labelledby="dropdownMenu1">
+                    <li><a href="#">创建时间</a></li>
+                    <li><a href="#">最近审批</a></li>
+                    <li><a href="#">进度完成度</a></li>
+                </ul>
+            </div> -->
+            <!-- <a href="w-project-add.html"><span class="glyphicon glyphicon-plus topImg"></span></a>  -->     
+        </div>
+        <div class="headerLeft fL">
+            <a href="index.html">
+                <span class="glyphicon glyphicon-chevron-left"></span>
+                <b>张三</b>
+            </a>
+        </div>
+    </div>
+    <div class="wrapContent">
+      <div class="userInfoList">
+        <ul>
+          <li>
+            <a href="#">
+              <div class="userLeft fL userTouImg">头像</div>
+              <div class="userRight">
+                <img src="images/avtra.png">
+                <span class="glyphicon glyphicon-menu-right"></span>
+              </div>
+            </a>
+          </li>
+          <li>
+            <a href="#">
+              <div class="userLeft fL">邮箱(登录帐号)</div>
+              <div class="userRight">
+                3216329758@qq.com
+                <span class="glyphicon glyphicon-menu-right"></span>
+              </div>
+            </a>
+          </li>
+          <li>
+            <a href="userInfo-edit-password.html">
+              <div class="userLeft fL">密码</div>
+              <div class="userRight">
+                <!-- 3216329758@qq.com -->
+                <span class="glyphicon glyphicon-menu-right"></span>
+              </div>
+            </a>
+          </li>
+          <li>
+            <a href="userInfo-edit-name.html">
+              <div class="userLeft fL">姓名</div>
+              <div class="userRight">
+                欧桃珍
+                <span class="glyphicon glyphicon-menu-right"></span>
+              </div>
+            </a>
+          </li>
+          <li>
+            <a href="#">
+              <div class="userLeft fL">单位名称</div>
+              <div class="userRight">
+                珠海纵横创新软件有限公司
+                <span class="glyphicon glyphicon-menu-right"></span>
+              </div>
+            </a>
+          </li>
+          <li>
+            <a href="#">
+              <div class="userLeft fL">职位</div>
+              <div class="userRight">
+                设计师
+                <span class="glyphicon glyphicon-menu-right"></span>
+              </div>
+            </a>
+          </li>
+          <li>
+            <a href="#">
+              <div class="userLeft fL">联系电话</div>
+              <div class="userRight">
+                0000-12345678 13750039378
+                <span class="glyphicon glyphicon-menu-right"></span>
+              </div>
+            </a>
+          </li>
+          <li>
+            <a href="#">
+              <div class="userLeft fL">QQ</div>
+              <div class="userRight">
+                3216329758
+                <span class="glyphicon glyphicon-menu-right"></span>
+              </div>
+            </a>
+          </li>
+        </ul>
+      </div>
+    </div>
+</body>

+ 1 - 1
w-project-add.html

@@ -5,7 +5,7 @@
     <title>纵横计量支付系统</title>
     <meta name=description content=计量支付>
     <meta name=copyright content=smartcost.com.cn>
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no">
     <link rel=stylesheet href=css/bootstrap.css>
     <link rel=stylesheet href=css/style.css>
     <script src=js/jquery-1.9.1.min.js></script>

+ 40 - 42
w-project-detail.html

@@ -5,13 +5,13 @@
     <title>纵横计量支付系统</title>
     <meta name=description content=计量支付>
     <meta name=copyright content=smartcost.com.cn>
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no">
     <link rel=stylesheet href=css/bootstrap.css>
     <link rel=stylesheet href=css/style.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="http://s1.bdstatic.com/r/www/cache/ecom/esl/1-6-10/esl.js"></script>
+    <script src=js/echarts.min.js></script> 
 </head>
 <body>
     <div class="wrapTop">
@@ -22,7 +22,7 @@
                 </div>
                 <ul class="dropdown-menu" id="dropdownMenu" aria-labelledby="dropdownMenu1">
                     <li><a href="w-project-edit.html">修改项目名称</a></li>
-                    <li><a href="#">项目分享</a></li>
+                    <li><a href="share-list.html">项目分享</a></li>
                 </ul>
             </div>
         </div>
@@ -46,33 +46,18 @@
                 <div id="chartContainer1" style="height: 300px; width: 100%; background-color: transparent; cursor: default;">
                 </div>
                 <!--图表2-->
-                <div id="chartContainer2" style="height: 300px; width: 100%; background-color: transparent; cursor: default;">
+                <div id="chartContainer2" style="height: 350px; width: 100%; background-color: transparent; cursor: default;">
                 </div>
                 <!--图表3-->
-                <div id="chartContainer3" style="height: 300px; width: 100%; background-color: transparent; cursor: default;">
+                <div id="chartContainer3" style="height: 350px; width: 100%; background-color: transparent; cursor: default; margin:2rem 0 0 0;">
                 </div>
             </div>
         </div>
     </div>
     <script type="text/javascript">
-        // 路径配置
-        require.config({
-            paths:{ 
-                'echarts' : 'http://echarts.baidu.com/build/echarts'
-            }
-        });
-        
-        // 使用
-        require(
-            [
-                'echarts',
-                'echarts/chart/pie', // 使用柱状图就加载bar模块,按需加载
-                'echarts/chart/bar'
-            ],
-            function(ec) {
                 //1 标段计量分布//
                 // 基于准备好的dom,初始化echarts图表
-                var myChart = ec.init(document.getElementById('chartContainer1'));   
+                var myChart = echarts.init(document.getElementById('chartContainer1'));   
                 var option = {
                   color: ['#e9af68','#57b7b6','#e4575a','#959eac','#ffa500',
                           '#d38b70','#8fb7cf','#cd5c5c','#5c616b','#40e0d0',
@@ -87,10 +72,10 @@
                       formatter: "{a} <br/>{b}:{c} <br>占总项目:{d} %"
                   },
                   legend: {
-                    selectedMode:false,
-                      orient : 'vertical',
-                      x : 'left',
-                      y : 'center',
+                      selectedMode:false,
+                      orient : 'horizontal',
+                      x : 'top',
+                      y : '50',
                       data:['土建合同','监理合同','设计合同','机电合同']
                   },
                   calculable : true,
@@ -98,8 +83,9 @@
                       {
                           name:'标段计量分布',
                           type:'pie',
-                          radius : '60%',
-                          center: ['55%', 175],
+                          roseType: 'angle',
+                          radius : '45%',
+                          center: ['50%', 175],
                           data:[
                               {value:27814964.00, name:'土建合同'},
                               {value:41043186.10, name:'监理合同'},
@@ -113,7 +99,7 @@
                 myChart.setOption(option); 
                 //1 标段计量分布//
                 //2 标段计量进度//
-                var myChart = ec.init(document.getElementById('chartContainer2'));   
+                var myChart = echarts.init(document.getElementById('chartContainer2'));   
                 var option = {
                   color:["#e9af68","#57b7b6","#e4575a"],
                   title : {
@@ -124,6 +110,7 @@
         formatter: "{b}  <br/>{a}:{c}元 <br/>{a1}:{c1}元<br/>{a2}:{c2} %"
     },
     legend: {
+        y: 'bottom',
         data:['总价','累计完成计量','完成进度百分比']
     },
     xAxis : [
@@ -132,13 +119,19 @@
             data : ['土建合同','监理合同','设计合同','机电合同']
         }
     ],
+    grid:[
+        {
+            x:'85',
+            x2:'50',
+        }
+    ],
     yAxis : [
         {
             type : 'value',
-            name : '金额',
+            name : '金额(元)',
             position:'left',
             axisLabel : {
-                formatter: '{value}'
+                formatter: '{value}'
             },
             splitArea : {show : true}
         },
@@ -149,19 +142,19 @@
             axisLabel : {
                 formatter: '{value} %'
             },
-            splitLine : {show : true}
+            splitLine : {show : false}
         }
     ],
     series : [
         {
             name:'总价',
             type:'bar',
-            data:[27814964.00,41043186.10, 42917475.00, 27634982.00],
+            data:[27814964,41043186, 42917475, 27634982]
         },
         {
             name:'累计完成计量',
             type:'bar',
-            data:[20571481.02,28770211.71, 23427801.00, 1708798.00],
+            data:[20571481.02,28770211.71, 23427801.00, 1708798.00]
         },
         {
             name:'完成进度百分比',
@@ -176,7 +169,7 @@
                 //2 标段计量进度//
                 //3 标段计量分布//
                 // 基于准备好的dom,初始化echarts图表
-                var myChart = ec.init(document.getElementById('chartContainer3'));   
+                var myChart = echarts.init(document.getElementById('chartContainer3'));   
                 var option = {
                           color:["#e9af68","#57b7b6"],
                           title : {
@@ -187,6 +180,7 @@
                               formatter: "{b} <br/>{a}:{c} %<br/>{a1}:{c1} %"
                           },
                           legend: {
+                              y:'30',
                               data:['累计完成','本月完成']
                           },
                           toolbox: {
@@ -197,19 +191,25 @@
                           },
     dataZoom : {
         show : true,
-        realtime: true,
-        start : 0,
+        start : 50,
         end : 100
     },
     xAxis : [
         {
                                   type : 'category',
-                                  boundaryGap : false,
+                                  boundaryGap : true,
             data : [
-                '2013年2月','3月','4月','5月','6月','7月','8月','9月','10月'
+                '2月','3月','4月','5月','6月','7月','8月','9月','10月'
             ]
         }
     ],
+    grid:[
+        {
+            x:'45',
+            x2:'20',
+            bottom:'20%',
+        }
+    ],
     yAxis : [
                               {
                                   type : 'value',
@@ -251,13 +251,11 @@
                                   data:[10, 0, 20, 10, 10, 10, 10, 5, 15]
                               }
                           ]
-};
+  };
                     
                     
                 // 为echarts对象加载数据 
                 myChart.setOption(option); 
                 //3 标段计量分布//
-            }
-        );
-    </script>
+</script>
 </body>

+ 1 - 1
w-project-edit.html

@@ -5,7 +5,7 @@
     <title>纵横计量支付系统</title>
     <meta name=description content=计量支付>
     <meta name=copyright content=smartcost.com.cn>
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no">
     <link rel=stylesheet href=css/bootstrap.css>
     <link rel=stylesheet href=css/style.css>
     <script src=js/jquery-1.9.1.min.js></script>

+ 26 - 26
w-project-section-detail.html

@@ -5,13 +5,13 @@
     <title>纵横计量支付系统</title>
     <meta name=description content=计量支付>
     <meta name=copyright content=smartcost.com.cn>
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no">
     <link rel=stylesheet href=css/bootstrap.css>
     <link rel=stylesheet href=css/style.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="http://s1.bdstatic.com/r/www/cache/ecom/esl/1-6-10/esl.js"></script>
+    <script src=js/echarts.min.js></script> 
 </head>
 <body>
     <div class="wrapTop">
@@ -21,8 +21,8 @@
                     <span class="glyphicon glyphicon-option-vertical topImg"></span>
                 </div>
                 <ul class="dropdown-menu" id="dropdownMenu" aria-labelledby="dropdownMenu1">
-                    <li><a href="#">修改项目名称</a></li>
-                    <li><a href="#">项目分享</a></li>
+                    <li><a href="index.html">首页</a></li>
+                    <li><a href="userInfo.html">张三</a></li>
                 </ul>
             </div>
             <a href="w-project-add.html"></a>
@@ -44,7 +44,7 @@
         <div class="project">
             <div class="proSection">
                 <!--图表4-->
-                <div id="chartContainer4" style="height: 300px; width: 100%;">
+                <div id="chartContainer4" style="height: 350px; width: 100%;">
                 </div>
                 <!--图表5-->
                 <div id="chartContainer5" style="height: 300px; width: 100%;">
@@ -124,23 +124,8 @@
     </div>
 
     <script type="text/javascript">
-        // 路径配置
-        require.config({
-            paths:{ 
-                'echarts' : 'http://echarts.baidu.com/build/echarts'
-            }
-        });
-        
-        // 使用
-        require(
-            [
-                'echarts',
-                'echarts/chart/pie', // 使用柱状图就加载bar模块,按需加载
-                'echarts/chart/bar'
-            ],
-            function(ec) {
                 //4 标段期数计量进度//
-                var myChart = ec.init(document.getElementById('chartContainer4'));   
+                var myChart = echarts.init(document.getElementById('chartContainer4'));   
                 var option = {
                   color: ['#e9af68','#57b7b6','#e4575a','#959eac','#6699FF',
                           '#d38b70','#8fb7cf','#cd5c5c','#ffa500','#40e0d0',
@@ -153,6 +138,9 @@
     legend: {
         data:['本期合同计量','本期数量变更计量','截至上期累计完成','本期完成计量','完成度']
     },
+    dataZoom: [
+           {show: true,start: 0, end: 100}
+      ],
     xAxis : [
         {
             type : 'category',
@@ -160,10 +148,22 @@
             data : ['第一期','第二期','第三期','第四期','第五期','第六期','第七期']
         }
     ],
+    grid:[
+        {
+            x:'45',
+            x2:'40',
+            top:'25%',
+            bottom:'20%',
+        }
+    ],
     yAxis : [
         {
-            type : 'value',
-            position: 'left',
+           type : 'value',
+            name : '金额',
+            position:'left',
+            axisLabel : {
+                formatter: '{value} 元'
+            },
             splitArea : {show : true}
         },
         {
@@ -220,7 +220,7 @@
                 //4 标段期数计量进度//
                 //5 期数组成//
                 // 基于准备好的dom,初始化echarts图表
-                var myChart = ec.init(document.getElementById('chartContainer5'));   
+                var myChart = echarts.init(document.getElementById('chartContainer5'));   
                 var option = {
                   color: ['#e9af68','#57b7b6','#e4575a','#959eac','#6699FF',
                           '#d38b70','#8fb7cf','#cd5c5c','#ffa500','#40e0d0',
@@ -239,6 +239,7 @@
                       {
                           name:'标段计量分布',
                           type:'pie',
+                          roseType: 'angle',
                           radius : '40%',
                           center: ['45%', 155],
                           data:[
@@ -256,8 +257,7 @@
                 // 为echarts对象加载数据 
                 myChart.setOption(option); 
                 //5 期数组成//
-            }
-        );
+            
     </script>
 
 </body>

+ 33 - 0
w-project-section-edit.html

@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html lang=zh-cn>
+<head>
+    <meta charset=utf-8>
+    <title>纵横计量支付系统</title>
+    <meta name=description content=计量支付>
+    <meta name=copyright content=smartcost.com.cn>
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no">
+    <link rel=stylesheet href=css/bootstrap.css>
+    <link rel=stylesheet href=css/style.css>
+    <script src=js/jquery-1.9.1.min.js></script>
+</head>
+<body>
+    <div class="wrapTop">
+        <div class="userInfo fR">
+            <span class="glyphicon glyphicon-ok topImg"></span>
+        </div>
+        <div class="headerLeft fL">
+            <a href="share-key.html">
+                <span class="glyphicon glyphicon-chevron-left"></span>
+                <b>修改标段类型名称</b>
+            </a>
+        </div>
+    </div>
+    <div class="wrapContent">
+        <div class="projectFrom">
+            <div class="form-group">
+                <input type="text" class="form-control" id="user" placeholder="项目名称" value="土建合同">
+            </div>
+        </div>
+    </div>
+
+</body>

+ 2 - 2
w-project-section-files-detail.html

@@ -5,7 +5,7 @@
     <title>纵横计量支付系统</title>
     <meta name=description content=计量支付>
     <meta name=copyright content=smartcost.com.cn>
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no">
     <link rel=stylesheet href=css/bootstrap.css>
     <link rel=stylesheet href=css/style.css>
     <script src=js/jquery-1.9.1.min.js></script>
@@ -22,7 +22,7 @@
                 </div>
                 <ul class="dropdown-menu" id="dropdownMenu" aria-labelledby="dropdownMenu1">
                     <li><a href="index.html">首页</a></li>
-                    <li><a href="#">张三</a></li>
+                    <li><a href="userInfo.html">张三</a></li>
                 </ul>
             </div>
         </div>

+ 3 - 3
w-project-section-files.html

@@ -5,7 +5,7 @@
     <title>纵横计量支付系统</title>
     <meta name=description content=计量支付>
     <meta name=copyright content=smartcost.com.cn>
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no">
     <link rel=stylesheet href=css/bootstrap.css>
     <link rel=stylesheet href=css/style.css>
     <script src=js/jquery-1.9.1.min.js></script>
@@ -21,8 +21,8 @@
                     <span class="glyphicon glyphicon-option-vertical topImg"></span>
                 </div>
                 <ul class="dropdown-menu" id="dropdownMenu" aria-labelledby="dropdownMenu1">
-                    <li><a href="#">修改项目名称</a></li>
-                    <li><a href="#">项目分享</a></li>
+                    <li><a href="index.html">首页</a></li>
+                    <li><a href="userInfo.html">张三</a></li>
                 </ul>
             </div>
             <a href="w-project-add.html"></a>

+ 4 - 4
w-project-section.html

@@ -5,7 +5,7 @@
     <title>纵横计量支付系统</title>
     <meta name=description content=计量支付>
     <meta name=copyright content=smartcost.com.cn>
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no">
     <link rel=stylesheet href=css/bootstrap.css>
     <link rel=stylesheet href=css/style.css>
     <script src=js/jquery-1.9.1.min.js></script>
@@ -22,7 +22,7 @@
                 </div>
                 <ul class="dropdown-menu" id="dropdownMenu" aria-labelledby="dropdownMenu1">
                     <li><a href="w-project-edit.html">修改项目名称</a></li>
-                    <li><a href="#">项目分享</a></li>
+                    <li><a href="share-list.html">项目分享</a></li>
                 </ul>
             </div>
             <a href="w-project-add.html"></a>
@@ -65,7 +65,7 @@
           <ul>
             <li>
               <div class="projectSection">
-                <div class="title"><a href="#">黄金大桥项目&nbsp;<span class="glyphicon glyphicon-cog"></span></a></div>
+                <div class="title"><a href="share-key.html">黄金大桥项目&nbsp;<span class="glyphicon glyphicon-cog"></span></a></div>
                 <p>总价:<b>¥123,122,212.00</b></p>
                 <div class="progress">
                   <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="min-width: 2em; width: 65%;" data-toggle="tooltip" data-placement="bottom" title="累计完成:¥499,500,000.00">65%</div>
@@ -117,7 +117,7 @@
             </li>
             <li>
               <div class="projectSection">
-                <div class="title"><a href="#">监理合同目&nbsp;<span class="glyphicon glyphicon-cog"></span></a></div>
+                <div class="title"><a href="share-key.html">监理合同目&nbsp;<span class="glyphicon glyphicon-cog"></span></a></div>
                 <p>总价:<b>¥123,122,212.00</b></p>
                 <div class="progress">
                   <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="min-width: 2em; width: 65%;" data-toggle="tooltip" data-placement="bottom" title="累计完成:¥499,500,000.00">65%</div>

+ 1 - 1
w-project.html

@@ -5,7 +5,7 @@
     <title>纵横计量支付系统</title>
     <meta name=description content=计量支付>
     <meta name=copyright content=smartcost.com.cn>
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no">
     <link rel=stylesheet href=css/bootstrap.css>
     <link rel=stylesheet href=css/style.css>
     <script src=js/jquery-1.9.1.min.js></script>