Home Verkennen Help
Inloggen
S.H.I.E.L.D.
/
jiliangzhifuV2
2
0
Vork 0
Bestanden Issues 0 Pull-aanvragen 0 Wiki
Bladeren bron

echarts 版本更新，并且引入本地js，不再使用第三方托管，希望可以提高运作效率

Chente 9 jaren geleden
bovenliggende
ccb5e7a362
commit
9509074f18
6 gewijzigde bestanden met toevoegingen van 368 en 404 verwijderingen
Zij-aan-zij weergave Toon Diff Stats
  1. 32 0
      js/echarts.min.js
  2. 69 80
      r-project-section-detail.html
  3. 65 77
      s-project-section-detail.html
  4. 62 77
      s-project-section.html
  5. 74 92
      w-project-detail.html
  6. 66 78
      w-project-section-detail.html

File diff suppressed because it is too large
+ 32 - 0
js/echarts.min.js


+ 69 - 80
r-project-section-detail.html
Bestand weergeven 

@@ -10,7 +10,7 @@
 
 	<script src=js/jquery-1.9.1.min.js></script> 
 	<script src=js/bootstrap.js></script> 
 	<script src=js/jl.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="wrapHeader"><h1 title="纵横计量支付" class="mainLogo"></h1><div class="userInfo"><img src="images/avtra.png" class="fR">
 
@@ -95,25 +95,70 @@
 
       <li><a href="r-project-section-files.html">附件</a></li>
 
       <li><a href="r-project-section-report.html">审批</a></li>
 
       </ul>
 
-      <!--导航-->      
+      <!--导航--> 
+
 
+    <div class="project">
 
+      <div class="proSection clearfix">
 
+        <!--图表4-->
 
+        <div id="chartContainer4" style="height: 300px; width: 100%;">
 
+        </div>
 
+        <!--图表4-->
 
+      </div>
 
+      <div class="proSection clearfix">
 
+        <!--图表5-->
 
+        <div class="fL" style="width:30%">
 
+          <div id="chartContainer5" style="height: 300px; width: 100%;">
 
+          </div>
 
+        </div>
 
+        <!--图表5-->
 
+        <!--表-->
 
+        <div class="fL" style="width:70%;height:300px;overflow:hide">
 
+          <table class="table table-striped">
 
+            <thead>
 
+              <tr>
 
+                <th width="8%">期数</th><th width="16%" class="taC">本期合同计量</th><th width="16%" class="taC">本期数量变更计量</th><th width="16%" class="taC">截止上期累计完成</th><th width="16%" class="taC">本期完成计量</th><th width="16%" class="taC">累计完成计量</th>
 
+              </tr>
 
+            </thead>
 
+          </table>
 
+          <div style="height:264px;overflow-y:auto">
 
+          <table class="table table-striped">
 
+            <tr>
 
+              <td width="8%">第七期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td width="16%" class="taR">0</td><td width="16%" class="taR">0</td><td width="16%" class="taR">0</td><td width="16%" class="taR">0</td><td width="16%" class="taR">0</td>
 
+            </tr>
 
+            <tr>
 
+              <td>第六期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td></td><td></td><td></td><td></td><td></td>
 
+            </tr>
 
+            <tr>
 
+              <td>第五期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td></td><td></td><td></td><td></td><td></td>
 
+            </tr>
 
+            <tr>
 
+              <td>第四期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td></td><td></td><td></td><td></td><td></td>
 
+            </tr>
 
+            <tr>
 
+              <td>第三期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td></td><td></td><td></td><td></td><td></td>
 
+            </tr>
 
+            <tr>
 
+              <td>第二期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td></td><td></td><td></td><td></td><td></td>
 
+            </tr>
 
+            <tr>
 
+              <td>第一期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td></td><td></td><td></td><td></td><td></td>
 
+            </tr>
 
+          </table>
 
+          </div>
 
+        </div>
 
+        <!--表-->
 
+      </div>
 
+    </div>
 
+  </div>
 
+
 
+        <!--内容-->
 
+    	</div>
 
+    </div>
 
+<script type="text/javascript">autoFlashHeight();</script>
 
+     
       <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',
 
@@ -126,6 +171,11 @@
 
     legend: {
 
         data:['本期合同计量','本期数量变更计量','截至上期累计完成','本期完成计量','完成度']
 
     },
 
+    dataZoom : {
 
+        show : true,
 
+        start :0,
 
+        end : 100
 
+    },
 
     xAxis : [
 
         {
 
             type : 'category',
 
@@ -193,7 +243,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',
 
@@ -229,66 +279,5 @@
 
                 // 为echarts对象加载数据 
                 myChart.setOption(option); 
                 //5 期数组成//
 
-            }
 
-        );
 
     </script>
 
-
 
-    <div class="project">
 
-      <div class="proSection clearfix">
 
-        <!--图表4-->
 
-        <div id="chartContainer4" style="height: 300px; width: 100%;">
 
-        </div>
 
-        <!--图表4-->
 
-      </div>
 
-      <div class="proSection clearfix">
 
-        <!--图表5-->
 
-        <div class="fL" style="width:30%">
 
-          <div id="chartContainer5" style="height: 300px; width: 100%;">
 
-          </div>
 
-        </div>
 
-        <!--图表5-->
 
-        <!--表-->
 
-        <div class="fL" style="width:70%;height:300px;overflow:hide">
 
-          <table class="table table-striped">
 
-            <thead>
 
-              <tr>
 
-                <th width="8%">期数</th><th width="16%" class="taC">本期合同计量</th><th width="16%" class="taC">本期数量变更计量</th><th width="16%" class="taC">截止上期累计完成</th><th width="16%" class="taC">本期完成计量</th><th width="16%" class="taC">累计完成计量</th>
 
-              </tr>
 
-            </thead>
 
-          </table>
 
-          <div style="height:264px;overflow-y:auto">
 
-          <table class="table table-striped">
 
-            <tr>
 
-              <td width="8%">第七期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td width="16%" class="taR">0</td><td width="16%" class="taR">0</td><td width="16%" class="taR">0</td><td width="16%" class="taR">0</td><td width="16%" class="taR">0</td>
 
-            </tr>
 
-            <tr>
 
-              <td>第六期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td></td><td></td><td></td><td></td><td></td>
 
-            </tr>
 
-            <tr>
 
-              <td>第五期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td></td><td></td><td></td><td></td><td></td>
 
-            </tr>
 
-            <tr>
 
-              <td>第四期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td></td><td></td><td></td><td></td><td></td>
 
-            </tr>
 
-            <tr>
 
-              <td>第三期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td></td><td></td><td></td><td></td><td></td>
 
-            </tr>
 
-            <tr>
 
-              <td>第二期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td></td><td></td><td></td><td></td><td></td>
 
-            </tr>
 
-            <tr>
 
-              <td>第一期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td></td><td></td><td></td><td></td><td></td>
 
-            </tr>
 
-          </table>
 
-          </div>
 
-        </div>
 
-        <!--表-->
 
-      </div>
 
-    </div>
 
-  </div>
 
-
 
-        <!--内容-->
 
-    	</div>
 
-    </div>
 
-<script type="text/javascript">autoFlashHeight();</script>
 
 </body>

+ 65 - 77
s-project-section-detail.html
Bestand weergeven 

@@ -10,6 +10,7 @@
 
 	<script src=js/jquery-1.9.1.min.js></script> 
 	<script src=js/bootstrap.js></script> 
 	<script src=js/jl.js></script> 
+  <script src=js/echarts.min.js></script> 
 <script src="http://s1.bdstatic.com/r/www/cache/ecom/esl/1-6-10/esl.js"></script>
 
 </head>
 
 <body><div class="wrapHeader"><h1 title="纵横计量支付" class="mainLogo"></h1><div class="userInfo"><img src="images/avtra.png" class="fR">
 
@@ -94,24 +95,66 @@
 
       <li><a href="s-project-section-measure.html">计量台帐</a></li>
 
       </ul>
 
       <!--导航-->
 
+    <div class="project">
 
+      <div class="proSection clearfix">
 
+        <!--图表4-->
 
+        <div id="chartContainer4" style="height: 300px; width: 100%;">
 
+        </div>
 
+        <!--图表4-->
 
+      </div>
 
+      <div class="proSection clearfix">
 
+        <!--图表5-->
 
+        <div class="fL" style="width:30%">
 
+          <div id="chartContainer5" style="height: 300px; width: 100%;">
 
+          </div>
 
+        </div>
 
+        <!--图表5-->
 
+        <!--表-->
 
+        <div class="fL" style="width:70%;height:300px;overflow:hide">
 
+          <table class="table table-striped">
 
+            <thead>
 
+              <tr>
 
+                <th width="8%">期数</th><th width="16%" class="taC">本期合同计量</th><th width="16%" class="taC">本期数量变更计量</th><th width="16%" class="taC">截止上期累计完成</th><th width="16%" class="taC">本期完成计量</th><th width="16%" class="taC">累计完成计量</th>
 
+              </tr>
 
+            </thead>
 
+          </table>
 
+          <div style="height:264px;overflow-y:auto">
 
+          <table class="table table-striped">
 
+            <tr>
 
+              <td width="8%">第七期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td width="16%" class="taR">0</td><td width="16%" class="taR">0</td><td width="16%" class="taR">0</td><td width="16%" class="taR">0</td><td width="16%" class="taR">0</td>
 
+            </tr>
 
+            <tr>
 
+              <td>第六期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td></td><td></td><td></td><td></td><td></td>
 
+            </tr>
 
+            <tr>
 
+              <td>第五期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td></td><td></td><td></td><td></td><td></td>
 
+            </tr>
 
+            <tr>
 
+              <td>第四期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td></td><td></td><td></td><td></td><td></td>
 
+            </tr>
 
+            <tr>
 
+              <td>第三期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td></td><td></td><td></td><td></td><td></td>
 
+            </tr>
 
+            <tr>
 
+              <td>第二期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td></td><td></td><td></td><td></td><td></td>
 
+            </tr>
 
+            <tr>
 
+              <td>第一期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td></td><td></td><td></td><td></td><td></td>
 
+            </tr>
 
+          </table>
 
+          </div>
 
+        </div>
 
+        <!--表-->
 
+      </div>
 
+    </div>
 
+  </div>
 
+        <!--内容-->
 
+    	</div>
 
+    </div>
 
+<script type="text/javascript">autoFlashHeight();</script>
 
                 <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',
 
@@ -124,6 +167,11 @@
 
     legend: {
 
         data:['本期合同计量','本期数量变更计量','截至上期累计完成','本期完成计量','完成度']
 
     },
 
+    dataZoom : {
 
+        show : true,
 
+        start :0,
 
+        end : 100
 
+    },
 
     xAxis : [
 
         {
 
             type : 'category',
 
@@ -191,7 +239,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',
 
@@ -227,65 +275,5 @@
 
                 // 为echarts对象加载数据 
                 myChart.setOption(option); 
                 //5 期数组成//
 
-            }
 
-        );
 
     </script>
 
-
 
-    <div class="project">
 
-      <div class="proSection clearfix">
 
-        <!--图表4-->
 
-        <div id="chartContainer4" style="height: 300px; width: 100%;">
 
-        </div>
 
-        <!--图表4-->
 
-      </div>
 
-      <div class="proSection clearfix">
 
-        <!--图表5-->
 
-        <div class="fL" style="width:30%">
 
-          <div id="chartContainer5" style="height: 300px; width: 100%;">
 
-          </div>
 
-        </div>
 
-        <!--图表5-->
 
-        <!--表-->
 
-        <div class="fL" style="width:70%;height:300px;overflow:hide">
 
-          <table class="table table-striped">
 
-            <thead>
 
-              <tr>
 
-                <th width="8%">期数</th><th width="16%" class="taC">本期合同计量</th><th width="16%" class="taC">本期数量变更计量</th><th width="16%" class="taC">截止上期累计完成</th><th width="16%" class="taC">本期完成计量</th><th width="16%" class="taC">累计完成计量</th>
 
-              </tr>
 
-            </thead>
 
-          </table>
 
-          <div style="height:264px;overflow-y:auto">
 
-          <table class="table table-striped">
 
-            <tr>
 
-              <td width="8%">第七期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td width="16%" class="taR">0</td><td width="16%" class="taR">0</td><td width="16%" class="taR">0</td><td width="16%" class="taR">0</td><td width="16%" class="taR">0</td>
 
-            </tr>
 
-            <tr>
 
-              <td>第六期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td></td><td></td><td></td><td></td><td></td>
 
-            </tr>
 
-            <tr>
 
-              <td>第五期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td></td><td></td><td></td><td></td><td></td>
 
-            </tr>
 
-            <tr>
 
-              <td>第四期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td></td><td></td><td></td><td></td><td></td>
 
-            </tr>
 
-            <tr>
 
-              <td>第三期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td></td><td></td><td></td><td></td><td></td>
 
-            </tr>
 
-            <tr>
 
-              <td>第二期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td></td><td></td><td></td><td></td><td></td>
 
-            </tr>
 
-            <tr>
 
-              <td>第一期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td></td><td></td><td></td><td></td><td></td>
 
-            </tr>
 
-          </table>
 
-          </div>
 
-        </div>
 
-        <!--表-->
 
-      </div>
 
-    </div>
 
-  </div>
 
-        <!--内容-->
 
-    	</div>
 
-    </div>
 
-<script type="text/javascript">autoFlashHeight();</script>
 
 </body>

+ 62 - 77
s-project-section.html
Bestand weergeven 

@@ -10,6 +10,7 @@
 
 	<script src=js/jquery-1.9.1.min.js></script> 
 	<script src=js/bootstrap.js></script> 
 	<script src=js/jl.js></script> 
+  <script src=js/echarts.min.js></script> 
 <script src="http://s1.bdstatic.com/r/www/cache/ecom/esl/1-6-10/esl.js"></script>
 
 </head>
 
 <body><div class="wrapHeader"><h1 title="纵横计量支付" class="mainLogo"></h1><div class="userInfo"><img src="images/avtra.png" class="fR">
 
@@ -57,25 +58,68 @@
 
           </li>
 
         </ul>
 
       </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) {
 
+                
+    <div class="project">
 
+      <div class="proSection clearfix">
 
+        <!--图表5-->
 
+        <div class="fL" style="width:30%">
 
+          <div id="chartContainer6" style="height: 300px; width: 100%;">
 
+          </div>
 
+        </div>
 
+        <!--图表5-->
 
+        <!--表-->
 
+        <div class="fL" style="width:70%;height:300px;overflow:hide">
 
+          <table class="table table-striped">
 
+            <thead>
 
+              <tr>
 
+                <th width="15%">标段名</th><th width="16%" class="taC">总价/期数</th><th width="40%" class="taC">截止上期累计完成/本期完成/未完成</th>
 
+              </tr>
 
+            </thead>
 
+          </table>
 
+          <div style="height:264px;overflow-y:auto">
 
+          <table class="table table-striped">
 
+            <tr>
 
+              <td width="15%"><a href="s-project-section-detail.html">GZ-HJDQ-JL-001(点我)</a><br>土建合同</td><td width="16%" class="taR">￥<b>5,000,000.00</b><br>共 2 期（本期 <span class="colOrange">审批中</span>）</td><td width="40%" class="taR"><div class="progress">
 
+                <div data-original-title="截止本期累计完成：￥731,121,121.00" data-toggle="tooltip" data-placement="bottom" style="width: 45%;" class="bar bar-success">45%</div>
 
+                <div data-original-title="本期完成：￥31,121,121.00" data-toggle="tooltip" data-placement="bottom" style="width:25%;" class="bar">25%</div>
 
+                <div data-original-title="未完成：￥71,121,121.00" data-toggle="tooltip" data-placement="bottom" style="width:30%;" class="bar bar-gary">30%</div>
 
+              </div></td>
 
+            </tr>
 
+            <tr>
 
+              <td width="15%"><a href="#">GZ-HJDQ-JL-002</a><br>土建合同</td><td width="16%" class="taR">￥<b>5,000,000.00</b><br>共 2 期（本期 <span class="colGreen">已完成</span>）</td><td width="40%" class="taR"><div class="progress">
 
+                <div data-original-title="截止本期累计完成：￥731,121,121.00" data-toggle="tooltip" data-placement="bottom" style="width: 29%;" class="bar bar-success">29%</div>
 
+                <div data-original-title="本期完成：￥31,121,121.00" data-toggle="tooltip" data-placement="bottom" style="width:5%;" class="bar">5%</div>
 
+                 <div data-original-title="未完成：￥71,121,121.00" data-toggle="tooltip" data-placement="bottom" style="width:66%;" class="bar bar-gary">66%</div>
 
+              </div></td>
 
+            </tr>
 
+            </tr>
 
+            <tr>
 
+              <td width="15%"><a href="#">GZ-HJDQ-JL-003</a><br>监理合同</td><td width="16%" class="taR">￥<b>5,000,000.00</b><br>共 2 期（本期 <span class="colOrange">审批中</span>）</td><td width="40%" class="taR"><div class="progress">
 
+                <div data-original-title="截止本期累计完成：￥731,121,121.00" data-toggle="tooltip" data-placement="bottom" style="width:15%;" class="bar bar-success">15%</div>
 
+                <div data-original-title="本期完成：￥31,121,121.00" data-toggle="tooltip" data-placement="bottom" style="width:45%;" class="bar">45%</div>
 
+                 <div data-original-title="未完成：￥71,121,121.00" data-toggle="tooltip" data-placement="bottom" style="width:40%;" class="bar bar-gary">40%</div>
 
+              </div></td>
 
+            </tr>
 
+            </tr>
 
+          </table>
 
+          </div>
 
+        </div>
 
+        <!--表-->
 
+      </div>
 
+      <div class="proSection clearfix">
 
+        <div id="chartContainer7" style="height: 300px; width: 100%;">
 
+        </div>
 
+      </div>
 
+    </div>
 
+  </div>
 
+        <!--内容-->
 
+    	</div>
 
+    </div>
 
+<script type="text/javascript">autoFlashHeight();</script>
 
+<script type="text/javascript">
 
                 //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',
 
@@ -109,7 +153,7 @@
 
                 //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',
 
@@ -208,65 +252,6 @@
 
                 // 为echarts对象加载数据 
                 myChart.setOption(option); 
                 //3 标段计量分布//
 
-            }
 
-        );
 
     </script>
 
 
-    <div class="project">
 
-      <div class="proSection clearfix">
 
-        <!--图表5-->
 
-        <div class="fL" style="width:30%">
 
-          <div id="chartContainer6" style="height: 300px; width: 100%;">
 
-          </div>
 
-        </div>
 
-        <!--图表5-->
 
-        <!--表-->
 
-        <div class="fL" style="width:70%;height:300px;overflow:hide">
 
-          <table class="table table-striped">
 
-            <thead>
 
-              <tr>
 
-                <th width="15%">标段名</th><th width="16%" class="taC">总价/期数</th><th width="40%" class="taC">截止上期累计完成/本期完成/未完成</th>
 
-              </tr>
 
-            </thead>
 
-          </table>
 
-          <div style="height:264px;overflow-y:auto">
 
-          <table class="table table-striped">
 
-            <tr>
 
-              <td width="15%"><a href="s-project-section-detail.html">GZ-HJDQ-JL-001(点我)</a><br>土建合同</td><td width="16%" class="taR">￥<b>5,000,000.00</b><br>共 2 期（本期 <span class="colOrange">审批中</span>）</td><td width="40%" class="taR"><div class="progress">
 
-                <div data-original-title="截止本期累计完成：￥731,121,121.00" data-toggle="tooltip" data-placement="bottom" style="width: 45%;" class="bar bar-success">45%</div>
 
-                <div data-original-title="本期完成：￥31,121,121.00" data-toggle="tooltip" data-placement="bottom" style="width:25%;" class="bar">25%</div>
 
-                <div data-original-title="未完成：￥71,121,121.00" data-toggle="tooltip" data-placement="bottom" style="width:30%;" class="bar bar-gary">30%</div>
 
-              </div></td>
 
-            </tr>
 
-            <tr>
 
-              <td width="15%"><a href="#">GZ-HJDQ-JL-002</a><br>土建合同</td><td width="16%" class="taR">￥<b>5,000,000.00</b><br>共 2 期（本期 <span class="colGreen">已完成</span>）</td><td width="40%" class="taR"><div class="progress">
 
-                <div data-original-title="截止本期累计完成：￥731,121,121.00" data-toggle="tooltip" data-placement="bottom" style="width: 29%;" class="bar bar-success">29%</div>
 
-                <div data-original-title="本期完成：￥31,121,121.00" data-toggle="tooltip" data-placement="bottom" style="width:5%;" class="bar">5%</div>
 
-                 <div data-original-title="未完成：￥71,121,121.00" data-toggle="tooltip" data-placement="bottom" style="width:66%;" class="bar bar-gary">66%</div>
 
-              </div></td>
 
-            </tr>
 
-            </tr>
 
-            <tr>
 
-              <td width="15%"><a href="#">GZ-HJDQ-JL-003</a><br>监理合同</td><td width="16%" class="taR">￥<b>5,000,000.00</b><br>共 2 期（本期 <span class="colOrange">审批中</span>）</td><td width="40%" class="taR"><div class="progress">
 
-                <div data-original-title="截止本期累计完成：￥731,121,121.00" data-toggle="tooltip" data-placement="bottom" style="width:15%;" class="bar bar-success">15%</div>
 
-                <div data-original-title="本期完成：￥31,121,121.00" data-toggle="tooltip" data-placement="bottom" style="width:45%;" class="bar">45%</div>
 
-                 <div data-original-title="未完成：￥71,121,121.00" data-toggle="tooltip" data-placement="bottom" style="width:40%;" class="bar bar-gary">40%</div>
 
-              </div></td>
 
-            </tr>
 
-            </tr>
 
-          </table>
 
-          </div>
 
-        </div>
 
-        <!--表-->
 
-      </div>
 
-      <div class="proSection clearfix">
 
-        <div id="chartContainer7" style="height: 300px; width: 100%;">
 
-        </div>
 
-      </div>
 
-    </div>
 
-  </div>
 
-        <!--内容-->
 
-    	</div>
 
-    </div>
 
-<script type="text/javascript">autoFlashHeight();</script>
 
 </body>

+ 74 - 92
w-project-detail.html
Bestand weergeven 

@@ -10,8 +10,7 @@
 
   <script src=js/jquery-1.9.1.min.js></script> 
   <script src=js/bootstrap.js></script> 
   <script src=js/jl.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="wrapHeader"><h1 title="纵横计量支付" class="mainLogo"></h1><div class="userInfo"><img src="images/avtra.png" class="fR">
 
       <div class="btn-group">
 
@@ -69,25 +68,76 @@
 
       <li><a href="w-project-section.html">标段列表</a></li>
 
       </ul>
 
       <!--导航-->
 
-          <script type="text/javascript">
 
-        // 路径配置
 
-        require.config({
 
-            paths:{ 
-                'echarts' : 'http://echarts.baidu.com/build/echarts'
 
-            }
 
-        });
 
+    <div class="project">
 
+      <div class="proSection clearfix">
 
+        <!--图表1-->
 
+        <div class="fL" style="width:49%">  
+          <div id="chartContainer" style="height: 300px; width: 100%;">
 
+          </div>
 
+        </div>
 
+          <!--图表1-->
 
+        <!--图表2-->
 
+        <div class="fR" style="width:49%">
 
+          <div id="chartContainer2" style="height: 300px; width: 100%;">
 
+          </div>
 
+        </div>
 
+        <!--图表2-->
 
+      </div>
 
+      <div class="proSection clearfix">
 
+        <!--图表3-->
 
+        <div id="chartContainer3" style="height: 300px; width: 100%;">
 
+        </div>
 
+        <!--图表3-->
 
+      </div>
 
+  </div>
 
+        <!--内容-->
 
+      </div>
 
+    </div>
 
+    <!-- 项目设置弹出 -->
 
+    <div id="pojoption" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
 
+      <div class="modal-header">
 
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
 
+        <h3 id="myModalLabel">项目设置</h3>
 
+      </div>
 
+      <div class="modal-body">
 
         
-        // 使用
 
-        require(
 
-            [
 
-                'echarts',
 
-                'echarts/chart/pie', // 使用柱状图就加载bar模块，按需加载
 
-                'echarts/chart/bar'
 
-            ],
 
-            function(ec) {
 
+      <div class="form">
 
+        <form class="form-horizontal">
 
+          <div class="control-group">
 
+            <label class="control-label" for="inputEmail">项目名称</label>
 
+            <div class="controls">
 
+              <input type="text" placeholder="输入项目名称" value="黄金大桥项目">
 
+            </div>
 
+          </div>
 
+          <div class="control-group">
 
+            <label class="control-label" for="inputEmail">颜色标识</label>
 
+            <div class="controls">
 
+              <ul class="pjColorList">
 
+              <li class="pjColor pj-c1 pjSelect"></li>
 
+              <li class="pjColor pj-c2"></li>
 
+              <li class="pjColor pj-c3"></li>
 
+              <li class="pjColor pj-c4"></li>
 
+              <li class="pjColor pj-c5"></li>
 
+              <li class="pjColor pj-c6"></li>
 
+              <li class="pjColor pj-c7"></li>
 
+              <li class="pjColor pj-c8"></li>
 
+              </ul>
 
+            </div>
 
+          </div>
 
+        </form>  
+      </div>
 
+      </div>
 
+      <div class="modal-footer">
 
+        <button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
 
+        <button class="btn btn-primary">保存</button>
 
+      </div>
 
+    </div>
 
+    <!-- 项目设置弹出 -->
 
+<script type="text/javascript">autoFlashHeight();</script>
 
+          <script type="text/javascript">
 
                 //1 标段计量分布//
 
                 // 基于准备好的dom，初始化echarts图表
 
-                var myChart = ec.init(document.getElementById('chartContainer'));   
+                var myChart = echarts.init(document.getElementById('chartContainer'));   
                 var option = {
 
                   color: ['#e9af68','#57b7b6','#e4575a','#959eac','#ffa500',
 
                           '#d38b70','#8fb7cf','#cd5c5c','#5c616b','#40e0d0',
 
@@ -128,7 +178,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 : {
 
@@ -191,7 +241,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 : {
 
@@ -212,16 +262,15 @@
 
                           },
 
     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月'
 
             ]
 
         }
 
     ],
 
@@ -272,73 +321,6 @@
 
                 // 为echarts对象加载数据 
                 myChart.setOption(option); 
                 //3 标段计量分布//
 
-            }
 
-        );
 
+            
     </script>
 
-    <div class="project">
 
-      <div class="proSection clearfix">
 
-        <!--图表1-->
 
-        <div class="fL" style="width:49%">  
-          <div id="chartContainer" style="height: 300px; width: 100%;">
 
-          </div>
 
-        </div>
 
-          <!--图表1-->
 
-        <!--图表2-->
 
-        <div class="fR" style="width:49%">
 
-          <div id="chartContainer2" style="height: 300px; width: 100%;">
 
-          </div>
 
-        </div>
 
-        <!--图表2-->
 
-      </div>
 
-      <div class="proSection clearfix">
 
-        <!--图表3-->
 
-        <div id="chartContainer3" style="height: 300px; width: 100%;">
 
-        </div>
 
-        <!--图表3-->
 
-      </div>
 
-  </div>
 
-        <!--内容-->
 
-      </div>
 
-    </div>
 
-    <!-- 项目设置弹出 -->
 
-    <div id="pojoption" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
 
-      <div class="modal-header">
 
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
 
-        <h3 id="myModalLabel">项目设置</h3>
 
-      </div>
 
-      <div class="modal-body">
 
-        
-      <div class="form">
 
-        <form class="form-horizontal">
 
-          <div class="control-group">
 
-            <label class="control-label" for="inputEmail">项目名称</label>
 
-            <div class="controls">
 
-              <input type="text" placeholder="输入项目名称" value="黄金大桥项目">
 
-            </div>
 
-          </div>
 
-          <div class="control-group">
 
-            <label class="control-label" for="inputEmail">颜色标识</label>
 
-            <div class="controls">
 
-              <ul class="pjColorList">
 
-              <li class="pjColor pj-c1 pjSelect"></li>
 
-              <li class="pjColor pj-c2"></li>
 
-              <li class="pjColor pj-c3"></li>
 
-              <li class="pjColor pj-c4"></li>
 
-              <li class="pjColor pj-c5"></li>
 
-              <li class="pjColor pj-c6"></li>
 
-              <li class="pjColor pj-c7"></li>
 
-              <li class="pjColor pj-c8"></li>
 
-              </ul>
 
-            </div>
 
-          </div>
 
-        </form>  
-      </div>
 
-      </div>
 
-      <div class="modal-footer">
 
-        <button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
 
-        <button class="btn btn-primary">保存</button>
 
-      </div>
 
-    </div>
 
-    <!-- 项目设置弹出 -->
 
-<script type="text/javascript">autoFlashHeight();</script>
 
 </body>

+ 66 - 78
w-project-section-detail.html
Bestand weergeven 

@@ -10,7 +10,7 @@
 
 	<script src=js/jquery-1.9.1.min.js></script> 
 	<script src=js/bootstrap.js></script> 
 	<script src=js/jl.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="wrapHeader"><h1 title="纵横计量支付" class="mainLogo"></h1><div class="userInfo"><img src="images/avtra.png" class="fR">
 
 			<div class="btn-group">
 
@@ -95,24 +95,67 @@
 
       <li><a href="w-project-section-measure.html">计量台帐</a></li>
 
       </ul>
 
       <!--导航-->
 
-                <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) {
 
+               
+    <div class="project">
 
+      <div class="proSection clearfix">
 
+        <!--图表4-->
 
+        <div id="chartContainer4" style="height: 300px; width: 100%;">
 
+        </div>
 
+        <!--图表4-->
 
+      </div>
 
+      <div class="proSection clearfix">
 
+        <!--图表5-->
 
+        <div class="fL" style="width:30%">
 
+          <div id="chartContainer5" style="height: 300px; width: 100%;">
 
+          </div>
 
+        </div>
 
+        <!--图表5-->
 
+        <!--表-->
 
+        <div class="fL" style="width:70%;height:300px;overflow:hide">
 
+          <table class="table table-striped">
 
+            <thead>
 
+              <tr>
 
+                <th width="8%">期数</th><th width="16%" class="taC">本期合同计量</th><th width="16%" class="taC">本期数量变更计量</th><th width="16%" class="taC">截止上期累计完成</th><th width="16%" class="taC">本期完成计量</th><th width="16%" class="taC">累计完成计量</th>
 
+              </tr>
 
+            </thead>
 
+          </table>
 
+          <div style="height:264px;overflow-y:auto">
 
+          <table class="table table-striped">
 
+            <tr>
 
+              <td width="8%">第七期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td width="16%" class="taR">0</td><td width="16%" class="taR">0</td><td width="16%" class="taR">0</td><td width="16%" class="taR">0</td><td width="16%" class="taR">0</td>
 
+            </tr>
 
+            <tr>
 
+              <td>第六期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td></td><td></td><td></td><td></td><td></td>
 
+            </tr>
 
+            <tr>
 
+              <td>第五期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td></td><td></td><td></td><td></td><td></td>
 
+            </tr>
 
+            <tr>
 
+              <td>第四期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td></td><td></td><td></td><td></td><td></td>
 
+            </tr>
 
+            <tr>
 
+              <td>第三期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td></td><td></td><td></td><td></td><td></td>
 
+            </tr>
 
+            <tr>
 
+              <td>第二期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td></td><td></td><td></td><td></td><td></td>
 
+            </tr>
 
+            <tr>
 
+              <td>第一期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td></td><td></td><td></td><td></td><td></td>
 
+            </tr>
 
+          </table>
 
+          </div>
 
+        </div>
 
+        <!--表-->
 
+      </div>
 
+    </div>
 
+  </div>
 
+        <!--内容-->
 
+    	</div>
 
+    </div>
 
+<script type="text/javascript">autoFlashHeight();</script>
 
+ <script type="text/javascript">
 
                 //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',
 
@@ -125,6 +168,9 @@
 
     legend: {
 
         data:['本期合同计量','本期数量变更计量','截至上期累计完成','本期完成计量','完成度']
 
     },
 
+    dataZoom: [
 
+           {show: true,start: 0, end: 100}
 
+      ],
 
     xAxis : [
 
         {
 
             type : 'category',
 
@@ -192,7 +238,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',
 
@@ -228,65 +274,7 @@
 
                 // 为echarts对象加载数据 
                 myChart.setOption(option); 
                 //5 期数组成//
 
-            }
 
-        );
 
+            
     </script>
 
 
-    <div class="project">
 
-      <div class="proSection clearfix">
 
-        <!--图表4-->
 
-        <div id="chartContainer4" style="height: 300px; width: 100%;">
 
-        </div>
 
-        <!--图表4-->
 
-      </div>
 
-      <div class="proSection clearfix">
 
-        <!--图表5-->
 
-        <div class="fL" style="width:30%">
 
-          <div id="chartContainer5" style="height: 300px; width: 100%;">
 
-          </div>
 
-        </div>
 
-        <!--图表5-->
 
-        <!--表-->
 
-        <div class="fL" style="width:70%;height:300px;overflow:hide">
 
-          <table class="table table-striped">
 
-            <thead>
 
-              <tr>
 
-                <th width="8%">期数</th><th width="16%" class="taC">本期合同计量</th><th width="16%" class="taC">本期数量变更计量</th><th width="16%" class="taC">截止上期累计完成</th><th width="16%" class="taC">本期完成计量</th><th width="16%" class="taC">累计完成计量</th>
 
-              </tr>
 
-            </thead>
 
-          </table>
 
-          <div style="height:264px;overflow-y:auto">
 
-          <table class="table table-striped">
 
-            <tr>
 
-              <td width="8%">第七期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td width="16%" class="taR">0</td><td width="16%" class="taR">0</td><td width="16%" class="taR">0</td><td width="16%" class="taR">0</td><td width="16%" class="taR">0</td>
 
-            </tr>
 
-            <tr>
 
-              <td>第六期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td></td><td></td><td></td><td></td><td></td>
 
-            </tr>
 
-            <tr>
 
-              <td>第五期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td></td><td></td><td></td><td></td><td></td>
 
-            </tr>
 
-            <tr>
 
-              <td>第四期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td></td><td></td><td></td><td></td><td></td>
 
-            </tr>
 
-            <tr>
 
-              <td>第三期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td></td><td></td><td></td><td></td><td></td>
 
-            </tr>
 
-            <tr>
 
-              <td>第二期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td></td><td></td><td></td><td></td><td></td>
 
-            </tr>
 
-            <tr>
 
-              <td>第一期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td></td><td></td><td></td><td></td><td></td>
 
-            </tr>
 
-          </table>
 
-          </div>
 
-        </div>
 
-        <!--表-->
 
-      </div>
 
-    </div>
 
-  </div>
 
-        <!--内容-->
 
-    	</div>
 
-    </div>
 
-<script type="text/javascript">autoFlashHeight();</script>
 
 </body>