修改项目级及进度首页

SGGL/FineUIPro.Web/common/mainProject.aspx

@@ -243,7 +243,7 @@ padding-left: 2em;
                 <div class="bw-b-bottom">
                     <div class="bw-b-bottom-up flex flexV">
                         <div class="tit-one tit-center tit-right-wrap" style="color:#fff">
-                            <div>施工进度曲线</div>
+                            <div>赢得值曲线</div>
                             <div class="tit-right more js-more-2">更多</div>
                         </div>
                         <div class="bw-item-content flex1 pdtb0">
@@ -499,13 +499,13 @@ padding-left: 2em;
 <script type="text/javascript" src="../res/index/js/swiper-3.4.2.jquery.min.js"></script>
 <script type="text/javascript" src="../res/index/js/echarts.min.js"></script>
 <script type="text/javascript">
-    function line(id, xArr, data)  {
+    function line(id, xArr, data) {
         // 基于准备好的dom，初始化echarts实例
         var myChart = echarts.init(document.getElementById(id))
         // 指定图表的配置项和数据
         var option = {
             title: {
-                left:'center',
+                left: 'center',
                 text: ' ',
                 textStyle: {
                     color: '#fff',
@@ -515,12 +515,12 @@ padding-left: 2em;
                 show: false
             },
             tooltip: {
-	      formatter: '{a}<br />{b}: {c}%'
-	    },
+                formatter: '{a}<br />{b}: {c}'
+            },
             legend: {
                 show: true,
-		textStyle: {
-                  color: '#fff'
+                textStyle: {
+                    color: '#fff'
                 },
                 left: 0
             },
@@ -557,7 +557,7 @@ padding-left: 2em;
                     textStyle: {
                         color: 'rgba(255, 255, 255, 0.8)'
                     },
-		    formatter: '{value} %'
+                    //formatter: '{value} %'
                 }
             },
             series: data,
@@ -572,11 +572,6 @@ padding-left: 2em;
             },
             itemStyle: {
                 //color: 'rgba(200,201,10, 1)'
-                //normal: {
-                //    label: {
-                //        show: false
-                //    }
-                //}
             },
             backgroundColor: 'rgba(0,162,233, 0.01)',
             textStyle: {
@@ -588,70 +583,52 @@ padding-left: 2em;
         myChart.setOption(option)
     }
     //var two = { "title": "赢得值曲线", "xFontNum": 0, "legend": null, "categories": ["2020-07", "2020-08", "2020-09", "2020-10", "2020-11", "2020-12", "2021-01", "2021-02"], "series": [{ "name": null, "type": null, "data": [5.0, 2.0, 0.0, 1.0, 4.0, 8.0, 2.0, 3.0], "dataString": null, "dataObject": null }, { "name": null, "type": null, "data": [8.0, 12.0, 4.0, 9.0, 10.0, 2.0, 3.0, 3.0], "dataString": null, "dataObject": null }, { "name": null, "type": null, "data": [12.0, 2.0, 5.0, 10.0, 3.0, 3.0, 8.0, 10.0], "dataString": null, "dataObject": null }, { "name": null, "type": null, "data": [4.0, 3.0, 14.0, 8.0, 10.0, 3.0, 5.0, 10.0], "dataString": null, "dataObject": null }], "series2": null };
-    var two =<%=Two %>
+    var two =<%=Two %>;
     var xArr1 = two.categories
-    var data1 = [ {
-        name: '计划值',
+    var data1 = [{
+        name: '本月BCWS',
         type: 'bar',
         //smooth: true,
         data: two.series[0].data,
-        label: { //柱体上显示数值
-            show: false,//开启显示
-            position: 'top',//在上方显示
-            textStyle: {//数值样式
-                fontSize: '20px',
-                color: '#fff'
-            },
-            formatter: '{c}',
-        },
         lineStyle: {
-            //color: 'rgba(200,201,10, 1)'
+            color: 'rgba(200,201,10, 1)'
         }
-    },{
-        name: '实际值',
+    }, {
+        name: '本月BCWP',
         type: 'bar',
         //smooth: true,
         data: two.series[2].data,
-        label: { //柱体上显示数值
-            show: false,//开启显示
-            position: 'top',//在上方显示
-            textStyle: {//数值样式
-                fontSize: '20px',
-                color: '#fff'
-            },
-            formatter: '{c}',
-        },
-    },{
-        name: '累计计划值',
+    }, {
+        name: '本月ACWP',
+        type: 'bar',
+        //smooth: true,
+        data: two.series[4].data,
+    }, {
+        name: '累计BCWS',
         type: 'line',
         //smooth: true,
         data: two.series[1].data,
-        label: { //柱体上显示数值
-            show: false,//开启显示
-            position: 'top',//在上方显示
-            textStyle: {//数值样式
-                fontSize: '20px',
-                color: '#fff'
-            },
-            formatter: '{c}',
-        },
         lineStyle: {
             //color: 'rgba(200,201,10, 1)'
         }
-    },{
-        name: '累计实际值',
+    }, {
+        name: '累计BCWP',
         type: 'line',
         //smooth: true,
         data: two.series[3].data,
-        label: { //柱体上显示数值
-            show: false,//开启显示
-            position: 'top',//在上方显示
-            textStyle: {//数值样式
-                fontSize: '20px',
-                color: '#fff'
+    }, {
+        name: '累计ACWP',
+        type: 'line',
+        //smooth: true,
+            data: two.series[5].data,
+        lineStyle: {
+            color: 'rgba(200,201,10, 1)'
             },
-            formatter: '{c}',
-        },
+            itemStyle: {
+                normal: {
+                    color: 'rgba(200,201,10, 1)'
+                }
+            }
     }]
     line('left_one', xArr1, data1)
 </script>
@@ -919,7 +896,7 @@ padding-left: 2em;
         })
 
         $(".js-more-2").click(function () {
-             window.open("../JDGL/Check/ProgressCompletion.aspx");
+             window.open("../common/mainMenu_JDGL.aspx");
         })
 
         $(".js-more-3").click(function () {