选科报名-自选专业后更新数据

src/views/system/user/profile/components/choose-subject-dialog.vue

@@ -8,7 +8,7 @@
     >
       <subject-choice :course0="course0" :course1="course1" :year="year" ></subject-choice>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+        <el-button type="primary" @click="cancel">确 定</el-button>
       </span>
     </el-dialog>
 </template>
@@ -18,6 +18,7 @@ export default {
   components: {
     SubjectChoice
   },
+  inject: ['optionalMajors'],
   data() {
     return{
       dialogVisible:false,
@@ -33,8 +34,10 @@ export default {
       this.course0 = course0
       this.course1 = course1
     },
-    handleClose() {
-
+    cancel() {
+      this.dialogVisible = false
+      this.optionalMajors()
+      this.$emit('chooseReally',)
     }
   }
 }

src/views/system/user/profile/components/report-table.vue

@@ -23,7 +23,15 @@
       <template #subjects="{row}">
         <el-row>
           <el-col :span="8" v-for="subject in row.subjects">
-            <el-tag type="success" class="mr10 mb10">{{ subject[0] }}</el-tag>
+            <el-popover
+              placement="top"
+              popper-class="zero-padding-popover"
+              trigger="click">
+              <div class="fx-column">
+                <span >{{subject}}</span>
+              </div>
+              <el-tag type="success" slot="reference" class="mr10 mb10">{{ subject[0] }}</el-tag>
+            </el-popover>
           </el-col>
         </el-row>
       </template>
@@ -54,7 +62,7 @@
         <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
       </span>
     </el-dialog>
-    <choose-subject-dialog ref="chooseDialog"></choose-subject-dialog>
+    <choose-subject-dialog ref="chooseDialog" @chooseReally="toggleSubject"></choose-subject-dialog>
     <Ai-dialog ref="aiDialog"></Ai-dialog>
   </el-card>
 </template>

src/views/system/user/profile/round-select.vue

@@ -113,6 +113,11 @@ import {
 } from '@/api/webApi/elective/ selected-subject'
 
 export default {
+  provide(){
+    return {
+      optionalMajors: this.getOptionalMajors
+    }
+  },
   components: { SelectSubject, TestSummary, TestResult, TestEntry,ReportTable },
   mixins: [transferMixin],
   name: 'round-select',