院校投档线

src/views/career/components/UniversitiesLine.vue

@@ -7,7 +7,6 @@
           <span class="radiaTitle">录 取 年 份：</span>
         </div>
         <el-radio-group v-model="universityParams.yearRes">
-<!--          <el-radio-button label="">所有</el-radio-button>-->
           <el-radio-button v-for="item in years" :key="item" :label="item"
                            style="margin-bottom:10px"></el-radio-button>
         </el-radio-group>
@@ -18,6 +17,7 @@
           <span class="radiaTitle">科 类：</span>
         </div>
         <el-radio-group v-model="universityParams.typeRes">
+          <el-radio-button label="">所有</el-radio-button>
           <el-radio-button v-for="item in types" :key="item" :label="item"
                            style="margin-bottom:10px"></el-radio-button>
         </el-radio-group>
@@ -28,6 +28,7 @@
           <span class="radiaTitle">层 次：</span>
         </div>
         <el-radio-group v-model="universityParams.levelsRes">
+          <el-radio-button label="">所有</el-radio-button>
           <el-radio-button v-for="item in levels" :key="item" :label="item"
                            style="margin-bottom:10px"></el-radio-button>
         </el-radio-group>
@@ -109,7 +110,7 @@
           year: this.universityParams.yearRes,
         }
         selectUniversityLevels(params).then(res => {
-          this.universityParams.levelsRes = res.rows[0]
+          // this.universityParams.levelsRes = res.rows[0]
           this.levels = res.rows
         })
       },
@@ -119,7 +120,7 @@
           year: this.universityParams.yearRes,
         }
         selectUniversityTypes(params).then(res => {
-          this.universityParams.typeRes = res.rows[0]
+          // this.universityParams.typeRes = res.rows[0]
           this.types = res.rows
         })
       },

src/views/career/components/UniversitiesLineTable.vue

@@ -65,7 +65,7 @@ export default {
       immediate: true,
       deep: true,
       handler(val) {
-        if (val.levelsRes == '' || val.locationsRes == '' || val.typeRes == '' || val.yearRes == '' ) {
+        if ( val.locationsRes == ''  || val.yearRes == '' ) {
           return
         }
         this.tableParams.level = val.levelsRes

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

@@ -198,14 +198,14 @@ export default {
       const isRefuse = activeModels.models.filter(item => item.rejected)
       if (isRefuse.length > 0) {
         // 拒绝了
-        return '拒绝填报志愿'
+        return '您拒绝了填报志愿'
       } else {
         //  填报 or 未选择
         const supply = activeModels.models.filter(item => item.selected)
         if (supply.length > 0) {
           return `填报志愿为${supply[0].groupName}`
         } else {
-          return '未填报志愿'
+          return '您未填报志愿'
         }
       }
     },
@@ -316,12 +316,12 @@ export default {
         subjects: {
           label: '自选专业',
           slot: 'subjects',
-          width: '150'
+          minWidth: '150'
         },
         colleges: {
           label: '院校',
           slot: 'colleges',
-          width: '250'
+          minWidth: '250'
         },
         signUp: {
           label: '操作',