Merge branch 'iteration_0307' into jenkins

src/school/train-report/components/list.tsx

@@ -118,6 +118,16 @@ export default defineComponent({
       onRefresh()
     }
 
+    const formatLength = (name: string) => {
+      if (name && name.length > 13) {
+        const fristName = name.substring(0, 8)
+        const lastName = name.substring(name.length - 5, name.length)
+        return fristName + '...' + lastName
+      } else {
+        return name
+      }
+    }
+
     onMounted(async () => {
       try {
         // 判断是否有乐团
@@ -192,7 +202,7 @@ export default defineComponent({
                 {state.list.map((item: any) => (
                   <Cell center class={styles.reportList}>
                     {{
-                      title: () => <div>{item.orchestraName}</div>,
+                      title: () => <div>{formatLength(item.orchestraName)}</div>,
                       value: () => (
                         <Button type="primary" round size="small" onClick={() => onDetail(item)}>
                           查看报告
@@ -201,7 +211,8 @@ export default defineComponent({
                       label: () =>
                         props.type === 'WEEKLY' ? (
                           <div class={styles.time}>
-                            {item.startTime}~{item.endTime}
+                            {dayjs(item.startTime).format('YYYY/MM/DD')}-
+                            {dayjs(item.endTime).format('YYYY/MM/DD')}
                           </div>
                         ) : (
                           <div class={styles.time}>{item.monthlyTime}</div>

src/school/train-report/index.tsx

@@ -9,7 +9,7 @@ import styles from './index.module.less'
 export default defineComponent({
   name: 'train-report',
   setup() {
-    const status = sessionStorage.getItem('mass-message-send')
+    const status = sessionStorage.getItem('train-report-tab')
     const state = reactive({
       loading: true,
       tabValue: status || 'WEEKLY',

src/school/train-report/modal/index.module.less

@@ -60,6 +60,7 @@
     font-weight: 600;
     color: #ffffff;
     line-height: 20px;
+    font-family: DINA;
     span {
       color: #42ffe2;
       padding: 0 6px;

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

@@ -161,7 +161,7 @@ export default defineComponent({
             总出勤率
             <span
               style={{
-                color: forms.total > 59 ? '#42FFE2' : '#FF7C88'
+                color: forms.total > 59 ? '#42FFE2' : props.type === 'month' ? '#FF99A2' : '#FF7C88'
               }}
             >
               {forms.total}

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

@@ -160,7 +160,7 @@ export default defineComponent({
             总出勤率
             <span
               style={{
-                color: forms.total > 59 ? '#42FFE2' : '#FF7C88'
+                color: forms.total > 59 ? '#42FFE2' : props.type === 'month' ? '#FF99A2' : '#FF7C88'
               }}
             >
               {forms.total}

src/school/train-report/month-report.tsx

@@ -32,6 +32,7 @@ import request from '@/helpers/request'
 import { useRoute, useRouter } from 'vue-router'
 import { postMessage, promisefiyPostMessage } from '@/helpers/native-message'
 import html2canvas from 'html2canvas'
+import iconArrow from './images/icon-arrow.png'
 
 export const reportCourseType = {
   PERCUSSION: '打击乐',
@@ -212,7 +213,13 @@ export default defineComponent({
         ]}
       >
         <div class={styles.trainContainer}></div>
-        <OHeader background="transparent" border={false} title=" " backIconColor="white">
+        <OHeader
+          background="transparent"
+          border={false}
+          title=" "
+          color="white"
+          isBack={forms.share != 1 ? true : false}
+        >
           {{
             right: () =>
               forms.share != 1 && (
@@ -243,9 +250,13 @@ export default defineComponent({
                 path: '/school-photo'
               })
             }}
+            style={{
+              display: 'flex',
+              alignItems: 'center'
+            }}
           >
             本月上传<span>{reportData.PHOTO.TOTAL || 0}</span>张训练照片
-            {forms.share != 1 && <Icon name="arrow" />}
+            {forms.share != 1 && <Icon name={iconArrow} size="10" style={{ marginLeft: '10px' }} />}
           </p>
         </div>
 
@@ -256,7 +267,7 @@ export default defineComponent({
           <Image src={iconClass} class={styles.iconPhoto} />
           <div>
             <p class={styles.subjectTips}>课件使用未达标班级</p>
-            <p class={styles.subjectNames}>
+            <p class={styles.subjectNames} style="color: #FF99A2">
               {reportData.coursewareList.map((item: string) => item + ' ')}
             </p>
           </div>

src/school/train-report/week-report.tsx

@@ -32,6 +32,8 @@ import { useRoute, useRouter } from 'vue-router'
 import request from '@/helpers/request'
 import { postMessage, promisefiyPostMessage } from '@/helpers/native-message'
 import html2canvas from 'html2canvas'
+import dayjs from 'dayjs'
+import iconArrow from './images/icon-arrow.png'
 
 export const reportCourseType = {
   PERCUSSION: '打击乐',
@@ -205,7 +207,13 @@ export default defineComponent({
     return () => (
       <div class={[styles.trainWeek, forms.share == 1 ? styles.trasinWeekShare : '']}>
         <div class={styles.trainContainer}></div>
-        <OHeader background="transparent" border={false} title=" " color="white">
+        <OHeader
+          background="transparent"
+          border={false}
+          title=" "
+          color="white"
+          isBack={forms.share != 1 ? true : false}
+        >
           {{
             right: () =>
               forms.share != 1 && (
@@ -222,7 +230,8 @@ export default defineComponent({
             <Image src={trainWeek} class={styles.iconTrainWeek} />
           </div>
           <div class={styles.trainTimer}>
-            {reportData.startTime}-{reportData.endTime}
+            {dayjs(reportData.startTime).format('YYYY/MM/DD')}-
+            {dayjs(reportData.endTime).format('YYYY/MM/DD')}
           </div>
         </div>
 
@@ -238,9 +247,13 @@ export default defineComponent({
                 path: '/school-photo'
               })
             }}
+            style={{
+              display: 'flex',
+              alignItems: 'center'
+            }}
           >
             本周上传<span>{reportData.PHOTO.TOTAL || 0}</span>张训练照片
-            {forms.share != 1 && <Icon name="arrow" />}
+            {forms.share != 1 && <Icon name={iconArrow} size="10" style={{ marginLeft: '10px' }} />}
           </p>
         </div>