0914-修改材料接口、焊接管理及三四级看板

SGGL/FineUIPro.Web/common/mainMenu_JDGL.aspx

@@ -238,7 +238,7 @@
                 show: false
             },
             tooltip: {
-                formatter: '{a}<br />{b}: {c}%'
+                formatter: '{a}<br />{b}: {c}'
             },
             legend: {
                 show: true,
@@ -280,7 +280,7 @@
                     textStyle: {
                         color: 'rgba(255, 255, 255, 0.8)'
                     },
-                    formatter: '{value} %'
+                    //formatter: '{value} %'
                 }
             },
             series: data,
@@ -308,20 +308,25 @@
     var two =<%=Two %>;
     var xArr1 = two.categories
     var data1 = [{
-        name: '计划值',
+        name: '本月计划工作预算费用-BCWS',
         type: 'bar',
         //smooth: true,
         data: two.series[0].data,
         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,
     }, {
-        name: '累计计划值',
+        name: '本月已完工作实际费用-ACWP',
+        type: 'bar',
+        //smooth: true,
+        data: two.series[4].data,
+    }, {
+        name: '累计计划工作预算费用-BCWS',
         type: 'line',
         //smooth: true,
         data: two.series[1].data,
@@ -329,10 +334,23 @@
             //color: 'rgba(200,201,10, 1)'
         }
     }, {
-        name: '累计实际值',
+        name: '累计已完工作预算费用-BCWP',
         type: 'line',
         //smooth: true,
         data: two.series[3].data,
+    }, {
+        name: '累计已完工作实际费用-ACWP',
+        type: 'line',
+        //smooth: true,
+            data: two.series[5].data,
+        lineStyle: {
+            color: 'rgba(200,201,10, 1)'
+            },
+            itemStyle: {
+                normal: {
+                    color: 'rgba(200,201,10, 1)'
+                }
+            }
     }]
     line('two', xArr1, data1)
 </script>