mo před 1 rokem
rodič
revize
4f1c74fe3b

binární
src/components/TheEmpty/images/nomore.png


+ 12 - 0
src/components/TheEmpty/index.module.less

@@ -4,4 +4,16 @@
   display: flex;
   justify-content: center;
   align-items: center;
+
+  :global {
+    .n-empty__icon {
+      width: 100%;
+      height: 100%;
+    }
+  }
+
+  .emptyImg {
+    width: 240px;
+    height: 240px;
+  }
 }

+ 5 - 2
src/components/TheEmpty/index.tsx

@@ -1,6 +1,7 @@
 import { defineComponent } from 'vue';
 import styles from './index.module.less';
-import { NEmpty } from 'naive-ui';
+import { NEmpty, NImage } from 'naive-ui';
+import emptyImg from './images/nomore.png'
 
 export default defineComponent({
   name: 'the-empty',
@@ -13,7 +14,9 @@ export default defineComponent({
   setup(props) {
     return () => (
       <div class={styles.theEmtpy}>
-        <NEmpty description={props.description} />
+        <NEmpty description={props.description} v-slots={{
+          icon: () => <NImage class={styles.emptyImg} previewDisabled src={emptyImg}></NImage>
+        }} />
       </div>
     );
   }

+ 1 - 1
src/components/TheQrCode/index.tsx

@@ -185,7 +185,7 @@ export default defineComponent({
         backgroundColor: this.backgroundColor,
         backgroundImage: img,
         backgroundDimming: this.backgroundDimming,
-        logoImage: logoImg + '?' + new Date().getTime(),
+        logoImage: logoImg ? logoImg + '?' + new Date().getTime() : '',
         logoScale: this.logoScale,
         logoBackgroundColor: this.logoBackgroundColor,
         correctLevel: this.correctLevel,

+ 1 - 0
src/components/layout/layoutTop.tsx

@@ -168,6 +168,7 @@ export default defineComponent({
             showIcon={false}
             title="修改密码">
             <ForgotPassword
+              phone={info.value.phone}
               onClose={() => {
                 showWord.value = false;
               }}

+ 4 - 0
src/views/classList/components/afterWork.tsx

@@ -26,6 +26,7 @@ import {
 import dayjs from 'dayjs';
 import TrainSettings from '../../attend-class/model/train-settings';
 import { use } from 'echarts';
+import TheEmpty from '/src/components/TheEmpty';
 export default defineComponent({
   name: 'afterWork',
   setup(props, { emit }) {
@@ -257,6 +258,9 @@ export default defineComponent({
         </NButton>
         <div class={styles.tableWrap}>
           <NDataTable
+               v-slots={{
+                empty:()=><TheEmpty></TheEmpty>
+              }}
             class={styles.classTable}
             loading={state.loading}
             columns={columns()}

+ 4 - 0
src/views/classList/components/afterWorkDetail.tsx

@@ -28,6 +28,7 @@ import { trainingStatusArray } from '@/utils/searchArray';
 import TrainingDetails from '../modals/TrainingDetails';
 import dayjs from 'dayjs';
 import { lookup } from 'dns';
+import TheEmpty from '/src/components/TheEmpty';
 export default defineComponent({
   name: 'student-studentList',
   setup(props, { emit }) {
@@ -279,6 +280,9 @@ export default defineComponent({
         </NButton> */}
           <div class={styles.tableWrap}>
             <NDataTable
+               v-slots={{
+                empty:()=><TheEmpty></TheEmpty>
+              }}
               class={styles.classTable}
               loading={state.loading}
               columns={columns()}

+ 4 - 0
src/views/classList/components/classStudent.tsx

@@ -15,6 +15,7 @@ import Pagination from '@/components/pagination';
 import { getStudentList } from '../api';
 import add from './images/add.png';
 import { useRoute, useRouter } from 'vue-router';
+import TheEmpty from '/src/components/TheEmpty';
 export default defineComponent({
   name: 'student-studentList',
   setup(props, { emit }) {
@@ -181,6 +182,9 @@ export default defineComponent({
         </NButton> */}
         <div class={styles.tableWrap}>
           <NDataTable
+             v-slots={{
+              empty:()=><TheEmpty></TheEmpty>
+            }}
             class={styles.classTable}
             loading={state.loading}
             columns={columns()}

+ 4 - 0
src/views/classList/components/testRecode.tsx

@@ -27,6 +27,7 @@ import {
 import { getTestList, getTrainingStat } from '../api';
 import CDatePicker from '/src/components/CDatePicker';
 import { useRoute, useRouter } from 'vue-router';
+import TheEmpty from '/src/components/TheEmpty';
 
 export default defineComponent({
   name: 'student-studentList',
@@ -323,6 +324,9 @@ export default defineComponent({
         </div>
         <div class={styles.tableWrap}>
           <NDataTable
+             v-slots={{
+              empty:()=><TheEmpty></TheEmpty>
+            }}
             class={styles.classTable}
             loading={state.loading}
             columns={columns()}

+ 4 - 1
src/views/classList/index.tsx

@@ -25,7 +25,7 @@ import add from '@/views/studentList/images/add.png';
 import ClassGuide from '@/custom-plugins/guide-page/class-guide';
 import { useRouter } from 'vue-router';
 import { rowDark } from 'naive-ui/es/legacy-grid/styles';
-
+import TheEmpty from '/src/components/TheEmpty';
 export default defineComponent({
   name: 'class-classList',
   setup(props, { emit }) {
@@ -298,6 +298,9 @@ export default defineComponent({
         </NButton>
         <div class={styles.tableWrap}>
           <NDataTable
+          v-slots={{
+            empty:()=><TheEmpty></TheEmpty>
+          }}
             class={styles.classTable}
             loading={state.loading}
             columns={columns()}

+ 4 - 0
src/views/home/components/practiceData.tsx

@@ -9,6 +9,7 @@ import { getMinutes, getSecend, getTimes } from '/src/utils/dateFormat';
 import { useRoute, useRouter } from 'vue-router';
 import { getTrainingStatList } from '../../classList/api';
 import dayjs from 'dayjs';
+import TheEmpty from '/src/components/TheEmpty';
 export default defineComponent({
   name: 'home-practiceData',
   props: {
@@ -351,6 +352,9 @@ export default defineComponent({
           </div>
           <div class={styles.tableWrap}>
             <NDataTable
+              v-slots={{
+                empty: () => <TheEmpty></TheEmpty>
+              }}
               class={styles.classTable}
               loading={state.loading}
               columns={columns()}

+ 4 - 0
src/views/home/components/practiceRanking.tsx

@@ -16,6 +16,7 @@ import add from './images/add.png';
 import { getMinutes, getSecend, getTimes } from '/src/utils/dateFormat';
 import { getTestList } from '../../classList/api';
 import dayjs from 'dayjs';
+import TheEmpty from '/src/components/TheEmpty';
 export default defineComponent({
   name: 'student-studentList',
   props: {
@@ -188,6 +189,9 @@ export default defineComponent({
       <div class={styles.listWrap}>
         <div class={styles.tableWrap}>
           <NDataTable
+             v-slots={{
+              empty:()=><TheEmpty></TheEmpty>
+            }}
             class={styles.classTable}
             loading={state.loading}
             columns={columns()}

+ 4 - 0
src/views/home/components/trainData.tsx

@@ -9,6 +9,7 @@ import { getTrainingStat } from '../../data-module/api';
 import { useRoute, useRouter } from 'vue-router';
 import { getTrainingList } from '../../classList/api';
 import dayjs from 'dayjs';
+import TheEmpty from '/src/components/TheEmpty';
 
 export default defineComponent({
   name: 'home-trainData',
@@ -547,6 +548,9 @@ export default defineComponent({
           </div>
           <div class={styles.tableWrap}>
             <NDataTable
+               v-slots={{
+                empty:()=><TheEmpty></TheEmpty>
+              }}
               class={styles.classTable}
               loading={state.loading}
               columns={columns()}

+ 9 - 2
src/views/home/index.tsx

@@ -334,7 +334,14 @@ export default defineComponent({
         }
       });
     };
-
+    const clearStorng = ()=>{
+      localStorage.removeItem('teacher-guideInfo')
+      forms.showGuide=false;
+      setTimeout(()=>{
+        forms.showGuide=true;
+      },500)
+
+    }
     return () => (
       <div class={styles.homeWrap}>
 
@@ -351,7 +358,7 @@ export default defineComponent({
               </div>
               <div class={styles.userTips}>
                 <span>欢迎您使用酷乐秀课堂乐器数字化教学平台!</span>
-                <NButton color="#40A1FF" round class={styles.guide_btn} {...{id:'home-1'}} >
+                <NButton color="#40A1FF" round class={styles.guide_btn} {...{id:'home-1'}}  onClick={()=>clearStorng()}>
                   功能引导
                   <i></i>
                 </NButton>

+ 3 - 0
src/views/setting/components/schoolInfo/index.tsx

@@ -350,6 +350,9 @@ export default defineComponent({
         </NSpace>
 
         <NDataTable
+           v-slots={{
+            empty:()=><TheEmpty></TheEmpty>
+          }}
           loading={data.loading}
           columns={columns()}
           data={data.dataList}></NDataTable>

+ 1 - 1
src/views/setting/modal/addteacherModel.tsx

@@ -152,7 +152,7 @@ export default defineComponent({
               </p>
               <div class={styles.codewrap}>
                 <img src={codewrap} class={styles.codewrapBg} alt="" />
-                <TheQrCode margin={0} logoSrc={logo} text={registerUrl()} size={119} />
+                <TheQrCode margin={0} text={registerUrl()} size={119} />
               </div>
               <div class={styles.codewrapSubmit}>
                 <NImage previewDisabled src={btnBg}></NImage>

+ 3 - 0
src/views/studentList/components/evaluationRecords.tsx

@@ -201,6 +201,9 @@ export default defineComponent({
         </NForm>
         <div class={styles.tableWrap}>
           <NDataTable
+             v-slots={{
+              empty:()=><TheEmpty></TheEmpty>
+            }}
             class={styles.classTable}
             loading={state.loading}
             columns={columns()}

+ 4 - 0
src/views/studentList/components/practiceData.tsx

@@ -21,6 +21,7 @@ import {
   getSecend
 } from '/src/utils/dateFormat';
 import CDatePicker from '/src/components/CDatePicker';
+import TheEmpty from '/src/components/TheEmpty';
 export default defineComponent({
   name: 'student-practiceData',
   props: {
@@ -385,6 +386,9 @@ export default defineComponent({
           </div>
           <div class={styles.tableWrap}>
             <NDataTable
+               v-slots={{
+                empty:()=><TheEmpty></TheEmpty>
+              }}
               class={styles.classTable}
               loading={state.loading}
               columns={columns()}

+ 5 - 1
src/views/studentList/components/studentAfterWork.tsx

@@ -28,6 +28,7 @@ import { trainingStatusArray } from '@/utils/searchArray';
 import StudentTraomomhDetails from '../modals/studentTraomomhDetails'
 import dayjs from 'dayjs';
 import { lookup } from 'dns';
+import TheEmpty from '/src/components/TheEmpty';
 export default defineComponent({
   name: 'student-studentList',
   setup(props, { emit }) {
@@ -158,7 +159,7 @@ export default defineComponent({
                   <p class={styles.nosub}>未提交</p>
                 ) : null}
                 {row.trainingStatus == 'SUBMITTED' ? (
-                  <p class={styles.ison}>不合格</p>
+                  <p style={{color:'#EA4132'}} class={styles.ison}>不合格</p>
                 ) : null}
                 {row.trainingStatus == 'TARGET' ? (
                   <p class={styles.isok}>合格</p>
@@ -250,6 +251,9 @@ export default defineComponent({
           </div>
           <div >
             <NDataTable
+               v-slots={{
+                empty:()=><TheEmpty></TheEmpty>
+              }}
               class={styles.classTable}
               loading={state.loading}
               columns={columns()}

+ 5 - 1
src/views/studentList/index.tsx

@@ -19,6 +19,7 @@ import { getStudentList } from './api';
 import { classGroupList } from '@/views/classList/api';
 import AddStudentModel from './modals/addStudentModel';
 import Studentguide from '@/custom-plugins/guide-page/student-guide'
+import TheEmpty from '/src/components/TheEmpty';
 export default defineComponent({
   name: 'student-studentList',
   setup(props, { emit }) {
@@ -258,7 +259,7 @@ export default defineComponent({
           v-slots={{
             icon: () => (
               <>
-                <NImage class={styles.addBtnIcon} src={add}></NImage>
+                <NImage class={styles.addBtnIcon} previewDisabled src={add}></NImage>
               </>
             )
           }}>
@@ -266,6 +267,9 @@ export default defineComponent({
         </NButton>
         <div class={styles.tableWrap}>
           <NDataTable
+             v-slots={{
+              empty:()=><TheEmpty></TheEmpty>
+            }}
             class={styles.classTable}
             loading={state.loading}
             columns={columns()}

+ 2 - 2
src/views/studentList/modals/addStudentModel.tsx

@@ -148,11 +148,11 @@ export default defineComponent({
               </p>
               <div class={styles.codewrap}>
                 <img src={codewrap} class={styles.codewrapBg} alt="" />
-                <TheQrCode margin={0} logoSrc={logo} class={styles.codewrapImg} text={url.value} size={119} />
+                <TheQrCode margin={0} class={styles.codewrapImg} text={url.value} size={119} />
               </div>
               <div class={styles.codewrapSubmit}>
                 <NImage previewDisabled src={btnBg}></NImage>
-                请扫描上方二维 <span>完成报名</span>{' '}
+                请使用微信扫码<span>完成报名</span>{' '}
               </div>
             </div>
           </div>