瀏覽代碼

更新样式

lex 2 年之前
父節點
當前提交
58d693841c

二進制
src/school/train-report/images/month/teacher-section-title-bg3.png


+ 9 - 4
src/school/train-report/modal/index.module.less

@@ -30,6 +30,11 @@
     }
   }
 
+  &.teacherOverSection {
+    background: url('../images/month/teacher-section-title-bg3.png') no-repeat top center;
+    background-size: contain;
+  }
+
   .trainTitle {
     display: flex;
     align-items: center;
@@ -163,13 +168,13 @@
       border-radius: 12px;
       padding: 4px 8px;
       font-size: 12px;
-      color: #000977;
-      border: 1px solid #8279F6;
+      color: #000977 !important;
+      border: 1px solid #8279F6 !important;
 
       &.overWorkActive {
-        background-color: #7A70FB;
+        background-color: #7A70FB !important;
         box-shadow: none;
-        color: #fff;
+        color: #fff !important;
 
       }
 

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

@@ -58,6 +58,7 @@ export default defineComponent({
   setup(props) {
     const forms = reactive({
       total: 0,
+      total2: 0,
       type: ['YES', 'NOT']
     })
 
@@ -82,10 +83,6 @@ export default defineComponent({
       for (const i in data) {
         if (i === 'TOTAL') {
           forms.total = Math.ceil(data[i] * 100)
-          // if (forms.total <= 59) {
-          //   lineColor = '#FF8057'
-          //   textColor = '#F67146'
-          // }
         } else {
           titleList.push(reportCourseType[i])
           valueList.push(data[i])
@@ -95,7 +92,9 @@ export default defineComponent({
       const valueList2: any = []
       const dataNot = props.reportDataNot || {}
       for (const i in dataNot) {
-        if (i !== 'TOTAL') {
+        if (i === 'TOTAL') {
+          forms.total2 = Math.ceil(data[i] * 100)
+        } else {
           valueList2.push(dataNot[i])
         }
       }
@@ -156,12 +155,21 @@ export default defineComponent({
           }
         },
         yAxis: {
-          type: 'value'
+          type: 'value',
+          minInterval: 1
         },
         tooltip: {
           trigger: 'axis',
           axisPointer: {
             type: 'shadow'
+            // label: {
+            //   formatter: (params: any) => {
+            //     console.log(params)
+            //   }
+            // }
+          },
+          textStyle: {
+            color: '#131415'
           }
         },
         grid: {
@@ -214,7 +222,7 @@ export default defineComponent({
         <div class={styles.trainSectionContent}>
           <div class={styles.tContent}>
             <div class={styles.calssEchartTitle}>
-              <span class={styles.unit}>单位:课时</span>
+              <span class={styles.unit}>单位:课时(节)</span>
               <div>
                 <span
                   class={[styles.attendType, forms.type.includes('YES') ? styles.attendActive : '']}

+ 2 - 1
src/school/train-report/modal/train-class.tsx

@@ -102,7 +102,8 @@ export default defineComponent({
           }
         },
         yAxis: {
-          type: 'value'
+          type: 'value',
+          minInterval: 1
         },
         grid: {
           left: 0,

+ 6 - 3
src/school/train-report/modal/train-over-work.tsx

@@ -155,18 +155,21 @@ export default defineComponent({
     })
 
     return () => (
-      <div class={[styles.trainSection, props.type === 'month' ? styles.teacherTrainSection : '']}>
+      <div class={[styles.trainSection, styles.teacherOverSection]}>
         <div class={styles.trainTitle}>
           <div class={styles.name}>
             <Image
               src={props.type === 'month' ? teacherArrowLine : arrowLine}
               class={styles.allowLine}
             />
-            完成作业率
+
+            {forms.type === 'target' ? '作业完成率' : '作业提交率'}
           </div>
+
           <div class={styles.countNums}>
             <Image src={arrowPoint} class={styles.arrowPoint} />
-            总完成率<span>{forms.total}</span>%
+            {forms.type === 'target' ? '总完成率' : '总提交率'}
+            <span>{forms.total}</span>%
           </div>
         </div>