Merge remote-tracking branch 'origin/develop' into develop

陈翱
2 parents c27deebc 32c92352
Showing 1 changed file with 7 additions and 31 deletions
src/views/scheduler/progressRate.vue
@@ -109,13 +109,13 @@ let options = {
         value: "id",
         width: 50
       },
-      // {
-      //   id: 2,
-      //   label: "项目名称",
-      //   value: "projectName",
-      //   width: 150,
-      //   expander: true
-      // },
+      {
+        id: 2,
+        label: "项目名称",
+        value: "projectName",
+        width: 150,
+        expander: true
+      },
       // {
       //   id: 3,
       //   label: "项目编码",
@@ -187,30 +187,6 @@ let options = {
   },
 };
  
-let doingStyle = {
-  base: {
-    fill: '#BFEFFF',
-    stroke: '#BFEFFF'
-  }
-}
-let warnStyle = {
-  base: {
-    fill: '#FF6A6A',
-    stroke: '#FF6A6A'
-  }
-}
-let finishStyle = {
-  base: {
-    fill: '#C1FFC1',
-    stroke: '#C1FFC1'
-  }
-}
-let cancelStyle = {
-  base: {
-    fill: '#BABABA',
-    stroke: '#BABABA'
-  }
-}
  
 export default {
   name: 'progressRate',