lex 2 anni fa
parent
commit
d0f45bd531

+ 16 - 2
src/school/train-report/index.tsx

@@ -9,8 +9,10 @@ import styles from './index.module.less'
 export default defineComponent({
   name: 'train-report',
   setup() {
+    const status = sessionStorage.getItem('mass-message-send')
     const state = reactive({
       loading: true,
+      tabValue: status || 'WEEKLY',
       orchestraList: [] as any,
       height: 'auto'
     })
@@ -22,7 +24,8 @@ export default defineComponent({
           data: {
             page: 1,
             rows: 100,
-            status: 'DONE'
+            status: 'DONE',
+            type: 'DELIVERY'
           }
         })
         const temps = data.rows || []
@@ -59,7 +62,18 @@ export default defineComponent({
           <OHeader />
         </OSticky>
         {!state.loading && (
-          <Tabs sticky lineWidth={20} lineHeight={4} offsetTop={state.height} swipeable animated>
+          <Tabs
+            sticky
+            lineWidth={20}
+            lineHeight={4}
+            offsetTop={state.height}
+            swipeable
+            animated
+            v-model:active={state.tabValue}
+            onChange={(val: string) => {
+              sessionStorage.setItem('train-report-tab', val)
+            }}
+          >
             <Tab title="周报" name="WEEKLY">
               <List type="WEEKLY" orchestraList={state.orchestraList} />
             </Tab>

+ 10 - 1
src/school/train-report/month-report.tsx

@@ -24,6 +24,9 @@ import iconPhoto from './images/icon-photo.png'
 import iconClass from './images/icon-class.png'
 import iconSaveImage from '@/school/orchestra/images/icon-save-image.png'
 import iconWechat from '@/school/orchestra/images/icon-wechat.png'
+import iconWeekPoint from './images/month/teacher-icon-point.png'
+import popupWeekBanner from './images/month/popup-week-banner.png'
+import popupQrcodeBg from './images/popup-qrcode-bg.png'
 import OQrcode from '@/components/o-qrcode'
 import request from '@/helpers/request'
 import { useRoute, useRouter } from 'vue-router'
@@ -267,6 +270,7 @@ export default defineComponent({
         >
           <div class={styles.codeContainer}>
             <div class={[styles.codeImg, styles.teacherCodeImg]} id="preview-container">
+              <Image src={popupWeekBanner} class={styles.popupWeekBanner} />
               <div class={styles.codeContent}>
                 <div
                   class={[
@@ -282,10 +286,15 @@ export default defineComponent({
                   <div>
                     <Image src={trainWeek} class={styles.iconTrainWeek} />
                   </div>
-                  <div class={styles.trainTimer}>{reportData.monthlyTime}</div>
+                  <div class={styles.trainTimer}>
+                    <Image class={styles.point} src={iconWeekPoint} />
+                    {reportData.monthlyTime}
+                    <Image class={styles.point} src={iconWeekPoint} />
+                  </div>
                 </div>
 
                 <div class={styles.codeQr}>
+                  <Image src={popupQrcodeBg} class={styles.popupQrcodeBg} />
                   <OQrcode text={forms.url} size={'100%'} logoSize="small" />
                 </div>
                 <div style={{ textAlign: 'center' }}>

+ 37 - 6
src/school/train-report/report.module.less

@@ -196,23 +196,45 @@
 
 .codeContainer {
   .codeImg {
+    position: relative;
     width: 315px;
     height: 440px;
-    background: url('./images/week/popup-week-banner.png') no-repeat top center;
-    background-size: contain;
+    z-index: 9;
+    // background: url('./images/week/popup-week-banner.png') no-repeat top center;
+    // background-size: contain;
     margin: 0 auto;
     background-color: #ffffff;
     border-radius: 8px;
+    .popupWeekBanner {
+      width: 100%;
+      position: absolute;
+      top: 0;
+      left: 0;
+      z-index: -1;
+    }
 
     &.teacherCodeImg {
-      background: url('./images/month/popup-week-banner.png') no-repeat top center;
-      background-size: contain;
+      // background: url('./images/month/popup-week-banner.png') no-repeat top center;
+      // background-size: contain;
       background-color: #ffffff;
     }
 
     .headerContantPopup {
       padding-top: 23px;
       padding-left: 18px;
+
+      .trainTimer {
+        &::before,
+        &::after {
+          display: none;
+        }
+        .point {
+          margin-left: 4px;
+          margin-right: 4px;
+          width: 6px;
+          height: 6px;
+        }
+      }
     }
 
     .codeTitle {
@@ -233,12 +255,13 @@
       color: #ffffff;
     }
     .codeQr {
+      position: relative;
       margin: 108px auto 0;
       width: 126px;
       height: 126px;
       padding: 12px;
-      background: url('./images/popup-qrcode-bg.png') no-repeat center;
-      background-size: contain;
+      // background: url('./images/popup-qrcode-bg.png') no-repeat center;
+      // background-size: contain;
       border-radius: 11px;
       overflow: hidden;
       box-sizing: border-box;
@@ -246,6 +269,14 @@
         width: 100%;
         height: 100%;
       }
+
+      .popupQrcodeBg {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 126px;
+        height: 126px;
+      }
     }
 
     .codeBtnText {

+ 8 - 0
src/school/train-report/week-report.tsx

@@ -24,6 +24,9 @@ import iconPhoto from './images/icon-photo.png'
 import iconClass from './images/icon-class.png'
 import iconSaveImage from '@/school/orchestra/images/icon-save-image.png'
 import iconWechat from '@/school/orchestra/images/icon-wechat.png'
+import iconWeekPoint from './images/week/icon-point.png'
+import popupWeekBanner from './images/week/popup-week-banner.png'
+import popupQrcodeBg from './images/popup-qrcode-bg.png'
 import OQrcode from '@/components/o-qrcode'
 import { useRoute, useRouter } from 'vue-router'
 import request from '@/helpers/request'
@@ -262,6 +265,7 @@ export default defineComponent({
         >
           <div class={styles.codeContainer}>
             <div class={styles.codeImg} id="preview-container">
+              <Image src={popupWeekBanner} class={styles.popupWeekBanner} />
               <div class={styles.codeContent}>
                 <div class={[styles.headerContant, styles.headerContantPopup]}>
                   <div class={styles.orchestra}>
@@ -272,11 +276,15 @@ export default defineComponent({
                     <Image src={trainWeek} class={styles.iconTrainWeek} />
                   </div>
                   <div class={styles.trainTimer}>
+                    <Image class={styles.point} src={iconWeekPoint} />
                     {reportData.startTime}-{reportData.endTime}
+                    <Image class={styles.point} src={iconWeekPoint} />
+                    {/* {reportData.startTime}-{reportData.endTime} */}
                   </div>
                 </div>
 
                 <div class={styles.codeQr}>
+                  <Image src={popupQrcodeBg} class={styles.popupQrcodeBg} />
                   <OQrcode text={forms.url} size={'100%'} logoSize="small" />
                 </div>
                 <div style={{ textAlign: 'center' }}>