elective student - move to new folder

src/views/elective/generation/detail.vue

@@ -72,7 +72,7 @@ import {
 import ElectiveGenerationFlowLog from '@/views/elective/generation/components/elective-generation-flow-log'
 import ElectiveFlowMajor from '@/views/elective/generation/components/elective-flow-major'
 import ElectiveFlowRankDescriptor from '@/views/elective/generation/components/elective-flow-rank-descriptor'
-import ReportTable from '@/views/system/user/profile/components/report-table'
+import ReportTable from '@/views/elective/select/components/elective-table'
 import { getPrimaryElectivesModels, getStudentElectiveModels } from '@/api/webApi/elective/selected-subject'
 
 export default {

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

@@ -14,11 +14,12 @@
   </el-dialog>
 </template>
 <script>
-import SingleSubjectReport from './single-subject-report'
-import AiTable from './ai-table'
+import SingleSubjectReport from '../../../system/user/profile/components/single-subject-report'
+import AiTable from './elective-ai-table'
 
 
 export default {
+  name: 'elective-ai-analysis-dialog',
   components:{
     AiTable
   },

src/views/system/user/profile/components/ai-table.vue → src/views/elective/select/components/elective-ai-table.vue

@@ -54,6 +54,8 @@ const resolverModules = require.context('./ai-round-select-resolvers', false, /\
 const resolvers = resolverModules.keys().map(key => resolverModules(key).default)
 
 export default {
+  mixins: [...resolvers],
+  name: 'elective-ai-table',
   components:{
     OverUnderBadge
   },
@@ -62,7 +64,6 @@ export default {
     readonly: Boolean,
     optionalMajors: { type: Array, default: () => [] }
   },
-  mixins: [...resolvers],
   data() {
     return{
       rows: [],

src/views/system/user/profile/components/esign-dialog.vue → src/views/elective/select/components/elective-esign-dialog.vue

@@ -33,12 +33,13 @@
   </div>
 </template>
 <script>
-import { submitElectiveModels, saveEsign, getStudentElectiveModels } from '@/api/webApi/elective/selected-subject'
+import { submitElectiveModels } from '@/api/webApi/elective/selected-subject'
 
 export default {
+  name: 'elective-esign-dialog',
+  props: ['generation'],
   data() {
     return {
-      selectedList: [],
       dialogVisible: false, // 弹框是否开启
       lineWidth: 3, // 画笔的线条粗细
       lineColor: '#000000', // 画笔的颜色
@@ -55,27 +56,23 @@ export default {
     }
   },
   methods: {
-    open(selectedList) {
-      this.selectedList = selectedList
+    open() {
       this.dialogVisible = true
     },
     // 清空画板
     handleReset() {
       this.$refs.esign.reset()
     },
-    saveELective() {
+    saveElective() {
       submitElectiveModels({
-        models: this.selectedList
-        // esign:this.base64Img
+        models: this.generation.activeModel.selectedList,
+        esign:this.base64Img
       }).then(res => {
         if (res.code == 200) {
           this.dialogVisible = false
           this.$message.success('报名成功')
-          this.loadStudentSelected()
-          this.getStudentElectiveModels()
+          this.refreshData()
         }
-
-        console.log(res)
       })
     },
     // 生成签字图
@@ -83,12 +80,10 @@ export default {
       this.$refs.esign
         .generate() // 使用生成器调用把签字的图片转换成为base64图片格式
         .then((res) => {
-          console.log(this.selectedList)
           this.base64Img = res
-          this.saveELective()
+          this.saveElective()
           // 在这里向后端发请求把转换后的base64文件传给后端，后端接收以后再转换成图片做静态图片存储
           // 当然也可以把base64转成流文件blob格式的，类似上传给后端这样，具体哪种方式看后端要求
-          console.log(this.resultImg)
         })
         .catch((err) => {
           // 画布没有签字时会执行这里提示一下
@@ -98,7 +93,6 @@ export default {
           })
           return
         })
-
       this.dialogVisible = true
     }
   }

src/views/system/user/profile/components/elective-preference-info.vue → src/views/elective/select/components/elective-preference-info.vue

@@ -12,7 +12,7 @@
 
 <script>
 import ElectiveToolsMixin from './elective-tools-mixins'
-import ElectivePreferenceDrag from '@/views/system/user/profile/components/elective-preference-drag'
+import ElectivePreferenceDrag from '@/views/elective/select/components/elective-preference-drag'
 
 export default {
   components: { ElectivePreferenceDrag },

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

@@ -78,25 +78,27 @@
 <script>
 import MxSelectTranslate from '@/components/Cache/modules/mx-select-translate-mixin.js'
 import ElectivePreferenceDrag from './elective-preference-drag'
-import ChooseSubjectDialog from './choose-subject-dialog'
+import ChooseSubjectDialog from '../../../system/user/profile/components/choose-subject-dialog'
 import SelectSubjectReportDialog from '@/views/system/user/profile/components/select-subject-report-dialog'
-import EsignDialog from '@/views/system/user/profile/components/esign-dialog'
-import ReportStep from './report-step'
+import EsignDialog from '@/views/elective/select/components/elective-esign-dialog'
+import ReportStep from '../../../system/user/profile/components/report-step'
 import OverUnderBadge from '@/views/elective/publish/components/steps/fauclty/over-under-badge'
 import { submitElectiveModels } from '@/api/webApi/elective/selected-subject'
 import consts from '@/common/mx-const'
 import { mapGetters } from 'vuex'
-import ElectiveEnrollInfo from '@/views/system/user/profile/components/elective-enroll-info'
+import ElectiveEnrollInfo from '@/views/elective/select/components/elective-enroll-info'
 import ElectiveToolsMixin from './elective-tools-mixins'
-import ElectivePreferenceInfo from '@/views/system/user/profile/components/elective-preference-info'
-import ElectivePreferenceReject from '@/views/system/user/profile/components/elective-preference-reject'
-import ElectivePreferenceCommand from '@/views/system/user/profile/components/elective-preference-command'
-import AiAnalysisDialog from '@/views/system/user/profile/components/ai-analysis-dialog'
+import ElectivePreferenceInfo from '@/views/elective/select/components/elective-preference-info'
+import ElectivePreferenceReject from '@/views/elective/select/components/elective-preference-reject'
+import ElectivePreferenceCommand from '@/views/elective/select/components/elective-preference-command'
+import AiAnalysisDialog from '@/views/elective/select/components/elective-ai-analysis-dialog'
 
 const resolverModules = require.context('./round-select-resolvers', false, /\.js$/)
 const resolvers = resolverModules.keys().map(key => resolverModules(key).default)
 
 export default {
+  mixins: [ElectiveToolsMixin, MxSelectTranslate, ...resolvers],
+  name: 'elective-table',
   props: {
     generation: Object,
     readonly: Boolean, // 校长端不允许操作
@@ -121,7 +123,6 @@ export default {
       }
     }
   },
-  mixins: [ElectiveToolsMixin, MxSelectTranslate, ...resolvers],
   computed: {
     ...mapGetters(['hasPermissions']),
     enrollInfoVisible() {
@@ -175,10 +176,7 @@ export default {
       return this.enableSelect && this.generation.active > this.generation.options.primary.value
     },
     enableAIFeature() {
-      if (!this.generation.activeOpt) return false
-      const options = this.generation.options
-      return !this.generation.activeOpt.decisionMaking &&
-        this.generation.activeOpt != options.primary && !this.readonly
+      return !this.generation.activeOpt.decisionMaking && this.generation.activeOpt != options.primary && !this.readonly
     },
     resolveTablePrefix() {
       return {

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

@@ -50,10 +50,10 @@ import { saveStudentSelected } from '@/api/webApi/selection'
 import TestEntry from '@/views/elective/test/components/test-entry'
 import TestResult from '@/views/elective/test/components/test-result'
 import SelectSubject from '@/views/system/user/profile/components/select-subject'
-import ReportTable from '@/views/system/user/profile/components/report-table'
+import ReportTable from '@/views/elective/select/components/elective-table'
 import ElectiveGenerationSteps from '@/views/elective/generation/components/elective-generation-steps'
 import TransferMixin from '@/components/mx-transfer-mixin'
-import ElectiveToolsMixin from './components/elective-tools-mixins'
+import ElectiveToolsMixin from '../../../elective/select/components/elective-tools-mixins'
 import config from '@/common/mx-config'
 import {
   getStudentElectiveModels,