提交修复BUG

1

src/components/layout/index.module.less

@@ -201,8 +201,11 @@
           height: 32px;
           border-radius: 50%;
           overflow: hidden;
+
         }
 
+        flex: 1;
+
         .rotueLeft {
           transform: rotate(-90deg);
           transition: 0.2s;
@@ -220,9 +223,20 @@
 }
 
 :global {
+  .nameTool.n-popover {
+
+    background-color: #000 !important;
+    color: #fff;
+
+  }
+
+}
+
+:global {
   .n-popover {
-    overflow: hidden;
+    // overflow: hidden;
     border-radius: 16px;
+
   }
 }
 
@@ -248,13 +262,18 @@
       border-radius: 50%;
       border: 1px solid #ffffff;
       overflow: hidden;
+
     }
 
     .teacherName {
+      flex: 1;
       font-size: 22px;
       font-weight: 600;
       color: #333333;
       margin-left: 16px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
     }
   }
 
@@ -335,7 +354,7 @@
   }
 
   .n-popover {
-    background-color: transparent !important;
+    background-color: transparent;
   }
 }
 

src/components/layout/layoutTop.tsx

@@ -1,6 +1,6 @@
 import { defineComponent, ref } from 'vue';
 import styles from './index.module.less';
-import { NImage, NBadge, NPopover, NIcon, NModal } from 'naive-ui';
+import { NImage, NBadge, NPopover, NIcon, NModal, NTooltip } from 'naive-ui';
 import schoolIcon from './images/schoolIcon.png';
 import teacherIcon from './images/teacherIcon.png';
 import messageIcon from './images/messageIcon.png';
@@ -10,6 +10,8 @@ import schoolDot from './images/schoolDot.png';
 import personIcon from './images/personIcon.png';
 import { useUserStore } from '@/store/modules/users';
 import { useRouter } from 'vue-router';
+import { storeToRefs } from 'pinia';
+
 import 'animate.css';
 import ForgotPassword from '/src/views/setting/modal/forgotPassword';
 export default defineComponent({
@@ -19,7 +21,8 @@ export default defineComponent({
     const showHeadFlag = ref(false);
     const users = useUserStore();
     const showWord = ref(false);
-    const info = users.getUserInfo;
+    const { info } = storeToRefs(users);
+    console.log(info.value, 'info');
     const gotoPerson = () => {
       router.push({ path: '/setting', query: { activeTab: 'person' } });
     };
@@ -40,7 +43,8 @@ export default defineComponent({
               class={styles.schoolIcon}
               previewDisabled></NImage>
             <p>
-              {info.schoolInfos[0].tenantName} | {info.schoolInfos[0].name}
+              {info.value.schoolInfos[0].tenantName} |{' '}
+              {info.value.schoolInfos[0].name}
             </p>
           </div>
           <div class={styles.layoutRight}>
@@ -57,7 +61,7 @@ export default defineComponent({
             <div class={styles.line}></div>
             <NPopover
               show-arrow={false}
-              trigger="hover"
+              trigger="click"
               onUpdate:show={val => {
                 showHeadFlag.value = val;
               }}
@@ -70,7 +74,9 @@ export default defineComponent({
                     <NImage
                       preview-disabled
                       class={styles.teacherIcon}
-                      src={info.avatar ? info.avatar : teacherIcon}></NImage>
+                      src={
+                        info.value.avatar ? info.value.avatar : teacherIcon
+                      }></NImage>
                     <NIcon
                       class={
                         showHeadFlag.value
@@ -92,9 +98,16 @@ export default defineComponent({
                 <div class={styles.teacherInfo}>
                   <NImage
                     class={styles.teacherIcon}
-                    src={info.avatar ? info.avatar : teacherIcon}
+                    src={info.value.avatar ? info.value.avatar : teacherIcon}
                     previewDisabled></NImage>
-                  <p class={styles.teacherName}>{info.nickname}</p>
+                  <NTooltip  class={styles.nameTool}>
+                    {{
+                      trigger: () => (
+                        <p class={styles.teacherName}>{info.value.nickname}</p>
+                      ),
+                      default: () => info.value.nickname
+                    }}
+                  </NTooltip>
                 </div>
                 <div class={styles.propWrapList}>
                   <div class={styles.propWrapItem} onClick={() => gotoPerson()}>
@@ -105,7 +118,7 @@ export default defineComponent({
                       previewDisabled></NImage>
                     <p class={styles.smallTitle}>个人信息</p>
                   </div>
-                  {info.isSuperAdmin ? (
+                  {info.value.isSuperAdmin ? (
                     <div
                       class={styles.propWrapItem}
                       onClick={() => {

src/views/classList/index.tsx

@@ -179,7 +179,6 @@ export default defineComponent({
     const classesBegin = (row: any) => {
       state.activeRow = row;
       state.goCourseVisiable = true;
-      console.log('classesBegin');
     };
     onMounted(() => {
       getList();

src/views/classList/modals/Gotoclass.tsx

@@ -102,7 +102,7 @@ export default defineComponent({
             type: 'COURSEWARE',
             enableFlag: 1,
             bookVersionId: forms.bookVersionId,
-            currentGradeNum: props.activeRow.currentGradeNum
+            // currentGradeNum: props.activeRow.currentGradeNum
           });
 
           forms.list = data.rows.map((item: any) => {

src/views/data-module/index.tsx

@@ -14,7 +14,7 @@ import {
 export default defineComponent({
   name: 'data-module',
   setup() {
-    const activeTab = ref('attendclass');
+    const activeTab = ref('training');
     const route = useRoute();
     getTabsCache((val: any) => {
       if (val.form.tabName) {

src/views/home/components/practiceData.tsx

@@ -98,6 +98,13 @@ export default defineComponent({
           key: 'date'
         },
         {
+          title: '练习人数',
+          key: 'practiceUserCount',
+          render(row: any) {
+            return (<>{row.practiceUserCount}人</>)
+          }
+        },
+        {
           title: '平均练习时长(分钟)',
           key: 'practiceDuration',
           render(row: any) {
@@ -151,7 +158,7 @@ export default defineComponent({
         });
 
         payForm.timeList = res2.data.trainingStatDetailList.map((item: any) => {
-          return item.practiceDuration;
+          return item.practiceUserCount;
         });
 
         console.log('trainingStatDetailList', payForm.timeList);
@@ -174,7 +181,7 @@ export default defineComponent({
           show: false,
           selected: {
             //在这里设置默认展示就ok了
-            '平均练习时长(分钟)': practiceFlag.value
+            '练习人数': practiceFlag.value
           }
         },
         xAxis: {
@@ -190,7 +197,7 @@ export default defineComponent({
           {
             type: 'value',
             axisLabel: {
-              formatter: '{value} min'
+              formatter: '{value}人'
             },
             axisTick: {
               show: false
@@ -200,7 +207,9 @@ export default defineComponent({
               areaStyle: {
                 color: ['rgba(255,255,255,0.2)']
               }
-            }
+            },
+            minInterval: 1,
+            splitNumber: 5,
           }
         ],
         grid: {
@@ -246,15 +255,11 @@ export default defineComponent({
             return [
               item[0].axisValueLabel,
               ...item.map((d: any) => {
-                let str;
-                getMinutes(d.value) > 0
-                  ? (str =
-                    getMinutes(d.value) + '分' + getSecend(d.value) + '秒')
-                  : (str = getSecend(d.value) + '秒');
+
                 return `<br/>${d.marker}<span style="margin-top:10px;margin-left:5px;font-size: 13px;font-weight: 500;
                   color: #131415;font-weight: 600;
                   margin-top:12px
-                  line-height: 18px;">平均练习时长: ${str} </span>`;
+                  line-height: 18px;">练习人数: ${d.value}人 </span>`;
               })
             ].join('');
           } else {
@@ -335,7 +340,7 @@ export default defineComponent({
                     styles.DataTopRightDot,
                     styles.DataTopRightDotBlue
                   ]}></div>
-                <p>练习时长（分钟）</p>
+                <p>练习人数</p>
               </div>
             </div>
           </div>

src/views/home/components/trainData.tsx

@@ -305,7 +305,9 @@ export default defineComponent({
               areaStyle: {
                 color: ['rgba(255,255,255,0.2)']
               }
-            }
+            },
+            minInterval: 1,
+            splitNumber: 5,
           }
         ],
         grid: {

src/views/login/components/codeLogin.tsx

@@ -43,6 +43,10 @@ export default defineComponent({
     const isDisabledCode = ref(false);
     const starTimer = ref(60);
     const codeName = '发送短信';
+    const formInlineHistory = storage.get("userInfo-teacher");
+    if (formInlineHistory) {
+      formInline.username =JSON.parse(formInlineHistory).username;
+    }
     const handleSubmit = async () => {
       formRef.value.validate(async (errors: any) => {
         if (!errors) {
@@ -141,6 +145,7 @@ export default defineComponent({
               { required: true, message: '请输入手机号', trigger: 'blur' }
             ]}>
             <NInput
+              maxlength={11}
               v-model:value={formInline.username}
               placeholder="请输入手机号">
               {{

src/views/login/components/forgotPassword.tsx

@@ -153,6 +153,7 @@ export default defineComponent({
             path="password"
             rule={[
               {
+                required:true,
                 pattern: /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,20}$/,
                 message: '密码为6-20位数字和字母组合',
                 trigger: 'blur'
@@ -242,7 +243,7 @@ export default defineComponent({
                       class={styles.sendMsg}
                       disabled={isDisabledCode.value}
                       onClick={() => sendMessage()}>
-                      {isDisabledCode.value ? starTimer.value : codeName}
+                      {isDisabledCode.value ? starTimer.value+'S' : codeName}
                     </NButton>
                   )
                 }}

src/views/setting/modal/addteacherModel.tsx

@@ -90,7 +90,7 @@ export default defineComponent({
         imgs.saveLoading = false;
       }, 100);
       const link = document.createElement('a');
-      link.setAttribute('download', '报名图片' + '.png');
+      link.setAttribute('download', '新增老师' + '.png');
       // 添加时间戳，防止浏览器缓存图片
       // console.log(imgUrl,'imgUrl')