shilipojs 2 år sedan
förälder
incheckning
aa693bcd39

+ 1 - 0
src/components/MxSearch/mx-search-group.vue

@@ -91,6 +91,7 @@ export default {
     border-radius: 10px;
   }
   .search-group-row {
+    align-items: center;
     flex-wrap: wrap;
   }
 }

+ 4 - 3
src/views/career/plan/UniversitiesDetail.vue

@@ -21,9 +21,9 @@
     </el-row>
     <div>
         <div class="tabs-wrap mb20">
-          <span class="tabs-item" @click="tabActive = 0" :class="{'bg-primary':tabActive == 0}">专业概况</span>
-          <span class="tabs-item" @click="tabActive = 1" :class="{'bg-primary':tabActive == 1}">就业前景</span>
-          <span class="tabs-item" @click="tabActive = 2" :class="{'bg-primary':tabActive == 2}">开设院校</span>
+          <span class="tabs-item" @click="tabActive = 0" :class="{'bg-primary':tabActive == 0}">院校概况</span>
+          <span class="tabs-item" @click="tabActive = 1" :class="{'bg-primary':tabActive == 1}">招生简章</span>
+          <span class="tabs-item" @click="tabActive = 2" :class="{'bg-primary':tabActive == 2}">院校风采</span>
         </div>
         <div v-if="tabActive == 0">
           <el-row :gutter="10" class="fx-row">
@@ -54,6 +54,7 @@
             <p class="format-tit">院系设置</p>
           </div>
         </div>
+        <!--  招生简章-->
         <enroll-list v-if="tabActive == 1"></enroll-list>
     </div>
 

+ 22 - 2
src/views/career/plan/compoents/enroll-list.vue

@@ -1,6 +1,20 @@
 <template>
    <div>
-     <mx-search-group :span="8"></mx-search-group>
+     <mx-search-group :span="8" placeholder="请输入内容">
+       <div class="f-666 f14 ml10">
+       共 <span class="f-primary">98</span>  条
+     </div> </mx-search-group>
+     <div class="guide-list">
+       <el-row class="guid-item" v-for="item in 10">
+         <el-col :span="20">
+           <a class="f-333 f16 text-ellipsis">
+             <span>清华大学2022年本科招生章程</span>
+           </a>
+         </el-col>
+         <el-col class="f-666 f14" :span="2">0 次浏览</el-col>
+         <el-col class="f-666 f14" :span="2">2022-06-06</el-col>
+       </el-row>
+     </div>
    </div>
 </template>
 
@@ -12,5 +26,11 @@ export default {
 </script>
 
 <style scoped>
-
+.guid-item{
+  border-bottom: 1px solid #f2f2f2;
+  line-height: 60px;
+}
+.guid-item a :hover{
+  color: #42b983;
+}
 </style>

+ 4 - 1
src/views/elective/master/components/choose-master-teacher.vue

@@ -47,7 +47,10 @@ export default  {
         this.$message.warning(`该老师已分配给新班级`)
         return
       }
-      console.log(this.isRepeat())
+      if(!this.selectedCode){
+        this.dialogVisible = false
+        return
+      }
       this.saveTeacherSettings()
     },
     saveTeacherSettings() {