Browse Source

Merge branch 'iteration_0307' into jenkins

lex 2 years ago
parent
commit
b1f9b140aa

+ 6 - 6
src/school/train-report/modal/student-attendance.tsx

@@ -73,15 +73,15 @@ export default defineComponent({
       const data = props.reportData || {}
       const titleList: any = []
       const valueList: any = []
-      let lineColor = '#356BF7'
-      let textColor = '#1B4FD7'
+      const lineColor = '#FF8057'
+      const textColor = '#F67146'
       for (const i in data) {
         if (i === 'TOTAL') {
           forms.total = Math.ceil(data[i] * 100)
-          if (forms.total <= 59) {
-            lineColor = '#FF8057'
-            textColor = '#F67146'
-          }
+          // if (forms.total <= 59) {
+          //   lineColor = '#FF8057'
+          //   textColor = '#F67146'
+          // }
         } else {
           titleList.push(reportCourseType[i])
           valueList.push(Math.ceil(data[i] * 100))

+ 6 - 6
src/school/train-report/modal/teacher-attendance.tsx

@@ -72,15 +72,15 @@ export default defineComponent({
       const data = props.reportData || {}
       const titleList: any = []
       const valueList: any = []
-      let lineColor = '#356BF7'
-      let textColor = '#1B4FD7'
+      const lineColor = '#356BF7'
+      const textColor = '#1B4FD7'
       for (const i in data) {
         if (i === 'TOTAL') {
           forms.total = Math.ceil(data[i] * 100)
-          if (forms.total <= 59) {
-            lineColor = '#FF8057'
-            textColor = '#F67146'
-          }
+          // if (forms.total <= 59) {
+          //   lineColor = '#FF8057'
+          //   textColor = '#F67146'
+          // }
         } else {
           titleList.push(reportCourseType[i])
           valueList.push(Math.ceil(data[i] * 100))