Merge branch 'iteration-0906' into jenkins

src/components/layout/index.tsx

@@ -359,7 +359,9 @@ export default defineComponent({
         '/classDetail',
         '/classStudentDetail',
         '/notation',
-        '/xiaoku-ai'
+        '/xiaoku-ai',
+        '/classStudentRecode',
+        '/afterWorkDetail'
       ];
       // 单独判断个人信息页面[学校设置]有引导
       if (route.path === '/setting') {

src/components/layout/layoutTop.tsx

@@ -250,6 +250,7 @@ export default defineComponent({
             class={['modalTitle', 'background', styles.suggestWrap]}
             v-model:show={showSuggestionViseble.value}
             preset="card"
+            display-directive='show'
             showIcon={false}>
             <SuggestionOption
               onClose={() =>

src/components/layout/modals/suggestion-option.tsx

@@ -29,6 +29,7 @@ import {
   getSuggestionList,
   sysParamConfigPage
 } from '../modals/api';
+
 export default defineComponent({
   name: 'train-update',
   emits: ['close', 'submit'],
@@ -44,7 +45,7 @@ export default defineComponent({
       mobileNo: userStore.getUserInfo.phone
     });
     const state = reactive([]) as any;
-    const isubmit = ref(false)
+    const isubmit = ref(true)
     const suggestionTypeList = ref([] as any);
     const ossUploadUrl = `https://gyt.ks3-cn-beijing.ksyuncs.com/`;
     const uploadRef = ref();
@@ -81,6 +82,7 @@ export default defineComponent({
           isubmit.value = true;
           // message.success('提交成功');
           setTimeout(()=>{
+            onReset()
             emit('close');
           },3000)
 
@@ -91,6 +93,14 @@ export default defineComponent({
       })
 
     };
+    const onReset = ()=>{
+      forms.suggestionTypeId=null
+      forms.clientType='TEACHER'
+      forms.content= ''
+      forms.attachmentUrls= ''
+      forms.type= 'APP'
+      forms.mobileNo= userStore.getUserInfo.phone
+    }
     const onBeforeUpload = async (options: any) => {
       console.log(options, 'onBeforeUpload');
       const file = options.file;
@@ -200,7 +210,7 @@ export default defineComponent({
           <NImage
             class={styles.closeBtn}
             src={suggestClose}
-            previewDisabled   onClick={() => emit('close')}></NImage>
+            previewDisabled   onClick={() => {onReset();emit('close')}}></NImage>
           <NImage class={styles.bgLine} src={bgLine} previewDisabled></NImage>
           <h2 class={styles.formTitle}>意见反馈</h2>
           <div class={styles.formWrapInfo}>

src/views/classList/index.tsx

@@ -85,7 +85,7 @@ export default defineComponent({
         gradeLevel: ''
       };
       if (state.popSelectYearList.length > 0) {
-        state.searchForm.gradeYear = state.popSelectYearList[0].id;
+        state.searchForm.gradeYear = state.popSelectYearList[1].id;
       }
       getList();
     };
@@ -359,9 +359,13 @@ export default defineComponent({
         temp.forEach((i: any) => {
           i.name = i.name + '学年';
         });
+        temp.unshift({
+          id: '',
+          name: '全部学年'
+        });
         state.popSelectYearList = temp || [];
         if (temp.length > 0) {
-          state.searchForm.gradeYear = temp[0].id;
+          state.searchForm.gradeYear = temp[1].id;
         }
       } catch {
         //