Merge branch 'master' of http://121.4.203.192:9000/mingxue/front

# Conflicts:
#	src/views/system/user/profile/round-select.vue

src/views/system/user/profile/components/ai-analysis-dialog.vue

@@ -6,7 +6,7 @@
     :close-on-click-modal ="false"
     width="80%"
   >
-    <p class="mb10"><el-button type="primary">整体报告</el-button></p>
+    <p class="mb10"><el-button type="primary" @click="$refs.SingleSubjectReport.dialogVisible = true">整体报告</el-button></p>
 
     <mx-table :propDefines="propDefines" :rows="formatRows">
       <template #underOver="{value}">

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

@@ -3,7 +3,7 @@
     <div class="mb10 fx-row fx-end-base">
       <div v-if="!readonly">
         <el-button v-if="aiButtonShow" type="primary" @click="toAiAnalysis">AI分析</el-button>
-        <el-button>选科历史记录</el-button>
+<!--        <el-button>选科历史记录</el-button>-->
       </div>
     </div>
 
@@ -19,7 +19,7 @@
       <template #signUp="{row}">
         <span class="f-red" v-if="!row.allowSelect">无法报名</span>
         <div v-else>
-          <span v-if="generation.current > 1">可报名</span>
+          <span v-if="generation.current > 1" @click="commit" class="btn-green">报名</span>
           <div v-else>
             <span class="f-red btn-red" v-if="row.selected" @click="toUnSelect(row)">取消报名</span>
             <span class="btn-green" v-else @click="toSelect(row)">报名</span>
@@ -66,7 +66,7 @@
       <div v-for="item in singleList" class="mb5 mt5">
         <el-button @click="commit" type="primary">{{ `${item.groupName} : 报名` }}</el-button>
       </div>
-      <div class="mb5 mt5">
+      <div class="mb5 mt10 text-right">
         <el-popover
           placement="right"
           width="300"
@@ -90,7 +90,6 @@
           <el-button slot="reference" type="danger">不同意</el-button>
         </el-popover>
       </div>
-      {{ resolveDynamicTable }}
     </div>
     <esign-dialog ref="esignDialog"></esign-dialog>
     <choose-subject-dialog ref="chooseDialog"></choose-subject-dialog>