shilipojs 3 роки тому
батько
коміт
71772f0a7e

+ 2 - 2
.env.development

@@ -2,9 +2,9 @@
 ENV = 'development'
 
 # 名学金榜学习系统/生产环境
-VUE_APP_BASE_API = 'https://front.mingxuejinbang.com/prod-api'
+#VUE_APP_BASE_API = 'https://front.mingxuejinbang.com/prod-api'
 #VUE_APP_BASE_API = 'http://192.168.0.106:1024/prod-api'
-#VUE_APP_BASE_API = 'http://192.168.0.107:1024/prod-api'
+VUE_APP_BASE_API = 'http://192.168.0.107:1024/prod-api'
 
 #VUE_APP_BASE_API = '/prod-api'
 VUE_APP_MOBILE = "https://h5.mingxuejinbang.com"

+ 2 - 2
src/views/elective/publish/components/steps/fauclty/over-under-badge.vue

@@ -15,11 +15,11 @@ export default {
     },
     overType: {
       type: String,
-      default: 'success'
+      default: 'danger'
     },
     underType: {
       type: String,
-      default: 'danger'
+      default: 'warning'
     },
     overText: {
       type: String,

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

@@ -29,7 +29,9 @@
         </el-row>
       </template>
       <template #group="{row}">
-        <span :class="{'f-primary': row.allowSelect,'f-red':!row.allowSelect}">{{row.groupName}}</span>
+        <el-badge value="推荐" :hidden="!row.isRecommend" type="success">
+          <el-button :class="{'f-primary': row.allowSelect,'f-red':!row.allowSelect}">{{row.groupName}}</el-button>
+        </el-badge>
       </template>
       <template #colleges="{row}">
         <el-row>

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

@@ -269,18 +269,11 @@ export default {
         const row = generationModels.find(item => item.groupId == rg.groupId) || {}
         row.allowSelectTips = row.allowSelect ? '报名中' : row.disabledReason || '无法报名'
         const matchedMajors = this.optionalMajors.filter(college => college.matchedGroupIds.includes(row.groupId))
-        return {
-          groupId: row.groupId,
-          groupName: row.groupName,
-          selected: row.selected,
-          scoreSumGroup: row.scoreSumGroup,
-          classCount: row.classCount,
-          personCount: row.personCount,
-          allowSelectTips: row.allowSelectTips,
-          colleges: matchedMajors.map(m => ({ college: m.collegeName, major: m.majorCategoryName })),
-          subjects: matchedMajors.map(m => m['majorCategoryName']),
-          allowSelect: row.allowSelect
-        }
+        row.colleges = matchedMajors.map(m => ({ college: m.collegeName, major: m.majorCategoryName }))
+        row.subjects = matchedMajors.map(m => m['majorCategoryName'])
+        // this.$set(row,'colleges',matchedMajors.map(m => ({ college: m.collegeName, major: m.majorCategoryName })))
+        // this.$set(row,'subjects',matchedMajors.map(m => m['majorCategoryName']))
+        return row
       })
     },
     formatCols() {